From 0b7e752bd177c90a05ca752fa31810f9e34c432c Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Thu, 19 Apr 2012 23:48:29 +0300
Subject: Dehardcode keys in gui widgets. Add new tab with keys settings in
 input settings tab.

---
 src/gui/inventorywindow.cpp | 27 +++++++--------------------
 1 file changed, 7 insertions(+), 20 deletions(-)

(limited to 'src/gui/inventorywindow.cpp')

diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp
index 425130b57..5fe44f2bd 100644
--- a/src/gui/inventorywindow.cpp
+++ b/src/gui/inventorywindow.cpp
@@ -25,10 +25,11 @@
 #include "configuration.h"
 #include "inventory.h"
 #include "item.h"
-#include "units.h"
 #include "inputmanager.h"
-#include "keyboardconfig.h"
+#include "keydata.h"
+#include "keyevent.h"
 #include "playerinfo.h"
+#include "units.h"
 
 #include "gui/itemamountwindow.h"
 #include "gui/setup.h"
@@ -473,28 +474,14 @@ void InventoryWindow::mouseClicked(gcn::MouseEvent &event)
 
 void InventoryWindow::keyPressed(gcn::KeyEvent &event)
 {
-    switch (event.getKey().getValue())
-    {
-        case Key::LEFT_SHIFT:
-        case Key::RIGHT_SHIFT:
-            mSplit = true;
-            break;
-        default:
-            break;
-    }
+    if (static_cast<KeyEvent*>(&event)->getActionId() == Input::KEY_GUI_MOD)
+        mSplit = true;
 }
 
 void InventoryWindow::keyReleased(gcn::KeyEvent &event)
 {
-    switch (event.getKey().getValue())
-    {
-        case Key::LEFT_SHIFT:
-        case Key::RIGHT_SHIFT:
-            mSplit = false;
-            break;
-        default:
-            break;
-    }
+    if (static_cast<KeyEvent*>(&event)->getActionId() == Input::KEY_GUI_MOD)
+        mSplit = false;
 }
 
 void InventoryWindow::valueChanged(const gcn::SelectionEvent &event A_UNUSED)
-- 
cgit v1.2.3-70-g09d2