Merge lp:~rperier/unity/exec-len into lp:unity

[Romain Perier]

UnityShell: Send Ubus activate message with GOTO_DASH_URI argument on Alt+F2

Sending message UBUS_PLACE_ENTRY_ACTIVATE_REQUEST with GOTO_DASH_URI argument when executing Alt+F2 shortcut. This switches to the right unity len and don't close the dash if this one was previously opened.

Sending message UBUS_PLACE_ENTRY_ACTIVATE_REQUEST with GOTO_DASH_URI argument from UnityScreen::SendExecuteCommand() when executing CTRL+F2 shortcut. This switches to the right unity len and don't close the dash if this one was previously opened. This patch fixes bug https://bugs.launchpad.net/unity/+bug/1019457

[Romain Perier (rperier)]

PS: That's better to use dash::GOTO_DASH_URI instead of 3, it improves readability and maintainability.

[Marco Trevisan (Treviño) (3v1n0)]

Cool, looks good. Thanks a lot I was missing this too :)

However, could you please add an autopilot test for it?
You should find some guidance here [1].

There should be some tests already doing similar things to what you need.

[1] http://askubuntu.com/questions/233219/how-do-i-contribute-an-autopilot-test

[Romain Perier (rperier)]

Yeah, I already discussed on IRC with bschaefer about autopilot. I will look at it ;)

[Łukasz Zemczak (sil2100)]

Good catch and good test coverage. +1

review: Approve

[Stephen M. Webb (bregma)]

Sweet.

review: Approve

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2013-01-24 16:32:35 +0000
+++ plugins/unityshell/src/unityshell.cpp	2013-01-25 14:57:21 +0000
@@ -26,6 +26,7 @@
 #include <Nux/WindowCompositor.h>
 
 #include <UnityCore/Variant.h>
+#include <UnityCore/Lens.h>
 
 #include "BaseWindowRaiserImp.h"
 #include "IconRenderer.h"
@@ -1847,7 +1848,7 @@
   ubus_manager_.SendMessage(UBUS_DASH_ABOUT_TO_SHOW, NULL, glib::Source::Priority::HIGH);
 
   ubus_manager_.SendMessage(UBUS_PLACE_ENTRY_ACTIVATE_REQUEST,
-                            g_variant_new("(sus)", "commands.lens", 0, ""),
+                            g_variant_new("(sus)", "commands.lens", dash::GOTO_DASH_URI, ""),
                             glib::Source::Priority::LOW);
 }
 

=== modified file 'tests/autopilot/unity/tests/test_dash.py'
--- tests/autopilot/unity/tests/test_dash.py	2013-01-16 19:52:49 +0000
+++ tests/autopilot/unity/tests/test_dash.py	2013-01-25 14:57:21 +0000
@@ -61,6 +61,12 @@
         self.dash.reveal_command_lens()
         self.assertThat(self.dash.active_lens, Eventually(Equals('commands.lens')))
 
+    def test_can_go_from_dash_to_command_lens(self):
+	"""Switch to command lens without closing the dash."""
+        self.dash.ensure_visible()
+        self.dash.reveal_command_lens()
+        self.assertThat(self.dash.visible, Eventually(Equals(False)))
+
     def test_alt_f4_close_dash(self):
         """Dash must close on alt+F4."""
         self.dash.ensure_visible()