Author: jtn
Date: Fri Dec 18 21:02:05 2015
New Revision: 31073

URL: http://svn.gna.org/viewcvs/freeciv?rev=31073&view=rev
Log:
Restore some key accelerators to the Gtk3 client that were lost in the
GtkBuilder migration.

See gna bug #24190.

Modified:
    trunk/client/gui-gtk-3.0/menu.c

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=31073&r1=31072&r2=31073&view=diff
==============================================================================
--- trunk/client/gui-gtk-3.0/menu.c     (original)
+++ trunk/client/gui-gtk-3.0/menu.c     Fri Dec 18 21:02:05 2015
@@ -251,11 +251,11 @@
   { "MENU_OPTIONS", N_("Options"), 0, 0, NULL, MGROUP_SAFE },
   { "MENU_EDIT", N_("Edit"), 0, 0, NULL, MGROUP_SAFE },
   { "MENU_VIEW", N_("?verb:View"), 0, 0, NULL, MGROUP_SAFE },
-  { "MENU_IMPROVEMENTS", N_("Improvements"), GDK_KEY_i, GDK_META_MASK,
+  { "MENU_IMPROVEMENTS", N_("Improvements"), 0, 0,
     NULL, MGROUP_SAFE },
-  { "MENU_CIVILIZATION", N_("Civilization"), GDK_KEY_z, GDK_META_MASK,
+  { "MENU_CIVILIZATION", N_("Civilization"), 0, 0,
     NULL, MGROUP_SAFE },
-  { "MENU_HELP", N_("Help"), GDK_KEY_h, GDK_META_MASK, NULL, MGROUP_SAFE },
+  { "MENU_HELP", N_("Help"), 0, 0, NULL, MGROUP_SAFE },
   { "CLEAR_CHAT_LOGS", N_("Clear Chat Log"), 0, 0,
     G_CALLBACK(clear_chat_logs_callback), MGROUP_SAFE },
   { "SAVE_CHAT_LOGS", N_("Save Chat Log"), 0, 0,
@@ -270,7 +270,7 @@
     G_CALLBACK(save_options_callback), MGROUP_SAFE },
   { "RELOAD_TILESET", N_("Reload Tileset"), GDK_KEY_r, GDK_META_MASK | 
GDK_CONTROL_MASK,
     G_CALLBACK(reload_tileset_callback), MGROUP_SAFE },
-  { "GAME_SAVE", N_("Save Game"), 0, 0,
+  { "GAME_SAVE", N_("Save Game"), GDK_KEY_s, GDK_CONTROL_MASK,
     G_CALLBACK(save_game_callback), MGROUP_SAFE },
   { "GAME_SAVE_AS", N_("Save Game As..."), 0, 0,
     G_CALLBACK(save_game_as_callback), MGROUP_SAFE },
@@ -279,7 +279,8 @@
   { "MAPIMG_SAVE_AS", N_("Save Map Image As..."), 0, 0,
     G_CALLBACK(save_mapimg_as_callback), MGROUP_SAFE },
   { "LEAVE", N_("Leave"), 0, 0, G_CALLBACK(leave_callback), MGROUP_SAFE },
-  { "QUIT", N_("Quit"), 0, 0, G_CALLBACK(quit_callback), MGROUP_SAFE },
+  { "QUIT", N_("Quit"), GDK_KEY_q, GDK_CONTROL_MASK,
+    G_CALLBACK(quit_callback), MGROUP_SAFE },
   { "FIND_CITY", N_("Find City"), GDK_KEY_f, GDK_CONTROL_MASK,
     G_CALLBACK(find_city_callback), MGROUP_SAFE },
   { "WORKLISTS", N_("Worklists"), GDK_KEY_l, GDK_CONTROL_MASK,
@@ -354,9 +355,9 @@
     G_CALLBACK(help_copying_callback), MGROUP_SAFE },
   { "HELP_ABOUT", N_("About Freeciv"), 0, 0,
     G_CALLBACK(help_about_callback), MGROUP_SAFE },
-  { "SAVE_OPTIONS_ON_EXIT", N_("Save Options on Exit"), GDK_KEY_e, 0,
+  { "SAVE_OPTIONS_ON_EXIT", N_("Save Options on Exit"), 0, 0,
     G_CALLBACK(save_options_on_exit_callback), MGROUP_SAFE },
-  { "EDIT_MODE", N_("Editing Mode"), 0, 0,
+  { "EDIT_MODE", N_("Editing Mode"), GDK_KEY_e, GDK_CONTROL_MASK,
     G_CALLBACK(edit_mode_callback), MGROUP_SAFE },
   { "SHOW_CITY_OUTLINES", N_("City Outlines"), GDK_KEY_y, GDK_CONTROL_MASK,
     G_CALLBACK(show_city_outlines_callback), MGROUP_SAFE },
@@ -366,11 +367,11 @@
     G_CALLBACK(show_map_grid_callback), MGROUP_SAFE },
   { "SHOW_NATIONAL_BORDERS", N_("National Borders"), GDK_KEY_b, 
GDK_CONTROL_MASK,
     G_CALLBACK(show_national_borders_callback), MGROUP_SAFE },
-  { "SHOW_NATIVE_TILES", N_("Native Tiles"), GDK_KEY_n, GDK_CONTROL_MASK,
+  { "SHOW_NATIVE_TILES", N_("Native Tiles"), GDK_KEY_n, GDK_CONTROL_MASK | 
GDK_SHIFT_MASK,
     G_CALLBACK(show_native_tiles_callback), MGROUP_SAFE },
   { "SHOW_CITY_FULL_BAR", N_("City Full Bar"), 0, 0,
     G_CALLBACK(show_city_full_bar_callback), MGROUP_SAFE },
-  { "SHOW_CITY_NAMES", N_("City Names"), GDK_KEY_n, 0,
+  { "SHOW_CITY_NAMES", N_("City Names"), GDK_KEY_n, GDK_CONTROL_MASK,
     G_CALLBACK(show_city_names_callback), MGROUP_SAFE },
   { "SHOW_CITY_GROWTH", N_("City Growth"), GDK_KEY_r, GDK_CONTROL_MASK,
     G_CALLBACK(show_city_growth_callback), MGROUP_SAFE },
@@ -413,9 +414,9 @@
   { "FULL_SCREEN", N_("Fullscreen"), GDK_KEY_KP_Enter, GDK_META_MASK,
     G_CALLBACK(full_screen_callback), MGROUP_SAFE },
 
-  { "RECALC_BORDERS", N_("Recalculate Borders"), GDK_KEY_b, 0,
+  { "RECALC_BORDERS", N_("Recalculate Borders"), 0, 0,
     G_CALLBACK(recalc_borders_callback), MGROUP_EDIT },
-  { "TOGGLE_FOG", N_("Toggle Fog of War"), GDK_KEY_w, 0,
+  { "TOGGLE_FOG", N_("Toggle Fog of War"), GDK_KEY_m, GDK_CONTROL_MASK,
     G_CALLBACK(toggle_fog_callback), MGROUP_EDIT },
   { "SCENARIO_PROPERTIES", N_("Game/Scenario Properties"), 0, 0,
     G_CALLBACK(scenario_properties_callback), MGROUP_EDIT },


_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

Reply via email to