1
=== modified file 'Dash/GenericScopeView.qml'
2
--- Dash/GenericScopeView.qml	2013-11-08 03:10:09 +0000
3
+++ Dash/GenericScopeView.qml	2013-11-14 15:12:49 +0000
4
@@ -16,15 +16,60 @@
5
16
16
6
17
import QtQuick 2.0
17
import QtQuick 2.0
7
18
import Ubuntu.Components 0.1
18
import Ubuntu.Components 0.1
8
19
import Utils 0.1
9
20
import Unity 0.1
10
19
import "../Components"
21
import "../Components"
11
20
import "../Components/ListItems" as ListItems
22
import "../Components/ListItems" as ListItems
12
21
23
14
22
ScopeView {
24
FocusScope {
15
23
    id: scopeView
25
    id: scopeView
16
26
17
27
    property Scope scope
18
28
    property SortFilterProxyModel categories: categoryFilter
19
29
    property bool isCurrent
20
30
    property ListModel searchHistory
21
31
    property alias moving: categoryView.moving
22
32
23
33
    signal endReached
24
34
    signal movementStarted
25
35
    signal positionedAtBeginning
26
36
27
24
    readonly property alias previewShown: previewListView.onScreen
37
    readonly property alias previewShown: previewListView.onScreen
28
25
    property bool enableHeightBehaviorOnNextCreation: false
38
    property bool enableHeightBehaviorOnNextCreation: false
29
26
39
31
27
    moving: categoryView.moving
40
    // FIXME delay the search so that daemons have time to settle, note that
32
41
    // removing this will break ScopeView::test_changeScope
33
42
    onScopeChanged: {
34
43
        if (scope) {
35
44
            timer.restart();
36
45
            scope.activateApplication.connect(activateApp);
37
46
        }
38
47
    }
39
48
40
49
    function activateApp(desktopFilePath) {
41
50
        shell.activateApplication(desktopFilePath);
42
51
    }
43
52
44
53
    Binding {
45
54
        target: scope
46
55
        property: "isActive"
47
56
        value: isCurrent
48
57
    }
49
58
50
59
    Timer {
51
60
        id: timer
52
61
        interval: 2000
53
62
        onTriggered: scope.searchQuery = ""
54
63
    }
55
64
56
65
    SortFilterProxyModel {
57
66
        id: categoryFilter
58
67
        model: scope ? scope.categories : null
59
68
        dynamicSortFilter: true
60
69
        filterRole: Categories.RoleCount
61
70
        filterRegExp: /^0$/
62
71
        invertMatch: true
63
72
    }
64
28
73
65
29
    onIsCurrentChanged: {
74
    onIsCurrentChanged: {
66
30
        pageHeader.resetSearch();
75
        pageHeader.resetSearch();
67
31
76
68
=== removed file 'Dash/ScopeView.qml'
69
--- Dash/ScopeView.qml	2013-10-11 10:07:25 +0000
70
+++ Dash/ScopeView.qml	1970-01-01 00:00:00 +0000
71
@@ -1,65 +0,0 @@
72
1
/*
73
2
 * Copyright (C) 2013 Canonical, Ltd.
74
3
 *
75
4
 * This program is free software; you can redistribute it and/or modify
76
5
 * it under the terms of the GNU General Public License as published by
77
6
 * the Free Software Foundation; version 3.
78
7
 *
79
8
 * This program is distributed in the hope that it will be useful,
80
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
81
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
82
11
 * GNU General Public License for more details.
83
12
 *
84
13
 * You should have received a copy of the GNU General Public License
85
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
86
15
 */
87
16
88
17
import QtQuick 2.0
89
18
import Utils 0.1
90
19
import Unity 0.1
91
20
92
21
FocusScope {
93
22
    property Scope scope
94
23
    property SortFilterProxyModel categories: categoryFilter
95
24
    property bool isCurrent
96
25
    property ListModel searchHistory
97
26
    property bool moving: false
98
27
99
28
    signal endReached
100
29
    signal movementStarted
101
30
    signal positionedAtBeginning
102
31
103
32
    // FIXME delay the search so that daemons have time to settle, note that
104
33
    // removing this will break ScopeView::test_changeScope
105
34
    onScopeChanged: {
106
35
        if (scope) {
107
36
            timer.restart();
108
37
            scope.activateApplication.connect(activateApp);
109
38
        }
110
39
    }
111
40
112
41
    function activateApp(desktopFilePath) {
113
42
        shell.activateApplication(desktopFilePath);
114
43
    }
115
44
116
45
    Binding {
117
46
        target: scope
118
47
        property: "isActive"
119
48
        value: isCurrent
120
49
    }
121
50
122
51
    Timer {
123
52
        id: timer
124
53
        interval: 2000
125
54
        onTriggered: scope.searchQuery = ""
126
55
    }
127
56
128
57
    SortFilterProxyModel {
129
58
        id: categoryFilter
130
59
        model: scope ? scope.categories : null
131
60
        dynamicSortFilter: true
132
61
        filterRole: Categories.RoleCount
133
62
        filterRegExp: /^0$/
134
63
        invertMatch: true
135
64
    }
136
65
}
137
66
0
138
=== modified file 'tests/qmltests/CMakeLists.txt'
139
--- tests/qmltests/CMakeLists.txt	2013-11-08 19:56:54 +0000
140
+++ tests/qmltests/CMakeLists.txt	2013-11-14 15:12:49 +0000
141
@@ -45,7 +45,6 @@
142
45
add_qml_test(Dash DashPreview)
45
add_qml_test(Dash DashPreview)
143
46
add_qml_test(Dash GenericPreview)
46
add_qml_test(Dash GenericPreview)
144
47
add_qml_test(Dash GenericScopeView IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS})
47
add_qml_test(Dash GenericScopeView IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS})
145
48
add_qml_test(Dash ScopeView IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS})
146
49
add_qml_test(Dash FilterGrids IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/plugins ${CMAKE_CURRENT_SOURCE_DIR}/plugins
48
add_qml_test(Dash FilterGrids IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/plugins ${CMAKE_CURRENT_SOURCE_DIR}/plugins
147
50
                                           ${CMAKE_BINARY_DIR}/tests/mocks)
49
                                           ${CMAKE_BINARY_DIR}/tests/mocks)
148
51
add_qml_test(Dash/Apps RunningApplicationsGrid IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
50
add_qml_test(Dash/Apps RunningApplicationsGrid IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
149
52
51
150
=== modified file 'tests/qmltests/Dash/qml/FakeScopeView.qml'
151
--- tests/qmltests/Dash/qml/FakeScopeView.qml	2013-10-31 10:41:10 +0000
152
+++ tests/qmltests/Dash/qml/FakeScopeView.qml	2013-11-14 15:12:49 +0000
153
@@ -19,14 +19,13 @@
154
19
19
155
20
import "../../../../Dash"
20
import "../../../../Dash"
156
21
21
158
22
ScopeView {
22
GenericScopeView {
159
23
    id: fakeScopeView
23
    id: fakeScopeView
160
24
24
161
25
    property alias backColor : back.color
25
    property alias backColor : back.color
162
26
    moving: listView.moving
163
27
26
164
28
    onEndReached: {
27
    onEndReached: {
166
29
        if (shell != undefined && shell.scopeStatus != undefined) {
28
        if (scope != undefined && shell != undefined && shell.scopeStatus != undefined) {
167
30
            shell.scopeStatus[scope.id].endReached++;
29
            shell.scopeStatus[scope.id].endReached++;
168
31
        }
30
        }
169
32
    }
31
    }
170
@@ -45,71 +44,6 @@
171
45
        id: back
44
        id: back
172
46
        anchors.fill: parent
45
        anchors.fill: parent
173
47
        color: "grey"
46
        color: "grey"
240
48
    }
47
        z: -1
175
49
176
50
    function randomBg()
177
51
    {
178
52
        var hex1=new Array("4", "5", "6", "7", "8", "9", "A", "B", "C", "D", "E", "F")
179
53
        var bg="#"+hex1[Math.floor(Math.random()*hex1.length)]+
180
54
                    hex1[Math.floor(Math.random()*hex1.length)]+
181
55
                    hex1[Math.floor(Math.random()*hex1.length)]+
182
56
                    hex1[Math.floor(Math.random()*hex1.length)]+
183
57
                    hex1[Math.floor(Math.random()*hex1.length)]+
184
58
                    hex1[Math.floor(Math.random()*hex1.length)]
185
59
        return bg
186
60
    }
187
61
188
62
189
63
    ListView {
190
64
        id: listView
191
65
        anchors.fill: parent
192
66
        model: scope ? scope.categories : null
193
67
        orientation: ListView.Vertical
194
68
195
69
        delegate:  Column {
196
70
            id: column
197
71
            width: listView.width
198
72
            height: childrenRect.height
199
73
200
74
            Rectangle {
201
75
                width: listView.width
202
76
                height: units.gu(3)
203
77
                color: randomBg()
204
78
205
79
                Text {
206
80
                    text: name
207
81
                    font.family: "Ubuntu"
208
82
                    font.weight: Font.Bold
209
83
                    font.pixelSize: 20
210
84
                    anchors.horizontalCenter: parent.horizontalCenter
211
85
                }
212
86
            }
213
87
            GridView {
214
88
                id: resultsGrid
215
89
                model: results
216
90
                cellWidth: units.gu(10); cellHeight: units.gu(10)
217
91
                height: childrenRect.height
218
92
                width: listView.width
219
93
                interactive: false
220
94
221
95
                delegate:  Component {
222
96
                    id: resultDelegate
223
97
                    Item {
224
98
                        width: resultsGrid.cellWidth; height: resultsGrid.cellHeight
225
99
                        Column {
226
100
                            anchors.verticalCenter: parent.verticalCenter
227
101
                            anchors.horizontalCenter: parent.horizontalCenter
228
102
                            Image {
229
103
                                width: units.gu(5)
230
104
                                height: units.gu(5)
231
105
                                source: icon
232
106
                                anchors.horizontalCenter: parent.horizontalCenter
233
107
                            }
234
108
                            Text { text: title; anchors.horizontalCenter: parent.horizontalCenter }
235
109
                        }
236
110
                    }
237
111
               }
238
112
            }
239
113
        }
241
114
    }
48
    }
242
115
}
49
}
243
116
50
244
=== modified file 'tests/qmltests/Dash/tst_DashContent.qml'
245
--- tests/qmltests/Dash/tst_DashContent.qml	2013-10-31 10:41:10 +0000
246
+++ tests/qmltests/Dash/tst_DashContent.qml	2013-11-14 15:12:49 +0000
247
@@ -28,6 +28,18 @@
248
28
28
249
29
    property ListModel searchHistory: ListModel {}
29
    property ListModel searchHistory: ListModel {}
250
30
30
251
31
    Item {
252
32
        // Fake. Make a few components less noisy
253
33
        id: greeter
254
34
        signal shownChanged
255
35
    }
256
36
257
37
    Item {
258
38
        // Fake. Make a few components less noisy
259
39
        id: panel
260
40
        signal searchClicked
261
41
    }
262
42
263
31
    property var scopeStatus: {
43
    property var scopeStatus: {
264
32
        'MockScope1': { 'movementStarted': 0, 'positionedAtBeginning': 0 },
44
        'MockScope1': { 'movementStarted': 0, 'positionedAtBeginning': 0 },
265
33
        'MockScope2': { 'movementStarted': 0, 'positionedAtBeginning': 0 },
45
        'MockScope2': { 'movementStarted': 0, 'positionedAtBeginning': 0 },
266
@@ -111,10 +123,17 @@
267
111
            clear_scope_status();
123
            clear_scope_status();
268
112
            dashContent.visible = true;
124
            dashContent.visible = true;
269
113
125
270
126
            var dashContentList = findChild(dashContent, "dashContentList");
271
127
            verify(dashContentList != undefined);
272
128
            // TODO For Qt 5.2 remove this wait
273
129
            // and the tryCompare and see if it still crashes when
274
130
            // looping the test
275
131
            wait(1000);
276
132
            if (dashContentList.currentItem !== null) {
277
133
                tryCompare(dashContentList.currentItem, "moving", false);
278
134
            }
279
114
            scopesModel.clear();
135
            scopesModel.clear();
280
115
            // wait for dash to empty scopes.
136
            // wait for dash to empty scopes.
281
116
            var dashContentList = findChild(dashContent, "dashContentList");
282
117
            verify(dashContentList != undefined);
283
118
            tryCompare(dashContentList, "count", 0);
137
            tryCompare(dashContentList, "count", 0);
284
119
        }
138
        }
285
120
139
286
@@ -237,7 +256,7 @@
287
237
256
288
238
            var startX = dashContentList.width/2;
257
            var startX = dashContentList.width/2;
289
239
            var startY = dashContentList.height/2;
258
            var startY = dashContentList.height/2;
291
240
            touchFlick(dashContentList, startX, startY, startX, startY - units.gu(800));
259
            touchFlick(dashContentList, startX, startY, startX, startY - units.gu(80));
292
241
260
293
242
            tryCompare(dashContentList.currentItem, "moving", true);
261
            tryCompare(dashContentList.currentItem, "moving", true);
294
243
262
295
244
263
296
=== modified file 'tests/qmltests/Dash/tst_GenericScopeView.qml'
297
--- tests/qmltests/Dash/tst_GenericScopeView.qml	2013-11-07 16:28:38 +0000
298
+++ tests/qmltests/Dash/tst_GenericScopeView.qml	2013-11-14 15:12:49 +0000
299
@@ -190,6 +190,13 @@
300
190
190
301
191
                closePreview();
191
                closePreview();
302
192
            }
