[Freeciv-Dev] (PR#8537) Suggestion: better menu name for Kingdom?
[Top] [All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index] [Thread Index]
To: |
undisclosed-recipients: ; |
Subject: |
[Freeciv-Dev] (PR#8537) Suggestion: better menu name for Kingdom? |
From: |
"Mateusz Stefek" <mstefek@xxxxxxxxx> |
Date: |
Sat, 14 Aug 2004 00:01:44 -0700 |
Reply-to: |
rt@xxxxxxxxxxx |
<URL: http://rt.freeciv.org/Ticket/Display.html?id=8537 >
Here's gtk1 part. Can anyone make a patch for Win32?
Index: menu.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-gtk/menu.c,v
retrieving revision 1.84
diff -u -r1.84 menu.c
--- menu.c 17 May 2004 01:29:47 -0000 1.84
+++ menu.c 14 Aug 2004 06:58:34 -0000
@@ -76,10 +76,10 @@
MENU_GAME_DISCONNECT,
MENU_GAME_QUIT,
- MENU_KINGDOM_TAX_RATE,
- MENU_KINGDOM_FIND_CITY,
- MENU_KINGDOM_WORKLISTS,
- MENU_KINGDOM_REVOLUTION,
+ MENU_GOVERNMENT_TAX_RATE,
+ MENU_GOVERNMENT_FIND_CITY,
+ MENU_GOVERNMENT_WORKLISTS,
+ MENU_GOVERNMENT_REVOLUTION,
MENU_VIEW_SHOW_MAP_GRID,
MENU_VIEW_SHOW_NATIONAL_BORDERS,
@@ -204,20 +204,20 @@
/****************************************************************
...
*****************************************************************/
-static void kingdom_menu_callback(gpointer callback_data,
+static void government_menu_callback(gpointer callback_data,
guint callback_action, GtkWidget *widget)
{
switch(callback_action) {
- case MENU_KINGDOM_TAX_RATE:
+ case MENU_GOVERNMENT_TAX_RATE:
popup_rates_dialog();
break;
- case MENU_KINGDOM_FIND_CITY:
+ case MENU_GOVERNMENT_FIND_CITY:
popup_find_dialog();
break;
- case MENU_KINGDOM_WORKLISTS:
+ case MENU_GOVERNMENT_WORKLISTS:
popup_worklists_report(game.player_ptr);
break;
- case MENU_KINGDOM_REVOLUTION:
+ case MENU_GOVERNMENT_REVOLUTION:
popup_revolution_dialog();
break;
}
@@ -611,27 +611,27 @@
game_menu_callback, MENU_GAME_DISCONNECT
},
{ "/" N_("Game") "/" N_("_Quit"), "<control>q",
gtk_main_quit, 0
},
- /* Kingdom menu ... */
- { "/" N_("_Kingdom"), NULL,
+ /* Government menu ... */
+ { "/" N_("_Government"), NULL,
NULL, 0,
"<Branch>" },
- { "/" N_("Kingdom") "/tearoff1", NULL,
+ { "/" N_("Government") "/tearoff1", NULL,
NULL, 0,
"<Tearoff>" },
- { "/" N_("Kingdom") "/" N_("_Tax Rates"), "<shift>t",
- kingdom_menu_callback, MENU_KINGDOM_TAX_RATE
},
- { "/" N_("Kingdom") "/sep1", NULL,
+ { "/" N_("Government") "/" N_("_Tax Rates"), "<shift>t",
+ government_menu_callback,MENU_GOVERNMENT_TAX_RATE
},
+ { "/" N_("Governemt") "/sep1", NULL,
NULL, 0,
"<Separator>" },
- { "/" N_("Kingdom") "/" N_("_Find City"), "<shift>f",
- kingdom_menu_callback, MENU_KINGDOM_FIND_CITY
},
- { "/" N_("Kingdom") "/" N_("Work_lists"), "<shift>l",
- kingdom_menu_callback, MENU_KINGDOM_WORKLISTS
},
- { "/" N_("Kingdom") "/sep2", NULL,
+ { "/" N_("Government") "/" N_("_Find City"), "<shift>f",
+ government_menu_callback,MENU_GOVERNMENT_FIND_CITY
},
+ { "/" N_("Government") "/" N_("Work_lists"), "<shift>l",
+ government_menu_callback,MENU_GOVERNMENT_WORKLISTS
},
+ { "/" N_("Government") "/sep2", NULL,
NULL, 0,
"<Separator>" },
- { "/" N_("Kingdom") "/" N_("_Government"), NULL,
+ { "/" N_("Government") "/" N_("_Change Government"), NULL,
NULL, 0, "<Branch>" },
- { "/" N_("Kingdom") "/" N_("_Government") "/" N_("_Revolution!"),
+ { "/" N_("Government") "/" N_("_Change Government") "/" N_("_Revolution!"),
"<shift>r",
- kingdom_menu_callback, MENU_KINGDOM_REVOLUTION },
- { "/" N_("_Kingdom") "/" N_("_Government") "/sep1", NULL,
+ government_menu_callback, MENU_GOVERNMENT_REVOLUTION },
+ { "/" N_("_Government") "/" N_("_Change Government") "/sep1", NULL,
NULL, 0, "<Separator>" },
/* View menu ... */
{ "/" N_("_View"), NULL,
@@ -1029,14 +1029,14 @@
{
if (!can_client_change_view()) {
menus_set_sensitive("<main>/_Reports", FALSE);
- menus_set_sensitive("<main>/_Kingdom", FALSE);
+ menus_set_sensitive("<main>/_Government", FALSE);
menus_set_sensitive("<main>/_View", FALSE);
menus_set_sensitive("<main>/_Orders", FALSE);
} else {
struct unit *punit;
GtkWidget *item;
const char *path =
- translate_menu_path("<main>/_Kingdom/_Government", TRUE);
+ translate_menu_path("<main>/_Government/_Change Government", TRUE);
GtkWidget *parent = gtk_item_factory_get_widget(item_factory, path);
if (parent) {
@@ -1073,15 +1073,15 @@
}
menus_set_sensitive("<main>/_Reports", TRUE);
- menus_set_sensitive("<main>/_Kingdom", TRUE);
+ menus_set_sensitive("<main>/_Government", TRUE);
menus_set_sensitive("<main>/_View", TRUE);
menus_set_sensitive("<main>/_Orders", can_client_issue_orders());
- menus_set_sensitive("<main>/_Kingdom/_Tax Rates",
+ menus_set_sensitive("<main>/_Government/_Tax Rates",
can_client_issue_orders());
- menus_set_sensitive("<main>/_Kingdom/Work_lists",
+ menus_set_sensitive("<main>/_Government/Work_lists",
can_client_issue_orders());
- menus_set_sensitive("<main>/_Kingdom/_Government",
+ menus_set_sensitive("<main>/_Government/_Change Government",
can_client_issue_orders());
menus_set_sensitive("<main>/_Reports/S_paceship",
|
|