Author: cazfi Date: Sat Dec 12 10:07:22 2015 New Revision: 30956 URL: http://svn.gna.org/viewcvs/freeciv?rev=30956&view=rev Log: Update gtk-clients ruleset dependant menu entries on ruleset change.
See bug #24158 Modified: branches/S2_6/client/gui-gtk-2.0/menu.c branches/S2_6/client/gui-gtk-3.0/menu.c Modified: branches/S2_6/client/gui-gtk-2.0/menu.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-2.0/menu.c?rev=30956&r1=30955&r2=30956&view=diff ============================================================================== --- branches/S2_6/client/gui-gtk-2.0/menu.c (original) +++ branches/S2_6/client/gui-gtk-2.0/menu.c Sat Dec 12 10:07:22 2015 @@ -1731,9 +1731,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"), @@ -2526,10 +2526,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. */ @@ -2549,6 +2551,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)); @@ -2556,6 +2560,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: branches/S2_6/client/gui-gtk-3.0/menu.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-3.0/menu.c?rev=30956&r1=30955&r2=30956&view=diff ============================================================================== --- branches/S2_6/client/gui-gtk-3.0/menu.c (original) +++ branches/S2_6/client/gui-gtk-3.0/menu.c Sat Dec 12 10:07:22 2015 @@ -1720,9 +1720,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"), @@ -2512,10 +2512,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. */ @@ -2535,6 +2537,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)); @@ -2542,6 +2546,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 Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits