Shell: Adjusting menu items

skyjake · Jan 30, 2013 · c012f67 · c012f67
1 parent 3815f3b
commit c012f67
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/doomsday/libshell/include/de/shell/action.h b/doomsday/libshell/include/de/shell/action.h
@@ -37,6 +37,8 @@ class Action : public QObject
 
     Action(String const &label, KeyEvent const &event, QObject *target = 0, char const *slot = 0);
 
+    Action(String const &label, QObject *target = 0, char const *slot = 0);
+
     Action(String const &label);
 
     ~Action();

diff --git a/doomsday/libshell/src/action.cpp b/doomsday/libshell/src/action.cpp
@@ -39,6 +39,15 @@ Action::Action(String const &label, KeyEvent const &event, QObject *target, char
     }
 }
 
+Action::Action(String const &label, QObject *target, char const *slot)
+    : _event(KeyEvent("")), _label(label)
+{
+    if(target && slot)
+    {
+        connect(this, SIGNAL(triggered()), target, slot);
+    }
+}
+
 Action::Action(String const &label) : _event(KeyEvent("")), _label(label)
 {}
 

diff --git a/doomsday/tools/shell/shell-text/src/shellapp.cpp b/doomsday/tools/shell/shell-text/src/shellapp.cpp
@@ -86,7 +86,7 @@ struct ShellApp::Instance
         // Main menu.
         menu = new MenuWidget;
         menu->hide(); // closed initially
-        menu->appendItem(new Action("Open connection...",
+        menu->appendItem(new Action("Connect to...",
                                     KeyEvent(Qt::Key_O),
                                     &self, SLOT(openConnection())), "O");
         menu->appendItem(new Action("Disconnect"));