1
=== modified file 'plugins/Dash/CardCreator.js'
2
--- plugins/Dash/CardCreator.js	2016-08-03 15:49:54 +0000
3
+++ plugins/Dash/CardCreator.js	2016-08-08 08:57:51 +0000
4
@@ -331,13 +331,15 @@
5
331
                        }\n';
331
                        }\n';
6
332
332
7
333
// %1 is used as anchors of touchdown effect
333
// %1 is used as anchors of touchdown effect
11
334
var kTouchdownCode = 'UbuntuShape { \n\
334
var kTouchdownCode = 'Loader { \n\
12
335
                        id: touchdown; \n\
335
                        active: root.pressed; \n\
10
336
                        objectName: "touchdown"; \n\
13
337
                        anchors { %1 } \n\
336
                        anchors { %1 } \n\
17
338
                        visible: root.pressed; \n\
337
                        sourceComponent: UbuntuShape { \n\
18
339
                        radius: "medium"; \n\
338
                            objectName: "touchdown"; \n\
19
340
                        borderSource: "radius_pressed.sci" \n\
339
                            anchors.fill: parent; \n\
20
340
                            radius: "medium"; \n\
21
341
                            borderSource: "radius_pressed.sci" \n\
22
342
                        } \n\
23
341
                    }\n';
343
                    }\n';
24
342
344
25
343
// %1 is used as anchors of subtitleLabel
345
// %1 is used as anchors of subtitleLabel
26
344
346
27
=== modified file 'tests/plugins/Dash/cardcreator/1.res'
28
--- tests/plugins/Dash/cardcreator/1.res	2016-06-28 15:38:21 +0000
29
+++ tests/plugins/Dash/cardcreator/1.res	2016-08-08 08:57:51 +0000
30
@@ -69,13 +69,15 @@
31
69
                        font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal; 
69
                        font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal; 
32
70
                        horizontalAlignment: Text.AlignHCenter;
70
                        horizontalAlignment: Text.AlignHCenter;
33
71
                    }
71
                    }
37
72
UbuntuShape {
72
Loader {
38
73
    id: touchdown;
73
    active: root.pressed;
36
74
    objectName: "touchdown";
39
75
    anchors { fill: artShapeLoader }
74
    anchors { fill: artShapeLoader }
43
76
    visible: root.pressed;
75
    sourceComponent: UbuntuShape {
44
77
    radius: "medium";
76
        objectName: "touchdown";
45
78
    borderSource: "radius_pressed.sci"
77
        anchors.fill: parent;
46
78
        radius: "medium";
47
79
        borderSource: "radius_pressed.sci"
48
80
    }
49
79
}
81
}
50
80
implicitHeight: titleLabel.y + titleLabel.height + units.gu(1);
82
implicitHeight: titleLabel.y + titleLabel.height + units.gu(1);
51
81
}
83
}
52
82
84
53
=== modified file 'tests/plugins/Dash/cardcreator/1.res.cardcreator'
54
--- tests/plugins/Dash/cardcreator/1.res.cardcreator	2016-06-28 15:50:44 +0000
55
+++ tests/plugins/Dash/cardcreator/1.res.cardcreator	2016-08-08 08:57:51 +0000
56
@@ -65,13 +65,15 @@
57
65
                        font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal; 
65
                        font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal; 
58
66
                        horizontalAlignment: Text.AlignHCenter;
66
                        horizontalAlignment: Text.AlignHCenter;
59
67
                    }
67
                    }
63
68
UbuntuShape {
68
Loader {
64
69
    id: touchdown;
69
    active: root.pressed;
62
70
    objectName: "touchdown";
65
71
    anchors { fill: artShapeLoader }
70
    anchors { fill: artShapeLoader }
69
72
    visible: root.pressed;
71
    sourceComponent: UbuntuShape {
70
73
    radius: "medium";
72
        objectName: "touchdown";
71
74
    borderSource: "radius_pressed.sci"
73
        anchors.fill: parent;
72
74
        radius: "medium";
73
75
        borderSource: "radius_pressed.sci"
74
76
    }
75
75
}
77
}
76
76
implicitHeight: titleLabel.y + titleLabel.height + units.gu(1);
78
implicitHeight: titleLabel.y + titleLabel.height + units.gu(1);
77
77
}
79
}
78
78
80
79
=== modified file 'tests/plugins/Dash/cardcreator/11.res'
80
--- tests/plugins/Dash/cardcreator/11.res	2016-06-28 15:38:21 +0000
81
+++ tests/plugins/Dash/cardcreator/11.res	2016-08-08 08:57:51 +0000
82
@@ -163,13 +163,15 @@
83
163
 
163
 
84
164
                                ] 
164
                                ] 
85
165
                    }
165
                    }
94
166
UbuntuShape { 
166
Loader {
95
167
                        id: touchdown; 
167
    active: root.pressed;
96
168
                        objectName: "touchdown"; 
168
    anchors { fill: backgroundLoader }
97
169
                        anchors { fill: backgroundLoader } 
169
    sourceComponent: UbuntuShape {
98
170
                        visible: root.pressed;
170
        objectName: "touchdown";
99
171
                        radius: "medium"; 
171
        anchors.fill: parent;
100
172
                        borderSource: "radius_pressed.sci" 
172
        radius: "medium";
101
173
                    }
173
        borderSource: "radius_pressed.sci"
102
174
    }
103
175
}
104
174
implicitHeight: row.y + row.height + units.gu(1);
176
implicitHeight: row.y + row.height + units.gu(1);
105
175
}
177
}
106
176
178
107
=== modified file 'tests/plugins/Dash/cardcreator/11.res.cardcreator'
108
--- tests/plugins/Dash/cardcreator/11.res.cardcreator	2016-06-28 15:50:44 +0000
109
+++ tests/plugins/Dash/cardcreator/11.res.cardcreator	2016-08-08 08:57:51 +0000
110
@@ -156,13 +156,15 @@
111
156
 
156
 
112
157
                                ] 
