Merge lp:~gerboland/unity-2d/dash-lens-shortcuts-fix into lp:unity-2d

[Gerry Boland]

[dash] Restore missing lens shortcuts (Meta+A, Meta+F). Fix bug:834078

Unmerged revisions

719. By Gerry Boland on 2011-09-14

[dash] Restore missing lens shortcuts (Meta+A, Meta+F). Fix bug:834078

=== modified file 'launcher/app/launcherview.cpp'
--- launcher/app/launcherview.cpp	2011-08-31 14:16:31 +0000
+++ launcher/app/launcherview.cpp	2011-09-14 12:13:28 +0000
@@ -57,6 +57,8 @@
 static const char* DASH_DBUS_METHOD_ACTIVATE_HOME = "activateHome";
 static const char* SPREAD_DBUS_METHOD_IS_SHOWN = "IsShown";
 static const char* COMMANDS_LENS_ID = "commands.lens";
+static const char* APPLICATIONS_LENS_ID = "applications.lens";
+static const char* FILES_LENS_ID = "files.lens";
 static const char* LAUNCHER_DCONF_SCHEMA = "com.canonical.Unity2d.Launcher";
 
 LauncherView::LauncherView(QWidget* parent) :
@@ -82,6 +84,14 @@
     Hotkey* altF2 = HotkeyMonitor::instance().getHotkeyFor(Qt::Key_F2, Qt::AltModifier);
     connect(altF2, SIGNAL(pressed()), SLOT(showCommandsLens()));
 
+    /* Meta+A activates the applications lens */
+    Hotkey* metaA = HotkeyMonitor::instance().getHotkeyFor(Qt::Key_A, Qt::MetaModifier);
+    connect(metaA, SIGNAL(pressed()), SLOT(showApplicationsLens()));
+
+    /* Meta+F activates the files lens */
+    Hotkey* metaF = HotkeyMonitor::instance().getHotkeyFor(Qt::Key_F, Qt::MetaModifier);
+    connect(metaF, SIGNAL(pressed()), SLOT(showFilesLens()));
+
     /* 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);
@@ -241,3 +251,16 @@
     dashInterface.asyncCall("activateLens", COMMANDS_LENS_ID);
 }
 
+void
+LauncherView::showApplicationsLens()
+{
+    QDBusInterface dashInterface(DASH_DBUS_SERVICE, DASH_DBUS_PATH, DASH_DBUS_INTERFACE);
+    dashInterface.asyncCall("activateLens", APPLICATIONS_LENS_ID);
+}
+
+void
+LauncherView::showFilesLens()
+{
+    QDBusInterface dashInterface(DASH_DBUS_SERVICE, DASH_DBUS_PATH, DASH_DBUS_INTERFACE);
+    dashInterface.asyncCall("activateLens", FILES_LENS_ID);
+}
 
=== modified file 'launcher/app/launcherview.h'
--- launcher/app/launcherview.h	2011-08-11 15:02:42 +0000
+++ launcher/app/launcherview.h	2011-09-14 12:13:28 +0000
@@ -58,6 +58,8 @@
     void updateSuperKeyHoldState();
     void toggleDash();
     void showCommandsLens();
+    void showApplicationsLens();
+    void showFilesLens();
 
 protected:
     void focusInEvent(QFocusEvent* event);