From 07dc9c165dfcc30fe3cd44f5e649f087e9e5baae Mon Sep 17 00:00:00 2001 From: Dino Date: Sun, 13 Apr 2025 22:36:52 -0400 Subject: [PATCH] #1292 Mac - use meta/command key instead of ctrl key for menu accelerator keys. --- client/gui-gtk-3.22/menu.c | 76 +++++++++++++++++++++----------------- client/gui-gtk-4.0/menu.c | 66 ++++++++++++++++++--------------- 2 files changed, 79 insertions(+), 63 deletions(-) diff --git a/client/gui-gtk-3.22/menu.c b/client/gui-gtk-3.22/menu.c index 1c38e2c501..6097872ba7 100644 --- a/client/gui-gtk-3.22/menu.c +++ b/client/gui-gtk-3.22/menu.c @@ -74,6 +74,14 @@ #define GTK_STOCK_EDIT NULL #endif +/* Mac uses "command"/"meta" key for menu accelerator modifier key */ +#ifdef __APPLE__ +#define ACCL_MOD_KEY GDK_META_MASK +#else +#define ACCL_MOD_KEY GDK_CONTROL_MASK +#endif + + static GtkBuilder *ui_builder = NULL; static void menu_entry_set_active(const char *key, @@ -290,9 +298,9 @@ static struct menu_entry_info menu_entries[] = { "SAVE_OPTIONS", N_("Save Options _Now"), 0, 0, G_CALLBACK(save_options_callback), MGROUP_SAFE }, { "RELOAD_TILESET", N_("_Reload Tileset"), - GDK_KEY_r, GDK_MOD1_MASK | GDK_CONTROL_MASK, + GDK_KEY_r, GDK_MOD1_MASK | ACCL_MOD_KEY, G_CALLBACK(reload_tileset_callback), MGROUP_SAFE }, - { "GAME_SAVE", N_("_Save Game"), GDK_KEY_s, GDK_CONTROL_MASK, + { "GAME_SAVE", N_("_Save Game"), GDK_KEY_s, ACCL_MOD_KEY, G_CALLBACK(save_game_callback), MGROUP_SAFE }, { "GAME_SAVE_AS", N_("Save Game _As..."), 0, 0, G_CALLBACK(save_game_as_callback), MGROUP_SAFE }, @@ -301,18 +309,18 @@ static struct menu_entry_info menu_entries[] = { "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"), GDK_KEY_q, GDK_CONTROL_MASK, + { "QUIT", N_("_Quit"), GDK_KEY_q, ACCL_MOD_KEY, G_CALLBACK(quit_callback), MGROUP_SAFE }, - { "FIND_CITY", N_("_Find City"), GDK_KEY_f, GDK_CONTROL_MASK, + { "FIND_CITY", N_("_Find City"), GDK_KEY_f, ACCL_MOD_KEY, G_CALLBACK(find_city_callback), MGROUP_SAFE }, { "WORKLISTS", N_("Work_lists"), - GDK_KEY_l, GDK_CONTROL_MASK | GDK_SHIFT_MASK, + GDK_KEY_l, ACCL_MOD_KEY | GDK_SHIFT_MASK, G_CALLBACK(worklists_callback), MGROUP_SAFE }, { "RALLY_DLG", N_("Rally point dialog"), - GDK_KEY_r, GDK_CONTROL_MASK | GDK_SHIFT_MASK, + GDK_KEY_r, ACCL_MOD_KEY | GDK_SHIFT_MASK, G_CALLBACK(rally_dialog_callback), MGROUP_SAFE }, { "INFRA_DLG", N_("Infra dialog"), - GDK_KEY_f, GDK_CONTROL_MASK | GDK_SHIFT_MASK, + GDK_KEY_f, ACCL_MOD_KEY | GDK_SHIFT_MASK, G_CALLBACK(infra_dialog_callback), MGROUP_SAFE }, { "CLIENT_LUA_SCRIPT", N_("Client _Lua Script"), 0, 0, G_CALLBACK(client_lua_script_callback), MGROUP_SAFE }, @@ -339,37 +347,37 @@ static struct menu_entry_info menu_entries[] = GDK_KEY_F1, GDK_SHIFT_MASK, G_CALLBACK(bg_select0_callback), MGROUP_SAFE }, { "BATTLE_GROUP_ASSIGN_0", N_("Assign Battle Group 1"), - GDK_KEY_F1, GDK_CONTROL_MASK, + GDK_KEY_F1, ACCL_MOD_KEY, G_CALLBACK(bg_assign0_callback), MGROUP_SAFE }, { "BATTLE_GROUP_APPEND_0", N_("Append to Battle Group 1"), - GDK_KEY_F1, GDK_SHIFT_MASK | GDK_CONTROL_MASK, + GDK_KEY_F1, GDK_SHIFT_MASK | ACCL_MOD_KEY, G_CALLBACK(bg_append0_callback), MGROUP_SAFE }, { "BATTLE_GROUP_SELECT_1", N_("Select Battle Group 2"), GDK_KEY_F2, GDK_SHIFT_MASK, G_CALLBACK(bg_select1_callback), MGROUP_SAFE }, { "BATTLE_GROUP_ASSIGN_1", N_("Assign Battle Group 2"), - GDK_KEY_F2, GDK_CONTROL_MASK, + GDK_KEY_F2, ACCL_MOD_KEY, G_CALLBACK(bg_assign1_callback), MGROUP_SAFE }, { "BATTLE_GROUP_APPEND_1", N_("Append to Battle Group 2"), - GDK_KEY_F2, GDK_SHIFT_MASK | GDK_CONTROL_MASK, + GDK_KEY_F2, GDK_SHIFT_MASK | ACCL_MOD_KEY, G_CALLBACK(bg_append1_callback), MGROUP_SAFE }, { "BATTLE_GROUP_SELECT_2", N_("Select Battle Group 3"), GDK_KEY_F3, GDK_SHIFT_MASK, G_CALLBACK(bg_select2_callback), MGROUP_SAFE }, { "BATTLE_GROUP_ASSIGN_2", N_("Assign Battle Group 3"), - GDK_KEY_F3, GDK_CONTROL_MASK, + GDK_KEY_F3, ACCL_MOD_KEY, G_CALLBACK(bg_assign2_callback), MGROUP_SAFE }, { "BATTLE_GROUP_APPEND_2", N_("Append to Battle Group 3"), - GDK_KEY_F3, GDK_SHIFT_MASK | GDK_CONTROL_MASK, + GDK_KEY_F3, GDK_SHIFT_MASK | ACCL_MOD_KEY, G_CALLBACK(bg_append2_callback), MGROUP_SAFE }, { "BATTLE_GROUP_SELECT_3", N_("Select Battle Group 4"), GDK_KEY_F4, GDK_SHIFT_MASK, G_CALLBACK(bg_select3_callback), MGROUP_SAFE }, { "BATTLE_GROUP_ASSIGN_3", N_("Assign Battle Group 4"), - GDK_KEY_F4, GDK_CONTROL_MASK, + GDK_KEY_F4, ACCL_MOD_KEY, G_CALLBACK(bg_assign3_callback), MGROUP_SAFE }, { "BATTLE_GROUP_APPEND_3", N_("Append to Battle Group 4"), - GDK_KEY_F4, GDK_SHIFT_MASK | GDK_CONTROL_MASK, + GDK_KEY_F4, GDK_SHIFT_MASK | ACCL_MOD_KEY, G_CALLBACK(bg_append3_callback), MGROUP_SAFE }, { "HELP_OVERVIEW", N_("?help:Overview"), 0, 0, @@ -426,29 +434,29 @@ static struct menu_entry_info menu_entries[] = G_CALLBACK(help_about_callback), MGROUP_SAFE }, { "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"), GDK_KEY_e, GDK_CONTROL_MASK, + { "EDIT_MODE", N_("_Editing Mode"), GDK_KEY_e, ACCL_MOD_KEY, G_CALLBACK(edit_mode_callback), MGROUP_SAFE }, - { "SHOW_CITY_OUTLINES", N_("Cit_y Outlines"), GDK_KEY_y, GDK_CONTROL_MASK, + { "SHOW_CITY_OUTLINES", N_("Cit_y Outlines"), GDK_KEY_y, ACCL_MOD_KEY, G_CALLBACK(show_city_outlines_callback), MGROUP_SAFE }, - { "SHOW_CITY_OUTPUT", N_("City Output"), GDK_KEY_v, GDK_CONTROL_MASK, + { "SHOW_CITY_OUTPUT", N_("City Output"), GDK_KEY_v, ACCL_MOD_KEY, G_CALLBACK(show_city_output_callback), MGROUP_SAFE }, - { "SHOW_MAP_GRID", N_("Map _Grid"), GDK_KEY_g, GDK_CONTROL_MASK, + { "SHOW_MAP_GRID", N_("Map _Grid"), GDK_KEY_g, ACCL_MOD_KEY, G_CALLBACK(show_map_grid_callback), MGROUP_SAFE }, - { "SHOW_NATIONAL_BORDERS", N_("National _Borders"), GDK_KEY_b, GDK_CONTROL_MASK, + { "SHOW_NATIONAL_BORDERS", N_("National _Borders"), GDK_KEY_b, ACCL_MOD_KEY, G_CALLBACK(show_national_borders_callback), MGROUP_SAFE }, - { "SHOW_NATIVE_TILES", N_("Native Tiles"), GDK_KEY_n, GDK_CONTROL_MASK | GDK_SHIFT_MASK, + { "SHOW_NATIVE_TILES", N_("Native Tiles"), GDK_KEY_n, ACCL_MOD_KEY | 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, GDK_CONTROL_MASK, + { "SHOW_CITY_NAMES", N_("City _Names"), GDK_KEY_n, ACCL_MOD_KEY, G_CALLBACK(show_city_names_callback), MGROUP_SAFE }, - { "SHOW_CITY_GROWTH", N_("City G_rowth"), GDK_KEY_o, GDK_CONTROL_MASK, + { "SHOW_CITY_GROWTH", N_("City G_rowth"), GDK_KEY_o, ACCL_MOD_KEY, G_CALLBACK(show_city_growth_callback), MGROUP_SAFE }, - { "SHOW_CITY_PRODUCTIONS", N_("City _Production"), GDK_KEY_p, GDK_CONTROL_MASK, + { "SHOW_CITY_PRODUCTIONS", N_("City _Production"), GDK_KEY_p, ACCL_MOD_KEY, G_CALLBACK(show_city_productions_callback), MGROUP_SAFE }, { "SHOW_CITY_BUY_COST", N_("City Buy Cost"), 0, 0, G_CALLBACK(show_city_buy_cost_callback), MGROUP_SAFE }, - { "SHOW_CITY_TRADE_ROUTES", N_("City Tra_deroutes"), GDK_KEY_d, GDK_CONTROL_MASK, + { "SHOW_CITY_TRADE_ROUTES", N_("City Tra_deroutes"), GDK_KEY_d, ACCL_MOD_KEY, G_CALLBACK(show_city_trade_routes_callback), MGROUP_SAFE }, { "SHOW_TERRAIN", N_("_Terrain"), 0, 0, G_CALLBACK(show_terrain_callback), MGROUP_SAFE }, @@ -477,7 +485,7 @@ static struct menu_entry_info menu_entries[] = { "SHOW_UNIT_SHIELDS", N_("Unit shields"), 0, 0, G_CALLBACK(show_unit_shields_callback), MGROUP_SAFE }, { "SHOW_STACK_SIZE", N_("Unit Stack Size"), - GDK_KEY_plus, GDK_CONTROL_MASK, + GDK_KEY_plus, ACCL_MOD_KEY, G_CALLBACK(show_stack_size_callback), MGROUP_SAFE }, { "SHOW_FOCUS_UNIT", N_("Focu_s Unit"), 0, 0, G_CALLBACK(show_focus_unit_callback), MGROUP_SAFE }, @@ -489,7 +497,7 @@ static struct menu_entry_info menu_entries[] = { "RECALC_BORDERS", N_("Recalculate _Borders"), 0, 0, G_CALLBACK(recalc_borders_callback), MGROUP_EDIT }, { "TOGGLE_FOG", N_("Toggle Fog of _War"), GDK_KEY_w, - GDK_CONTROL_MASK | GDK_SHIFT_MASK, + ACCL_MOD_KEY | GDK_SHIFT_MASK, G_CALLBACK(toggle_fog_callback), MGROUP_EDIT }, { "SCENARIO_PROPERTIES", N_("Game/Scenario Properties"), 0, 0, G_CALLBACK(scenario_properties_callback), MGROUP_EDIT }, @@ -503,7 +511,7 @@ static struct menu_entry_info menu_entries[] = { "REPORT_RESEARCH", N_("_Research"), GDK_KEY_F6, 0, G_CALLBACK(report_research_callback), MGROUP_PLAYER }, { "POLICIES", N_("_Policies..."), - GDK_KEY_p, GDK_SHIFT_MASK | GDK_CONTROL_MASK, + GDK_KEY_p, GDK_SHIFT_MASK | ACCL_MOD_KEY, G_CALLBACK(multiplier_callback), MGROUP_PLAYER }, { "REPORT_SPACESHIP", N_("_Spaceship"), GDK_KEY_F12, 0, G_CALLBACK(report_spaceship_callback), MGROUP_PLAYER }, @@ -578,14 +586,14 @@ static struct menu_entry_info menu_entries[] = G_CALLBACK(build_mine_callback), MGROUP_UNIT }, { "PLANT", N_("Plant"), GDK_KEY_m, GDK_SHIFT_MASK, G_CALLBACK(plant_callback), MGROUP_UNIT }, - { "CONNECT_ROAD", N_("Connect With Roa_d"), GDK_KEY_r, GDK_CONTROL_MASK, + { "CONNECT_ROAD", N_("Connect With Roa_d"), GDK_KEY_r, ACCL_MOD_KEY, G_CALLBACK(connect_road_callback), MGROUP_UNIT }, - { "CONNECT_RAIL", N_("Connect With Rai_l"), GDK_KEY_l, GDK_CONTROL_MASK, + { "CONNECT_RAIL", N_("Connect With Rai_l"), GDK_KEY_l, ACCL_MOD_KEY, G_CALLBACK(connect_rail_callback), MGROUP_UNIT }, - { "CONNECT_MAGLEV", N_("Connect With _Maglev"), GDK_KEY_m, GDK_CONTROL_MASK, + { "CONNECT_MAGLEV", N_("Connect With _Maglev"), GDK_KEY_m, ACCL_MOD_KEY, G_CALLBACK(connect_maglev_callback), MGROUP_UNIT }, { "CONNECT_IRRIGATION", N_("Connect With Irri_gation"), - GDK_KEY_i, GDK_CONTROL_MASK, + GDK_KEY_i, ACCL_MOD_KEY, G_CALLBACK(connect_irrigation_callback), MGROUP_UNIT }, { "TRANSFORM_TERRAIN", N_("Transf_orm Terrain"), GDK_KEY_o, 0, G_CALLBACK(transform_terrain_callback), MGROUP_UNIT }, @@ -608,10 +616,10 @@ static struct menu_entry_info menu_entries[] = { "MENU_GOVERNMENT", N_("_Government"), 0, 0, NULL, MGROUP_PLAYING }, - { "TAX_RATE", N_("_Tax Rates..."), GDK_KEY_t, GDK_CONTROL_MASK, + { "TAX_RATE", N_("_Tax Rates..."), GDK_KEY_t, ACCL_MOD_KEY, G_CALLBACK(tax_rate_callback), MGROUP_PLAYING }, { "START_REVOLUTION", N_("_Revolution..."), - GDK_KEY_g, GDK_SHIFT_MASK | GDK_CONTROL_MASK, + GDK_KEY_g, GDK_SHIFT_MASK | ACCL_MOD_KEY, G_CALLBACK(government_callback), MGROUP_PLAYING }, { NULL } }; diff --git a/client/gui-gtk-4.0/menu.c b/client/gui-gtk-4.0/menu.c index e94739a9af..db43d5f0c0 100644 --- a/client/gui-gtk-4.0/menu.c +++ b/client/gui-gtk-4.0/menu.c @@ -70,6 +70,14 @@ #include "menu.h" +/* Mac uses "command"/"meta" key for menu accelerator modifier key */ +#ifdef __APPLE__ +#define ACCL_MOD_KEY "" +#else +#define ACCL_MOD_KEY "" +#endif + + static GMenu *main_menubar = NULL; static bool menus_built = FALSE; @@ -553,12 +561,12 @@ static struct menu_entry_info menu_entries[] = #ifdef FREECIV_DEBUG { "RELOAD_TILESET", N_("_Reload Tileset"), - "reload_tileset", "r", MGROUP_SAFE, + "reload_tileset", ACCL_MOD_KEY"r", MGROUP_SAFE, NULL, FALSE }, #endif /* FREECIV_DEBUG */ { "GAME_SAVE", N_("_Save Game"), - "game_save", "s", MGROUP_SAFE, + "game_save", ACCL_MOD_KEY"s", MGROUP_SAFE, NULL, FALSE }, { "GAME_SAVE_AS", N_("Save Game _As..."), "game_save_as", NULL, MGROUP_SAFE, @@ -573,27 +581,27 @@ static struct menu_entry_info menu_entries[] = "leave", NULL, MGROUP_SAFE, NULL, FALSE }, { "QUIT", N_("_Quit"), - "quit", "q", MGROUP_SAFE, + "quit", ACCL_MOD_KEY"q", MGROUP_SAFE, NULL, FALSE }, /* Edit menu */ { "FIND_CITY", N_("_Find City"), - "find_city", "f", MGROUP_SAFE, + "find_city", ACCL_MOD_KEY"f", MGROUP_SAFE, NULL, FALSE }, { "WORKLISTS", N_("Work_lists"), - "worklists", "l", MGROUP_SAFE, + "worklists", ACCL_MOD_KEY"l", MGROUP_SAFE, NULL, FALSE }, { "RALLY_DLG", N_("Rally point dialog"), - "rally_dlg", "r", MGROUP_SAFE, + "rally_dlg", ACCL_MOD_KEY"r", MGROUP_SAFE, NULL, FALSE }, { "INFRA_DLG", N_("Infra dialog"), - "infra_dlg", "f", MGROUP_SAFE, + "infra_dlg", ACCL_MOD_KEY"f", MGROUP_SAFE, NULL, FALSE }, { "EDIT_MODE", N_("_Editing Mode"), - "edit_mode", "e", MGROUP_SAFE, + "edit_mode", ACCL_MOD_KEY"e", MGROUP_SAFE, edit_mode_callback, FALSE }, { "TOGGLE_FOG", N_("Toggle Fog of _War"), - "toggle_fog", "w", MGROUP_EDIT, + "toggle_fog", ACCL_MOD_KEY"w", MGROUP_EDIT, toggle_fog_callback, FALSE }, { "SCENARIO_PROPERTIES", N_("Game/Scenario Properties"), "scenario_props", NULL, MGROUP_EDIT, @@ -607,37 +615,37 @@ static struct menu_entry_info menu_entries[] = /* View menu */ { "SHOW_CITY_OUTLINES", N_("Cit_y Outlines"), - "show_city_outlines", "y", MGROUP_SAFE, + "show_city_outlines", ACCL_MOD_KEY"y", MGROUP_SAFE, show_city_outlines_callback, FALSE }, { "SHOW_CITY_OUTPUT", N_("City Output"), - "show_city_output", "v", MGROUP_SAFE, + "show_city_output", ACCL_MOD_KEY"v", MGROUP_SAFE, show_city_output_callback, FALSE }, { "SHOW_MAP_GRID", N_("Map _Grid"), - "show_map_grid", "g", MGROUP_SAFE, + "show_map_grid", ACCL_MOD_KEY"g", MGROUP_SAFE, show_map_grid_callback, FALSE }, { "SHOW_NAT_BORDERS", N_("National _Borders"), - "show_nat_borders", "b", MGROUP_SAFE, + "show_nat_borders", ACCL_MOD_KEY"b", MGROUP_SAFE, show_national_borders_callback, FALSE }, { "SHOW_NATIVE_TILES", N_("Native Tiles"), - "show_native_tiles", "n", MGROUP_SAFE, + "show_native_tiles", ACCL_MOD_KEY"n", MGROUP_SAFE, show_native_tiles_callback, FALSE }, { "SHOW_CITY_FULL_BAR", N_("City Full Bar"), "show_city_full_bar", NULL, MGROUP_SAFE, show_city_full_bar_callback, FALSE }, { "SHOW_CITY_NAMES", N_("City _Names"), - "show_city_names", "n", MGROUP_SAFE, + "show_city_names", ACCL_MOD_KEY"n", MGROUP_SAFE, show_city_names_callback, FALSE }, { "SHOW_CITY_GROWTH", N_("City G_rowth"), - "show_city_growth", "o", MGROUP_SAFE, + "show_city_growth", ACCL_MOD_KEY"o", MGROUP_SAFE, show_city_growth_callback, FALSE }, { "SHOW_CITY_PRODUCTIONS", N_("City _Production"), - "show_city_productions", "p", MGROUP_SAFE, + "show_city_productions", ACCL_MOD_KEY"p", MGROUP_SAFE, show_city_productions_callback, FALSE }, { "SHOW_CITY_BUY_COST", N_("City Buy Cost"), "show_city_buy_cost", NULL, MGROUP_SAFE, show_city_buy_cost_callback, FALSE }, { "SHOW_CITY_TRADE_ROUTES", N_("City Tra_deroutes"), - "show_trade_routes", "d", MGROUP_SAFE, + "show_trade_routes", ACCL_MOD_KEY"d", MGROUP_SAFE, show_city_trade_routes_callback, FALSE }, { "SHOW_TERRAIN", N_("_Terrain"), "show_terrain", NULL, MGROUP_SAFE, @@ -679,7 +687,7 @@ static struct menu_entry_info menu_entries[] = "show_unit_shields", NULL, MGROUP_SAFE, show_unit_shields_callback, FALSE }, { "SHOW_STACK_SIZE", N_("Unit Stack Size"), - "show_stack_size", "plus", MGROUP_SAFE, + "show_stack_size", ACCL_MOD_KEY"plus", MGROUP_SAFE, show_stack_size_callback, FALSE }, { "SHOW_FOCUS_UNIT", N_("Focu_s Unit"), "show_focus_unit", NULL, MGROUP_SAFE, @@ -689,7 +697,7 @@ static struct menu_entry_info menu_entries[] = show_fog_of_war_callback, FALSE }, { "FULL_SCREEN", N_("_Fullscreen"), - "full_screen", "F11", MGROUP_SAFE, + "full_screen", ACCL_MOD_KEY"F11", MGROUP_SAFE, full_screen_callback, FALSE }, { "CENTER_VIEW", N_("_Center View"), "center_view", "c", MGROUP_PLAYER, @@ -794,16 +802,16 @@ static struct menu_entry_info menu_entries[] = "transform_terrain", "o", MGROUP_UNIT, NULL, FALSE }, { "CONNECT_ROAD", N_("Connect With Roa_d"), - "connect_road", "r", MGROUP_UNIT, + "connect_road", ACCL_MOD_KEY"r", MGROUP_UNIT, NULL, FALSE }, { "CONNECT_RAIL", N_("Connect With Rai_l"), - "connect_rail", "l", MGROUP_UNIT, + "connect_rail", ACCL_MOD_KEY"l", MGROUP_UNIT, NULL, FALSE }, { "CONNECT_MAGLEV", N_("Connect With _Maglev"), - "connect_maglev", "m", MGROUP_UNIT, + "connect_maglev", ACCL_MOD_KEY"m", MGROUP_UNIT, NULL, FALSE }, { "CONNECT_IRRIGATION", N_("Connect With Irri_gation"), - "connect_irrigation", "i", MGROUP_UNIT, + "connect_irrigation", ACCL_MOD_KEY"i", MGROUP_UNIT, NULL, FALSE }, { "CLEAN", N_("_Clean"), "clean", "p", MGROUP_UNIT, @@ -847,7 +855,7 @@ static struct menu_entry_info menu_entries[] = NULL, FALSE }, { "TAX_RATES", N_("_Tax Rates..."), - "tax_rates", "t", MGROUP_PLAYING, + "tax_rates", ACCL_MOD_KEY"t", MGROUP_PLAYING, NULL, FALSE }, { "POLICIES", N_("_Policies..."), "policies", "p", MGROUP_PLAYER, @@ -881,7 +889,7 @@ static struct menu_entry_info menu_entries[] = "bg_select_0", "F1", MGROUP_PLAYING, NULL, FALSE }, { "BG_ASSIGN_1", N_("Assign Battle Group 1"), - "bg_assign_0", "F1", MGROUP_PLAYING, + "bg_assign_0", ACCL_MOD_KEY"F1", MGROUP_PLAYING, NULL, FALSE }, { "BG_APPEND_1", N_("Append to Battle Group 1"), "bg_append_0", "F1", MGROUP_PLAYING, @@ -890,7 +898,7 @@ static struct menu_entry_info menu_entries[] = "bg_select_1", "F2", MGROUP_PLAYING, NULL, FALSE }, { "BG_ASSIGN_2", N_("Assign Battle Group 2"), - "bg_assign_1", "F2", MGROUP_PLAYING, + "bg_assign_1", ACCL_MOD_KEY"F2", MGROUP_PLAYING, NULL, FALSE }, { "BG_APPEND_2", N_("Append to Battle Group 2"), "bg_append_1", "F2", MGROUP_PLAYING, @@ -899,7 +907,7 @@ static struct menu_entry_info menu_entries[] = "bg_select_2", "F3", MGROUP_PLAYING, NULL, FALSE }, { "BG_ASSIGN_3", N_("Assign Battle Group 3"), - "bg_assign_2", "F3", MGROUP_PLAYING, + "bg_assign_2", ACCL_MOD_KEY"F3", MGROUP_PLAYING, NULL, FALSE }, { "BG_APPEND_3", N_("Append to Battle Group 3"), "bg_append_2", "F3", MGROUP_PLAYING, @@ -908,7 +916,7 @@ static struct menu_entry_info menu_entries[] = "bg_select_3", "F4", MGROUP_PLAYING, NULL, FALSE }, { "BG_ASSIGN_4", N_("Assign Battle Group 4"), - "bg_assign_3", "F4", MGROUP_PLAYING, + "bg_assign_3", ACCL_MOD_KEY"F4", MGROUP_PLAYING, NULL, FALSE }, { "BG_APPEND_4", N_("Append to Battle Group 4"), "bg_append_3", "F4", MGROUP_PLAYING, -- 2.31.0