3 files changed, 28 insertions, 0 deletions
diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp
index 80533025..ffff6b1a 100644
--- a/src/gui/inventorywindow.cpp
+++ b/src/gui/inventorywindow.cpp
@@ -25,6 +25,7 @@
 #include "item.h"
 #include "localplayer.h"
 #include "units.h"
+#include "keyboardconfig.h"
 
 #include "gui/itemamount.h"
 #include "gui/setup.h"
@@ -221,6 +222,19 @@ void InventoryWindow::mouseClicked(gcn::MouseEvent &event)
         const int my = event.getY() + getY();
         viewport->showPopup(mx, my, item);
     }
+
+    if (event.getButton() == gcn::MouseEvent::LEFT)
+    {
+        if (storageWindow && keyboard.isKeyActive(keyboard.KEY_EMOTE))
+        {
+            Item *item = mItems->getSelectedItem();
+
+            if(!item)
+                return;
+
+            storageWindow->addStore(item, item->getQuantity());
+        }
+    }
 }
 
 void InventoryWindow::keyPressed(gcn::KeyEvent &event)
diff --git a/src/gui/inventorywindow.h b/src/gui/inventorywindow.h
index 5117c23f..3a13035c 100644
--- a/src/gui/inventorywindow.h
+++ b/src/gui/inventorywindow.h
@@ -24,6 +24,7 @@
 
 #include "inventory.h"
 
+#include "gui/storagewindow.h"
 #include "gui/widgets/window.h"
 
 #include "net/inventoryhandler.h"
diff --git a/src/gui/storagewindow.cpp b/src/gui/storagewindow.cpp
index b05c2104..c3b13ef9 100644
--- a/src/gui/storagewindow.cpp
+++ b/src/gui/storagewindow.cpp
@@ -25,6 +25,7 @@
 #include "item.h"
 #include "localplayer.h"
 #include "units.h"
+#include "keyboardconfig.h"
 
 #include "gui/inventorywindow.h"
 #include "gui/itemamount.h"
@@ -174,6 +175,18 @@ void StorageWindow::mouseClicked(gcn::MouseEvent &event)
         const int my = event.getY() + getY();
         viewport->showPopup(mx, my, item, false);
     }
+    if (event.getButton() == gcn::MouseEvent::LEFT)
+    {
+        if (keyboard.isKeyActive(keyboard.KEY_EMOTE))
+        {
+            Item *item = mItems->getSelectedItem();
+
+            if(!item)
+                return;
+
+            removeStore(item, item->getQuantity());
+        }
+    }
 }
 
 Item *StorageWindow::getSelectedItem() const