1
=== added file 'Dash/Apps/AppInfo.qml'
2
--- Dash/Apps/AppInfo.qml	1970-01-01 00:00:00 +0000
3
+++ Dash/Apps/AppInfo.qml	2013-08-13 09:51:04 +0000
4
@@ -0,0 +1,88 @@
5
1
/*
6
2
 * Copyright (C) 2013 Canonical, Ltd.
7
3
 *
8
4
 * This program is free software; you can redistribute it and/or modify
9
5
 * it under the terms of the GNU General Public License as published by
10
6
 * the Free Software Foundation; version 3.
11
7
 *
12
8
 * This program is distributed in the hope that it will be useful,
13
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
15
11
 * GNU General Public License for more details.
16
12
 *
17
13
 * You should have received a copy of the GNU General Public License
18
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
19
15
 */
20
16
21
17
import QtQuick 2.0
22
18
import Ubuntu.Components 0.1
23
19
import "../../Components"
24
20
25
21
Row {
26
22
    id: root
27
23
    property alias icon: image.source
28
24
    property alias appName: appNameLabel.text
29
25
    property alias rating: ratingStars.rating
30
26
    property int rated: 0
31
27
    property int reviews: 0
32
28
33
29
    spacing: units.gu(2)
34
30
35
31
    UbuntuShape {
36
32
        id: imageShape
37
33
        width: units.gu(6)
38
34
        height: units.gu(6)
39
35
        image: Image {
40
36
            id: image
41
37
            sourceSize { width: imageShape.width; height: imageShape.height }
42
38
            asynchronous: true
43
39
            fillMode: Image.PreserveAspectFit
44
40
        }
45
41
    }
46
42
47
43
    Column {
48
44
        spacing: units.gu(1)
49
45
50
46
        Label {
51
47
            id: appNameLabel
52
48
            fontSize: "large"
53
49
            color: "white"
54
50
            style: Text.Raised
55
51
            styleColor: "black"
56
52
            opacity: .9
57
53
        }
58
54
59
55
        Row {
60
56
            spacing: units.gu(1)
61
57
62
58
            RatingStars {
63
59
                id: ratingStars
64
60
                maximumRating: 10
65
61
            }
66
62
67
63
            Label {
68
64
                id: ratedLabel
69
65
                objectName: "ratedLabel"
70
66
                fontSize: "medium"
71
67
                color: "white"
72
68
                style: Text.Raised
73
69
                styleColor: "black"
74
70
                opacity: .6
75
71
                //TRANSLATORS: Number of persons who rated this app
76
72
                text: i18n.tr("(%1)").arg(root.rated)
77
73
            }
78
74
79
75
            Label {
80
76
                id: reviewsLabel
81
77
                objectName: "reviewsLabel"
82
78
                fontSize: "medium"
83
79
                color: "white"
84
80
                style: Text.Raised
85
81
                styleColor: "black"
86
82
                opacity: .6
87
83
                //TRANSLATORS: Number of persons who wrote reviews for this app
88
84
                text: i18n.tr("%1 review", "%1 reviews", root.reviews).arg(root.reviews)
89
85
            }
90
86
        }
91
87
    }
92
88
}
93
0
89
94
=== added file 'Dash/Apps/AppPreview.qml'
95
--- Dash/Apps/AppPreview.qml	1970-01-01 00:00:00 +0000
96
+++ Dash/Apps/AppPreview.qml	2013-08-13 09:51:04 +0000
97
@@ -0,0 +1,195 @@
98
1
/*
99
2
 * Copyright (C) 2013 Canonical, Ltd.
100
3
 *
101
4
 * This program is free software; you can redistribute it and/or modify
102
5
 * it under the terms of the GNU General Public License as published by
103
6
 * the Free Software Foundation; version 3.
104
7
 *
105
8
 * This program is distributed in the hope that it will be useful,
106
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
107
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
108
11
 * GNU General Public License for more details.
109
12
 *
110
13
 * You should have received a copy of the GNU General Public License
111
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
112
15
 */
113
16
114
17
import QtQuick 2.0
115
18
import Ubuntu.Components 0.1
116
19
import Ubuntu.Components.ListItems 0.1 as ListItem
117
20
import Ubuntu.DownloadDaemonListener 0.1
118
21
import ".."
119
22
import "../../Components"
120
23
import "../../Components/IconUtil.js" as IconUtil
121
24
122
25
DashPreview {
123
26
    id: root
124
27
125
28
    signal sendUserReview(string review)
126
29
127
30
    title: root.previewData.title
128
31
129
32
    header: ListView {
130
33
        spacing: units.gu(1)
131
34
        orientation: ListView.Horizontal
132
35
        height: units.gu(22)
133
36
        anchors {
134
37
            left: parent.left
135
38
            right: parent.right
136
39
            margins: units.gu(1)
137
40
        }
138
41
        model: previewData.infoMap["more-screenshots"].value
139
42
140
43
        delegate: UbuntuShape {
141
44
            id: shape
142
45
            anchors {
143
46
                top: parent.top
144
47
                bottom: parent.bottom
145
48
            }
146
49
            width: units.gu(12)
147
50
            radius: "medium"
148
51
            borderSource: ""
149
52
            image: Image {
150
53
                asynchronous: true
151
54
                sourceSize { width: shape.width; height: shape.height }
152
55
                source: modelData ? modelData : ""
153
56
                fillMode: Image.PreserveAspectCrop
154
57
            }
155
58
        }
156
59
    }
157
60
158
61
    Component {
159
62
        id: buttonsComponent
160
63
161
64
        GridView {
162
65
            id: buttonsGrid
163
66
            objectName: "gridButtons"
164
67
165
68
            property int numOfRows: (count + 1) / 2
166
69
            property int spacing: units.gu(1)
167
70
            height: Math.max(units.gu(5), units.gu(5)*numOfRows + spacing*(numOfRows - 1))
168
71
169
72
            interactive: false
170
73
            cellWidth: Math.max(units.gu(9), width / 2)
171
74
            cellHeight: buttonHeight + spacing
172
75
            property int buttonWidth: count > 1 ? Math.max(0, width / 2 - spacing) : width
173
76
            property int buttonHeight: units.gu(5)
174
77
175
78
            delegate: Button {
176
79
                width: Math.max(units.gu(4), buttonsGrid.buttonWidth)
177
80
                height: buttonsGrid.buttonHeight
178
81
                color: Theme.palette.selected.foreground
179
82
                text: modelData.displayName
180
83
                iconSource: modelData.iconHint
181
84
                iconPosition: "right"
182
85
                onClicked: root.previewData.execute(modelData.id, { })
183
86
            }
184
87
        }
185
88
    }
186
89
187
90
    Component {
188
91
        id: progressComponent
189
92
190
93
        ProgressBar {
191
94
            id: progressBar
192
95
            objectName: "progressBar"
193
96
            value: 0
194
97
            maximumValue: 100
195
98
            height: units.gu(5)
196
99
197
100
            property var model
198
101
199
102
            DownloadTracker {
200
103
                service: "com.canonical.applications.Downloader"
201
104
                dbusPath: root.previewData.infoMap["progressbar_source"] ? root.previewData.infoMap["progressbar_source"].value : ""
202
105
203
106
                onProgress: {
204
107
                    var percentage = parseInt(received * 100 / total);
205
108
                    progressBar.value = percentage;
206
109
                }
207
110
208
111
                onFinished: {
209
112
                    root.previewData.execute(progressBar.model[0].id, { })
210
113
                }
211
114
            }
212
115
213
116
        }
214
117
    }
215
118
216
119
    buttons: Loader {
217
120
        anchors {
218
121
            left: parent.left
219
122
            right: parent.right
220
123
        }
221
124
222
125
        sourceComponent: root.previewData.infoMap["show_progressbar"] ? progressComponent : buttonsComponent
223
126
224
127
        onLoaded: {
225
128
            item.model = root.previewData.actions;
226
129
        }
227
130
    }
228
131
229
132
    body: Column {
230
133
        spacing: units.gu(1)
231
134
232
135
        AppInfo {
233
136
            objectName: "appInfo"
234
137
            anchors { left: parent.left; right: parent.right }
235
138
236
139
            appName: root.previewData.title
237
140
            icon: IconUtil.from_gicon(root.previewData.appIcon)
238
141
            rating: root.previewData.infoMap["rating"] ? root.previewData.infoMap["rating"].value : 0
239
142
            rated: root.previewData.infoMap["rated"] ? root.previewData.infoMap["rated"].value : 0
240
143
            reviews: root.previewData.infoMap["reviews"] ? root.previewData.infoMap["reviews"].value : 0
241
144
        }
242
145
243
146
        Label {
244
147
            anchors { left: parent.left; right: parent.right }
245
148
            text: root.previewData.description
246
149
            fontSize: "medium"
247
150
            color: Theme.palette.selected.backgroundText
248
151
            opacity: .6
249
152
            wrapMode: Text.WordWrap
250
153
            style: Text.Raised
251
154
            styleColor: "black"
252
155
        }
253
156
254
157
        ListItem.ThinDivider {}
255
158
256
159
        Item {
257
160
            anchors { left: parent.left; right: parent.right }
258
161
            height: rateLabel.height
259
162
260
163
            Label {
261
164
                id: rateLabel
262
165
                fontSize: "medium"
263
166
                color: "white"
264
167
                style: Text.Raised
265
168
                styleColor: "black"
266
169
                opacity: .9
267
170
                text: i18n.tr("Rate this")
268
171
269
172
                anchors.left: parent.left
270
173
                anchors.verticalCenter: parent.verticalCenter
271
174
            }
272
175
273
176
            // FIXME these need to be made interactive and connected to the scope
274
177
            RatingStars {
275
178
                anchors.right: parent.right
276
179
                anchors.verticalCenter: parent.verticalCenter
277
180
            }
278
181
        }
279
182
280
183
        ListItem.ThinDivider {}
281
184
282
185
        AppReviews {
283
186
            objectName: "appReviews"
284
187
            anchors { left: parent.left; right: parent.right }
285
188
286
189
            model: root.previewData.infoMap["comments"] ? root.previewData.infoMap["comments"].value : undefined
287
190
288
191
            onSendReview: root.sendUserReview(review);
289
192
        }
290
193
291
194
    }
292
195
}
293
0
196
294
=== added file 'Dash/Apps/AppReviews.qml'
295
--- Dash/Apps/AppReviews.qml	1970-01-01 00:00:00 +0000
296
+++ Dash/Apps/AppReviews.qml	2013-08-13 09:51:04 +0000
297
@@ -0,0 +1,191 @@
298
1
/*
299
2
 * Copyright (C) 2013 Canonical, Ltd.
300
3
 *
301
4
 * This program is free software; you can redistribute it and/or modify
302
5
 * it under the terms of the GNU General Public License as published by
303
6
 * the Free Software Foundation; version 3.
304
7
 *
305
8
 * This program is distributed in the hope that it will be useful,
306
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
307
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
308
11
 * GNU General Public License for more details.
309
12
 *
310
13
 * You should have received a copy of the GNU General Public License
311
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
312
15
 */
