Project

General

Profile

Feature #1292 » 1292-gtk5.patch

Dean Brown, 04/16/2025 01:57 AM

View differences:

client/gui-gtk-5.0/menu.c
#include "menu.h"
/* Mac uses "command"/"meta" key for menu accelerator modifier key */
#ifdef __APPLE__
#define ACCL_MOD_KEY "<Meta>"
#else
#define ACCL_MOD_KEY "<ctrl>"
#endif
static GMenu *main_menubar = NULL;
static bool menus_built = FALSE;
......
#ifdef FREECIV_DEBUG
{ "RELOAD_TILESET", N_("_Reload Tileset"),
"reload_tileset", "<ctrl><alt>r", MGROUP_SAFE,
"reload_tileset", ACCL_MOD_KEY"<alt>r", MGROUP_SAFE,
NULL, FALSE },
#endif /* FREECIV_DEBUG */
{ "GAME_SAVE", N_("_Save Game"),
"game_save", "<ctrl>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,
......
"leave", NULL, MGROUP_SAFE,
NULL, FALSE },
{ "QUIT", N_("_Quit"),
"quit", "<ctrl>q", MGROUP_SAFE,
"quit", ACCL_MOD_KEY"q", MGROUP_SAFE,
NULL, FALSE },
/* Edit menu */
{ "FIND_CITY", N_("_Find City"),
"find_city", "<ctrl>f", MGROUP_SAFE,
"find_city", ACCL_MOD_KEY"f", MGROUP_SAFE,
NULL, FALSE },
{ "WORKLISTS", N_("Work_lists"),
"worklists", "<ctrl><shift>l", MGROUP_SAFE,
"worklists", ACCL_MOD_KEY"<shift>l", MGROUP_SAFE,
NULL, FALSE },
{ "RALLY_DLG", N_("Rally point dialog"),
"rally_dlg", "<ctrl><shift>r", MGROUP_SAFE,
"rally_dlg", ACCL_MOD_KEY"<shift>r", MGROUP_SAFE,
NULL, FALSE },
{ "INFRA_DLG", N_("Infra dialog"),
"infra_dlg", "<ctrl><shift>f", MGROUP_SAFE,
"infra_dlg", ACCL_MOD_KEY"<shift>f", MGROUP_SAFE,
NULL, FALSE },
{ "EDIT_MODE", N_("_Editing Mode"),
"edit_mode", "<ctrl>e", MGROUP_SAFE,
"edit_mode", ACCL_MOD_KEY"e", MGROUP_SAFE,
edit_mode_callback, FALSE },
{ "TOGGLE_FOG", N_("Toggle Fog of _War"),
"toggle_fog", "<ctrl><shift>w", MGROUP_EDIT,
"toggle_fog", ACCL_MOD_KEY"<shift>w", MGROUP_EDIT,
toggle_fog_callback, FALSE },
{ "SCENARIO_PROPERTIES", N_("Game/Scenario Properties"),
"scenario_props", NULL, MGROUP_EDIT,
......
/* View menu */
{ "SHOW_CITY_OUTLINES", N_("Cit_y Outlines"),
"show_city_outlines", "<ctrl>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", "<ctrl>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", "<ctrl>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", "<ctrl>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", "<ctrl><shift>n", MGROUP_SAFE,
"show_native_tiles", ACCL_MOD_KEY"<shift>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", "<ctrl>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", "<ctrl>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", "<ctrl>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", "<ctrl>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,
......
"show_unit_shields", NULL, MGROUP_SAFE,
show_unit_shields_callback, FALSE },
{ "SHOW_STACK_SIZE", N_("Unit Stack Size"),
"show_stack_size", "<ctrl>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,
......
show_fog_of_war_callback, FALSE },
{ "FULL_SCREEN", N_("_Fullscreen"),
"full_screen", "<ctrl>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,
......
"transform_terrain", "o", MGROUP_UNIT,
NULL, FALSE },
{ "CONNECT_ROAD", N_("Connect With Roa_d"),
"connect_road", "<ctrl>r", MGROUP_UNIT,
"connect_road", ACCL_MOD_KEY"r", MGROUP_UNIT,
NULL, FALSE },
{ "CONNECT_RAIL", N_("Connect With Rai_l"),
"connect_rail", "<ctrl>l", MGROUP_UNIT,
"connect_rail", ACCL_MOD_KEY"l", MGROUP_UNIT,
NULL, FALSE },
{ "CONNECT_MAGLEV", N_("Connect With _Maglev"),
"connect_maglev", "<ctrl>m", MGROUP_UNIT,
"connect_maglev", ACCL_MOD_KEY"m", MGROUP_UNIT,
NULL, FALSE },
{ "CONNECT_IRRIGATION", N_("Connect With Irri_gation"),
"connect_irrigation", "<ctrl>i", MGROUP_UNIT,
"connect_irrigation", ACCL_MOD_KEY"i", MGROUP_UNIT,
NULL, FALSE },
{ "CLEAN", N_("_Clean"),
"clean", "p", MGROUP_UNIT,
......
NULL, FALSE },
{ "TAX_RATES", N_("_Tax Rates..."),
"tax_rates", "<ctrl>t", MGROUP_PLAYING,
"tax_rates", ACCL_MOD_KEY"t", MGROUP_PLAYING,
NULL, FALSE },
{ "POLICIES", N_("_Policies..."),
"policies", "<shift><ctrl>p", MGROUP_PLAYER,
......
"bg_select_0", "<shift>F1", MGROUP_PLAYING,
NULL, FALSE },
{ "BG_ASSIGN_1", N_("Assign Battle Group 1"),
"bg_assign_0", "<ctrl>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", "<shift><ctrl>F1", MGROUP_PLAYING,
......
"bg_select_1", "<shift>F2", MGROUP_PLAYING,
NULL, FALSE },
{ "BG_ASSIGN_2", N_("Assign Battle Group 2"),
"bg_assign_1", "<ctrl>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", "<shift><ctrl>F2", MGROUP_PLAYING,
......
"bg_select_2", "<shift>F3", MGROUP_PLAYING,
NULL, FALSE },
{ "BG_ASSIGN_3", N_("Assign Battle Group 3"),
"bg_assign_2", "<ctrl>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", "<shift><ctrl>F3", MGROUP_PLAYING,
......
"bg_select_3", "<shift>F4", MGROUP_PLAYING,
NULL, FALSE },
{ "BG_ASSIGN_4", N_("Assign Battle Group 4"),
"bg_assign_3", "<ctrl>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", "<shift><ctrl>F4", MGROUP_PLAYING,
(2-2/2)