Project

Profile

Help

HostedRedmine.com has moved to the Planio platform. All logins and passwords remained the same. All users will be able to login and use Redmine just as before. Read more...

Bug #850291 ยป 26-gtk322-shortcuts.patch

Jacob Nevins, 2019-12-01 05:07 AM

View differences:

client/gui-gtk-3.22/menu.c
251 251
  { "MENU_OPTIONS", N_("Options"), 0, 0, NULL, MGROUP_SAFE },
252 252
  { "MENU_EDIT", N_("Edit"), 0, 0, NULL, MGROUP_SAFE },
253 253
  { "MENU_VIEW", N_("?verb:View"), 0, 0, NULL, MGROUP_SAFE },
254
  { "MENU_IMPROVEMENTS", N_("Improvements"), GDK_KEY_i, GDK_META_MASK,
254
  { "MENU_IMPROVEMENTS", N_("Improvements"), 0, 0,
255 255
    NULL, MGROUP_SAFE },
256
  { "MENU_CIVILIZATION", N_("Civilization"), GDK_KEY_z, GDK_META_MASK,
256
  { "MENU_CIVILIZATION", N_("Civilization"), 0, 0,
257 257
    NULL, MGROUP_SAFE },
258
  { "MENU_HELP", N_("Help"), GDK_KEY_h, GDK_META_MASK, NULL, MGROUP_SAFE },
258
  { "MENU_HELP", N_("Help"), 0, 0, NULL, MGROUP_SAFE },
259 259
  { "CLEAR_CHAT_LOGS", N_("Clear Chat Log"), 0, 0,
260 260
    G_CALLBACK(clear_chat_logs_callback), MGROUP_SAFE },
261 261
  { "SAVE_CHAT_LOGS", N_("Save Chat Log"), 0, 0,
......
270 270
    G_CALLBACK(save_options_callback), MGROUP_SAFE },
271 271
  { "RELOAD_TILESET", N_("Reload Tileset"), GDK_KEY_r, GDK_META_MASK | GDK_CONTROL_MASK,
272 272
    G_CALLBACK(reload_tileset_callback), MGROUP_SAFE },
273
  { "GAME_SAVE", N_("Save Game"), 0, 0,
273
  { "GAME_SAVE", N_("Save Game"), GDK_KEY_s, GDK_CONTROL_MASK,
274 274
    G_CALLBACK(save_game_callback), MGROUP_SAFE },
275 275
  { "GAME_SAVE_AS", N_("Save Game As..."), 0, 0,
276 276
    G_CALLBACK(save_game_as_callback), MGROUP_SAFE },
......
279 279
  { "MAPIMG_SAVE_AS", N_("Save Map Image As..."), 0, 0,
280 280
    G_CALLBACK(save_mapimg_as_callback), MGROUP_SAFE },
281 281
  { "LEAVE", N_("Leave"), 0, 0, G_CALLBACK(leave_callback), MGROUP_SAFE },
282
  { "QUIT", N_("Quit"), 0, 0, G_CALLBACK(quit_callback), MGROUP_SAFE },
282
  { "QUIT", N_("Quit"), GDK_KEY_q, GDK_CONTROL_MASK,
283
    G_CALLBACK(quit_callback), MGROUP_SAFE },
283 284
  { "FIND_CITY", N_("Find City"), GDK_KEY_f, GDK_CONTROL_MASK,
284 285
    G_CALLBACK(find_city_callback), MGROUP_SAFE },
285 286
  { "WORKLISTS", N_("Worklists"), GDK_KEY_l, GDK_CONTROL_MASK,
......
354 355
    G_CALLBACK(help_copying_callback), MGROUP_SAFE },
355 356
  { "HELP_ABOUT", N_("About Freeciv"), 0, 0,
356 357
    G_CALLBACK(help_about_callback), MGROUP_SAFE },
357
  { "SAVE_OPTIONS_ON_EXIT", N_("Save Options on Exit"), GDK_KEY_e, 0,
358
  { "SAVE_OPTIONS_ON_EXIT", N_("Save Options on Exit"), 0, 0,
358 359
    G_CALLBACK(save_options_on_exit_callback), MGROUP_SAFE },
359
  { "EDIT_MODE", N_("Editing Mode"), 0, 0,
360
  { "EDIT_MODE", N_("Editing Mode"), GDK_KEY_e, GDK_CONTROL_MASK,
360 361
    G_CALLBACK(edit_mode_callback), MGROUP_SAFE },
361 362
  { "SHOW_CITY_OUTLINES", N_("City Outlines"), GDK_KEY_y, GDK_CONTROL_MASK,
362 363
    G_CALLBACK(show_city_outlines_callback), MGROUP_SAFE },
......
366 367
    G_CALLBACK(show_map_grid_callback), MGROUP_SAFE },
367 368
  { "SHOW_NATIONAL_BORDERS", N_("National Borders"), GDK_KEY_b, GDK_CONTROL_MASK,
368 369
    G_CALLBACK(show_national_borders_callback), MGROUP_SAFE },
369
  { "SHOW_NATIVE_TILES", N_("Native Tiles"), GDK_KEY_n, GDK_CONTROL_MASK,
370
  { "SHOW_NATIVE_TILES", N_("Native Tiles"), GDK_KEY_n, GDK_CONTROL_MASK | GDK_SHIFT_MASK,
370 371
    G_CALLBACK(show_native_tiles_callback), MGROUP_SAFE },
371 372
  { "SHOW_CITY_FULL_BAR", N_("City Full Bar"), 0, 0,
372 373
    G_CALLBACK(show_city_full_bar_callback), MGROUP_SAFE },
373
  { "SHOW_CITY_NAMES", N_("City Names"), GDK_KEY_n, 0,
374
  { "SHOW_CITY_NAMES", N_("City Names"), GDK_KEY_n, GDK_CONTROL_MASK,
374 375
    G_CALLBACK(show_city_names_callback), MGROUP_SAFE },
375 376
  { "SHOW_CITY_GROWTH", N_("City Growth"), GDK_KEY_r, GDK_CONTROL_MASK,
376 377
    G_CALLBACK(show_city_growth_callback), MGROUP_SAFE },
......
413 414
  { "FULL_SCREEN", N_("Fullscreen"), GDK_KEY_KP_Enter, GDK_META_MASK,
414 415
    G_CALLBACK(full_screen_callback), MGROUP_SAFE },
415 416

  
416
  { "RECALC_BORDERS", N_("Recalculate Borders"), GDK_KEY_b, 0,
417
  { "RECALC_BORDERS", N_("Recalculate Borders"), 0, 0,
417 418
    G_CALLBACK(recalc_borders_callback), MGROUP_EDIT },
418
  { "TOGGLE_FOG", N_("Toggle Fog of War"), GDK_KEY_w, 0,
419
  { "TOGGLE_FOG", N_("Toggle Fog of War"), GDK_KEY_m, GDK_CONTROL_MASK,
419 420
    G_CALLBACK(toggle_fog_callback), MGROUP_EDIT },
420 421
  { "SCENARIO_PROPERTIES", N_("Game/Scenario Properties"), 0, 0,
421 422
    G_CALLBACK(scenario_properties_callback), MGROUP_EDIT },
    (1-1/1)