157
                                ] 
113
158
                    }
158
                    }
122
159
UbuntuShape { 
159
Loader {
123
160
                        id: touchdown; 
160
    active: root.pressed;
124
161
                        objectName: "touchdown"; 
161
    anchors { fill: backgroundLoader }
125
162
                        anchors { fill: backgroundLoader } 
162
    sourceComponent: UbuntuShape {
126
163
                        visible: root.pressed;
163
        objectName: "touchdown";
127
164
                        radius: "medium"; 
164
        anchors.fill: parent;
128
165
                        borderSource: "radius_pressed.sci" 
165
        radius: "medium";
129
166
                    }
166
        borderSource: "radius_pressed.sci"
130
167
    }
131
168
}
132
167
implicitHeight: row.y + row.height + units.gu(1);
169
implicitHeight: row.y + row.height + units.gu(1);
133
168
}
170
}
134
169
171
135
=== modified file 'tests/plugins/Dash/cardcreator/12.res'
136
--- tests/plugins/Dash/cardcreator/12.res	2016-06-28 15:38:21 +0000
137
+++ tests/plugins/Dash/cardcreator/12.res	2016-08-08 08:57:51 +0000
138
@@ -95,13 +95,15 @@
139
95
    model: cardData && cardData["socialActions"];
95
    model: cardData && cardData["socialActions"];
140
96
    onClicked: root.action(actionId);
96
    onClicked: root.action(actionId);
141
97
}
97
}
145
98
UbuntuShape {
98
Loader {
146
99
    id: touchdown;
99
    active: root.pressed;
144
100
    objectName: "touchdown";
147
101
    anchors { fill: artShapeLoader }
100
    anchors { fill: artShapeLoader }
151
102
    visible: root.pressed;
101
    sourceComponent: UbuntuShape {
152
103
    radius: "medium";
102
        objectName: "touchdown";
153
104
    borderSource: "radius_pressed.sci"
103
        anchors.fill: parent;
154
104
        radius: "medium";
155
105
        borderSource: "radius_pressed.sci"
156
106
    }
157
105
}
107
}
158
106
implicitHeight: socialActionsRow.y + socialActionsRow.height + units.gu(1);
108
implicitHeight: socialActionsRow.y + socialActionsRow.height + units.gu(1);
159
107
}
109
}
160
108
110
161
=== modified file 'tests/plugins/Dash/cardcreator/12.res.cardcreator'
162
--- tests/plugins/Dash/cardcreator/12.res.cardcreator	2016-06-28 15:50:44 +0000
163
+++ tests/plugins/Dash/cardcreator/12.res.cardcreator	2016-08-08 08:57:51 +0000
164
@@ -91,13 +91,15 @@
165
91
    model: cardData && cardData["socialActions"];
91
    model: cardData && cardData["socialActions"];
166
92
    onClicked: root.action(actionId);
92
    onClicked: root.action(actionId);
167
93
}
93
}
171
94
UbuntuShape {
94
Loader {
172
95
    id: touchdown;
95
    active: root.pressed;
170
96
    objectName: "touchdown";
173
97
    anchors { fill: artShapeLoader }
96
    anchors { fill: artShapeLoader }
177
98
    visible: root.pressed;
97
    sourceComponent: UbuntuShape {
178
99
    radius: "medium";
98
        objectName: "touchdown";
179
100
    borderSource: "radius_pressed.sci"
99
        anchors.fill: parent;
180
100
        radius: "medium";
181
101
        borderSource: "radius_pressed.sci"
182
102
    }
183
101
}
103
}
184
102
implicitHeight: socialActionsRow.y + socialActionsRow.height + units.gu(1);
104
implicitHeight: socialActionsRow.y + socialActionsRow.height + units.gu(1);
185
103
}
105
}
186
104
106
187
=== modified file 'tests/plugins/Dash/cardcreator/4.res'
188
--- tests/plugins/Dash/cardcreator/4.res	2016-05-26 14:53:20 +0000
189
+++ tests/plugins/Dash/cardcreator/4.res	2016-08-08 08:57:51 +0000
190
@@ -98,13 +98,15 @@
191
98
}
98
}
192
99
]
99
]
193
100
}
100
}
197
101
UbuntuShape {
101
Loader {
198
102
    id: touchdown;
102
    active: root.pressed;
196
103
    objectName: "touchdown";
199
104
    anchors { fill: root }
103
    anchors { fill: root }
203
105
    visible: root.pressed;
104
    sourceComponent: UbuntuShape {
204
106
    radius: "medium";
105
        objectName: "touchdown";
205
107
    borderSource: "radius_pressed.sci"
106
        anchors.fill: parent;
206
107
        radius: "medium";
207
108
        borderSource: "radius_pressed.sci"
208
109
    }
209
108
}
110
}
210
109
implicitHeight: row.y + row.height + units.gu(1);
111
implicitHeight: row.y + row.height + units.gu(1);
211
110
}
112
}
212
111
113
213
=== modified file 'tests/plugins/Dash/cardcreator/4.res.cardcreator'
214
--- tests/plugins/Dash/cardcreator/4.res.cardcreator	2016-05-26 14:53:20 +0000
215
+++ tests/plugins/Dash/cardcreator/4.res.cardcreator	2016-08-08 08:57:51 +0000
216
@@ -95,13 +95,15 @@
217
95
}
95
}
218
96
]
96
]
219
97
}
97
}
223
98
UbuntuShape {
98
Loader {
224
99
    id: touchdown;
99
    active: root.pressed;
222
100
    objectName: "touchdown";
225
101
    anchors { fill: root }
100
    anchors { fill: root }
229
102
    visible: root.pressed;
101
    sourceComponent: UbuntuShape {
230
103
    radius: "medium";
102
        objectName: "touchdown";
231
104
    borderSource: "radius_pressed.sci"
103
        anchors.fill: parent;
232
104
        radius: "medium";
233
105
        borderSource: "radius_pressed.sci"
234
106
    }
235
105
}
107
}
236
106
implicitHeight: row.y + row.height + units.gu(1);
108
implicitHeight: row.y + row.height + units.gu(1);
237
107
}
109
}
238
108
110
239
=== modified file 'tests/plugins/Dash/cardcreator/6.res'
240
--- tests/plugins/Dash/cardcreator/6.res	2016-05-26 14:53:20 +0000
241
+++ tests/plugins/Dash/cardcreator/6.res	2016-08-08 08:57:51 +0000
242
@@ -114,13 +114,15 @@
243
114
 
