From ef1a1be4a87913ed5c50eb10401622275da1c842 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 2 Feb 2014 16:57:51 +0300 Subject: add actions for select next/previous tab in spells/commands window. --- src/actionmanager.cpp | 20 ++++++++++++++++++++ src/actionmanager.h | 2 ++ src/gui/setupactiondata.h | 12 ++++++++++++ src/input/keyboarddata.h | 14 ++++++++++++++ src/input/keydata.h | 2 ++ 5 files changed, 50 insertions(+) diff --git a/src/actionmanager.cpp b/src/actionmanager.cpp index ce01bc8d6..8f0f3db2c 100644 --- a/src/actionmanager.cpp +++ b/src/actionmanager.cpp @@ -1169,4 +1169,24 @@ impHandler0(prevShortcutsTab) return false; } +impHandler0(nextCommandsTab) +{ + if (spellShortcutWindow) + { + spellShortcutWindow->nextTab(); + return true; + } + return false; +} + +impHandler0(prevCommandsTab) +{ + if (spellShortcutWindow) + { + spellShortcutWindow->prevTab(); + return true; + } + return false; +} + } // namespace ActionManager diff --git a/src/actionmanager.h b/src/actionmanager.h index 010344458..50a71f67e 100644 --- a/src/actionmanager.h +++ b/src/actionmanager.h @@ -96,6 +96,8 @@ namespace ActionManager decHandler(showWindows); decHandler(nextShortcutsTab); decHandler(prevShortcutsTab); + decHandler(nextCommandsTab); + decHandler(prevCommandsTab); decHandler(hideWindows); decHandler(helpWindowShow); diff --git a/src/gui/setupactiondata.h b/src/gui/setupactiondata.h index 6065f624c..b76ffa696 100644 --- a/src/gui/setupactiondata.h +++ b/src/gui/setupactiondata.h @@ -508,6 +508,18 @@ static SetupActionData setupActionData2[] = Input::KEY_NEXT_SHORTCUTS_TAB, "", }, + { + // TRANSLATORS: input action name + N_("Previous Commands tab"), + Input::KEY_PREV_COMMANDS_TAB, + "", + }, + { + // TRANSLATORS: input action name + N_("Next Commands tab"), + Input::KEY_NEXT_COMMANDS_TAB, + "", + }, { "", Input::KEY_NO_VALUE, diff --git a/src/input/keyboarddata.h b/src/input/keyboarddata.h index a8817bc6e..87202e8f2 100644 --- a/src/input/keyboarddata.h +++ b/src/input/keyboarddata.h @@ -2066,6 +2066,20 @@ static const KeyData keyData[Input::KEY_TOTAL] = { &ActionManager::nextShortcutsTab, Input::KEY_NO_VALUE, 50, COND_NOINPUT | COND_INGAME}, + {"keyCommandsPrevTab", + INPUT_UNKNOWN, Input::KEY_NO_VALUE, + INPUT_UNKNOWN, Input::KEY_NO_VALUE, + Input::GRP_DEFAULT | Input::GRP_GUI, + &ActionManager::prevCommandsTab, + Input::KEY_NO_VALUE, 50, + COND_NOINPUT | COND_INGAME}, + {"keyCommandsNextTab", + INPUT_UNKNOWN, Input::KEY_NO_VALUE, + INPUT_UNKNOWN, Input::KEY_NO_VALUE, + Input::GRP_DEFAULT | Input::GRP_GUI, + &ActionManager::nextCommandsTab, + Input::KEY_NO_VALUE, 50, + COND_NOINPUT | COND_INGAME} }; #endif // INPUT_KEYBOARDDATA_H diff --git a/src/input/keydata.h b/src/input/keydata.h index d0cbb8d3a..c36a11e7c 100644 --- a/src/input/keydata.h +++ b/src/input/keydata.h @@ -355,6 +355,8 @@ namespace Input KEY_GUI_W, KEY_PREV_SHORTCUTS_TAB, KEY_NEXT_SHORTCUTS_TAB, + KEY_PREV_COMMANDS_TAB, + KEY_NEXT_COMMANDS_TAB, KEY_TOTAL }; } // namespace Input -- cgit v1.2.3-60-g2f50