Merge lp:~3v1n0/unity/static-quicklist-startup-notification into lp:unity

[Marco Trevisan (Treviño)]

ApplicationLauncherIcon: use GAppLaunchContext to open indicator shortcuts

Using the new indicator_desktop_shortcuts_nick_exec_with_context passing to it
the context containing the timestamp of the quicklist activation event.

Using indicator_desktop_shortcuts_nick_exec_with_context to open unity static quicklist with proper timestamp, so that startup-notify will work as expected (and also the compiz Focus Stealing prevention).

Added an autopilot test, also fixed the test_quicklist_actions so that it works with any locale now.

PS: make sure to use lp:~3v1n0/libindicator/shortcut-nicks-startup-notify-13.04 or the test won't pass.

[Andrea Azzarone (azzar1)]

lgtm

review: Approve (unity code)

[Brandon Schaefer (brandontschaefer)]

Test pass for me, LGTM

review: Approve

[Łukasz Zemczak (sil2100)]

Test wise the code looks ok. As mentioned already, good to know DesktopEntry has so many convenient methods!

review: Approve (autopilot)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'launcher/ApplicationLauncherIcon.cpp'
--- launcher/ApplicationLauncherIcon.cpp	2013-04-08 18:19:46 +0000
+++ launcher/ApplicationLauncherIcon.cpp	2013-04-09 18:46:26 +0000
@@ -731,8 +731,12 @@
     std::string nick(nicks[index]);
 
     _gsignals.Add<void, DbusmenuMenuitem*, gint>(item, DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED,
-    [this, nick] (DbusmenuMenuitem* item, unsigned) {
-      indicator_desktop_shortcuts_nick_exec(_desktop_shortcuts, nick.c_str());
+    [this, nick] (DbusmenuMenuitem* item, unsigned timestamp) {
+      GdkDisplay* display = gdk_display_get_default();
+      glib::Object<GdkAppLaunchContext> context(gdk_display_get_app_launch_context(display));
+      gdk_app_launch_context_set_timestamp(context, timestamp);
+      auto gcontext = glib::object_cast<GAppLaunchContext>(context);
+      indicator_desktop_shortcuts_nick_exec_with_context(_desktop_shortcuts, nick.c_str(), gcontext);
     });
 
     dbusmenu_menuitem_child_append(_menu_desktop_shortcuts, item);

=== modified file 'launcher/QuicklistMenuItem.cpp'
--- launcher/QuicklistMenuItem.cpp	2013-03-19 18:47:01 +0000
+++ launcher/QuicklistMenuItem.cpp	2013-04-09 18:46:26 +0000
@@ -39,6 +39,7 @@
   : nux::View(NUX_FILE_LINE_PARAM)
   , _item_type(type)
   , _menu_item(item)
+  , _activate_timestamp(0)
   , _prelight(false)
 {
   mouse_up.connect(sigc::mem_fun(this, &QuicklistMenuItem::RecvMouseUp));
@@ -134,8 +135,8 @@
   if (!_menu_item || !GetSelectable())
     return;
 
-  auto event_time = nux::GetGraphicsDisplay()->GetCurrentEvent().x11_timestamp;
-  dbusmenu_menuitem_handle_event(_menu_item, "clicked", nullptr, event_time);
+  _activate_timestamp = nux::GetGraphicsDisplay()->GetCurrentEvent().x11_timestamp;
+  dbusmenu_menuitem_handle_event(_menu_item, "clicked", nullptr, _activate_timestamp);
 
   if (!IsOverlayQuicklist())
   {
@@ -434,7 +435,8 @@
   .add("active", GetActive())
   .add("visible", GetVisible())
   .add("selectable", GetSelectable())
-  .add("selected", _prelight);
+  .add("selected", _prelight)
+  .add("activate_timestamp", _activate_timestamp);
 }
 
 } //NAMESPACE

=== modified file 'launcher/QuicklistMenuItem.h'
--- launcher/QuicklistMenuItem.h	2013-02-08 14:33:35 +0000
+++ launcher/QuicklistMenuItem.h	2013-04-09 18:46:26 +0000
@@ -123,6 +123,7 @@
   nux::ObjectPtr<nux::BaseTexture> _prelightTexture[2];
   QuicklistMenuItemType _item_type;
   glib::Object<DbusmenuMenuitem> _menu_item;
+  mutable Time _activate_timestamp;
   bool _prelight;
   int _pre_layout_width;
   int _pre_layout_height;

=== modified file 'tests/autopilot/unity/tests/__init__.py'
--- tests/autopilot/unity/tests/__init__.py	2013-04-05 15:21:12 +0000
+++ tests/autopilot/unity/tests/__init__.py	2013-04-09 18:46:26 +0000
@@ -40,6 +40,9 @@
     Unity
     )
 
+from Xlib import display
+from Xlib import Xutil
+
 
 log = getLogger(__name__)
 
@@ -228,3 +231,8 @@
     def register_nautilus(self):
         self.addCleanup(self.unregister_known_application, "Nautilus")
         self.register_known_application("Nautilus", "nautilus.desktop", "nautilus")
+
+    def get_startup_notification_timestamp(self, bamf_window):
+        atom = display.Display().intern_atom('_NET_WM_USER_TIME')
+        atom_type = display.Display().intern_atom('CARDINAL')
+        return bamf_window.x_win.get_property(atom, atom_type, 0, 1024).value[0]

