Author: cazfi
Date: Sat Dec 12 10:07:15 2015
New Revision: 30955
URL: http://svn.gna.org/viewcvs/freeciv?rev=30955&view=rev
Log:
Update gtk-clients ruleset dependant menu entries on ruleset change.
See bug #24158
Modified:
trunk/client/gui-gtk-2.0/menu.c
trunk/client/gui-gtk-3.0/menu.c
Modified: trunk/client/gui-gtk-2.0/menu.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-2.0/menu.c?rev=30955&r1=30954&r2=30955&view=diff
==============================================================================
--- trunk/client/gui-gtk-2.0/menu.c (original)
+++ trunk/client/gui-gtk-2.0/menu.c Sat Dec 12 10:07:15 2015
@@ -1741,9 +1741,9 @@
/* Combat menu. */
{"FORTIFY", NULL, _("Fortify"),
"f", NULL, G_CALLBACK(fortify_callback)},
- {"BUILD_FORTRESS", NULL, Q_(terrain_control.gui_type_base0),
+ {"BUILD_FORTRESS", NULL, _("Build Fortress"),
"<Shift>f", NULL, G_CALLBACK(build_fortress_callback)},
- {"BUILD_AIRBASE", NULL, Q_(terrain_control.gui_type_base1),
+ {"BUILD_AIRBASE", NULL, _("Build Airbase"),
"<Shift>e", NULL, G_CALLBACK(build_airbase_callback)},
{"DO_PILLAGE", NULL, _("_Pillage"),
@@ -1751,7 +1751,7 @@
/* TRANS: Menu item to bring up the action selection dialog. */
{"DIPLOMAT_ACTION", NULL, _("_Do..."),
"d", NULL, G_CALLBACK(diplomat_action_callback)},
- {"EXPLODE_NUKE", NULL, action_get_ui_name(ACTION_NUKE),
+ {"EXPLODE_NUKE", NULL, _("Explode Nuke"),
"<Shift>n", NULL, G_CALLBACK(explode_nuke_callback)},
};
@@ -2496,6 +2496,8 @@
} else {
menus_rename(unit_group, "CLEAN_POLLUTION", _("Clean _Pollution"));
}
+
+ menus_rename(unit_group, "EXPLODE_NUKE", action_get_ui_name(ACTION_NUKE));
}
/**************************************************************************
@@ -2544,10 +2546,12 @@
return;
}
+ menus_rename(unit_group, "BUILD_FORTRESS",
Q_(terrain_control.gui_type_base0));
+ menus_rename(unit_group, "BUILD_AIRBASE",
Q_(terrain_control.gui_type_base1));
+
if ((menu = find_action_menu(playing_group, "MENU_GOVERNMENT"))) {
GList *list, *iter;
- GtkWidget *item, *image;
- struct sprite *gsprite;
+ GtkWidget *item;
char buf[256];
/* Remove previous government entries. */
@@ -2567,6 +2571,8 @@
governments_iterate(g) {
if (g != game.government_during_revolution) {
+ struct sprite *gsprite;
+
/* TRANS: %s is a government name */
fc_snprintf(buf, sizeof(buf), _("%s..."),
government_name_translation(g));
@@ -2574,6 +2580,8 @@
g_object_set_data(G_OBJECT(item), "government", g);
if ((gsprite = get_government_sprite(tileset, g))) {
+ GtkWidget *image;
+
image = gtk_image_new_from_pixbuf(sprite_get_pixbuf(gsprite));
gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), image);
gtk_widget_show(image);
Modified: trunk/client/gui-gtk-3.0/menu.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.0/menu.c?rev=30955&r1=30954&r2=30955&view=diff
==============================================================================
--- trunk/client/gui-gtk-3.0/menu.c (original)
+++ trunk/client/gui-gtk-3.0/menu.c Sat Dec 12 10:07:15 2015
@@ -2532,8 +2532,7 @@
if ((menu = find_menu("<MENU>/GOVERNMENT"))) {
GList *list, *iter;
- GtkWidget *item, *image;
- struct sprite *gsprite;
+ GtkWidget *item;
char buf[256];
/* Remove previous government entries. */
@@ -2553,6 +2552,8 @@
governments_iterate(g) {
if (g != game.government_during_revolution) {
+ struct sprite *gsprite;
+
/* TRANS: %s is a government name */
fc_snprintf(buf, sizeof(buf), _("%s..."),
government_name_translation(g));
@@ -2560,6 +2561,7 @@
g_object_set_data(G_OBJECT(item), "government", g);
if ((gsprite = get_government_sprite(tileset, g))) {
+ GtkWidget *image;
GdkPixbuf *pb = sprite_get_pixbuf(gsprite);
image = gtk_image_new_from_pixbuf(pb);
_______________________________________________
Freeciv-commits mailing list
[email protected]
https://mail.gna.org/listinfo/freeciv-commits
