[Freeciv-Dev] (PR#9778) gui-xaw: rename "kingdom" menu as "government"

["Jason Short" <jdorje@xxxxxxxxxxxxxxxxxxxxx>]

<URL: http://rt.freeciv.org/Ticket/Display.html?id=9778 >

This patch renames the "kingdom" menu into the "government" menu for 
gui-xaw.

jason

Index: client/gui-xaw/actions.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-xaw/actions.c,v
retrieving revision 1.20
diff -u -r1.20 actions.c
--- client/gui-xaw/actions.c    17 May 2004 01:29:47 -0000      1.20
+++ client/gui-xaw/actions.c    23 Aug 2004 20:40:59 -0000
@@ -224,7 +224,7 @@
 static void xaw_key_open_find_city(Widget w, XEvent *event, String *argv, 
Cardinal *argc)
 {
   if (can_client_change_view() &&
-     is_menu_item_active(MENU_KINGDOM, MENU_KINGDOM_FIND_CITY))
+     is_menu_item_active(MENU_GOVERNMENT, MENU_GOVERNMENT_FIND_CITY))
     popup_find_dialog();
 }
 
@@ -252,14 +252,14 @@
 static void xaw_key_open_rates(Widget w, XEvent *event, String *argv, Cardinal 
*argc)
 {
   if (can_client_change_view() &&
-     is_menu_item_active(MENU_KINGDOM, MENU_KINGDOM_RATES))
+     is_menu_item_active(MENU_GOVERNMENT, MENU_GOVERNMENT_RATES))
     popup_rates_dialog();
 }
 
 static void xaw_key_open_revolution(Widget w, XEvent *event, String *argv, 
Cardinal *argc)
 {
   if (can_client_change_view() &&
-     is_menu_item_active(MENU_KINGDOM, MENU_KINGDOM_REVOLUTION))
+     is_menu_item_active(MENU_GOVERNMENT, MENU_GOVERNMENT_REVOLUTION))
     popup_revolution_dialog();
 }
 
@@ -301,7 +301,7 @@
 static void xaw_key_open_worklists(Widget w, XEvent *event, String *argv, 
Cardinal *argc)
 {
   if (can_client_change_view() &&
-     is_menu_item_active(MENU_KINGDOM, MENU_KINGDOM_WORKLISTS))
+     is_menu_item_active(MENU_GOVERNMENT, MENU_GOVERNMENT_WORKLISTS))
     popup_worklists_dialog(game.player_ptr);
 }
 
Index: client/gui-xaw/menu.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-xaw/menu.c,v
retrieving revision 1.63
diff -u -r1.63 menu.c
--- client/gui-xaw/menu.c       17 May 2004 01:29:47 -0000      1.63
+++ client/gui-xaw/menu.c       23 Aug 2004 20:40:59 -0000
@@ -117,13 +117,13 @@
     { { 0,                            },       0, MENU_END_OF_LIST, 0 }
 };
 
