1
=== modified file 'qml/Dash/DashSectionHeader.qml'
2
--- qml/Dash/DashSectionHeader.qml	2016-11-04 10:38:48 +0000
3
+++ qml/Dash/DashSectionHeader.qml	2017-04-05 16:15:43 +0000
4
@@ -19,9 +19,11 @@
5
19
import Ubuntu.Components 1.3
19
import Ubuntu.Components 1.3
6
20
20
7
21
Item {
21
Item {
8
22
    property alias text: label.text
9
23
    property alias color: label.color
22
    property alias color: label.color
10
23
    property alias fontSize: label.fontSize
11
24
    property alias iconName: icon.name
24
    property alias iconName: icon.name
12
25
    property alias labelOpacity: label.opacity
13
26
    property alias text: label.text
14
25
27
15
26
    signal clicked(variant mouse)
28
    signal clicked(variant mouse)
16
27
29
17
28
30
18
=== added directory 'qml/Dash/Dashboard'
19
=== added file 'qml/Dash/Dashboard/DashboardManager.qml'
20
--- qml/Dash/Dashboard/DashboardManager.qml	1970-01-01 00:00:00 +0000
21
+++ qml/Dash/Dashboard/DashboardManager.qml	2017-04-05 16:15:43 +0000
22
@@ -0,0 +1,61 @@
23
1
/*
24
2
 * Copyright (C) 2017 Canonical, Ltd.
25
3
 *
26
4
 * This program is free software; you can redistribute it and/or modify
27
5
 * it under the terms of the GNU General Public License as published by
28
6
 * the Free Software Foundation; version 3.
29
7
 *
30
8
 * This program is distributed in the hope that it will be useful,
31
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
32
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
33
11
 * GNU General Public License for more details.
34
12
 *
35
13
 * You should have received a copy of the GNU General Public License
36
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
37
15
 */
38
16
39
17
import QtQuick 2.4
40
18
import QtQuick.Window 2.2
41
19
import Ubuntu.Components 1.3
42
20
import Unity 0.2
43
21
import "../../Components"
44
22
45
23
MainView {
46
24
    id: root
47
25
48
26
    anchors.fill: parent
49
27
50
28
    Scopes { id: scopes }
51
29
52
30
    PageHeader {
53
31
        id: pageHeader
54
32
        title: i18n.tr("Manage Dashboard")
55
33
    }
56
34
57
35
    ListView {
58
36
        id: categoriesContainer
59
37
        objectName: "categoriesContainer"
60
38
61
39
        anchors {
62
40
            top: pageHeader.bottom
63
41
            bottom: parent.bottom
64
42
            left: parent.left
65
43
            right: parent.right
66
44
        }
67
45
68
46
        clip: true
69
47
        model: scopes.overviewScope ? scopes.overviewScope.categories : null
70
48
        delegate: DashboardManagerCategory {
71
49
            categoryId: model.categoryId
72
50
            categoryName: model.name
73
51
            categoryResults: model.results
74
52
            onRequestFavorite: scopes.setFavorite(scopeId, favorite);
75
53
        }
76
54
    }
77
55
78
56
    Binding {
79
57
        target: scopes.overviewScope
80
58
        property: "isActive"
81
59
        value: root.visible
82
60
    }
83
61
}
84
0
62
85
=== added file 'qml/Dash/Dashboard/DashboardManagerCategory.qml'
86
--- qml/Dash/Dashboard/DashboardManagerCategory.qml	1970-01-01 00:00:00 +0000
87
+++ qml/Dash/Dashboard/DashboardManagerCategory.qml	2017-04-05 16:15:43 +0000
88
@@ -0,0 +1,85 @@
89
1
/*
90
2
 * Copyright (C) 2017 Canonical, Ltd.
91
3
 *
92
4
 * This program is free software; you can redistribute it and/or modify
93
5
 * it under the terms of the GNU General Public License as published by
94
6
 * the Free Software Foundation; version 3.
95
7
 *
96
8
 * This program is distributed in the hope that it will be useful,
97
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
98
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
99
11
 * GNU General Public License for more details.
100
12
 *
101
13
 * You should have received a copy of the GNU General Public License
102
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
103
15
 */
104
16
105
17
import QtQuick 2.4
106
18
import Ubuntu.Components 1.3
107
19
import "../../Components"
108
20
import ".."
109
21
110
22
ListItem {
111
23
    id: root
112
24
    objectName: name + "Section"
113
25
114
26
    signal requestFavorite(string scopeId, bool favorite)
115
27
116
28
    property alias categoryId: categoryView.categoryId
117
29
    property alias categoryName: categoryView.categoryName
118
30
    property alias categoryResults: categoryView.model
119
31
120
32
    // Expose for testing
121
33
    readonly property int index: model.index
122
34
123
35
    implicitHeight: layout.height
124
36
    divider.visible: false
125
37
126
38
    Item {
127
39
        id: layout
128
40
129
41
        height: categoryView.contentHeight
130
42
        width: parent.width
131
43
132
44
        ListView {
133
45
            id: categoryView
134
46
            objectName: "categoryView"
135
47
136
48
            property string categoryId
137
49
            property string categoryName
138
50
139
51
            readonly property bool isPinnedToDashboard: categoryId === "favorites"
140
52
            readonly property bool isAlsoInstalled: categoryId === "other"
141
53
142
54
            height: contentHeight
143
55
            width: parent.width
144
56
145
57
            header: DashSectionHeader {
146
58
                visible: results.count > 0
147
59
                fontSize: "small"
148
60
                labelOpacity: 0.75
149
61
                text: {
150
62
                    if (categoryName === "Favorites") {
151
63
                        return i18n.tr("Dashboard");
152
64
                    } else if (categoryName === "Non Favorites") {
153
65
                        return i18n.tr("Also Installed");
154
66
                    } else {
155
67
                        return categoryName;
156
68
                    }
157
69
                }
158
70
            }
159
71
160
72
            displaced: Transition {
161
73
                UbuntuNumberAnimation {
162
74
                    properties: "y"
163
75
                    duration: UbuntuAnimation.FastDuration
164
76
                }
165
77
            }
166
78
167
79
            delegate: DashboardManagerScope {
168
80
                scopeIcon: model.art
169
81
                scopeId: model.scopeId
170
82
            }
171
83
        }
172
84
    }
173
85
}
174
0
86
175
=== added file 'qml/Dash/Dashboard/DashboardManagerScope.qml'
176
--- qml/Dash/Dashboard/DashboardManagerScope.qml	1970-01-01 00:00:00 +0000
177
+++ qml/Dash/Dashboard/DashboardManagerScope.qml	2017-04-05 16:15:43 +0000
178
@@ -0,0 +1,91 @@
179
1
/*
180
2
* Copyright (C) 2017 Canonical, Ltd.
181
3
*
182
4
* This program is free software; you can redistribute it and/or modify
183
5
* it under the terms of the GNU General Public License as published by
184
6
* the Free Software Foundation; version 3.
185
7
*
186
8
* This program is distributed in the hope that it will be useful,
187
9
* but WITHOUT ANY WARRANTY; without even the implied warranty of
188
10
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
189
11
* GNU General Public License for more details.
190
12
*
191
13
* You should have received a copy of the GNU General Public License
192
14
* along with this program.  If not, see <http://www.gnu.org/licenses/>.
193
15
*/
194
16
195
17
import QtQuick 2.4
196
18
import Ubuntu.Components 1.3
197
19
import Ubuntu.Components.ListItems 1.3 as ListItems
198
20
import Unity 0.2
199
21
import "../../Components"
200
22
201
23
ListItem {
202
24
    readonly property alias innerLayoutPadding: innerLayout.padding
203
25
204
26
    property alias scopeIcon: scopeArtIcon.source
205
27
    property alias scopeId: innerLayout.scopeId
206
28
207
29
    height: innerLayout.height
208
30
    width: parent.width
209
31
210
32
    divider.visible: false
211
33
212
34
213
35
    Rectangle {
214
36
        height: units.dp(1);
215
37
        width: parent.width
216
38
        anchors.top: parent.top
217
39
        color: "#eeeeee"
218
40
        visible: index != 0
219
41
    }
220
42
221
43
    ListItemLayout {
222
44
        id: innerLayout
223
45
        objectName: "layout" + index
224
46
225
47
        property string scopeId
226
48
227
49
        ProportionalShape {
228
50
            id: scopeArt
229
51
            height: units.gu(4.5)
230
52
            SlotsLayout.position: SlotsLayout.Leading
231
53
232
54
            aspect: UbuntuShape.Flat
233
55
            source: Image {
234
56
                id: scopeArtIcon
235
57
236
58
                sourceSize.height: scopeArt.height
237
59
                sourceSize.width: scopeArt.width
238
60
            }
239
61
        }
240
62
241
63
        title.text: scopeId
242
64
243
65
        // FIXME: update when pin icon is added to theme
244
66
        Icon {
245
67
            objectName: "pinIcon"
246
68
247
69
            height: units.gu(2)
248
70
            width: units.gu(2)
249
71
            source: {
250
72
                if (categoryView.isPinnedToDashboard) {
251
73
                    return "graphics/pinned.png"
252
74
                } else if (categoryView.isAlsoInstalled) {
253
75
                    return "graphics/unpinned.png"
254
76
                } else {
255
77
                    return ""
256
78
                }
257
79
            }
258
80
259
81
            MouseArea {
260
82
                objectName: "favoriteButton"
261
83
262
84
                anchors.fill: parent
263
85
                onClicked: {
264
86
                    root.requestFavorite(scopeId, !categoryView.isPinnedToDashboard)
265
87
                }
266
88
            }
267
89
        }
268
90
    }
269
91
}
270
0
92
271
=== added directory 'qml/Dash/Dashboard/graphics'
272
=== added file 'qml/Dash/Dashboard/graphics/pinned@27.png'
273
1
Binary files qml/Dash/Dashboard/graphics/pinned@27.png	1970-01-01 00:00:00 +0000 and qml/Dash/Dashboard/graphics/pinned@27.png	2017-04-05 16:15:43 +0000 differ
93
Binary files qml/Dash/Dashboard/graphics/pinned@27.png	1970-01-01 00:00:00 +0000 and qml/Dash/Dashboard/graphics/pinned@27.png	2017-04-05 16:15:43 +0000 differ
274
=== added file 'qml/Dash/Dashboard/graphics/unpinned@27.png'
275
2
Binary files qml/Dash/Dashboard/graphics/unpinned@27.png	1970-01-01 00:00:00 +0000 and qml/Dash/Dashboard/graphics/unpinned@27.png	2017-04-05 16:15:43 +0000 differ
94
Binary files qml/Dash/Dashboard/graphics/unpinned@27.png	1970-01-01 00:00:00 +0000 and qml/Dash/Dashboard/graphics/unpinned@27.png	2017-04-05 16:15:43 +0000 differ
276
=== modified file 'tests/CMakeLists.txt'
277
--- tests/CMakeLists.txt	2017-03-15 18:57:52 +0000
278
+++ tests/CMakeLists.txt	2017-04-05 16:15:43 +0000
279
@@ -133,7 +133,22 @@
280
133
  FIND_PROGRAM(QDBUSXML2CPP_EXECUTABLE qdbusxml2cpp)
133
  FIND_PROGRAM(QDBUSXML2CPP_EXECUTABLE qdbusxml2cpp)
281
134
endif()
134
endif()
282
135
135
284
136
136
FILE(GLOB_RECURSE TEST_GRAPHICS_FILE
285
137
    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
286
138
    graphics/*.png
287
139
)
288
140
289
141
function(generate_qrc)
290
142
    SET(qrc_header "<!DOCTYPE RCC><RCC version=\"1.0\"><qresource>")
291
143
    SET(qrc_footer "</qresource></RCC>")
292
144
    FOREACH(graphic ${TEST_GRAPHICS_FILE})
293
145
        STRING(CONCAT qrc_header ${qrc_header} "<file>${graphic}</file>")
294
146
    ENDFOREACH(graphic)
295
147
    STRING(CONCAT qrc_header ${qrc_header} ${qrc_footer})
296
148
    FILE(WRITE graphics.qrc ${qrc_header})
297
149
endfunction()
298
150
299
151
generate_qrc()
300
137
install(DIRECTORY data graphics
152
install(DIRECTORY data graphics
301
138
    DESTINATION "${SHELL_APP_DIR}/tests"
153
    DESTINATION "${SHELL_APP_DIR}/tests"
302
139
)
154
)
303
140
155
304
=== modified file 'tests/mocks/Unity/CMakeLists.txt'
305
--- tests/mocks/Unity/CMakeLists.txt	2017-01-31 13:35:50 +0000
306
+++ tests/mocks/Unity/CMakeLists.txt	2017-04-05 16:15:43 +0000
307
@@ -22,6 +22,7 @@
308
22
add_definitions(-DQT_NO_KEYWORDS)
22
add_definitions(-DQT_NO_KEYWORDS)
309
23
23
310
24
set(UnityQML_SOURCES
24
set(UnityQML_SOURCES
311
25
  ../../graphics.qrc
312
25
  fake_scope.cpp
26
  fake_scope.cpp
313
26
  fake_scopes.cpp
27
  fake_scopes.cpp
314
27
  fake_scopesoverview.cpp
28
  fake_scopesoverview.cpp
315
28
29
316
=== modified file 'tests/mocks/Unity/fake_scopesoverview.cpp'
317
--- tests/mocks/Unity/fake_scopesoverview.cpp	2016-05-26 12:52:24 +0000
318
+++ tests/mocks/Unity/fake_scopesoverview.cpp	2017-04-05 16:15:43 +0000
319
@@ -298,7 +298,7 @@
320
298
        case RoleSubtitle:
298
        case RoleSubtitle:
321
299
            return scope && scope->name() == "Videos this is long ab cd ef gh ij kl" ? "tube, movies, cinema, pictures, art, moving images, magic in a box" : QString();
299
            return scope && scope->name() == "Videos this is long ab cd ef gh ij kl" ? "tube, movies, cinema, pictures, art, moving images, magic in a box" : QString();
322
300
        case RoleArt:
300
        case RoleArt:
324
301
            return QString("../../tests/graphics/applicationIcons/dash.png");
301
            return QUrl("qrc:graphics/applicationIcons/dash.png");
325
302
        case RoleMascot:
302
        case RoleMascot:
326
303
        case RoleEmblem:
303
        case RoleEmblem:
327
304
        case RoleSummary:
304
        case RoleSummary:
328
305
305
329
=== modified file 'tests/qmltests/CMakeLists.txt'
330
--- tests/qmltests/CMakeLists.txt	2017-01-18 14:31:42 +0000
331
+++ tests/qmltests/CMakeLists.txt	2017-04-05 16:15:43 +0000
332
@@ -41,6 +41,7 @@
333
41
add_unity8_qmltest_data(Dash artwork)
41
add_unity8_qmltest_data(Dash artwork)
334
42
add_unity8_qmltest_data(Dash CardHelpers.js)
42
add_unity8_qmltest_data(Dash CardHelpers.js)
335
43
add_unity8_qmltest_data(Dash tst_PageHeader)
43
add_unity8_qmltest_data(Dash tst_PageHeader)
336
44
add_unity8_qmltest(Dash/Dashboard DashboardManager)
337
44
add_unity8_qmltest(Dash/Previews Preview)
45
add_unity8_qmltest(Dash/Previews Preview)
338
45
add_unity8_qmltest(Dash/Previews PreviewActions)
46
add_unity8_qmltest(Dash/Previews PreviewActions)
339
46
add_unity8_qmltest(Dash/Previews PreviewAudioPlayback)
47
add_unity8_qmltest(Dash/Previews PreviewAudioPlayback)
340
47
48
341
=== added directory 'tests/qmltests/Dash/Dashboard'
342
=== added file 'tests/qmltests/Dash/Dashboard/tst_DashboardManager.qml'
343
--- tests/qmltests/Dash/Dashboard/tst_DashboardManager.qml	1970-01-01 00:00:00 +0000
344
+++ tests/qmltests/Dash/Dashboard/tst_DashboardManager.qml	2017-04-05 16:15:43 +0000
345
@@ -0,0 +1,85 @@
346
1
/*
347
2
 * Copyright 2017 Canonical Ltd.
348
3
 *
349
4
 * This program is free software; you can redistribute it and/or modify
350
5
 * it under the terms of the GNU General Public License as published by
351
6
 * the Free Software Foundation; version 3.
352
7
 *
353
8
 * This program is distributed in the hope that it will be useful,
354
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
355
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
356
11
 * GNU General Public License for more details.
357
12
 *
358
13
 * You should have received a copy of the GNU General Public License
359
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
360
15
 */
361
16
362
17
import QtQuick 2.4
363
18
import QtTest 1.0
364
19
import "../../../../qml/Dash/Dashboard"
365
20
import Ubuntu.Components 1.3
366
21
import Unity.Test 0.1 as UT
367
22
368
23
Item {
369
24
    id: root
370
25
    width: units.gu(40)
371
26
    height: units.gu(80)
372
27
373
28
    DashboardManager {
374
29
        id: dashboardManager
375
30
    }
376
31
377
32
    UT.UnityTestCase {
378
33
        name: "ManageDashboard"
379
34
        when: windowShown
380
35
381
36
        function scrollToCategory(categoryName) {
382
37
            var container = findChild(dashboardManager, "categoriesContainer")
383
38
            flickToYBeginning(container);
384
39
385
40
            tryCompareFunction(function(){
386
41
                var category = findChild(container, categoryName + "Section", 0)
387
42
                if (category !== null) return true;
388
43
                touchFlick(container, container.width / 2, units.gu(20), container.width / 2, container.y, true, true, units.gu(2))
389
44
                tryCompare(container, "moving", false);
390
45
                return false;
391
46
            }, true)
392
47
        }
393
48
394
49
        function test_pinning() {
395
50
            var container = findChild(dashboardManager, "categoriesContainer")
396
51
397
52
            // Test removing a favorite
398
53
            scrollToCategory("Favorites");
399
54
            var favorites_category = findChild(container, "FavoritesSection")
400
55
            var favorites = findChild(favorites_category, "categoryView")
401
56
            var first_favorite = findChild(favorites, "layout0");
402
57
403
58
            // scrollToCategory loads the delegate
404
59
            // and this guarantees that it is visible
405
60
            container.positionViewAtIndex(favorites_category.index, ListView.Visible);
406
61
407
62
            // Check the icon path as it will be changed in the future
408
63
            var pin_icon = findChild(first_favorite, "pinIcon");
409
64
            compare(/graphics\/pinned\.png$/.test(pin_icon.source), true)
410
65
411
66
            var initialFavoritesCount = favorites.count
412
67
            mouseClick(findChild(first_favorite, "favoriteButton"));
413
68
            tryCompare(favorites, "count", initialFavoritesCount - 1);
414
69
415
70
            // Test adding a favorite
416
71
            scrollToCategory("Non Favorites")
417
72
            var non_favorites_category = findChild(container, "Non FavoritesSection")
418
73
            var non_favorites = findChild(non_favorites_category, "categoryView")
419
74
            var first_non_favorite = findChild(non_favorites, "layout0");
420
75
            container.positionViewAtIndex(non_favorites_category.index, ListView.Visible);
421
76
422
77
            pin_icon = findChild(first_non_favorite, "pinIcon");
423
78
            compare(/graphics\/unpinned\.png$/.test(pin_icon.source), true)
424
79
425
80
            var initialNonFavoritesCount = non_favorites.count
426
81
            mouseClick(findChild(first_non_favorite, "favoriteButton"));
427
82
            tryCompare(non_favorites, "count", initialNonFavoritesCount - 1);
428
83
        }
429
84
    }
430
85
}
431
0
86
432
=== modified file 'tests/utils/modules/Unity/Test/UnityTestCase.qml'
433
--- tests/utils/modules/Unity/Test/UnityTestCase.qml	2017-01-19 16:30:08 +0000
434
+++ tests/utils/modules/Unity/Test/UnityTestCase.qml	2017-04-05 16:15:43 +0000
435
@@ -283,6 +283,24 @@
436
283
        }
283
        }
437
284
    }