114
 
244
115
                            ]
115
                            ]
245
116
                        }
116
                        }
249
117
UbuntuShape {
117
Loader {
250
118
    id: touchdown;
118
    active: root.pressed;
248
119
    objectName: "touchdown";
251
120
    anchors { fill: backgroundLoader }
119
    anchors { fill: backgroundLoader }
255
121
    visible: root.pressed;
120
    sourceComponent: UbuntuShape {
256
122
    radius: "medium";
121
        objectName: "touchdown";
257
123
    borderSource: "radius_pressed.sci"
122
        anchors.fill: parent;
258
123
        radius: "medium";
259
124
        borderSource: "radius_pressed.sci"
260
125
    }
261
124
}
126
}
262
125
implicitHeight: headerTitleContainer.y + headerTitleContainer.height + units.gu(1);
127
implicitHeight: headerTitleContainer.y + headerTitleContainer.height + units.gu(1);
263
126
}
128
}
264
127
129
265
=== modified file 'tests/plugins/Dash/cardcreator/6.res.cardcreator'
266
--- tests/plugins/Dash/cardcreator/6.res.cardcreator	2016-05-26 14:53:20 +0000
267
+++ tests/plugins/Dash/cardcreator/6.res.cardcreator	2016-08-08 08:57:51 +0000
268
@@ -112,13 +112,15 @@
269
112
 
112
 
270
113
                            ]
113
                            ]
271
114
                        }
114
                        }
275
115
UbuntuShape {
115
Loader {
276
116
    id: touchdown;
116
    active: root.pressed;
274
117
    objectName: "touchdown";
277
118
    anchors { fill: backgroundLoader }
117
    anchors { fill: backgroundLoader }
281
119
    visible: root.pressed;
118
    sourceComponent: UbuntuShape {
282
120
    radius: "medium";
119
        objectName: "touchdown";
283
121
    borderSource: "radius_pressed.sci"
120
        anchors.fill: parent;
284
121
        radius: "medium";
285
122
        borderSource: "radius_pressed.sci"
286
123
    }
287
122
}
124
}
288
123
implicitHeight: headerTitleContainer.y + headerTitleContainer.height + units.gu(1);
125
implicitHeight: headerTitleContainer.y + headerTitleContainer.height + units.gu(1);
289
124
}
126
}
290
125
127
291
=== modified file 'tests/plugins/Dash/cardcreator/8.res'
292
--- tests/plugins/Dash/cardcreator/8.res	2016-05-26 14:53:20 +0000
293
+++ tests/plugins/Dash/cardcreator/8.res	2016-08-08 08:57:51 +0000
294
@@ -96,13 +96,15 @@
295
96
 
96
 
296
97
                                ] 
97
                                ] 
297
98
                    }
98
                    }
301
99
UbuntuShape { 
99
Loader {
302
100
    id: touchdown;
100
    active: root.pressed;
300
101
    objectName: "touchdown";
303
102
    anchors { fill: backgroundLoader }
101
    anchors { fill: backgroundLoader }
307
103
    visible: root.pressed;
102
    sourceComponent: UbuntuShape {
308
104
    radius: "medium";
103
        objectName: "touchdown";
309
105
    borderSource: "radius_pressed.sci"
104
        anchors.fill: parent;
310
105
        radius: "medium";
311
106
        borderSource: "radius_pressed.sci"
312
107
    }
313
106
}
108
}
314
107
implicitHeight: row.y + row.height + units.gu(1);
109
implicitHeight: row.y + row.height + units.gu(1);
315
108
}
110
}
316
109
111
317
=== modified file 'tests/plugins/Dash/cardcreator/8.res.cardcreator'
318
--- tests/plugins/Dash/cardcreator/8.res.cardcreator	2016-05-26 14:53:20 +0000
319
+++ tests/plugins/Dash/cardcreator/8.res.cardcreator	2016-08-08 08:57:51 +0000
320
@@ -93,13 +93,15 @@
321
93
 
93
 
322
94
                                ] 
94
                                ] 
323
95
                    }
95
                    }
327
96
UbuntuShape { 
96
Loader {
328
97
    id: touchdown;
97
    active: root.pressed;
326
98
    objectName: "touchdown";
329
99
    anchors { fill: backgroundLoader }
98
    anchors { fill: backgroundLoader }
333
100
    visible: root.pressed;
99
    sourceComponent: UbuntuShape {
334
101
    radius: "medium";
100
        objectName: "touchdown";
335
102
    borderSource: "radius_pressed.sci"
101
        anchors.fill: parent;
336
102
        radius: "medium";
337
103
        borderSource: "radius_pressed.sci"
338
104
    }
339
103
}
105
}
340
104
implicitHeight: row.y + row.height + units.gu(1);
106
implicitHeight: row.y + row.height + units.gu(1);
341
105
}
107
}
342
106
108
343
=== modified file 'tests/plugins/Dash/cardcreator/9.res'
344
--- tests/plugins/Dash/cardcreator/9.res	2016-05-20 14:53:04 +0000
345
+++ tests/plugins/Dash/cardcreator/9.res	2016-08-08 08:57:51 +0000
346
@@ -107,13 +107,15 @@
347
107
                            onPressAndHold: { 
107
                            onPressAndHold: { 
348
108
                                root.pressAndHold(); 
108
                                root.pressAndHold(); 
349
109
                            } 
109
                            } 