313
16
314
17
import QtQuick 2.0
315
18
import Ubuntu.Components 0.1
316
19
import Ubuntu.Components.ListItems 0.1 as ListItem
317
20
import "../../Components"
318
21
319
22
Column {
320
23
    id: root
321
24
322
25
    property var model
323
26
324
27
    signal sendReview(string review)
325
28
326
29
    spacing: units.gu(2)
327
30
    state: ""
328
31
329
32
    states: [
330
33
        State {
331
34
            name: ""
332
35
            PropertyChanges { target: reviewField; width: root.width }
333
36
            PropertyChanges { target: sendButton; opacity: 0 }
334
37
            PropertyChanges { target: inverseArea; enabled: false }
335
38
        },
336
39
        State {
337
40
            name: "editing"
338
41
            PropertyChanges { target: reviewField; width: (root.width - row.spacing - sendButton.width) }
339
42
            PropertyChanges { target: sendButton; opacity: 1 }
340
43
            PropertyChanges { target: inverseArea; enabled: true }
341
44
        }
342
45
     ]
343
46
344
47
    transitions: [
345
48
        Transition {
346
49
            from: ""
347
50
            to: "editing"
348
51
            SequentialAnimation {
349
52
                UbuntuNumberAnimation { target: reviewField; properties: "width"; duration: UbuntuAnimation.SlowDuration }
350
53
                UbuntuNumberAnimation { target: sendButton; properties: "opacity"; duration: UbuntuAnimation.SlowDuration }
351
54
            }
352
55
        },
353
56
        Transition {
354
57
            from: "editing"
355
58
            to: ""
356
59
            SequentialAnimation {
357
60
                UbuntuNumberAnimation { target: sendButton; properties: "opacity"; duration: UbuntuAnimation.SlowDuration }
358
61
                UbuntuNumberAnimation { target: reviewField; properties: "width"; duration: UbuntuAnimation.SlowDuration }
359
62
            }
360
63
        }
361
64
    ]
362
65
363
66
    Label {
364
67
        fontSize: "medium"
365
68
        color: "white"
366
69
        style: Text.Raised
367
70
        styleColor: "black"
368
71
        opacity: .9
369
72
        text: i18n.tr("Add a review")
370
73
    }
371
74
372
75
    Row {
373
76
        id: row
374
77
        spacing: units.gu(1)
375
78
        width: root.width
376
79
377
80
        // FIXME: needs to react to Qt.inputMethod geometry
378
81
        TextArea {
379
82
            id: reviewField
380
83
            objectName: "reviewField"
381
84
            placeholderText: i18n.tr("Review")
382
85
            width: parent.width
383
86
            verticalAlignment: Text.AlignVCenter
384
87
            autoSize: true
385
88
            maximumLineCount: 5
386
89
387
90
            Behavior on height { UbuntuNumberAnimation { duration: UbuntuAnimation.SnapDuration } }
388
91
389
92
            onFocusChanged: {
390
93
                if(reviewField.focus){
391
94
                    root.state = "editing";
392
95
                    reviewField.selectAll();
393
96
                }
394
97
            }
395
98
396
99
            // FIXME: not active when in wide mode
397
100
            InverseMouseArea {
398
101
                id: inverseArea
399
102
                anchors.fill: parent
400
103
                enabled: false
401
104
                onPressed: {
402
105
                    reviewField.focus = false;
403
106
                    root.state = "";
404
107
                }
405
108
            }
406
109
        }
407
110
408
111
        Button {
409
112
            id: sendButton
410
113
            objectName: "sendButton"
411
114
            width: units.gu(10)
412
115
            height: units.gu(4)
413
116
            anchors.bottom: reviewField.bottom
414
117
            color: Theme.palette.selected.foreground
415
118
            text: i18n.tr("Send")
416
119
            opacity: 0
417
120
418
121
            onClicked: {
419
122
                root.sendReview(reviewField.text);
420
123
                reviewField.text = ""
421
124
            }
422
125
        }
423
126
    }
424
127
425
128
    ListItem.ThinDivider {}
426
129
427
130
    Label {
428
131
        fontSize: "medium"
429
132
        color: "white"
430
133
        style: Text.Raised
431
134
        styleColor: "black"
432
135
        opacity: .9
433
136
        text: i18n.tr("Comments:")
434
137
    }
435
138
436
139
    Repeater {
437
140
        objectName: "commentsArea"
438
141
        model: root.model
439
142
440
143
        Column {
441
144
            anchors { left: parent.left; right: parent.right }
442
145
443
146
            Column {
444
147
                anchors { left: parent.left; right: parent.right }
445
148
446
149
                Label {
447
150
                    anchors { left: parent.left; right: parent.right }
448
151
                    text: modelData[0]
449
152
                    fontSize: "medium"
450
153
                    color: "white"
451
154
                    opacity: .8
452
155
                    wrapMode: Text.WordWrap
453
156
                    style: Text.Raised
454
157
                    styleColor: "black"
455
158
                }
456
159
457
160
                Row {
458
161
                    spacing: units.gu(1)
459
162
460
163
                    RatingStars {
461
164
                        maximumRating: 10
462
165
                        rating: modelData[1]
463
166
                    }
464
167
465
168
                    Label {
466
169
                        text: modelData[2]
467
170
                        fontSize: "medium"
468
171
                        color: Theme.palette.selected.backgroundText
469
172
                        opacity: .6
470
173
                        style: Text.Raised
471
174
                        styleColor: "black"
472
175
                    }
473
176
                }
474
177
            }
475
178
476
179
            Label {
477
180
                anchors { left: parent.left; right: parent.right }
478
181
                text: modelData[3]
479
182
                fontSize: "medium"
480
183
                color: Theme.palette.selected.backgroundText
481
184
                opacity: .6
482
185
                wrapMode: Text.WordWrap
483
186
                style: Text.Raised
484
187
                styleColor: "black"
485
188
            }
486
189
        }
487
190
    }
488
191
}
489
0
192
490
=== modified file 'Dash/DashApps.qml'
491
--- Dash/DashApps.qml	2013-08-02 16:16:31 +0000
492
+++ Dash/DashApps.qml	2013-08-13 09:51:04 +0000
493
@@ -170,4 +170,95 @@
494
170
            searchHistory: scopeView.searchHistory
170
            searchHistory: scopeView.searchHistory
495
171
        }
171
        }
496
172
    }
172
    }
497
173
498
174
    OpenEffect {
499
175
        id: effect
500
176
        anchors {
501
177
            fill: parent
502
178
            bottomMargin: -bottomOverflow
503
179
        }
504
180
        sourceItem: categoryView
505
181
506
182
        enabled: gap > 0.0
507
183
508
184
        topGapPx: (1 - gap) * positionPx
509
185
        topOpacity: (1 - gap * 1.2)
510
186
        bottomGapPx: positionPx + gap * (targetBottomGapPx - positionPx)
511
187
        bottomOverflow: units.gu(20)
512
188
        bottomOpacity: 1 - (gap * 0.8)
513
189
514
190
        property int targetBottomGapPx: height - units.gu(8) - bottomOverflow
515
191
        property real gap: previewLoader.open ? 1.0 : 0.0
516
192
517
193
        Behavior on gap {
518
194
            NumberAnimation {
519
195
                duration: 200
520
196
                easing.type: Easing.InOutQuad
521
197
                onRunningChanged: {
522
198
                    if (!previewLoader.open && !running) {
523
199
                        previewLoader.onScreen = false
524
200
                    }
525
201
                }
526
202
            }
527
203
        }
528
204
    }
529
205
530
206
    Connections {
531
207
        target: scopeView.scope
532
208
        onPreviewReady: {
533
209
            previewLoader.previewData = preview
534
210
            previewLoader.open = true
535
211
        }
536
212
    }
537
213
538
214
    Connections {
539
215
        ignoreUnknownSignals: true
540
216
        target: previewLoader.valid ? previewLoader.item : null
541
217
        onClose: {
542
218
            previewLoader.open = false
543
219
        }
544
220
    }
545
221
546
222
    PreviewDelegateMapper {
547
223
        id: previewDelegateMapper
548
224
    }
549
225
550
226
    Loader {
551
227
        id: previewLoader
552
228
        property var previewData
553
229
        height: effect.bottomGapPx - effect.topGapPx
554
230
        anchors {
555
231
            top: parent.top
556
232
            topMargin: effect.topGapPx
557
233
            left: parent.left
558
234
            right: parent.right
559
235
        }
560
236
        source: onScreen ? previewDelegateMapper.map("preview-application") : ""
561
237
562
238
        property bool open: false
563
239
        property bool onScreen: false
564
240
        property bool valid: item !== null
565
241
566
242
        onOpenChanged: {
567
243
            if (open) {
568
244
                onScreen = true
569
245
            }
570
246
        }
571
247
572
248
        onLoaded: {
573
249
            item.previewData = previewLoader.previewData
574
250
        }
575
251
    }
576
252
577
253
    // TODO: Move as InverseMouseArea to DashPreview
578
254
    MouseArea {
579
255
        enabled: previewLoader.onScreen
580
256
        anchors {
581
257
            fill: parent
582
258
            topMargin: effect.bottomGapPx
583
259
        }
584
260
        onClicked: {
585
261
            previewLoader.open = false;
586
262
        }
587
263
    }
588
173
}
264
}
589
174
265
590
=== added file 'Dash/DashPreview.qml'
591
--- Dash/DashPreview.qml	1970-01-01 00:00:00 +0000
592
+++ Dash/DashPreview.qml	2013-08-13 09:51:04 +0000
593
@@ -0,0 +1,188 @@
594
1
/*
595
2
 * Copyright (C) 2013 Canonical, Ltd.
596
3
 *
597
4
 * This program is free software; you can redistribute it and/or modify
598
5
 * it under the terms of the GNU General Public License as published by
599
6
 * the Free Software Foundation; version 3.
600
7
 *
601
8
 * This program is distributed in the hope that it will be useful,
602
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
603
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
604
11
 * GNU General Public License for more details.
605
12
 *
606
13
 * You should have received a copy of the GNU General Public License
607
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
608
15
 */
609
16
610
17
import QtQuick 2.0
611
18
import Ubuntu.Components 0.1
612
19
613
20
Rectangle {
614
21
    id: root
615
22
616
23
    property var previewData
617
24
618
25
    property string title: ""
619
26
    property real previewWidthRatio: 0.5
620
27
621
28
    property Component header
622
29
    property Component buttons
623
30
    property Component body
624
31
625
32
    readonly property bool narrowMode: width <= height
626
33
    readonly property int contentSpacing: units.gu(3)
627
34
628
35
    signal close()
629
36
    signal previewImageClicked()
630
37
631
38
    color: Qt.rgba(0, 0, 0, .3)
632
39
    clip: true
633
40
634
41
    Connections {
635
42
        target: shell.applicationManager
636
43
        onMainStageFocusedApplicationChanged: {
637
44
            root.close();
638
45
        }
639
46
        onSideStageFocusedApplicationChanged: {
640
47
            root.close();
641
48
        }
642
49
    }
643
50
644
51
    MouseArea {
645
52
        anchors.fill: parent
646
53
    }
647
54
648
55
    Item {
649
56
        id: headerRow
650
57
        height: units.gu(4)
651
58
        anchors {
652
59
            top: parent.top
653
60
            left: parent.left
654
61
            right: parent.right
655
62
            margins: root.contentSpacing
656
63
        }
657
64
658
65
        MouseArea {
659
66
            anchors {
660
67
                fill: parent
661
68
                leftMargin: -root.contentSpacing
662
69
                rightMargin: -root.contentSpacing
663
70
                topMargin: -root.contentSpacing
664
71
            }
665
72
666
73
            onClicked: root.close();
667
74
        }
668
75
669
76
        Item {
670
77
            id: labelItem
671
78
            anchors {
672
79
                fill: parent
673
80
                rightMargin: closePreviewImage.width + spacing
674
81
            }
675
82
676
83
            property int spacing: units.gu(2)
677
84
678
85
            Label {
679
86
                id: title
680
87
                objectName: "titleLabel"
681
88
                anchors {
682
89
                    left: parent.left
683
90
                    right: parent.right
684
91
                }
685
92
686
93
                elide: Text.ElideRight
687
94
                fontSize: "x-large"
688
95
                font.weight: Font.Light
689
96
                color: Theme.palette.selected.backgroundText
690
97
                opacity: 0.9
691
98
                text: root.title
692
99
                style: Text.Raised
693
100
                styleColor: "black"
694
101
            }
695
102
            Image {
696
103
                id: closePreviewImage
697
104
                source: "graphics/tablet/icon_close_preview.png"
698
105
                width: units.gu(4)
699
106
                height: units.gu(1.5)
700
107
                anchors {
701
108
                    bottom: title.bottom
702
109
                    bottomMargin: units.dp(7)
703
110
                    left: parent.left
704
111
                    leftMargin: title.paintedWidth + labelItem.spacing
705
112
                }
706
113
            }
707
114
        }
708
115
    }
709
116
710
117
    Row {
711
118
        id: contentRow
712
119
        anchors {
713
120
            left: parent.left
714
121
            right: parent.right
715
122
            top: headerRow.bottom
716
123
            bottom: parent.bottom
717
124
            margins: root.contentSpacing
718
125
        }
719
126
720
127
        spacing: units.gu(2)
721
128
722
129
        Flickable {
723
130
            id: leftFlickable
724
131
            anchors.top: parent.top
725
132
            anchors.bottom: parent.bottom
726
133
            width: root.narrowMode ? contentRow.width : contentRow.width * root.previewWidthRatio
727
134
            contentHeight: leftColumn.height
728
135
            clip: true
729
136
730
137
            Column {
731
138
                id: leftColumn
732
139
                objectName: "leftColumn"
733
140
                anchors {
734
141
                    left: parent.left
735
142
                    right: parent.right
736
143
                }
737
144
                height: childrenRect.height
738
145
                spacing: units.gu(1)
739
146
740
147
                Loader {
741
148
                    id: headerLoader
742
149
                    anchors.left: parent.left
743
150
                    anchors.right: parent.right
744
151
                    sourceComponent: root.header
745
152
                }
746
153
                Loader {
747
154
                    id: buttonLoader
748
155
                    anchors.left: parent.left
749
156
                    anchors.right: parent.right
750
157
                    sourceComponent: root.buttons
751
158
                }
752
159
            }
753
160
        }
754
161
755
162
        Flickable {
756
163
            id: rightFlickable
757
164
            anchors.top: parent.top
758
165
            anchors.bottom: parent.bottom
759
166
            width: narrowMode ? 0 : (contentRow.width - leftColumn.width - contentRow.spacing)
760
167
            contentHeight: rightColumn.height
761
168
            clip: true
762
169
763
170
            Column {
764
171
                id: rightColumn
765
172
                objectName: "rightColumn"
766
173
                height: childrenRect.height
767
174
                anchors {
768
175
                    left: parent.left
769
176
                    right: parent.right
770
177
                }
771
178
            }
772
179
        }
773
180
    }
774
181
775
182
    Loader {
776
183
        parent: root.narrowMode ? leftColumn : rightColumn
777
184
        anchors.left: parent.left
778
185
        anchors.right: parent.right
779
186
        sourceComponent: root.body
780
187
    }
781
188
}
782
0
189
783
=== removed file 'Dash/DashPreview.qml'
784
--- Dash/DashPreview.qml	2013-07-12 16:07:42 +0000
785
+++ Dash/DashPreview.qml	1970-01-01 00:00:00 +0000
786
@@ -1,218 +0,0 @@
787
1
/*
788
2
 * Copyright (C) 2013 Canonical, Ltd.
789
3
 *
790
4
 * This program is free software; you can redistribute it and/or modify
791
5
 * it under the terms of the GNU General Public License as published by
792
6
 * the Free Software Foundation; version 3.
793
7
 *
794
8
 * This program is distributed in the hope that it will be useful,
795
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
796
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
797
11
 * GNU General Public License for more details.
798
12
 *
799
13
 * You should have received a copy of the GNU General Public License
800
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
801
15
 */