-static struct MenuEntry kingdom_menu_entries[]={
-    { { N_("Tax Rates"), 0            },     "T", MENU_KINGDOM_RATES, 0 },
+static struct MenuEntry government_menu_entries[]={
+    { { N_("Tax Rates"), 0            },     "T", MENU_GOVERNMENT_RATES, 0 },
     { { 0                             },      "", MENU_SEPARATOR_LINE, 0 },
-    { { N_("Find City"), 0            },     "F", MENU_KINGDOM_FIND_CITY, 0 },
-    { { N_("Worklists"), 0            },     "L", MENU_KINGDOM_WORKLISTS, 0 },
+    { { N_("Find City"), 0            },     "F", MENU_GOVERNMENT_FIND_CITY, 0 
},
+    { { N_("Worklists"), 0            },     "L", MENU_GOVERNMENT_WORKLISTS, 0 
},
     { { 0                             },      "", MENU_SEPARATOR_LINE, 0 },
-    { { N_("Revolution"), 0           },     "R", MENU_KINGDOM_REVOLUTION, 0 },
+    { { N_("Revolution"), 0           },     "R", MENU_GOVERNMENT_REVOLUTION, 
0 },
     { { 0,                            },       0, MENU_END_OF_LIST, 0 }
 };
 
@@ -259,7 +259,7 @@
     XtSetSensitive(menus[MENU_REPORT]->button, False);
     XtSetSensitive(menus[MENU_ORDER]->button, False);
     XtSetSensitive(menus[MENU_VIEW]->button, False);
-    XtSetSensitive(menus[MENU_KINGDOM]->button, False);
+    XtSetSensitive(menus[MENU_GOVERNMENT]->button, False);
 
     menu_entry_sensitive(MENU_GAME, MENU_GAME_OPTIONS, 0);
     menu_entry_sensitive(MENU_GAME, MENU_GAME_MSG_OPTIONS, 0);
@@ -287,13 +287,13 @@
     XtSetSensitive(menus[MENU_ORDER]->button,
                   punit && can_client_issue_orders());
     XtSetSensitive(menus[MENU_VIEW]->button, True);
-    XtSetSensitive(menus[MENU_KINGDOM]->button, True);
+    XtSetSensitive(menus[MENU_GOVERNMENT]->button, True);
 
-    menu_entry_sensitive(MENU_KINGDOM, MENU_KINGDOM_RATES,
+    menu_entry_sensitive(MENU_GOVERNMENT, MENU_GOVERNMENT_RATES,
                          can_client_issue_orders());
-    menu_entry_sensitive(MENU_KINGDOM, MENU_KINGDOM_WORKLISTS,
+    menu_entry_sensitive(MENU_GOVERNMENT, MENU_GOVERNMENT_WORKLISTS,
                          can_client_issue_orders());
-    menu_entry_sensitive(MENU_KINGDOM, MENU_KINGDOM_REVOLUTION,
+    menu_entry_sensitive(MENU_GOVERNMENT, MENU_GOVERNMENT_REVOLUTION,
                          can_client_issue_orders());
     menu_entry_sensitive(MENU_VIEW, MENU_VIEW_SHOW_CITY_GROWTH,
                         draw_city_names);
@@ -500,22 +500,22 @@
 /****************************************************************
 ...
 *****************************************************************/
-static void kingdom_menu_callback(Widget w, XtPointer client_data,
-                                 XtPointer garbage)
+static void government_menu_callback(Widget w, XtPointer client_data,
+                                    XtPointer garbage)
 {
   size_t pane_num = (size_t)client_data;
 
   switch(pane_num) {
-  case MENU_KINGDOM_FIND_CITY:
+  case MENU_GOVERNMENT_FIND_CITY:
     popup_find_dialog();
     break;
-  case MENU_KINGDOM_RATES:
+  case MENU_GOVERNMENT_RATES:
     popup_rates_dialog();
     break;
-  case MENU_KINGDOM_WORKLISTS:
+  case MENU_GOVERNMENT_WORKLISTS:
     popup_worklists_dialog(game.player_ptr);
     break;
-  case MENU_KINGDOM_REVOLUTION:
+  case MENU_GOVERNMENT_REVOLUTION:
     popup_revolution_dialog();
     break;
   }
@@ -827,8 +827,8 @@
   create_menu(MENU_GAME, "gamemenu", 
              game_menu_entries, game_menu_callback, 
              parent_form);
-  create_menu(MENU_KINGDOM, "kingdommenu", 
-             kingdom_menu_entries, kingdom_menu_callback, 
+  create_menu(MENU_GOVERNMENT, "governmentmenu", 
+             government_menu_entries, government_menu_callback, 
              parent_form);
   create_menu(MENU_VIEW, "viewmenu", 
              view_menu_entries, view_menu_callback, 
Index: client/gui-xaw/menu.h
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-xaw/menu.h,v
retrieving revision 1.18
diff -u -r1.18 menu.h
--- client/gui-xaw/menu.h       17 May 2004 01:29:47 -0000      1.18
+++ client/gui-xaw/menu.h       23 Aug 2004 20:40:59 -0000
@@ -20,7 +20,7 @@
 /* Indices for the menus. */
 enum MenuIndex {
   MENU_GAME,
-  MENU_KINGDOM,   
+  MENU_GOVERNMENT,
   MENU_VIEW,
   MENU_ORDER,
   MENU_REPORT,
@@ -43,10 +43,10 @@
   MENU_GAME_DISCONNECT,
   MENU_GAME_QUIT,
 
-  MENU_KINGDOM_RATES,   
-  MENU_KINGDOM_FIND_CITY,
-  MENU_KINGDOM_WORKLISTS,
-  MENU_KINGDOM_REVOLUTION,
+  MENU_GOVERNMENT_RATES,
+  MENU_GOVERNMENT_FIND_CITY,
+  MENU_GOVERNMENT_WORKLISTS,
+  MENU_GOVERNMENT_REVOLUTION,
 
   MENU_VIEW_SHOW_MAP_GRID,
   MENU_VIEW_SHOW_NATIONAL_BORDERS,
Index: data/Freeciv
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/Freeciv,v
retrieving revision 1.213
diff -u -r1.213 Freeciv
--- data/Freeciv        17 May 2004 01:29:48 -0000      1.213
+++ data/Freeciv        23 Aug 2004 20:41:00 -0000
@@ -2023,15 +2023,15 @@
 ! menus
 !
 Freeciv*gamemenu.label:                 _("Game")
-Freeciv*kingdommenu.label:              _("Kingdom")
+Freeciv*governmentmenu.label:           _("Government")
 Freeciv*viewmenu.label:                 _("View")
 Freeciv*ordersmenu.label:               _("Orders")
 Freeciv*reportsmenu.label:              _("Reports")
 Freeciv*helpmenu.label:                 _("Help")
 Freeciv*gamemenu.background:            gray84
 Freeciv*gamemenu.foreground:            black
-Freeciv*kingdommenu.background:         gray84
-Freeciv*kingdommenu.foreground:         black
+Freeciv*governmentmenu.background:         gray84
+Freeciv*governmentmenu.foreground:         black
 Freeciv*viewmenu.background:            gray84
 Freeciv*viewmenu.foreground:            black
 Freeciv*ordersmenu.background:          gray84
@@ -2041,17 +2041,17 @@
 Freeciv*helpmenu.background:            gray84
 Freeciv*helpmenu.foreground:            black
 Freeciv*gamemenu.borderWidth:           0
-Freeciv*kingdommenu.borderWidth:        0
+Freeciv*governmentmenu.borderWidth:        0
 Freeciv*viewmenu.borderWidth:           0
 Freeciv*ordersmenu.borderWidth:         0
 Freeciv*reportsmenu.borderWidth:        0
 Freeciv*helpmenu.borderWidth:           0
 Freeciv*gamemenu.left:                  chainLeft
 Freeciv*gamemenu.right:                 chainLeft
-Freeciv*kingdommenu.fromHoriz:          gamemenu
-Freeciv*kingdommenu.left:               chainLeft
-Freeciv*kingdommenu.right:              chainLeft
-Freeciv*viewmenu.fromHoriz:             kingdommenu
+Freeciv*governmentmenu.fromHoriz:          gamemenu
+Freeciv*governmentmenu.left:               chainLeft
+Freeciv*governmentmenu.right:              chainLeft
+Freeciv*viewmenu.fromHoriz:             governmentmenu
 Freeciv*viewmenu.left:                  chainLeft
 Freeciv*viewmenu.right:                 chainLeft
 Freeciv*ordersmenu.fromHoriz:           viewmenu