284
    }
438
285
285
439
286
    function flickToYBeginning(item) {
440
287
        if (!item)
441
288
            qtest_fail("no item given", 1);
442
289
443
290
        var i = 0;
444
291
        var x = item.width / 2;
445
292
        var y = units.gu(1);
446
293
        var toY = item.height - units.gu(1)
447
294
        var maxIterations = 5 + item.contentHeight / item.height;
448
295
        while (i < maxIterations && !item.atYBeginning) {
449
296
            touchFlick(item, x, y, x , toY);
450
297
            tryCompare(item, "moving", false);
451
298
            ++i;
452
299
        }
453
300
454
301
        tryCompare(item, "atYBeginning", true);
455
302
    }
456
303
457
286
    function flickToYEnd(item) {
304
    function flickToYEnd(item) {
458
287
        if (!item)
305
        if (!item)
459
288
            qtest_fail("no item given", 1);
306
            qtest_fail("no item given", 1);
Status:	Needs review
Proposed branch:	lp:~josharenson/unity8/dashboard-manager
Merge into:	lp:unity8
Diff against target:	459 lines (+362/-3) 10 files modified qml/Dash/DashSectionHeader.qml (+3/-1) qml/Dash/Dashboard/DashboardManager.qml (+61/-0) qml/Dash/Dashboard/DashboardManagerCategory.qml (+85/-0) qml/Dash/Dashboard/DashboardManagerScope.qml (+91/-0) tests/CMakeLists.txt (+16/-1) tests/mocks/Unity/CMakeLists.txt (+1/-0) tests/mocks/Unity/fake_scopesoverview.cpp (+1/-1) tests/qmltests/CMakeLists.txt (+1/-0) tests/qmltests/Dash/Dashboard/tst_DashboardManager.qml (+85/-0) tests/utils/modules/Unity/Test/UnityTestCase.qml (+18/-0)
To merge this branch:	bzr merge lp:~josharenson/unity8/dashboard-manager
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Unity8 CI Bot	continuous-integration		Approve on 2017-04-05
Matthew Paul Thomas (community)	design	2017-03-10	Needs Information on 2017-04-03
Andrea Cimitan (community)			Needs Fixing on 2017-03-13
Review via email: mp+319522@code.launchpad.net