Merge lp:~stolowski/unity/no-click-preview-for-apps into lp:unity

[Paweł Stołowski]

Activate (installed) applications on single left-click in Home and Applications scopes view.

Activate (installed) applications on single left-click in Home and Applications scopes view. Applications which are not installed will still be previewed first (this is handled on Application scope side which has the final say about how to handle activation request).

Note: we had a discussion in scopes team whether to expose an API to make it full controllable by scope developers, and decided not to do so, as Apps are the only exception for the default behavior and we want more control over this behavior.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3399
http://jenkins.qa.ubuntu.com/job/unity-ci/181/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-ci/69
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-ci/69
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-ci/69

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-ci/181/rebuild

review: Approve (continuous-integration)

[Brandon Schaefer (brandontschaefer)]

111 + scope = self.unity.dash.view.get_scope view_by_name("home.scope")

This is causing some error for me while trying to run the test_dash.py AP tests.

Failed to import test module: unity.tests.test_dash
Traceback (most recent call last):
  File "/usr/lib/python2.7/unittest/loader.py", line 252, in _find_tests
    module = self._get_module_from_name(name)
  File "/usr/lib/python2.7/unittest/loader.py", line 230, in _get_module_from_name
    __import__(name)
  File "/home/bschaefer/src/tmp-unity/tests/autopilot/unity/tests/test_dash.py", line 837
    scope = self.unity.dash.view.get_scope view_by_name("home.scope")
                                                       ^
SyntaxError: invalid syntax

    unittest.loader.ModuleImportFailure.unity.tests.test_dash

review: Needs Fixing

[Brandon Schaefer (brandontschaefer)]

But other then the tests, this works like a charm :)

[Paweł Stołowski (stolowski)]

> But other then the tests, this works like a charm :)

Ah, seems I accidentally pressed space before commiting... Thanks for catching, updated.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3400
http://jenkins.qa.ubuntu.com/job/unity-ci/187/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-ci/75
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-ci/75
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-ci/75

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-ci/187/rebuild

review: Approve (continuous-integration)

[Brandon Schaefer (brandontschaefer)]

Nice.

Looks good to me, tests working, and AP tests :)

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-autolanding/128/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/generic-cleanup-mbs/675/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-autolanding/76/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-autolanding/76/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-autolanding/76/console

review: Needs Fixing (continuous-integration)

[Christopher Townsend (townsend)]

Re-approving due to some weird jenkins publickey failures.

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'dash/ResultView.h'
--- dash/ResultView.h	2013-07-01 21:19:33 +0000
+++ dash/ResultView.h	2013-07-04 08:04:42 +0000
@@ -61,6 +61,7 @@
   typedef enum ActivateType_
   {
     DIRECT,
+    PREVIEW_LEFT_BUTTON,
     PREVIEW
   } ActivateType;
 

=== modified file 'dash/ResultViewGrid.cpp'
--- dash/ResultViewGrid.cpp	2013-05-13 19:24:26 +0000
+++ dash/ResultViewGrid.cpp	2013-07-04 08:04:42 +0000
@@ -812,7 +812,7 @@
       {
         // delay activate for single left click. (for double click check)
         activate_timer_.reset(new glib::Timeout(DOUBLE_CLICK_SPEED, [this, index]() {
-          Activate(activated_result_, index, ResultView::ActivateType::PREVIEW);
+          Activate(activated_result_, index, ResultView::ActivateType::PREVIEW_LEFT_BUTTON);
           return false;
         }));
       }