802
16
803
17
import QtQuick 2.0
804
18
import Ubuntu.Components 0.1
805
19
806
20
Rectangle {
807
21
    id: root
808
22
    property string title: ""
809
23
    property url url: ""
810
24
    property real previewWidthRatio: 0.5
811
25
    property bool playable: false
812
26
    property bool forceSquare: false
813
27
    property Component buttons
814
28
    property Component caption
815
29
    property Component description
816
30
817
31
    readonly property bool narrowMode: width <= height
818
32
    readonly property int contentSpacing: units.gu(3)
819
33
820
34
    signal close()
821
35
    signal previewImageClicked()
822
36
823
37
    color: Qt.rgba(0, 0, 0, .3)
824
38
    clip: true
825
39
826
40
    Connections {
827
41
        target: shell.applicationManager
828
42
        onMainStageFocusedApplicationChanged: {
829
43
            root.close();
830
44
        }
831
45
        onSideStageFocusedApplicationChanged: {
832
46
            root.close();
833
47
        }
834
48
    }
835
49
836
50
    MouseArea {
837
51
        anchors.fill: parent
838
52
    }
839
53
840
54
    Item {
841
55
        id: headerRow
842
56
        height: units.gu(4)
843
57
        anchors {
844
58
            top: parent.top
845
59
            left: parent.left
846
60
            right: parent.right
847
61
            margins: root.contentSpacing
848
62
        }
849
63
850
64
        MouseArea {
851
65
            anchors {
852
66
                fill: parent
853
67
                leftMargin: -root.contentSpacing
854
68
                rightMargin: -root.contentSpacing
855
69
                topMargin: -root.contentSpacing
856
70
            }
857
71
858
72
            onClicked: root.close();
859
73
        }
860
74
861
75
        Item {
862
76
            id: labelItem
863
77
            anchors {
864
78
                fill: parent
865
79
                rightMargin: closePreviewImage.width + spacing
866
80
            }
867
81
868
82
            property int spacing: units.gu(2)
869
83
870
84
            Label {
871
85
                id: title
872
86
                objectName: "titleLabel"
873
87
                anchors {
874
88
                    left: parent.left
875
89
                    right: parent.right
876
90
                }
877
91
878
92
                elide: Text.ElideRight
879
93
                fontSize: "x-large"
880
94
                font.weight: Font.Light
881
95
                color: Theme.palette.selected.backgroundText
882
96
                opacity: 0.9
883
97
                text: root.title
884
98
                style: Text.Raised
885
99
                styleColor: "black"
886
100
            }
887
101
            Image {
888
102
                id: closePreviewImage
889
103
                source: "graphics/tablet/icon_close_preview.png"
890
104
                width: units.gu(4)
891
105
                height: units.gu(1.5)
892
106
                anchors {
893
107
                    bottom: title.bottom
894
108
                    bottomMargin: units.dp(7)
895
109
                    left: parent.left
896
110
                    leftMargin: title.paintedWidth + labelItem.spacing
897
111
                }
898
112
            }
899
113
        }
900
114
    }
901
115
902
116
    Row {
903
117
        id: contentRow
904
118
        anchors {
905
119
            left: parent.left
906
120
            right: parent.right
907
121
            top: headerRow.bottom
908
122
            bottom: parent.bottom
909
123
            margins: root.contentSpacing
910
124
        }
911
125
912
126
        spacing: units.gu(2)
913
127
914
128
        Flickable {
915
129
            id: leftFlickable
916
130
            anchors.top: parent.top
917
131
            anchors.bottom: parent.bottom
918
132
            width: root.narrowMode ? contentRow.width : contentRow.width * root.previewWidthRatio
919
133
            contentHeight: leftColumn.height
920
134
            clip: true
921
135
922
136
            Column {
923
137
                id: leftColumn
924
138
                objectName: "leftColumn"
925
139
                anchors {
926
140
                    left: parent.left
927
141
                    right: parent.right
928
142
                }
929
143
                height: childrenRect.height
930
144
                spacing: root.contentSpacing
931
145
932
146
                // TODO: replace this UbuntuShape with the Video component once that lands
933
147
                // with the player.
934
148
                UbuntuShape {
935
149
                    id: urlLoader
936
150
                    anchors.left: parent.left
937
151
                    anchors.right: parent.right
938
152
                    height: root.forceSquare ? width : width * previewImage.sourceSize.height / previewImage.sourceSize.width
939
153
                    radius: "medium"
940
154
                    image: Image {
941
155
                        id: previewImage
942
156
                        asynchronous: true
943
157
                        source: root.url
944
158
                        fillMode: Image.PreserveAspectCrop
945
159
                    }
946
160
947
161
                    Image {
948
162
                        objectName: "playButton"
949
163
                        anchors.centerIn: parent
950
164
                        visible: root.playable
951
165
                        readonly property bool bigButton: parent.width > units.gu(40)
952
166
                        width: bigButton ? units.gu(8) : units.gu(4.5)
953
167
                        height: width
954
168
                        source: "graphics/play_button%1%2.png".arg(previewImageMouseArea.pressed ? "_active" : "").arg(bigButton ? "_big" : "")
955
169
                    }
956
170
957
171
                    MouseArea {
958
172
                        id: previewImageMouseArea
959
173
                        anchors.fill: parent
960
174
                        onClicked: root.previewImageClicked()
961
175
                    }
962
176
                }
963
177
                Loader {
964
178
                    id: buttonLoader
965
179
                    anchors.left: parent.left
966
180
                    anchors.right: parent.right
967
181
                    sourceComponent: root.buttons
968
182
                }
969
183
                Loader {
970
184
                    id: captionLoader
971
185
                    anchors.left: parent.left
972
186
                    anchors.right: parent.right
973
187
                    sourceComponent: root.caption
974
188
                }
975
189
            }
976
190
        }
977
191
978
192
        Flickable {
979
193
            id: rightFlickable
980
194
            anchors.top: parent.top
981
195
            anchors.bottom: parent.bottom
982
196
            width: narrowMode ? 0 : (contentRow.width - leftColumn.width - contentRow.spacing)
983
197
            contentHeight: rightColumn.height
984
198
            clip: true
985
199
986
200
            Column {
987
201
                id: rightColumn
988
202
                objectName: "rightColumn"
989
203
                height: childrenRect.height
990
204
                anchors {
991
205
                    left: parent.left
992
206
                    right: parent.right
993
207
                }
994
208
            }
995
209
        }
996
210
    }
997
211
998
212
    Loader {
999
213
        parent: root.narrowMode ? leftColumn : rightColumn
1000
214
        anchors.left: parent.left
1001
215
        anchors.right: parent.right
1002
216
        sourceComponent: root.description
1003
217
    }
1004
218
}
1005
219
0
1006
=== modified file 'Dash/Generic/GenericPreview.qml'
1007
--- Dash/Generic/GenericPreview.qml	2013-07-10 13:33:47 +0000
1008
+++ Dash/Generic/GenericPreview.qml	2013-08-13 09:51:04 +0000
1009
@@ -23,12 +23,26 @@
1010
23
23
1011
24
DashPreview {
24
DashPreview {
1012
25
    id: genericPreview
25
    id: genericPreview
1013
26
    property var previewData
1014
27
26
1015
28
    title: previewData.title
27
    title: previewData.title
1016
29
    url: IconUtil.from_gicon(previewData.image)
1017
30
    previewWidthRatio: 0.6
28
    previewWidthRatio: 0.6
1018
31
29
1019
30
    property url url: IconUtil.from_gicon(previewData.image)
1020
31
1021
32
    header: UbuntuShape {
1022
33
        id: urlLoader
1023
34
        anchors.left: parent.left
1024
35
        anchors.right: parent.right
1025
36
        height: width * previewImage.sourceSize.height / previewImage.sourceSize.width
1026
37
        radius: "medium"
1027
38
        image: Image {
1028
39
            id: previewImage
1029
40
            asynchronous: true
1030
41
            source: genericPreview.url
1031
42
            fillMode: Image.PreserveAspectCrop
1032
43
        }
1033
44
    }
1034
45
1035
32
    buttons: GridView {
46
    buttons: GridView {
1036
33
        id: buttons
47
        id: buttons
1037
34
        model: genericPreview.previewData.actions
48
        model: genericPreview.previewData.actions
1038
@@ -56,7 +70,7 @@
1039
56
        }
70
        }
1040
57
        focus: false
71
        focus: false
1041
58
    }
72
    }
1043
59
    description: Column {
73
    body: Column {
1044
60
        spacing: units.gu(2)
74
        spacing: units.gu(2)
1045
61
75
1046
62
        Label {
76
        Label {
1047
63
77
1048
=== modified file 'Dash/GenericScopeView.qml'
1049
--- Dash/GenericScopeView.qml	2013-07-25 16:05:52 +0000
1050
+++ Dash/GenericScopeView.qml	2013-08-13 09:51:04 +0000
1051
@@ -211,7 +211,7 @@
1052
211
        }
211
        }
1053
212
212
1054
213
        onLoaded: {
213
        onLoaded: {
1056
214
            item.previewData = previewLoader.previewData
214
            item.previewData = Qt.binding(function() { return previewLoader.previewData })
1057
215
        }
215
        }
1058
216
    }
216
    }