192
            }
303
193
304
194
            function test_changeScope() {
305
195
                genericScopeView.scope.searchQuery = "test"
306
196
                genericScopeView.scope = scopes.get(1)
307
197
                genericScopeView.scope = scopes.get(0)
308
198
                tryCompare(genericScopeView.scope, "searchQuery", "")
309
199
            }
310
193
        }
200
        }
311
194
    }
201
    }
312
195
}
202
}
313
196
203
314
=== removed file 'tests/qmltests/Dash/tst_ScopeView.qml'
315
--- tests/qmltests/Dash/tst_ScopeView.qml	2013-06-13 09:27:02 +0000
316
+++ tests/qmltests/Dash/tst_ScopeView.qml	1970-01-01 00:00:00 +0000
317
@@ -1,52 +0,0 @@
318
1
/*
319
2
 * Copyright 2013 Canonical Ltd.
320
3
 *
321
4
 * This program is free software; you can redistribute it and/or modify
322
5
 * it under the terms of the GNU General Public License as published by
323
6
 * the Free Software Foundation; version 3.
324
7
 *
325
8
 * This program is distributed in the hope that it will be useful,
326
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
327
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
328
11
 * GNU General Public License for more details.
329
12
 *
330
13
 * You should have received a copy of the GNU General Public License
331
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
332
15
 */
