Extend quick move items from inventory to storage and back.

Add new key for quick actions "modifier key".

1 files changed, 37 insertions, 30 deletions

diff --git a/src/keyboardconfig.cpp b/src/keyboardconfig.cpp
index 1ad6fb582..6ca3f65c5 100644
--- a/src/keyboardconfig.cpp
+++ b/src/keyboardconfig.cpp
@@ -70,7 +70,7 @@ static KeyData const keyData[KeyboardConfig::KEY_TOTAL] = {
     {"keyChangePickupType", SDLK_o, N_("Change Pickup Type"),
         KeyboardConfig::GRP_DEFAULT},
     {"keyHideWindows", SDLK_h, N_("Hide Windows"),
-        KeyboardConfig::GRP_DEFAULT},
+        KeyboardConfig::GRP_DEFAULT | KeyboardConfig::GRP_GUI},
     {"keyBeingSit", SDLK_s, N_("Sit"), KeyboardConfig::GRP_DEFAULT},
     {"keyScreenshot", SDLK_p, N_("Screenshot"), KeyboardConfig::GRP_DEFAULT},
     {"keyTrade", SDLK_r, N_("Enable/Disable Trading"),
@@ -119,45 +119,50 @@ static KeyData const keyData[KeyboardConfig::KEY_TOTAL] = {
         strprintf(N_("Item Shortcut %d"), 19), KeyboardConfig::GRP_DEFAULT},
     {"keyShortcut20", KeyboardConfig::KEY_NO_VALUE,
         strprintf(N_("Item Shortcut %d"), 20), KeyboardConfig::GRP_DEFAULT},
-    {"keyWindowHelp", SDLK_F1, N_("Help Window"), KeyboardConfig::GRP_DEFAULT},
+    {"keyWindowHelp", SDLK_F1, N_("Help Window"), KeyboardConfig::GRP_DEFAULT
+        | KeyboardConfig::GRP_GUI},
     {"keyWindowStatus", SDLK_F2, N_("Status Window"),
-        KeyboardConfig::GRP_DEFAULT},
+        KeyboardConfig::GRP_DEFAULT | KeyboardConfig::GRP_GUI},
     {"keyWindowInventory", SDLK_F3, N_("Inventory Window"),
-        KeyboardConfig::GRP_DEFAULT},
+        KeyboardConfig::GRP_DEFAULT | KeyboardConfig::GRP_GUI},
     {"keyWindowEquipment", SDLK_F4, N_("Equipment Window"),
-        KeyboardConfig::GRP_DEFAULT},
+        KeyboardConfig::GRP_DEFAULT | KeyboardConfig::GRP_GUI},
     {"keyWindowSkill", SDLK_F5, N_("Skill Window"),
-        KeyboardConfig::GRP_DEFAULT},
+        KeyboardConfig::GRP_DEFAULT | KeyboardConfig::GRP_GUI},
     {"keyWindowMinimap", SDLK_F6, N_("Minimap Window"),
-        KeyboardConfig::GRP_DEFAULT},
-    {"keyWindowChat", SDLK_F7, N_("Chat Window"), KeyboardConfig::GRP_DEFAULT},
+        KeyboardConfig::GRP_DEFAULT | KeyboardConfig::GRP_GUI},
+    {"keyWindowChat", SDLK_F7, N_("Chat Window"), KeyboardConfig::GRP_DEFAULT
+        | KeyboardConfig::GRP_GUI},
     {"keyWindowShortcut", SDLK_F8, N_("Item Shortcut Window"),
-        KeyboardConfig::GRP_DEFAULT},
+        KeyboardConfig::GRP_DEFAULT | KeyboardConfig::GRP_GUI},
     {"keyWindowSetup", SDLK_F9, N_("Setup Window"),
-        KeyboardConfig::GRP_DEFAULT},
+        KeyboardConfig::GRP_DEFAULT | KeyboardConfig::GRP_GUI},
     {"keyWindowDebug", SDLK_F10, N_("Debug Window"),
-        KeyboardConfig::GRP_DEFAULT},
+        KeyboardConfig::GRP_DEFAULT | KeyboardConfig::GRP_GUI},
     {"keyWindowSocial", SDLK_F11, N_("Social Window"),
-        KeyboardConfig::GRP_DEFAULT},
+        KeyboardConfig::GRP_DEFAULT | KeyboardConfig::GRP_GUI},
     {"keyWindowEmoteBar", SDLK_F12, N_("Emote Shortcut Window"),
-        KeyboardConfig::GRP_DEFAULT},
+        KeyboardConfig::GRP_DEFAULT | KeyboardConfig::GRP_GUI},
     {"keyWindowOutfit", SDLK_BACKQUOTE, N_("Outfits Window"),
-        KeyboardConfig::GRP_DEFAULT},
-    {"keyWindowShop", -1, N_("Shop Window"), KeyboardConfig::GRP_DEFAULT},
+        KeyboardConfig::GRP_DEFAULT | KeyboardConfig::GRP_GUI},
+    {"keyWindowShop", -1, N_("Shop Window"), KeyboardConfig::GRP_DEFAULT
+        | KeyboardConfig::GRP_GUI},
     {"keyWindowDrop", SDLK_w, N_("Quick drop Window"),
-        KeyboardConfig::GRP_DEFAULT},
+        KeyboardConfig::GRP_DEFAULT | KeyboardConfig::GRP_GUI},
     {"keyWindowKills", SDLK_e, N_("Kill Stats Window"),
-        KeyboardConfig::GRP_DEFAULT},
+        KeyboardConfig::GRP_DEFAULT | KeyboardConfig::GRP_GUI},
     {"keyWindowSpells", SDLK_j, N_("Commands Window"),
-        KeyboardConfig::GRP_DEFAULT},
+        KeyboardConfig::GRP_DEFAULT | KeyboardConfig::GRP_GUI},
     {"keyWindowBotChecker", SDLK_LEFTBRACKET, N_("Bot Checker Window"),
-        KeyboardConfig::GRP_DEFAULT},
+        KeyboardConfig::GRP_DEFAULT | KeyboardConfig::GRP_GUI},
     {"keyWindowOnline", KeyboardConfig::KEY_NO_VALUE,
-        _("Who Is Online Window"), KeyboardConfig::GRP_DEFAULT},
+        _("Who Is Online Window"), KeyboardConfig::GRP_DEFAULT
+        | KeyboardConfig::GRP_GUI},
     {"keySocialPrevTab", KeyboardConfig::KEY_NO_VALUE,
-        _("Previous Social Tab"), KeyboardConfig::GRP_DEFAULT},
+        _("Previous Social Tab"), KeyboardConfig::GRP_DEFAULT
+        | KeyboardConfig::GRP_GUI},
     {"keySocialNextTab", KeyboardConfig::KEY_NO_VALUE, N_("Next Social Tab"),
-        KeyboardConfig::GRP_DEFAULT},
+        KeyboardConfig::GRP_DEFAULT | KeyboardConfig::GRP_GUI},
     {"keyEmoteShortcut1", SDLK_1, strprintf(N_("Emote Shortcut %d"), 1),
         KeyboardConfig::GRP_EMOTION},
     {"keyEmoteShortcut2", SDLK_2, strprintf(N_("Emote Shortcut %d"), 2),
@@ -257,16 +262,16 @@ static KeyData const keyData[KeyboardConfig::KEY_TOTAL] = {
         KeyboardConfig::GRP_DEFAULT},
     {"keyCopyEquipedOutfit", SDLK_RIGHTBRACKET, N_("Copy equipped to Outfit"),
         KeyboardConfig::GRP_DEFAULT},
-    {"keyChat", SDLK_RETURN, N_("Toggle Chat"),
-        KeyboardConfig::GRP_DEFAULT | KeyboardConfig::GRP_CHAT},
+    {"keyChat", SDLK_RETURN, N_("Toggle Chat"), KeyboardConfig::GRP_DEFAULT
+        | KeyboardConfig::GRP_CHAT},
     {"keyChatScrollUp", SDLK_PAGEUP, N_("Scroll Chat Up"),
-        KeyboardConfig::GRP_DEFAULT},
+        KeyboardConfig::GRP_DEFAULT | KeyboardConfig::GRP_GUI},
     {"keyChatScrollDown", SDLK_PAGEDOWN, N_("Scroll Chat Down"),
-        KeyboardConfig::GRP_DEFAULT},
+        KeyboardConfig::GRP_DEFAULT | KeyboardConfig::GRP_GUI},
     {"keyChatPrevTab", SDLK_KP7, N_("Previous Chat Tab"),
-        KeyboardConfig::GRP_DEFAULT},
+        KeyboardConfig::GRP_DEFAULT | KeyboardConfig::GRP_GUI},
     {"keyChatNextTab", SDLK_KP9, N_("Next Chat Tab"),
-        KeyboardConfig::GRP_DEFAULT},
+        KeyboardConfig::GRP_DEFAULT | KeyboardConfig::GRP_GUI},
     {"keyChatPrevHistory", SDLK_KP7, N_("Previous chat line"),
         KeyboardConfig::GRP_CHAT},
     {"keyChatNextHistory", SDLK_KP9, N_("Next chat line"),
@@ -275,7 +280,8 @@ static KeyData const keyData[KeyboardConfig::KEY_TOTAL] = {
         KeyboardConfig::GRP_CHAT},
     {"keyDeActivateChat", SDLK_ESCAPE, N_("Deactivate Chat Input"),
         KeyboardConfig::GRP_CHAT},
-    {"keyOK", SDLK_SPACE, N_("Select OK"), KeyboardConfig::GRP_DEFAULT},
+    {"keyOK", SDLK_SPACE, N_("Select OK"),
+        KeyboardConfig::GRP_DEFAULT | KeyboardConfig::GRP_GUI},
     {"keyQuit", SDLK_ESCAPE, N_("Quit"), KeyboardConfig::GRP_DEFAULT},
     {"keyIgnoreInput1", SDLK_LSUPER, N_("Ignore input 1"),
         KeyboardConfig::GRP_DEFAULT},
@@ -324,7 +330,8 @@ static KeyData const keyData[KeyboardConfig::KEY_TOTAL] = {
     {"keyRightClick", SDLK_TAB, N_("Emulate right click from keyboard"),
         KeyboardConfig::GRP_DEFAULT},
     {"keyCameraMode", SDLK_KP_PLUS, N_("Toggle camera mode"),
-        KeyboardConfig::GRP_DEFAULT}
+        KeyboardConfig::GRP_DEFAULT},
+    {"keyMod", SDLK_LSHIFT, N_("Modifier key"), KeyboardConfig::GRP_GUI}
 };
 
 void KeyboardConfig::init()