Merge lp:~osomon/unity-2d/super-s-overlay into lp:unity-2d/3.0

[Olivier Tilloy]

[launcher] Display the shortcut overlay for the workspace switcher.

[Ugo Riboni (uriboni)]

Conflict with trunk. Otherwise works great and code is a great simplification. Good idea.

review: Needs Fixing

=== modified file 'launcher/UnityApplications/workspaces.cpp'
--- launcher/UnityApplications/workspaces.cpp	2011-04-28 13:09:25 +0000
+++ launcher/UnityApplications/workspaces.cpp	2011-05-09 13:21:03 +0000
@@ -30,6 +30,7 @@
 
 Workspaces::Workspaces()
 {
+    setShortcutKey(Qt::Key_S);
 }
 
 Workspaces::Workspaces(const Workspaces& other)

=== modified file 'launcher/app/launcherview.cpp'
--- launcher/app/launcherview.cpp	2011-05-03 18:34:05 +0000
+++ launcher/app/launcherview.cpp	2011-05-09 13:21:03 +0000
@@ -78,10 +78,6 @@
     Hotkey* altF2 = HotkeyMonitor::instance().getHotkeyFor(Qt::Key_F2, Qt::AltModifier);
     connect(altF2, SIGNAL(pressed()), SLOT(showCommandsPlace()));
 
-    /* Super+s activates the workspaces switcher. */
-    Hotkey* superS = HotkeyMonitor::instance().getHotkeyFor(Qt::Key_S, Qt::MetaModifier);
-    connect(superS, SIGNAL(pressed()), SLOT(showWorkspaceSwitcher()));
-
     /* Super+{n} for 0 ≤ n ≤ 9 activates the item with index (n + 9) % 10. */
     for (Qt::Key key = Qt::Key_0; key <= Qt::Key_9; key = (Qt::Key) (key + 1)) {
         Hotkey* hotkey = HotkeyMonitor::instance().getHotkeyFor(key, Qt::MetaModifier);
@@ -341,22 +337,3 @@
                             APPLICATIONS_PLACE, COMMANDS_PLACE_ENTRY, 0);
 }
 
-void
-LauncherView::showWorkspaceSwitcher()
-{
-    QDBusInterface spreadInterface(SPREAD_DBUS_SERVICE, SPREAD_DBUS_PATH, SPREAD_DBUS_INTERFACE);
-
-    /* Here we only show the spread, if it's hidden.
-       However on Super+s the spread should exit if it's already running.
-       That is done directly in spread/Workspaces.qml because the spread
-       fully grabs the keyboard, so it's the only place where Super+s can
-       be handled while the spread is active */
-    QDBusReply<bool> isShown = spreadInterface.call("IsShown");
-    if (isShown.isValid()) {
-        if (isShown.value() == false) {
-            spreadInterface.asyncCall("ShowAllWorkspaces", QString());
-        }
-    } else {
-        UQ_WARNING << "Failed to get property IsShown on" << SPREAD_DBUS_SERVICE;
-    }
-}

=== modified file 'launcher/app/launcherview.h'
--- launcher/app/launcherview.h	2011-05-03 18:32:56 +0000
+++ launcher/app/launcherview.h	2011-05-09 13:21:03 +0000
@@ -62,7 +62,6 @@
     void updateSuperKeyHoldState();
     void toggleDash();
     void showCommandsPlace();
-    void showWorkspaceSwitcher();
 
 public Q_SLOTS:
     void activateWindow();