333
16
334
17
import QtQuick 2.0
335
18
import QtTest 1.0
336
19
import Unity 0.1
337
20
import ".."
338
21
import "../../../Dash"
339
22
import Ubuntu.Components 0.1
340
23
341
24
Item {
342
25
    width: units.gu(120)
343
26
    height: units.gu(80)
344
27
345
28
    Scopes {
346
29
        id: scopes
347
30
    }
348
31
349
32
    ScopeView {
350
33
        id: scopeView
351
34
        anchors.fill: parent
352
35
353
36
        TestCase {
354
37
            name: "ScopeView"
355
38
            when: scopes.loaded
356
39
357
40
            function init() {
358
41
                scopeView.scope = scopes.get(0)
359
42
            }
360
43
361
44
            function test_changeScope() {
362
45
                scopeView.scope.searchQuery = "test"
363
46
                scopeView.scope = scopes.get(1)
364
47
                scopeView.scope = scopes.get(0)
365
48
                tryCompare(scopeView.scope, "searchQuery", "")
366
49
            }
367
50
        }
368
51
    }
369
52
}
370
53
0
371
=== modified file 'tests/utils/modules/Unity/Test/UnityTestCase.qml'
372
--- tests/utils/modules/Unity/Test/UnityTestCase.qml	2013-11-05 10:18:43 +0000
373
+++ tests/utils/modules/Unity/Test/UnityTestCase.qml	2013-11-14 15:12:49 +0000
374
@@ -214,6 +214,8 @@
375
214
214
376
215
    // speed is in pixels/second
