diff options
author | Andrei Karas <akaras@inbox.ru> | 2014-08-23 19:54:53 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2014-08-23 19:54:53 +0300 |
commit | 0bda5a9018bb8a8b0511e86d6b0790a5b5127e42 (patch) | |
tree | 7b79a624486e94e862546e994d4f65720720aa14 /src/input | |
parent | d6f58bee33ca548ea6fc125553aa8d4d2fdba91f (diff) | |
download | mv-0bda5a9018bb8a8b0511e86d6b0790a5b5127e42.tar.gz mv-0bda5a9018bb8a8b0511e86d6b0790a5b5127e42.tar.bz2 mv-0bda5a9018bb8a8b0511e86d6b0790a5b5127e42.tar.xz mv-0bda5a9018bb8a8b0511e86d6b0790a5b5127e42.zip |
Move chat command /ipctoggle into actions.
Diffstat (limited to 'src/input')
-rw-r--r-- | src/input/inputaction.h | 1 | ||||
-rw-r--r-- | src/input/inputactionmap.h | 11 | ||||
-rw-r--r-- | src/input/pages/other.cpp | 6 |
3 files changed, 17 insertions, 1 deletions
diff --git a/src/input/inputaction.h b/src/input/inputaction.h index d67e60d2d..365f11571 100644 --- a/src/input/inputaction.h +++ b/src/input/inputaction.h @@ -344,6 +344,7 @@ namespace InputAction CLOSE_ALL_CHAT_TABS, IGNORE_ALL_WHISPERS, CHAT_ANNOUNCE, + IPC_TOGGLE, TOTAL }; } // namespace InputAction diff --git a/src/input/inputactionmap.h b/src/input/inputactionmap.h index 37810b5d7..b1807760d 100644 --- a/src/input/inputactionmap.h +++ b/src/input/inputactionmap.h @@ -2865,7 +2865,16 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputAction::NO_VALUE, 50, InputCondition::INGAME, "announce", - true} + true}, + {"keyIpcToggle", + InputType::UNKNOWN, InputAction::NO_VALUE, + InputType::UNKNOWN, InputAction::NO_VALUE, + Input::GRP_DEFAULT, + &Actions::ipcToggle, + InputAction::NO_VALUE, 50, + InputCondition::INGAME, + "ipctoggle", + false} }; #endif // INPUT_INPUTACTIONMAP_H diff --git a/src/input/pages/other.cpp b/src/input/pages/other.cpp index 65ee2af90..70b6b95d5 100644 --- a/src/input/pages/other.cpp +++ b/src/input/pages/other.cpp @@ -191,6 +191,12 @@ SetupActionData setupActionDataOther[] = }, { // TRANSLATORS: input action name + N_("Toggle ipc mode"), + InputAction::IPC_TOGGLE, + "", + }, + { + // TRANSLATORS: input action name N_("Show onscreen keyboard"), InputAction::SHOW_KEYBOARD, "", |