1
=== modified file 'Launcher/Launcher.qml'
2
--- Launcher/Launcher.qml	2013-11-05 15:43:13 +0000
3
+++ Launcher/Launcher.qml	2013-12-10 14:00:58 +0000
4
@@ -41,7 +41,7 @@
5
41
    signal dash()
41
    signal dash()
6
42
42
7
43
    // emitted when the dash icon in the launcher has been tapped
43
    // emitted when the dash icon in the launcher has been tapped
9
44
    signal dashItemSelected()
44
    signal showDashHome()
10
45
45
11
46
    onStateChanged: {
46
    onStateChanged: {
12
47
        if (state == "") {
47
        if (state == "") {
13
@@ -161,9 +161,9 @@
14
161
            root.state = ""
161
            root.state = ""
15
162
            launcherApplicationSelected(appId)
162
            launcherApplicationSelected(appId)
16
163
        }
163
        }
18
164
        onDashItemSelected: {
164
        onShowDashHome: {
19
165
            root.state = ""
165
            root.state = ""
21
166
            root.dashItemSelected(index)
166
            root.showDashHome();
22
167
        }
167
        }
23
168
168
24
169
        onPreventHidingChanged: {
169
        onPreventHidingChanged: {
25
170
170
26
=== modified file 'Launcher/LauncherPanel.qml'
27
--- Launcher/LauncherPanel.qml	2013-11-19 22:24:49 +0000
28
+++ Launcher/LauncherPanel.qml	2013-12-10 14:00:58 +0000
29
@@ -36,7 +36,7 @@
30
36
    property int highlightIndex: -1
36
    property int highlightIndex: -1
31
37
37
32
38
    signal applicationSelected(string appId)
38
    signal applicationSelected(string appId)
34
39
    signal dashItemSelected(int index)
39
    signal showDashHome()
35
40
40
36
41
    BorderImage {
41
    BorderImage {
37
42
        id: background
42
        id: background
38
@@ -57,7 +57,7 @@
39
57
            id: dashItem
57
            id: dashItem
40
58
            width: parent.width
58
            width: parent.width
41
59
            height: units.gu(7)
59
            height: units.gu(7)
43
60
            onClicked: root.dashItemSelected(0)
60
            onClicked: root.showDashHome()
44
61
            z: 1
61
            z: 1
45
62
            Image {
62
            Image {
46
63
                objectName: "dashItem"
63
                objectName: "dashItem"
47
64
64
48
=== modified file 'Shell.qml'
49
--- Shell.qml	2013-12-04 13:24:06 +0000
50
+++ Shell.qml	2013-12-10 14:00:58 +0000
51
@@ -667,7 +667,7 @@
52
667
            dragAreaWidth: shell.edgeSize
667
            dragAreaWidth: shell.edgeSize
53
668
            available: (!greeter.shown || greeter.narrowMode) && edgeDemo.launcherEnabled
668
            available: (!greeter.shown || greeter.narrowMode) && edgeDemo.launcherEnabled
54
669
669
56
670
            onDashItemSelected: {
670
            onShowDashHome: {
57
671
                if (edgeDemo.running)
671
                if (edgeDemo.running)
58
672
                    return;
672
                    return;
59
673
673
60
674
674
61
=== modified file 'tests/qmltests/Launcher/tst_Launcher.qml'
62
--- tests/qmltests/Launcher/tst_Launcher.qml	2013-10-21 09:02:32 +0000
63
+++ tests/qmltests/Launcher/tst_Launcher.qml	2013-12-10 14:00:58 +0000
64
@@ -41,9 +41,9 @@
65
41
            lastSelectedApplication = appId
41
            lastSelectedApplication = appId
66
42
        }
42
        }
67
43
43
71
44
        property int dashItemSelected_count: 0
44
        property int showDashHome_count: 0
72
45
        onDashItemSelected: {
45
        onShowDashHome: {
73
46
            dashItemSelected_count++;
46
            showDashHome_count++;
74
47
        }
47
        }
75
48
48
76
49
        property int maxPanelX: 0
49
        property int maxPanelX: 0
77
@@ -138,9 +138,9 @@
78
138
        }
138
        }
79
139
139
80
140
        /* If I click on the dash icon on the launcher
140
        /* If I click on the dash icon on the launcher
82
141
           Launcher::dashItemSelected signal should be emitted */
141
           Launcher::showDashHome signal should be emitted */
83
142
        function test_clickingOnDashIconCausesSignalEmission() {
142
        function test_clickingOnDashIconCausesSignalEmission() {
85
143
            launcher.dashItemSelected_count = 0
143
            launcher.showDashHome_count = 0
86
144
144
87
145
            revealer.dragLauncherIntoView()
145
            revealer.dragLauncherIntoView()
88
146
146
89
@@ -149,7 +149,7 @@
90
149
149
91
150
            mouseClick(dashIcon, dashIcon.width/2, dashIcon.height/2)
150
            mouseClick(dashIcon, dashIcon.width/2, dashIcon.height/2)
92
151
151
94
152
            tryCompare(launcher, "dashItemSelected_count", 1)
152
            tryCompare(launcher, "showDashHome_count", 1)
95
153
153
96
154
            // Tapping on the dash icon also dismisses the launcher
154
            // Tapping on the dash icon also dismisses the launcher
97
155
            revealer.waitUntilLauncherDisappears()
155
            revealer.waitUntilLauncherDisappears()
Status:	Merged
Approved by:	Michał Sawicz on 2013-12-10
Approved revision:	573
Merged at revision:	583
Proposed branch:	lp:~aacid/unity8/dash_show_home_no_index
Merge into:	lp:unity8
Diff against target:	97 lines (+12/-12) 4 files modified Launcher/Launcher.qml (+3/-3) Launcher/LauncherPanel.qml (+2/-2) Shell.qml (+1/-1) tests/qmltests/Launcher/tst_Launcher.qml (+6/-6)
To merge this branch:	bzr merge lp:~aacid/unity8/dash_show_home_no_index
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration		Approve on 2013-12-10
Andrea Cimitan (community)		2013-12-04	Approve on 2013-12-10
Review via email: mp+197714@code.launchpad.net
1	=== modified file 'Launcher/Launcher.qml'
2	--- Launcher/Launcher.qml 2013-11-05 15:43:13 +0000
3	+++ Launcher/Launcher.qml 2013-12-10 14:00:58 +0000
4	@@ -41,7 +41,7 @@
5	41	signal dash()	41	signal dash()
6	42		42
7	43	// emitted when the dash icon in the launcher has been tapped	43	// emitted when the dash icon in the launcher has been tapped
9	44	signal dashItemSelected()	44	signal showDashHome()
10	45		45
11	46	onStateChanged: {	46	onStateChanged: {
12	47	if (state == "") {	47	if (state == "") {
13	@@ -161,9 +161,9 @@
14	161	root.state = ""	161	root.state = ""
15	162	launcherApplicationSelected(appId)	162	launcherApplicationSelected(appId)
16	163	}	163	}
18	164	onDashItemSelected: {	164	onShowDashHome: {
19	165	root.state = ""	165	root.state = ""
21	166	root.dashItemSelected(index)	166	root.showDashHome();
22	167	}	167	}
23	168		168
24	169	onPreventHidingChanged: {	169	onPreventHidingChanged: {
25	170		170
26	=== modified file 'Launcher/LauncherPanel.qml'
27	--- Launcher/LauncherPanel.qml 2013-11-19 22:24:49 +0000
28	+++ Launcher/LauncherPanel.qml 2013-12-10 14:00:58 +0000
29	@@ -36,7 +36,7 @@
30	36	property int highlightIndex: -1	36	property int highlightIndex: -1
31	37		37
32	38	signal applicationSelected(string appId)	38	signal applicationSelected(string appId)
34	39	signal dashItemSelected(int index)	39	signal showDashHome()
35	40		40
36	41	BorderImage {	41	BorderImage {
37	42	id: background	42	id: background
38	@@ -57,7 +57,7 @@
39	57	id: dashItem	57	id: dashItem
40	58	width: parent.width	58	width: parent.width
41	59	height: units.gu(7)	59	height: units.gu(7)
43	60	onClicked: root.dashItemSelected(0)	60	onClicked: root.showDashHome()
44	61	z: 1	61	z: 1
45	62	Image {	62	Image {
46	63	objectName: "dashItem"	63	objectName: "dashItem"
47	64		64
48	=== modified file 'Shell.qml'
49	--- Shell.qml 2013-12-04 13:24:06 +0000
50	+++ Shell.qml 2013-12-10 14:00:58 +0000
51	@@ -667,7 +667,7 @@
52	667	dragAreaWidth: shell.edgeSize	667	dragAreaWidth: shell.edgeSize
53	668	available: (!greeter.shown \|\| greeter.narrowMode) && edgeDemo.launcherEnabled	668	available: (!greeter.shown \|\| greeter.narrowMode) && edgeDemo.launcherEnabled
54	669		669
56	670	onDashItemSelected: {	670	onShowDashHome: {
57	671	if (edgeDemo.running)	671	if (edgeDemo.running)
58	672	return;	672	return;
59	673		673
60	674		674
61	=== modified file 'tests/qmltests/Launcher/tst_Launcher.qml'
62	--- tests/qmltests/Launcher/tst_Launcher.qml 2013-10-21 09:02:32 +0000
63	+++ tests/qmltests/Launcher/tst_Launcher.qml 2013-12-10 14:00:58 +0000
64	@@ -41,9 +41,9 @@
65	41	lastSelectedApplication = appId	41	lastSelectedApplication = appId
66	42	}	42	}
67	43		43
71	44	property int dashItemSelected_count: 0	44	property int showDashHome_count: 0
72	45	onDashItemSelected: {	45	onShowDashHome: {
73	46	dashItemSelected_count++;	46	showDashHome_count++;
74	47	}	47	}
75	48		48
76	49	property int maxPanelX: 0	49	property int maxPanelX: 0
77	@@ -138,9 +138,9 @@
78	138	}	138	}
79	139		139
80	140	/* If I click on the dash icon on the launcher	140	/* If I click on the dash icon on the launcher
82	141	Launcher::dashItemSelected signal should be emitted */	141	Launcher::showDashHome signal should be emitted */
83	142	function test_clickingOnDashIconCausesSignalEmission() {	142	function test_clickingOnDashIconCausesSignalEmission() {
85	143	launcher.dashItemSelected_count = 0	143	launcher.showDashHome_count = 0
86	144		144
87	145	revealer.dragLauncherIntoView()	145	revealer.dragLauncherIntoView()
88	146		146
89	@@ -149,7 +149,7 @@
90	149		149
91	150	mouseClick(dashIcon, dashIcon.width/2, dashIcon.height/2)	150	mouseClick(dashIcon, dashIcon.width/2, dashIcon.height/2)
92	151		151
94	152	tryCompare(launcher, "dashItemSelected_count", 1)	152	tryCompare(launcher, "showDashHome_count", 1)
95	153		153
96	154	// Tapping on the dash icon also dismisses the launcher	154	// Tapping on the dash icon also dismisses the launcher
97	155	revealer.waitUntilLauncherDisappears()	155	revealer.waitUntilLauncherDisappears()