215
    // speed is in pixels/second
377
216
    function touchFlick(item, x, y, toX, toY, beginTouch, endTouch, speed, iterations) {
216
    function touchFlick(item, x, y, toX, toY, beginTouch, endTouch, speed, iterations) {
378
217
        // Make sure the item is rendered
379
218
        waitForRendering(item);
380
217
219
381
218
        // Default to true for beginTouch if not present
220
        // Default to true for beginTouch if not present
382
219
        beginTouch = (beginTouch !== undefined) ? beginTouch : true
221
        beginTouch = (beginTouch !== undefined) ? beginTouch : true
Status:	Merged
Approved by:	Michał Sawicz on 2013-11-18
Approved revision:	516
Merged at revision:	533
Proposed branch:	lp:~aacid/unity8/noScopeView
Merge into:	lp:unity8
Diff against target:	382 lines (+81/-192) 8 files modified Dash/GenericScopeView.qml (+47/-2) Dash/ScopeView.qml (+0/-65) tests/qmltests/CMakeLists.txt (+0/-1) tests/qmltests/Dash/qml/FakeScopeView.qml (+3/-69) tests/qmltests/Dash/tst_DashContent.qml (+22/-3) tests/qmltests/Dash/tst_GenericScopeView.qml (+7/-0) tests/qmltests/Dash/tst_ScopeView.qml (+0/-52) tests/utils/modules/Unity/Test/UnityTestCase.qml (+2/-0)
To merge this branch:	bzr merge lp:~aacid/unity8/noScopeView
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration		Approve on 2013-11-19
Nick Dedekind (community)		2013-11-08	Approve on 2013-11-14
Review via email: mp+194486@code.launchpad.net