358
110
                        }UbuntuShape { 
110
                        }Loader {
359
111
                        id: touchdown; 
111
    active: root.pressed;
360
112
                        objectName: "touchdown"; 
112
    anchors { fill: root }
361
113
                        anchors { fill: root } 
113
    sourceComponent: UbuntuShape {
362
114
                        visible: root.pressed;
114
        objectName: "touchdown";
363
115
                        radius: "medium"; 
115
        anchors.fill: parent;
364
116
                        borderSource: "radius_pressed.sci" 
116
        radius: "medium";
365
117
                    }
117
        borderSource: "radius_pressed.sci"
366
118
    }
367
119
}
368
118
implicitHeight: audioButton.height;
120
implicitHeight: audioButton.height;
369
119
}
121
}
370
120
122
371
=== modified file 'tests/plugins/Dash/cardcreator/9.res.cardcreator'
372
--- tests/plugins/Dash/cardcreator/9.res.cardcreator	2016-05-20 14:53:04 +0000
373
+++ tests/plugins/Dash/cardcreator/9.res.cardcreator	2016-08-08 08:57:51 +0000
374
@@ -105,13 +105,15 @@
375
105
                            onPressAndHold: { 
105
                            onPressAndHold: { 
376
106
                                root.pressAndHold(); 
106
                                root.pressAndHold(); 
377
107
                            } 
107
                            } 
386
108
                        }UbuntuShape { 
108
                        }Loader {
387
109
                        id: touchdown; 
109
    active: root.pressed;
388
110
                        objectName: "touchdown"; 
110
    anchors { fill: root }
389
111
                        anchors { fill: root } 
111
    sourceComponent: UbuntuShape {
390
112
                        visible: root.pressed;
112
        objectName: "touchdown";
391
113
                        radius: "medium"; 
113
        anchors.fill: parent;
392
114
                        borderSource: "radius_pressed.sci" 
114
        radius: "medium";
393
115
                    }
115
        borderSource: "radius_pressed.sci"
394
116
    }
395
117
}
396
116
implicitHeight: audioButton.height;
118
implicitHeight: audioButton.height;
397
117
}
119
}
398
118
120
399
=== modified file 'tests/qmltests/Dash/tst_Card.qml'
400
--- tests/qmltests/Dash/tst_Card.qml	2016-06-02 08:10:48 +0000
401
+++ tests/qmltests/Dash/tst_Card.qml	2016-08-08 08:57:51 +0000
402
@@ -618,12 +618,17 @@
403
618
            waitForRendering(card);
618
            waitForRendering(card);
404
619
619
405
620
            var touchdown = findChild(card, "touchdown");
620
            var touchdown = findChild(card, "touchdown");
406
621
            compare(touchdown, null);
407
621
622
408
622
            compare(touchdown.visible, false);
409
623
            mousePress(card);
623
            mousePress(card);
410
624
411
625
            touchdown = findChild(card, "touchdown");
412
624
            compare(touchdown.visible, true);
626
            compare(touchdown.visible, true);
413
627
414
625
            mouseRelease(card);
628
            mouseRelease(card);
416
626
            compare(touchdown.visible, false);
629
417
630
            touchdown = findChild(card, "touchdown");
418
631
            compare(touchdown, null);
419
627
        }
632
        }
420
628
633
421
629
        function test_paddings_data() {
634
        function test_paddings_data() {
422
630
635
423
=== modified file 'tests/qmltests/Dash/tst_GenericScopeView.qml'
424
--- tests/qmltests/Dash/tst_GenericScopeView.qml	2016-06-29 14:45:18 +0000
425
+++ tests/qmltests/Dash/tst_GenericScopeView.qml	2016-08-08 08:57:51 +0000
426
@@ -642,11 +642,15 @@
427
642
                var item0 = findChild(cardGrid, "delegate0");
642
                var item0 = findChild(cardGrid, "delegate0");
428
643
                waitForRendering(item0);
643
                waitForRendering(item0);
429
644
                compare(item0.enabled, false);
644
                compare(item0.enabled, false);
430
645
431
645
                var touchdown = findChild(item0, "touchdown");
646
                var touchdown = findChild(item0, "touchdown");
432
647
                compare(touchdown, null);
433
646
648
434
647
                compare(touchdown.visible, false);
435
648
                mousePress(item0);
649
                mousePress(item0);
437
649
                compare(touchdown.visible, false);
650
438
651
                touchdown = findChild(item0, "touchdown");
439
652
                compare(touchdown, null);
440
653
441
650
                mouseRelease(item0);
654
                mouseRelease(item0);
442
651
655
443
652
                cardTool.template["non-interactive"] = false;
656
                cardTool.template["non-interactive"] = false;
444
@@ -656,13 +660,19 @@
445
656
                waitForRendering(category0);
660
                waitForRendering(category0);
446
657
                item0 = findChild(cardGrid, "delegate0");
661
                item0 = findChild(cardGrid, "delegate0");
447
658
                compare(item0.enabled, true);
662
                compare(item0.enabled, true);
451
659
                var touchdown = findChild(item0, "touchdown");
663
452
660
664
                touchdown = findChild(item0, "touchdown");
453
661
                compare(touchdown.visible, false);
665
                compare(touchdown, null);
454
666
455
662
                mousePress(item0);
667
                mousePress(item0);
456
668
457
669
                touchdown = findChild(item0, "touchdown");
458
663
                compare(touchdown.visible, true);
670
                compare(touchdown.visible, true);
459
671
460
664
                mouseRelease(item0);
672
                mouseRelease(item0);
462
665
                compare(touchdown.visible, false);
673
463
674
                touchdown = findChild(item0, "touchdown");
464
675
                compare(touchdown, null);
465
666
                closePreview();
676
                closePreview();
466
667
            }
677
            }