=== modified file 'dash/ScopeView.cpp'
--- dash/ScopeView.cpp	2013-07-04 06:35:46 +0000
+++ dash/ScopeView.cpp	2013-07-04 08:04:42 +0000
@@ -474,15 +474,23 @@
 
   if (scope_)
   {
+    const std::string category_id = category.id();
     std::string unique_id = category.name() + scope_->name();
     results_view->unique_id = unique_id;
     results_view->expanded = false;
 
-    results_view->ResultActivated.connect([this, unique_id] (LocalResult const& local_result, ResultView::ActivateType type, GVariant* data)
+    results_view->ResultActivated.connect([this, unique_id, category_id] (LocalResult const& local_result, ResultView::ActivateType type, GVariant* data)
     {
       if (g_str_has_prefix(local_result.uri.c_str(), "x-unity-no-preview"))
         type = ResultView::ActivateType::DIRECT;
 
+      // Applications scope results should be activated on left-click (instead of preview). Note that app scope can still
+      // respond with preview for activation request (the case for uninstalled apps).
+      bool is_app_scope_result = (scope_->id() == "applications.scope" || (scope_->id() == "home.scope" && category_id == "applications.scope"));
+
+      if (is_app_scope_result && type == ResultView::ActivateType::PREVIEW_LEFT_BUTTON)
+        type = ResultView::ActivateType::DIRECT;
+      
       result_activated.emit(type, local_result, data, unique_id);
       switch (type)
       {
@@ -490,6 +498,7 @@
         {
           scope_->Activate(local_result, nullptr, cancellable_);
         } break;
+        case ResultView::ActivateType::PREVIEW_LEFT_BUTTON:
         case ResultView::ActivateType::PREVIEW:
         {
           scope_->Preview(local_result, nullptr, cancellable_);

=== modified file 'tests/autopilot/unity/tests/test_dash.py'
--- tests/autopilot/unity/tests/test_dash.py	2013-06-14 16:30:01 +0000
+++ tests/autopilot/unity/tests/test_dash.py	2013-07-04 08:04:42 +0000
@@ -794,13 +794,68 @@
 
         result = results[0]
         # result.preview handles finding xy co-ords and right mouse-click
-        result.preview()
+        result.preview(button=2)
         self.assertThat(self.unity.dash.preview_displaying, Eventually(Equals(True)))
 
         self.keyboard.press_and_release("Escape")
 
         self.assertThat(self.unity.dash.preview_displaying, Eventually(Equals(False)))
 
+    def test_app_scope_lmb_installed_app(self):
+        """Left-clicking on an application scope result in 'Installed' category
+        must activate it.
+        """
+        gettext.install("unity-scope-applications", unicode=True)
+        scope = self.unity.dash.reveal_application_scope()
+        
+        self.addCleanup(self.process_manager.close_all_app, "Character Map")
+        self.addCleanup(self.unity.dash.ensure_hidden)
+
+        self.keyboard.type("Character")
+        # wait for "Installed" category
+        category = self.wait_for_category(scope, _("Installed"))
+
+        # wait for some results
+        self.assertThat(lambda: len(category.get_results()), Eventually(GreaterThan(0), timeout=20))
+        results = category.get_results()
+
+        result = results[0]
+        # result.preview handles finding xy co-ords and right mouse-click
+        result.activate(double_click=False)
+
+        # make sure it started
+        self.assertThat(lambda: len(self.process_manager.get_open_windows_by_application("Character Map")), Eventually(Equals(1), timeout=10))
+
+        self.assertThat(self.unity.dash.preview_displaying, Eventually(Equals(False)))
+
+    def test_home_scope_lmb_app(self):
+        """Left-clicking on an application scope result in 'Application' category of Home
+        must activate it.
+        """
+        gettext.install("unity-scope-applications", unicode=True)
+        self.unity.dash.ensure_visible()
+        scope = self.unity.dash.view.get_scopeview_by_name("home.scope")
+        
+        self.addCleanup(self.process_manager.close_all_app, "Character Map")
+        self.addCleanup(self.unity.dash.ensure_hidden)
+
+        self.keyboard.type("Character Map")
+        # wait for "Applications" category
+        category = self.wait_for_category(scope, _("Applications"))
+
+        # wait for some results
+        self.assertThat(lambda: len(category.get_results()), Eventually(GreaterThan(0), timeout=20))
+        results = category.get_results()
+
+        result = results[0]
+        # result.preview handles finding xy co-ords and right mouse-click
+        result.activate(double_click=False)
+
+        # make sure it started
+        self.assertThat(lambda: len(self.process_manager.get_open_windows_by_application("Character Map")), Eventually(Equals(1), timeout=10))
+
+        self.assertThat(self.unity.dash.preview_displaying, Eventually(Equals(False)))
+
     def test_files_scope_preview_open_close(self):
         """Right-clicking on a files scope result must show its
         preview.