1059
217
217
1060
218
218
1061
=== modified file 'Dash/PreviewDelegateMapper.qml'
1062
--- Dash/PreviewDelegateMapper.qml	2013-07-10 12:58:58 +0000
1063
+++ Dash/PreviewDelegateMapper.qml	2013-08-13 09:51:04 +0000
1064
@@ -19,7 +19,9 @@
1065
19
QtObject {
19
QtObject {
1066
20
    property var d: QtObject {
20
    property var d: QtObject {
1067
21
        readonly property string genericPreview: "Generic/GenericPreview.qml"
21
        readonly property string genericPreview: "Generic/GenericPreview.qml"
1068
22
        readonly property string appPreview: "Apps/AppPreview.qml"
1069
22
        property var previewDelegateMapping: {"preview-generic": genericPreview,
23
        property var previewDelegateMapping: {"preview-generic": genericPreview,
1070
24
                                              "preview-application": appPreview,
1071
23
        }
25
        }
1072
24
    }
26
    }
1073
25
27
1074
26
28
1075
=== modified file 'Dash/Video/VideoPreview.qml'
1076
--- Dash/Video/VideoPreview.qml	2013-07-12 16:07:42 +0000
1077
+++ Dash/Video/VideoPreview.qml	2013-08-13 09:51:04 +0000
1078
@@ -24,7 +24,9 @@
1079
24
24
1080
25
    property var item
25
    property var item
1081
26
    property alias ready: nfo.ready
26
    property alias ready: nfo.ready
1082
27
    property bool playable: fileUri != ""
1083
27
    readonly property url fileUri: item ? item.fileUri : ""
28
    readonly property url fileUri: item ? item.fileUri : ""
1084
29
    property url url: item ? item.nfoUri.replace(/\.nfo$/, "-fanart.jpg") : ""
1085
28
30
1086
29
    VideoInfo {
31
    VideoInfo {
1087
30
        id: nfo
32
        id: nfo
1088
@@ -32,9 +34,7 @@
1089
32
    }
34
    }
1090
33
35
1091
34
    title: nfo.ready ? nfo.video.title : ""
36
    title: nfo.ready ? nfo.video.title : ""
1092
35
    url: item ? item.nfoUri.replace(/\.nfo$/, "-fanart.jpg") : ""
1093
36
    previewWidthRatio: 0.6
37
    previewWidthRatio: 0.6
1094
37
    playable: fileUri != ""
1095
38
38
1096
39
    onPreviewImageClicked: {
39
    onPreviewImageClicked: {
1097
40
        if (playable) {
40
        if (playable) {
1098
@@ -42,6 +42,38 @@
1099
42
        }
42
        }
1100
43
    }
43
    }
1101
44
44
1102
45
    // TODO: replace this UbuntuShape with the Video component once that lands
1103
46
    // with the player.
1104
47
    header: UbuntuShape {
1105
48
        id: urlLoader
1106
49
        anchors.left: parent.left
1107
50
        anchors.right: parent.right
1108
51
        height: width * previewImage.sourceSize.height / previewImage.sourceSize.width
1109
52
        radius: "medium"
1110
53
        image: Image {
1111
54
            id: previewImage
1112
55
            asynchronous: true
1113
56
            source: root.url
1114
57
            fillMode: Image.PreserveAspectCrop
1115
58
        }
1116
59
1117
60
        Image {
1118
61
            objectName: "playButton"
1119
62
            anchors.centerIn: parent
1120
63
            visible: root.playable
1121
64
            readonly property bool bigButton: parent.width > units.gu(40)
1122
65
            width: bigButton ? units.gu(8) : units.gu(4.5)
1123
66
            height: width
1124
67
            source: "../graphics/play_button%1%2.png".arg(previewImageMouseArea.pressed ? "_active" : "").arg(bigButton ? "_big" : "")
1125
68
        }
1126
69
1127
70
        MouseArea {
1128
71
            id: previewImageMouseArea
1129
72
            anchors.fill: parent
1130
73
            onClicked: root.previewImageClicked()
1131
74
        }
1132
75
    }
1133
76
1134
45
    buttons: Row {
77
    buttons: Row {
1135
46
        spacing: units.gu(2)
78
        spacing: units.gu(2)
1136
47
79
1137
@@ -64,7 +96,7 @@
1138
64
        }
96
        }
1139
65
    }
97
    }