467
668
678
Status:	Merged
Approved by:	Josh Arenson on 2016-08-24
Approved revision:	2546
Merged at revision:	2617
Proposed branch:	lp:~aacid/unity8/touchdownLoader
Merge into:	lp:unity8
Diff against target:	466 lines (+151/-106) 17 files modified plugins/Dash/CardCreator.js (+8/-6) tests/plugins/Dash/cardcreator/1.res (+8/-6) tests/plugins/Dash/cardcreator/1.res.cardcreator (+8/-6) tests/plugins/Dash/cardcreator/11.res (+10/-8) tests/plugins/Dash/cardcreator/11.res.cardcreator (+10/-8) tests/plugins/Dash/cardcreator/12.res (+8/-6) tests/plugins/Dash/cardcreator/12.res.cardcreator (+8/-6) tests/plugins/Dash/cardcreator/4.res (+8/-6) tests/plugins/Dash/cardcreator/4.res.cardcreator (+8/-6) tests/plugins/Dash/cardcreator/6.res (+8/-6) tests/plugins/Dash/cardcreator/6.res.cardcreator (+8/-6) tests/plugins/Dash/cardcreator/8.res (+8/-6) tests/plugins/Dash/cardcreator/8.res.cardcreator (+8/-6) tests/plugins/Dash/cardcreator/9.res (+10/-8) tests/plugins/Dash/cardcreator/9.res.cardcreator (+10/-8) tests/qmltests/Dash/tst_Card.qml (+7/-2) tests/qmltests/Dash/tst_GenericScopeView.qml (+16/-6)
To merge this branch:	bzr merge lp:~aacid/unity8/touchdownLoader
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Unity8 CI Bot	continuous-integration		Approve on 2016-08-24
Josh Arenson		2016-07-21	Approve on 2016-08-24
Andrea Cimitan (community)			Approve on 2016-08-24
Michael Terry			Approve on 2016-08-24
Review via email: mp+300735@code.launchpad.net
1	=== modified file 'plugins/Dash/CardCreator.js'
2	--- plugins/Dash/CardCreator.js 2016-08-03 15:49:54 +0000
3	+++ plugins/Dash/CardCreator.js 2016-08-08 08:57:51 +0000
4	@@ -331,13 +331,15 @@
5	331	}\n';	331	}\n';
6	332		332
7	333	// %1 is used as anchors of touchdown effect	333	// %1 is used as anchors of touchdown effect
11	334	var kTouchdownCode = 'UbuntuShape { \n\	334	var kTouchdownCode = 'Loader { \n\
12	335	id: touchdown; \n\	335	active: root.pressed; \n\
10	336	objectName: "touchdown"; \n\
13	337	anchors { %1 } \n\	336	anchors { %1 } \n\
17	338	visible: root.pressed; \n\	337	sourceComponent: UbuntuShape { \n\
18	339	radius: "medium"; \n\	338	objectName: "touchdown"; \n\
19	340	borderSource: "radius_pressed.sci" \n\	339	anchors.fill: parent; \n\
20			340	radius: "medium"; \n\
21			341	borderSource: "radius_pressed.sci" \n\
22			342	} \n\
23	341	}\n';	343	}\n';
24	342		344
25	343	// %1 is used as anchors of subtitleLabel	345	// %1 is used as anchors of subtitleLabel
26	344		346
27	=== modified file 'tests/plugins/Dash/cardcreator/1.res'
28	--- tests/plugins/Dash/cardcreator/1.res 2016-06-28 15:38:21 +0000
29	+++ tests/plugins/Dash/cardcreator/1.res 2016-08-08 08:57:51 +0000
30	@@ -69,13 +69,15 @@
31	69	font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal;	69	font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal;
32	70	horizontalAlignment: Text.AlignHCenter;	70	horizontalAlignment: Text.AlignHCenter;
33	71	}	71	}
37	72	UbuntuShape {	72	Loader {
38	73	id: touchdown;	73	active: root.pressed;
36	74	objectName: "touchdown";
39	75	anchors { fill: artShapeLoader }	74	anchors { fill: artShapeLoader }
43	76	visible: root.pressed;	75	sourceComponent: UbuntuShape {
44	77	radius: "medium";	76	objectName: "touchdown";
45	78	borderSource: "radius_pressed.sci"	77	anchors.fill: parent;
46			78	radius: "medium";
47			79	borderSource: "radius_pressed.sci"
48			80	}
49	79	}	81	}
50	80	implicitHeight: titleLabel.y + titleLabel.height + units.gu(1);	82	implicitHeight: titleLabel.y + titleLabel.height + units.gu(1);
51	81	}	83	}
52	82		84
53	=== modified file 'tests/plugins/Dash/cardcreator/1.res.cardcreator'
54	--- tests/plugins/Dash/cardcreator/1.res.cardcreator 2016-06-28 15:50:44 +0000
55	+++ tests/plugins/Dash/cardcreator/1.res.cardcreator 2016-08-08 08:57:51 +0000
56	@@ -65,13 +65,15 @@
57	65	font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal;	65	font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal;
58	66	horizontalAlignment: Text.AlignHCenter;	66	horizontalAlignment: Text.AlignHCenter;
59	67	}	67	}
63	68	UbuntuShape {	68	Loader {
64	69	id: touchdown;	69	active: root.pressed;
62	70	objectName: "touchdown";
65	71	anchors { fill: artShapeLoader }	70	anchors { fill: artShapeLoader }
69	72	visible: root.pressed;	71	sourceComponent: UbuntuShape {
70	73	radius: "medium";	72	objectName: "touchdown";
71	74	borderSource: "radius_pressed.sci"	73	anchors.fill: parent;
72			74	radius: "medium";
73			75	borderSource: "radius_pressed.sci"
74			76	}
75	75	}	77	}
76	76	implicitHeight: titleLabel.y + titleLabel.height + units.gu(1);	78	implicitHeight: titleLabel.y + titleLabel.height + units.gu(1);
77	77	}	79	}
78	78		80
79	=== modified file 'tests/plugins/Dash/cardcreator/11.res'
80	--- tests/plugins/Dash/cardcreator/11.res 2016-06-28 15:38:21 +0000
81	+++ tests/plugins/Dash/cardcreator/11.res 2016-08-08 08:57:51 +0000
82	@@ -163,13 +163,15 @@
83	163		163
84	164	]	164	]
85	165	}	165	}
94	166	UbuntuShape {	166	Loader {
95	167	id: touchdown;	167	active: root.pressed;
96	168	objectName: "touchdown";	168	anchors { fill: backgroundLoader }
97	169	anchors { fill: backgroundLoader }	169	sourceComponent: UbuntuShape {
98	170	visible: root.pressed;	170	objectName: "touchdown";
99	171	radius: "medium";	171	anchors.fill: parent;
100	172	borderSource: "radius_pressed.sci"	172	radius: "medium";
101	173	}	173	borderSource: "radius_pressed.sci"
102			174	}
103			175	}
104	174	implicitHeight: row.y + row.height + units.gu(1);	176	implicitHeight: row.y + row.height + units.gu(1);
105	175	}	177	}
106	176		178
107	=== modified file 'tests/plugins/Dash/cardcreator/11.res.cardcreator'
108	--- tests/plugins/Dash/cardcreator/11.res.cardcreator 2016-06-28 15:50:44 +0000
109	+++ tests/plugins/Dash/cardcreator/11.res.cardcreator 2016-08-08 08:57:51 +0000
110	@@ -156,13 +156,15 @@
111	156		156
112	157	]	157	]
113	158	}	158	}
122	159	UbuntuShape {	159	Loader {
123	160	id: touchdown;	160	active: root.pressed;
124	161	objectName: "touchdown";	161	anchors { fill: backgroundLoader }
125	162	anchors { fill: backgroundLoader }	162	sourceComponent: UbuntuShape {
126	163	visible: root.pressed;	163	objectName: "touchdown";
127	164	radius: "medium";	164	anchors.fill: parent;
128	165	borderSource: "radius_pressed.sci"	165	radius: "medium";
129	166	}	166	borderSource: "radius_pressed.sci"
130			167	}
131			168	}
132	167	implicitHeight: row.y + row.height + units.gu(1);	169	implicitHeight: row.y + row.height + units.gu(1);
133	168	}	170	}
134	169		171
135	=== modified file 'tests/plugins/Dash/cardcreator/12.res'
136	--- tests/plugins/Dash/cardcreator/12.res 2016-06-28 15:38:21 +0000
137	+++ tests/plugins/Dash/cardcreator/12.res 2016-08-08 08:57:51 +0000
138	@@ -95,13 +95,15 @@
139	95	model: cardData && cardData["socialActions"];	95	model: cardData && cardData["socialActions"];
140	96	onClicked: root.action(actionId);	96	onClicked: root.action(actionId);
141	97	}	97	}
145	98	UbuntuShape {	98	Loader {
146	99	id: touchdown;	99	active: root.pressed;
144	100	objectName: "touchdown";
147	101	anchors { fill: artShapeLoader }	100	anchors { fill: artShapeLoader }
151	102	visible: root.pressed;	101	sourceComponent: UbuntuShape {
152	103	radius: "medium";	102	objectName: "touchdown";
153	104	borderSource: "radius_pressed.sci"	103	anchors.fill: parent;
154			104	radius: "medium";
155			105	borderSource: "radius_pressed.sci"
156			106	}
157	105	}	107	}
158	106	implicitHeight: socialActionsRow.y + socialActionsRow.height + units.gu(1);	108	implicitHeight: socialActionsRow.y + socialActionsRow.height + units.gu(1);
159	107	}	109	}
160	108		110
161	=== modified file 'tests/plugins/Dash/cardcreator/12.res.cardcreator'
162	--- tests/plugins/Dash/cardcreator/12.res.cardcreator 2016-06-28 15:50:44 +0000
163	+++ tests/plugins/Dash/cardcreator/12.res.cardcreator 2016-08-08 08:57:51 +0000
164	@@ -91,13 +91,15 @@
165	91	model: cardData && cardData["socialActions"];	91	model: cardData && cardData["socialActions"];
166	92	onClicked: root.action(actionId);	92	onClicked: root.action(actionId);
167	93	}	93	}
171	94	UbuntuShape {	94	Loader {
172	95	id: touchdown;	95	active: root.pressed;
170	96	objectName: "touchdown";
173	97	anchors { fill: artShapeLoader }	96	anchors { fill: artShapeLoader }
177	98	visible: root.pressed;	97	sourceComponent: UbuntuShape {
178	99	radius: "medium";	98	objectName: "touchdown";
179	100	borderSource: "radius_pressed.sci"	99	anchors.fill: parent;
180			100	radius: "medium";
181			101	borderSource: "radius_pressed.sci"
182			102	}
183	101	}	103	}
184	102	implicitHeight: socialActionsRow.y + socialActionsRow.height + units.gu(1);	104	implicitHeight: socialActionsRow.y + socialActionsRow.height + units.gu(1);
185	103	}	105	}
186	104		106
187	=== modified file 'tests/plugins/Dash/cardcreator/4.res'
188	--- tests/plugins/Dash/cardcreator/4.res 2016-05-26 14:53:20 +0000
189	+++ tests/plugins/Dash/cardcreator/4.res 2016-08-08 08:57:51 +0000
190	@@ -98,13 +98,15 @@
191	98	}	98	}
192	99	]	99	]
193	100	}	100	}
197	101	UbuntuShape {	101	Loader {
198	102	id: touchdown;	102	active: root.pressed;
196	103	objectName: "touchdown";
199	104	anchors { fill: root }	103	anchors { fill: root }
203	105	visible: root.pressed;	104	sourceComponent: UbuntuShape {
204	106	radius: "medium";	105	objectName: "touchdown";
205	107	borderSource: "radius_pressed.sci"	106	anchors.fill: parent;
206			107	radius: "medium";
207			108	borderSource: "radius_pressed.sci"
208			109	}
209	108	}	110	}
210	109	implicitHeight: row.y + row.height + units.gu(1);	111	implicitHeight: row.y + row.height + units.gu(1);
211	110	}	112	}
212	111		113
213	=== modified file 'tests/plugins/Dash/cardcreator/4.res.cardcreator'
214	--- tests/plugins/Dash/cardcreator/4.res.cardcreator 2016-05-26 14:53:20 +0000
215	+++ tests/plugins/Dash/cardcreator/4.res.cardcreator 2016-08-08 08:57:51 +0000
216	@@ -95,13 +95,15 @@
217	95	}	95	}
218	96	]	96	]
219	97	}	97	}
223	98	UbuntuShape {	98	Loader {
224	99	id: touchdown;	99	active: root.pressed;
222	100	objectName: "touchdown";
225	101	anchors { fill: root }	100	anchors { fill: root }
229	102	visible: root.pressed;	101	sourceComponent: UbuntuShape {
230	103	radius: "medium";	102	objectName: "touchdown";
231	104	borderSource: "radius_pressed.sci"	103	anchors.fill: parent;
232			104	radius: "medium";
233			105	borderSource: "radius_pressed.sci"
234			106	}
235	105	}	107	}
236	106	implicitHeight: row.y + row.height + units.gu(1);	108	implicitHeight: row.y + row.height + units.gu(1);
237	107	}	109	}
238	108		110
239	=== modified file 'tests/plugins/Dash/cardcreator/6.res'
240	--- tests/plugins/Dash/cardcreator/6.res 2016-05-26 14:53:20 +0000
241	+++ tests/plugins/Dash/cardcreator/6.res 2016-08-08 08:57:51 +0000
242	@@ -114,13 +114,15 @@
243	114		114
244	115	]	115	]
245	116	}	116	}
249	117	UbuntuShape {	117	Loader {
250	118	id: touchdown;	118	active: root.pressed;
248	119	objectName: "touchdown";
251	120	anchors { fill: backgroundLoader }	119	anchors { fill: backgroundLoader }
255	121	visible: root.pressed;	120	sourceComponent: UbuntuShape {
256	122	radius: "medium";	121	objectName: "touchdown";
257	123	borderSource: "radius_pressed.sci"	122	anchors.fill: parent;
258			123	radius: "medium";
259			124	borderSource: "radius_pressed.sci"
260			125	}
261	124	}	126	}
262	125	implicitHeight: headerTitleContainer.y + headerTitleContainer.height + units.gu(1);	127	implicitHeight: headerTitleContainer.y + headerTitleContainer.height + units.gu(1);
263	126	}	128	}
264	127		129
265	=== modified file 'tests/plugins/Dash/cardcreator/6.res.cardcreator'
266	--- tests/plugins/Dash/cardcreator/6.res.cardcreator 2016-05-26 14:53:20 +0000
267	+++ tests/plugins/Dash/cardcreator/6.res.cardcreator 2016-08-08 08:57:51 +0000
268	@@ -112,13 +112,15 @@
269	112		112
270	113	]	113	]
271	114	}	114	}
275	115	UbuntuShape {	115	Loader {
276	116	id: touchdown;	116	active: root.pressed;
274	117	objectName: "touchdown";
277	118	anchors { fill: backgroundLoader }	117	anchors { fill: backgroundLoader }
281	119	visible: root.pressed;	118	sourceComponent: UbuntuShape {
282	120	radius: "medium";	119	objectName: "touchdown";
283	121	borderSource: "radius_pressed.sci"	120	anchors.fill: parent;
284			121	radius: "medium";
285			122	borderSource: "radius_pressed.sci"
286			123	}
287	122	}	124	}
288	123	implicitHeight: headerTitleContainer.y + headerTitleContainer.height + units.gu(1);	125	implicitHeight: headerTitleContainer.y + headerTitleContainer.height + units.gu(1);
289	124	}	126	}
290	125		127
291	=== modified file 'tests/plugins/Dash/cardcreator/8.res'
292	--- tests/plugins/Dash/cardcreator/8.res 2016-05-26 14:53:20 +0000
293	+++ tests/plugins/Dash/cardcreator/8.res 2016-08-08 08:57:51 +0000
294	@@ -96,13 +96,15 @@
295	96		96
296	97	]	97	]
297	98	}	98	}
301	99	UbuntuShape {	99	Loader {
302	100	id: touchdown;	100	active: root.pressed;
300	101	objectName: "touchdown";
303	102	anchors { fill: backgroundLoader }	101	anchors { fill: backgroundLoader }
307	103	visible: root.pressed;	102	sourceComponent: UbuntuShape {
308	104	radius: "medium";	103	objectName: "touchdown";
309	105	borderSource: "radius_pressed.sci"	104	anchors.fill: parent;
310			105	radius: "medium";
311			106	borderSource: "radius_pressed.sci"
312			107	}
313	106	}	108	}
314	107	implicitHeight: row.y + row.height + units.gu(1);	109	implicitHeight: row.y + row.height + units.gu(1);
315	108	}	110	}
316	109		111
317	=== modified file 'tests/plugins/Dash/cardcreator/8.res.cardcreator'
318	--- tests/plugins/Dash/cardcreator/8.res.cardcreator 2016-05-26 14:53:20 +0000
319	+++ tests/plugins/Dash/cardcreator/8.res.cardcreator 2016-08-08 08:57:51 +0000
320	@@ -93,13 +93,15 @@
321	93		93
322	94	]	94	]
323	95	}	95	}
327	96	UbuntuShape {	96	Loader {
328	97	id: touchdown;	97	active: root.pressed;
326	98	objectName: "touchdown";
329	99	anchors { fill: backgroundLoader }	98	anchors { fill: backgroundLoader }
333	100	visible: root.pressed;	99	sourceComponent: UbuntuShape {
334	101	radius: "medium";	100	objectName: "touchdown";
335	102	borderSource: "radius_pressed.sci"	101	anchors.fill: parent;
336			102	radius: "medium";
337			103	borderSource: "radius_pressed.sci"
338			104	}
339	103	}	105	}
340	104	implicitHeight: row.y + row.height + units.gu(1);	106	implicitHeight: row.y + row.height + units.gu(1);
341	105	}	107	}
342	106		108
343	=== modified file 'tests/plugins/Dash/cardcreator/9.res'
344	--- tests/plugins/Dash/cardcreator/9.res 2016-05-20 14:53:04 +0000
345	+++ tests/plugins/Dash/cardcreator/9.res 2016-08-08 08:57:51 +0000
346	@@ -107,13 +107,15 @@
347	107	onPressAndHold: {	107	onPressAndHold: {
348	108	root.pressAndHold();	108	root.pressAndHold();
349	109	}	109	}
358	110	}UbuntuShape {	110	}Loader {
359	111	id: touchdown;	111	active: root.pressed;
360	112	objectName: "touchdown";	112	anchors { fill: root }
361	113	anchors { fill: root }	113	sourceComponent: UbuntuShape {
362	114	visible: root.pressed;	114	objectName: "touchdown";
363	115	radius: "medium";	115	anchors.fill: parent;
364	116	borderSource: "radius_pressed.sci"	116	radius: "medium";
365	117	}	117	borderSource: "radius_pressed.sci"
366			118	}
367			119	}
368	118	implicitHeight: audioButton.height;	120	implicitHeight: audioButton.height;
369	119	}	121	}
370	120		122
371	=== modified file 'tests/plugins/Dash/cardcreator/9.res.cardcreator'
372	--- tests/plugins/Dash/cardcreator/9.res.cardcreator 2016-05-20 14:53:04 +0000
373	+++ tests/plugins/Dash/cardcreator/9.res.cardcreator 2016-08-08 08:57:51 +0000
374	@@ -105,13 +105,15 @@
375	105	onPressAndHold: {	105	onPressAndHold: {
376	106	root.pressAndHold();	106	root.pressAndHold();
377	107	}	107	}
386	108	}UbuntuShape {	108	}Loader {
387	109	id: touchdown;	109	active: root.pressed;
388	110	objectName: "touchdown";	110	anchors { fill: root }
389	111	anchors { fill: root }	111	sourceComponent: UbuntuShape {
390	112	visible: root.pressed;	112	objectName: "touchdown";
391	113	radius: "medium";	113	anchors.fill: parent;
392	114	borderSource: "radius_pressed.sci"	114	radius: "medium";
393	115	}	115	borderSource: "radius_pressed.sci"
394			116	}
395			117	}
396	116	implicitHeight: audioButton.height;	118	implicitHeight: audioButton.height;
397	117	}	119	}
398	118		120
399	=== modified file 'tests/qmltests/Dash/tst_Card.qml'
400	--- tests/qmltests/Dash/tst_Card.qml 2016-06-02 08:10:48 +0000
401	+++ tests/qmltests/Dash/tst_Card.qml 2016-08-08 08:57:51 +0000
402	@@ -618,12 +618,17 @@
403	618	waitForRendering(card);	618	waitForRendering(card);
404	619		619
405	620	var touchdown = findChild(card, "touchdown");	620	var touchdown = findChild(card, "touchdown");
406			621	compare(touchdown, null);
407	621		622
408	622	compare(touchdown.visible, false);
409	623	mousePress(card);	623	mousePress(card);
410			624
411			625	touchdown = findChild(card, "touchdown");
412	624	compare(touchdown.visible, true);	626	compare(touchdown.visible, true);
413			627
414	625	mouseRelease(card);	628	mouseRelease(card);
416	626	compare(touchdown.visible, false);	629
417			630	touchdown = findChild(card, "touchdown");
418			631	compare(touchdown, null);
419	627	}	632	}
420	628		633
421	629	function test_paddings_data() {	634	function test_paddings_data() {
422	630		635
423	=== modified file 'tests/qmltests/Dash/tst_GenericScopeView.qml'
424	--- tests/qmltests/Dash/tst_GenericScopeView.qml 2016-06-29 14:45:18 +0000
425	+++ tests/qmltests/Dash/tst_GenericScopeView.qml 2016-08-08 08:57:51 +0000
426	@@ -642,11 +642,15 @@
427	642	var item0 = findChild(cardGrid, "delegate0");	642	var item0 = findChild(cardGrid, "delegate0");
428	643	waitForRendering(item0);	643	waitForRendering(item0);
429	644	compare(item0.enabled, false);	644	compare(item0.enabled, false);
430			645
431	645	var touchdown = findChild(item0, "touchdown");	646	var touchdown = findChild(item0, "touchdown");
432			647	compare(touchdown, null);
433	646		648
434	647	compare(touchdown.visible, false);
435	648	mousePress(item0);	649	mousePress(item0);
437	649	compare(touchdown.visible, false);	650
438			651	touchdown = findChild(item0, "touchdown");
439			652	compare(touchdown, null);
440			653
441	650	mouseRelease(item0);	654	mouseRelease(item0);
442	651		655
443	652	cardTool.template["non-interactive"] = false;	656	cardTool.template["non-interactive"] = false;
444	@@ -656,13 +660,19 @@
445	656	waitForRendering(category0);	660	waitForRendering(category0);
446	657	item0 = findChild(cardGrid, "delegate0");	661	item0 = findChild(cardGrid, "delegate0");
447	658	compare(item0.enabled, true);	662	compare(item0.enabled, true);
451	659	var touchdown = findChild(item0, "touchdown");	663
452	660		664	touchdown = findChild(item0, "touchdown");
453	661	compare(touchdown.visible, false);	665	compare(touchdown, null);
454			666
455	662	mousePress(item0);	667	mousePress(item0);
456			668
457			669	touchdown = findChild(item0, "touchdown");
458	663	compare(touchdown.visible, true);	670	compare(touchdown.visible, true);
459			671
460	664	mouseRelease(item0);	672	mouseRelease(item0);
462	665	compare(touchdown.visible, false);	673
463			674	touchdown = findChild(item0, "touchdown");
464			675	compare(touchdown, null);
465	666	closePreview();	676	closePreview();
466	667	}	677	}
467	668		678