Merge lp:~uriboni/unity-2d/alt-f2-commands-place into lp:unity-2d/3.0

[Ugo Riboni]

[dash] Pressing Alt+F2 will bring up the commands place entry in the dash (AKA runner)

[dash] Pressing Alt+F2 will bring up the commands place entry in the dash (AKA runner)

Please note that to test this you will probably need to install the package. This is because metacity grabs the alt+f2 key for itself by default, so we install a gconf key together with the package to disable that.

[Florian Boucault (fboucault)]

It will not work if the dash is not running.

review: Needs Fixing

[lp:~uriboni/unity-2d/alt-f2-commands-place]

464. By Ugo Riboni on 2011-03-23

Move the alt+f2 monitoring to the launcher, so that it works even when the dash is not active yet

=== modified file 'debian/20_unity-2d-gconf-mandatory'
--- debian/20_unity-2d-gconf-mandatory	2011-03-15 12:27:52 +0000
+++ debian/20_unity-2d-gconf-mandatory	2011-03-23 11:32:29 +0000
@@ -1,2 +1,3 @@
 /apps/nautilus/preferences/exit_with_last_window false
 /apps/metacity/global_keybindings/panel_main_menu disabled
+/apps/metacity/global_keybindings/panel_run_dialog disabled

=== modified file 'launcher/app/launcherview.cpp'
--- launcher/app/launcherview.cpp	2011-03-22 11:56:07 +0000
+++ launcher/app/launcherview.cpp	2011-03-23 11:32:29 +0000
@@ -46,6 +46,8 @@
 static const char* DASH_DBUS_INTERFACE = "com.canonical.Unity2d.Dash";
 static const char* DASH_DBUS_PROPERTY_ACTIVE = "active";
 static const char* DASH_DBUS_METHOD_ACTIVATE_HOME = "activateHome";
+static const char* APPLICATIONS_PLACE = "/usr/share/unity/places/applications.place";
+static const char* COMMANDS_PLACE_ENTRY = "Runner";
 
 LauncherView::LauncherView(QWidget* parent) :
     QDeclarativeView(parent),
@@ -64,6 +66,10 @@
     /* Alt+F1 gives the keyboard focus to the launcher. */
     Hotkey* altF1 = HotkeyMonitor::instance().getHotkeyFor(Qt::Key_F1, Qt::AltModifier);
     connect(altF1, SIGNAL(pressed()), SLOT(activateWindow()));
+
+    /* Alt+F2 shows the dash with the commands place entry activated. */
+    Hotkey* altF2 = HotkeyMonitor::instance().getHotkeyFor(Qt::Key_F2, Qt::AltModifier);
+    connect(altF2, SIGNAL(pressed()), SLOT(showCommandsPlace()));
 }
 
 void
@@ -320,3 +326,17 @@
 
     return colors;
 }
+
+void
+LauncherView::showCommandsPlace()
+{
+    QDBusInterface dashInterface(DASH_DBUS_SERVICE, DASH_DBUS_PATH, DASH_DBUS_INTERFACE);
+    if (!dashInterface.isValid()) {
+        qWarning() << "Can't access the dash via DBUS on" << DASH_DBUS_SERVICE
+                   << DASH_DBUS_PATH << DASH_DBUS_INTERFACE;
+        return;
+    }
+
+    dashInterface.asyncCall("activatePlaceEntry",
+                            APPLICATIONS_PLACE, COMMANDS_PLACE_ENTRY, 0);
+}

=== modified file 'launcher/app/launcherview.h'
--- launcher/app/launcherview.h	2011-03-22 11:21:52 +0000
+++ launcher/app/launcherview.h	2011-03-23 11:32:29 +0000
@@ -60,6 +60,7 @@
     void updateSuperKeyHoldState();
     void toggleDash();
     void changeKeyboardShortcutsState(bool enabled);
+    void showCommandsPlace();
 
 public Q_SLOTS:
     void activateWindow();

=== modified file 'places/app/dashdeclarativeview.cpp'
--- places/app/dashdeclarativeview.cpp	2011-03-17 10:07:18 +0000
+++ places/app/dashdeclarativeview.cpp	2011-03-23 11:32:29 +0000
@@ -30,7 +30,6 @@
 #include <QGraphicsObject>
 #include <QtDBus/QDBusConnection>
 #include <QTimer>
-#include <QDebug>
 
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>