[Freeciv-Dev] (PR#12114) Reorganize and trim client options.

["Vasco Alexandre da Silva Costa" <vasc@xxxxxxxxxxxxxx>]

<URL: http://bugs.freeciv.org/Ticket/Display.html?id=12114 >

This patch:

* Makes concise city production the default.
* Removes the solid unit icon background option.
* Moves the disable worklist task icons option to the graphics tab.

Index: client/cityrepdata.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/cityrepdata.c,v
retrieving revision 1.45
diff -u -r1.45 cityrepdata.c
--- client/cityrepdata.c        13 Dec 2004 16:23:29 -0000      1.45
+++ client/cityrepdata.c        5 Feb 2005 01:26:57 -0000
@@ -359,7 +359,7 @@
   static char buf[128];
   const char *from_worklist =
     worklist_is_empty(&pcity->worklist) ? "" :
-    concise_city_production ? "*" : _("(worklist)");
+    concise_city_production ? "+" : _("(worklist)");
        
   if (get_current_construction_bonus(pcity, EFT_PROD_TO_GOLD) > 0) {
     my_snprintf(buf, sizeof(buf), "%s (%d/X/X/X)%s",
Index: client/options.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/options.c,v
retrieving revision 1.115
diff -u -r1.115 options.c
--- client/options.c    4 Feb 2005 23:00:02 -0000       1.115
+++ client/options.c    5 Feb 2005 01:26:57 -0000
@@ -63,7 +63,7 @@
 bool auto_center_on_combat = FALSE;
 bool wakeup_focus = TRUE;
 bool center_when_popup_city = TRUE;
-bool concise_city_production = FALSE;
+bool concise_city_production = TRUE;
 bool auto_turn_done = FALSE;
 bool meta_accelerators = TRUE;
 bool map_scrollbars = FALSE;
Index: client/gui-gtk-2.0/graphics.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-gtk-2.0/graphics.c,v
retrieving revision 1.33
diff -u -r1.33 graphics.c
--- client/gui-gtk-2.0/graphics.c       4 Feb 2005 02:07:06 -0000       1.33
+++ client/gui-gtk-2.0/graphics.c       5 Feb 2005 01:26:58 -0000
@@ -374,7 +374,6 @@
 ***************************************************************************/
 void create_overlay_unit(struct canvas *pcanvas, int i)
 {
-  enum color_std bg_color;
   int x1, x2, y1, y2;
   int width, height;
   struct unit_type *type = get_unit_type(i);
@@ -394,18 +393,6 @@
     height = UNIT_TILE_HEIGHT;
   }
 
-  if (solid_unit_icon_bg) {
-    /* Give tile a background color, based on the type of unit */
-    switch (type->move_type) {
-      case LAND_MOVING: bg_color = COLOR_STD_GROUND; break;
-      case SEA_MOVING:  bg_color = COLOR_STD_OCEAN;  break;
-      case HELI_MOVING: bg_color = COLOR_STD_YELLOW; break;
-      case AIR_MOVING:  bg_color = COLOR_STD_CYAN;   break;
-      default:       bg_color = COLOR_STD_BLACK;  break;
-    }
-    canvas_put_rectangle(pcanvas, bg_color, 0, 0, width, height);
-  }
-
   /* Finally, put a picture of the unit in the tile */
   canvas_put_sprite(pcanvas, 0, 0, type->sprite, 
       (x2 + x1 - width) / 2, (y1 + y2 - height) / 2, 
Index: client/gui-gtk-2.0/gui_main.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-gtk-2.0/gui_main.c,v
retrieving revision 1.105
diff -u -r1.105 gui_main.c
--- client/gui-gtk-2.0/gui_main.c       4 Feb 2005 23:00:02 -0000       1.105
+++ client/gui-gtk-2.0/gui_main.c       5 Feb 2005 01:26:58 -0000
@@ -162,7 +162,7 @@
                  N_("Disabling this will turn off the unit and building "
                     "icons in the worklist dialog and the production "
                     "tab of the city dialog."),
-                 COC_INTERFACE),
+                 COC_GRAPHICS),
   GEN_BOOL_OPTION(fullscreen_mode, N_("Fullscreen Mode"),
                  N_("If this option is set then the game will be played in "
                     "fullscreen mode. There are some known bugs with "
@@ -174,12 +174,6 @@
                     "be shown as separate tabs rather than in popup "
                     "dialogs."),
                  COC_INTERFACE),
-  GEN_BOOL_OPTION(solid_unit_icon_bg,
-                 N_("Solid unit icon background color in city dialog"),
-                 N_("If this is enabled then units will be shown in the "
-                    "city dialog production tab with a color-coded "
-                    "solid background."),
-                 COC_INTERFACE),
   GEN_BOOL_OPTION(better_fog,
                  N_("Better fog-of-war drawing"),
                  N_("If this is enabled then a better method is used for "
Index: client/gui-gtk-2.0/gui_main.h
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-gtk-2.0/gui_main.h,v
retrieving revision 1.19
diff -u -r1.19 gui_main.h
--- client/gui-gtk-2.0/gui_main.h       25 Dec 2004 19:50:29 -0000      1.19
+++ client/gui-gtk-2.0/gui_main.h       5 Feb 2005 01:26:58 -0000
@@ -43,7 +43,6 @@
 
 extern bool fullscreen_mode;
 extern bool enable_tabs;
-extern bool solid_unit_icon_bg;
 extern bool better_fog;
 
 extern GdkGC *          civ_gc;