Merge lp:~alecu/unity8/show-hide-dash into lp:unity8

[Alejandro J. Cura]

Make SHOW_DASH and HIDE_DASH close the current preview

Make SHOW_DASH and HIDE_DASH close the current preview

[Diego Sarmentero (diegosarmentero)]

looks good

review: Approve

[Michał Sawicz (saviq)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:349
http://jenkins.qa.ubuntu.com/job/unity8-ci/1138/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/4038
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/1653
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/1886
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-amd64-ci/161
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1138
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1138/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/1137
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/350
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/4136
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/4136/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1655
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1655/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/1386
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/1398

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity8-ci/1138/rebuild

review: Approve (continuous-integration)

=== modified file 'Dash/GenericScopeView.qml'
--- Dash/GenericScopeView.qml	2013-09-19 15:28:42 +0000
+++ Dash/GenericScopeView.qml	2013-09-26 12:00:21 +0000
@@ -50,6 +50,12 @@
         }
     }
 
+    Connections {
+        target: scopeView.scope
+        onShowDash: previewLoader.open = false;
+        onHideDash: previewLoader.open = false;
+    }
+
     ScopeListView {
         id: categoryView
         anchors.fill: parent

=== modified file 'tests/mocks/Unity/fake_scope.h'
--- tests/mocks/Unity/fake_scope.h	2013-09-02 20:34:05 +0000
+++ tests/mocks/Unity/fake_scope.h	2013-09-26 12:00:21 +0000
@@ -90,6 +90,8 @@
     // signals triggered by activate(..) or preview(..) requests.
     void previewReady(Preview *preview);
     void activateApplication(const QString &desktop);
+    void showDash();
+    void hideDash();
 
 protected:
 

=== modified file 'tests/qmltests/Dash/tst_GenericScopeView.qml'
--- tests/qmltests/Dash/tst_GenericScopeView.qml	2013-09-17 16:40:27 +0000
+++ tests/qmltests/Dash/tst_GenericScopeView.qml	2013-09-26 12:00:21 +0000
@@ -52,6 +52,20 @@
                 tryCompare(pageHeader, "searchQuery", "")
                 tryCompare(genericScopeView, "previewShown", false);
             }
+
+            function test_showDash() {
+                var previewLoader = findChild(genericScopeView, "previewLoader");
+                previewLoader.open = true;
+                scopes.get(0).showDash();
+                tryCompare(genericScopeView, "previewShown", false);
+            }
+
+            function test_hideDash() {
+                var previewLoader = findChild(genericScopeView, "previewLoader");
+                previewLoader.open = true;
+                scopes.get(0).hideDash();
+                tryCompare(genericScopeView, "previewShown", false);
+            }
         }
     }
 }