1
=== modified file 'data/unity8.conf'
2
--- data/unity8.conf	2014-03-18 10:57:24 +0000
3
+++ data/unity8.conf	2014-03-18 10:57:24 +0000
4
@@ -1,6 +1,8 @@
5
1
description "Unity Shell v8"
1
description "Unity Shell v8"
6
2
author "Ricardo Mendoza <ricmm@ubuntu.com>"
2
author "Ricardo Mendoza <ricmm@ubuntu.com>"
7
3
3
8
4
emits scope-ui-starting
9
5
10
4
start on ((xsession SESSION=ubuntu-touch) or (xsession SESSION=ubuntu-touch-surfaceflinger)) and started dbus
6
start on ((xsession SESSION=ubuntu-touch) or (xsession SESSION=ubuntu-touch-surfaceflinger)) and started dbus
11
5
stop on desktop-end
7
stop on desktop-end
12
6
8
13
@@ -38,6 +40,8 @@
14
38
    if [ -S "$MIR_SERVER_FILE" ]; then
40
    if [ -S "$MIR_SERVER_FILE" ]; then
15
39
        rm "$MIR_SERVER_FILE"
41
        rm "$MIR_SERVER_FILE"
16
40
    fi
42
    fi
17
43
18
44
    initctl emit scope-ui-starting
19
41
end script
45
end script
20
42
46
21
43
exec ${BINARY:-unity8} $ARGS
47
exec ${BINARY:-unity8} $ARGS
22
44
48
23
=== modified file 'plugins/DashViews/listviewwithpageheader.cpp'
24
--- plugins/DashViews/listviewwithpageheader.cpp	2014-03-18 10:57:24 +0000
25
+++ plugins/DashViews/listviewwithpageheader.cpp	2014-03-18 10:57:24 +0000
26
@@ -376,13 +376,18 @@
27
376
    }
376
    }
