git.iko.soy/unity8
on xenial help sign in
dashItemSelected -> showDashHome
7e7264aAlbert Astals
Launcher/Launcher.qml+3−3
compare with xenial
unifiedsplit
@@ -41,7 +41,7 @@ Item {
41 signal dash()
41 signal dash()
42
42
43 // emitted when the dash icon in the launcher has been tapped
43 // emitted when the dash icon in the launcher has been tapped
44− signal dashItemSelected()
44+ signal showDashHome()
45
45
46 onStateChanged: {
46 onStateChanged: {
47 if (state == "") {
47 if (state == "") {
@@ -161,9 +161,9 @@ Item {
161 root.state = ""
161 root.state = ""
162 launcherApplicationSelected(appId)
162 launcherApplicationSelected(appId)
163 }
163 }
164− onDashItemSelected: {
164+ onShowDashHome: {
165 root.state = ""
165 root.state = ""
166− root.dashItemSelected(index)
166+ root.showDashHome();
167 }
167 }
168
168
169 onPreventHidingChanged: {
169 onPreventHidingChanged: {
Launcher/LauncherPanel.qml+2−2
@@ -36,7 +36,7 @@ Item {
36 property int highlightIndex: -1
36 property int highlightIndex: -1
37
37
38 signal applicationSelected(string appId)
38 signal applicationSelected(string appId)
39− signal dashItemSelected(int index)
39+ signal showDashHome()
40
40
41 BorderImage {
41 BorderImage {
42 id: background
42 id: background
@@ -57,7 +57,7 @@ Item {
57 id: dashItem
57 id: dashItem
58 width: parent.width
58 width: parent.width
59 height: units.gu(7)
59 height: units.gu(7)
60− onClicked: root.dashItemSelected(0)
60+ onClicked: root.showDashHome()
61 z: 1
61 z: 1
62 Image {
62 Image {
63 objectName: "dashItem"
63 objectName: "dashItem"
Shell.qml+1−1
@@ -667,7 +667,7 @@ FocusScope {
667 dragAreaWidth: shell.edgeSize
667 dragAreaWidth: shell.edgeSize
668 available: (!greeter.shown || greeter.narrowMode) && edgeDemo.launcherEnabled
668 available: (!greeter.shown || greeter.narrowMode) && edgeDemo.launcherEnabled
669
669
670− onDashItemSelected: {
670+ onShowDashHome: {
671 if (edgeDemo.running)
671 if (edgeDemo.running)
672 return;
672 return;
673
673
tests/qmltests/Launcher/tst_Launcher.qml+6−6
@@ -41,9 +41,9 @@ Item {
41 lastSelectedApplication = appId
41 lastSelectedApplication = appId
42 }
42 }
43
43
44− property int dashItemSelected_count: 0
44+ property int showDashHome_count: 0
45− onDashItemSelected: {
45+ onShowDashHome: {
46− dashItemSelected_count++;
46+ showDashHome_count++;
47 }
47 }
48
48
49 property int maxPanelX: 0
49 property int maxPanelX: 0
@@ -138,9 +138,9 @@ Item {
138 }
138 }
139
139
140 /* If I click on the dash icon on the launcher
140 /* If I click on the dash icon on the launcher
141− Launcher::dashItemSelected signal should be emitted */
141+ Launcher::showDashHome signal should be emitted */
142 function test_clickingOnDashIconCausesSignalEmission() {
142 function test_clickingOnDashIconCausesSignalEmission() {
143− launcher.dashItemSelected_count = 0
143+ launcher.showDashHome_count = 0
144
144
145 revealer.dragLauncherIntoView()
145 revealer.dragLauncherIntoView()
146
146
@@ -149,7 +149,7 @@ Item {
149
149
150 mouseClick(dashIcon, dashIcon.width/2, dashIcon.height/2)
150 mouseClick(dashIcon, dashIcon.width/2, dashIcon.height/2)
151
151
152− tryCompare(launcher, "dashItemSelected_count", 1)
152+ tryCompare(launcher, "showDashHome_count", 1)
153
153
154 // Tapping on the dash icon also dismisses the launcher
154 // Tapping on the dash icon also dismisses the launcher
155 revealer.waitUntilLauncherDisappears()
155 revealer.waitUntilLauncherDisappears()