=== modified file 'tests/autopilot/unity/tests/launcher/test_icon_behavior.py'
--- tests/autopilot/unity/tests/launcher/test_icon_behavior.py	2013-04-05 15:22:02 +0000
+++ tests/autopilot/unity/tests/launcher/test_icon_behavior.py	2013-04-09 18:46:26 +0000
@@ -19,7 +19,6 @@
 from unity.emulators.launcher import IconDragType
 from unity.tests.launcher import LauncherTestCase, _make_scenarios
 
-from Xlib import display
 from Xlib import Xutil
 
 logger = logging.getLogger(__name__)
@@ -60,11 +59,6 @@
         self.assertThat(lambda: self.app_is_running("Calculator"), Eventually(Equals(False)))
         return calc_icon
 
-    def get_startup_notification_timestamp(self, bamf_window):
-        atom = display.Display().intern_atom('_NET_WM_USER_TIME')
-        atom_type = display.Display().intern_atom('CARDINAL')
-        return bamf_window.x_win.get_property(atom, atom_type, 0, 1024).value[0]
-
     def test_bfb_tooltip_disappear_when_dash_is_opened(self):
         """Tests that the bfb tooltip disappear when the dash is opened."""
         bfb = self.unity.launcher.model.get_bfb_icon()

=== modified file 'tests/autopilot/unity/tests/test_quicklist.py'
--- tests/autopilot/unity/tests/test_quicklist.py	2013-02-04 04:38:46 +0000
+++ tests/autopilot/unity/tests/test_quicklist.py	2013-04-09 18:46:26 +0000
@@ -38,32 +38,60 @@
         self.assertThat(launcher_icon.get_quicklist, Eventually(NotEquals(None)))
         return launcher_icon.get_quicklist()
 
+    def get_desktop_entry(self, application):
+        # load the desktop file from disk:
+        desktop_id = self.KNOWN_APPS[application]['desktop-file']
+        desktop_file = os.path.join('/usr/share/applications', desktop_id)
+        return DesktopEntry(desktop_file)
+
     def test_quicklist_actions(self):
         """Test that all actions present in the destop file are shown in the quicklist."""
-        self.start_app(self.app_name)
+        app = self.start_app(self.app_name)
 
-        # load the desktop file from disk:
-        desktop_id = self.KNOWN_APPS[self.app_name]['desktop-file']
-        desktop_file = os.path.join('/usr/share/applications', desktop_id)
-        de = DesktopEntry(desktop_file)
         # get the launcher icon from the launcher:
-        launcher_icon = self.unity.launcher.model.get_icon(desktop_id=desktop_id)
+        launcher_icon = self.unity.launcher.model.get_icon(desktop_id=app.desktop_file)
         self.assertThat(launcher_icon, NotEquals(None))
 
         # open the icon quicklist, and get all the text labels:
+        de = self.get_desktop_entry(self.app_name)
         ql = self.open_quicklist_for_icon(launcher_icon)
         ql_item_texts = [i.text for i in ql.items if type(i) is QuicklistMenuItemLabel]
 
         # iterate over all the actions from the desktop file, make sure they're
         # present in the quicklist texts.
-        # FIXME, this doesn't work using a locale other than English.
-        actions = de.getActions()
-        for action in actions:
+        for action in de.getActions():
             key = 'Desktop Action ' + action
             self.assertThat(de.content, Contains(key))
-            name = de.content[key]['Name']
+            name = de.get('Name', group=key, locale=True)
             self.assertThat(ql_item_texts, Contains(name))
 
+    def test_quicklist_action_uses_startup_notification(self):
+        """Tests that quicklist uses startup notification protocol."""
+        self.register_nautilus()
+        self.addCleanup(self.close_all_windows, "Nautilus")
+
+        self.start_app_window("Calculator")
+        self.start_app(self.app_name)
+
+        nautilus_icon = self.unity.launcher.model.get_icon(desktop_id="nautilus.desktop")
+        ql = self.open_quicklist_for_icon(nautilus_icon)
+        de = self.get_desktop_entry("Nautilus")
+
+        new_window_action_name = de.get("Name", group="Desktop Action Window", locale=True)
+        self.assertThat(new_window_action_name, NotEquals(None))
+        new_win_ql_item_fn = lambda : ql.get_quicklist_item_by_text(new_window_action_name)
+        self.assertThat(new_win_ql_item_fn, Eventually(NotEquals(None)))
+        new_win_ql_item = new_win_ql_item_fn()
+
+        ql.click_item(new_win_ql_item)
+
+        nautilus_windows_fn = lambda: self.get_open_windows_by_application("Nautilus")
+        self.assertThat(lambda: len(nautilus_windows_fn()), Eventually(Equals(1)))
+        [nautilus_window] = nautilus_windows_fn()
+
+        self.assertThat(lambda: self.get_startup_notification_timestamp(nautilus_window),
+                        Eventually(Equals(new_win_ql_item.activate_timestamp)))
+
     def test_quicklist_application_item_focus_last_active_window(self):
         """This tests shows that when you activate a quicklist application item
         only the last focused instance of that application is rasied.