28
377
}
377
}
29
378
378
30
379
static inline bool uFuzzyCompare(qreal r1, qreal r2)
31
380
{
32
381
    return qFuzzyCompare(r1, r2) || (qFuzzyIsNull(r1) && qFuzzyIsNull(r2));
33
382
}
34
383
35
379
void ListViewWithPageHeader::showHeader()
384
void ListViewWithPageHeader::showHeader()
36
380
{
385
{
37
381
    if (!m_headerItem)
386
    if (!m_headerItem)
38
382
        return;
387
        return;
39
383
388
42
384
    auto to = qMax(-minYExtent(), contentY() - m_headerItem->height() + m_headerItemShownHeight);
389
    const auto to = qMax(-minYExtent(), contentY() - m_headerItem->height() + m_headerItemShownHeight);
43
385
    if (to != contentY()) {
390
    if (!uFuzzyCompare(to, contentY())) {
44
386
        const bool headerShownByItsOwn = contentY() < m_headerItem->y() + m_headerItem->height();
391
        const bool headerShownByItsOwn = contentY() < m_headerItem->y() + m_headerItem->height();
45
387
        if (headerShownByItsOwn && m_headerItemShownHeight == 0) {
392
        if (headerShownByItsOwn && m_headerItemShownHeight == 0) {
46
388
            // We are not clipping since we are just at the top of the viewport
393
            // We are not clipping since we are just at the top of the viewport
47
@@ -485,11 +490,6 @@
48
485
    polish();
490
    polish();
49
486
}
491
}
50
487
492
51
488
static inline bool uFuzzyCompare(qreal r1, qreal r2)
52
489
{
53
490
    return qFuzzyCompare(r1, r2) || (qFuzzyIsNull(r1) && qFuzzyIsNull(r2));
54
491
}
55
492
56
493
void ListViewWithPageHeader::viewportMoved(Qt::Orientations orient)
493
void ListViewWithPageHeader::viewportMoved(Qt::Orientations orient)
57
494
{
494
{
58
495
    // Check we are not being taken down and don't paint anything
495
    // Check we are not being taken down and don't paint anything
59
496
496
60
=== removed file 'qml/Components/OpenEffect.qml'
61
--- qml/Components/OpenEffect.qml	2013-07-09 15:24:41 +0000
62
+++ qml/Components/OpenEffect.qml	1970-01-01 00:00:00 +0000
63
@@ -1,138 +0,0 @@
64
1
/*
65
2
 * Copyright (C) 2013 Canonical, Ltd.
66
3
 *
67
4
 * This program is free software; you can redistribute it and/or modify
68
5
 * it under the terms of the GNU General Public License as published by
69
6
 * the Free Software Foundation; version 3.
70
7
 *
71
8
 * This program is distributed in the hope that it will be useful,
72
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
73
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
74
11
 * GNU General Public License for more details.
75
12
 *
76
13
 * You should have received a copy of the GNU General Public License
77
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
78
15
 */
79
16
80
17
import QtQuick 2.0
81
18
82
19
Item {
83
20
    id: effect
84
21
    property bool enabled: topGapPx != positionPx || bottomGapPx != positionPx
85
22
    property alias live: effectSource.live
86
23
    property Item sourceItem
87
24
    property ShaderEffectSource source: ShaderEffectSource {
88
25
        id: effectSource
89
26
        sourceItem: effect.enabled ? effect.sourceItem : null
90
27
        hideSource: effect.enabled
91
28
        live: false
92
29
        sourceRect: {
93
30
          if (effect.enabled) {
94
31
            Qt.rect(0, -effect.topOverflow, sourceItem.width, sourceItem.height + effect.topOverflow + effect.bottomOverflow)
95
32
          } else {
96
33
            Qt.rect(0, 0, 0, 0)
97
34
          }
98
35
        }
99
36
    }
100
37
101
38
    onEnabledChanged: if (!live && enabled) scheduleUpdate()
102
39
103
40
    /*!
104
41
    \qmlproperty real positionPx
105
42
    The y coordinate of where to perform the split.
106
43
107
44
    \qmlproperty real topGapPx
108
45
    Gap's top edge.
109
46
110
47
    \qmlproperty real bottomGapPx
111
48
    Gap's bottom edge.
112
49
113
50
    \qmlproperty real topOverflow
114
51
    How much of the sourceItem should be sourced above its bounds.
115
52
116
53
    \qmlproperty real bottomOverflow
117
54
    How much of the sourceItem should be sourced below its bounds.
118
55
    */
119
56
120
57
    property real positionPx: 0
121
58
    property real topGapPx: 0
122
59
    property real bottomGapPx: height
123
60
    property real topOverflow: 0.0
124
61
    property real bottomOverflow: 0.0
125
62
    property real topOpacity: 1.0
126
63
    property real bottomOpacity: 1.0
127
64
128
65
    property real __roundedPositionPx: Math.round(positionPx)
129
66
130
67
    function scheduleUpdate() {
131
68
        source.scheduleUpdate();
132
69
    }
133
70
134
71
    ShaderEffect {
135
72
        id: top
136
73
        visible: effect.enabled
137
74
        opacity: topOpacity
138
75
        property ShaderEffectSource source: effect.source
139
76
        property real positionPx: __roundedPositionPx
140
77
        property real factor: effect.height / height
141
78
142
79
        clip: true
143
80
144
81
        anchors {
145
82
            top: parent.top
146
83
            left: parent.left
147
84
            right: parent.right
148
85
            topMargin: -topOverflow - positionPx + topGapPx
149
86
        }
150
87
        height: topOverflow + positionPx
151
88
152
89
        vertexShader: "
153
90
            uniform highp mat4 qt_Matrix;
154
91
            attribute highp vec4 qt_Vertex;
155
92
            attribute highp vec2 qt_MultiTexCoord0;
156
93
            varying highp vec2 qt_TexCoord0;
157
94
            uniform highp float factor;
158
95
159
96
            void main() {
160
97
                highp vec4 pos = qt_Vertex;
161
98
                pos.y *= factor;
162
99
                gl_Position = qt_Matrix * pos;
163
100
                qt_TexCoord0 = qt_MultiTexCoord0;
164
101
            }
165
102
        "
166
103
    }
167
104
168
105
    ShaderEffect {
169
106
        id: bottom
170
107
        visible: effect.enabled
171
108
        opacity: bottomOpacity
172
109
        property ShaderEffectSource source: effect.source
173
110
        property real offset: effect.topOverflow + __roundedPositionPx
174
111
        property real factor: effect.height / height
175
112
176
113
        clip: true
177
114
178
115
        anchors {
179
116
            left: parent.left
180
117
            right: parent.right
181
118
        }
182
119
        y: topOverflow + bottomGapPx
183
120
        height: sourceItem.height - positionPx + bottomOverflow
184
121
185
122
        vertexShader: "
186
123
            uniform highp mat4 qt_Matrix;
187
124
            attribute highp vec4 qt_Vertex;
188
125
            attribute highp vec2 qt_MultiTexCoord0;
189
126
            varying highp vec2 qt_TexCoord0;
190
127
            uniform highp float factor;
191
128
            uniform highp float offset;
192
129
193
130
            void main() {
194
131
                highp vec4 pos = qt_Vertex;
195
132
                pos.y = (pos.y * factor) - offset;
196
133
                gl_Position = qt_Matrix * pos;
197
134
                qt_TexCoord0 = qt_MultiTexCoord0;
198
135
            }
199
136
        "
200
137
    }
201
138
}
202
139
0
203
=== modified file 'qml/Components/PageHeader.qml'
204
--- qml/Components/PageHeader.qml	2014-03-18 10:57:24 +0000
205
+++ qml/Components/PageHeader.qml	2014-03-18 10:57:24 +0000
206
@@ -74,6 +74,7 @@
207
74
74
208
75
        AbstractButton {
75
        AbstractButton {
209
76
            id: backButton
76
            id: backButton
210
77
            objectName: root.objectName + "_backButton"
211
77
            visible: false
78
            visible: false
212
78
            height: header.height
79
            height: header.height
213
79
            y: header.contentY
80
            y: header.contentY
214
80
81
215
=== removed file 'qml/Components/RatingStars.qml'
216
--- qml/Components/RatingStars.qml	2014-02-14 10:14:55 +0000
217
+++ qml/Components/RatingStars.qml	1970-01-01 00:00:00 +0000
218
@@ -1,41 +0,0 @@
219
1
/*
220
2
 * Copyright (C) 2013 Canonical, Ltd.
221
3
 *
222
4
 * This program is free software; you can redistribute it and/or modify
223
5
 * it under the terms of the GNU General Public License as published by
224
6
 * the Free Software Foundation; version 3.
225
7
 *
226
8
 * This program is distributed in the hope that it will be useful,
227
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
228
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
229
11
 * GNU General Public License for more details.
230
12
 *
231
13
 * You should have received a copy of the GNU General Public License
232
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
233
15
 */
234
16
235
17
import QtQuick 2.0
236
18
237
19
Row {
238
20
    id: root
239
21
    property int rating
240
22
    property int maximumRating: 5
241
23
    property int starCount: 5
242
24
    height: childrenRect.height
243
25
    width: childrenRect.width
244
26
245
27
    readonly property int effectiveRating: Math.max(0, Math.min(root.starCount * root.rating / root.maximumRating, root.maximumRating))
246
28
247
29
    Repeater {
248
30
        model: root.effectiveRating
249
31
        Image {
250
32
            source: "graphics/icon_star_on.png"
251
33
        }
252
34
    }
253
35
    Repeater {
254
36
        model: root.starCount - root.effectiveRating
255
37
        Image {
256
38
            source: "graphics/icon_star_off.png"
257
39
        }
258
40
    }
259
41
}
260
42
0
261
=== removed file 'qml/Components/Tile.qml'
262
--- qml/Components/Tile.qml	2013-10-14 10:43:49 +0000
263
+++ qml/Components/Tile.qml	1970-01-01 00:00:00 +0000
264
@@ -1,39 +0,0 @@
265
1
/*
266
2
 * Copyright (C) 2013 Canonical, Ltd.
267
3
 *
268
4
 * This program is free software; you can redistribute it and/or modify
269
5
 * it under the terms of the GNU General Public License as published by
270
6
 * the Free Software Foundation; version 3.
271
7
 *
272
8
 * This program is distributed in the hope that it will be useful,
273
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
274
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
275
11
 * GNU General Public License for more details.
276
12
 *
277
13
 * You should have received a copy of the GNU General Public License
278
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
279
15
 */
280
16
281
17
import QtQuick 2.0
282
18
import Ubuntu.Components 0.1
283
19
284
20
AbstractButton {
285
21
    property url source
286
22
    property int fillMode: Image.PreserveAspectCrop
287
23
    property int horizontalAlignment: Text.AlignHCenter
288
24
    property string text
289
25
    property int imageWidth
290
26
    property int imageHeight
291
27
    property int maximumLineCount: 1
292
28
293
29
    readonly property int center: (index % GridView.view.columns * width) + (width / 2)
294
30
295
31
    opacity: GridView.view.highlightIndex === -1 ? 1 :
296
32
                GridView.view.highlightIndex === index ? 0.6 : 0.2
297
33
298
34
    Behavior on opacity {
299
35
        UbuntuNumberAnimation {}
300
36
    }
301
37
302
38
    style: TileStyle {}
303
39
}
304
40
0
305
=== removed file 'qml/Components/TileStyle.qml'
306
--- qml/Components/TileStyle.qml	2013-10-10 10:20:36 +0000
307
+++ qml/Components/TileStyle.qml	1970-01-01 00:00:00 +0000
308
@@ -1,81 +0,0 @@
309
1
/*
310
2
 * Copyright (C) 2013 Canonical, Ltd.
311
3
 *
312
4
 * This program is free software; you can redistribute it and/or modify
313
5
 * it under the terms of the GNU General Public License as published by
314
6
 * the Free Software Foundation; version 3.
315
7
 *
316
8
 * This program is distributed in the hope that it will be useful,
317
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
318
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
319
11
 * GNU General Public License for more details.
320
12
 *
321
13
 * You should have received a copy of the GNU General Public License
322
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
323
15
 */
324
16
325
17
import QtQuick 2.0
326
18
import Ubuntu.Components 0.1
327
19
328
20
Item {
329
21
    id: tile
330
22
331
23
    anchors.fill: parent
332
24
333
25
    UbuntuShape {
334
26
        id: icon
335
27
        anchors {
336
28
            top: parent.top
337
29
            horizontalCenter: parent.horizontalCenter
338
30
        }
339
31
        radius: "medium"
340
32
        width: styledItem.imageWidth
341
33
        height: styledItem.imageHeight
342
34
        image: Image {
343
35
            id: image
344
36
            objectName: "image"
345
37
            sourceSize { width: icon.width; height: icon.height }
346
38
            asynchronous: true
347
39
            cache: false
348
40
            source: styledItem.source
349
41
            fillMode: styledItem.fillMode
350
42
            horizontalAlignment: Image.AlignHCenter
351
43
            verticalAlignment: Image.AlignVCenter
352
44
        }
353
45
    }
354
46
355
47
    UbuntuShape {
356
48
        id: borderPressed
357
49
        objectName: "borderPressed"
358
50
359
51
        anchors.fill: icon
360
52
        radius: "medium"
361
53
        borderSource: "radius_pressed.sci"
362
54
        opacity: styledItem.pressed ? 1.0 : 0.0
363
55
        Behavior on opacity { NumberAnimation { duration: 200; easing.type: Easing.OutQuint } }
364
56
    }
365
57
366
58
    Label {
367
59
        id: label
368
60
        objectName: "label"
369
61
        anchors {
370
62
            baseline: icon.bottom
371
63
            baselineOffset: units.gu(2)
372
64
            left: parent.left
373
65
            right: parent.right
374
66
            leftMargin: units.gu(1)
375
67
            rightMargin: units.gu(1)
376
68
        }
377
69
378
70
        color: Theme.palette.selected.backgroundText
379
71
        opacity: 0.9
380
72
        style: Text.Raised
381
73
        styleColor: "black"
382
74
        fontSize: "small"
383
75
        elide: Text.ElideMiddle
384
76
        horizontalAlignment: styledItem.horizontalAlignment
385
77
        text: styledItem.text
386
78
        wrapMode: Text.Wrap
387
79
        maximumLineCount: styledItem.maximumLineCount
388
80
    }
389
81
}
390
82
0
391
=== removed file 'qml/Dash/Apps/AppPreview.qml'
392
--- qml/Dash/Apps/AppPreview.qml	2014-01-15 06:32:25 +0000
393
+++ qml/Dash/Apps/AppPreview.qml	1970-01-01 00:00:00 +0000
394
@@ -1,167 +0,0 @@
395
1
/*
396
2
 * Copyright (C) 2013 Canonical, Ltd.
397
3
 *
398
4
 * This program is free software; you can redistribute it and/or modify
399
5
 * it under the terms of the GNU General Public License as published by
400
6
 * the Free Software Foundation; version 3.
401
7
 *
402
8
 * This program is distributed in the hope that it will be useful,
403
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
404
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
405
11
 * GNU General Public License for more details.
406
12
 *
407
13
 * You should have received a copy of the GNU General Public License
408
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
409
15
 */
410
16
411
17
import QtQuick 2.0
412
18
import Ubuntu.Components 0.1
413
19
import Ubuntu.Components.ListItems 0.1 as ListItems
414
20
import ".."
415
21
import "../Generic"
416
22
import "../Previews"
417
23
import "../../Components"
418
24
419
25
GenericPreview {
420
26
    id: root
421
27
422
28
    signal sendUserReview(string review)
423
29
424
30
    previewImages: previewImagesComponent
425
31
    description: descriptionComponent
426
32
    header: headerComponent
427
33
428
34
    // TODO: Ratings are not yet complete... enable this once they work
429
35
    //ratings: ratingsComponent
430
36
431
37
    Component {
432
38
        id: previewImagesComponent
433
39
        ListView {
434
40
            id: previewImageListView
435
41
            spacing: units.gu(1)
436
42
            orientation: ListView.Horizontal
437
43
            height: units.gu(22)
438
44
            model: previewData.infoMap["more-screenshots"] != null ? previewData.infoMap["more-screenshots"].value : [previewData.image]
439
45
            cacheBuffer: width * 3
440
46
441
47
            // FIXME: Because of ListViews inside ListViews inside Flickables inside ListViews (and some more)
442
48
            // we finally reached the point where this ListView doesn't correctly get swipe input any more but
443
49
            // instead the parent ListView is the one that is swiped. This MouseArea sort of creates a blocking
444
50
            // layer to make sure this ListView can be swiped, regardless of what's behind it.
445
51
            MouseArea {
446
52
                anchors.fill: parent
447
53
                enabled: parent.contentWidth > parent.width
448
54
            }
449
55
450
56
            LazyImage {
451
57
                objectName: "placeholderScreenshot"
452
58
                anchors {
453
59
                    top: parent.top
454
60
                    bottom: parent.bottom
455
61
                }
456
62
                scaleTo: "height"
457
63
                source: "broken_image"
458
64
                initialWidth: units.gu(13)
459
65
                visible: previewImageListView.count == 0
460
66
            }
461
67
462
68
            delegate: LazyImage {
463
69
                id: shape
464
70
                anchors {
465
71
                    top: parent.top
466
72
                    bottom: parent.bottom
467
73
                }
468
74
                source: modelData ? modelData : ""
469
75
                scaleTo: "height"
470
76
                initialWidth: units.gu(13)
471
77
            }
472
78
        }
473
79
    }
474
80
475
81
    Component {
476
82
        id: headerComponent
477
83
        Header {
478
84
            objectName: "previewHeader"
479
85
            title: previewData.title
480
86
            icon: previewData.appIcon
481
87
            subtitle: root.previewData.infoMap["publisher"] ? root.previewData.infoMap["publisher"].value : ""
482
88
            rating: Math.round(root.previewData.rating * 10)
483
89
            reviews: root.previewData.numRatings
484
90
            rated: root.previewData.infoMap["rated"] ? root.previewData.infoMap["rated"].value : 0
485
91
        }
486
92
    }
487
93
488
94
    Component {
489
95
        id: descriptionComponent
490
96
        Column {
491
97
            spacing: units.gu(1)
492
98
493
99
            Label {
494
100
                objectName: "descriptionLabel"
495
101
                anchors { left: parent.left; right: parent.right }
496
102
                text: root.previewData.description
497
103
                fontSize: "medium"
498
104
                color: Theme.palette.selected.backgroundText
499
105
                opacity: .6
500
106
                wrapMode: Text.WordWrap
501
107
                style: Text.Raised
502
108
                styleColor: "black"
503
109
            }
504
110
        }
505
111
    }
506
112
507
113
    Component {
508
114
        id: ratingsComponent
509
115
        Column {
510
116
            id: columnReviewRating
511
117
            objectName: "columnReviewRating"
512
118
            visible: root.previewData.rating >= 0
513
119
514
120
            spacing: units.gu(1)
515
121
            height: childrenRect.height
516
122
517
123
            ListItems.ThinDivider { }
518
124
519
125
            Item {
520
126
                anchors { left: parent.left; right: parent.right }
521
127
                height: rateLabel.height
522
128
523
129
                Label {
524
130
                    id: rateLabel
525
131
                    fontSize: "medium"
526
132
                    color: "white"
527
133
                    style: Text.Raised
528
134
                    styleColor: "black"
529
135
                    opacity: .9
530
136
                    text: i18n.tr("Rate this")
531
137
532
138
                    anchors.left: parent.left
533
139
                    anchors.verticalCenter: parent.verticalCenter
534
140
                }
535
141
536
142
                // FIXME these need to be made interactive and connected to the scope
537
143
                RatingStars {
538
144
                    anchors.right: parent.right
539
145
                    anchors.verticalCenter: parent.verticalCenter
540
146
                }
541
147
            }
542
148
543
149
            ListItems.ThinDivider { }
544
150
545
151
            Reviews {
546
152
                id: appReviews
547
153
                objectName: "appReviews"
548
154
549
155
                anchors { left: parent.left; right: parent.right }
550
156
551
157
                model: root.previewData.infoMap["comments"] ? root.previewData.infoMap["comments"].value : undefined
552
158
553
159
                onSendReview: root.sendUserReview(review);
554
160
555
161
                onEditing: {
556
162
                    root.ensureVisible(appReviews.textArea);
557
163
                }
558
164
            }
559
165
        }
560
166
    }
561
167
}
562
168
0
563
=== removed file 'qml/Dash/Apps/DashPluginFilterGrid.qml'
564
--- qml/Dash/Apps/DashPluginFilterGrid.qml	2013-11-11 11:44:39 +0000
565
+++ qml/Dash/Apps/DashPluginFilterGrid.qml	1970-01-01 00:00:00 +0000
566
@@ -1,47 +0,0 @@
567
1
/*
568
2
 * Copyright (C) 2013 Canonical, Ltd.
569
3
 *
570
4
 * This program is free software; you can redistribute it and/or modify
571
5
 * it under the terms of the GNU General Public License as published by
572
6
 * the Free Software Foundation; version 3.
573
7
 *
574
8
 * This program is distributed in the hope that it will be useful,
575
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
576
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
577
11
 * GNU General Public License for more details.
578
12
 *
579
13
 * You should have received a copy of the GNU General Public License
580
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
581
15
 */
582
16
583
17
import QtQuick 2.0
584
18
import Ubuntu.Components 0.1
585
19
import "../../Components"
586
20
import "../Generic"
587
21
588
22
GenericFilterGrid {
589
23
    id: filtergrid
590
24
591
25
    delegate: Tile {
592
26
        id: tile
593
27
        objectName: "delegate" + index
594
28
        width: filtergrid.cellWidth
595
29
        height: filtergrid.cellHeight
596
30
        text: model.title
597
31
        imageWidth: filtergrid.iconWidth
598
32
        imageHeight: filtergrid.iconHeight
599
33
        source: model.icon
600
34
601
35
        style: FlatTileStyle {
602
36
            disabled: model.rendererHints['scope_disabled'] === 1;
603
37
        }
604
38
605
39
        onClicked: {
606
40
            filtergrid.clicked(index, tile.y)
607
41
        }
608
42
609
43
        onPressAndHold: {
610
44
            filtergrid.pressAndHold(index, tile.y)
611
45
        }
612
46
    }
613
47
}
614
48
0
615
=== removed file 'qml/Dash/Apps/FrequentlyUsedAppsModel.qml'
616
--- qml/Dash/Apps/FrequentlyUsedAppsModel.qml	2014-02-24 20:56:03 +0000
617
+++ qml/Dash/Apps/FrequentlyUsedAppsModel.qml	1970-01-01 00:00:00 +0000
618
@@ -1,110 +0,0 @@
619
1
/*
620
2
 * Copyright (C) 2013 Canonical, Ltd.
621
3
 *
622
4
 * This program is free software; you can redistribute it and/or modify
623
5
 * it under the terms of the GNU General Public License as published by
624
6
 * the Free Software Foundation; version 3.
625
7
 *
626
8
 * This program is distributed in the hope that it will be useful,
627
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
628
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
629
11
 * GNU General Public License for more details.
630
12
 *
631
13
 * You should have received a copy of the GNU General Public License
632
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
633
15
 */
634
16
635
17
import QtQuick 2.0
636
18
637
19
ListModel {
638
20
    ListElement {
639
21
        uri: "application://dialer-app.desktop"
640
22
        icon: "../../graphics/applicationIcons/phone-app.png"
641
23
        category: 0
642
24
        mimetype: "application/x-desktop"
643
25
        title: "Dialer"
644
26
        comment: ""
645
27
        dndUri: "file:///usr/share/applications/dialer-app.desktop"
646
28
        metadata: "subscope:applications.scope/applications-non-click.scope"
647
29
    }
648
30
    ListElement {
649
31
        uri: "application://messaging-app.desktop"
650
32
        icon: "../../graphics/applicationIcons/messages-app.png"
651
33
        category: 0
652
34
        mimetype: "application/x-desktop"
653
35
        title: "Messaging"
654
36
        comment: ""
655
37
        dndUri: "file:///usr/share/applications/messaging-app.desktop"
656
38
        metadata: "subscope:applications.scope/applications-non-click.scope"
657
39
    }
658
40
    ListElement {
659
41
        uri: "application://address-book-app.desktop"
660
42
        icon: "../../graphics/applicationIcons/contacts-app.png"
661
43
        category: 0
662
44
        mimetype: "application/x-desktop"
663
45
        title: "Contacts"
664
46
        comment: ""
665
47
        dndUri: "file:///usr/share/applications/address-book-app.desktop"
666
48
        metadata: "subscope:applications.scope/applications-non-click.scope"
667
49
    }
668
50
    ListElement {
669
51
        uri: "appid://com.ubuntu.camera/camera/current-user-version"
670
52
        icon: "../../graphics/applicationIcons/camera.png"
671
53
        category: 0
672
54
        mimetype: "application/x-desktop"
673
55
        title: "Camera"
674
56
        comment: ""
675
57
        dndUri: "appid://com.ubuntu.camera/camera/current-user-version"
676
58
        metadata: "subscope:applications.scope/applications-click.scope?app_id=com.ubuntu.camera"
677
59
    }
678
60
    ListElement {
679
61
        uri: "appid://com.ubuntu.gallery/gallery/current-user-version"
680
62
        icon: "../../graphics/applicationIcons/gallery.png"
681
63
        category: 0
682
64
        mimetype: "application/x-desktop"
683
65
        title: "Gallery"
684
66
        comment: ""
685
67
        dndUri: "appid://com.ubuntu.gallery/gallery/current-user-version"
686
68
        metadata: "subscope:applications.scope/applications-click.scope?app_id=com.ubuntu.gallery"
687
69
    }
688
70
    ListElement {
689
71
        uri: "appid://com.ubuntu.developer.webapps.webapp-facebook/webapp-facebook/current-user-version"
690
72
        icon: "../../graphics/applicationIcons/facebook.png"
691
73
        category: 0
692
74
        mimetype: "application/x-desktop"
693
75
        title: "Facebook"
694
76
        comment: ""
695
77
        dndUri: "appid://com.ubuntu.developer.webapps.webapp-facebook/webapp-facebook/current-user-version"
696
78
        metadata: "subscope:applications.scope/applications-click.scope?app_id=com.ubuntu.developer.webapps.webapp-facebook"
697
79
    }
698
80
    ListElement {
699
81
        uri: "application://webbrowser-app.desktop"
700
82
        icon: "../../graphics/applicationIcons/browser.png"
701
83
        category: 0
702
84
        mimetype: "application/x-desktop"
703
85
        title: "Browser"
704
86
        comment: ""
705
87
        dndUri: "file:///usr/share/applications/webbrowser-app.desktop"
706
88
        metadata: "subscope:applications.scope/applications-non-click.scope"
707
89
    }
708
90
    ListElement {
709
91
        uri: "appid://com.ubuntu.developer.webapps.webapp-gmail/webapp-gmail/current-user-version"
710
92
        icon: "../../graphics/applicationIcons/gmail.png"
711
93
        category: 0
712
94
        mimetype: "application/x-desktop"
713
95
        title: "GMail"
714
96
        comment: ""
715
97
        dndUri: "appid://com.ubuntu.developer.webapps.webapp-gmail/webapp-gmail/current-user-version"
716
98
        metadata: "subscope:applications.scope/applications-click.scope?app_id=com.ubuntu.developer.webapps.webapp-gmail"
717
99
    }
718
100
    ListElement {
719
101
        uri: "application://ubuntu-system-settings.desktop"
720
102
        icon: "../../graphics/applicationIcons/system-settings.png"
721
103
        category: 0
722
104
        mimetype: "application/x-desktop"
723
105
        title: "System Settings"
724
106
        comment: ""
725
107
        dndUri: "file:///usr/share/applications/ubuntu-system-settings.desktop"
726
108
        metadata: "subscope:applications.scope/applications-non-click.scope"
727
109
    }
728
110
}
729
111
0
730
=== modified file 'qml/Dash/Card.qml'
731
--- qml/Dash/Card.qml	2014-03-18 10:57:24 +0000
732
+++ qml/Dash/Card.qml	2014-03-18 10:57:24 +0000
733
@@ -26,6 +26,7 @@
734
26
    property alias fontScale: header.fontScale
26
    property alias fontScale: header.fontScale
735
27
    property alias headerAlignment: header.headerAlignment
27
    property alias headerAlignment: header.headerAlignment
736
28
    property alias headerHeight: header.height
28
    property alias headerHeight: header.height
737
29
    readonly property alias title: header.title
738
29
30
739
30
    property bool showHeader: true
31
    property bool showHeader: true
740
31
32
741
32
33
742
=== modified file 'qml/Dash/CardCarousel.qml'
743
--- qml/Dash/CardCarousel.qml	2014-03-18 10:57:24 +0000
744
+++ qml/Dash/CardCarousel.qml	2014-03-18 10:57:24 +0000
745
@@ -42,7 +42,6 @@
746
42
        selectedItemScaleFactor: cardTool.carouselSelectedItemScaleFactor
42
        selectedItemScaleFactor: cardTool.carouselSelectedItemScaleFactor
747
43
        cacheBuffer: 1404 // 18px * 13gu * 6
43
        cacheBuffer: 1404 // 18px * 13gu * 6
748
44
        model: cardCarousel.model
44
        model: cardCarousel.model
749
45
        highlightIndex: cardCarousel.highlightIndex
750
46
45
751
47
        onClicked: cardCarousel.clicked(index, itemY)
46
        onClicked: cardCarousel.clicked(index, itemY)
752
48
        onPressAndHold: cardCarousel.pressAndHold(index, itemY)
47
        onPressAndHold: cardCarousel.pressAndHold(index, itemY)
753
@@ -52,7 +51,7 @@
754
52
51
755
53
        itemComponent: Card {
52
        itemComponent: Card {
756
54
            id: card
53
            id: card
758
55
            objectName: "delegate" + index
54
            objectName: "carouselDelegate" + index
759
56
            headerHeight: carousel.headerHeight
55
            headerHeight: carousel.headerHeight
760
57
            cardData: model
56
            cardData: model
761
58
            template: cardTool.template
57
            template: cardTool.template
762
59
58
763
=== modified file 'qml/Dash/CardFilterGrid.qml'
764
--- qml/Dash/CardFilterGrid.qml	2014-03-18 10:57:24 +0000
765
+++ qml/Dash/CardFilterGrid.qml	2014-03-18 10:57:24 +0000
766
@@ -15,35 +15,62 @@
767
15
 */
15
 */
768
16
16
769
17
import QtQuick 2.0
17
import QtQuick 2.0
771
18
import Ubuntu.Components 0.1
18
import "../Components"
772
19
19
774
20
DashFilterGrid {
20
DashRenderer {
775
21
    id: genericFilterGrid
21
    id: genericFilterGrid
776
22
22
780
23
    minimumHorizontalSpacing: units.gu(1)
23
    expandable: filterGrid.expandable
781
24
    delegateWidth: cardTool.cardWidth
24
    collapsedRowCount: Math.min(2, cardTool && cardTool.template && cardTool.template["collapsed-rows"] || 2)
782
25
    delegateHeight: cardTool.cardHeight
25
    collapsedHeight: filterGrid.collapsedHeight
783
26
    columns: filterGrid.columns
784
27
    rows: filter ? collapsedRowCount : uncollapsedRowCount
785
28
    margins: filterGrid.margins
786
29
    uncollapsedHeight: filterGrid.uncollapsedHeight
787
26
    verticalSpacing: units.gu(1)
30
    verticalSpacing: units.gu(1)
808
27
    collapsedRowCount: Math.min(2, template && template["collapsed-rows"] || 2)
31
    currentItem: filterGrid.currentItem
809
28
32
    height: filterGrid.height
810
29
    delegate: Item {
33
811
30
        width: genericFilterGrid.cellWidth
34
    function startFilterAnimation(filter) {
812
31
        height: genericFilterGrid.cellHeight
35
        filterGrid.startFilterAnimation(filter)
813
32
        Card {
36
    }
814
33
            id: card
37
815
34
            width: cardTool.cardWidth
38
    FilterGrid {
816
35
            height: cardTool.cardHeight
39
        id: filterGrid
817
36
            headerHeight: cardTool.headerHeight
40
        width: genericFilterGrid.width
818
37
            anchors.horizontalCenter: parent.horizontalCenter
41
        minimumHorizontalSpacing: units.gu(1)
819
38
            objectName: "delegate" + index
42
        delegateWidth: cardTool.cardWidth
820
39
            cardData: model
43
        delegateHeight: cardTool.cardHeight
821
40
            template: cardTool.template
44
        verticalSpacing: genericFilterGrid.verticalSpacing
822
41
            components: cardTool.components
45
        model: genericFilterGrid.model
823
42
46
        filter: genericFilterGrid.filter
824
43
            headerAlignment: cardTool.headerAlignment
47
        collapsedRowCount: genericFilterGrid.collapsedRowCount
825
44
48
        delegateCreationBegin: genericFilterGrid.delegateCreationBegin
826
45
            onClicked: genericFilterGrid.clicked(index, card.y)
49
        delegateCreationEnd: genericFilterGrid.delegateCreationEnd
827
46
            onPressAndHold: genericFilterGrid.pressAndHold(index, card.y)
50
        delegate: Item {
828
51
            width: filterGrid.cellWidth
829
52
            height: filterGrid.cellHeight
830
53
            Card {
831
54
                id: card
832
55
                width: cardTool.cardWidth
833
56
                height: cardTool.cardHeight
834
57
                headerHeight: cardTool.headerHeight
835
58
                anchors.horizontalCenter: parent.horizontalCenter
836
59
                objectName: "delegate" + index
837
60
                cardData: model
838
61
                template: cardTool.template
839
62
                components: cardTool.components
840
63
841
64
                headerAlignment: cardTool.headerAlignment
842
65
843
66
                onClicked: genericFilterGrid.clicked(index, card.y)
844
67
                onPressAndHold: genericFilterGrid.pressAndHold(index, card.y)
845
68
            }
846
69
        }
847
70
848
71
        onFilterChanged: {
849
72
            genericFilterGrid.filter = filter
850
73
            filter = Qt.binding(function() { return genericFilterGrid.filter })
851
47
        }
74
        }
852
48
    }
75
    }
853
49
}
76
}
854
50
77
855
=== modified file 'qml/Dash/CardTool.qml'
856
--- qml/Dash/CardTool.qml	2014-03-06 15:46:54 +0000
857
+++ qml/Dash/CardTool.qml	2014-03-18 10:57:24 +0000
858
@@ -163,7 +163,7 @@
859
163
163
860
164
    Card {
164
    Card {
861
165
        id: card
165
        id: card
863
166
        objectName: "card"
166
        objectName: "cardToolCard"
864
167
        template: cardTool.template
167
        template: cardTool.template
865
168
        components: cardTool.components
168
        components: cardTool.components
866
169
169
867
170
170
868
=== removed file 'qml/Dash/DashCarousel.qml'
869
--- qml/Dash/DashCarousel.qml	2013-11-22 13:53:00 +0000
870
+++ qml/Dash/DashCarousel.qml	1970-01-01 00:00:00 +0000
871
@@ -1,47 +0,0 @@
872
1
/*
873
2
 * Copyright (C) 2013 Canonical, Ltd.
874
3
 *
875
4
 * This program is free software; you can redistribute it and/or modify
876
5
 * it under the terms of the GNU General Public License as published by
877
6
 * the Free Software Foundation; version 3.
878
7
 *
879
8
 * This program is distributed in the hope that it will be useful,
880
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
881
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
882
11
 * GNU General Public License for more details.
883
12
 *
884
13
 * You should have received a copy of the GNU General Public License
885
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
886
15
 */
887
16
888
17
import QtQuick 2.0
889
18
import Ubuntu.Components 0.1
890
19
import "../Components"
891
20
892
21
DashRenderer {
893
22
    id: dashCarousel
894
23
895
24
    property alias cacheBuffer: carousel.cacheBuffer
896
25
    property alias itemComponent: carousel.itemComponent
897
26
    property alias minimumTileWidth: carousel.minimumTileWidth
898
27
    property alias selectedItemScaleFactor: carousel.selectedItemScaleFactor
899
28
    property alias tileAspectRatio: carousel.tileAspectRatio
900
29
901
30
    currentItem: carousel.currentItem
902
31
    height: carousel.implicitHeight + units.gu(6)
903
32
    verticalSpacing: units.gu(3)
904
33
905
34
    Carousel {
906
35
        id: carousel
907
36
        anchors.fill: parent
908
37
        tileAspectRatio: 198 / 288
909
38
        minimumTileWidth: units.gu(13)
910
39
        selectedItemScaleFactor: 1.14
911
40
        cacheBuffer: 1404 // 18px * 13gu * 6
912
41
        model: dashCarousel.model
913
42
        highlightIndex: dashCarousel.highlightIndex
914
43
915
44
        onClicked: dashCarousel.clicked(index, itemY)
916
45
        onPressAndHold: dashCarousel.pressAndHold(index, itemY)
917
46
    }
918
47
}
919
48
0
920
=== modified file 'qml/Dash/DashContent.qml'
921
--- qml/Dash/DashContent.qml	2014-03-18 10:57:24 +0000
922
+++ qml/Dash/DashContent.qml	2014-03-18 10:57:24 +0000
923
@@ -24,7 +24,7 @@
924
24
24
925
25
    property var model: null
25
    property var model: null
926
26
    property var scopes: null
26
    property var scopes: null
928
27
    property alias currentIndex: dashContentList.currentIndex
27
    readonly property alias currentIndex: dashContentList.currentIndex
929
28
    property alias previewOpen: previewListView.open
28
    property alias previewOpen: previewListView.open
930
29
29
931
30
    property ScopeDelegateMapper scopeMapper : ScopeDelegateMapper {}
30
    property ScopeDelegateMapper scopeMapper : ScopeDelegateMapper {}
932
@@ -51,6 +51,12 @@
933
51
    }
51
    }
934
52
52
935
53
    function setCurrentScopeAtIndex(index, animate, reset) {
53
    function setCurrentScopeAtIndex(index, animate, reset) {
936
54
        // if the scopes haven't loaded yet, then wait until they are.
937
55
        if (!scopes.loaded) {
938
56
            set_current_index = [ index, animate, reset ]
939
57
            return;
940
58
        }
941
59
942
54
        var storedMoveDuration = dashContentList.highlightMoveDuration
60
        var storedMoveDuration = dashContentList.highlightMoveDuration
943
55
        var storedMoveSpeed = dashContentList.highlightMoveVelocity
61
        var storedMoveSpeed = dashContentList.highlightMoveVelocity
944
56
        if (!animate) {
62
        if (!animate) {
945
@@ -58,11 +64,6 @@
946
58
            dashContentList.highlightMoveDuration = 0
64
            dashContentList.highlightMoveDuration = 0
947
59
        }
65
        }
948
60
66
949
61
        // if the scopes haven't loaded yet, then wait until they are.
950
62
        if (!scopes.loaded) {
951
63
            set_current_index = [ index, animate, reset ]
952
64
            return;
953
65
        }
954
66
        set_current_index = undefined;
67
        set_current_index = undefined;
955
67
68
956
68
        if (dashContentList.count > index)
69
        if (dashContentList.count > index)
957
@@ -100,7 +101,7 @@
958
100
            id: dashContentList
101
            id: dashContentList
959
101
            objectName: "dashContentList"
102
            objectName: "dashContentList"
960
102
103
962
103
            interactive: dashContent.scopes.loaded && !previewListView.open && !currentItem.moving
104
            interactive: dashContent.scopes.loaded && !previewListView.open && currentItem && !currentItem.moving
963
104
105
964
105
            anchors.fill: parent
106
            anchors.fill: parent
965
106
            model: dashContent.model
107
            model: dashContent.model
966
@@ -124,7 +125,7 @@
967
124
                        dashContent.setCurrentScopeAtIndex(count-1, true, true)
125
                        dashContent.setCurrentScopeAtIndex(count-1, true, true)
968
125
                    } else if (currentIndex < 0) {
126
                    } else if (currentIndex < 0) {
969
126
                        // setting currentIndex directly, cause we don't want to loose set_current_index
127
                        // setting currentIndex directly, cause we don't want to loose set_current_index
971
127
                        dashContent.currentIndex = 0
128
                        dashContentList.currentIndex = 0
972
128
                    }
129
                    }
973
129
                }
130
                }
974
130
            }
131
            }
975
@@ -147,11 +148,12 @@
976
147
                    readonly property bool isLoaded: status == Loader.Ready
148
                    readonly property bool isLoaded: status == Loader.Ready
977
148
149
978
149
                    onLoaded: {
150
                    onLoaded: {
979
151
                        item.objectName = scope.id
980
152
                        item.pageHeader = dashPageHeader;
981
153
                        item.previewListView = previewListView;
982
150
                        item.scope = Qt.binding(function() { return scope })
154
                        item.scope = Qt.binding(function() { return scope })
983
151
                        item.isCurrent = Qt.binding(function() { return visible && ListView.isCurrentItem })
155
                        item.isCurrent = Qt.binding(function() { return visible && ListView.isCurrentItem })
984
152
                        item.tabBarHeight = dashPageHeader.implicitHeight;
156
                        item.tabBarHeight = dashPageHeader.implicitHeight;
985
153
                        item.pageHeader = dashPageHeader;
986
154
                        item.previewListView = previewListView;
987
155
                        dashContentList.movementStarted.connect(item.movementStarted)
157
                        dashContentList.movementStarted.connect(item.movementStarted)
988
156
                        dashContent.positionedAtBeginning.connect(item.positionedAtBeginning)
158
                        dashContent.positionedAtBeginning.connect(item.positionedAtBeginning)
989
157
                        dashContent.scopeLoaded(item.scope.id)
159
                        dashContent.scopeLoaded(item.scope.id)
990
@@ -177,23 +179,25 @@
991
177
            width: parent.width
179
            width: parent.width
992
178
            searchEntryEnabled: true
180
            searchEntryEnabled: true
993
179
            searchHistory: dashContent.searchHistory
181
            searchHistory: dashContent.searchHistory
995
180
            scope: dashContentList.currentItem.theScope
182
            scope: dashContentList.currentItem && dashContentList.currentItem.theScope
996
181
183
997
182
            childItem: TabBar {
184
            childItem: TabBar {
998
183
                id: tabBar
185
                id: tabBar
999
184
                objectName: "tabbar"
186
                objectName: "tabbar"
1000
185
                height: units.gu(6.5)
187
                height: units.gu(6.5)
1001
186
                width: parent.width
188
                width: parent.width
1002
187
                selectionMode: false
1003
188
                style: DashContentTabBarStyle {}
189
                style: DashContentTabBarStyle {}
1004
189
190
1010
190
                // TODO This together with the __styleInstance onModelChanged below
191
                model: dashContentList.model
1006
191
                // are a workaround for the first tab sometimes not showing the text.
1007
192
                // But Tabs are going away in the future so not sure if makes
1008
193
                // sense invetigating what's the problem at this stage
1009
194
                model: dashContentList.model.count > 0 ? dashContentList.model : null
1011
195
192
1012
196
                onSelectedIndexChanged: {
193
                onSelectedIndexChanged: {
1013
194
                    if (dashContentList.currentIndex == -1 && tabBar.selectedIndex != -1) {
1014
195
                        // TODO This together with the Timer below
1015
196
                        // are a workaround for the first tab sometimes not showing the text.
1016
197
                        // But Tabs are going away in the future so not sure if makes
1017
198
                        // sense invetigating what's the problem at this stage
1018
199
                        selectionModeTimer.restart();
1019
200
                    }
1020
197
                    dashContentList.currentIndex = selectedIndex;
201
                    dashContentList.currentIndex = selectedIndex;
1021
198
                }
202
                }
1022
199
203
1023
@@ -204,12 +208,10 @@
1024
204
                    }
208
                    }
1025
205
                }
209
                }
1026
206
210
1033
207
                Connections {
211
                Timer {
1034
208
                    target: __styleInstance
212
                    id: selectionModeTimer
1035
209
                    onModelChanged: {
213
                    interval: 1
1036
210
                        tabBar.selectedIndex = -1;
214
                    onTriggered: tabBar.selectionMode = false
1031
211
                        tabBar.selectedIndex = 0;
1032
212
                    }
1037
213
                }
215
                }
1038
214
            }
216
            }
1039
215
        }
217
        }
1040
@@ -217,6 +219,7 @@
1041
217
219
1042
218
    PreviewListView {
220
    PreviewListView {
1043
219
        id: previewListView
221
        id: previewListView
1044
222
        objectName: "dashContentPreviewList"
1045
220
        visible: x != width
223
        visible: x != width
1046
221
        scope: dashContentList.currentItem ? dashContentList.currentItem.theScope : null
224
        scope: dashContentList.currentItem ? dashContentList.currentItem.theScope : null
1047
222
        pageHeader: dashPageHeader
225
        pageHeader: dashPageHeader
1048
223
226
1049
=== removed file 'qml/Dash/DashFilterGrid.qml'
1050
--- qml/Dash/DashFilterGrid.qml	2014-03-18 10:57:24 +0000
1051
+++ qml/Dash/DashFilterGrid.qml	1970-01-01 00:00:00 +0000
1052
@@ -1,65 +0,0 @@
1053
1
/*
1054
2
 * Copyright (C) 2013 Canonical, Ltd.
1055
3
 *
1056
4
 * This program is free software; you can redistribute it and/or modify
1057
5
 * it under the terms of the GNU General Public License as published by
1058
6
 * the Free Software Foundation; version 3.
1059
7
 *
1060
8
 * This program is distributed in the hope that it will be useful,
1061
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1062
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1063
11
 * GNU General Public License for more details.
1064
12
 *
1065
13
 * You should have received a copy of the GNU General Public License
1066
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1067
15
 */
1068
16
1069
17
import QtQuick 2.0
1070
18
import "../Components"
1071
19
import ".."
1072
20
1073
21
DashRenderer {
1074
22
    id: dashFilterGrid
1075
23
1076
24
    property alias cellWidth: filterGrid.cellWidth
1077
25
    property alias cellHeight: filterGrid.cellHeight
1078
26
    property alias delegate: filterGrid.delegate
1079
27
    property alias delegateWidth: filterGrid.delegateWidth
1080
28
    property alias delegateHeight: filterGrid.delegateHeight
1081
29
    property alias verticalSpacing: filterGrid.verticalSpacing
1082
30
    property alias maximumNumberOfColumns: filterGrid.maximumNumberOfColumns
1083
31
    property alias minimumHorizontalSpacing: filterGrid.minimumHorizontalSpacing
1084
32
    property alias collapsedRowCount: filterGrid.collapsedRowCount
1085
33
1086
34
    collapsedHeight: filterGrid.collapsedHeight
1087
35
    columns: filterGrid.columns
1088
36
    rows: filter ? filterGrid.collapsedRowCount : filterGrid.uncollapsedRowCount
1089
37
    currentItem: filterGrid.currentItem
1090
38
    expandable: filterGrid.expandable
1091
39
    height: filterGrid.height
1092
40
    margins: filterGrid.margins
1093
41
    uncollapsedHeight: filterGrid.uncollapsedHeight
1094
42
1095
43
    function startFilterAnimation(filter) {
1096
44
        filterGrid.startFilterAnimation(filter)
1097
45
    }
1098
46
1099
47
    FilterGrid {
1100
48
        id: filterGrid
1101
49
        width: dashFilterGrid.width
1102
50
        minimumHorizontalSpacing: units.gu(0.5)
1103
51
        delegateWidth: units.gu(11)
1104
52
        delegateHeight: units.gu(9.5)
1105
53
        verticalSpacing: units.gu(2)
1106
54
        model: dashFilterGrid.model
1107
55
        filter: dashFilterGrid.filter
1108
56
        highlightIndex: dashFilterGrid.highlightIndex
1109
57
        delegateCreationBegin: dashFilterGrid.delegateCreationBegin
1110
58
        delegateCreationEnd: dashFilterGrid.delegateCreationEnd
1111
59
1112
60
        onFilterChanged: {
1113
61
            dashFilterGrid.filter = filter
1114
62
            filter = Qt.binding(function() { return dashFilterGrid.filter })
1115
63
        }
1116
64
    }
1117
65
}
1118
66
0
1119
=== removed file 'qml/Dash/DashHome.qml'
1120
--- qml/Dash/DashHome.qml	2013-08-11 21:21:38 +0000
1121
+++ qml/Dash/DashHome.qml	1970-01-01 00:00:00 +0000
1122
@@ -1,39 +0,0 @@
1123
1
/*
1124
2
 * Copyright (C) 2013 Canonical, Ltd.
1125
3
 *
1126
4
 * This program is free software; you can redistribute it and/or modify
1127
5
 * it under the terms of the GNU General Public License as published by
1128
6
 * the Free Software Foundation; version 3.
1129
7
 *
1130
8
 * This program is distributed in the hope that it will be useful,
1131
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1132
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1133
11
 * GNU General Public License for more details.
1134
12
 *
1135
13
 * You should have received a copy of the GNU General Public License
1136
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1137
15
 */
1138
16
1139
17
import QtQuick 2.0
1140
18
import Ubuntu.Components 0.1
1141
19
import Utils 0.1
1142
20
import "../Components"
1143
21
import "../Components/ListItems"
1144
22
import "Apps"
1145
23
1146
24
GenericScopeView {
1147
25
    id: root
1148
26
    objectName: "DashHome"
1149
27
1150
28
    SearchableResultModel {
1151
29
        id: appsModel
1152
30
1153
31
        model: FrequentlyUsedAppsModel {}
1154
32
        filterRole: 3
1155
33
        searchQuery: root.scope.searchQuery
1156
34
    }
1157
35
1158
36
    onScopeChanged: {
1159
37
        root.scope.categories.overrideResults("applications.scope", appsModel);
1160
38
    }
1161
39
}
1162
40
0
1163
=== removed file 'qml/Dash/DashPreview.qml'
1164
--- qml/Dash/DashPreview.qml	2014-02-03 19:18:05 +0000
1165
+++ qml/Dash/DashPreview.qml	1970-01-01 00:00:00 +0000
1166
@@ -1,208 +0,0 @@
1167
1
/*
1168
2
 * Copyright (C) 2013 Canonical, Ltd.
1169
3
 *
1170
4
 * This program is free software; you can redistribute it and/or modify
1171
5
 * it under the terms of the GNU General Public License as published by
1172
6
 * the Free Software Foundation; version 3.
1173
7
 *
1174
8
 * This program is distributed in the hope that it will be useful,
1175
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1176
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1177
11
 * GNU General Public License for more details.
1178
12
 *
1179
13
 * You should have received a copy of the GNU General Public License
1180
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1181
15
 */
1182
16
1183
17
import QtQuick 2.0
1184
18
import Ubuntu.Components 0.1
1185
19
1186
20
Item {
1187
21
    id: root
1188
22
1189
23
    property int keyboardSize: Qt.inputMethod.visible ? Qt.inputMethod.keyboardRectangle.height : 0
1190
24
    property var previewData
1191
25
    property alias showProcessingAction: waitingForActionMouseArea.enabled
1192
26
1193
27
    property real previewWidthRatio: 0.5
1194
28
    property bool isCurrent: false
1195
29
1196
30
    property Component previewImages
1197
31
    property Component header
1198
32
    property Component actions
1199
33
    property Component description
1200
34
    property Component ratings
1201
35
1202
36
    readonly property bool narrowMode: width <= height * 1.5
1203
37
    readonly property int columnWidth: narrowMode ? contentRow.width : (contentRow.width / 3) - contentRow.spacing
1204
38
    readonly property int contentSpacing: units.gu(3)
1205
39
1206
40
    clip: true
1207
41
1208
42
    function ensureVisible(item) {
1209
43
        var o = leftFlickable.mapFromItem(item, 0, 0, item.width, item.height);
1210
44
        var keyboardY = shell.height - root.keyboardSize;
1211
45
        if ((o.y + o.height) > keyboardY) {
1212
46
            leftFlickable.contentY += o.y + o.height - keyboardY;
1213
47
        }
1214
48
    }
1215
49
1216
50
    Connections {
1217
51
        target: shell.applicationManager
1218
52
        onMainStageFocusedApplicationChanged: {
1219
53
            root.close();
1220
54
        }
1221
55
        onSideStageFocusedApplicationChanged: {
1222
56
            root.close();
1223
57
        }
1224
58
    }
1225
59
1226
60
    onPreviewDataChanged: showProcessingAction = false
1227
61
1228
62
    MouseArea {
1229
63
        anchors.fill: parent
1230
64
    }
1231
65
1232
66
    Row {
1233
67
        id: contentRow
1234
68
        anchors {
1235
69
            left: parent.left
1236
70
            top: parent.top
1237
71
            right: parent.right
1238
72
            bottom: parent.bottom
1239
73
            topMargin: root.contentSpacing
1240
74
            leftMargin: root.contentSpacing
1241
75
            rightMargin: root.contentSpacing
1242
76
        }
1243
77
        height: childrenRect.height
1244
78
1245
79
        spacing: units.gu(2)
1246
80
1247
81
1248
82
        Flickable {
1249
83
            id: leftFlickable
1250
84
            objectName: "leftFlickable"
1251
85
            anchors {
1252
86
                top: parent.top
1253
87
                bottom: parent.bottom
1254
88
            }
1255
89
            width: root.columnWidth
1256
90
            contentHeight: leftColumn.height + root.contentSpacing
1257
91
            anchors.bottomMargin: root.keyboardSize
1258
92
            clip: true
1259
93
1260
94
            Behavior on contentY { NumberAnimation { duration: 300 } }
1261
95
1262
96
            Column {
1263
97
                id: leftColumn
1264
98
                objectName: "leftColumn"
1265
99
                height: childrenRect.height
1266
100
                spacing: root.contentSpacing
1267
101
                anchors {
1268
102
                    left: parent.left
1269
103
                    right: parent.right
1270
104
                }
1271
105
            }
1272
106
        }
1273
107
1274
108
        Flickable {
1275
109
            id: centerFlickable
1276
110
            anchors {
1277
111
                top: parent.top
1278
112
                bottom: parent.bottom
1279
113
            }
1280
114
            width: root.columnWidth
1281
115
            contentHeight: centerColumn.height
1282
116
            clip: true
1283
117
1284
118
            Column {
1285
119
                id: centerColumn
1286
120
                objectName: "centerColumn"
1287
121
                height: childrenRect.height
1288
122
                anchors {
1289
123
                    left: parent.left
1290
124
                    right: parent.right
1291
125
                }
1292
126
                spacing: root.contentSpacing
1293
127
            }
1294
128
        }
1295
129
1296
130
        Flickable {
1297
131
            id: rightFlickable
1298
132
            anchors {
1299
133
                top: parent.top
1300
134
                bottom: parent.bottom
1301
135
            }
1302
136
            width: root.columnWidth
1303
137
            contentHeight: rightColumn.height
1304
138
            clip: true
1305
139
1306
140
            Column {
1307
141
                id: rightColumn
1308
142
                objectName: "rightColumn"
1309
143
                height: childrenRect.height
1310
144
                anchors {
1311
145
                    left: parent.left
1312
146
                    right: parent.right
1313
147
                }
1314
148
            }
1315
149
        }
1316
150
    }
1317
151
1318
152
    Loader {
1319
153
        id: previewImageLoader
1320
154
        parent: leftColumn
1321
155
        sourceComponent: root.previewImages
1322
156
        anchors {
1323
157
            left: parent.left
1324
158
            right: parent.right
1325
159
        }
1326
160
    }
1327
161
1328
162
    Loader {
1329
163
        id: ratingsLoader
1330
164
        parent: root.narrowMode ? leftColumn : rightColumn
1331
165
        anchors {
1332
166
            left: parent.left
1333
167
            right: parent.right
1334
168
        }
1335
169
        sourceComponent: root.ratings
1336
170
    }
1337
171
1338
172
    Loader {
1339
173
        id: descriptionLoader
1340
174
        parent: root.narrowMode ? leftColumn : centerColumn
1341
175
        anchors {
1342
176
            left: parent.left
1343
177
            right: parent.right
1344
178
        }
1345
179
        sourceComponent: root.description
1346
180
    }
1347
181
1348
182
    Loader {
1349
183
        id: actionsLoader
1350
184
        parent: root.narrowMode ? leftColumn : centerColumn
1351
185
        anchors {
1352
186
            left: parent.left
1353
187
            right: parent.right
1354
188
        }
1355
189
        sourceComponent: root.actions
1356
190
    }
1357
191
1358
192
    Loader {
1359
193
        id: headerLoader
1360
194
        parent: root.narrowMode ? leftColumn : centerColumn
1361
195
        anchors {
1362
196
            left: parent.left
1363
197
            right: parent.right
1364
198
        }
1365
199
        sourceComponent: root.header
1366
200
    }
1367
201
1368
202
    MouseArea {
1369
203
        id: waitingForActionMouseArea
1370
204
        objectName: "waitingForActionMouseArea"
1371
205
        anchors.fill: parent
1372
206
        enabled: false
1373
207
    }
1374
208
}
1375
209
0
1376
=== removed file 'qml/Dash/DashPreviewPlaceholder.qml'
1377
--- qml/Dash/DashPreviewPlaceholder.qml	2014-03-18 10:57:24 +0000
1378
+++ qml/Dash/DashPreviewPlaceholder.qml	1970-01-01 00:00:00 +0000
1379
@@ -1,25 +0,0 @@
1380
1
/*
1381
2
 * Copyright (C) 2013 Canonical, Ltd.
1382
3
 *
1383
4
 * This program is free software; you can redistribute it and/or modify
1384
5
 * it under the terms of the GNU General Public License as published by
1385
6
 * the Free Software Foundation; version 3.
1386
7
 *
1387
8
 * This program is distributed in the hope that it will be useful,
1388
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1389
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1390
11
 * GNU General Public License for more details.
1391
12
 *
1392
13
 * You should have received a copy of the GNU General Public License
1393
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1394
15
 */
1395
16
1396
17
import QtQuick 2.0
1397
18
import Ubuntu.Components 0.1
1398
19
1399
20
DashPreview {
1400
21
    ActivityIndicator {
1401
22
        anchors.centerIn: parent
1402
23
        running: visible
1403
24
    }
1404
25
}
1405
26
0
1406
=== modified file 'qml/Dash/DashRenderer.qml'
1407
--- qml/Dash/DashRenderer.qml	2014-03-18 10:57:24 +0000
1408
+++ qml/Dash/DashRenderer.qml	2014-03-18 10:57:24 +0000
1409
@@ -31,9 +31,6 @@
1410
31
31
1411
32
    property int rows: 1
32
    property int rows: 1
1412
33
33
1413
34
    // Index of the highlighted item
1414
35
    property int highlightIndex: -1
1415
36
1416
37
    property int margins: 0
34
    property int margins: 0
1417
38
35
1418
39
    property int uncollapsedHeight: height
36
    property int uncollapsedHeight: height
1419
@@ -53,7 +50,7 @@
1420
53
    /*!
50
    /*!
1421
54
     \brief CardTool component.
51
     \brief CardTool component.
1422
55
     */
52
     */
1424
56
    property var cardTool
53
    property var cardTool: undefined
1425
57
54
1426
58
    /// Emitted when the user clicked on an item
55
    /// Emitted when the user clicked on an item
1427
59
    /// @param index is the index of the clicked item
56
    /// @param index is the index of the clicked item
1428
60
57
1429
=== removed directory 'qml/Dash/Generic'
1430
=== removed file 'qml/Dash/Generic/FlatTileStyle.qml'
1431
--- qml/Dash/Generic/FlatTileStyle.qml	2013-10-10 10:20:36 +0000
1432
+++ qml/Dash/Generic/FlatTileStyle.qml	1970-01-01 00:00:00 +0000
1433
@@ -1,79 +0,0 @@
1434
1
/*
1435
2
 * Copyright (C) 2013 Canonical, Ltd.
1436
3
 *
1437
4
 * This program is free software; you can redistribute it and/or modify
1438
5
 * it under the terms of the GNU General Public License as published by
1439
6
 * the Free Software Foundation; version 3.
1440
7
 *
1441
8
 * This program is distributed in the hope that it will be useful,
1442
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1443
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1444
11
 * GNU General Public License for more details.
1445
12
 *
1446
13
 * You should have received a copy of the GNU General Public License
1447
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1448
15
 */
1449
16
1450
17
import QtQuick 2.0
1451
18
import Ubuntu.Components 0.1
1452
19
1453
20
Item {
1454
21
    id: tile
1455
22
1456
23
    property bool disabled: false
1457
24
1458
25
    anchors.fill: parent
1459
26
1460
27
    Image {
1461
28
        id: icon
1462
29
        objectName: "image"
1463
30
        width: styledItem.imageWidth
1464
31
        height: styledItem.imageHeight
1465
32
1466
33
        anchors.horizontalCenter: parent.horizontalCenter
1467
34
1468
35
        sourceSize { width: width; height: height }
1469
36
        asynchronous: true
1470
37
        cache: false
1471
38
        source: styledItem.source
1472
39
        fillMode: styledItem.fillMode
1473
40
        opacity: tile.disabled ? 0.3 : 1.0
1474
41
        horizontalAlignment: Image.AlignHCenter
1475
42
        verticalAlignment: Image.AlignVCenter
1476
43
    }
1477
44
1478
45
    UbuntuShape {
1479
46
        id: borderPressed
1480
47
        objectName: "borderPressed"
1481
48
1482
49
        anchors.fill: icon
1483
50
        radius: "medium"
1484
51
        borderSource: "radius_pressed.sci"
1485
52
        opacity: styledItem.pressed ? 1.0 : 0.0
1486
53
        Behavior on opacity { NumberAnimation { duration: 200; easing.type: Easing.OutQuint } }
1487
54
    }
1488
55
1489
56
    Label {
1490
57
        id: label
1491
58
        objectName: "label"
1492
59
        anchors {
1493
60
            baseline: icon.bottom
1494
61
            baselineOffset: units.gu(2)
1495
62
            left: parent.left
1496
63
            right: parent.right
1497
64
            leftMargin: units.gu(1)
1498
65
            rightMargin: units.gu(1)
1499
66
        }
1500
67
1501
68
        color: Theme.palette.selected.backgroundText
1502
69
        opacity: 0.9
1503
70
        style: Text.Raised
1504
71
        styleColor: "black"
1505
72
        fontSize: "small"
1506
73
        elide: Text.ElideMiddle
1507
74
        horizontalAlignment: styledItem.horizontalAlignment
1508
75
        text: styledItem.text
1509
76
        wrapMode: Text.Wrap
1510
77
        maximumLineCount: styledItem.maximumLineCount
1511
78
    }
1512
79
}
1513
80
0
1514
=== removed file 'qml/Dash/Generic/GenericCarousel.qml'
1515
--- qml/Dash/Generic/GenericCarousel.qml	2013-12-05 18:01:29 +0000
1516
+++ qml/Dash/Generic/GenericCarousel.qml	1970-01-01 00:00:00 +0000
1517
@@ -1,53 +0,0 @@
1518
1
/*
1519
2
 * Copyright (C) 2013 Canonical, Ltd.
1520
3
 *
1521
4
 * This program is free software; you can redistribute it and/or modify
1522
5
 * it under the terms of the GNU General Public License as published by
1523
6
 * the Free Software Foundation; version 3.
1524
7
 *
1525
8
 * This program is distributed in the hope that it will be useful,
1526
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1527
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1528
11
 * GNU General Public License for more details.
1529
12
 *
1530
13
 * You should have received a copy of the GNU General Public License
1531
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1532
15
 */
1533
16
1534
17
import QtQuick 2.0
1535
18
import Ubuntu.Components 0.1
1536
19
import "../../Components"
1537
20
import ".."
1538
21
1539
22
DashCarousel {
1540
23
    id: genericCarousel
1541
24
    itemComponent: carouselDelegateGeneric
1542
25
1543
26
    Component {
1544
27
        id: carouselDelegateGeneric
1545
28
1546
29
        BaseCarouselDelegate {
1547
30
            id: item
1548
31
            objectName: "carouselDelegate"
1549
32
1550
33
            UbuntuShape {
1551
34
                anchors.fill: parent
1552
35
                radius: "medium"
1553
36
                borderSource: ""
1554
37
                image: Image {
1555
38
                    asynchronous: true
1556
39
                    sourceSize { width: item.width; height: item.height }
1557
40
                    source: model ? model.icon : ""
1558
41
                }
1559
42
            }
1560
43
1561
44
            BorderImage {
1562
45
                anchors.centerIn: parent
1563
46
                opacity: 0.6
1564
47
                source: "../../Components/graphics/non-selected.sci"
1565
48
                width: parent.width + units.gu(1.5)
1566
49
                height: parent.height + units.gu(1.5)
1567
50
            }
1568
51
        }
1569
52
    }
1570
53
}
1571
54
0
1572
=== removed file 'qml/Dash/Generic/GenericFilterGrid.qml'
1573
--- qml/Dash/Generic/GenericFilterGrid.qml	2013-11-22 13:53:00 +0000
1574
+++ qml/Dash/Generic/GenericFilterGrid.qml	1970-01-01 00:00:00 +0000
1575
@@ -1,46 +0,0 @@
1576
1
/*
1577
2
 * Copyright (C) 2013 Canonical, Ltd.
1578
3
 *
1579
4
 * This program is free software; you can redistribute it and/or modify
1580
5
 * it under the terms of the GNU General Public License as published by
1581
6
 * the Free Software Foundation; version 3.
1582
7
 *
1583
8
 * This program is distributed in the hope that it will be useful,
1584
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1585
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1586
11
 * GNU General Public License for more details.
1587
12
 *
1588
13
 * You should have received a copy of the GNU General Public License
1589
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1590
15
 */
1591
16
1592
17
import QtQuick 2.0
1593
18
import Ubuntu.Components 0.1
1594
19
import "../../Components"
1595
20
import ".."
1596
21
1597
22
DashFilterGrid {
1598
23
    id: genericFilterGrid
1599
24
1600
25
    property int iconWidth: units.gu(8)
1601
26
    property int iconHeight: units.gu(7.5)
1602
27
1603
28
    minimumHorizontalSpacing: units.gu(0.5)
1604
29
    delegateWidth: units.gu(11)
1605
30
    delegateHeight: units.gu(9.5)
1606
31
    verticalSpacing: units.gu(2)
1607
32
1608
33
    delegate: Tile {
1609
34
        id: tile
1610
35
        objectName: "delegate" + index
1611
36
        width: genericFilterGrid.cellWidth
1612
37
        height: genericFilterGrid.cellHeight
1613
38
        text: model.title
1614
39
        imageWidth: genericFilterGrid.iconWidth
1615
40
        imageHeight: genericFilterGrid.iconHeight
1616
41
        source: model.icon
1617
42
1618
43
        onClicked: genericFilterGrid.clicked(index, tile.y)
1619
44
        onPressAndHold: genericFilterGrid.pressAndHold(index, tile.y)
1620
45
    }
1621
46
}
1622
47
0
1623
=== removed file 'qml/Dash/Generic/GenericFilterGridPotrait.qml'
1624
--- qml/Dash/Generic/GenericFilterGridPotrait.qml	2013-11-20 00:10:01 +0000
1625
+++ qml/Dash/Generic/GenericFilterGridPotrait.qml	1970-01-01 00:00:00 +0000
1626
@@ -1,28 +0,0 @@
1627
1
/*
1628
2
 * Copyright (C) 2013 Canonical, Ltd.
1629
3
 *
1630
4
 * This program is free software; you can redistribute it and/or modify
1631
5
 * it under the terms of the GNU General Public License as published by
1632
6
 * the Free Software Foundation; version 3.
1633
7
 *
1634
8
 * This program is distributed in the hope that it will be useful,
1635
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1636
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1637
11
 * GNU General Public License for more details.
1638
12
 *
1639
13
 * You should have received a copy of the GNU General Public License
1640
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1641
15
 */
1642
16
1643
17
import QtQuick 2.0
1644
18
import Ubuntu.Components 0.1
1645
19
import "../../Components"
1646
20
1647
21
GenericFilterGrid {
1648
22
    minimumHorizontalSpacing: units.gu(0.5)
1649
23
    delegateWidth: units.gu(11)
1650
24
    delegateHeight: units.gu(18)
1651
25
    verticalSpacing: units.gu(2)
1652
26
    iconWidth: (width / columns) * 0.8
1653
27
    iconHeight: iconWidth * 16 / 11
1654
28
}
1655
29
0
1656
=== removed file 'qml/Dash/Generic/GenericPreview.qml'
1657
--- qml/Dash/Generic/GenericPreview.qml	2014-01-23 06:57:49 +0000
1658
+++ qml/Dash/Generic/GenericPreview.qml	1970-01-01 00:00:00 +0000
1659
@@ -1,197 +0,0 @@
1660
1
/*
1661
2
 * Copyright (C) 2013, 2014 Canonical, Ltd.
1662
3
 *
1663
4
 * This program is free software; you can redistribute it and/or modify
1664
5
 * it under the terms of the GNU General Public License as published by
1665
6
 * the Free Software Foundation; version 3.
1666
7
 *
1667
8
 * This program is distributed in the hope that it will be useful,
1668
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1669
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1670
11
 * GNU General Public License for more details.
1671
12
 *
1672
13
 * You should have received a copy of the GNU General Public License
1673
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1674
15
 */
1675
16
1676
17
import QtQuick 2.0
1677
18
import Ubuntu.Components 0.1
1678
19
import Ubuntu.Components.ListItems 0.1 as ListItems
1679
20
import Ubuntu.DownloadDaemonListener 0.1
1680
21
import "../../Components"
1681
22
import ".."
1682
23
import "../Previews"
1683
24
1684
25
DashPreview {
1685
26
    id: genericPreview
1686
27
1687
28
    previewImages: previewImagesComponent
1688
29
    header: headerComponent
1689
30
    actions: (previewData.infoMap !== undefined && previewData.infoMap["show_progressbar"]) ? progressComponent : actionsComponent
1690
31
    description: descriptionComponent
1691
32
1692
33
    Component {
1693
34
        id: previewImagesComponent
1694
35
1695
36
        LazyImage {
1696
37
            objectName: "genericPreviewImage"
1697
38
            anchors {
1698
39
                left: parent.left
1699
40
                right: parent.right
1700
41
            }
1701
42
            scaleTo: "width"
1702
43
            source: genericPreview.previewData.image
1703
44
            initialHeight: width
1704
45
        }
1705
46
    }
1706
47
1707
48
    Component {
1708
49
        id: headerComponent
1709
50
        Header {
1710
51
            title: previewData.title
1711
52
            subtitle: previewData.subtitle
1712
53
        }
1713
54
    }
1714
55
1715
56
    Component {
1716
57
        id: actionsComponent
1717
58
1718
59
        Column {
1719
60
            id: buttonList
1720
61
            spacing: units.gu(1)
1721
62
            Repeater {
1722
63
                objectName: "buttonList"
1723
64
                model: previewData.actions
1724
65
1725
66
                delegate: Button {
1726
67
                    objectName: "button" + index
1727
68
                    width: parent.width
1728
69
                    height: buttonList.buttonHeight
1729
70
                    color: Theme.palette.selected.foreground
1730
71
                    text: modelData.displayName
1731
72
                    iconSource: modelData.iconHint
1732
73
                    iconPosition: "right"
1733
74
                    onClicked: {
1734
75
                        previewData.execute(modelData.id, { })
1735
76
                        genericPreview.showProcessingAction = true;
1736
77
                    }
1737
78
                }
1738
79
            }
1739
80
        }
1740
81
    }
1741
82
1742
83
    Component {
1743
84
        id: progressComponent
1744
85
1745
86
        ProgressBar {
1746
87
            id: progressBar
1747
88
            objectName: "progressBar"
1748
89
            value: 0
1749
90
            maximumValue: 100
1750
91
            height: units.gu(5)
1751
92
1752
93
            property var model: previewData.actions
1753
94
1754
95
            DownloadTracker {
1755
96
                service: "com.canonical.applications.Downloader"
1756
97
                dbusPath: previewData.infoMap["progressbar_source"] ? previewData.infoMap["progressbar_source"].value : ""
1757
98
1758
99
                onProgress: {
1759
100
                    var percentage = parseInt(received * 100 / total);
1760
101
                    progressBar.value = percentage;
1761
102
                }
1762
103
1763
104
                onFinished: {
1764
105
                    previewData.execute(progressBar.model[0].id, { })
1765
106
                }
1766
107
1767
108
                onError: {
1768
109
                    previewData.execute(progressBar.model[1].id, { "error": error });
1769
110
                }
1770
111
            }
1771
112
1772
113
        }
1773
114
    }
1774
115
1775
116
    Component {
1776
117
        id: descriptionComponent
1777
118
        Column {
1778
119
            spacing: units.gu(2)
1779
120
1780
121
            Label {
1781
122
                id: descriptionLabel
1782
123
                objectName: "descriptionLabel"
1783
124
                anchors { left: parent.left; right: parent.right }
1784
125
                visible: text != ""
1785
126
                fontSize: "small"
1786
127
                opacity: 0.6
1787
128
                color: "white"
1788
129
                text: previewData.description.replace(/[\r\n]/g, "<br />")
1789
130
                style: Text.Raised
1790
131
                styleColor: "black"
1791
132
                wrapMode: Text.WordWrap
1792
133
                textFormat: Text.RichText
1793
134
                // FIXME: workaround for https://bugreports.qt-project.org/browse/QTBUG-33020
1794
135
                onWidthChanged: { wrapMode = Text.NoWrap; wrapMode = Text.WordWrap }
1795
136
            }
1796
137
1797
138
            Column {
1798
139
                objectName: "infoHintColumn"
1799
140
                anchors {
1800
141
                    left: parent.left
1801
142
                    right: parent.right
1802
143
                }
1803
144
                Repeater {
1804
145
                    objectName: "infoHintRepeater"
1805
146
                    model: previewData.infoHints
1806
147
1807
148
                    delegate: Item {
1808
149
                        objectName: "infoHintItem" + index
1809
150
                        width: parent.width
1810
151
                        height: units.gu(5)
1811
152
                        Row {
1812
153
                            width: parent.width
1813
154
                            spacing: units.gu(1)
1814
155
                            property int columnWidth: (width - spacing) / 2
1815
156
                            anchors.verticalCenter: parent.verticalCenter
1816
157
1817
158
                            Label {
1818
159
                                objectName: "displayNameLabel"
1819
160
                                visible: valueLabel.visible
1820
161
                                fontSize: "small"
1821
162
                                opacity: 0.9
1822
163
                                color: "white"
1823
164
                                horizontalAlignment: Text.AlignLeft
1824
165
                                width: parent.columnWidth
1825
166
                                text: modelData.displayName
1826
167
                                style: Text.Raised
1827
168
                                styleColor: "black"
1828
169
                            }
1829
170
                            Label {
1830
171
                                id: valueLabel
1831
172
                                objectName: "valueLabel"
1832
173
                                visible: modelData.value != ""
1833
174
                                fontSize: "small"
1834
175
                                opacity: 0.6
1835
176
                                color: "white"
1836
177
                                horizontalAlignment: Text.AlignRight
1837
178
                                width: parent.columnWidth
1838
179
                                text: modelData.value ? modelData.value : ""
1839
180
                                style: Text.Raised
1840
181
                                styleColor: "black"
1841
182
                                wrapMode: Text.WordWrap
1842
183
                            }
1843
184
                        }
1844
185
                        ListItems.ThinDivider {
1845
186
                            anchors {
1846
187
                                left: parent.left
1847
188
                                bottom: parent.bottom
1848
189
                                right: parent.right
1849
190
                            }
1850
191
                        }
1851
192
                    }
1852
193
                }
1853
194
            }
1854
195
        }
1855
196
    }
1856
197
}
1857
198
0
1858
=== removed file 'qml/Dash/Generic/WeatherFilterGrid.qml'
1859
--- qml/Dash/Generic/WeatherFilterGrid.qml	2013-11-11 11:44:39 +0000
1860
+++ qml/Dash/Generic/WeatherFilterGrid.qml	1970-01-01 00:00:00 +0000
1861
@@ -1,47 +0,0 @@
1862
1
/*
1863
2
 * Copyright (C) 2013 Canonical, Ltd.
1864
3
 *
1865
4
 * This program is free software; you can redistribute it and/or modify
1866
5
 * it under the terms of the GNU General Public License as published by
1867
6
 * the Free Software Foundation; version 3.
1868
7
 *
1869
8
 * This program is distributed in the hope that it will be useful,
1870
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1871
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1872
11
 * GNU General Public License for more details.
1873
12
 *
1874
13
 * You should have received a copy of the GNU General Public License
1875
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1876
15
 */
1877
16
1878
17
import QtQuick 2.0
1879
18
import Ubuntu.Components 0.1
1880
19
import "../../Components"
1881
20
1882
21
GenericFilterGrid {
1883
22
    id: filtergrid
1884
23
1885
24
    delegateHeight: units.gu(11.5)
1886
25
1887
26
    delegate: Tile {
1888
27
        id: tile
1889
28
        objectName: "delegate" + index
1890
29
        width: filtergrid.cellWidth
1891
30
        height: filtergrid.cellHeight
1892
31
        text: model.title
1893
32
        imageWidth: filtergrid.iconWidth
1894
33
        imageHeight: filtergrid.iconHeight
1895
34
        source: model.icon
1896
35
        maximumLineCount: 2
1897
36
1898
37
        style: FlatTileStyle {}
1899
38
1900
39
        onClicked: {
1901
40
            filtergrid.clicked(index, tile.y)
1902
41
        }
1903
42
1904
43
        onPressAndHold: {
1905
44
            filtergrid.pressAndHold(index, tile.y)
1906
45
        }
1907
46
    }
1908
47
}
1909
48
0
1910
=== modified file 'qml/Dash/GenericScopeView.qml'
1911
--- qml/Dash/GenericScopeView.qml	2014-03-18 10:57:24 +0000
1912
+++ qml/Dash/GenericScopeView.qml	2014-03-18 10:57:24 +0000
1913
@@ -24,9 +24,9 @@
1914
24
FocusScope {
24
FocusScope {
1915
25
    id: scopeView
25
    id: scopeView
1916
26
26
1918
27
    property Scope scope
27
    property Scope scope: null
1919
28
    property SortFilterProxyModel categories: categoryFilter
28
    property SortFilterProxyModel categories: categoryFilter
1921
29
    property bool isCurrent
29
    property bool isCurrent: false
1922
30
    property alias moving: categoryView.moving
30
    property alias moving: categoryView.moving
1923
31
    property int tabBarHeight: 0
31
    property int tabBarHeight: 0
1924
32
    property PageHeader pageHeader: null
32
    property PageHeader pageHeader: null
1925
@@ -91,7 +91,7 @@
1926
91
    Binding {
91
    Binding {
1927
92
        target: pageHeader
92
        target: pageHeader
1928
93
        property: "searchQuery"
93
        property: "searchQuery"
1930
94
        value: scopeView.scope.searchQuery
94
        value: scopeView.scope ? scopeView.scope.searchQuery : ""
1931
95
        when: isCurrent
95
        when: isCurrent
1932
96
    }
96
    }
1933
97
97
1934
@@ -122,11 +122,6 @@
1935
122
        onOriginYChanged: pageHeader.positionRealHeader();
122
        onOriginYChanged: pageHeader.positionRealHeader();
1936
123
        onContentHeightChanged: pageHeader.positionRealHeader();
123
        onContentHeightChanged: pageHeader.positionRealHeader();
1937
124
124
1938
125
        Behavior on contentY {
1939
126
            enabled: previewListView.open
1940
127
            UbuntuNumberAnimation {}
1941
128
        }
1942
129
1943
130
        delegate: ListItems.Base {
125
        delegate: ListItems.Base {
1944
131
            id: baseItem
126
            id: baseItem
1945
132
            objectName: "dashCategory" + category
127
            objectName: "dashCategory" + category
1946
133
128
1947
=== removed directory 'qml/Dash/Movie'
1948
=== removed file 'qml/Dash/Movie/MoviePreview.qml'
1949
--- qml/Dash/Movie/MoviePreview.qml	2013-10-02 19:21:33 +0000
1950
+++ qml/Dash/Movie/MoviePreview.qml	1970-01-01 00:00:00 +0000
1951
@@ -1,71 +0,0 @@
1952
1
/*
1953
2
 * Copyright (C) 2013 Canonical, Ltd.
1954
3
 *
1955
4
 * This program is free software; you can redistribute it and/or modify
1956
5
 * it under the terms of the GNU General Public License as published by
1957
6
 * the Free Software Foundation; version 3.
1958
7
 *
1959
8
 * This program is distributed in the hope that it will be useful,
1960
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1961
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1962
11
 * GNU General Public License for more details.
1963
12
 *
1964
13
 * You should have received a copy of the GNU General Public License
1965
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1966
15
 */
1967
16
1968
17
import QtQuick 2.0
1969
18
import Ubuntu.Components 0.1
1970
19
import ".."
1971
20
import "../Generic"
1972
21
import "../../Components"
1973
22
import "../Previews"
1974
23
1975
24
GenericPreview {
1976
25
    id: root
1977
26
1978
27
    property bool ready: previewData ? true : false
1979
28
    property url url: ready ? previewData.image : ""
1980
29
1981
30
    previewImages: previewImageComponent
1982
31
    header: headerComponent
1983
32
1984
33
    Component {
1985
34
        id: previewImageComponent
1986
35
        LazyImage {
1987
36
            anchors.left: parent.left
1988
37
            anchors.right: parent.right
1989
38
            scaleTo: "width"
1990
39
            visible: height > 0
1991
40
            source: root.url
1992
41
            initialHeight: width * 10 / 16
1993
42
1994
43
            Image {
1995
44
                objectName: "playButton"
1996
45
                anchors.centerIn: parent
1997
46
                readonly property bool bigButton: parent.width > units.gu(40)
1998
47
                width: bigButton ? units.gu(8) : units.gu(4.5)
1999
48
                height: width
2000
49
                source: "../graphics/play_button%1%2.png".arg(previewImageMouseArea.pressed ? "_active" : "").arg(bigButton ? "_big" : "")
2001
50
            }
2002
51
2003
52
            MouseArea {
2004
53
                id: previewImageMouseArea
2005
54
                anchors.fill: parent
2006
55
                onClicked: {
2007
56
                    Qt.openUrlExternally(previewData.result.uri);
2008
57
                }
2009
58
            }
2010
59
        }
2011
60
    }
2012
61
2013
62
    Component {
2014
63
        id: headerComponent
2015
64
        Header {
2016
65
            title: previewData.title
2017
66
            rating: Math.round(previewData.rating * 10)
2018
67
            reviews: previewData.numRatings
2019
68
            rated: previewData.infoMap["rated"] ? previewData.infoMap["rated"].value : 0
2020
69
        }
2021
70
    }
2022
71
}
2023
72
0
2024
=== removed directory 'qml/Dash/Music'
2025
=== removed file 'qml/Dash/Music/CarouselDelegateMusic.qml'
2026
--- qml/Dash/Music/CarouselDelegateMusic.qml	2013-07-09 11:04:25 +0000
2027
+++ qml/Dash/Music/CarouselDelegateMusic.qml	1970-01-01 00:00:00 +0000
2028
@@ -1,42 +0,0 @@
2029
1
/*
2030
2
 * Copyright (C) 2013 Canonical, Ltd.
2031
3
 *
2032
4
 * This program is free software; you can redistribute it and/or modify
2033
5
 * it under the terms of the GNU General Public License as published by
2034
6
 * the Free Software Foundation; version 3.
2035
7
 *
2036
8
 * This program is distributed in the hope that it will be useful,
2037
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
2038
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
2039
11
 * GNU General Public License for more details.
2040
12
 *
2041
13
 * You should have received a copy of the GNU General Public License
2042
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
2043
15
 */
2044
16
2045
17
import QtQuick 2.0
2046
18
import Ubuntu.Components 0.1
2047
19
import "../../Components"
2048
20
2049
21
BaseCarouselDelegate {
2050
22
    id: item
2051
23
2052
24
    UbuntuShape {
2053
25
        anchors.fill: parent
2054
26
        radius: "medium"
2055
27
        borderSource: ""
2056
28
        image: Image {
2057
29
            asynchronous: true
2058
30
            sourceSize { width: item.width; height: item.height }
2059
31
            source: model ? model.icon : ""
2060
32
        }
2061
33
    }
2062
34
2063
35
    BorderImage {
2064
36
        anchors.centerIn: parent
2065
37
        opacity: 0.6
2066
38
        source: "../../Components/graphics/non-selected.sci"
2067
39
        width: parent.width + units.gu(1.5)
2068
40
        height: parent.height + units.gu(1.5)
2069
41
    }
2070
42
}
2071
43
0
2072
=== removed file 'qml/Dash/Music/MusicCarousel.qml'
2073
--- qml/Dash/Music/MusicCarousel.qml	2013-11-20 00:10:01 +0000
2074
+++ qml/Dash/Music/MusicCarousel.qml	1970-01-01 00:00:00 +0000
2075
@@ -1,34 +0,0 @@
2076
1
/*
2077
2
 * Copyright (C) 2013 Canonical, Ltd.
2078
3
 *
2079
4
 * This program is free software; you can redistribute it and/or modify
2080
5
 * it under the terms of the GNU General Public License as published by
2081
6
 * the Free Software Foundation; version 3.
2082
7
 *
2083
8
 * This program is distributed in the hope that it will be useful,
2084
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
2085
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
2086
11
 * GNU General Public License for more details.
2087
12
 *
2088
13
 * You should have received a copy of the GNU General Public License
2089
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
2090
15
 */
2091
16
2092
17
import QtQuick 2.0
2093
18
import "../../Components"
2094
19
import ".."
2095
20
2096
21
DashCarousel {
2097
22
    id: musicCarousel
2098
23
    tileAspectRatio: 1
2099
24
    minimumTileWidth: units.gu(13)
2100
25
    itemComponent: carouselDelegateMusic
2101
26
    selectedItemScaleFactor: 1.2
2102
27
    cacheBuffer: 1404 // 18px * 13gu * 6
2103
28
2104
29
    Component {
2105
30
        id: carouselDelegateMusic
2106
31
        CarouselDelegateMusic {
2107
32
        }
2108
33
    }
2109
34
}
2110
35
0
2111
=== removed file 'qml/Dash/Music/MusicFilterGrid.qml'
2112
--- qml/Dash/Music/MusicFilterGrid.qml	2013-11-22 13:53:00 +0000
2113
+++ qml/Dash/Music/MusicFilterGrid.qml	1970-01-01 00:00:00 +0000
2114
@@ -1,48 +0,0 @@
2115
1
/*
2116
2
 * Copyright (C) 2013 Canonical, Ltd.
2117
3
 *
2118
4
 * This program is free software; you can redistribute it and/or modify
2119
5
 * it under the terms of the GNU General Public License as published by
2120
6
 * the Free Software Foundation; version 3.
2121
7
 *
2122
8
 * This program is distributed in the hope that it will be useful,
2123
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
2124
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
2125
11
 * GNU General Public License for more details.
2126
12
 *
2127
13
 * You should have received a copy of the GNU General Public License
2128
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
2129
15
 */
2130
16
2131
17
import QtQuick 2.0
2132
18
import "../../Components"
2133
19
import "../Generic"
2134
20
2135
21
GenericFilterGrid {
2136
22
    id: musicFilterGrid
2137
23
2138
24
    delegateWidth: units.gu(11)
2139
25
    delegateHeight: units.gu(16)
2140
26
    iconWidth: units.gu(11)
2141
27
    iconHeight: units.gu(11)
2142
28
2143
29
    delegate: Tile {
2144
30
        id: tile
2145
31
        objectName: "delegate" + index
2146
32
        width: musicFilterGrid.cellWidth
2147
33
        height: musicFilterGrid.cellHeight
2148
34
        text: model.comment
2149
35
        imageWidth: musicFilterGrid.iconWidth
2150
36
        imageHeight: musicFilterGrid.iconHeight
2151
37
        source: model.icon
2152
38
        maximumLineCount: 2
2153
39
        horizontalAlignment: Text.AlignLeft
2154
40
2155
41
        style: MusicTileStyle {
2156
42
            artist: model.title
2157
43
        }
2158
44
2159
45
        onClicked: musicFilterGrid.clicked(index, tile.y)
2160
46
        onPressAndHold: musicFilterGrid.pressAndHold(index, tile.y)
2161
47
    }
2162
48
}
2163
49
0
2164
=== removed file 'qml/Dash/Music/MusicPreview.qml'
2165
--- qml/Dash/Music/MusicPreview.qml	2014-01-29 16:12:16 +0000
2166
+++ qml/Dash/Music/MusicPreview.qml	1970-01-01 00:00:00 +0000
2167
@@ -1,203 +0,0 @@
2168
1
/*
2169
2
 * Copyright (C) 2013 Canonical, Ltd.
2170
3
 *
2171
4
 * This program is free software; you can redistribute it and/or modify
2172
5
 * it under the terms of the GNU General Public License as published by
2173
6
 * the Free Software Foundation; version 3.
2174
7
 *
2175
8
 * This program is distributed in the hope that it will be useful,
2176
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
2177
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
2178
11
 * GNU General Public License for more details.
2179
12
 *
2180
13
 * You should have received a copy of the GNU General Public License
2181
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
2182
15
 */
2183
16
2184
17
import QtQuick 2.0
2185
18
import QtMultimedia 5.0
2186
19
import Ubuntu.Components 0.1
2187
20
import Ubuntu.Components.ListItems 0.1
2188
21
import ".."
2189
22
import "../Generic"
2190
23
import "../../Components"
2191
24
import "../Previews"
2192
25
2193
26
GenericPreview {
2194
27
    id: root
2195
28
2196
29
    previewImages: previewImageComponent
2197
30
    header: headerComponent
2198
31
    description: descriptionComponent
2199
32
2200
33
    Component {
2201
34
        id: previewImageComponent
2202
35
        LazyImage {
2203
36
            height: units.gu(22)
2204
37
            scaleTo: "height"
2205
38
            source: previewData ? previewData.image : ""
2206
39
            initialHeight: height
2207
40
            initialWidth: height
2208
41
        }
2209
42
    }
2210
43
2211
44
    Component {
2212
45
        id: headerComponent
2213
46
        Header {
2214
47
            title: previewData.title
2215
48
            subtitle: previewData.subtitle
2216
49
        }
2217
50
    }
2218
51
2219
52
    Component {
2220
53
        id: descriptionComponent
2221
54
2222
55
        Item {
2223
56
            height: childrenRect.height
2224
57
            Audio {
2225
58
                id: audioPlayer
2226
59
                objectName: "audioPlayer"
2227
60
                property real progress: audioPlayer.position / audioPlayer.duration
2228
61
2229
62
                property Item playingItem
2230
63
2231
64
                Component.onDestruction: {
2232
65
                    audioPlayer.stop();
2233
66
                }
2234
67
2235
68
                onErrorStringChanged: console.warn("Audio player error:", errorString)
2236
69
2237
70
            }
2238
71
2239
72
            Connections {
2240
73
                target: root
2241
74
                onIsCurrentChanged: {
2242
75
                    if (!root.isCurrent) {
2243
76
                        audioPlayer.stop();
2244
77
                    }
2245
78
                }
2246
79
            }
2247
80
2248
81
            Column {
2249
82
                anchors { left: parent.left; right: parent.right }
2250
83
                visible: trackRepeater.count > 0
2251
84
2252
85
                ThinDivider {
2253
86
                    objectName: "topDivider"
2254
87
                    anchors { left: parent.left; right: parent.right }
2255
88
                }
2256
89
2257
90
                Repeater {
2258
91
                    id: trackRepeater
2259
92
                    objectName: "trackRepeater"
2260
93
2261
94
                    model: previewData.tracks
2262
95
2263
96
                    delegate: Item {
2264
97
                        id: trackItem
2265
98
                        objectName: "trackItem" + index
2266
99
                        anchors { left: parent.left; right: parent.right }
2267
100
                        height: units.gu(5)
2268
101
                        property bool isPlayingItem: audioPlayer.playingItem == trackItem
2269
102
2270
103
                        function play() {
2271
104
                            audioPlayer.stop();
2272
105
                            // Make sure we change the source, even if two items point to the same uri location
2273
106
                            audioPlayer.source = "";
2274
107
                            audioPlayer.source = model.uri;
2275
108
                            audioPlayer.playingItem = trackItem;
2276
109
                            audioPlayer.play();
2277
110
                        }
2278
111
2279
112
                        Row {
2280
113
                            id: trackRow
2281
114
                            width: parent.width
2282
115
                            spacing: units.gu(1)
2283
116
                            property int column1Width: units.gu(3)
2284
117
                            property int column2Width: width - (2 * spacing) - column1Width - column3Width
2285
118
                            property int column3Width: units.gu(4)
2286
119
                            anchors.verticalCenter: parent.verticalCenter
2287
120
2288
121
                            Button {
2289
122
                                objectName: "playButton"
2290
123
                                width: trackRow.column1Width
2291
124
                                height: width
2292
125
                                iconSource: audioPlayer.playbackState == Audio.PlayingState && trackItem.isPlayingItem ? "image://theme/media-playback-pause" : "image://theme/media-playback-start"
2293
126
2294
127
                                // Can't be "transparent" or "#00xxxxxx" as the button optimizes away the surrounding shape
2295
128
                                // FIXME when this is resolved: https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1251685
2296
129
                                color: "#01000000"
2297
130
2298
131
                                onClicked: {
2299
132
                                    if (trackItem.isPlayingItem) {
2300
133
                                        if (audioPlayer.playbackState == Audio.PlayingState) {
2301
134
                                            audioPlayer.pause();
2302
135
                                        } else if (audioPlayer.playbackState == Audio.PausedState){
2303
136
                                            audioPlayer.play();
2304
137
                                        }
2305
138
                                    } else {
2306
139
                                        trackItem.play();
2307
140
                                    }
2308
141
                                }
2309
142
                            }
2310
143
2311
144
                            Label {
2312
145
                                objectName: "trackTitleLabel"
2313
146
                                fontSize: "small"
2314
147
                                opacity: 0.9
2315
148
                                color: "white"
2316
149
                                horizontalAlignment: Text.AlignLeft
2317
150
                                anchors.verticalCenter: parent.verticalCenter
2318
151
                                width: parent.column2Width
2319
152
                                text: title
2320
153
                                style: Text.Raised
2321
154
                                styleColor: "black"
2322
155
                                elide: Text.ElideRight
2323
156
2324
157
                                UbuntuShape {
2325
158
                                    id: progressBarFill
2326
159
                                    objectName: "progressBarFill"
2327
160
                                    color: UbuntuColors.orange
2328
161
                                    anchors.left: progressBarImage.left
2329
162
                                    anchors.right: progressBarImage.right
2330
163
                                    anchors.verticalCenter: progressBarImage.verticalCenter
2331
164
                                    height: units.dp(2)
2332
165
                                    anchors.margins: units.dp(2)
2333
166
                                    anchors.rightMargin: maxWidth - (maxWidth * audioPlayer.progress) + units.dp(2)
2334
167
                                    visible: progressBarImage.visible
2335
168
                                    property int maxWidth: progressBarImage.width - units.dp(4)
2336
169
                                }
2337
170
2338
171
                                Image {
2339
172
                                    id: progressBarImage
2340
173
                                    anchors { left: parent.left; top: parent.bottom; right: parent.right }
2341
174
                                    height: units.dp(6)
2342
175
                                    visible: audioPlayer.playbackState != Audio.StoppedState && trackItem.isPlayingItem && model.length.length > 0
2343
176
                                    source: "graphics/music_progress_bg.png"
2344
177
                                }
2345
178
                            }
2346
179
2347
180
                            Label {
2348
181
                                id: valueLabel
2349
182
                                objectName: "timeLabel"
2350
183
                                fontSize: "small"
2351
184
                                opacity: 0.9
2352
185
                                color: "white"
2353
186
                                anchors.verticalCenter: parent.verticalCenter
2354
187
                                horizontalAlignment: Text.AlignRight
2355
188
                                width: parent.column3Width
2356
189
                                text: length
2357
190
                                style: Text.Raised
2358
191
                                styleColor: "black"
2359
192
                            }
2360
193
                        }
2361
194
2362
195
                        ThinDivider {
2363
196
                            anchors { left: parent.left; bottom: parent.bottom; right: parent.right }
2364
197
                        }
2365
198
                    }
2366
199
                }
2367
200
            }
2368
201
        }
2369
202
    }
2370
203
}
2371
204
0
2372
=== removed file 'qml/Dash/Music/MusicTileStyle.qml'
2373
--- qml/Dash/Music/MusicTileStyle.qml	2013-10-14 10:23:18 +0000
2374
+++ qml/Dash/Music/MusicTileStyle.qml	1970-01-01 00:00:00 +0000
2375
@@ -1,102 +0,0 @@
2376
1
/*
2377
2
 * Copyright (C) 2013 Canonical, Ltd.
2378
3
 *
2379
4
 * This program is free software; you can redistribute it and/or modify
2380
5
 * it under the terms of the GNU General Public License as published by
2381
6
 * the Free Software Foundation; version 3.
2382
7
 *
2383
8
 * This program is distributed in the hope that it will be useful,
2384
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
2385
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
2386
11
 * GNU General Public License for more details.
2387
12
 *
2388
13
 * You should have received a copy of the GNU General Public License
2389
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
2390
15
 */
2391
16
2392
17
import QtQuick 2.0
2393
18
import Ubuntu.Components 0.1
2394
19
2395
20
Item {
2396
21
    id: tile
2397
22
2398
23
    property alias artist: artistLabel.text
2399
24
2400
25
    anchors.fill: parent
2401
26
2402
27
    UbuntuShape {
2403
28
        id: icon
2404
29
        anchors {
2405
30
            top: parent.top
2406
31
            horizontalCenter: parent.horizontalCenter
2407
32
        }
2408
33
        radius: "medium"
2409
34
        width: styledItem.imageWidth
2410
35
        height: styledItem.imageHeight
2411
36
        image: Image {
2412
37
            id: image
2413
38
            objectName: "image"
2414
39
            sourceSize { width: icon.width; height: icon.height }
2415
40
            asynchronous: true
2416
41
            cache: false
2417
42
            source: styledItem.source
2418
43
            fillMode: styledItem.fillMode
2419
44
            horizontalAlignment: Image.AlignHCenter
2420
45
            verticalAlignment: Image.AlignVCenter
2421
46
        }
2422
47
    }
2423
48
2424
49
    UbuntuShape {
2425
50
        id: borderPressed
2426
51
        objectName: "borderPressed"
2427
52
2428
53
        anchors.fill: icon
2429
54
        radius: "medium"
2430
55
        borderSource: "radius_pressed.sci"
2431
56
        opacity: styledItem.pressed ? 1.0 : 0.0
2432
57
        Behavior on opacity { NumberAnimation { duration: 200; easing.type: Easing.OutQuint } }
2433
58
    }
2434
59
2435
60
    Label {
2436
61
        id: label
2437
62
        objectName: "label"
2438
63
        anchors {
2439
64
            baseline: icon.bottom
2440
65
            baselineOffset: units.gu(2)
2441
66
            left: icon.left
2442
67
            right: parent.right
2443
68
            rightMargin: units.gu(1)
2444
69
            leftMargin: units.dp(2)
2445
70
        }
2446
71
2447
72
        color: Theme.palette.selected.backgroundText
2448
73
        opacity: 0.9
2449
74
        style: Text.Raised
2450
75
        styleColor: "black"
2451
76
        fontSize: "small"
2452
77
        font.weight: Font.Bold
2453
78
        elide: Text.ElideRight
2454
79
        horizontalAlignment: styledItem.horizontalAlignment
2455
80
        text: styledItem.text
2456
81
        wrapMode: Text.Wrap
2457
82
        maximumLineCount: styledItem.maximumLineCount
2458
83
    }
2459
84
2460
85
    Label {
2461
86
        id: artistLabel
2462
87
        anchors {
2463
88
            top: label.bottom
2464
89
            left: label.left
2465
90
            right: label.right
2466
91
            rightMargin: units.gu(1)
2467
92
        }
2468
93
2469
94
        color: Theme.palette.selected.backgroundText
2470
95
        opacity: 0.9
2471
96
        style: Text.Raised
2472
97
        styleColor: "black"
2473
98
        fontSize: "x-small"
2474
99
        elide: Text.ElideMiddle
2475
100
        horizontalAlignment: styledItem.horizontalAlignment
2476
101
    }
2477
102
}
2478
103
0
2479
=== removed file 'qml/Dash/PreviewDelegateMapper.qml'
2480
--- qml/Dash/PreviewDelegateMapper.qml	2013-11-04 15:40:30 +0000
2481
+++ qml/Dash/PreviewDelegateMapper.qml	1970-01-01 00:00:00 +0000
2482
@@ -1,38 +0,0 @@
2483
1
/*
2484
2
 * Copyright (C) 2013 Canonical, Ltd.
2485
3
 *
2486
4
 * This program is free software; you can redistribute it and/or modify
2487
5
 * it under the terms of the GNU General Public License as published by
2488
6
 * the Free Software Foundation; version 3.
2489
7
 *
2490
8
 * This program is distributed in the hope that it will be useful,
2491
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
2492
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
2493
11
 * GNU General Public License for more details.
2494
12
 *
2495
13
 * You should have received a copy of the GNU General Public License
2496
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
2497
15
 */
2498
16
2499
17
import QtQuick 2.0
2500
18
2501
19
QtObject {
2502
20
    property var d: QtObject {
2503
21
        readonly property string genericPreview: "Generic/GenericPreview.qml"
2504
22
        readonly property string appPreview: "Apps/AppPreview.qml"
2505
23
        property var previewDelegateMapping: {"preview-generic": genericPreview,
2506
24
                                              "preview-application": appPreview,
2507
25
                                              "preview-movie": "Movie/MoviePreview.qml",
2508
26
                                              "preview-music": "Music/MusicPreview.qml",
2509
27
        }
2510
28
    }
2511
29
2512
30
    function map(rendererName) {
2513
31
        var customPreview = d.previewDelegateMapping[rendererName]
2514
32
        if (customPreview != undefined) {
2515
33
            return customPreview
2516
34
        }
2517
35
        console.debug("Renderer "+rendererName+" not found, using preview-generic")
2518
36
        return d.genericPreview
2519
37
    }
2520
38
}
2521
39
0
2522
=== modified file 'qml/Dash/PreviewListView.qml'
2523
--- qml/Dash/PreviewListView.qml	2014-03-18 10:57:24 +0000
2524
+++ qml/Dash/PreviewListView.qml	2014-03-18 10:57:24 +0000
2525
@@ -34,6 +34,7 @@
2526
34
34
2527
35
    PageHeader {
35
    PageHeader {
2528
36
        id: header
36
        id: header
2529
37
        objectName: root.objectName + "_pageHeader"
2530
37
        width: parent.width
38
        width: parent.width
2531
38
        searchEntryEnabled: false
39
        searchEntryEnabled: false
2532
39
        scope: root.scope
40
        scope: root.scope
2533
@@ -60,7 +61,7 @@
2534
60
61
2535
61
    ListView  {
62
    ListView  {
2536
62
        id: previewListView
63
        id: previewListView
2538
63
        objectName: "previewListView"
64
        objectName: root.objectName + "_listView"
2539
64
        anchors {
65
        anchors {
2540
65
            top: header.bottom
66
            top: header.bottom
2541
66
            bottom: parent.bottom
67
            bottom: parent.bottom
2542
@@ -91,7 +92,7 @@
2543
91
                pageHeader.unfocus();
92
                pageHeader.unfocus();
2544
92
            } else {
93
            } else {
2545
93
                // Cancel any pending preview requests or actions
94
                // Cancel any pending preview requests or actions
2547
94
                if (previewListView.currentItem.previewData !== undefined) {
95
                if (previewListView.currentItem && previewListView.currentItem.previewData !== undefined) {
2548
95
                    previewListView.currentItem.previewData.cancelAction();
96
                    previewListView.currentItem.previewData.cancelAction();
2549
96
                }
97
                }
2550
97
                scope.cancelActivation();
98
                scope.cancelActivation();
2551
@@ -100,6 +101,7 @@
2552
100
        }
101
        }
2553
101
102
2554
102
        delegate: Item {
103
        delegate: Item {
2555
104
            objectName: "previewItem" + index
2556
103
            height: previewListView.height
105
            height: previewListView.height
2557
104
            width: previewListView.width
106
            width: previewListView.width
2558
105
107
2559
106
108
2560
=== removed file 'qml/Dash/Previews/Header.qml'
2561
--- qml/Dash/Previews/Header.qml	2013-10-01 17:49:48 +0000
2562
+++ qml/Dash/Previews/Header.qml	1970-01-01 00:00:00 +0000
2563
@@ -1,109 +0,0 @@
2564
1
/*
2565
2
 * Copyright (C) 2013 Canonical, Ltd.
2566
3
 *
2567
4
 * This program is free software; you can redistribute it and/or modify
2568
5
 * it under the terms of the GNU General Public License as published by
2569
6
 * the Free Software Foundation; version 3.
2570
7
 *
2571
8
 * This program is distributed in the hope that it will be useful,
2572
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
2573
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
2574
11
 * GNU General Public License for more details.
2575
12
 *
2576
13
 * You should have received a copy of the GNU General Public License
2577
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
2578
15
 */
2579
16
2580
17
import QtQuick 2.0
2581
18
import Ubuntu.Components 0.1
2582
19
import "../../Components"
2583
20
2584
21
Row {
2585
22
    id: root
2586
23
    property alias icon: image.source
2587
24
    property alias title: titleLabel.text
2588
25
    property alias subtitle: subtitleLabel.text
2589
26
    property alias rating: ratingStars.rating
2590
27
    property int rated: 0
2591
28
    property int reviews: 0
2592
29
2593
30
    spacing: units.gu(2)
2594
31
    height: imageShape.visible ? imageShape.height : contentColumn.height
2595
32
2596
33
    UbuntuShape {
2597
34
        id: imageShape
2598
35
        width: height
2599
36
        height: Math.max(units.gu(6), contentColumn.height)
2600
37
        visible: image.source.toString().length > 0
2601
38
        image: Image {
2602
39
            id: image
2603
40
            sourceSize { width: imageShape.width; height: imageShape.height }
2604
41
            asynchronous: true
2605
42
            fillMode: Image.PreserveAspectFit
2606
43
        }
2607
44
    }
2608
45
2609
46
    Column {
2610
47
        id: contentColumn
2611
48
        spacing: units.gu(1)
2612
49
        width: parent.width - x
2613
50
2614
51
        Label {
2615
52
            id: titleLabel
2616
53
            objectName: "titleLabel"
2617
54
            fontSize: "large"
2618
55
            color: "white"
2619
56
            style: Text.Raised
2620
57
            styleColor: "black"
2621
58
            opacity: .9
2622
59
            width: parent.width
2623
60
            elide: Text.ElideRight
2624
61
        }
2625
62
2626
63
        Label {
2627
64
            id: subtitleLabel
2628
65
            objectName: "subtitleLabel"
2629
66
            fontSize: "medium"
2630
67
            color: "white"
2631
68
            style: Text.Raised
2632
69
            styleColor: "black"
2633
70
            opacity: .6
2634
71
            visible: text.length > 0
2635
72
        }
2636
73
2637
74
        Row {
2638
75
            visible: root.rating >= 0
2639
76
            spacing: units.gu(1)
2640
77
2641
78
            RatingStars {
2642
79
                id: ratingStars
2643
80
                maximumRating: 10
2644
81
                rating: -1
2645
82
            }
2646
83
2647
84
            Label {
2648
85
                id: ratedLabel
2649
86
                objectName: "ratedLabel"
2650
87
                fontSize: "medium"
2651
88
                color: "white"
2652
89
                style: Text.Raised
2653
90
                styleColor: "black"
2654
91
                opacity: .6
2655
92
                //TRANSLATORS: Number of persons who rated this app/video/whatever
2656
93
                text: i18n.tr("(%1)").arg(root.rated)
2657
94
            }
2658
95
2659
96
            Label {
2660
97
                id: reviewsLabel
2661
98
                objectName: "reviewsLabel"
2662
99
                fontSize: "medium"
2663
100
                color: "white"
2664
101
                style: Text.Raised
2665
102
                styleColor: "black"
2666
103
                opacity: .6
2667
104
                //TRANSLATORS: Number of persons who wrote reviews for this app/video/whatever
2668
105
                text: i18n.tr("%1 review", "%1 reviews", root.reviews).arg(root.reviews)
2669
106
            }
2670
107
        }
2671
108
    }
2672
109
}
2673
110
0
2674
=== removed file 'qml/Dash/Previews/Reviews.qml'
2675
--- qml/Dash/Previews/Reviews.qml	2013-09-30 19:34:47 +0000
2676
+++ qml/Dash/Previews/Reviews.qml	1970-01-01 00:00:00 +0000
2677
@@ -1,194 +0,0 @@
2678
1
/*
2679
2
 * Copyright (C) 2013 Canonical, Ltd.
2680
3
 *
2681
4
 * This program is free software; you can redistribute it and/or modify
2682
5
 * it under the terms of the GNU General Public License as published by
2683
6
 * the Free Software Foundation; version 3.
2684
7
 *
2685
8
 * This program is distributed in the hope that it will be useful,
2686
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
2687
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
2688
11
 * GNU General Public License for more details.
2689
12
 *
2690
13
 * You should have received a copy of the GNU General Public License
2691
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
2692
15
 */
2693
16
2694
17
import QtQuick 2.0
2695
18
import Ubuntu.Components 0.1
2696
19
import Ubuntu.Components.ListItems 0.1 as ListItem
2697
20
import "../../Components"
2698
21
2699
22
Column {
2700
23
    id: root
2701
24
2702
25
    property var model
2703
26
    property alias textArea: reviewField
2704
27
2705
28
    signal sendReview(string review)
2706
29
    signal editing
2707
30
2708
31
    spacing: units.gu(2)
2709
32
    state: ""
2710
33
2711
34
    states: [
2712
35
        State {
2713
36
            name: ""
2714
37
            PropertyChanges { target: reviewField; width: root.width }
2715
38
            PropertyChanges { target: sendButton; opacity: 0 }
2716
39
            PropertyChanges { target: inverseArea; enabled: false }
2717
40
        },
2718
41
        State {
2719
42
            name: "editing"
2720
43
            PropertyChanges { target: reviewField; width: (root.width - row.spacing - sendButton.width) }
2721
44
            PropertyChanges { target: sendButton; opacity: 1 }
2722
45
            PropertyChanges { target: inverseArea; enabled: true }
2723
46
        }
2724
47
     ]
2725
48
2726
49
    transitions: [
2727
50
        Transition {
2728
51
            from: ""
2729
52
            to: "editing"
2730
53
            SequentialAnimation {
2731
54
                UbuntuNumberAnimation { target: reviewField; properties: "width"; duration: UbuntuAnimation.SlowDuration }
2732
55
                UbuntuNumberAnimation { target: sendButton; properties: "opacity"; duration: UbuntuAnimation.SlowDuration }
2733
56
            }
2734
57
        },
2735
58
        Transition {
2736
59
            from: "editing"
2737
60
            to: ""
2738
61
            SequentialAnimation {
2739
62
                UbuntuNumberAnimation { target: sendButton; properties: "opacity"; duration: UbuntuAnimation.SlowDuration }
2740
63
                UbuntuNumberAnimation { target: reviewField; properties: "width"; duration: UbuntuAnimation.SlowDuration }
2741
64
            }
2742
65
        }
2743
66
    ]
2744
67
2745
68
    Label {
2746
69
        fontSize: "medium"
2747
70
        color: "white"
2748
71
        style: Text.Raised
2749
72
        styleColor: "black"
2750
73
        opacity: .9
2751
74
        text: i18n.tr("Add a review")
2752
75
    }
2753
76
2754
77
    Row {
2755
78
        id: row
2756
79
        spacing: units.gu(1)
2757
80
        width: root.width
2758
81
2759
82
        // FIXME: needs to react to Qt.inputMethod geometry
2760
83
        TextArea {
2761
84
            id: reviewField
2762
85
            objectName: "reviewField"
2763
86
            placeholderText: i18n.tr("Review")
2764
87
            width: parent.width
2765
88
            verticalAlignment: Text.AlignVCenter
2766
89
            autoSize: true
2767
90
            maximumLineCount: 5
2768
91
2769
92
            Behavior on height { UbuntuNumberAnimation { duration: UbuntuAnimation.SnapDuration } }
2770
93
2771
94
            onFocusChanged: {
2772
95
                if(reviewField.focus){
2773
96
                    root.state = "editing";
2774
97
                    reviewField.selectAll();
2775
98
                    root.editing();
2776
99
                }
2777
100
            }
2778
101
2779
102
            // FIXME: not active when in wide mode
2780
103
            InverseMouseArea {
2781
104
                id: inverseArea
2782
105
                anchors.fill: parent
2783
106
                enabled: false
2784
107
                onPressed: {
2785
108
                    reviewField.focus = false;
2786
109
                    root.state = "";
2787
110
                }
2788
111
            }
2789
112
        }
2790
113
2791
114
        Button {
2792
115
            id: sendButton
2793
116
            objectName: "sendButton"
2794
117
            width: units.gu(10)
2795
118
            height: units.gu(4)
2796
119
            anchors.bottom: reviewField.bottom
2797
120
            color: Theme.palette.selected.foreground
2798
121
            text: i18n.tr("Send")
2799
122
            opacity: 0
2800
123
2801
124
            onClicked: {
2802
125
                root.sendReview(reviewField.text);
2803
126
                reviewField.text = ""
2804
127
            }
2805
128
        }
2806
129
    }
2807
130
2808
131
    ListItem.ThinDivider {}
2809
132
2810
133
    Label {
2811
134
        fontSize: "medium"
2812
135
        color: "white"
2813
136
        style: Text.Raised
2814
137
        styleColor: "black"
2815
138
        opacity: .9
2816
139
        text: i18n.tr("Comments:")
2817
140
    }
2818
141
2819
142
    Repeater {
2820
143
        objectName: "commentsArea"
2821
144
        model: root.model
2822
145
2823
146
        Column {
2824
147
            anchors { left: parent.left; right: parent.right }
2825
148
2826
149
            Column {
2827
150
                anchors { left: parent.left; right: parent.right }
2828
151
2829
152
                Label {
2830
153
                    anchors { left: parent.left; right: parent.right }
2831
154
                    text: modelData[0]
2832
155
                    fontSize: "medium"
2833
156
                    color: "white"
2834
157
                    opacity: .8
2835
158
                    wrapMode: Text.WordWrap
2836
159
                    style: Text.Raised
2837
160
                    styleColor: "black"
2838
161
                }
2839
162
2840
163
                Row {
2841
164
                    spacing: units.gu(1)
2842
165
2843
166
                    RatingStars {
2844
167
                        maximumRating: 10
2845
168
                        rating: modelData[1]
2846
169
                    }
2847
170
2848
171
                    Label {
2849
172
                        text: modelData[2]
2850
173
                        fontSize: "medium"
2851
174
                        color: Theme.palette.selected.backgroundText
2852
175
                        opacity: .6
2853
176
                        style: Text.Raised
2854
177
                        styleColor: "black"
2855
178
                    }
2856
179
                }
2857
180
            }
2858
181
2859
182
            Label {
2860
183
                anchors { left: parent.left; right: parent.right }
2861
184
                text: modelData[3]
2862
185
                fontSize: "medium"
2863
186
                color: Theme.palette.selected.backgroundText
2864
187
                opacity: .6
2865
188
                wrapMode: Text.WordWrap
2866
189
                style: Text.Raised
2867
190
                styleColor: "black"
2868
191
            }
2869
192
        }
2870
193
    }
2871
194
}
2872
195
0
2873
=== modified file 'qml/Dash/ScopeDelegateMapper.qml'
2874
--- qml/Dash/ScopeDelegateMapper.qml	2014-03-18 10:57:24 +0000
2875
+++ qml/Dash/ScopeDelegateMapper.qml	2014-03-18 10:57:24 +0000
2876
@@ -17,9 +17,7 @@
2877
17
import QtQuick 2.0
17
import QtQuick 2.0
2878
18
18
2879
19
QtObject {
19
QtObject {
2883
20
    property var scopeDelegateMapping: {"clickscope": "DashApps.qml",
20
    property var scopeDelegateMapping: {"clickscope": "DashApps.qml"}
2881
21
                                       "home.scope": "DashHome.qml"
2882
22
                                      }
2884
23
    property string genericScope: "GenericScopeView.qml"
21
    property string genericScope: "GenericScopeView.qml"
2885
24
22
2886
25
    function map(scopeId) {
23
    function map(scopeId) {
2887
26
24
2888
=== removed file 'qml/Dash/SearchableResultModel.qml'
2889
--- qml/Dash/SearchableResultModel.qml	2014-03-18 10:57:24 +0000
2890
+++ qml/Dash/SearchableResultModel.qml	1970-01-01 00:00:00 +0000
2891
@@ -1,44 +0,0 @@
2892
1
/*
2893
2
 * Copyright (C) 2013 Canonical, Ltd.
2894
3
 *
2895
4
 * This program is free software; you can redistribute it and/or modify
2896
5
 * it under the terms of the GNU General Public License as published by
2897
6
 * the Free Software Foundation; version 3.
2898
7
 *
2899
8
 * This program is distributed in the hope that it will be useful,
2900
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
2901
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
2902
11
 * GNU General Public License for more details.
2903
12
 *
2904
13
 * You should have received a copy of the GNU General Public License
2905
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
2906
15
 */
2907
16
2908
17
import Utils 0.1
2909
18
import Unity 0.2
2910
19
2911
20
SortFilterProxyModel {
2912
21
    id: root
2913
22
2914
23
    property string searchQuery: ""
2915
24
    property bool hideOnSearch: false
2916
25
2917
26
    filterRole: CategoryResults.RoleTitle
2918
27
2919
28
    function get(index) {
2920
29
        return model.get(mapToSource(index))
2921
30
    }
2922
31
2923
32
    onSearchQueryChanged: {
2924
33
        if (searchQuery.length == 0) {
2925
34
            filterRegExp = RegExp("");
2926
35
            filterCaseSensitivity = Qt.CaseInsensitive;
2927
36
        } else if (!hideOnSearch) {
2928
37
            setFilterWildcard(searchQuery);
2929
38
            filterCaseSensitivity = Qt.CaseInsensitive;
2930
39
        } else {
2931
40
            filterRegExp = /^$/;
2932
41
            filterCaseSensitivity = Qt.CaseInsensitive;
2933
42
        }
2934
43
    }
2935
44
}
2936
45
0
2937
=== removed directory 'qml/Dash/Video'
2938
=== removed file 'qml/Dash/Video/CarouselDelegateVideo.qml'
2939
--- qml/Dash/Video/CarouselDelegateVideo.qml	2013-07-09 09:06:29 +0000
2940
+++ qml/Dash/Video/CarouselDelegateVideo.qml	1970-01-01 00:00:00 +0000
2941
@@ -1,42 +0,0 @@
2942
1
/*
2943
2
 * Copyright (C) 2013 Canonical, Ltd.
2944
3
 *
2945
4
 * This program is free software; you can redistribute it and/or modify
2946
5
 * it under the terms of the GNU General Public License as published by
2947
6
 * the Free Software Foundation; version 3.
2948
7
 *
2949
8
 * This program is distributed in the hope that it will be useful,
2950
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
2951
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
2952
11
 * GNU General Public License for more details.
2953
12
 *
2954
13
 * You should have received a copy of the GNU General Public License
2955
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
2956
15
 */
2957
16
2958
17
import QtQuick 2.0
2959
18
import Ubuntu.Components 0.1
2960
19
import "../../Components"
2961
20
2962
21
BaseCarouselDelegate {
2963
22
    id: item
2964
23
2965
24
    UbuntuShape {
2966
25
        anchors.fill: parent
2967
26
        radius: "medium"
2968
27
        borderSource: ""
2969
28
        image: Image {
2970
29
            asynchronous: true
2971
30
            sourceSize { width: item.width; height: item.height }
2972
31
            source: model ? model.icon : ""
2973
32
        }
2974
33
    }
2975
34
2976
35
    BorderImage {
2977
36
        anchors.centerIn: parent
2978
37
        opacity: 0.6
2979
38
        source: "../../Components/graphics/non-selected.sci"
2980
39
        width: parent.width + units.gu(1.5)
2981
40
        height: parent.height + units.gu(1.5)
2982
41
    }
2983
42
}
2984
43
0
2985
=== removed file 'qml/Dash/Video/VideoCarousel.qml'
2986
--- qml/Dash/Video/VideoCarousel.qml	2013-11-20 00:10:01 +0000
2987
+++ qml/Dash/Video/VideoCarousel.qml	1970-01-01 00:00:00 +0000
2988
@@ -1,34 +0,0 @@
2989
1
/*
2990
2
 * Copyright (C) 2013 Canonical, Ltd.
2991
3
 *
2992
4
 * This program is free software; you can redistribute it and/or modify
2993
5
 * it under the terms of the GNU General Public License as published by
2994
6
 * the Free Software Foundation; version 3.
2995
7
 *
2996
8
 * This program is distributed in the hope that it will be useful,
2997
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
2998
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
2999
11
 * GNU General Public License for more details.
3000
12
 *
3001
13
 * You should have received a copy of the GNU General Public License
3002
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
3003
15
 */
3004
16
3005
17
import QtQuick 2.0
3006
18
import "../../Components"
3007
19
import ".."
3008
20
3009
21
DashCarousel {
3010
22
    id: videosCarousel
3011
23
    tileAspectRatio: 198 / 288
3012
24
    minimumTileWidth: units.gu(13)
3013
25
    itemComponent: carouselDelegateVideo
3014
26
    selectedItemScaleFactor: 1.14
3015
27
    cacheBuffer: 1404 // 18px * 13gu * 6
3016
28
3017
29
    Component {
3018
30
        id: carouselDelegateVideo
3019
31
        CarouselDelegateVideo {
3020
32
        }
3021
33
    }
3022
34
}
3023
35
0
3024
=== removed file 'qml/Dash/Video/VideoFilterGrid.qml'
3025
--- qml/Dash/Video/VideoFilterGrid.qml	2013-11-22 13:53:00 +0000
3026
+++ qml/Dash/Video/VideoFilterGrid.qml	1970-01-01 00:00:00 +0000
3027
@@ -1,47 +0,0 @@
3028
1
/*
3029
2
 * Copyright (C) 2013 Canonical, Ltd.
3030
3
 *
3031
4
 * This program is free software; you can redistribute it and/or modify
3032
5
 * it under the terms of the GNU General Public License as published by
3033
6
 * the Free Software Foundation; version 3.
3034
7
 *
3035
8
 * This program is distributed in the hope that it will be useful,
3036
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
3037
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
3038
11
 * GNU General Public License for more details.
3039
12
 *
3040
13
 * You should have received a copy of the GNU General Public License
3041
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
3042
15
 */
3043
16
3044
17
import QtQuick 2.0
3045
18
import Ubuntu.Components 0.1
3046
19
import "../../Components"
3047
20
import "../Generic"
3048
21
3049
22
GenericFilterGrid {
3050
23
    id: videoFilterGrid
3051
24
3052
25
    delegateWidth: units.gu(11)
3053
26
    delegateHeight: units.gu(15)
3054
27
    iconWidth: units.gu(11)
3055
28
    iconHeight: units.gu(11)
3056
29
3057
30
    delegate: Tile {
3058
31
        id: tile
3059
32
        objectName: "delegate" + index
3060
33
        width: videoFilterGrid.cellWidth
3061
34
        height: videoFilterGrid.cellHeight
3062
35
        text: model.title
3063
36
        imageWidth: videoFilterGrid.iconWidth
3064
37
        imageHeight: videoFilterGrid.iconHeight
3065
38
        source: model.icon
3066
39
        maximumLineCount: 2
3067
40
        horizontalAlignment: Text.AlignLeft
3068
41
3069
42
        style: VideoTileStyle {}
3070
43
3071
44
        onClicked: videoFilterGrid.clicked(index, tile.y)
3072
45
        onPressAndHold: videoFilterGrid.pressAndHold(index, tile.y)
3073
46
    }
3074
47
}
3075
48
0
3076
=== removed file 'qml/Dash/Video/VideoTileStyle.qml'
3077
--- qml/Dash/Video/VideoTileStyle.qml	2013-10-14 10:23:18 +0000
3078
+++ qml/Dash/Video/VideoTileStyle.qml	1970-01-01 00:00:00 +0000
3079
@@ -1,87 +0,0 @@
3080
1
/*
3081
2
 * Copyright (C) 2013 Canonical, Ltd.
3082
3
 *
3083
4
 * This program is free software; you can redistribute it and/or modify
3084
5
 * it under the terms of the GNU General Public License as published by
3085
6
 * the Free Software Foundation; version 3.
3086
7
 *
3087
8
 * This program is distributed in the hope that it will be useful,
3088
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
3089
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
3090
11
 * GNU General Public License for more details.
3091
12
 *
3092
13
 * You should have received a copy of the GNU General Public License
3093
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
3094
15
 */
3095
16
3096
17
import QtQuick 2.0
3097
18
import Ubuntu.Components 0.1
3098
19
3099
20
Item {
3100
21
    id: tile
3101
22
3102
23
    anchors.fill: parent
3103
24
3104
25
    Image {
3105
26
        id: icon
3106
27
        anchors {
3107
28
            top: parent.top
3108
29
            horizontalCenter: parent.horizontalCenter
3109
30
        }
3110
31
        width: styledItem.imageWidth
3111
32
        height: styledItem.imageHeight
3112
33
        source: "graphics/movie_icon_holder.png"
3113
34
3114
35
        Image {
3115
36
            id: image
3116
37
            objectName: "image"
3117
38
            anchors {
3118
39
                fill: parent;
3119
40
                topMargin: units.gu(2);
3120
41
                bottomMargin: units.gu(2)
3121
42
            }
3122
43
            sourceSize { width: icon.width; height: icon.height }
3123
44
            asynchronous: true
3124
45
            cache: false
3125
46
            source: styledItem.source
3126
47
            fillMode: styledItem.fillMode
3127
48
            horizontalAlignment: Image.AlignHCenter
3128
49
            verticalAlignment: Image.AlignVCenter
3129
50
        }
3130
51
    }
3131
52
3132
53
    UbuntuShape {
3133
54
        id: borderPressed
3134
55
        objectName: "borderPressed"
3135
56
3136
57
        anchors.fill: icon
3137
58
        radius: "medium"
3138
59
        borderSource: "radius_pressed.sci"
3139
60
        opacity: styledItem.pressed ? 1.0 : 0.0
3140
61
        Behavior on opacity { NumberAnimation { duration: 200; easing.type: Easing.OutQuint } }
3141
62
    }
3142
63
3143
64
    Label {
3144
65
        id: label
3145
66
        objectName: "label"
3146
67
        anchors {
3147
68
            baseline: icon.bottom
3148
69
            baselineOffset: units.gu(2)
3149
70
            left: icon.left
3150
71
            right: parent.right
3151
72
            rightMargin: units.gu(1)
3152
73
            leftMargin: units.dp(2)
3153
74
        }
3154
75
3155
76
        color: Theme.palette.selected.backgroundText
3156
77
        opacity: 0.9
3157
78
        style: Text.Raised
3158
79
        styleColor: "black"
3159
80
        fontSize: "small"
3160
81
        elide: Text.ElideRight
3161
82
        horizontalAlignment: styledItem.horizontalAlignment
3162
83
        text: styledItem.text
3163
84
        wrapMode: Text.Wrap
3164
85
        maximumLineCount: styledItem.maximumLineCount
3165
86
    }
3166
87
}
3167
88
0
3168
=== removed directory 'qml/Dash/Video/graphics'
3169
=== removed file 'qml/Dash/Video/graphics/icon_button_amazon@20.png'
3170
89
Binary files qml/Dash/Video/graphics/icon_button_amazon@20.png	2013-06-05 22:03:08 +0000 and qml/Dash/Video/graphics/icon_button_amazon@20.png	1970-01-01 00:00:00 +0000 differ
1
Binary files qml/Dash/Video/graphics/icon_button_amazon@20.png	2013-06-05 22:03:08 +0000 and qml/Dash/Video/graphics/icon_button_amazon@20.png	1970-01-01 00:00:00 +0000 differ
3171
=== removed file 'qml/Dash/Video/graphics/icon_button_u1@20.png'
3172
90
Binary files qml/Dash/Video/graphics/icon_button_u1@20.png	2013-06-05 22:03:08 +0000 and qml/Dash/Video/graphics/icon_button_u1@20.png	1970-01-01 00:00:00 +0000 differ
2
Binary files qml/Dash/Video/graphics/icon_button_u1@20.png	2013-06-05 22:03:08 +0000 and qml/Dash/Video/graphics/icon_button_u1@20.png	1970-01-01 00:00:00 +0000 differ
3173
=== removed file 'qml/Dash/Video/graphics/movie_icon_holder@27.png'
3174
91
Binary files qml/Dash/Video/graphics/movie_icon_holder@27.png	2013-10-09 17:06:13 +0000 and qml/Dash/Video/graphics/movie_icon_holder@27.png	1970-01-01 00:00:00 +0000 differ
3
Binary files qml/Dash/Video/graphics/movie_icon_holder@27.png	2013-10-09 17:06:13 +0000 and qml/Dash/Video/graphics/movie_icon_holder@27.png	1970-01-01 00:00:00 +0000 differ
3175
=== modified file 'tests/autopilot/unity8/shell/emulators/dash.py'
3176
--- tests/autopilot/unity8/shell/emulators/dash.py	2014-02-07 17:03:14 +0000
3177
+++ tests/autopilot/unity8/shell/emulators/dash.py	2014-03-18 10:57:24 +0000
3178
@@ -36,11 +36,9 @@
3179
36
        self.dash_content_list = self.wait_select_single(
36
        self.dash_content_list = self.wait_select_single(
3180
37
            'QQuickListView', objectName='dashContentList')
37
            'QQuickListView', objectName='dashContentList')
3181
38
38
3187
39
    def get_home_applications_grid(self):
39
    def get_applications_grid(self):
3188
40
        get_grid = self.get_scope('home').wait_select_single(
40
        get_grid = self.get_scope('clickscope').wait_select_single(
3189
41
            "GenericFilterGrid",
41
            'CardFilterGrid', objectName='local')
3185
42
            objectName="applications.scope"
3186
43
        )
3190
44
        return get_grid
42
        return get_grid
3191
45
43
3192
46
    def get_application_icon(self, text):
44
    def get_application_icon(self, text):
3193
@@ -50,24 +48,22 @@
3194
50
        :param text: String containing the text of the icon to search for.
48
        :param text: String containing the text of the icon to search for.
3195
51
49
3196
52
        """
50
        """
3198
53
        app_grid = self.get_home_applications_grid()
51
        app_grid = self.get_applications_grid()
3199
54
        resp_grid = app_grid.wait_select_single('ResponsiveGridView')
52
        resp_grid = app_grid.wait_select_single('ResponsiveGridView')
3200
55
        return resp_grid.select_single('Tile', text=text)
53
        return resp_grid.select_single('Tile', text=text)
3201
56
54
3204
57
    def get_scope(self, scope_name='home'):
55
    def get_scope(self, scope_name='clickscope'):
3203
58
        scope_id = "%s.scope" % scope_name
3205
59
        return self.dash_content_list.select_single(
56
        return self.dash_content_list.select_single(
3207
60
            'QQuickLoader', scopeId=scope_id)
57
            'QQuickLoader', scopeId=scope_name)
3208
61
58
3209
62
    @autopilot_logging.log_action(logger.info)
59
    @autopilot_logging.log_action(logger.info)
3211
63
    def open_scope(self, scope_name):
60
    def open_scope(self, scope_id):
3212
64
        """Open a dash scope.
61
        """Open a dash scope.
3213
65
62
3215
66
        :parameter scope_name: The name of the scope.
63
        :parameter scope_id: The id of the scope.
3216
67
        :return: The scope.
64
        :return: The scope.
3217
68
65
3218
69
        """
66
        """
3219
70
        scope_id = "%s.scope" % scope_name
3220
71
        scope_loader = self._get_scope_loader(scope_id)
67
        scope_loader = self._get_scope_loader(scope_id)
3221
72
        if scope_loader.isCurrent:
68
        if scope_loader.isCurrent:
3222
73
            logger.info('The scope is already open.')
69
            logger.info('The scope is already open.')
3223
@@ -84,7 +80,7 @@
3224
84
                'No scope found with id {0}'.format(scope_id))
80
                'No scope found with id {0}'.format(scope_id))
3225
85
81
3226
86
    def _get_scope_from_loader(self, loader):
82
    def _get_scope_from_loader(self, loader):
3228
87
        if loader.scopeId == 'applications.scope':
83
        if loader.scopeId == 'clickscope':
3229
88
            return loader.select_single(DashApps)
84
            return loader.select_single(DashApps)
3230
89
        else:
85
        else:
3231
90
            return loader.select_single(GenericScopeView)
86
            return loader.select_single(GenericScopeView)
3232
@@ -115,7 +111,7 @@
3233
115
        original_index = self.dash_content_list.currentIndex
111
        original_index = self.dash_content_list.currentIndex
3234
116
        # Scroll on the border of the page header, because some scopes have
112
        # Scroll on the border of the page header, because some scopes have
3235
117
        # contents that can be scrolled horizontally.
113
        # contents that can be scrolled horizontally.
3237
118
        page_header = self.select_single('PageHeader')
114
        page_header = self._get_page_header()
3238
119
        border = page_header.select_single('QQuickBorderImage')
115
        border = page_header.select_single('QQuickBorderImage')
3239
120
        start_x = border.width / 3
116
        start_x = border.width / 3
3240
121
        stop_x = border.width / 3 * 2
117
        stop_x = border.width / 3 * 2
3241
@@ -123,12 +119,15 @@
3242
123
        self.pointing_device.drag(start_x, start_y, stop_x, stop_y)
119
        self.pointing_device.drag(start_x, start_y, stop_x, stop_y)
3243
124
        self.dash_content_list.currentIndex.wait_for(original_index - 1)
120
        self.dash_content_list.currentIndex.wait_for(original_index - 1)
3244
125
121
3245
122
    def _get_page_header(self):
3246
123
        return self.select_single('PageHeader', objectName='pageHeader')
3247
124
3248
126
    @autopilot_logging.log_action(logger.info)
125
    @autopilot_logging.log_action(logger.info)
3249
127
    def _scroll_to_right_scope(self):
126
    def _scroll_to_right_scope(self):
3250
128
        original_index = self.dash_content_list.currentIndex
127
        original_index = self.dash_content_list.currentIndex
3251
129
        # Scroll on the border of the page header, because some scopes have
128
        # Scroll on the border of the page header, because some scopes have
3252
130
        # contents that can be scrolled horizontally.
129
        # contents that can be scrolled horizontally.
3254
131
        page_header = self.select_single('PageHeader')
130
        page_header = self._get_page_header()
3255
132
        border = page_header.select_single('QQuickBorderImage')
131
        border = page_header.select_single('QQuickBorderImage')
3256
133
        start_x = border.width / 3 * 2
132
        start_x = border.width / 3 * 2
3257
134
        stop_x = border.width / 3
133
        stop_x = border.width / 3
3258
@@ -137,24 +136,9 @@
3259
137
        self.dash_content_list.currentIndex.wait_for(original_index + 1)
136
        self.dash_content_list.currentIndex.wait_for(original_index + 1)
3260
138
137
3261
139
138
3262
140
class DashPreview(emulators.UnityEmulatorBase):
3263
141
    """Autopilot emulator for the generic preview."""
3264
142
3265
143
    def get_details(self):
3266
144
        """Return the details of the open preview."""
3267
145
        title = self.select_single('Label', objectName='titleLabel').text
3268
146
        subtitle = self.select_single(
3269
147
            'Label', objectName='subtitleLabel').text
3270
148
        description = self.select_single(
3271
149
            'Label', objectName='descriptionLabel').text
3272
150
        return dict(title=title, subtitle=subtitle, description=description)
3273
151
3274
152
3275
153
class GenericScopeView(emulators.UnityEmulatorBase):
139
class GenericScopeView(emulators.UnityEmulatorBase):
3276
154
    """Autopilot emulator for generic scopes."""
140
    """Autopilot emulator for generic scopes."""
3277
155
141
3278
156
    preview_class = DashPreview
3279
157
3280
158
    @autopilot_logging.log_action(logger.info)
142
    @autopilot_logging.log_action(logger.info)
3281
159
    def open_preview(self, category, app_name):
143
    def open_preview(self, category, app_name):
3282
160
        """Open the preview of an application.
144
        """Open the preview of an application.
3283
@@ -164,15 +148,13 @@
3284
164
148
3285
165
        """
149
        """
3286
166
        category_element = self._get_category_element(category)
150
        category_element = self._get_category_element(category)
3288
167
        icon = category_element.select_single('Tile', text=app_name)
151
        icon = category_element.select_single('Card', title=app_name)
3289
168
        # FIXME some categories need a long press in order to see the preview.
152
        # FIXME some categories need a long press in order to see the preview.
3290
169
        # Some categories do not show previews, like recent apps.
153
        # Some categories do not show previews, like recent apps.
3291
170
        # --elopio - 2014-1-14
154
        # --elopio - 2014-1-14
3292
171
        self.pointing_device.click_object(icon)
155
        self.pointing_device.click_object(icon)
3297
172
        preview = self.get_root_instance().wait_select_single(
156
        return self.get_root_instance().wait_select_single(
3298
173
            self.preview_class, isCurrent=True)
157
            'PreviewListView', objectName='dashContentPreviewList')
3295
174
        preview.showProcessingAction.wait_for(False)
3296
175
        return preview
3299
176
158
3300
177
    def _get_category_element(self, category):
159
    def _get_category_element(self, category):
3301
178
        try:
160
        try:
3302
@@ -183,24 +165,9 @@
3303
183
                'No category found with name {}'.format(category))
165
                'No category found with name {}'.format(category))
3304
184
166
3305
185
167
3306
186
class AppPreview(DashPreview):
3307
187
    """Autopilot emulator for the application preview."""
3308
188
3309
189
    def get_details(self):
3310
190
        """Return the details of the application showed in its preview."""
3311
191
        details = super(AppPreview, self).get_details()
3312
192
        # TODO return screenshots, icon, rating and reviews.
3313
193
        # --elopio - 2014-1-15
3314
194
        return dict(
3315
195
            title=details.get('title'), publisher=details.get('subtitle'),
3316
196
            description=details.get('description'))
3317
197
3318
198
3319
199
class DashApps(GenericScopeView):
168
class DashApps(GenericScopeView):
3320
200
    """Autopilot emulator for the applications scope."""
169
    """Autopilot emulator for the applications scope."""
3321
201
170
3322
202
    preview_class = AppPreview
3323
203
3324
204
    def get_applications(self, category):
171
    def get_applications(self, category):
3325
205
        """Return the list of applications on a category.
172
        """Return the list of applications on a category.
3326
206
173
3327
@@ -208,7 +175,11 @@
3328
208
175
3329
209
        """
176
        """
3330
210
        category_element = self._get_category_element(category)
177
        category_element = self._get_category_element(category)
3332
211
        application_tiles = category_element.select_many('Tile')
178
        application_tiles = category_element.select_many('Card')
3333
212
        # TODO return them on the same order they are displayed.
179
        # TODO return them on the same order they are displayed.
3334
213
        # --elopio - 2014-1-15
180
        # --elopio - 2014-1-15
3336
214
        return [tile.text for tile in application_tiles]
181
        result = []
3337
182
        for card in application_tiles:
3338
183
            if card.objectName != 'cardToolCard':
3339
184
                result.append(card)
3340
185
        return result
3341
215
186
3342
=== modified file 'tests/autopilot/unity8/shell/emulators/main_window.py'
3343
--- tests/autopilot/unity8/shell/emulators/main_window.py	2014-02-12 06:11:16 +0000
3344
+++ tests/autopilot/unity8/shell/emulators/main_window.py	2014-03-18 10:57:24 +0000
3345
@@ -42,10 +42,6 @@
3346
42
            objectName="greeterContentLoader"
42
            objectName="greeterContentLoader"
3347
43
        )
43
        )
3348
44
44
3349
45
    def get_greeter_background(self):
3350
46
        return self.select_single(
3351
47
            "CrossFadeImage", objectName="greeterBackground")
3352
48
3353
49
    def get_login_loader(self):
45
    def get_login_loader(self):
3354
50
        return self.select_single("QQuickLoader", objectName="loginLoader")
46
        return self.select_single("QQuickLoader", objectName="loginLoader")
3355
51
47
3356
52
48
3357
=== modified file 'tests/autopilot/unity8/shell/tests/__init__.py'
3358
--- tests/autopilot/unity8/shell/tests/__init__.py	2014-02-22 00:12:49 +0000
3359
+++ tests/autopilot/unity8/shell/tests/__init__.py	2014-03-18 10:57:24 +0000
3360
@@ -376,7 +376,7 @@
3361
376
376
3362
377
    def assertUnityReady(self):
377
    def assertUnityReady(self):
3363
378
        dash = self.get_dash()
378
        dash = self.get_dash()
3365
379
        home_scope = dash.get_scope('home')
379
        home_scope = dash.get_scope('clickscope')
3366
380
380
3367
381
        # FIXME! There is a huge timeout here for when we're doing CI on
381
        # FIXME! There is a huge timeout here for when we're doing CI on
3368
382
        # VMs. See lp:1203715
382
        # VMs. See lp:1203715
3369
383
383
3370
=== modified file 'tests/autopilot/unity8/shell/tests/test_emulators.py'
3371
--- tests/autopilot/unity8/shell/tests/test_emulators.py	2014-02-22 00:12:49 +0000
3372
+++ tests/autopilot/unity8/shell/tests/test_emulators.py	2014-03-18 10:57:24 +0000
3373
@@ -60,14 +60,13 @@
3374
60
                self.dash.open_scope, scope_name)
60
                self.dash.open_scope, scope_name)
3375
61
61
3376
62
        self.assertEqual(
62
        self.assertEqual(
3378
63
            'No scope found with id unexisting.scope', str(exception))
63
            'No scope found with id unexisting', str(exception))
3379
64
        self.assertFalse(mock_pointer.called)
64
        self.assertFalse(mock_pointer.called)
3380
65
65
3381
66
    def test_open_already_opened_scope(self):
66
    def test_open_already_opened_scope(self):
3382
67
        scope_id = self._get_current_scope_id()
67
        scope_id = self._get_current_scope_id()
3383
68
        with mock.patch.object(self.dash, 'pointing_device') as mock_pointer:
68
        with mock.patch.object(self.dash, 'pointing_device') as mock_pointer:
3386
69
            scope = self.dash.open_scope(self._get_scope_name_from_id(
69
            scope = self.dash.open_scope(scope_id)
3385
70
                scope_id))
3387
71
70
3388
72
        self.assertFalse(mock_pointer.called)
71
        self.assertFalse(mock_pointer.called)
3389
73
        self._assert_scope_is_opened(scope, scope_id)
72
        self._assert_scope_is_opened(scope, scope_id)
3390
@@ -83,12 +82,11 @@
3391
83
        return scope.scopeId
82
        return scope.scopeId
3392
84
83
3393
85
    def test_open_scope_to_the_right(self):
84
    def test_open_scope_to_the_right(self):
3396
86
        leftmost_scope = self._get_scope_name_from_id(
85
        leftmost_scope = self._get_leftmost_scope_id()
3395
87
            self._get_leftmost_scope_id())
3397
88
        self.dash.open_scope(leftmost_scope)
86
        self.dash.open_scope(leftmost_scope)
3398
89
87
3399
90
        scope_id = self._get_rightmost_scope_id()
88
        scope_id = self._get_rightmost_scope_id()
3401
91
        scope = self.dash.open_scope(self._get_scope_name_from_id(scope_id))
89
        scope = self.dash.open_scope(scope_id)
3402
92
        self._assert_scope_is_opened(scope, scope_id)
90
        self._assert_scope_is_opened(scope, scope_id)
3403
93
91
3404
94
    def _get_leftmost_scope_id(self):
92
    def _get_leftmost_scope_id(self):
3405
@@ -104,10 +102,6 @@
3406
104
            'QQuickItem')[0]
102
            'QQuickItem')[0]
3407
105
        return item.get_children_by_type('QQuickLoader')
103
        return item.get_children_by_type('QQuickLoader')
3408
106
104
3409
107
    def _get_scope_name_from_id(self, scope_id):
3410
108
        if scope_id.endswith('.scope'):
3411
109
            return scope_id[:-6]
3412
110
3413
111
    def _get_rightmost_scope_id(self):
105
    def _get_rightmost_scope_id(self):
3414
112
        scope_loaders = self._get_scope_loaders()
106
        scope_loaders = self._get_scope_loaders()
3415
113
        rightmost_scope_loader = scope_loaders[0]
107
        rightmost_scope_loader = scope_loaders[0]
3416
@@ -117,23 +111,22 @@
3417
117
        return rightmost_scope_loader.scopeId
111
        return rightmost_scope_loader.scopeId
3418
118
112
3419
119
    def test_open_scope_to_the_left(self):
113
    def test_open_scope_to_the_left(self):
3422
120
        rightmost_scope = self._get_scope_name_from_id(
114
        rightmost_scope = self._get_rightmost_scope_id()
3421
121
            self._get_rightmost_scope_id())
3423
122
        self.dash.open_scope(rightmost_scope)
115
        self.dash.open_scope(rightmost_scope)
3424
123
116
3425
124
        scope_id = self._get_leftmost_scope_id()
117
        scope_id = self._get_leftmost_scope_id()
3427
125
        scope = self.dash.open_scope(self._get_scope_name_from_id(scope_id))
118
        scope = self.dash.open_scope(scope_id)
3428
126
        self._assert_scope_is_opened(scope, scope_id)
119
        self._assert_scope_is_opened(scope, scope_id)
3429
127
120
3430
128
    def test_open_generic_scope(self):
121
    def test_open_generic_scope(self):
3433
129
        scope_id = 'home.scope'
122
        scope_id = 'scopes'
3434
130
        scope = self.dash.open_scope(self._get_scope_name_from_id(scope_id))
123
        scope = self.dash.open_scope(scope_id)
3435
131
        self._assert_scope_is_opened(scope, scope_id)
124
        self._assert_scope_is_opened(scope, scope_id)
3436
132
        self.assertIsInstance(scope, dash_emulators.GenericScopeView)
125
        self.assertIsInstance(scope, dash_emulators.GenericScopeView)
3437
133
126
3438
134
    def test_open_applications_scope(self):
127
    def test_open_applications_scope(self):
3441
135
        scope_id = 'applications.scope'
128
        scope_id = 'clickscope'
3442
136
        scope = self.dash.open_scope(self._get_scope_name_from_id(scope_id))
129
        scope = self.dash.open_scope(scope_id)
3443
137
        self._assert_scope_is_opened(scope, scope_id)
130
        self._assert_scope_is_opened(scope, scope_id)
3444
138
        self.assertIsInstance(scope, dash_emulators.DashApps)
131
        self.assertIsInstance(scope, dash_emulators.DashApps)
3445
139
132
3446
@@ -144,36 +137,24 @@
3447
144
        # Set up the fake scopes before launching unity.
137
        # Set up the fake scopes before launching unity.
3448
145
        self.useFixture(fixture_setup.FakeScopes())
138
        self.useFixture(fixture_setup.FakeScopes())
3449
146
        super(GenericScopeViewEmulatorTestCase, self).setUp()
139
        super(GenericScopeViewEmulatorTestCase, self).setUp()
3451
147
        self.home_scope = self.dash.open_scope('home')
140
        self.generic_scope = self.dash.open_scope('MockScope1')
3452
148
141
3453
149
    def test_open_preview(self):
142
    def test_open_preview(self):
3468
150
        preview = self.home_scope.open_preview('0', 'Title.0')
143
        preview = self.generic_scope.open_preview('0', 'Title.0.0')
3469
151
        self.assertIsInstance(preview, dash_emulators.DashPreview)
144
        preview.x.wait_for(0)
3456
152
        self.assertTrue(preview.isCurrent)
3457
153
        self.assertFalse(preview.showProcessingAction)
3458
154
3459
155
    def test_get_details(self):
3460
156
        expected_details = dict(
3461
157
            title='Title', subtitle='Subtitle', description='Description')
3462
158
3463
159
        preview = self.home_scope.open_preview('0', 'Title.0')
3464
160
        details = preview.get_details()
3465
161
3466
162
        self.assertEqual(expected_details, details)
3467
163
3470
164
145
3471
165
class DashAppsEmulatorTestCase(DashBaseTestCase):
146
class DashAppsEmulatorTestCase(DashBaseTestCase):
3472
166
147
3473
167
    available_applications = [
148
    available_applications = [
3477
168
        'Title.1', 'Title.21', 'Title.41',  'Title.61', 'Title.81',
149
        'Title.2.0', 'Title.2.1', 'Title.2.2',  'Title.2.3', 'Title.2.4',
3478
169
        'Title.101', 'Title.121', 'Title.141', 'Title.161', 'Title.181',
150
        'Title.2.5', 'Title.2.6', 'Title.2.7',  'Title.2.8', 'Title.2.9',
3479
170
        'Title.201', 'Title.221', 'Title.241', 'Title.261', 'Title.281']
151
        'Title.2.9', 'Title.2.10', 'Title.2.11']
3480
171
152
3481
172
    def setUp(self):
153
    def setUp(self):
3482
173
        # Set up the fake scopes before launching unity.
154
        # Set up the fake scopes before launching unity.
3483
174
        self.useFixture(fixture_setup.FakeScopes())
155
        self.useFixture(fixture_setup.FakeScopes())
3484
175
        super(DashAppsEmulatorTestCase, self).setUp()
156
        super(DashAppsEmulatorTestCase, self).setUp()
3486
176
        self.applications_scope = self.dash.open_scope('applications')
157
        self.applications_scope = self.dash.open_scope('clickscope')
3487
177
158
3488
178
    def test_get_applications_with_unexisting_category(self):
159
    def test_get_applications_with_unexisting_category(self):
3489
179
        exception = self.assertRaises(
160
        exception = self.assertRaises(
3490
@@ -185,34 +166,27 @@
3491
185
            'No category found with name unexisting category', str(exception))
166
            'No category found with name unexisting category', str(exception))
3492
186
167
3493
187
    def test_get_applications_should_return_list_with_names(self):
168
    def test_get_applications_should_return_list_with_names(self):
3495
188
        category = 'installed'
169
        category = '2'
3496
189
        expected_apps_count = self._get_number_of_application_slots(category)
170
        expected_apps_count = self._get_number_of_application_slots(category)
3497
190
        expected_applications = self.available_applications[
171
        expected_applications = self.available_applications[
3498
191
            :expected_apps_count]
172
            :expected_apps_count]
3499
192
173
3500
193
        applications = self.applications_scope.get_applications(category)
174
        applications = self.applications_scope.get_applications(category)
3501
175
        applications_titles = []
3502
176
        for application in applications:
3503
177
            cardHeader = application.select_single('CardHeader')
3504
178
            applications_titles.append(cardHeader.title)
3505
194
179
3506
195
        self.assertThat(applications, HasLength(expected_apps_count))
180
        self.assertThat(applications, HasLength(expected_apps_count))
3507
196
        for expected in expected_applications:
181
        for expected in expected_applications:
3509
197
            self.assertThat(applications, Contains(expected))
182
            self.assertThat(applications_titles, Contains(expected))
3510
198
183
3511
199
    def _get_number_of_application_slots(self, category):
184
    def _get_number_of_application_slots(self, category):
3512
200
        category_element = self.applications_scope._get_category_element(
185
        category_element = self.applications_scope._get_category_element(
3513
201
            category)
186
            category)
3515
202
        grid = category_element.select_single('GenericFilterGrid')
187
        grid = category_element.select_single('CardFilterGrid')
3516
203
        return grid.columns * grid.rows
188
        return grid.columns * grid.rows
3517
204
189
3518
205
    def test_open_preview(self):
190
    def test_open_preview(self):
3532
206
        preview = self.applications_scope.open_preview('installed', 'Title.1')
191
        preview = self.applications_scope.open_preview('2', 'Title.2.1')
3533
207
        self.assertIsInstance(preview, dash_emulators.AppPreview)
192
        preview.x.wait_for(0)
3521
208
        self.assertTrue(preview.isCurrent)
3522
209
        self.assertFalse(preview.showProcessingAction)
3523
210
3524
211
    def test_get_details(self):
3525
212
        expected_details = dict(
3526
213
            title='Title', publisher='', description='Description')
3527
214
3528
215
        preview = self.applications_scope.open_preview('installed', 'Title.1')
3529
216
        details = preview.get_details()
3530
217
3531
218
        self.assertEqual(expected_details, details)
3534
219
193
3535
=== removed file 'tests/autopilot/unity8/shell/tests/test_greeter.py'
3536
--- tests/autopilot/unity8/shell/tests/test_greeter.py	2013-10-22 15:59:23 +0000
3537
+++ tests/autopilot/unity8/shell/tests/test_greeter.py	1970-01-01 00:00:00 +0000
3538
@@ -1,38 +0,0 @@
3539
1
# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
3540
2
#
3541
3
# Unity Autopilot Test Suite
3542
4
# Copyright (C) 2012-2013 Canonical
3543
5
#
3544
6
# This program is free software: you can redistribute it and/or modify
3545
7
# it under the terms of the GNU General Public License as published by
3546
8
# the Free Software Foundation, either version 3 of the License, or
3547
9
# (at your option) any later version.
3548
10
#
3549
11
# This program is distributed in the hope that it will be useful,
3550
12
# but WITHOUT ANY WARRANTY; without even the implied warranty of
3551
13
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
3552
14
# GNU General Public License for more details.
3553
15
#
3554
16
# You should have received a copy of the GNU General Public License
3555
17
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
3556
18
#
3557
19
3558
20
from unity8.shell.tests import UnityTestCase, _get_device_emulation_scenarios
3559
21
3560
22
from testtools.matchers import Equals
3561
23
3562
24
class TestGreeter(UnityTestCase):
3563
25
3564
26
    """Tests the Shell Greeter."""
3565
27
3566
28
    scenarios = _get_device_emulation_scenarios()
3567
29
3568
30
    def test_greeter_background(self):
3569
31
        """Test that the background of the greeter and the background of the shell are placed correctly
3570
32
3571
33
        """
3572
34
        self.launch_unity()
3573
35
        self.main_window.get_greeter()
3574
36
        greeter_background = self.main_window.get_greeter_background()
3575
37
        shell_background = self.main_window.get_shell_background()
3576
38
        self.assertThat(greeter_background.globalRect, Equals(shell_background.globalRect))
3577
39
0
3578
=== modified file 'tests/mocks/Unity/CMakeLists.txt'
3579
--- tests/mocks/Unity/CMakeLists.txt	2014-02-07 09:55:56 +0000
3580
+++ tests/mocks/Unity/CMakeLists.txt	2014-03-18 10:57:24 +0000
3581
@@ -18,14 +18,14 @@
3582
18
add_definitions(-DQT_NO_KEYWORDS)
18
add_definitions(-DQT_NO_KEYWORDS)
3583
19
19
3584
20
set(UnityQML_SOURCES
20
set(UnityQML_SOURCES
3585
21
  categoryresults.cpp
3586
22
  iconutils.cpp
21
  iconutils.cpp
3587
23
  fake_applications_scope.cpp
3588
24
  fake_preview.cpp
3589
25
  fake_scope.cpp
22
  fake_scope.cpp
3590
26
  fake_scopes.cpp
23
  fake_scopes.cpp
3591
27
  fake_categories.cpp
24
  fake_categories.cpp
3593
28
  scopes-ng/fake_preview_model.cpp
25
  fake_resultsmodel.cpp
3594
26
  fake_previewmodel.cpp
3595
27
  fake_previewstack.cpp
3596
28
  fake_previewwidgetmodel.cpp
3597
29
  fake_unity_plugin.cpp
29
  fake_unity_plugin.cpp
3598
30
)
30
)
3599
31
31
3600
32
32
3601
=== removed file 'tests/mocks/Unity/categoryresults.cpp'
3602
--- tests/mocks/Unity/categoryresults.cpp	2013-11-12 18:21:40 +0000
3603
+++ tests/mocks/Unity/categoryresults.cpp	1970-01-01 00:00:00 +0000
3604
@@ -1,121 +0,0 @@
3605
1
/*
3606
2
 * Copyright (C) 2013 Canonical, Ltd.
3607
3
 *
3608
4
 * Authors:
3609
5
 *  Michal Hruby <michal.hruby@canonical.com>
3610
6
 *
3611
7
 * This program is free software; you can redistribute it and/or modify
3612
8
 * it under the terms of the GNU General Public License as published by
3613
9
 * the Free Software Foundation; version 3.
3614
10
 *
3615
11
 * This program is distributed in the hope that it will be useful,
3616
12
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
3617
13
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
3618
14
 * GNU General Public License for more details.
3619
15
 *
3620
16
 * You should have received a copy of the GNU General Public License
3621
17
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
3622
18
 */
3623
19
3624
20
// self
3625
21
#include "categoryresults.h"
3626
22
#include "iconutils.h"
3627
23
3628
24
// TODO: use something from libunity once it's public
3629
25
enum ResultsColumn {
3630
26
    URI,
3631
27
    ICON_HINT,
3632
28
    CATEGORY,
3633
29
    RESULT_TYPE,
3634
30
    MIMETYPE,
3635
31
    TITLE,
3636
32
    COMMENT,
3637
33
    DND_URI,
3638
34
    METADATA
3639
35
};
3640
36
3641
37
CategoryResults::CategoryResults(QObject* parent)
3642
38
    : DeeListModel(parent)
3643
39
    , m_categoryIndex(-1)
3644
40
{
3645
41
    m_roles[CategoryResults::RoleUri] = "uri";
3646
42
    m_roles[CategoryResults::RoleIconHint] = "icon";
3647
43
    m_roles[CategoryResults::RoleCategory] = "category";
3648
44
    m_roles[CategoryResults::RoleMimetype] = "mimetype";
3649
45
    m_roles[CategoryResults::RoleTitle] = "title";
3650
46
    m_roles[CategoryResults::RoleComment] = "comment";
3651
47
    m_roles[CategoryResults::RoleDndUri] = "dndUri";
3652
48
    m_roles[CategoryResults::RoleMetadata] = "metadata";
3653
49
    m_roles[CategoryResults::RoleRendererHints] = "rendererHints";
3654
50
}
3655
51
3656
52
int CategoryResults::categoryIndex() const
3657
53
{
3658
54
    return m_categoryIndex;
3659
55
}
3660
56
3661
57
void CategoryResults::setCategoryIndex(int index)
3662
58
{
3663
59
    if (m_categoryIndex != index) {
3664
60
        m_categoryIndex = index;
3665
61
        Q_EMIT categoryIndexChanged(m_categoryIndex);
3666
62
    }
3667
63
}
3668
64
3669
65
QHash<int, QByteArray>
3670
66
CategoryResults::roleNames() const
3671
67
{
3672
68
    return m_roles;
3673
69
}
3674
70
3675
71
QVariant
3676
72
CategoryResults::data(const QModelIndex& index, int role) const
3677
73
{
3678
74
    if (!index.isValid()) {
3679
75
        return QVariant();
3680
76
    }
3681
77
3682
78
    switch (role) {
3683
79
        case RoleUri:
3684
80
            return DeeListModel::data(index, ResultsColumn::URI);
3685
81
        case RoleIconHint: {
3686
82
            QString giconString(DeeListModel::data(index, ResultsColumn::ICON_HINT).toString());
3687
83
            if (giconString.isEmpty()) {
3688
84
                QString mimetype(DeeListModel::data(index, ResultsColumn::MIMETYPE).toString());
3689
85
                QString uri(DeeListModel::data(index, ResultsColumn::URI).toString());
3690
86
                QString thumbnailerUri(uriToThumbnailerProviderString(uri, mimetype, DeeListModel::data(index, ResultsColumn::METADATA).toHash()));
3691
87
                if (!thumbnailerUri.isNull()) {
3692
88
                    return QVariant::fromValue(thumbnailerUri);
3693
89
                }
3694
90
            }
3695
91
            return QVariant::fromValue(gIconToDeclarativeImageProviderString(giconString));
3696
92
        }
3697
93
        case RoleCategory:
3698
94
            return DeeListModel::data(index, ResultsColumn::CATEGORY);
3699
95
        case RoleMimetype:
3700
96
            return DeeListModel::data(index, ResultsColumn::MIMETYPE);
3701
97
        case RoleTitle:
3702
98
            return DeeListModel::data(index, ResultsColumn::TITLE);
3703
99
        case RoleComment:
3704
100
            return DeeListModel::data(index, ResultsColumn::COMMENT);
3705
101
        case RoleDndUri:
3706
102
            return DeeListModel::data(index, ResultsColumn::DND_URI);
3707
103
        case RoleMetadata:
3708
104
            return DeeListModel::data(index, ResultsColumn::METADATA);
3709
105
        case RoleRendererHints:
3710
106
        {
3711
107
            QVariantHash hash(DeeListModel::data(index, ResultsColumn::METADATA).toHash());
3712
108
            if (hash.contains("content")) {
3713
109
                QVariantMap hints;
3714
110
                QVariantHash innerHash(hash["content"].toHash());
3715
111
                if (innerHash.contains("scope_disabled")) {
3716
112
                    hints["scope_disabled"] = innerHash["scope_disabled"];
3717
113
                }
3718
114
                return hints.empty() ? QVariant() : QVariant::fromValue(hints);
3719
115
            }
3720
116
            return QVariant();
3721
117
        }
3722
118
        default:
3723
119
            return QVariant();
3724
120
    }
3725
121
}
3726
122
0
3727
=== removed file 'tests/mocks/Unity/categoryresults.h'
3728
--- tests/mocks/Unity/categoryresults.h	2013-11-12 18:21:40 +0000
3729
+++ tests/mocks/Unity/categoryresults.h	1970-01-01 00:00:00 +0000
3730
@@ -1,68 +0,0 @@
3731
1
/*
3732
2
 * Copyright (C) 2013 Canonical, Ltd.
3733
3
 *
3734
4
 * Authors:
3735
5
 *  Michal Hruby <michal.hruby@canonical.com>
3736
6
 *
3737
7
 * This program is free software; you can redistribute it and/or modify
3738
8
 * it under the terms of the GNU General Public License as published by
3739
9
 * the Free Software Foundation; version 3.
3740
10
 *
3741
11
 * This program is distributed in the hope that it will be useful,
3742
12
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
3743
13
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
3744
14
 * GNU General Public License for more details.
3745
15
 *
3746
16
 * You should have received a copy of the GNU General Public License
3747
17
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
3748
18
 */
3749
19
3750
20
3751
21
#ifndef CATEGORY_RESULTS_H
3752
22
#define CATEGORY_RESULTS_H
3753
23
3754
24
// dee-qt
3755
25
#include "deelistmodel.h"
3756
26
3757
27
class Q_DECL_EXPORT CategoryResults : public DeeListModel
3758
28
{
3759
29
    Q_OBJECT
3760
30
3761
31
    Q_ENUMS(Roles)
3762
32
3763
33
    Q_PROPERTY(int categoryIndex READ categoryIndex WRITE setCategoryIndex NOTIFY categoryIndexChanged)
3764
34
3765
35
public:
3766
36
    explicit CategoryResults(QObject* parent = 0);
3767
37
3768
38
    enum Roles {
3769
39
        RoleUri,
3770
40
        RoleIconHint,
3771
41
        RoleCategory,
3772
42
        RoleMimetype,
3773
43
        RoleTitle,
3774
44
        RoleComment,
3775
45
        RoleDndUri,
3776
46
        RoleMetadata,
3777
47
        RoleRendererHints
3778
48
    };
3779
49
3780
50
    QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const;
3781
51
3782
52
    QHash<int, QByteArray> roleNames() const;
3783
53
3784
54
    /* getters */
3785
55
    int categoryIndex() const;
3786
56
3787
57
    /* setters */
3788
58
    void setCategoryIndex(int index);
3789
59
3790
60
Q_SIGNALS:
3791
61
    void categoryIndexChanged(int index);
3792
62
3793
63
private:
3794
64
    QHash<int, QByteArray> m_roles;
3795
65
    int m_categoryIndex;
3796
66
};
3797
67
3798
68
#endif // CATEGORY_RESULTS_H
3799
69
0
3800
=== removed file 'tests/mocks/Unity/fake_applications_scope.cpp'
3801
--- tests/mocks/Unity/fake_applications_scope.cpp	2014-01-16 17:39:35 +0000
3802
+++ tests/mocks/Unity/fake_applications_scope.cpp	1970-01-01 00:00:00 +0000
3803
@@ -1,76 +0,0 @@
3804
1
/*
3805
2
 * Copyright (C) 2013, 2014 Canonical, Ltd.
3806
3
 *
3807
4
 * This program is free software; you can redistribute it and/or modify
3808
5
 * it under the terms of the GNU General Public License as published by
3809
6
 * the Free Software Foundation; version 3.
3810
7
 *
3811
8
 * This program is distributed in the hope that it will be useful,
3812
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
3813
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
3814
11
 * GNU General Public License for more details.
3815
12
 *
3816
13
 * You should have received a copy of the GNU General Public License
3817
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
3818
15
 */
3819
16
3820
17
#include "fake_applications_scope.h"
3821
18
3822
19
static const gchar * categories_model_schema[] = {
3823
20
    "s", //ID
3824
21
    "s", // DISPLAY_NAME
3825
22
    "s", // ICON_HINT
3826
23
    "s", // RENDERER_NAME
3827
24
    "a{sv}" // HINTS
3828
25
};
3829
26
3830
27
ApplicationsScope::ApplicationsScope(bool visible, QObject* parent)
3831
28
    : Scope(parent)
3832
29
{
3833
30
    m_id = "applications.scope";
3834
31
    m_name = "Applications";
3835
32
    m_visible = visible;
3836
33
    m_previewRendererName = "preview-application";
3837
34
    m_categories->setModel(createCategoriesModel());
3838
35
}
3839
36
3840
37
DeeModel* ApplicationsScope::createCategoriesModel()
3841
38
{
3842
39
    DeeModel* category_model = dee_sequence_model_new();
3843
40
    dee_model_set_schema_full(category_model, categories_model_schema, G_N_ELEMENTS(categories_model_schema));
3844
41
    GVariant* hints = g_variant_new_array(g_variant_type_element(G_VARIANT_TYPE_VARDICT), NULL, 0);
3845
42
3846
43
    GVariant* children[1];
3847
44
    children[0] = g_variant_new_dict_entry(g_variant_new_string("content-type"),
3848
45
                                           g_variant_new_variant(g_variant_new_string("apps")));
3849
46
    GVariant* recentHints = g_variant_new_array(g_variant_type_element(G_VARIANT_TYPE_VARDICT), children, 1);
3850
47
    dee_model_append(category_model,
3851
48
                     "recent",
3852
49
                     "Recent",
3853
50
                     "gtk-apply",
3854
51
                     "special",
3855
52
                     recentHints);
3856
53
3857
54
    dee_model_append(category_model,
3858
55
                     "installed",
3859
56
                     "Installed",
3860
57
                     "gtk-apply",
3861
58
                     "grid",
3862
59
                     hints);
3863
60
3864
61
    dee_model_append(category_model,
3865
62
                     "suggested",
3866
63
                     "Suggested",
3867
64
                     "gtk-apply",
3868
65
                     "grid",
3869
66
                     hints);
3870
67
3871
68
    dee_model_append(category_model,
3872
69
                     "outdated",
3873
70
                     "Outdaded",
3874
71
                     "gtk-apply",
3875
72
                     "grid",
3876
73
                     hints);
3877
74
3878
75
    return category_model;
3879
76
}
3880
77
0
3881
=== removed file 'tests/mocks/Unity/fake_applications_scope.h'
3882
--- tests/mocks/Unity/fake_applications_scope.h	2013-09-02 20:34:05 +0000
3883
+++ tests/mocks/Unity/fake_applications_scope.h	1970-01-01 00:00:00 +0000
3884
@@ -1,33 +0,0 @@
3885
1
/*
3886
2
 * Copyright (C) 2013 Canonical, Ltd.
3887
3
 *
3888
4
 * This program is free software; you can redistribute it and/or modify
3889
5
 * it under the terms of the GNU General Public License as published by
3890
6
 * the Free Software Foundation; version 3.
3891
7
 *
3892
8
 * This program is distributed in the hope that it will be useful,
3893
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
3894
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
3895
11
 * GNU General Public License for more details.
3896
12
 *
3897
13
 * You should have received a copy of the GNU General Public License
3898
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
3899
15
 */
3900
16
3901
17
#ifndef FAKE_APPLICATIONS_SCOPE_H
3902
18
#define FAKE_APPLICATIONS_SCOPE_H
3903
19
3904
20
#include "fake_scope.h"
3905
21
3906
22
class ApplicationsScope : public Scope
3907
23
{
3908
24
    Q_OBJECT
3909
25
3910
26
public:
3911
27
    ApplicationsScope(bool visible, QObject* parent = 0);
3912
28
3913
29
private:
3914
30
    DeeModel* createCategoriesModel();
3915
31
};
3916
32
3917
33
#endif // FAKE_APPLICATIONS_SCOPE_H
3918
34
0
3919
=== modified file 'tests/mocks/Unity/fake_categories.cpp'
3920
--- tests/mocks/Unity/fake_categories.cpp	2013-10-02 13:02:16 +0000
3921
+++ tests/mocks/Unity/fake_categories.cpp	2014-03-18 10:57:24 +0000
3922
@@ -19,100 +19,21 @@
3923
19
// self
19
// self
3924
20
#include "fake_categories.h"
20
#include "fake_categories.h"
3925
21
21
3942
22
// local
22
#include "fake_resultsmodel.h"
3943
23
#include "categoryresults.h"
23
3944
24
24
Categories::Categories(int category_count, QObject* parent)
3945
25
#define CATEGORY_COLUMN 2
25
    : QAbstractListModel(parent)
3946
26
26
    , m_category_count(category_count)
3931
27
// TODO: use something from libunity once it's public
3932
28
enum CategoryColumn {
3933
29
    ID,
3934
30
    DISPLAY_NAME,
3935
31
    ICON_HINT,
3936
32
    RENDERER_NAME,
3937
33
    HINTS
3938
34
};
3939
35
3940
36
Categories::Categories(QObject* parent)
3941
37
    : DeeListModel(parent)
3947
38
{
27
{
3948
39
    // FIXME: need to clean up unused filters on countChanged
3949
40
    m_roles[Categories::RoleCategoryId] = "categoryId";
28
    m_roles[Categories::RoleCategoryId] = "categoryId";
3950
41
    m_roles[Categories::RoleName] = "name";
29
    m_roles[Categories::RoleName] = "name";
3951
42
    m_roles[Categories::RoleIcon] = "icon";
30
    m_roles[Categories::RoleIcon] = "icon";
3952
31
    m_roles[Categories::RoleRawRendererTemplate] = "rawRendererTemplate";
3953
43
    m_roles[Categories::RoleRenderer] = "renderer";
32
    m_roles[Categories::RoleRenderer] = "renderer";
3957
44
    m_roles[Categories::RoleContentType] = "contentType";
33
    m_roles[Categories::RoleComponents] = "components";
3958
45
    m_roles[Categories::RoleRendererHint] = "rendererHint";
34
    m_roles[Categories::RoleProgressSource] = "progressSource";
3956
46
    m_roles[Categories::RoleHints] = "hints";
3959
47
    m_roles[Categories::RoleResults] = "results";
35
    m_roles[Categories::RoleResults] = "results";
3960
48
    m_roles[Categories::RoleCount] = "count";
36
    m_roles[Categories::RoleCount] = "count";
3961
49
3962
50
    // TODO This should not be needed but accumulatting the count changes
3963
51
    // makes the visualization more stable and also makes crashes on fast
3964
52
    // change of the search term harder to reproduce
3965
53
    m_timer.setSingleShot(true);
3966
54
    m_timer.setInterval(50);
3967
55
    connect(&m_timer, SIGNAL(timeout()), this, SLOT(onEmitCountChanged()));
3968
56
}
3969
57
3970
58
DeeListModel*
3971
59
Categories::getFilter(int index) const
3972
60
{
3973
61
    if (!m_filters.contains(index)) {
3974
62
        auto results = new CategoryResults ();
3975
63
        results->setCategoryIndex(index);
3976
64
        connect(results, SIGNAL(countChanged()), this, SLOT(onCountChanged()));
3977
65
3978
66
        unsigned cat_index = static_cast<unsigned>(index);
3979
67
        auto model = getResultsForCategory(cat_index);
3980
68
        results->setModel(model);
3981
69
3982
70
        m_filters.insert(index, results);
3983
71
    }
3984
72
3985
73
    return m_filters[index];
3986
74
}
3987
75
3988
76
void
3989
77
Categories::onCountChanged()
3990
78
{
3991
79
    DeeListModel* filter = qobject_cast<DeeListModel*>(sender());
3992
80
    if (filter) {
3993
81
        m_timerFilters << filter;
3994
82
        m_timer.start();
3995
83
    }
3996
84
}
3997
85
3998
86
void Categories::onRowCountChanged()
3999
87
{
4000
88
    QAbstractItemModel* model = qobject_cast<QAbstractItemModel*>(sender());
4001
89
    // find the corresponding category index
4002
90
    for (auto iter = m_overriddenCategories.begin(); iter != m_overriddenCategories.end(); ++iter) {
4003
91
        if (iter.value() == model) {
4004
92
            for (int i = 0; i < rowCount(); i++) {
4005
93
                auto id = data(index(i), RoleCategoryId).toString();
4006
94
                if (id != iter.key()) continue;
4007
95
                QVector<int> roles;
4008
96
                roles.append(RoleCount);
4009
97
                QModelIndex changedIndex = index(i);
4010
98
                Q_EMIT dataChanged(changedIndex, changedIndex, roles);
4011
99
                break;
4012
100
            }
4013
101
        }
4014
102
    }
4015
103
}
4016
104
4017
105
void
4018
106
Categories::onEmitCountChanged()
4019
107
{
4020
108
    QVector<int> roles;
4021
109
    roles.append(Categories::RoleCount);
4022
110
    Q_FOREACH(DeeListModel* results, m_timerFilters) {
4023
111
        auto cat_results = qobject_cast<CategoryResults*>(results);
4024
112
        QModelIndex changedIndex = index(cat_results->categoryIndex());
4025
113
        Q_EMIT dataChanged(changedIndex, changedIndex, roles);
4026
114
    }
4027
115
    m_timerFilters.clear();
4028
116
}
37
}
4029
117
38
4030
118
QHash<int, QByteArray>
39
QHash<int, QByteArray>
4031
@@ -121,92 +42,44 @@
4032
121
    return m_roles;
42
    return m_roles;
4033
122
}
43
}
4034
123
44
4121
124
void Categories::onOverrideModelDestroyed()
45
int Categories::rowCount(const QModelIndex& /*parent*/) const
4122
125
{
46
{
4123
126
    QObject* model = sender();
47
    return m_category_count + m_specialCategories.count();
4124
127
    auto iter = m_overriddenCategories.begin();
48
}
4125
128
    while (iter != m_overriddenCategories.end()) {
49
4126
129
        if (iter.value() == model) {
50
void Categories::addSpecialCategory(QString const& categoryId, QString const& name, QString const& icon, QString const& rawTemplate, QObject* countObject)
4127
130
            iter = m_overriddenCategories.erase(iter);
51
{
4128
131
            continue;
52
    CategoryData catData;
4129
132
        }
53
    catData.categoryId = categoryId;
4130
133
        ++iter;
54
    catData.name = name;
4131
134
    }
55
    catData.icon = icon;
4132
135
}
56
    catData.rawTemplate = rawTemplate;
4133
136
57
    catData.countObject = countObject;
4134
137
void Categories::overrideResults(const QString& categoryId, QAbstractItemModel* model)
58
4135
138
{
59
    beginInsertRows(QModelIndex(), 0, 0);
4136
139
    m_overriddenCategories[categoryId] = model;
60
    m_specialCategories.prepend(catData);
4137
140
    // watch the model
61
    endInsertRows();
4138
141
    connect(model, &QObject::destroyed, this, &Categories::onOverrideModelDestroyed);
62
4139
142
    connect(model, &QAbstractItemModel::rowsInserted, this, &Categories::onRowCountChanged);
63
    if (countObject) {
4140
143
    connect(model, &QAbstractItemModel::rowsRemoved, this, &Categories::onRowCountChanged);
64
        connect(countObject, SIGNAL(countChanged()), this, SLOT(countChanged()));
4141
144
    connect(model, &QAbstractItemModel::modelReset, this, &Categories::onRowCountChanged);
65
    }
4142
145
66
}
4143
146
    // emit the dataChanged signal if the category is already in the model
67
4144
147
    for (int i = 0; i < rowCount(); i++) {
68
void Categories::countChanged()
4145
148
        auto id = data(index(i), RoleCategoryId).toString();
69
{
4146
149
        if (id != categoryId) continue;
70
    QObject* countObject = sender();
4147
150
        QVector<int> roles;
71
4148
151
        roles.append(RoleCount);
72
    for (int i = 0; i < m_specialCategories.count(); ++i) {
4149
152
        roles.append(RoleResults);
73
        const CategoryData &catData = m_specialCategories.at(i);
4150
153
        QModelIndex changedIndex = index(i);
74
        if (catData.countObject == countObject) {
4151
154
        Q_EMIT dataChanged(changedIndex, changedIndex, roles);
75
            QVector<int> roles;
4152
155
        break;
76
            roles.append(RoleCount);
4153
156
    }
77
4154
157
}
78
            QModelIndex changedIndex(index(i));
4155
158
79
            dataChanged(changedIndex, changedIndex, roles);
4156
159
void Categories::setResultModel(DeeModel* model)
80
            break;
4157
160
{
81
        }
4158
161
  // FIXME: should ref it
82
    }
4073
162
  m_dee_results = model;
4074
163
}
4075
164
4076
165
4077
166
static void category_filter_map_func (DeeModel* orig_model,
4078
167
                                      DeeFilterModel* filter_model,
4079
168
                                      gpointer user_data)
4080
169
{
4081
170
    DeeModelIter* iter;
4082
171
    DeeModelIter* end;
4083
172
    unsigned index = GPOINTER_TO_UINT(user_data);
4084
173
4085
174
    iter = dee_model_get_first_iter(orig_model);
4086
175
    end = dee_model_get_last_iter(orig_model);
4087
176
    while (iter != end) {
4088
177
        unsigned category_index = dee_model_get_uint32(orig_model, iter, CATEGORY_COLUMN);
4089
178
        if (index == category_index) {
4090
179
            dee_filter_model_append_iter(filter_model, iter);
4091
180
        }
4092
181
        iter = dee_model_next(orig_model, iter);
4093
182
    }
4094
183
}
4095
184
4096
185
static gboolean category_filter_notify_func (DeeModel* orig_model,
4097
186
                                             DeeModelIter* orig_iter,
4098
187
                                             DeeFilterModel* filter_model,
4099
188
                                             gpointer user_data)
4100
189
{
4101
190
    unsigned index = GPOINTER_TO_UINT(user_data);
4102
191
    unsigned category_index = dee_model_get_uint32(orig_model, orig_iter, CATEGORY_COLUMN);
4103
192
4104
193
    if (index != category_index)
4105
194
        return FALSE;
4106
195
4107
196
    dee_filter_model_insert_iter_with_original_order(filter_model, orig_iter);
4108
197
    return TRUE;
4109
198
}
4110
199
4111
200
DeeModel* Categories::getResultsForCategory(unsigned cat_index) const
4112
201
{
4113
202
    DeeFilter filter;
4114
203
    filter.map_func = category_filter_map_func;
4115
204
    filter.map_notify = category_filter_notify_func;
4116
205
    filter.destroy = nullptr;
4117
206
    filter.userdata = GUINT_TO_POINTER(cat_index);
4118
207
4119
208
    DeeModel* filtered_model = dee_filter_model_new(m_dee_results, &filter);
4120
209
    return filtered_model;
4159
210
}
83
}
4160
211
84
4161
212
QVariant
85
QVariant
4162
@@ -216,44 +89,86 @@
4163
216
        return QVariant();
89
        return QVariant();
4164
217
    }
90
    }
4165
218
91
4205
219
    switch (role) {
92
    ResultsModel *resultsModel = m_resultsModels[index.row()];
4206
220
        case RoleCategoryId:
93
    if (!resultsModel) {
4207
221
            return DeeListModel::data(index, CategoryColumn::ID);
94
        resultsModel = new ResultsModel(15, index.row());
4208
222
        case RoleName:
95
        m_resultsModels[index.row()] = resultsModel;
4209
223
            return DeeListModel::data(index, CategoryColumn::DISPLAY_NAME);
96
    }
4210
224
        case RoleIcon:
97
    if (index.row() < m_specialCategories.count()) {
4211
225
            return DeeListModel::data(index, CategoryColumn::ICON_HINT);
98
        const CategoryData &catData = m_specialCategories.at(index.row());
4212
226
        case RoleRenderer:
99
        switch (role) {
4213
227
            return DeeListModel::data(index, CategoryColumn::RENDERER_NAME);
100
            case RoleCategoryId:
4214
228
        case RoleContentType:
101
                return catData.categoryId;
4215
229
        {
102
            case RoleName:
4216
230
            auto hints = DeeListModel::data(index, CategoryColumn::HINTS).toHash();
103
                return catData.name;
4217
231
            return  hints.contains("content-type") ? hints["content-type"] : QVariant(QString("default"));
104
            case RoleIcon:
4218
232
        }
105
                return catData.icon;
4219
233
        case RoleRendererHint:
106
            case RoleRawRendererTemplate:
4220
234
        {
107
                return catData.rawTemplate;
4221
235
            auto hints = DeeListModel::data(index, CategoryColumn::HINTS).toHash();
108
            case RoleRenderer:
4222
236
            return  hints.contains("renderer-hint") ? hints["renderer-hint"] : QVariant(QString());
109
            {
4223
237
        }
110
                QVariantMap map;
4224
238
        case RoleHints:
111
                map["category-layout"] = index.row() % 2 == 0 ? "grid" : "carousel";
4225
239
            return DeeListModel::data(index, CategoryColumn::HINTS);
112
                map["card-size"] = "small";
4226
240
        case RoleResults:
113
                return map;
4227
241
            if (m_overriddenCategories.size() > 0)
114
            }
4228
242
            {
115
            case RoleComponents:
4229
243
                auto id = DeeListModel::data(index, CategoryColumn::ID).toString();
116
            {
4230
244
                if (m_overriddenCategories.find(id) != m_overriddenCategories.end())
117
                QVariantMap map, artMap;
4231
245
                    return QVariant::fromValue(m_overriddenCategories[id]);
118
                artMap["aspect-ratio"] = "1.0";
4232
246
            }
119
                artMap["field"] = "art";
4233
247
            return QVariant::fromValue(getFilter(index.row()));
120
                map["art"] = artMap;
4234
248
        case RoleCount:
121
                map["title"] = "HOLA";
4235
249
            if (m_overriddenCategories.size() > 0)
122
                return map;
4236
250
            {
123
            }
4237
251
                auto id = DeeListModel::data(index, CategoryColumn::ID).toString();
124
            case RoleProgressSource:
4238
252
                if (m_overriddenCategories.find(id) != m_overriddenCategories.end())
125
                qFatal("Using un-implemented RoleProgressSource Categories role");
4239
253
                    return QVariant::fromValue(m_overriddenCategories[id]->rowCount());
126
                return QVariant();
4240
254
            }
127
            case RoleResults:
4241
255
            return QVariant::fromValue(getFilter(index.row())->rowCount());
128
                return QVariant();
4242
256
        default:
129
            case RoleCount:
4243
257
            return QVariant();
130
                return catData.countObject->property("count");
4244
131
            default:
4245
132
                qFatal("Using un-implemented Categories role");
4246
133
                return QVariant();
4247
134
        }
4248
135
    } else {
4249
136
        switch (role) {
4250
137
            case RoleCategoryId:
4251
138
                return QString("%1").arg(index.row());
4252
139
            case RoleName:
4253
140
                return QString("Category %1").arg(index.row());
4254
141
            case RoleIcon:
4255
142
                return "gtk-apply";
4256
143
            case RoleRawRendererTemplate:
4257
144
                qFatal("Using un-implemented RoleRawRendererTemplate Categories role");
4258
145
                return QVariant();
4259
146
            case RoleRenderer:
4260
147
            {
4261
148
                QVariantMap map;
4262
149
                map["category-layout"] = index.row() % 2 == 0 ? "grid" : "carousel";
4263
150
                map["card-size"] = "small";
4264
151
                return map;
4265
152
            }
4266
153
            case RoleComponents:
4267
154
            {
4268
155
                QVariantMap map, artMap;
4269
156
                artMap["aspect-ratio"] = "1.0";
4270
157
                artMap["field"] = "art";
4271
158
                map["art"] = artMap;
4272
159
                map["title"] = "HOLA";
4273
160
                return map;
4274
161
            }
4275
162
            case RoleProgressSource:
4276
163
                qFatal("Using un-implemented RoleProgressSource Categories role");
4277
164
                return QVariant();
4278
165
            case RoleResults:
4279
166
                return QVariant::fromValue(resultsModel);
4280
167
            case RoleCount:
4281
168
                return resultsModel->rowCount();
4282
169
            default:
4283
170
                qFatal("Using un-implemented Categories role");
4284
171
                return QVariant();
4285
172
        }
4286
258
    }
173
    }
4287
259
}
174
}
4288
260
175
4289
=== modified file 'tests/mocks/Unity/fake_categories.h'
4290
--- tests/mocks/Unity/fake_categories.h	2013-10-02 13:02:16 +0000
4291
+++ tests/mocks/Unity/fake_categories.h	2014-03-18 10:57:24 +0000
4292
@@ -18,58 +18,54 @@
4293
18
#define FAKE_CATEGORIES_H
18
#define FAKE_CATEGORIES_H
4294
19
19
4295
20
// Qt
20
// Qt
4304
21
#include <QObject>
21
#include <QAbstractListModel>
4305
22
#include <QSet>
22
#include <QList>
4306
23
#include <QTimer>
23
4307
24
24
class ResultsModel;
4308
25
#include <dee.h>
25
4309
26
#include <deelistmodel.h>
26
class Categories : public QAbstractListModel
4302
27
4303
28
class Categories : public DeeListModel
4310
29
{
27
{
4311
30
    Q_OBJECT
28
    Q_OBJECT
4312
31
29
4313
32
    Q_ENUMS(Roles)
30
    Q_ENUMS(Roles)
4314
33
31
4315
34
public:
32
public:
4317
35
    Categories(QObject* parent = 0);
33
    Categories(int category_count, QObject* parent = 0);
4318
36
    enum Roles {
34
    enum Roles {
4319
37
        RoleCategoryId,
35
        RoleCategoryId,
4320
38
        RoleName,
36
        RoleName,
4321
39
        RoleIcon,
37
        RoleIcon,
4322
38
        RoleRawRendererTemplate,
4323
40
        RoleRenderer,
39
        RoleRenderer,
4327
41
        RoleContentType,
40
        RoleComponents,
4328
42
        RoleRendererHint,
41
        RoleProgressSource, // maybe
4326
43
        RoleHints,
4329
44
        RoleResults,
42
        RoleResults,
4330
45
        RoleCount
43
        RoleCount
4331
46
    };
44
    };
4332
47
45
4341
48
    Q_INVOKABLE void overrideResults(const QString& categoryId, QAbstractItemModel* model);
46
    QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
4342
49
47
    QHash<int, QByteArray> roleNames() const override;
4343
50
    QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const;
48
    int rowCount(const QModelIndex& parent = QModelIndex()) const override;
4344
51
49
4345
52
    QHash<int, QByteArray> roleNames() const;
50
    Q_INVOKABLE void addSpecialCategory(QString const& categoryId, QString const& name, QString const& icon, QString const& rawTemplate, QObject* countObject);
4338
53
4339
54
    /* setters */
4340
55
    void setResultModel(DeeModel* model);
4346
56
51
4347
57
private Q_SLOTS:
52
private Q_SLOTS:
4352
58
    void onCountChanged();
53
    void countChanged();
4349
59
    void onRowCountChanged();
4350
60
    void onEmitCountChanged();
4351
61
    void onOverrideModelDestroyed();
4353
62
54
4354
63
private:
55
private:
4361
64
    DeeModel* getResultsForCategory(unsigned index) const;
56
    mutable QHash<int, ResultsModel*> m_resultsModels;
4356
65
    DeeListModel* getFilter(int index) const;
4357
66
4358
67
    DeeModel* m_dee_results;
4359
68
    QTimer m_timer;
4360
69
    QSet<DeeListModel*> m_timerFilters;
4362
70
    QHash<int, QByteArray> m_roles;
57
    QHash<int, QByteArray> m_roles;
4365
71
    QMap<QString, QAbstractItemModel*> m_overriddenCategories;
58
    int m_category_count;
4366
72
    mutable QMap<int, DeeListModel*> m_filters;
59
4367
60
    struct CategoryData {
4368
61
        QString categoryId;
4369
62
        QString name;
4370
63
        QString icon;
4371
64
        QString rawTemplate;
4372
65
        QObject* countObject;
4373
66
    };
4374
67
4375
68
    QList<CategoryData> m_specialCategories;
4376
73
};
69
};
4377
74
70
4378
75
#endif // FAKE_CATEGORIES_H
71
#endif // FAKE_CATEGORIES_H
4379
76
72
4380
=== removed file 'tests/mocks/Unity/fake_preview.cpp'
4381
--- tests/mocks/Unity/fake_preview.cpp	2014-01-16 17:39:35 +0000
4382
+++ tests/mocks/Unity/fake_preview.cpp	1970-01-01 00:00:00 +0000
4383
@@ -1,73 +0,0 @@
4384
1
/*
4385
2
 * Copyright (C) 2013, 2014 Canonical, Ltd.
4386
3
 *
4387
4
 * This program is free software; you can redistribute it and/or modify
4388
5
 * it under the terms of the GNU General Public License as published by
4389
6
 * the Free Software Foundation; version 3.
4390
7
 *
4391
8
 * This program is distributed in the hope that it will be useful,
4392
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
4393
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
4394
11
 * GNU General Public License for more details.
4395
12
 *
4396
13
 * You should have received a copy of the GNU General Public License
4397
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
4398
15
 */
4399
16
4400
17
#include "fake_preview.h"
4401
18
4402
19
Preview::Preview(const QString &rendererName, QObject *parent):
4403
20
    QObject(parent),
4404
21
    m_rendererName(rendererName)
4405
22
{
4406
23
}
4407
24
4408
25
QString Preview::rendererName() const
4409
26
{
4410
27
    return m_rendererName;
4411
28
}
4412
29
4413
30
QString Preview::title() const
4414
31
{
4415
32
    return "Title";
4416
33
}
4417
34
4418
35
QString Preview::subtitle() const
4419
36
{
4420
37
    return "Subtitle";
4421
38
}
4422
39
4423
40
QString Preview::description() const
4424
41
{
4425
42
    return "Description";
4426
43
}
4427
44
4428
45
QVariant Preview::actions()
4429
46
{
4430
47
    return QVariant();
4431
48
}
4432
49
4433
50
QVariant Preview::infoHints()
4434
51
{
4435
52
    return QVariant();
4436
53
}
4437
54
4438
55
QVariantMap Preview::infoHintsHash() const
4439
56
{
4440
57
    return QVariantMap();
4441
58
}
4442
59
4443
60
QString Preview::image() const
4444
61
{
4445
62
    return "";
4446
63
}
4447
64
4448
65
void Preview::execute(const QString& actionId, const QHash<QString, QVariant>& hints)
4449
66
{
4450
67
    Q_UNUSED(actionId);
4451
68
    Q_UNUSED(hints);
4452
69
}
4453
70
4454
71
void Preview::cancelAction()
4455
72
{
4456
73
}
4457
74
0
4458
=== removed file 'tests/mocks/Unity/fake_preview.h'
4459
--- tests/mocks/Unity/fake_preview.h	2014-01-16 17:39:35 +0000
4460
+++ tests/mocks/Unity/fake_preview.h	1970-01-01 00:00:00 +0000
4461
@@ -1,65 +0,0 @@
4462
1
/*
4463
2
 * Copyright (C) 2013, 2014 Canonical, Ltd.
4464
3
 *
4465
4
 * This program is free software; you can redistribute it and/or modify
4466
5
 * it under the terms of the GNU General Public License as published by
4467
6
 * the Free Software Foundation; version 3.
4468
7
 *
4469
8
 * This program is distributed in the hope that it will be useful,
4470
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
4471
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
4472
11
 * GNU General Public License for more details.
4473
12
 *
4474
13
 * You should have received a copy of the GNU General Public License
4475
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
4476
15
 */
4477
16
4478
17
#ifndef FAKE_PREVIEW_H
4479
18
#define FAKE_PREVIEW_H
4480
19
4481
20
// Qt
4482
21
#include <QObject>
4483
22
#include <QString>
4484
23
#include <QMetaType>
4485
24
#include <QList>
4486
25
#include <QVariantMap>
4487
26
4488
27
class Q_DECL_EXPORT Preview : public QObject
4489
28
{
4490
29
    Q_OBJECT
4491
30
4492
31
    Q_PROPERTY(QString rendererName READ rendererName NOTIFY previewChanged)
4493
32
    Q_PROPERTY(QString title READ title NOTIFY previewChanged)
4494
33
    Q_PROPERTY(QString subtitle READ subtitle NOTIFY previewChanged)
4495
34
    Q_PROPERTY(QString description READ description NOTIFY previewChanged)
4496
35
    Q_PROPERTY(QVariant actions READ actions NOTIFY previewChanged)
4497
36
    Q_PROPERTY(QVariant infoHints READ infoHints NOTIFY previewChanged)
4498
37
    Q_PROPERTY(QVariantMap infoMap READ infoHintsHash NOTIFY previewChanged)
4499
38
    Q_PROPERTY(QString image READ image NOTIFY previewChanged)
4500
39
4501
40
public:
4502
41
    explicit Preview(const QString &rendererName, QObject *parent = 0);
4503
42
4504
43
    QString rendererName() const;
4505
44
    QString title() const;
4506
45
    QString subtitle() const;
4507
46
    QString description() const;
4508
47
    QVariant actions();
4509
48
    QVariant infoHints();
4510
49
    QVariantMap infoHintsHash() const;
4511
50
    QString image() const;
4512
51
4513
52
    Q_INVOKABLE void execute(const QString& actionId, const QHash<QString, QVariant>& hints);
4514
53
4515
54
    Q_INVOKABLE void cancelAction();
4516
55
4517
56
Q_SIGNALS:
4518
57
    void previewChanged();
4519
58
4520
59
private:
4521
60
    QString m_rendererName;
4522
61
};
4523
62
4524
63
Q_DECLARE_METATYPE(Preview *)
4525
64
4526
65
#endif // FAKE_PREVIEW_H
4527
66
0
4528
=== renamed file 'tests/mocks/Unity/scopes-ng/fake_preview_model.cpp' => 'tests/mocks/Unity/fake_previewmodel.cpp'
4529
--- tests/mocks/Unity/scopes-ng/fake_preview_model.cpp	2014-02-07 09:57:30 +0000
4530
+++ tests/mocks/Unity/fake_previewmodel.cpp	2014-03-18 10:57:24 +0000
4531
@@ -19,78 +19,68 @@
4532
19
 */
19
 */
4533
20
20
4534
21
// self
21
// self
4536
22
#include "fake_preview_model.h"
22
#include "fake_previewmodel.h"
4537
23
4538
24
// local
4539
25
#include "fake_previewwidgetmodel.h"
4540
23
26
4541
24
// Qt
27
// Qt
4557
25
#include <QVariantMap>
28
#include <QDebug>
4543
26
4544
27
namespace scopes_ng
4545
28
{
4546
29
4547
30
struct PreviewData
4548
31
{
4549
32
    QString id;
4550
33
    QString type;
4551
34
    QVariantMap data;
4552
35
4553
36
    PreviewData(QString const& id_, QString const& type_, QVariantMap const& data_): id(id_), type(type_), data(data_)
4554
37
    {
4555
38
    }
4556
39
};
4558
40
29
4559
41
PreviewModel::PreviewModel(QObject* parent) : QAbstractListModel(parent)
30
PreviewModel::PreviewModel(QObject* parent) : QAbstractListModel(parent)
4560
42
{
31
{
4587
43
    m_roles[Roles::RoleWidgetId] = "widgetId";
32
    // we have one column by default
4588
44
    m_roles[Roles::RoleType] = "type";
33
    PreviewWidgetModel* columnModel = new PreviewWidgetModel(this);
4589
45
    m_roles[Roles::RoleProperties] = "properties";
34
    m_previewWidgetModels.append(columnModel);
4564
46
4565
47
    populateWidgets();
4566
48
}
4567
49
4568
50
void PreviewModel::populateWidgets()
4569
51
{
4570
52
    beginResetModel();
4571
53
    m_previewWidgets.clear();
4572
54
    for (int i = 0; i <= 20; i++) {
4573
55
        // FIXME: the API will expose nicer getters soon, use those!
4574
56
        QVariantMap attributes;
4575
57
        attributes["text"] = QVariant::fromValue(QString("Widget %1").arg(i));
4576
58
        attributes["title"] = QVariant::fromValue(QString("Title %1").arg(i));
4577
59
        PreviewData* preview_data = new PreviewData(QString("widget-%1").arg(i), QString("text"), attributes);
4578
60
        m_previewWidgets.append(QSharedPointer<PreviewData>(preview_data));
4579
61
    }
4580
62
    endResetModel();
4581
63
4582
64
}
4583
65
4584
66
void PreviewModel::triggered(QString widgetId, QString actionId, QVariantMap data)
4585
67
{
4586
68
    Q_EMIT actionTriggered(widgetId, actionId, data);
4590
69
}
35
}
4591
70
36
4592
71
QHash<int, QByteArray> PreviewModel::roleNames() const
37
QHash<int, QByteArray> PreviewModel::roleNames() const
4593
72
{
38
{
4595
73
    return m_roles;
39
    QHash<int, QByteArray> roles;
4596
40
4597
41
    roles[Roles::RoleColumnModel] = "columnModel";
4598
42
4599
43
    return roles;
4600
44
}
4601
45
4602
46
void PreviewModel::setWidgetColumnCount(int count)
4603
47
{
4604
48
    if (count != 1) {
4605
49
        qWarning("PreviewModel::setWidgetColumnCount != 1 not implemented");
4606
50
    }
4607
51
}
4608
52
4609
53
int PreviewModel::widgetColumnCount() const
4610
54
{
4611
55
    return 1;
4612
56
}
4613
57
4614
58
bool PreviewModel::loaded() const
4615
59
{
4616
60
    return true;
4617
61
}
4618
62
4619
63
bool PreviewModel::processingAction() const
4620
64
{
4621
65
    return false;
4622
66
}
4623
67
4624
68
void PreviewModel::setProcessingAction(bool /*processing*/)
4625
69
{
4626
70
    qFatal("PreviewModel::setProcessingAction not implemented");
4627
74
}
71
}
4628
75
72
4629
76
int PreviewModel::rowCount(const QModelIndex&) const
73
int PreviewModel::rowCount(const QModelIndex&) const
4630
77
{
74
{
4632
78
    return m_previewWidgets.size();
75
    return m_previewWidgetModels.size();
4633
79
}
76
}
4634
80
77
4635
81
QVariant PreviewModel::data(const QModelIndex& index, int role) const
78
QVariant PreviewModel::data(const QModelIndex& index, int role) const
4636
82
{
79
{
4637
83
    auto widget_data = m_previewWidgets.at(index.row());
4638
84
    switch (role) {
80
    switch (role) {
4645
85
        case RoleWidgetId:
81
        case RoleColumnModel:
4646
86
            return widget_data->id;
82
            return QVariant::fromValue(m_previewWidgetModels.at(index.row()));
4641
87
        case RoleType:
4642
88
            return widget_data->type;
4643
89
        case RoleProperties:
4644
90
            return widget_data->data;
4647
91
        default:
83
        default:
4648
92
            return QVariant();
84
            return QVariant();
4649
93
    }
85
    }
4650
94
}
86
}
4651
95
4652
96
} // namespace scopes_ng
4653
97
87
4654
=== renamed file 'tests/mocks/Unity/scopes-ng/fake_preview_model.h' => 'tests/mocks/Unity/fake_previewmodel.h'
4655
--- tests/mocks/Unity/scopes-ng/fake_preview_model.h	2014-02-07 09:55:56 +0000
4656
+++ tests/mocks/Unity/fake_previewmodel.h	2014-03-18 10:57:24 +0000
4657
@@ -15,54 +15,53 @@
4658
15
 */
15
 */
4659
16
16
4660
17
17
4663
18
#ifndef NG_FAKE_PREVIEW_H
18
#ifndef FAKE_PREVIEWMODEL_H
4664
19
#define NG_FAKE_PREVIEW_H
19
#define FAKE_PREVIEWMODEL_H
4665
20
20
4666
21
#include <QAbstractListModel>
21
#include <QAbstractListModel>
4667
22
#include <QSharedPointer>
22
#include <QSharedPointer>
4668
23
#include <QVariantMap>
23
#include <QVariantMap>
4669
24
24
4676
25
namespace scopes_ng
25
class PreviewWidgetModel;
4677
26
{
26
4678
27
27
class PreviewModel : public QAbstractListModel
4673
28
class PreviewData;
4674
29
4675
30
class Q_DECL_EXPORT PreviewModel : public QAbstractListModel
4679
31
{
28
{
4680
32
    Q_OBJECT
29
    Q_OBJECT
4681
33
30
4682
34
    Q_ENUMS(Roles)
31
    Q_ENUMS(Roles)
4683
35
32
4684
33
    Q_PROPERTY(int widgetColumnCount READ widgetColumnCount WRITE setWidgetColumnCount NOTIFY widgetColumnCountChanged)
4685
34
    Q_PROPERTY(bool loaded READ loaded NOTIFY loadedChanged)
4686
35
    Q_PROPERTY(bool processingAction READ processingAction NOTIFY processingActionChanged)
4687
36
4688
36
public:
37
public:
4689
37
    explicit PreviewModel(QObject* parent = 0);
38
    explicit PreviewModel(QObject* parent = 0);
4690
38
39
4691
39
    enum Roles {
40
    enum Roles {
4695
40
        RoleWidgetId,
41
        RoleColumnModel
4693
41
        RoleType,
4694
42
        RoleProperties
4696
43
    };
42
    };
4697
44
43
4698
45
    QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
44
    QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
4699
46
    QHash<int, QByteArray> roleNames() const override;
45
    QHash<int, QByteArray> roleNames() const override;
4700
47
    int rowCount(const QModelIndex& parent = QModelIndex()) const override;
46
    int rowCount(const QModelIndex& parent = QModelIndex()) const override;
4701
48
47
4702
48
    void setWidgetColumnCount(int count);
4703
49
    int widgetColumnCount() const;
4704
50
    bool loaded() const;
4705
51
    bool processingAction() const;
4706
52
    void setProcessingAction(bool processing);
4707
53
4708
49
Q_SIGNALS:
54
Q_SIGNALS:
4713
50
    void actionTriggered(QString widgetId, QString actionId, QVariantMap data);
55
    void widgetColumnCountChanged();
4714
51
56
    void loadedChanged();
4715
52
public Q_SLOTS:
57
    void processingActionChanged();
4716
53
    void triggered(QString widgetId, QString actionId, QVariantMap data);
58
    void triggered(QString const&, QString const&, QVariantMap const&);
4717
54
59
4718
55
private:
60
private:
4719
56
    QHash<int, QByteArray> m_roles;
61
    QHash<int, QByteArray> m_roles;
4724
57
    QList<QSharedPointer<PreviewData>> m_previewWidgets;
62
    QList<PreviewWidgetModel*> m_previewWidgetModels;
4721
58
4722
59
    void populateWidgets();
4723
60
4725
61
};
63
};
4726
62
64
4733
63
} // namespace scopes_ng
65
Q_DECLARE_METATYPE(PreviewModel*)
4734
64
66
4735
65
67
#endif // FAKE_PREVIEWMODEL_H
4730
66
Q_DECLARE_METATYPE(scopes_ng::PreviewModel*)
4731
67
4732
68
#endif // NG_FAKE_PREVIW_H
4736
69
68
4737
=== added file 'tests/mocks/Unity/fake_previewstack.cpp'
4738
--- tests/mocks/Unity/fake_previewstack.cpp	1970-01-01 00:00:00 +0000
4739
+++ tests/mocks/Unity/fake_previewstack.cpp	2014-03-18 10:57:24 +0000
4740
@@ -0,0 +1,76 @@
4741
1
/*
4742
2
 * Copyright (C) 2014 Canonical, Ltd.
4743
3
 *
4744
4
 * This program is free software; you can redistribute it and/or modify
4745
5
 * it under the terms of the GNU General Public License as published by
4746
6
 * the Free Software Foundation; version 3.
4747
7
 *
4748
8
 * This program is distributed in the hope that it will be useful,
4749
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
4750
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
4751
11
 * GNU General Public License for more details.
4752
12
 *
4753
13
 * You should have received a copy of the GNU General Public License
4754
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
4755
15
 */
4756
16
4757
17
// self
4758
18
#include "fake_previewstack.h"
4759
19
4760
20
// local
4761
21
#include "fake_previewmodel.h"
4762
22
#include "fake_scope.h"
4763
23
4764
24
PreviewStack::PreviewStack(QObject* parent) : QAbstractListModel(parent)
4765
25
{
4766
26
    m_previews << new PreviewModel(this);
4767
27
}
4768
28
4769
29
PreviewStack::~PreviewStack()
4770
30
{
4771
31
}
4772
32
4773
33
QHash<int, QByteArray> PreviewStack::roleNames() const
4774
34
{
4775
35
    QHash<int, QByteArray> roles;
4776
36
4777
37
    roles[Roles::RolePreviewModel] = "previewModel";
4778
38
4779
39
    return roles;
4780
40
}
4781
41
4782
42
void PreviewStack::setWidgetColumnCount(int columnCount)
4783
43
{
4784
44
    if (columnCount != 1) {
4785
45
        qFatal("PreviewStack::setWidgetColumnCount != 1 not implemented");
4786
46
    }
4787
47
}
4788
48
4789
49
int PreviewStack::widgetColumnCount() const
4790
50
{
4791
51
    return 1;
4792
52
}
4793
53
4794
54
int PreviewStack::rowCount(const QModelIndex&) const
4795
55
{
4796
56
    return m_previews.size();
4797
57
}
4798
58
4799
59
PreviewModel* PreviewStack::get(int index) const
4800
60
{
4801
61
    if (index >= m_previews.size()) {
4802
62
        return nullptr;
4803
63
    }
4804
64
4805
65
    return m_previews.at(index);
4806
66
}
4807
67
4808
68
QVariant PreviewStack::data(const QModelIndex& index, int role) const
4809
69
{
4810
70
    switch (role) {
4811
71
        case RolePreviewModel:
4812
72
            return QVariant::fromValue(m_previews.at(index.row()));
4813
73
        default:
4814
74
            return QVariant();
4815
75
    }
4816
76
}
4817
0
77
4818
=== added file 'tests/mocks/Unity/fake_previewstack.h'
4819
--- tests/mocks/Unity/fake_previewstack.h	1970-01-01 00:00:00 +0000
4820
+++ tests/mocks/Unity/fake_previewstack.h	2014-03-18 10:57:24 +0000
4821
@@ -0,0 +1,61 @@
4822
1
/*
4823
2
 * Copyright (C) 2014 Canonical, Ltd.
4824
3
 *
4825
4
 * This program is free software; you can redistribute it and/or modify
4826
5
 * it under the terms of the GNU General Public License as published by
4827
6
 * the Free Software Foundation; version 3.
4828
7
 *
4829
8
 * This program is distributed in the hope that it will be useful,
4830
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
4831
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
4832
11
 * GNU General Public License for more details.
4833
12
 *
4834
13
 * You should have received a copy of the GNU General Public License
4835
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
4836
15
 */
4837
16
4838
17
4839
18
#ifndef FAKE_PREVIEWSTACK_H
4840
19
#define FAKE_PREVIEWSTACK_H
4841
20
4842
21
#include <QAbstractListModel>
4843
22
#include <QSharedPointer>
4844
23
#include <QVariantMap>
4845
24
4846
25
class PreviewModel;
4847
26
4848
27
class PreviewStack : public QAbstractListModel
4849
28
{
4850
29
    Q_OBJECT
4851
30
4852
31
    Q_ENUMS(Roles)
4853
32
4854
33
    Q_PROPERTY(int widgetColumnCount READ widgetColumnCount WRITE setWidgetColumnCount NOTIFY widgetColumnCountChanged)
4855
34
4856
35
public:
4857
36
    explicit PreviewStack(QObject* parent = 0);
4858
37
    virtual ~PreviewStack();
4859
38
4860
39
    enum Roles {
4861
40
        RolePreviewModel
4862
41
    };
4863
42
4864
43
    QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
4865
44
    QHash<int, QByteArray> roleNames() const override;
4866
45
    int rowCount(const QModelIndex& parent = QModelIndex()) const override;
4867
46
4868
47
    Q_INVOKABLE PreviewModel* get(int index) const;
4869
48
4870
49
    void setWidgetColumnCount(int columnCount);
4871
50
    int widgetColumnCount() const;
4872
51
4873
52
Q_SIGNALS:
4874
53
    void widgetColumnCountChanged();
4875
54
4876
55
private:
4877
56
    QList<PreviewModel*> m_previews;
4878
57
};
4879
58
4880
59
Q_DECLARE_METATYPE(PreviewStack*)
4881
60
4882
61
#endif // FAKE_PREVIEWSTACK_H
4883
0
62
4884
=== added file 'tests/mocks/Unity/fake_previewwidgetmodel.cpp'
4885
--- tests/mocks/Unity/fake_previewwidgetmodel.cpp	1970-01-01 00:00:00 +0000
4886
+++ tests/mocks/Unity/fake_previewwidgetmodel.cpp	2014-03-18 10:57:24 +0000
4887
@@ -0,0 +1,86 @@
4888
1
/*
4889
2
 * Copyright (C) 2014 Canonical, Ltd.
4890
3
 *
4891
4
 * Authors:
4892
5
 *  Michał Sawicz <michal.sawicz@canonical.com>
4893
6
 *  Michal Hruby <michal.hruby@canonical.com>
4894
7
 *
4895
8
 * This program is free software; you can redistribute it and/or modify
4896
9
 * it under the terms of the GNU General Public License as published by
4897
10
 * the Free Software Foundation; version 3.
4898
11
 *
4899
12
 * This program is distributed in the hope that it will be useful,
4900
13
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
4901
14
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
4902
15
 * GNU General Public License for more details.
4903
16
 *
4904
17
 * You should have received a copy of the GNU General Public License
4905
18
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
4906
19
 */
4907
20
4908
21
// self
4909
22
#include "fake_previewwidgetmodel.h"
4910
23
4911
24
// Qt
4912
25
#include <QVariantMap>
4913
26
4914
27
struct PreviewData
4915
28
{
4916
29
    QString id;
4917
30
    QString type;
4918
31
    QVariantMap data;
4919
32
4920
33
    PreviewData(QString const& id_, QString const& type_, QVariantMap const& data_): id(id_), type(type_), data(data_)
4921
34
    {
4922
35
    }
4923
36
};
4924
37
4925
38
PreviewWidgetModel::PreviewWidgetModel(QObject* parent) : QAbstractListModel(parent)
4926
39
{
4927
40
    m_roles[Roles::RoleWidgetId] = "widgetId";
4928
41
    m_roles[Roles::RoleType] = "type";
4929
42
    m_roles[Roles::RoleProperties] = "properties";
4930
43
4931
44
    populateWidgets();
4932
45
}
4933
46
4934
47
void PreviewWidgetModel::populateWidgets()
4935
48
{
4936
49
    beginResetModel();
4937
50
    m_previewWidgets.clear();
4938
51
    for (int i = 0; i <= 20; i++) {
4939
52
        // FIXME: the API will expose nicer getters soon, use those!
4940
53
        QVariantMap attributes;
4941
54
        attributes["text"] = QVariant::fromValue(QString("Widget %1").arg(i));
4942
55
        attributes["title"] = QVariant::fromValue(QString("Title %1").arg(i));
4943
56
        PreviewData* preview_data = new PreviewData(QString("widget-%1").arg(i), QString("text"), attributes);
4944
57
        m_previewWidgets.append(QSharedPointer<PreviewData>(preview_data));
4945
58
    }
4946
59
    endResetModel();
4947
60
4948
61
}
4949
62
4950
63
QHash<int, QByteArray> PreviewWidgetModel::roleNames() const
4951
64
{
4952
65
    return m_roles;
4953
66
}
4954
67
4955
68
int PreviewWidgetModel::rowCount(const QModelIndex&) const
4956
69
{
4957
70
    return m_previewWidgets.size();
4958
71
}
4959
72
4960
73
QVariant PreviewWidgetModel::data(const QModelIndex& index, int role) const
4961
74
{
4962
75
    auto widget_data = m_previewWidgets.at(index.row());
4963
76
    switch (role) {
4964
77
        case RoleWidgetId:
4965
78
            return widget_data->id;
4966
79
        case RoleType:
4967
80
            return widget_data->type;
4968
81
        case RoleProperties:
4969
82
            return widget_data->data;
4970
83
        default:
4971
84
            return QVariant();
4972
85
    }
4973
86
}
4974
0
87
4975
=== added file 'tests/mocks/Unity/fake_previewwidgetmodel.h'
4976
--- tests/mocks/Unity/fake_previewwidgetmodel.h	1970-01-01 00:00:00 +0000
4977
+++ tests/mocks/Unity/fake_previewwidgetmodel.h	2014-03-18 10:57:24 +0000
4978
@@ -0,0 +1,56 @@
4979
1
/*
4980
2
 * Copyright (C) 2014 Canonical, Ltd.
4981
3
 *
4982
4
 * This program is free software; you can redistribute it and/or modify
4983
5
 * it under the terms of the GNU General Public License as published by
4984
6
 * the Free Software Foundation; version 3.
4985
7
 *
4986
8
 * This program is distributed in the hope that it will be useful,
4987
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
4988
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
4989
11
 * GNU General Public License for more details.
4990
12
 *
4991
13
 * You should have received a copy of the GNU General Public License
4992
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
4993
15
 */
4994
16
4995
17
4996
18
#ifndef FAKE_PREVIEWWIDGETMODEL_H
4997
19
#define FAKE_PREVIEWWIDGETMODEL_H
4998
20
4999
21
#include <QAbstractListModel>
5000
22
#include <QSharedPointer>
Status:	Merged
Merge reported by:	Michał Sawicz
Merged at revision:	not available
Proposed branch:	lp:~unity-team/unity8/new-scopes-cleanup
Merge into:	lp:unity8
Prerequisite:	lp:~unity-team/unity8/new-scopes-clean-to-trunk
Diff against target:	7715 lines (+1067/-5236) 91 files modified data/unity8.conf (+4/-0) plugins/DashViews/listviewwithpageheader.cpp (+7/-7) qml/Components/OpenEffect.qml (+0/-138) qml/Components/PageHeader.qml (+1/-0) qml/Components/RatingStars.qml (+0/-41) qml/Components/Tile.qml (+0/-39) qml/Components/TileStyle.qml (+0/-81) qml/Dash/Apps/AppPreview.qml (+0/-167) qml/Dash/Apps/DashPluginFilterGrid.qml (+0/-47) qml/Dash/Apps/FrequentlyUsedAppsModel.qml (+0/-110) qml/Dash/Card.qml (+1/-0) qml/Dash/CardCarousel.qml (+1/-2) qml/Dash/CardFilterGrid.qml (+52/-25) qml/Dash/CardTool.qml (+1/-1) qml/Dash/DashCarousel.qml (+0/-47) qml/Dash/DashContent.qml (+26/-23) qml/Dash/DashFilterGrid.qml (+0/-65) qml/Dash/DashHome.qml (+0/-39) qml/Dash/DashPreview.qml (+0/-208) qml/Dash/DashPreviewPlaceholder.qml (+0/-25) qml/Dash/DashRenderer.qml (+1/-4) qml/Dash/Generic/FlatTileStyle.qml (+0/-79) qml/Dash/Generic/GenericCarousel.qml (+0/-53) qml/Dash/Generic/GenericFilterGrid.qml (+0/-46) qml/Dash/Generic/GenericFilterGridPotrait.qml (+0/-28) qml/Dash/Generic/GenericPreview.qml (+0/-197) qml/Dash/Generic/WeatherFilterGrid.qml (+0/-47) qml/Dash/GenericScopeView.qml (+3/-8) qml/Dash/Movie/MoviePreview.qml (+0/-71) qml/Dash/Music/CarouselDelegateMusic.qml (+0/-42) qml/Dash/Music/MusicCarousel.qml (+0/-34) qml/Dash/Music/MusicFilterGrid.qml (+0/-48) qml/Dash/Music/MusicPreview.qml (+0/-203) qml/Dash/Music/MusicTileStyle.qml (+0/-102) qml/Dash/PreviewDelegateMapper.qml (+0/-38) qml/Dash/PreviewListView.qml (+4/-2) qml/Dash/Previews/Header.qml (+0/-109) qml/Dash/Previews/Reviews.qml (+0/-194) qml/Dash/ScopeDelegateMapper.qml (+1/-3) qml/Dash/SearchableResultModel.qml (+0/-44) qml/Dash/Video/CarouselDelegateVideo.qml (+0/-42) qml/Dash/Video/VideoCarousel.qml (+0/-34) qml/Dash/Video/VideoFilterGrid.qml (+0/-47) qml/Dash/Video/VideoTileStyle.qml (+0/-87) tests/autopilot/unity8/shell/emulators/dash.py (+23/-52) tests/autopilot/unity8/shell/emulators/main_window.py (+0/-4) tests/autopilot/unity8/shell/tests/__init__.py (+1/-1) tests/autopilot/unity8/shell/tests/test_emulators.py (+26/-52) tests/autopilot/unity8/shell/tests/test_greeter.py (+0/-38) tests/mocks/Unity/CMakeLists.txt (+4/-4) tests/mocks/Unity/categoryresults.cpp (+0/-121) tests/mocks/Unity/categoryresults.h (+0/-68) tests/mocks/Unity/fake_applications_scope.cpp (+0/-76) tests/mocks/Unity/fake_applications_scope.h (+0/-33) tests/mocks/Unity/fake_categories.cpp (+127/-212) tests/mocks/Unity/fake_categories.h (+28/-32) tests/mocks/Unity/fake_preview.cpp (+0/-73) tests/mocks/Unity/fake_preview.h (+0/-65) tests/mocks/Unity/fake_previewmodel.cpp (+43/-53) tests/mocks/Unity/fake_previewmodel.h (+24/-25) tests/mocks/Unity/fake_previewstack.cpp (+76/-0) tests/mocks/Unity/fake_previewstack.h (+61/-0) tests/mocks/Unity/fake_previewwidgetmodel.cpp (+86/-0) tests/mocks/Unity/fake_previewwidgetmodel.h (+56/-0) tests/mocks/Unity/fake_resultsmodel.cpp (+117/-0) tests/mocks/Unity/fake_resultsmodel.h (+80/-0) tests/mocks/Unity/fake_scope.cpp (+20/-120) tests/mocks/Unity/fake_scope.h (+17/-18) tests/mocks/Unity/fake_scopes.cpp (+1/-5) tests/mocks/Unity/fake_unity_plugin.cpp (+8/-18) tests/qmltests/CMakeLists.txt (+0/-10) tests/qmltests/Components/tst_OpenEffect.qml (+0/-71) tests/qmltests/Components/tst_PageHeaderLabel.qml (+1/-1) tests/qmltests/Components/tst_RatingStars.qml (+0/-62) tests/qmltests/Components/tst_Tile.qml (+0/-71) tests/qmltests/Dash/Apps/tst_AppPreview.qml (+0/-276) tests/qmltests/Dash/Movie/tst_MoviePreview.qml (+0/-86) tests/qmltests/Dash/Music/tst_MusicPreview.qml (+0/-174) tests/qmltests/Dash/Previews/tst_Preview.qml (+3/-17) tests/qmltests/Dash/qml/FakeScopeView.qml (+1/-1) tests/qmltests/Dash/qml/fake_scopeView1.qml (+1/-1) tests/qmltests/Dash/qml/fake_scopeView2.qml (+1/-1) tests/qmltests/Dash/qml/fake_scopeView3.qml (+1/-1) tests/qmltests/Dash/tst_CardTool.qml (+1/-1) tests/qmltests/Dash/tst_Dash.qml (+12/-6) tests/qmltests/Dash/tst_DashContent.qml (+116/-34) tests/qmltests/Dash/tst_DashPreview.qml (+0/-202) tests/qmltests/Dash/tst_FilterGrids.qml (+0/-143) tests/qmltests/Dash/tst_GenericPreview.qml (+0/-125) tests/qmltests/Dash/tst_GenericScopeView.qml (+24/-231) tests/qmltests/tst_Shell.qml (+6/-25)
To merge this branch:	bzr merge lp:~unity-team/unity8/new-scopes-cleanup
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration	2014-03-06	Needs Fixing on 2014-03-18
Unity Team		2014-03-06	Pending
Review via email: mp+209642@code.launchpad.net