Merged 0.0 changes from revision 3362 to 3580 to trunk.

1 files changed, 10 insertions, 2 deletions

diff --git a/src/gui/menuwindow.cpp b/src/gui/menuwindow.cpp
index bfa2f1f2..8d4d184d 100644
--- a/src/gui/menuwindow.cpp
+++ b/src/gui/menuwindow.cpp
@@ -37,6 +37,7 @@ extern Window *inventoryWindow;
 extern Window *equipmentWindow;
 extern Window *skillDialog;
 extern Window *statusWindow;
+extern Window *itemShortcutWindow;
 
 namespace {
     struct MenuWindowListener : public gcn::ActionListener
@@ -62,6 +63,7 @@ MenuWindow::MenuWindow():
         N_("Equipment"),
         N_("Inventory"),
         N_("Skills"),
+        N_("Shortcut"),
         N_("Setup"),
         0
     };
@@ -109,14 +111,20 @@ void MenuWindowListener::action(const gcn::ActionEvent &event)
     {
         window = skillDialog;
     }
+    else if (event.getId() == "Shortcut")
+    {
+        window = itemShortcutWindow;
+    }
     else if (event.getId() == "Setup")
     {
         window = setupWindow;
     }
 
-    if (window) {
+    if (window)
+    {
         window->setVisible(!window->isVisible());
-        if (window->isVisible()) {
+        if (window->isVisible())
+        {
             window->requestMoveToTop();
         }
     }