1140
66
98
1142
67
    description: Column {
99
    body: Column {
1143
68
        spacing: units.gu(2)
100
        spacing: units.gu(2)
1144
69
        RatingStars {
101
        RatingStars {
1145
70
            maximumRating: 10 // FIXME: this should happen on the backend side
102
            maximumRating: 10 // FIXME: this should happen on the backend side
1146
71
103
1147
=== modified file 'plugins/Ubuntu/CMakeLists.txt'
1148
--- plugins/Ubuntu/CMakeLists.txt	2013-06-05 22:03:08 +0000
1149
+++ plugins/Ubuntu/CMakeLists.txt	2013-08-13 09:51:04 +0000
1150
@@ -1,1 +1,2 @@
1151
1
add_subdirectory(Gestures)
1
add_subdirectory(Gestures)
1152
2
add_subdirectory(DownloadDaemonListener)
1153
2
3
1154
=== added directory 'plugins/Ubuntu/DownloadDaemonListener'
1155
=== added file 'plugins/Ubuntu/DownloadDaemonListener/CMakeLists.txt'
1156
--- plugins/Ubuntu/DownloadDaemonListener/CMakeLists.txt	1970-01-01 00:00:00 +0000
1157
+++ plugins/Ubuntu/DownloadDaemonListener/CMakeLists.txt	2013-08-13 09:51:04 +0000
1158
@@ -0,0 +1,22 @@
1159
1
# export_qmlplugin macro
1160
2
include(Plugins)
1161
3
1162
4
include_directories(
1163
5
    ${CMAKE_CURRENT_SOURCE_DIR}
1164
6
    ${CMAKE_CURRENT_BINARY_DIR}
1165
7
    ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
1166
8
)
1167
9
1168
10
set(DOWNLOADDAEMONLISTENER_SOURCES
1169
11
    plugin.cpp
1170
12
    DownloadTracker.cpp
1171
13
    interface/downloadtrackeradaptor.cpp
1172
14
    )
1173
15
1174
16
add_library(DownloadDaemonListener MODULE ${DOWNLOADDAEMONLISTENER_SOURCES})
1175
17
1176
18
qt5_use_modules(DownloadDaemonListener Qml Quick DBus Core)
1177
19
1178
20
# export the qmldir qmltypes and plugin files
1179
21
export_qmlfiles(Ubuntu.DownloadDaemonListener Ubuntu/DownloadDaemonListener)
1180
22
export_qmlplugin(Ubuntu.DownloadDaemonListener 0.1 Ubuntu/DownloadDaemonListener TARGETS DownloadDaemonListener)
1181
0
23
1182
=== added file 'plugins/Ubuntu/DownloadDaemonListener/DownloadTracker.cpp'
1183
--- plugins/Ubuntu/DownloadDaemonListener/DownloadTracker.cpp	1970-01-01 00:00:00 +0000
1184
+++ plugins/Ubuntu/DownloadDaemonListener/DownloadTracker.cpp	2013-08-13 09:51:04 +0000
1185
@@ -0,0 +1,84 @@
1186
1
/*
1187
2
 * Copyright (C) 2013 - Canonical Ltd.
1188
3
 *
1189
4
 * This program is free software: you can redistribute it and/or modify it
1190
5
 * under the terms of the GNU Lesser General Public License, as
1191
6
 * published by the  Free Software Foundation; either version 2.1 or 3.0
1192
7
 * of the License.
1193
8
 *
1194
9
 * This program is distributed in the hope that it will be useful, but
1195
10
 * WITHOUT ANY WARRANTY; without even the implied warranties of
1196
11
 * MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR
1197
12
 * PURPOSE.  See the applicable version of the GNU Lesser General Public
1198
13
 * License for more details.
1199
14
 *
1200
15
 * You should have received a copy of both the GNU Lesser General Public
1201
16
 * License along with this program. If not, see <http://www.gnu.org/licenses/>
1202
17
 *
1203
18
 * Authored by: Diego Sarmentero <diego.sarmentero@canonical.com>
1204
19
 */
1205
20
1206
21
1207
22
#include "DownloadTracker.h"
1208
23
1209
24
DownloadTracker::DownloadTracker(QObject *parent)
1210
25
    : QObject(parent)
1211
26
    , m_adaptor(nullptr)
1212
27
{
1213
28
}
1214
29
1215
30
bool DownloadTracker::isServiceReady() const
1216
31
{
1217
32
    bool ready = false;
1218
33
    if(m_adaptor != nullptr) {
1219
34
        ready = m_adaptor->isValid();
1220
35
    }
1221
36
1222
37
    return ready;
1223
38
}
1224
39
1225
40
QString DownloadTracker::dbusPath() const
1226
41
{
1227
42
    return m_dbusPath;
1228
43
}
1229
44
1230
45
void DownloadTracker::setDbusPath(const QString& path)
1231
46
{
1232
47
    if(m_dbusPath != path){
1233
48
        m_dbusPath = path;
1234
49
        startService();
1235
50
        Q_EMIT dbusPathChanged(m_dbusPath);
1236
51
    }
1237
52
}
1238
53
1239
54
QString DownloadTracker::service() const
1240
55
{
1241
56
    return m_service;
1242
57
}
1243
58
1244
59
void DownloadTracker::setService(const QString& service)
1245
60
{
1246
61
    if(m_service != service){
1247
62
        m_service = service;
1248
63
        startService();
1249
64
        Q_EMIT serviceChanged(m_service);
1250
65
    }
1251
66
}
1252
67
1253
68
void DownloadTracker::startService()
1254
69
{
1255
70
    // FIXME update dbus path and service on changes
1256
71
    if(!m_service.isEmpty() && !m_dbusPath.isEmpty()) {
1257
72
        m_adaptor = new DownloadTrackerAdaptor(m_service, m_dbusPath, QDBusConnection::sessionBus(), this);
1258
73
1259
74
        connect(m_adaptor, SIGNAL(canceled(bool)), this, SIGNAL(canceled(bool)));
1260
75
        connect(m_adaptor, SIGNAL(error(const QString &)), this, SIGNAL(error(const QString &)));
1261
76
        connect(m_adaptor, SIGNAL(finished(const QString &)), this, SIGNAL(finished(const QString &)));
1262
77
        connect(m_adaptor, SIGNAL(paused(bool)), this, SIGNAL(paused(bool)));
1263
78
        connect(m_adaptor, SIGNAL(progress(qulonglong, qulonglong)), this, SIGNAL(progress(qulonglong, qulonglong)));
1264
79
        connect(m_adaptor, SIGNAL(resumed(bool)), this, SIGNAL(resumed(bool)));
1265
80
        connect(m_adaptor, SIGNAL(started(bool)), this, SIGNAL(started(bool)));
1266
81
    }
1267
82
    // FIXME find a better way of determining if the service is ready
1268
83
    Q_EMIT serviceReadyChanged(m_adaptor && m_adaptor->isValid());
1269
84
}
1270
0
85
1271
=== added file 'plugins/Ubuntu/DownloadDaemonListener/DownloadTracker.h'
1272
--- plugins/Ubuntu/DownloadDaemonListener/DownloadTracker.h	1970-01-01 00:00:00 +0000
1273
+++ plugins/Ubuntu/DownloadDaemonListener/DownloadTracker.h	2013-08-13 09:51:04 +0000
1274
@@ -0,0 +1,69 @@
1275
1
/*
1276
2
 * Copyright (C) 2013 - Canonical Ltd.
1277
3
 *
1278
4
 * This program is free software: you can redistribute it and/or modify it
1279
5
 * under the terms of the GNU Lesser General Public License, as
1280
6
 * published by the  Free Software Foundation; either version 2.1 or 3.0
1281
7
 * of the License.
1282
8
 *
1283
9
 * This program is distributed in the hope that it will be useful, but
1284
10
 * WITHOUT ANY WARRANTY; without even the implied warranties of
1285
11
 * MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR
1286
12
 * PURPOSE.  See the applicable version of the GNU Lesser General Public
1287
13
 * License for more details.
1288
14
 *
1289
15
 * You should have received a copy of both the GNU Lesser General Public
1290
16
 * License along with this program. If not, see <http://www.gnu.org/licenses/>
1291
17
 *
1292
18
 * Authored by: Diego Sarmentero <diego.sarmentero@canonical.com>
1293
19
 */
1294
20
1295
21
1296
22
#ifndef DOWNLOADTRACKER_H
1297
23
#define DOWNLOADTRACKER_H
1298
24
1299
25
#include <interface/downloadtrackeradaptor.h>
1300
26
1301
27
#include <QObject>
1302
28
#include <QDBusObjectPath>
1303
29
1304
30
class DownloadTracker : public QObject
1305
31
{
1306
32
    Q_OBJECT
1307
33
    Q_DISABLE_COPY(DownloadTracker)
1308
34
    Q_PROPERTY(QString service READ service WRITE setService NOTIFY serviceChanged)
1309
35
    Q_PROPERTY(QString dbusPath READ dbusPath WRITE setDbusPath NOTIFY dbusPathChanged)
1310
36
    Q_PROPERTY(bool serviceReady READ isServiceReady NOTIFY serviceReadyChanged)
1311
37
1312
38
public:
1313
39
    explicit DownloadTracker(QObject *parent = 0);
1314
40
1315
41
    QString service() const;
1316
42
    QString dbusPath() const;
1317
43
    bool isServiceReady() const;
1318
44
1319
45
    void setDbusPath(const QString& path);
1320
46
    void setService(const QString& service);
1321
47
1322
48
Q_SIGNALS:
1323
49
    void serviceChanged(const QString &service);
1324
50
    void dbusPathChanged(const QString &dbusPath);
1325
51
    void serviceReadyChanged(const bool &serviceReady);
1326
52
1327
53
    void canceled(bool success);
1328
54
    void error(const QString &error);
1329
55
    void finished(const QString &path);
1330
56
    void paused(bool success);
1331
57
    void progress(qulonglong received, qulonglong total);
1332
58
    void resumed(bool success);
1333
59
    void started(bool success);
1334
60
1335
61
private:
1336
62
    QString m_dbusPath;
1337
63
    QString m_service;
1338
64
    DownloadTrackerAdaptor* m_adaptor;
1339
65
1340
66
    void startService();
1341
67
};
1342
68
1343
69
#endif // DOWNLOADTRACKER_H
1344
0
70
1345
=== added directory 'plugins/Ubuntu/DownloadDaemonListener/interface'
1346
=== added file 'plugins/Ubuntu/DownloadDaemonListener/interface/downloadtrackeradaptor.cpp'
1347
--- plugins/Ubuntu/DownloadDaemonListener/interface/downloadtrackeradaptor.cpp	1970-01-01 00:00:00 +0000
1348
+++ plugins/Ubuntu/DownloadDaemonListener/interface/downloadtrackeradaptor.cpp	2013-08-13 09:51:04 +0000
1349
@@ -0,0 +1,25 @@
1350
1
/*
1351
2
 * This file was generated by qdbusxml2cpp version 0.8
1352
3
 * Command line was: qdbusxml2cpp -v -c DownloadTrackerAdaptor -p downloadtrackeradaptor.h:downloadtrackeradaptor.cpp -i metatypes.h com.canonical.applications.download.xml
1353
4
 *
1354
5
 * qdbusxml2cpp is Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
1355
6
 *
1356
7
 * This is an auto-generated file.
1357
8
 * This file may have been hand-edited. Look for HAND-EDIT comments
1358
9
 * before re-generating it.
1359
10
 */
1360
11
1361
12
#include "downloadtrackeradaptor.h"
1362
13
1363
14
/*
1364
15
 * Implementation of interface class DownloadTrackerAdaptor
1365
16
 */
1366
17
1367
18
DownloadTrackerAdaptor::DownloadTrackerAdaptor(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent)
1368
19
    : QDBusAbstractInterface(service, path, staticInterfaceName(), connection, parent)
1369
20
{
1370
21
}
1371
22
1372
23
DownloadTrackerAdaptor::~DownloadTrackerAdaptor()
1373
24
{
1374
25
}
1375
0
26
1376
=== added file 'plugins/Ubuntu/DownloadDaemonListener/interface/downloadtrackeradaptor.h'
1377
--- plugins/Ubuntu/DownloadDaemonListener/interface/downloadtrackeradaptor.h	1970-01-01 00:00:00 +0000
1378
+++ plugins/Ubuntu/DownloadDaemonListener/interface/downloadtrackeradaptor.h	2013-08-13 09:51:04 +0000
1379
@@ -0,0 +1,125 @@
1380
1
/*
1381
2
 * This file was generated by qdbusxml2cpp version 0.8
1382
3
 * Command line was: qdbusxml2cpp -v -c DownloadTrackerAdaptor -p downloadtrackeradaptor.h:downloadtrackeradaptor.cpp -i metatypes.h com.canonical.applications.download.xml
1383
4
 *
1384
5
 * qdbusxml2cpp is Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
1385
6
 *
1386
7
 * This is an auto-generated file.
1387
8
 * Do not edit! All changes made to it will be lost.
1388
9
 */
1389
10
1390
11
#ifndef DOWNLOADTRACKERADAPTOR_H_1374434371
1391
12
#define DOWNLOADTRACKERADAPTOR_H_1374434371
1392
13
1393
14
#include <QtCore/QObject>
1394
15
#include <QtCore/QByteArray>
1395
16
#include <QtCore/QList>
1396
17
#include <QtCore/QMap>
1397
18
#include <QtCore/QString>
1398
19
#include <QtCore/QStringList>
1399
20
#include <QtCore/QVariant>
1400
21
#include <QtDBus/QtDBus>
1401
22
#include "metatypes.h"
1402
23
1403
24
/*
1404
25
 * Proxy class for interface com.canonical.applications.Download
1405
26
 */
1406
27
class DownloadTrackerAdaptor: public QDBusAbstractInterface
1407
28
{
1408
29
    Q_OBJECT
1409
30
public:
1410
31
    static inline const char *staticInterfaceName()
1411
32
    { return "com.canonical.applications.Download"; }
1412
33
1413
34
public:
1414
35
    DownloadTrackerAdaptor(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = 0);
1415
36
1416
37
    ~DownloadTrackerAdaptor();
1417
38
1418
39
public Q_SLOTS: // METHODS
1419
40
    inline QDBusPendingReply<> allowGSMDownload(bool allowed)
1420
41
    {
1421
42
        QList<QVariant> argumentList;
1422
43
        argumentList << QVariant::fromValue(allowed);
1423
44
        return asyncCallWithArgumentList(QLatin1String("allowGSMDownload"), argumentList);
1424
45
    }
1425
46
1426
47
    inline QDBusPendingReply<> cancel()
1427
48
    {
1428
49
        QList<QVariant> argumentList;
1429
50
        return asyncCallWithArgumentList(QLatin1String("cancel"), argumentList);
1430
51
    }
1431
52
1432
53
    inline QDBusPendingReply<bool> isGSMDownloadAllowed()
1433
54
    {
1434
55
        QList<QVariant> argumentList;
1435
56
        return asyncCallWithArgumentList(QLatin1String("isGSMDownloadAllowed"), argumentList);
1436
57
    }
1437
58
1438
59
    inline QDBusPendingReply<QVariantMap> metadata()
1439
60
    {
1440
61
        QList<QVariant> argumentList;
1441
62
        return asyncCallWithArgumentList(QLatin1String("metadata"), argumentList);
1442
63
    }
1443
64
1444
65
    inline QDBusPendingReply<> pause()
1445
66
    {
1446
67
        QList<QVariant> argumentList;
1447
68
        return asyncCallWithArgumentList(QLatin1String("pause"), argumentList);
1448
69
    }
1449
70
1450
71
    inline QDBusPendingReply<qulonglong> progress()
1451
72
    {
1452
73
        QList<QVariant> argumentList;
1453
74
        return asyncCallWithArgumentList(QLatin1String("progress"), argumentList);
1454
75
    }
1455
76
1456
77
    inline QDBusPendingReply<> resume()
1457
78
    {
1458
79
        QList<QVariant> argumentList;
1459
80
        return asyncCallWithArgumentList(QLatin1String("resume"), argumentList);
1460
81
    }
1461
82
1462
83
    inline QDBusPendingReply<> setThrottle(qulonglong speed)
1463
84
    {
1464
85
        QList<QVariant> argumentList;
1465
86
        argumentList << QVariant::fromValue(speed);
1466
87
        return asyncCallWithArgumentList(QLatin1String("setThrottle"), argumentList);
1467
88
    }
1468
89
1469
90
    inline QDBusPendingReply<> start()
1470
91
    {
1471
92
        QList<QVariant> argumentList;
1472
93
        return asyncCallWithArgumentList(QLatin1String("start"), argumentList);
1473
94
    }
1474
95
1475
96
    inline QDBusPendingReply<qulonglong> throttle()
1476
97
    {
1477
98
        QList<QVariant> argumentList;
1478
99
        return asyncCallWithArgumentList(QLatin1String("throttle"), argumentList);
1479
100
    }
1480
101
1481
102
    inline QDBusPendingReply<qulonglong> totalSize()
1482
103
    {
1483
104
        QList<QVariant> argumentList;
1484
105
        return asyncCallWithArgumentList(QLatin1String("totalSize"), argumentList);
1485
106
    }
1486
107
1487
108
Q_SIGNALS: // SIGNALS
1488
109
    void canceled(bool success);
1489
110
    void error(const QString &error);
1490
111
    void finished(const QString &path);
1491
112
    void paused(bool success);
1492
113
    void progress(qulonglong received, qulonglong total);
1493
114
    void resumed(bool success);
1494
115
    void started(bool success);
1495
116
};
1496
117
1497
118
namespace com {
1498
119
  namespace canonical {
1499
120
    namespace applications {
1500
121
      typedef ::DownloadTrackerAdaptor Download;
1501
122
    }
1502
123
  }
1503
124
}
1504
125
#endif
1505
0
126
1506
=== added file 'plugins/Ubuntu/DownloadDaemonListener/interface/metatypes.h'
1507
--- plugins/Ubuntu/DownloadDaemonListener/interface/metatypes.h	1970-01-01 00:00:00 +0000
1508
+++ plugins/Ubuntu/DownloadDaemonListener/interface/metatypes.h	2013-08-13 09:51:04 +0000
1509
@@ -0,0 +1,28 @@
1510
1
/*
1511
2
 * Copyright 2013 2013 Canonical Ltd.
1512
3
 *
1513
4
 * This library is free software; you can redistribute it and/or
1514
5
 * modify it under the terms of version 3 of the GNU Lesser General Public
1515
6
 * License as published by the Free Software Foundation.
1516
7
 *
1517
8
 * This program is distributed in the hope that it will be useful,
1518
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1519
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
1520
11
 * General Public License for more details.
1521
12
 *
1522
13
 * You should have received a copy of the GNU Lesser General Public
1523
14
 * License along with this library; if not, write to the
1524
15
 * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
1525
16
 * Boston, MA 02110-1301, USA.
1526
17
 */
1527
18
1528
19
#ifndef DOWNLOADER_LIB_APP_METATYPES_H
1529
20
#define DOWNLOADER_LIB_APP_METATYPES_H
1530
21
1531
22
#include <QMap>
1532
23
1533
24
typedef QMap<QString, QString> StringMap;
1534
25
1535
26
Q_DECLARE_METATYPE(StringMap)
1536
27
1537
28
#endif // METATYPES_H
1538
0
29
1539
=== added file 'plugins/Ubuntu/DownloadDaemonListener/plugin.cpp'
1540
--- plugins/Ubuntu/DownloadDaemonListener/plugin.cpp	1970-01-01 00:00:00 +0000
1541
+++ plugins/Ubuntu/DownloadDaemonListener/plugin.cpp	2013-08-13 09:51:04 +0000
1542
@@ -0,0 +1,39 @@
1543
1
/*
1544
2
 * Copyright (C) 2013 - Canonical Ltd.
1545
3
 *
1546
4
 * This program is free software: you can redistribute it and/or modify it
1547
5
 * under the terms of the GNU Lesser General Public License, as
1548
6
 * published by the  Free Software Foundation; either version 2.1 or 3.0
1549
7
 * of the License.
1550
8
 *
1551
9
 * This program is distributed in the hope that it will be useful, but
1552
10
 * WITHOUT ANY WARRANTY; without even the implied warranties of
1553
11
 * MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR
1554
12
 * PURPOSE.  See the applicable version of the GNU Lesser General Public
1555
13
 * License for more details.
1556
14
 *
1557
15
 * You should have received a copy of both the GNU Lesser General Public
1558
16
 * License along with this program. If not, see <http://www.gnu.org/licenses/>
1559
17
 *
1560
18
 * Authored by: Diego Sarmentero <diego.sarmentero@canonical.com>
1561
19
 */
1562
20
1563
21
1564
22
#include "plugin.h"
1565
23
#include "DownloadTracker.h"
1566
24
1567
25
#include <QtQml>
1568
26
#include <QtQml/QQmlContext>
1569
27
1570
28
1571
29
void BackendPlugin::registerTypes(const char *uri)
1572
30
{
1573
31
    Q_ASSERT(uri == QLatin1String("Ubuntu.DownloadDaemonListener"));
1574
32
1575
33
    qmlRegisterType<DownloadTracker>(uri, 0, 1, "DownloadTracker");
1576
34
}
1577
35
1578
36
void BackendPlugin::initializeEngine(QQmlEngine *engine, const char *uri)
1579
37
{
1580
38
    QQmlExtensionPlugin::initializeEngine(engine, uri);
1581
39
}
1582
0
40
1583
=== added file 'plugins/Ubuntu/DownloadDaemonListener/plugin.h'
1584
--- plugins/Ubuntu/DownloadDaemonListener/plugin.h	1970-01-01 00:00:00 +0000
1585
+++ plugins/Ubuntu/DownloadDaemonListener/plugin.h	2013-08-13 09:51:04 +0000
1586
@@ -0,0 +1,37 @@
1587
1
/*
1588
2
 * Copyright (C) 2013 - Canonical Ltd.
1589
3
 *
1590
4
 * This program is free software: you can redistribute it and/or modify it
1591
5
 * under the terms of the GNU Lesser General Public License, as
1592
6
 * published by the  Free Software Foundation; either version 2.1 or 3.0
1593
7
 * of the License.
1594
8
 *
1595
9
 * This program is distributed in the hope that it will be useful, but
1596
10
 * WITHOUT ANY WARRANTY; without even the implied warranties of
1597
11
 * MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR
1598
12
 * PURPOSE.  See the applicable version of the GNU Lesser General Public
1599
13
 * License for more details.
1600
14
 *
1601
15
 * You should have received a copy of both the GNU Lesser General Public
1602
16
 * License along with this program. If not, see <http://www.gnu.org/licenses/>
1603
17
 *
1604
18
 * Authored by: Diego Sarmentero <diego.sarmentero@canonical.com>
1605
19
 */
1606
20
1607
21
1608
22
#ifndef BACKEND_PLUGIN_H
1609
23
#define BACKEND_PLUGIN_H
1610
24
1611
25
#include <QQmlEngine>
1612
26
#include <QQmlExtensionPlugin>
1613
27
1614
28
class BackendPlugin : public QQmlExtensionPlugin
1615
29
{
1616
30
    Q_OBJECT
1617
31
    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
1618
32
1619
33
public:
1620
34
    void registerTypes(const char *uri);
1621
35
    void initializeEngine(QQmlEngine *engine, const char *uri);
1622
36
};
1623
37
#endif // BACKEND_PLUGIN_H
1624
0
38
1625
=== added file 'plugins/Ubuntu/DownloadDaemonListener/qmldir'
1626
--- plugins/Ubuntu/DownloadDaemonListener/qmldir	1970-01-01 00:00:00 +0000
1627
+++ plugins/Ubuntu/DownloadDaemonListener/qmldir	2013-08-13 09:51:04 +0000
1628
@@ -0,0 +1,3 @@
1629
1
module Ubuntu.DownloadDaemonListener
1630
2
plugin DownloadDaemonListener
1631
3
typeinfo plugins.qmltypes
1632
0
4
1633
=== modified file 'plugins/Unity/preview.cpp'
1634
--- plugins/Unity/preview.cpp	2013-07-04 14:53:21 +0000
1635
+++ plugins/Unity/preview.cpp	2013-08-13 09:51:04 +0000
1636
@@ -94,6 +94,11 @@
1637
94
    return QVariant::fromValue(m_infoHints);
94
    return QVariant::fromValue(m_infoHints);
1638
95
}
95
}
1639
96
96
1640
97
QVariantMap Preview::infoHintsHash() const
1641
98
{
1642
99
    return m_infoHintsHash;
1643
100
}
1644
101
1645
97
QString Preview::image() const
102
QString Preview::image() const
1646
98
{
103
{
1647
99
    if (m_unityPreview) {
104
    if (m_unityPreview) {
1648
@@ -145,6 +150,7 @@
1649
145
150
1650
146
    qDeleteAll(m_infoHints);
151
    qDeleteAll(m_infoHints);
1651
147
    m_infoHints.clear();
152
    m_infoHints.clear();
1652
153
    m_infoHintsHash.clear();
1653
148
    qDeleteAll(m_actions);
154
    qDeleteAll(m_actions);
1654
149
    m_actions.clear();
155
    m_actions.clear();
1655
150
156
1656
@@ -152,6 +158,7 @@
1657
152
        auto hint = new PreviewInfoHint(this);
158
        auto hint = new PreviewInfoHint(this);
1658
153
        hint->setUnityInfoHint(unityInfoHint);
159
        hint->setUnityInfoHint(unityInfoHint);
1659
154
        m_infoHints.append(hint);
160
        m_infoHints.append(hint);
1660
161
        m_infoHintsHash[hint->id()] = QVariant::fromValue(hint);
1661
155
    }
162
    }
1662
156
163
1663
157
    for (auto unityAction: m_unityPreview->GetActions()) {
164
    for (auto unityAction: m_unityPreview->GetActions()) {
1664
158
165
1665
=== modified file 'plugins/Unity/preview.h'
1666
--- plugins/Unity/preview.h	2013-07-02 10:57:33 +0000
1667
+++ plugins/Unity/preview.h	2013-08-13 09:51:04 +0000
1668
@@ -25,6 +25,7 @@
1669
25
#include <QString>
25
#include <QString>
1670
26
#include <QMetaType>
26
#include <QMetaType>
1671
27
#include <QList>
27
#include <QList>
1672
28
#include <QVariantMap>
1673
28
29
1674
29
// libunity-core
30
// libunity-core
1675
30
#include <UnityCore/Preview.h>
31
#include <UnityCore/Preview.h>
1676
@@ -42,6 +43,7 @@
1677
42
    Q_PROPERTY(QString description READ description NOTIFY previewChanged)
43
    Q_PROPERTY(QString description READ description NOTIFY previewChanged)
1678
43
    Q_PROPERTY(QVariant actions READ actions NOTIFY previewChanged)
44
    Q_PROPERTY(QVariant actions READ actions NOTIFY previewChanged)
1679
44
    Q_PROPERTY(QVariant infoHints READ infoHints NOTIFY previewChanged)
45
    Q_PROPERTY(QVariant infoHints READ infoHints NOTIFY previewChanged)
1680
46
    Q_PROPERTY(QVariantMap infoMap READ infoHintsHash NOTIFY previewChanged)
1681
45
    Q_PROPERTY(QString image READ image NOTIFY previewChanged)
47
    Q_PROPERTY(QString image READ image NOTIFY previewChanged)
1682
46
    Q_PROPERTY(QString imageSourceUri READ imageSourceUri NOTIFY previewChanged)
48
    Q_PROPERTY(QString imageSourceUri READ imageSourceUri NOTIFY previewChanged)
1683
47
49
1684
@@ -55,6 +57,7 @@
1685
55
    QString description() const;
57
    QString description() const;
1686
56
    QVariant actions();
58
    QVariant actions();
1687
57
    QVariant infoHints();
59
    QVariant infoHints();
1688
60
    QVariantMap infoHintsHash() const;
1689
58
    QString image() const;
61
    QString image() const;
1690
59
    QString imageSourceUri() const;
62
    QString imageSourceUri() const;
1691
60
63
1692
@@ -73,6 +76,7 @@
1693
73
76
1694
74
    QList<QObject *> m_actions;
77
    QList<QObject *> m_actions;
1695
75
    QList<QObject *> m_infoHints;
78
    QList<QObject *> m_infoHints;
1696
79
    QVariantMap m_infoHintsHash;
1697
76
};
80
};
1698
77
81
1699
78
Q_DECLARE_METATYPE(Preview *)
82
Q_DECLARE_METATYPE(Preview *)
1700
79
83
1701
=== modified file 'po/unity8.pot'
1702
--- po/unity8.pot	2013-08-09 08:13:00 +0000
1703
+++ po/unity8.pot	2013-08-13 09:51:04 +0000
1704
@@ -8,7 +8,7 @@
1705
8
msgstr ""
8
msgstr ""
1706
9
"Project-Id-Version: unity8\n"
9
"Project-Id-Version: unity8\n"
1707
10
"Report-Msgid-Bugs-To: \n"
10
"Report-Msgid-Bugs-To: \n"
1709
11
"POT-Creation-Date: 2013-08-09 10:12+0200\n"
11
"POT-Creation-Date: 2013-08-09 12:18+0200\n"
1710
12
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
12
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1711
13
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1712
14
"Language-Team: LANGUAGE <LL@li.org>\n"
14
"Language-Team: LANGUAGE <LL@li.org>\n"
1713
@@ -16,6 +16,7 @@
1714
16
"MIME-Version: 1.0\n"
16
"MIME-Version: 1.0\n"
1715
17
"Content-Type: text/plain; charset=CHARSET\n"
17
"Content-Type: text/plain; charset=CHARSET\n"
1716
18
"Content-Transfer-Encoding: 8bit\n"
18
"Content-Transfer-Encoding: 8bit\n"
1717
19
"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
1718
19
20
1719
20
#: Applications/applications.js:23
21
#: Applications/applications.js:23
1720
21
msgid "Phone"
22
msgid "Phone"
1721
@@ -89,6 +90,40 @@
1722
89
msgid "Recent searches"
90
msgid "Recent searches"
1723
90
msgstr ""
91
msgstr ""
1724
91
92
1725
93
#. TRANSLATORS: Number of persons who rated this app
1726
94
#: Dash/Apps/AppInfo.qml:72
1727
95
#, qt-format
1728
96
msgid "(%1)"
1729
97
msgstr ""
1730
98
1731
99
#. TRANSLATORS: Number of persons who wrote reviews for this app
1732
100
#: Dash/Apps/AppInfo.qml:84 tests/qmltests/Dash/Apps/tst_AppPreview.qml:115
1733
101
#, qt-format
1734
102
msgid "%1 review"
1735
103
msgid_plural "%1 reviews"
1736
104
msgstr[0] ""
1737
105
msgstr[1] ""
1738
106
1739
107
#: Dash/Apps/AppPreview.qml:181
1740
108
msgid "Rate this"
1741
109
msgstr ""
1742
110
1743
111
#: Dash/Apps/AppReviews.qml:72
1744
112
msgid "Add a review"
1745
113
msgstr ""
1746
114
1747
115
#: Dash/Apps/AppReviews.qml:84
1748
116
msgid "Review"
1749
117
msgstr ""
1750
118
1751
119
#: Dash/Apps/AppReviews.qml:118
1752
120
msgid "Send"
1753
121
msgstr ""
1754
122
1755
123
#: Dash/Apps/AppReviews.qml:136
1756
124
msgid "Comments:"
1757
125
msgstr ""
1758
126
1759
92
#: Dash/DashApps.qml:65
127
#: Dash/DashApps.qml:65
1760
93
msgid "Running apps"
128
msgid "Running apps"
1761
94
msgstr ""
129
msgstr ""
1762
@@ -153,15 +188,15 @@
1763
153
msgid "Videos"
188
msgid "Videos"
1764
154
msgstr ""
189
msgstr ""
1765
155
190
1767
156
#: Dash/Video/VideoPreview.qml:98
191
#: Dash/Video/VideoPreview.qml:130
1768
157
msgid "Directed by:"
192
msgid "Directed by:"
1769
158
msgstr ""
193
msgstr ""
1770
159
194
1772
160
#: Dash/Video/VideoPreview.qml:121
195
#: Dash/Video/VideoPreview.qml:153
1773
161
msgid "Starring:"
196
msgid "Starring:"
1774
162
msgstr ""
197
msgstr ""
1775
163
198
1777
164
#: Dash/Video/VideoPreview.qml:144
199
#: Dash/Video/VideoPreview.qml:176
1778
165
msgid "Author:"
200
msgid "Author:"
1779
166
msgstr ""
201
msgstr ""
1780
167
202
1781
168
203
1782
=== modified file 'tests/mocks/Ubuntu/CMakeLists.txt'
1783
--- tests/mocks/Ubuntu/CMakeLists.txt	2013-07-04 14:47:47 +0000
1784
+++ tests/mocks/Ubuntu/CMakeLists.txt	2013-08-13 09:51:04 +0000
1785
@@ -1,1 +1,2 @@
1786
1
add_subdirectory(Application)
1
add_subdirectory(Application)
1787
2
add_subdirectory(DownloadDaemonListener)
1788
2
3
1789
=== added directory 'tests/mocks/Ubuntu/DownloadDaemonListener'
1790
=== added file 'tests/mocks/Ubuntu/DownloadDaemonListener/CMakeLists.txt'
1791
--- tests/mocks/Ubuntu/DownloadDaemonListener/CMakeLists.txt	1970-01-01 00:00:00 +0000
1792
+++ tests/mocks/Ubuntu/DownloadDaemonListener/CMakeLists.txt	2013-08-13 09:51:04 +0000
1793
@@ -0,0 +1,18 @@
1794
1
set(FakeUbuntuDownloadDaemonListenerQml_SOURCES
1795
2
    plugin.cpp
1796
3
    MockDownloadTracker.cpp
1797
4
)
1798
5
1799
6
add_library(FakeUbuntuDownloadDaemonListenerQml MODULE ${FakeUbuntuDownloadDaemonListenerQml_SOURCES})
1800
7
1801
8
qt5_use_modules(FakeUbuntuDownloadDaemonListenerQml Core Quick)
1802
9
1803
10
# copy files into build directory for shadow builds
1804
11
add_custom_target(UbuntuDownloadQmlDirFile ALL
1805
12
    COMMAND cp "${CMAKE_CURRENT_SOURCE_DIR}/qmldir" ${CMAKE_CURRENT_BINARY_DIR}
1806
13
    DEPENDS qmldir
1807
14
)
1808
15
1809
16
install(TARGETS FakeUbuntuDownloadDaemonListenerQml
1810
17
    DESTINATION ${SHELL_PRIVATE_LIBDIR}/qml/mocks/Ubuntu/DownloadDaemonListener
1811
18
    )
1812
0
19
1813
=== added file 'tests/mocks/Ubuntu/DownloadDaemonListener/MockDownloadTracker.cpp'
1814
--- tests/mocks/Ubuntu/DownloadDaemonListener/MockDownloadTracker.cpp	1970-01-01 00:00:00 +0000
1815
+++ tests/mocks/Ubuntu/DownloadDaemonListener/MockDownloadTracker.cpp	2013-08-13 09:51:04 +0000
1816
@@ -0,0 +1,67 @@
1817
1
/*
1818
2
 * Copyright (C) 2013 - Canonical Ltd.
1819
3
 *
1820
4
 * This program is free software: you can redistribute it and/or modify it
1821
5
 * under the terms of the GNU Lesser General Public License, as
1822
6
 * published by the  Free Software Foundation; either version 2.1 or 3.0
1823
7
 * of the License.
1824
8
 *
1825
9
 * This program is distributed in the hope that it will be useful, but
1826
10
 * WITHOUT ANY WARRANTY; without even the implied warranties of
1827
11
 * MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR
1828
12
 * PURPOSE.  See the applicable version of the GNU Lesser General Public
1829
13
 * License for more details.
1830
14
 *
1831
15
 * You should have received a copy of both the GNU Lesser General Public
1832
16
 * License along with this program. If not, see <http://www.gnu.org/licenses/>
1833
17
 *
1834
18
 * Authored by: Diego Sarmentero <diego.sarmentero@canonical.com>
1835
19
 */
1836
20
1837
21
1838
22
#include "MockDownloadTracker.h"
1839
23
1840
24
MockDownloadTracker::MockDownloadTracker(QObject *parent)
1841
25
    : QObject(parent)
1842
26
    , m_active(false)
1843
27
{
1844
28
}
1845
29
1846
30
bool MockDownloadTracker::isServiceReady() const
1847
31
{
1848
32
    return m_active;
1849
33
}
1850
34
1851
35
QString MockDownloadTracker::dbusPath() const
1852
36
{
1853
37
    return m_dbusPath;
1854
38
}
1855
39
1856
40
void MockDownloadTracker::setDbusPath(const QString& path)
1857
41
{
1858
42
    if(m_dbusPath != path){
1859
43
        m_dbusPath = path;
1860
44
        startService();
1861
45
    }
1862
46
}
1863
47
1864
48
QString MockDownloadTracker::service() const
1865
49
{
1866
50
    return m_service;
1867
51
}
1868
52
1869
53
void MockDownloadTracker::setService(const QString& service)
1870
54
{
1871
55
    if(m_service != service){
1872
56
        m_service = service;
1873
57
        startService();
1874
58
    }
1875
59
}
1876
60
1877
61
void MockDownloadTracker::startService()
1878
62
{
1879
63
    if(!m_service.isEmpty() && !m_dbusPath.isEmpty()) {
1880
64
        m_active = true;
1881
65
        Q_EMIT serviceReadyChanged(m_active);
1882
66
    }
1883
67
}
1884
0
68
1885
=== added file 'tests/mocks/Ubuntu/DownloadDaemonListener/MockDownloadTracker.h'
1886
--- tests/mocks/Ubuntu/DownloadDaemonListener/MockDownloadTracker.h	1970-01-01 00:00:00 +0000
1887
+++ tests/mocks/Ubuntu/DownloadDaemonListener/MockDownloadTracker.h	2013-08-13 09:51:04 +0000
1888
@@ -0,0 +1,66 @@
1889
1
/*
1890
2
 * Copyright (C) 2013 - Canonical Ltd.
1891
3
 *
1892
4
 * This program is free software: you can redistribute it and/or modify it
1893
5
 * under the terms of the GNU Lesser General Public License, as
1894
6
 * published by the  Free Software Foundation; either version 2.1 or 3.0
1895
7
 * of the License.
1896
8
 *
1897
9
 * This program is distributed in the hope that it will be useful, but
1898
10
 * WITHOUT ANY WARRANTY; without even the implied warranties of
1899
11
 * MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR
1900
12
 * PURPOSE.  See the applicable version of the GNU Lesser General Public
1901
13
 * License for more details.
1902
14
 *
1903
15
 * You should have received a copy of both the GNU Lesser General Public
1904
16
 * License along with this program. If not, see <http://www.gnu.org/licenses/>
1905
17
 *
1906
18
 * Authored by: Diego Sarmentero <diego.sarmentero@canonical.com>
1907
19
 */
1908
20
1909
21
1910
22
#ifndef MOCKDOWNLOADTRACKER_H
1911
23
#define MOCKDOWNLOADTRACKER_H
1912
24
1913
25
#include <QObject>
1914
26
1915
27
class MockDownloadTracker : public QObject
1916
28
{
1917
29
    Q_OBJECT
1918
30
    Q_DISABLE_COPY(MockDownloadTracker)
1919
31
    Q_PROPERTY(QString service READ service WRITE setService NOTIFY serviceChanged)
1920
32
    Q_PROPERTY(QString dbusPath READ dbusPath WRITE setDbusPath NOTIFY dbusPathChanged)
1921
33
    Q_PROPERTY(bool serviceReady READ isServiceReady NOTIFY serviceReadyChanged)
1922
34
1923
35
public:
1924
36
    explicit MockDownloadTracker(QObject *parent = 0);
1925
37
1926
38
    QString service() const;
1927
39
    QString dbusPath() const;
1928
40
    bool isServiceReady() const;
1929
41
1930
42
    void setDbusPath(const QString& path);
1931
43
    void setService(const QString& service);
1932
44
1933
45
Q_SIGNALS:
1934
46
    void serviceChanged(const QString &service);
1935
47
    void dbusPathChanged(const QString &dbusPath);
1936
48
    void serviceReadyChanged(const bool &serviceReady);
1937
49
1938
50
    void canceled(bool success);
1939
51
    void error(const QString &error);
1940
52
    void finished(const QString &path);
1941
53
    void paused(bool success);
1942
54
    void progress(qulonglong received, qulonglong total);
1943
55
    void resumed(bool success);
1944
56
    void started(bool success);
1945
57
1946
58
private:
1947
59
    QString m_dbusPath;
1948
60
    QString m_service;
1949
61
    bool m_active;
1950
62
1951
63
    void startService();
1952
64
};
1953
65
1954
66
#endif // MOCKDOWNLOADTRACKER_H
1955
0
67
1956
=== added file 'tests/mocks/Ubuntu/DownloadDaemonListener/plugin.cpp'
1957
--- tests/mocks/Ubuntu/DownloadDaemonListener/plugin.cpp	1970-01-01 00:00:00 +0000
1958
+++ tests/mocks/Ubuntu/DownloadDaemonListener/plugin.cpp	2013-08-13 09:51:04 +0000
1959
@@ -0,0 +1,28 @@
1960
1
/*
1961
2
 * Copyright (C) 2013 Canonical, Ltd.
1962
3
 *
1963
4
 * This program is free software; you can redistribute it and/or modify
1964
5
 * it under the terms of the GNU General Public License as published by
1965
6
 * the Free Software Foundation; version 3.
1966
7
 *
1967
8
 * This program is distributed in the hope that it will be useful,
1968
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1969
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1970
11
 * GNU General Public License for more details.
1971
12
 *
1972
13
 * You should have received a copy of the GNU General Public License
1973
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1974
15
 */
1975
16
1976
17
#include "plugin.h"
1977
18
#include "MockDownloadTracker.h"
1978
19
1979
20
#include <QtQml>
1980
21
#include <QtQml/QQmlContext>
1981
22
#include <qqml.h>
1982
23
1983
24
1984
25
void FakeUbuntuDownloadDaemonListenerQmlPlugin::registerTypes(const char *uri)
1985
26
{
1986
27
    qmlRegisterType<MockDownloadTracker>(uri, 0, 1, "DownloadTracker");
1987
28
}
1988
0
29
1989
=== added file 'tests/mocks/Ubuntu/DownloadDaemonListener/plugin.h'
1990
--- tests/mocks/Ubuntu/DownloadDaemonListener/plugin.h	1970-01-01 00:00:00 +0000
1991
+++ tests/mocks/Ubuntu/DownloadDaemonListener/plugin.h	2013-08-13 09:51:04 +0000
1992
@@ -0,0 +1,30 @@
1993
1
/*
1994
2
 * Copyright (C) 2013 Canonical, Ltd.
1995
3
 *
1996
4
 * This program is free software; you can redistribute it and/or modify
1997
5
 * it under the terms of the GNU General Public License as published by
1998
6
 * the Free Software Foundation; version 3.
1999
7
 *
2000
8
 * This program is distributed in the hope that it will be useful,
2001
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
2002
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
2003
11
 * GNU General Public License for more details.
2004
12
 *
2005
13
 * You should have received a copy of the GNU General Public License
2006
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
2007
15
 */
2008
16
2009
17
#ifndef PLUGIN_H
2010
18
#define PLUGIN_H
2011
19
2012
20
#include <QQmlExtensionPlugin>
2013
21
2014
22
class FakeUbuntuDownloadDaemonListenerQmlPlugin : public QQmlExtensionPlugin
2015
23
{
2016
24
    Q_OBJECT
2017
25
    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
2018
26
public:
2019
27
    void registerTypes(const char *uri);
2020
28
};
2021
29
2022
30
#endif
2023
0
31
2024
=== added file 'tests/mocks/Ubuntu/DownloadDaemonListener/qmldir'
2025
--- tests/mocks/Ubuntu/DownloadDaemonListener/qmldir	1970-01-01 00:00:00 +0000
2026
+++ tests/mocks/Ubuntu/DownloadDaemonListener/qmldir	2013-08-13 09:51:04 +0000
2027
@@ -0,0 +1,2 @@
2028
1
module Ubuntu.DownloadDaemonListener
2029
2
plugin FakeUbuntuDownloadDaemonListenerQml
2030
0
3
2031
=== modified file 'tests/qmltests/CMakeLists.txt'
2032
--- tests/qmltests/CMakeLists.txt	2013-08-06 15:14:29 +0000
2033
+++ tests/qmltests/CMakeLists.txt	2013-08-13 09:51:04 +0000
2034
@@ -49,6 +49,8 @@
2035
49
add_qml_test(Dash FilterGrids IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/plugins ${CMAKE_CURRENT_SOURCE_DIR}/plugins
49
add_qml_test(Dash FilterGrids IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/plugins ${CMAKE_CURRENT_SOURCE_DIR}/plugins
2036
50
                                           ${CMAKE_BINARY_DIR}/tests/mocks)
50
                                           ${CMAKE_BINARY_DIR}/tests/mocks)
2037
51
add_qml_test(Dash/Apps RunningApplicationsGrid IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
51
add_qml_test(Dash/Apps RunningApplicationsGrid IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
2038
52
add_qml_test(Dash/Apps AppPreview IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
2039
53
add_qml_test(Dash/Video VideoPreview IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
2040
52
add_qml_test(Greeter Lockscreen IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS}
54
add_qml_test(Greeter Lockscreen IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS}
2041
53
                             PROPERTIES ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics:${CMAKE_BINARY_DIR}/tests/mocks/LightDM/full")
55
                             PROPERTIES ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics:${CMAKE_BINARY_DIR}/tests/mocks/LightDM/full")
2042
54
add_qml_test(Greeter Tablet IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS}
56
add_qml_test(Greeter Tablet IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS}
2043
55
57
2044
=== added file 'tests/qmltests/Dash/Apps/tst_AppPreview.qml'
2045
--- tests/qmltests/Dash/Apps/tst_AppPreview.qml	1970-01-01 00:00:00 +0000
2046
+++ tests/qmltests/Dash/Apps/tst_AppPreview.qml	2013-08-13 09:51:04 +0000
2047
@@ -0,0 +1,152 @@
2048
1
/*
2049
2
 * Copyright 2013 Canonical Ltd.
2050
3
 *
2051
4
 * This program is free software; you can redistribute it and/or modify
2052
5
 * it under the terms of the GNU General Public License as published by
2053
6
 * the Free Software Foundation; version 3.
2054
7
 *
2055
8
 * This program is distributed in the hope that it will be useful,
2056
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
2057
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
2058
11
 * GNU General Public License for more details.
2059
12
 *
2060
13
 * You should have received a copy of the GNU General Public License
2061
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
2062
15
 */
2063
16
2064
17
import QtQuick 2.0
2065
18
import QtTest 1.0
2066
19
import Ubuntu.Components 0.1
2067
20
import "../../../../Dash/Apps"
2068
21
import Unity.Test 0.1 as UT
2069
22
2070
23
Item {
2071
24
    id: root
2072
25
    width: units.gu(60)
2073
26
    height: units.gu(80)
2074
27
2075
28
    property var calls: []
2076
29
2077
30
    SignalSpy {
2078
31
        id: sendPreviewSpy
2079
32
        target: appPreview
2080
33
        signalName: "sendUserReview"
2081
34
    }
2082
35
2083
36
    property string commentary: "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus a mi vitae augue rhoncus lobortis ut rutrum metus. Curabitur tortor leo, tristique sed mollis quis, condimentum venenatis nibh.";
2084
37
    QtObject { id: screenshots; property var value: ["fake_image1.png", "fake_image2.png", "fake_image3.png"] }
2085
38
    QtObject { id: rating; property int value: 8 }
2086
39
    QtObject { id: rated; property int value: 120 }
2087
40
    QtObject { id: reviews; property int value: 8 }
2088
41
    QtObject { id: progress; property string value: "source" }
2089
42
    QtObject { id: comments; property var value: [
2090
43
            ["Unity User", 4, "08/20/2013", root.commentary],
2091
44
            ["Unity User", 8, "01/15/2013", root.commentary],
2092
45
            ["Unity User", 10, "10/02/2013", root.commentary],
2093
46
        ]
2094
47
    }
2095
48
2096
49
    QtObject {
2097
50
        id: data
2098
51
        property string title: "Unity App"
2099
52
        property string appIcon: "fake_image.png"
2100
53
        property string description: "This is an Application description"
2101
54
        property var execute: root.fake_call
2102
55
        property var infoMap: {
2103
56
            "more-screenshots": screenshots,
2104
57
            "rating": rating,
2105
58
            "rated": rated,
2106
59
            "reviews": reviews,
2107
60
            "comments": comments
2108
61
        }
2109
62
        property var actions: [
2110
63
            { "id": 123, "displayName": "action1" },
2111
64
            { "id": 456, "displayName": "action2" },
2112
65
            { "id": 789, "displayName": "action3" },
2113
66
        ]
2114
67
    }
2115
68
2116
69
    function fake_call(id, data){
2117
70
        root.calls[root.calls.length] = id;
2118
71
    }
2119
72
2120
73
    // The component under test
2121
74
    AppPreview {
2122
75
        id: appPreview
2123
76
        anchors.fill: parent
2124
77
2125
78
        previewData: data
2126
79
    }
2127
80
2128
81
    UT.UnityTestCase {
2129
82
        name: "AppPreview"
2130
83
        when: windowShown
2131
84
2132
85
        function cleanup() {
2133
86
            root.calls = new Array();
2134
87
            sendPreviewSpy.clear();
2135
88
            var reviewField = findChild(appPreview, "reviewField");
2136
89
            reviewField.focus = false;
2137
90
            reviewField.text = "";
2138
91
        }
2139
92
2140
93
        function test_actions() {
2141
94
            var buttons = findChild(appPreview, "gridButtons");
2142
95
            compare(buttons.count, 3, "Not the proper amount of actions detected.");
2143
96
2144
97
            for(var i = 0; i < buttons.count; i++) {
2145
98
                buttons.currentIndex = i;
2146
99
                buttons.currentItem.clicked();
2147
100
            }
2148
101
2149
102
            var actions = data.actions;
2150
103
            for(var i = 0; i < actions.length; i++) {
2151
104
                compare(root.calls[i], actions[i].id, "Id of action not found.");
2152
105
            }
2153
106
        }
2154
107
2155
108
        function test_rated() {
2156
109
            var rated = findChild(appPreview, "ratedLabel");
2157
110
            compare(rated.text, "(120)", "Rates not equal");
2158
111
        }
2159
112
2160
113
        function test_reviews() {
2161
114
            var rated = findChild(appPreview, "reviewsLabel");
2162
115
            compare(rated.text, "8 reviews", "Reviews don't match");
2163
116
        }
2164
117
2165
118
        function test_send_review() {
2166
119
            var appReviews = findChild(appPreview, "appReviews");
2167
120
            appReviews.sendReview("review");
2168
121
            sendPreviewSpy.wait();
2169
122
        }
2170
123
2171
124
        function test_review_focus() {
2172
125
            var appReviews = findChild(appPreview, "appReviews");
2173
126
            var sendButton = findChild(appReviews, "sendButton");
2174
127
            var reviewField = findChild(appReviews, "reviewField");
2175
128
2176
129
            compare(reviewField.focus, false, "ReviewField shouldn't have focus");
2177
130
            compare(appReviews.state, "", "State should be empty");
2178
131
2179
132
            mouseClick(reviewField, reviewField.width/2, reviewField.height/2);
2180
133
            compare(reviewField.focus, true, "Review Field should have focus");
2181
134
            compare(appReviews.state, "editing", "State should be 'editing'");
2182
135
        }
2183
136
2184
137
        function test_comments() {
2185
138
            var commentsArea = findChild(appPreview, "commentsArea");
2186
139
            compare(commentsArea.count, 3);
2187
140
            for(var i = 0; i < 3; i++) {
2188
141
                var username = commentsArea.itemAt(i).children[0].children[0].text
2189
142
                var rate = commentsArea.itemAt(i).children[0].children[1].children[0].rating
2190
143
                var date = commentsArea.itemAt(i).children[0].children[1].children[1].text
2191
144
                var comment = commentsArea.itemAt(i).children[1].text
2192
145
                compare(username, comments.value[i][0], "Username don't match");
2193
146
                compare(rate, comments.value[i][1], "Rating don't match");
2194
147
                compare(date, comments.value[i][2], "Date don't match");
2195
148
                compare(comment, comments.value[i][3], "Comment don't match");
2196
149
            }
2197
150
        }
2198
151
    }
2199
152
}
2200
0
153
2201
=== added directory 'tests/qmltests/Dash/Video'
2202
=== added file 'tests/qmltests/Dash/Video/tst_VideoPreview.qml'
2203
--- tests/qmltests/Dash/Video/tst_VideoPreview.qml	1970-01-01 00:00:00 +0000
2204
+++ tests/qmltests/Dash/Video/tst_VideoPreview.qml	2013-08-13 09:51:04 +0000
2205
@@ -0,0 +1,63 @@
2206
1
/*
2207
2
 * Copyright 2013 Canonical Ltd.
2208
3
 *
2209
4
 * This program is free software; you can redistribute it and/or modify
2210
5
 * it under the terms of the GNU General Public License as published by
2211
6
 * the Free Software Foundation; version 3.
2212
7
 *
2213
8
 * This program is distributed in the hope that it will be useful,
2214
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
2215
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
2216
11
 * GNU General Public License for more details.
2217
12
 *
2218
13
 * You should have received a copy of the GNU General Public License
2219
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
2220
15
 */
2221
16
2222
17
import QtQuick 2.0
2223
18
import QtTest 1.0
2224
19
import "../../../../Dash/Video"
2225
20
import Unity.Test 0.1 as UT
2226
21
2227
22
Item {
2228
23
    id: root
2229
24
    width: units.gu(60)
2230
25
    height: units.gu(80)
2231
26
2232
27
    SignalSpy {
2233
28
        id: previewClickedSpy
2234
29
        target: preview
2235
30
        signalName: "previewImageClicked"
2236
31
    }
2237
32
2238
33
    // The component under test
2239
34
    VideoPreview {
2240
35
        id: preview
2241
36
        anchors.fill: parent
2242
37
    }
2243
38
2244
39
    UT.UnityTestCase {
2245
40
        name: "VideoPreview"
2246
41
        when: windowShown
2247
42
2248
43
        function test_play_button_data() {
2249
44
            return [
2250
45
            {tag: "playable", playable: true},
2251
46
            {tag: "not playable", playable: false}
2252
47
            ]
2253
48
        }
2254
49
2255
50
        function test_play_button(data) {
2256
51
            var playButton = findChild(preview, "playButton")
2257
52
            preview.playable = data.playable
2258
53
            compare(playButton.visible, data.playable)
2259
54
        }
2260
55
2261
56
        function test_play_button_click() {
2262
57
            preview.playable = true
2263
58
            var playButton = findChild(preview, "playButton")
2264
59
            mouseClick(playButton, 1, 1)
2265
60
            tryCompare(previewClickedSpy, "count", 1)
2266
61
        }
2267
62
    }
2268
63
}
2269
0
64
2270
=== modified file 'tests/qmltests/Dash/tst_DashPreview.qml'
2271
--- tests/qmltests/Dash/tst_DashPreview.qml	2013-06-05 22:03:08 +0000
2272
+++ tests/qmltests/Dash/tst_DashPreview.qml	2013-08-13 09:51:04 +0000
2273
@@ -32,7 +32,6 @@
2274
32
        id: preview
32
        id: preview
2275
33
        anchors.fill: parent
33
        anchors.fill: parent
2276
34
        title: "Testing rocks, debugging sucks!"
34
        title: "Testing rocks, debugging sucks!"
2277
35
        forceSquare: true
2278
36
35
2279
37
        buttons: Row {
36
        buttons: Row {
2280
38
            width: parent.width
37
            width: parent.width
2281
@@ -55,9 +54,9 @@
2282
55
            }
54
            }
2283
56
        }
55
        }
2284
57
56
2286
58
        caption: Label { text: "Caption label" }
57
        header: Label { text: "Caption label" }
2287
59
58
2289
60
        description: Column {
59
        body: Column {
2290
61
            id: testContent
60
            id: testContent
2291
62
            objectName: "testContent"
61
            objectName: "testContent"
2292
63
            width: parent.width
62
            width: parent.width
2293
@@ -102,26 +101,6 @@
2294
102
            compare(closeSpy.count, 1, "Close signal not emitted")
101
            compare(closeSpy.count, 1, "Close signal not emitted")
2295
103
        }
102
        }
2296
104
103
2297
105
        function test_play_button_data() {
2298
106
            return [
2299
107
                {tag: "playable", playable: true},
2300
108
                {tag: "not playable", playable: false}
2301
109
            ]
2302
110
        }
2303
111
2304
112
        function test_play_button(data) {
2305
113
            var playButton = findChild(preview, "playButton")
2306
114
            preview.playable = data.playable
2307
115
            compare(playButton.visible, data.playable)
2308
116
        }
2309
117
2310
118
        function test_play_button_click() {
2311
119
            preview.playable = true
2312
120
            var playButton = findChild(preview, "playButton")
2313
121
            mouseClick(playButton, 1, 1)
2314
122
            tryCompare(previewClickedSpy, "count", 1)
2315
123
        }
2316
124
2317
125
        function test_columns_data() {
104
        function test_columns_data() {
2318
126
            return [
105
            return [
2319
127
                {tag: "1 columns", width: units.gu(5), height: units.gu(10), columns: 1},
106
                {tag: "1 columns", width: units.gu(5), height: units.gu(10), columns: 1},
Status:	Merged
Approved by:	Albert Astals Cid on 2013-08-13
Approved revision:	169
Merged at revision:	192
Proposed branch:	lp:~unity-team/unity8/app-preview-data
Merge into:	lp:unity8
Diff against target:	2319 lines (+1534/-252) 33 files modified Dash/Apps/AppInfo.qml (+88/-0) Dash/Apps/AppPreview.qml (+195/-0) Dash/Apps/AppReviews.qml (+191/-0) Dash/DashApps.qml (+91/-0) Dash/DashPreview.qml (+0/-218) Dash/Generic/GenericPreview.qml (+17/-3) Dash/GenericScopeView.qml (+1/-1) Dash/PreviewDelegateMapper.qml (+2/-0) Dash/Video/VideoPreview.qml (+35/-3) plugins/Ubuntu/CMakeLists.txt (+1/-0) plugins/Ubuntu/DownloadDaemonListener/CMakeLists.txt (+22/-0) plugins/Ubuntu/DownloadDaemonListener/DownloadTracker.cpp (+84/-0) plugins/Ubuntu/DownloadDaemonListener/DownloadTracker.h (+69/-0) plugins/Ubuntu/DownloadDaemonListener/interface/downloadtrackeradaptor.cpp (+25/-0) plugins/Ubuntu/DownloadDaemonListener/interface/downloadtrackeradaptor.h (+125/-0) plugins/Ubuntu/DownloadDaemonListener/interface/metatypes.h (+28/-0) plugins/Ubuntu/DownloadDaemonListener/plugin.cpp (+39/-0) plugins/Ubuntu/DownloadDaemonListener/plugin.h (+37/-0) plugins/Ubuntu/DownloadDaemonListener/qmldir (+3/-0) plugins/Unity/preview.cpp (+7/-0) plugins/Unity/preview.h (+4/-0) po/unity8.pot (+39/-4) tests/mocks/Ubuntu/CMakeLists.txt (+1/-0) tests/mocks/Ubuntu/DownloadDaemonListener/CMakeLists.txt (+18/-0) tests/mocks/Ubuntu/DownloadDaemonListener/MockDownloadTracker.cpp (+67/-0) tests/mocks/Ubuntu/DownloadDaemonListener/MockDownloadTracker.h (+66/-0) tests/mocks/Ubuntu/DownloadDaemonListener/plugin.cpp (+28/-0) tests/mocks/Ubuntu/DownloadDaemonListener/plugin.h (+30/-0) tests/mocks/Ubuntu/DownloadDaemonListener/qmldir (+2/-0) tests/qmltests/CMakeLists.txt (+2/-0) tests/qmltests/Dash/Apps/tst_AppPreview.qml (+152/-0) tests/qmltests/Dash/Video/tst_VideoPreview.qml (+63/-0) tests/qmltests/Dash/tst_DashPreview.qml (+2/-23)
To merge this branch:	bzr merge lp:~unity-team/unity8/app-preview-data
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration	2013-08-09	Approve on 2013-08-13
Albert Astals Cid (community)			Approve on 2013-08-13
Michał Sawicz			Pending
Michael Zanetti		2013-08-09	Pending
Review via email: mp+179348@code.launchpad.net