upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-21 18:12:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

assign correct scopes to old SCOPE_GENERAL hotkeys

Browse Source
This commit is contained in:
gfgtdf 2014-06-23 23:39:26 +02:00
parent 6b8a39d933
commit c1aead6776
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/hotkey/hotkey_command.cpp
View File

@ -49,19 +49,19 @@ hotkey::hotkey_command_temp hotkey_list_[] = {
{ hotkey::HOTKEY_UNIT_HOLD_POSITION, "holdposition", N_("Hold Position"), false, scope_game, "" },
{ hotkey::HOTKEY_END_UNIT_TURN, "endunitturn", N_("End Unit Turn"), false, scope_game, "" },
{ hotkey::HOTKEY_LEADER, "leader", N_("Leader"), false, scope_game, "" },
{ hotkey::HOTKEY_UNDO, "undo", N_("Undo"), false, scope_game | scope_editor | scope_main, "" },
{ hotkey::HOTKEY_REDO, "redo", N_("Redo"), false, scope_game | scope_editor | scope_main, "" },
{ hotkey::HOTKEY_UNDO, "undo", N_("Undo"), false, scope_game | scope_editor, "" },
{ hotkey::HOTKEY_REDO, "redo", N_("Redo"), false, scope_game | scope_editor, "" },
{ hotkey::HOTKEY_ZOOM_IN, "zoomin", N_("Zoom In"), false, scope_game | scope_editor | scope_main, "" },
{ hotkey::HOTKEY_ZOOM_OUT, "zoomout", N_("Zoom Out"), false, scope_game | scope_editor | scope_main, "" },
{ hotkey::HOTKEY_ZOOM_DEFAULT, "zoomdefault", N_("Default Zoom"), false, scope_game | scope_editor | scope_main, "" },
{ hotkey::HOTKEY_FULLSCREEN, "fullscreen", N_("Toggle Full Screen"), false, scope_game | scope_editor | scope_main, "" },
{ hotkey::HOTKEY_SCREENSHOT, "screenshot", N_("Screenshot"), false, scope_game | scope_editor | scope_main, "" },
{ hotkey::HOTKEY_MAP_SCREENSHOT, "mapscreenshot", N_("Map Screenshot"), false, scope_game | scope_editor | scope_main, "" },
{ hotkey::HOTKEY_MAP_SCREENSHOT, "mapscreenshot", N_("Map Screenshot"), false, scope_game | scope_editor, "" },
{ hotkey::HOTKEY_ACCELERATED, "accelerated", N_("Accelerated"), false, scope_game, "" },
{ hotkey::HOTKEY_TERRAIN_DESCRIPTION, "describeterrain", N_("Terrain Description"), false, scope_game | scope_editor | scope_main, "" },
{ hotkey::HOTKEY_UNIT_DESCRIPTION, "describeunit", N_("Unit Description"), false, scope_game | scope_editor | scope_main, "" },
{ hotkey::HOTKEY_RENAME_UNIT, "renameunit", N_("Rename Unit"), false, scope_game | scope_editor | scope_main, "" },
{ hotkey::HOTKEY_DELETE_UNIT, "editor-deleteunit", N_("Delete Unit"), false, scope_game | scope_editor | scope_main, "" },
{ hotkey::HOTKEY_TERRAIN_DESCRIPTION, "describeterrain", N_("Terrain Description"), false, scope_game | scope_editor, "" },
{ hotkey::HOTKEY_UNIT_DESCRIPTION, "describeunit", N_("Unit Description"), false, scope_game | scope_editor, "" },
{ hotkey::HOTKEY_RENAME_UNIT, "renameunit", N_("Rename Unit"), false, scope_game | scope_editor, "" },
{ hotkey::HOTKEY_DELETE_UNIT, "editor-deleteunit", N_("Delete Unit"), false, scope_game | scope_editor, "" },
{ hotkey::HOTKEY_SAVE_GAME, "save", N_("Save Game"), false, scope_game, "" },
{ hotkey::HOTKEY_SAVE_REPLAY, "savereplay", N_("Save Replay"), false, scope_game, "" },
@ -71,8 +71,9 @@ hotkey::hotkey_command_temp hotkey_list_[] = {
{ hotkey::HOTKEY_REPEAT_RECRUIT, "repeatrecruit", N_("Repeat Recruit"), false, scope_game, "" },
{ hotkey::HOTKEY_RECALL, "recall", N_("Recall"), false, scope_game, "" },
{ hotkey::HOTKEY_ENDTURN, "endturn", N_("End Turn"), false, scope_game, "" },
//TODO: why has HOTKEY_TOGGLE_ELLIPSES more than scope_game ?
{ hotkey::HOTKEY_TOGGLE_ELLIPSES, "toggleellipses", N_("Toggle Ellipses"), false, scope_game | scope_editor | scope_main, "" },
{ hotkey::HOTKEY_TOGGLE_GRID, "togglegrid", N_("Toggle Grid"), false, scope_game | scope_editor | scope_main, "" },
{ hotkey::HOTKEY_TOGGLE_GRID, "togglegrid", N_("Toggle Grid"), false, scope_game | scope_editor, "" },
{ hotkey::HOTKEY_MOUSE_SCROLL, "mousescroll", N_("Mouse Scrolling"), false, scope_game | scope_editor | scope_main, "" },
{ hotkey::HOTKEY_STATUS_TABLE, "statustable", N_("Status Table"), false, scope_game, "" },
{ hotkey::HOTKEY_MUTE, "mute", N_("Mute"), false, scope_game | scope_editor | scope_main, "" },
@ -82,7 +83,7 @@ hotkey::hotkey_command_temp hotkey_list_[] = {
{ hotkey::HOTKEY_KILL_UNIT, "killunit", N_("Kill Unit (Debug!)"), false, scope_game, "" },
{ hotkey::HOTKEY_PREFERENCES, "preferences", N_("Preferences"), false, scope_game | scope_editor | scope_main, "" },
{ hotkey::HOTKEY_OBJECTIVES, "objectives", N_("Scenario Objectives"), false, scope_game, "" },
{ hotkey::HOTKEY_UNIT_LIST, "unitlist", N_("Unit List"), false, scope_game | scope_editor | scope_main, "" },
{ hotkey::HOTKEY_UNIT_LIST, "unitlist", N_("Unit List"), false, scope_game | scope_editor, "" },
{ hotkey::HOTKEY_STATISTICS, "statistics", N_("Statistics"), false, scope_game, "" },
{ hotkey::HOTKEY_STOP_NETWORK, "stopnetwork", N_("Pause Network Game"), false, scope_game, "" },
{ hotkey::HOTKEY_START_NETWORK, "startnetwork", N_("Continue Network Game"), false, scope_game, "" },
@ -236,13 +237,14 @@ hotkey::hotkey_command_temp hotkey_list_[] = {
{ hotkey::HOTKEY_SPEAK_ALL, "speaktoall", N_("Speak to All"), false, scope_game, "" },
{ hotkey::HOTKEY_HELP, "help", N_("Help"), false, scope_game | scope_editor | scope_main, "" },
{ hotkey::HOTKEY_CHAT_LOG, "chatlog", N_("View Chat Log"), false, scope_game, "" },
//TODO: why does HOTKEY_USER_CMD have not only scope_game ?
{ hotkey::HOTKEY_USER_CMD, "command", N_("Enter User Command"), false, scope_game | scope_editor | scope_main, "" },
{ hotkey::HOTKEY_CUSTOM_CMD, "customcommand", N_("Custom Command"), false, scope_game, "" },
{ hotkey::HOTKEY_AI_FORMULA, "aiformula", N_("Run Formula"), false, scope_game, "" },
{ hotkey::HOTKEY_CLEAR_MSG, "clearmessages", N_("Clear Messages"), false, scope_game, "" },
{ hotkey::HOTKEY_LANGUAGE, "changelanguage", N_("Change Language"), false, scope_main, "" },
{ hotkey::TITLE_SCREEN__RELOAD_WML, "title_screen__reload_wml", N_("Refresh WML"), true ,scope_game | scope_editor | scope_main, "" },
{ hotkey::TITLE_SCREEN__RELOAD_WML, "title_screen__reload_wml", N_("Refresh WML"), true , scope_editor | scope_main, "" },
{ hotkey::TITLE_SCREEN__NEXT_TIP, "title_screen__next_tip", N_("Next Tip of the Day"), false, scope_main, "" },
{ hotkey::TITLE_SCREEN__PREVIOUS_TIP, "title_screen__previous_tip", N_("Previous Tip of the Day"), false, scope_main, "" },
{ hotkey::TITLE_SCREEN__TUTORIAL, "title_screen__tutorial", N_("Start Tutorial"), false , scope_main, "" },