Merge lp:~aacid/unity8/dash_show_home_no_index into lp:unity8

[Albert Astals Cid]

dashItemSelected -> showDashHome

Because we are not using the index at all in the upper layers

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:572
http://jenkins.qa.ubuntu.com/job/unity8-ci/1821/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/1421
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/1390
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/556
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/344
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/345
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/345/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/344
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/1262
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/1421
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/1421/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/1390
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/1390/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/3921
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/2063

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

review: Approve (continuous-integration)

[Andrea Cimitan (cimi)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity8-autolanding/848/
Executed test runs:
    FAILURE: http://s-jenkins.ubuntu-ci:8080/job/generic-cleanup-mbs/3581/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/1551/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/1506/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/610/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-autolanding/234/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-autolanding/234/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-autolanding/234/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/1551/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/1506/console

review: Needs Fixing (continuous-integration)

[Andrea Cimitan (cimi)]

review: Approve

[Michał Sawicz (saviq)]

Please merge trunk.

[Michał Sawicz (saviq)]

Please ignore.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:573
http://jenkins.qa.ubuntu.com/job/unity8-ci/1852/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/1555/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/1507
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/611
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/375
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/376
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/376/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/375
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/1380/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/1555
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/1555/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/1507
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/1507/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/4034
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/2195

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity8-autolanding/849/
Executed test runs:
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/generic-cleanup-mbs/3582
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/1557/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/1509
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/613
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-autolanding/235
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-autolanding/235
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-autolanding/235/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-autolanding/235
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/1382/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/1557
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/1557/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/1509
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/1509/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/4036
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/2197

review: Needs Fixing (continuous-integration)

[Francis Ginther (fginther)]

Otto trusty environment needed to be updated. A test run after the update passed, so re-approving.

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity8-autolanding/851/
Executed test runs:
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/generic-cleanup-mbs/3585
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/1573
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/1523/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/620
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-autolanding/237
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-autolanding/237
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-autolanding/237/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-autolanding/237
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/1395
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/1573
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/1573/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/1523
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/1523/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/4047/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/2208

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'Launcher/Launcher.qml'
--- Launcher/Launcher.qml	2013-11-05 15:43:13 +0000
+++ Launcher/Launcher.qml	2013-12-10 14:00:58 +0000
@@ -41,7 +41,7 @@
     signal dash()
 
     // emitted when the dash icon in the launcher has been tapped
-    signal dashItemSelected()
+    signal showDashHome()
 
     onStateChanged: {
         if (state == "") {
@@ -161,9 +161,9 @@
             root.state = ""
             launcherApplicationSelected(appId)
         }
-        onDashItemSelected: {
+        onShowDashHome: {
             root.state = ""
-            root.dashItemSelected(index)
+            root.showDashHome();
         }
 
         onPreventHidingChanged: {

=== modified file 'Launcher/LauncherPanel.qml'
--- Launcher/LauncherPanel.qml	2013-11-19 22:24:49 +0000
+++ Launcher/LauncherPanel.qml	2013-12-10 14:00:58 +0000
@@ -36,7 +36,7 @@
     property int highlightIndex: -1
 
     signal applicationSelected(string appId)
-    signal dashItemSelected(int index)
+    signal showDashHome()
 
     BorderImage {
         id: background
@@ -57,7 +57,7 @@
             id: dashItem
             width: parent.width
             height: units.gu(7)
-            onClicked: root.dashItemSelected(0)
+            onClicked: root.showDashHome()
             z: 1
             Image {
                 objectName: "dashItem"

=== modified file 'Shell.qml'
--- Shell.qml	2013-12-04 13:24:06 +0000
+++ Shell.qml	2013-12-10 14:00:58 +0000
@@ -667,7 +667,7 @@
             dragAreaWidth: shell.edgeSize
             available: (!greeter.shown || greeter.narrowMode) && edgeDemo.launcherEnabled
 
-            onDashItemSelected: {
+            onShowDashHome: {
                 if (edgeDemo.running)
                     return;
 

=== modified file 'tests/qmltests/Launcher/tst_Launcher.qml'
--- tests/qmltests/Launcher/tst_Launcher.qml	2013-10-21 09:02:32 +0000
+++ tests/qmltests/Launcher/tst_Launcher.qml	2013-12-10 14:00:58 +0000
@@ -41,9 +41,9 @@
             lastSelectedApplication = appId
         }
 
-        property int dashItemSelected_count: 0
-        onDashItemSelected: {
-            dashItemSelected_count++;
+        property int showDashHome_count: 0
+        onShowDashHome: {
+            showDashHome_count++;
         }
 
         property int maxPanelX: 0
@@ -138,9 +138,9 @@
         }
 
         /* If I click on the dash icon on the launcher
-           Launcher::dashItemSelected signal should be emitted */
+           Launcher::showDashHome signal should be emitted */
         function test_clickingOnDashIconCausesSignalEmission() {
-            launcher.dashItemSelected_count = 0
+            launcher.showDashHome_count = 0
 
             revealer.dragLauncherIntoView()
 
@@ -149,7 +149,7 @@
 
             mouseClick(dashIcon, dashIcon.width/2, dashIcon.height/2)
 
-            tryCompare(launcher, "dashItemSelected_count", 1)
+            tryCompare(launcher, "showDashHome_count", 1)
 
             // Tapping on the dash icon also dismisses the launcher
             revealer.waitUntilLauncherDisappears()