1
=== modified file 'plugins/Dash/CardAttributes.qml'
2
--- plugins/Dash/CardAttributes.qml	2015-02-12 16:28:36 +0000
3
+++ plugins/Dash/CardAttributes.qml	2015-07-22 14:32:16 +0000
4
@@ -16,7 +16,7 @@
5
16
16
6
17
import QtQuick 2.2
17
import QtQuick 2.2
7
18
import QtQuick.Layouts 1.1
18
import QtQuick.Layouts 1.1
9
19
import Ubuntu.Components 1.1
19
import Ubuntu.Components 1.3
10
20
20
11
21
GridLayout {
21
GridLayout {
12
22
    id: grid
22
    id: grid
13
@@ -27,7 +27,7 @@
14
27
    columns: 2 + repeater.count % 2
27
    columns: 2 + repeater.count % 2
15
28
    rowSpacing: units.gu(.5)
28
    rowSpacing: units.gu(.5)
16
29
    property alias model: repeater.model
29
    property alias model: repeater.model
18
30
    property color color: Theme.palette.normal.baseText
30
    property color color: theme.palette.normal.baseText
19
31
    property real fontScale: 1.0
31
    property real fontScale: 1.0
20
32
32
21
33
    Repeater {
33
    Repeater {
22
34
34
23
=== modified file 'plugins/Dash/CardCreator.js'
24
--- plugins/Dash/CardCreator.js	2015-07-02 16:09:39 +0000
25
+++ plugins/Dash/CardCreator.js	2015-07-22 14:32:16 +0000
26
@@ -480,20 +480,20 @@
27
480
        }
480
        }
28
481
    }
481
    }
29
482
482
31
483
    var summaryColorWithBackground = 'backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? Theme.palette.normal.baseText : "white")';
483
    var summaryColorWithBackground = 'backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? theme.palette.normal.baseText : "white")';
32
484
484
33
485
    var hasTitleContainer = hasTitle && (hasEmblem || (hasMascot && (hasSubtitle || hasAttributes)));
485
    var hasTitleContainer = hasTitle && (hasEmblem || (hasMascot && (hasSubtitle || hasAttributes)));
34
486
    var titleSubtitleCode = '';
486
    var titleSubtitleCode = '';
35
487
    if (hasTitle) {
487
    if (hasTitle) {
36
488
        var titleColor;
488
        var titleColor;
37
489
        if (headerAsOverlay) {
489
        if (headerAsOverlay) {
39
490
            titleColor = 'root.scopeStyle && overlayLoader.item ? root.scopeStyle.getTextColor(overlayLoader.item.luminance) : (overlayLoader.item && overlayLoader.item.luminance > 0.7 ? Theme.palette.normal.baseText : "white")';
490
            titleColor = 'root.scopeStyle && overlayLoader.item ? root.scopeStyle.getTextColor(overlayLoader.item.luminance) : (overlayLoader.item && overlayLoader.item.luminance > 0.7 ? theme.palette.normal.baseText : "white")';
40
491
        } else if (hasSummary) {
491
        } else if (hasSummary) {
41
492
            titleColor = 'summary.color';
492
            titleColor = 'summary.color';
42
493
        } else if (hasBackground) {
493
        } else if (hasBackground) {
43
494
            titleColor = summaryColorWithBackground;
494
            titleColor = summaryColorWithBackground;
44
495
        } else {
495
        } else {
46
496
            titleColor = 'root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText';
496
            titleColor = 'root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText';
47
497
        }
497
        }
48
498
498
49
499
        var titleAnchors;
499
        var titleAnchors;
50
@@ -649,7 +649,7 @@
51
649
        if (hasBackground) {
649
        if (hasBackground) {
52
650
            summaryColor = summaryColorWithBackground;
650
            summaryColor = summaryColorWithBackground;
53
651
        } else {
651
        } else {
55
652
            summaryColor = 'root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText';
652
            summaryColor = 'root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText';
56
653
        }
653
        }
57
654
654
58
655
        var summaryTopMargin = (hasMascot || hasSubtitle || hasAttributes ? 'anchors.margins' : '0');
655
        var summaryTopMargin = (hasMascot || hasSubtitle || hasAttributes ? 'anchors.margins' : '0');
59
@@ -698,7 +698,7 @@
60
698
698
61
699
function createCardComponent(parent, template, components) {
699
function createCardComponent(parent, template, components) {
62
700
    var imports = 'import QtQuick 2.2; \n\
700
    var imports = 'import QtQuick 2.2; \n\
64
701
                   import Ubuntu.Components 1.1; \n\
701
                   import Ubuntu.Components 1.3; \n\
65
702
                   import Ubuntu.Settings.Components 0.1; \n\
702
                   import Ubuntu.Settings.Components 0.1; \n\
66
703
                   import Dash 0.1;\n\
703
                   import Dash 0.1;\n\
67
704
                   import Utils 0.1;\n';
704
                   import Utils 0.1;\n';
68
705
705
69
=== modified file 'plugins/Dash/ScopeStyle.qml'
70
--- plugins/Dash/ScopeStyle.qml	2014-11-20 11:44:44 +0000
71
+++ plugins/Dash/ScopeStyle.qml	2015-07-22 14:32:16 +0000
72
@@ -16,7 +16,7 @@
73
16
16
74
17
import QtQuick 2.2
17
import QtQuick 2.2
75
18
import Utils 0.1
18
import Utils 0.1
77
19
import Ubuntu.Components 1.1
19
import Ubuntu.Components 1.3
78
20
20
79
21
/*! \brief Helper for processing scope customization options.
21
/*! \brief Helper for processing scope customization options.
80
22
22
81
23
23
82
=== modified file 'qml/Components/Background.qml'
83
--- qml/Components/Background.qml	2014-08-29 08:47:21 +0000
84
+++ qml/Components/Background.qml	2015-07-22 14:32:16 +0000
85
@@ -15,7 +15,7 @@
86
15
 */
15
 */
87
16
16
88
17
import QtQuick 2.0
17
import QtQuick 2.0
90
18
import Ubuntu.Components 1.1
18
import Ubuntu.Components 1.3
91
19
import Utils 0.1 as Utils
19
import Utils 0.1 as Utils
92
20
20
93
21
Loader {
21
Loader {
94
22
22
95
=== modified file 'qml/Components/BaseCarouselDelegate.qml'
96
--- qml/Components/BaseCarouselDelegate.qml	2014-07-08 17:49:18 +0000
97
+++ qml/Components/BaseCarouselDelegate.qml	2015-07-22 14:32:16 +0000
98
@@ -15,7 +15,7 @@
99
15
 */
15
 */
100
16
16
101
17
import QtQuick 2.0
17
import QtQuick 2.0
103
18
import Ubuntu.Components 0.1
18
import Ubuntu.Components 1.3
104
19
19
105
20
/*!
20
/*!
106
21
 \brief Base delegate for use with the Carousel component
21
 \brief Base delegate for use with the Carousel component
107
22
22
108
=== modified file 'qml/Components/Carousel.qml'
109
--- qml/Components/Carousel.qml	2015-01-14 09:51:39 +0000
110
+++ qml/Components/Carousel.qml	2015-07-22 14:32:16 +0000
111
@@ -15,7 +15,7 @@
112
15
 */
15
 */
113
16
16
114
17
import QtQuick 2.3
17
import QtQuick 2.3
116
18
import Ubuntu.Components 0.1
18
import Ubuntu.Components 1.3
117
19
import "carousel.js" as CarouselJS
19
import "carousel.js" as CarouselJS
118
20
20
119
21
/*! The Carousel component presents the items of a model in a carousel view. It's similar to a
21
/*! The Carousel component presents the items of a model in a carousel view. It's similar to a
120
22
22
121
=== modified file 'qml/Components/DelayedLockscreen.qml'
122
--- qml/Components/DelayedLockscreen.qml	2015-02-12 14:48:06 +0000
123
+++ qml/Components/DelayedLockscreen.qml	2015-07-22 14:32:16 +0000
124
@@ -15,7 +15,7 @@
125
15
 */
15
 */
126
16
16
127
17
import QtQuick 2.0
17
import QtQuick 2.0
129
18
import Ubuntu.Components 0.1
18
import Ubuntu.Components 1.3
130
19
import "../Components"
19
import "../Components"
131
20
20
132
21
Item {
21
Item {
133
22
22
134
=== modified file 'qml/Components/Dialogs.qml'
135
--- qml/Components/Dialogs.qml	2015-03-26 15:24:04 +0000
136
+++ qml/Components/Dialogs.qml	2015-07-22 14:32:16 +0000
137
@@ -18,7 +18,7 @@
138
18
18
139
19
import Unity.Application 0.1
19
import Unity.Application 0.1
140
20
import Unity.Session 0.1
20
import Unity.Session 0.1
142
21
import Ubuntu.Components 1.1
21
import Ubuntu.Components 1.3
143
22
import LightDM 0.1 as LightDM
22
import LightDM 0.1 as LightDM
144
23
23
145
24
Item {
24
Item {
146
25
25
147
=== modified file 'qml/Components/DragHandle.qml'
148
--- qml/Components/DragHandle.qml	2015-04-10 21:16:37 +0000
149
+++ qml/Components/DragHandle.qml	2015-07-22 14:32:16 +0000
150
@@ -15,7 +15,7 @@
151
15
 */
15
 */
152
16
16
153
17
import QtQuick 2.0
17
import QtQuick 2.0
155
18
import Ubuntu.Components 0.1
18
import Ubuntu.Components 1.3
156
19
import Ubuntu.Gestures 0.1
19
import Ubuntu.Gestures 0.1
157
20
20
158
21
/*
21
/*
159
22
22
160
=== modified file 'qml/Components/DraggingArea.qml'
161
--- qml/Components/DraggingArea.qml	2014-07-11 09:22:59 +0000
162
+++ qml/Components/DraggingArea.qml	2015-07-22 14:32:16 +0000
163
@@ -15,7 +15,7 @@
164
15
 */
15
 */
165
16
16
166
17
import QtQuick 2.0
17
import QtQuick 2.0
168
18
import Ubuntu.Components 0.1
18
import Ubuntu.Components 1.3
169
19
19
170
20
MouseArea {
20
MouseArea {
171
21
    id: draggingArea
21
    id: draggingArea
172
22
22
173
=== modified file 'qml/Components/EdgeDragEvaluator.qml'
174
--- qml/Components/EdgeDragEvaluator.qml	2015-04-27 15:30:18 +0000
175
+++ qml/Components/EdgeDragEvaluator.qml	2015-07-22 14:32:16 +0000
176
@@ -15,7 +15,7 @@
177
15
 */
15
 */
178
16
16
179
17
import QtQuick 2.0
17
import QtQuick 2.0
181
18
import Ubuntu.Components 0.1
18
import Ubuntu.Components 1.3
182
19
import Ubuntu.Gestures 0.1
19
import Ubuntu.Gestures 0.1
183
20
20
184
21
/*
21
/*
185
22
22
186
=== modified file 'qml/Components/Header.qml'
187
--- qml/Components/Header.qml	2014-08-01 16:13:53 +0000
188
+++ qml/Components/Header.qml	2015-07-22 14:32:16 +0000
189
@@ -14,8 +14,8 @@
190
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
191
15
 */
15
 */
192
16
16
195
17
import Ubuntu.Components 1.1
17
import Ubuntu.Components 1.3
196
18
import Ubuntu.Components.Themes.Ambiance 1.1
18
import Ubuntu.Components.Themes.Ambiance 1.3
197
19
19
198
20
PageHeadStyle {
20
PageHeadStyle {
199
21
    id: root
21
    id: root
200
22
22
201
=== modified file 'qml/Components/InputMethod.qml'
202
--- qml/Components/InputMethod.qml	2014-10-01 13:20:32 +0000
203
+++ qml/Components/InputMethod.qml	2015-07-22 14:32:16 +0000
204
@@ -16,7 +16,7 @@
205
16
16
206
17
import QtQuick 2.0
17
import QtQuick 2.0
207
18
import Unity.Application 0.1
18
import Unity.Application 0.1
209
19
import Ubuntu.Components 0.1
19
import Ubuntu.Components 1.3
210
20
import Ubuntu.Gestures 0.1
20
import Ubuntu.Gestures 0.1
211
21
21
212
22
Item {
22
Item {
213
23
23
214
=== modified file 'qml/Components/LazyImage.qml'
215
--- qml/Components/LazyImage.qml	2014-09-29 20:55:54 +0000
216
+++ qml/Components/LazyImage.qml	2015-07-22 14:32:16 +0000
217
@@ -18,7 +18,7 @@
218
18
 */
18
 */
219
19
19
220
20
import QtQuick 2.0
20
import QtQuick 2.0
222
21
import Ubuntu.Components 0.1
21
import Ubuntu.Components 1.3
223
22
22
224
23
Item {
23
Item {
225
24
    id: root
24
    id: root
226
25
25
227
=== modified file 'qml/Components/ListItems/Header.qml'
228
--- qml/Components/ListItems/Header.qml	2014-07-16 16:30:15 +0000
229
+++ qml/Components/ListItems/Header.qml	2015-07-22 14:32:16 +0000
230
@@ -16,7 +16,7 @@
231
16
16
232
17
import QtQuick 2.0
17
import QtQuick 2.0
233
18
import QtQuick.Layouts 1.1
18
import QtQuick.Layouts 1.1
235
19
import Ubuntu.Components 0.1
19
import Ubuntu.Components 1.3
236
20
20
237
21
Item {
21
Item {
238
22
    property alias text: label.text
22
    property alias text: label.text
239
23
23
240
=== modified file 'qml/Components/Lockscreen.qml'
241
--- qml/Components/Lockscreen.qml	2015-03-18 17:27:30 +0000
242
+++ qml/Components/Lockscreen.qml	2015-07-22 14:32:16 +0000
243
@@ -15,8 +15,8 @@
244
15
 */
15
 */
245
16
16
246
17
import QtQuick 2.0
17
import QtQuick 2.0
249
18
import Ubuntu.Components 1.0
18
import Ubuntu.Components 1.3
250
19
import Ubuntu.Components.Popups 1.0
19
import Ubuntu.Components.Popups 1.3
251
20
import Ubuntu.Telephony 0.1 as Telephony
20
import Ubuntu.Telephony 0.1 as Telephony
252
21
21
253
22
Showable {
22
Showable {
254
23
23
255
=== modified file 'qml/Components/PassphraseLockscreen.qml'
256
--- qml/Components/PassphraseLockscreen.qml	2015-03-18 17:27:30 +0000
257
+++ qml/Components/PassphraseLockscreen.qml	2015-07-22 14:32:16 +0000
258
@@ -15,7 +15,7 @@
259
15
 */
15
 */
260
16
16
261
17
import QtQuick 2.0
17
import QtQuick 2.0
263
18
import Ubuntu.Components 0.1
18
import Ubuntu.Components 1.3
264
19
import "../Components"
19
import "../Components"
265
20
20
266
21
Item {
21
Item {
267
22
22
268
=== modified file 'qml/Components/PinLockscreen.qml'
269
--- qml/Components/PinLockscreen.qml	2015-05-28 07:42:09 +0000
270
+++ qml/Components/PinLockscreen.qml	2015-07-22 14:32:16 +0000
271
@@ -15,8 +15,8 @@
272
15
 */
15
 */
273
16
16
274
17
import QtQuick 2.0
17
import QtQuick 2.0
277
18
import Ubuntu.Components 0.1
18
import Ubuntu.Components 1.3
278
19
import Ubuntu.Components.ListItems 0.1
19
import Ubuntu.Components.ListItems 1.3
279
20
import "../Components"
20
import "../Components"
280
21
21
281
22
Item {
22
Item {
282
23
23
283
=== modified file 'qml/Components/PinPadButton.qml'
284
--- qml/Components/PinPadButton.qml	2015-03-18 17:27:30 +0000
285
+++ qml/Components/PinPadButton.qml	2015-07-22 14:32:16 +0000
286
@@ -15,7 +15,7 @@
287
15
 */
15
 */
288
16
16
289
17
import QtQuick 2.0
17
import QtQuick 2.0
291
18
import Ubuntu.Components 1.1
18
import Ubuntu.Components 1.3
292
19
19
293
20
AbstractButton {
20
AbstractButton {
294
21
    id: root
21
    id: root
295
22
22
296
=== modified file 'qml/Components/Rating.qml'
297
--- qml/Components/Rating.qml	2014-02-13 17:00:06 +0000
298
+++ qml/Components/Rating.qml	2015-07-22 14:32:16 +0000
299
@@ -15,7 +15,7 @@
300
15
 */
15
 */
301
16
16
302
17
import QtQuick 2.0
17
import QtQuick 2.0
304
18
import Ubuntu.Components 0.1
18
import Ubuntu.Components 1.3
305
19
19
306
20
/*! Rating widget bar. */
20
/*! Rating widget bar. */
307
21
21
308
22
22
309
=== modified file 'qml/Components/RatingStyle.qml'
310
--- qml/Components/RatingStyle.qml	2014-02-13 17:00:06 +0000
311
+++ qml/Components/RatingStyle.qml	2015-07-22 14:32:16 +0000
312
@@ -15,7 +15,7 @@
313
15
 */
15
 */
314
16
16
315
17
import QtQuick 2.0
17
import QtQuick 2.0
317
18
import Ubuntu.Components 0.1
18
import Ubuntu.Components 1.3
318
19
19
319
20
Row {
20
Row {
320
21
    anchors.fill: parent
21
    anchors.fill: parent
321
22
22
322
=== modified file 'qml/Components/ResponsiveGridView.qml'
323
--- qml/Components/ResponsiveGridView.qml	2014-10-23 11:59:22 +0000
324
+++ qml/Components/ResponsiveGridView.qml	2015-07-22 14:32:16 +0000
325
@@ -15,7 +15,7 @@
326
15
 */
15
 */
327
16
16
328
17
import QtQuick 2.3
17
import QtQuick 2.3
330
18
import Ubuntu.Components 0.1
18
import Ubuntu.Components 1.3
331
19
19
332
20
/*
20
/*
333
21
   Essentially a GridView where you can specify the maximum number of columns it can have.
21
   Essentially a GridView where you can specify the maximum number of columns it can have.
334
22
22
335
=== modified file 'qml/Components/ResponsiveVerticalJournal.qml'
336
--- qml/Components/ResponsiveVerticalJournal.qml	2015-05-12 10:05:52 +0000
337
+++ qml/Components/ResponsiveVerticalJournal.qml	2015-07-22 14:32:16 +0000
338
@@ -15,7 +15,7 @@
339
15
 */
15
 */
340
16
16
341
17
import QtQuick 2.0
17
import QtQuick 2.0
343
18
import Ubuntu.Components 0.1
18
import Ubuntu.Components 1.3
344
19
import "../Components"
19
import "../Components"
345
20
import Dash 0.1
20
import Dash 0.1
346
21
21
347
22
22
348
=== modified file 'qml/Components/ScrollCalculator.qml'
349
--- qml/Components/ScrollCalculator.qml	2014-10-13 15:09:46 +0000
350
+++ qml/Components/ScrollCalculator.qml	2015-07-22 14:32:16 +0000
351
@@ -15,7 +15,7 @@
352
15
 */
15
 */
353
16
16
354
17
import QtQuick 2.2
17
import QtQuick 2.2
356
18
import Ubuntu.Components 1.1
18
import Ubuntu.Components 1.3
357
19
19
358
20
Item {
20
Item {
359
21
    id: scrollArea
21
    id: scrollArea
360
22
22
361
=== modified file 'qml/Components/ShellDialog.qml'
362
--- qml/Components/ShellDialog.qml	2014-12-08 13:39:01 +0000
363
+++ qml/Components/ShellDialog.qml	2015-07-22 14:32:16 +0000
364
@@ -16,8 +16,8 @@
365
16
16
366
17
import QtQuick 2.0
17
import QtQuick 2.0
367
18
18
370
19
import Ubuntu.Components 1.1
19
import Ubuntu.Components 1.3
371
20
import Ubuntu.Components.Popups 0.1
20
import Ubuntu.Components.Popups 1.3
372
21
21
373
22
/*
22
/*
374
23
    A Dialog configured for use as a proper in-scene Dialog
23
    A Dialog configured for use as a proper in-scene Dialog
375
24
24
376
=== modified file 'qml/Components/UbuntuShapeForItem.qml'
377
--- qml/Components/UbuntuShapeForItem.qml	2014-10-06 07:39:42 +0000
378
+++ qml/Components/UbuntuShapeForItem.qml	2015-07-22 14:32:16 +0000
379
@@ -15,7 +15,7 @@
380
15
 */
15
 */
381
16
16
382
17
import QtQuick 2.0
17
import QtQuick 2.0
384
18
import Ubuntu.Components 0.1
18
import Ubuntu.Components 1.3
385
19
19
386
20
/* FIXME: This component is duplicating the UbuntuShape from the SDK, but shapes more
20
/* FIXME: This component is duplicating the UbuntuShape from the SDK, but shapes more
387
21
 * general (Item-based) components. This ability should be incorporated into the SDK's
21
 * general (Item-based) components. This ability should be incorporated into the SDK's
388
22
22
389
=== modified file 'qml/Components/WindowControlButtons.qml'
390
--- qml/Components/WindowControlButtons.qml	2014-11-24 11:21:38 +0000
391
+++ qml/Components/WindowControlButtons.qml	2015-07-22 14:32:16 +0000
392
@@ -17,7 +17,7 @@
393
17
 */
17
 */
394
18
18
395
19
import QtQuick 2.3
19
import QtQuick 2.3
397
20
import Ubuntu.Components 1.1
20
import Ubuntu.Components 1.3
398
21
21
399
22
Row {
22
Row {
400
23
    id: root
23
    id: root
401
24
24
402
=== modified file 'qml/Components/ZoomableImage.qml'
403
--- qml/Components/ZoomableImage.qml	2015-05-06 15:05:06 +0000
404
+++ qml/Components/ZoomableImage.qml	2015-07-22 14:32:16 +0000
405
@@ -15,7 +15,7 @@
406
15
 */
15
 */
407
16
16
408
17
import QtQuick 2.0
17
import QtQuick 2.0
410
18
import Ubuntu.Components 0.1
18
import Ubuntu.Components 1.3
411
19
import "../Components"
19
import "../Components"
412
20
20
413
21
/*! \brief Zoomable for image.
21
/*! \brief Zoomable for image.
414
22
22
415
=== modified file 'qml/Dash/CardCarousel.qml'
416
--- qml/Dash/CardCarousel.qml	2015-05-13 10:21:18 +0000
417
+++ qml/Dash/CardCarousel.qml	2015-07-22 14:32:16 +0000
418
@@ -15,7 +15,7 @@
419
15
 */
15
 */
420
16
16
421
17
import QtQuick 2.0
17
import QtQuick 2.0
423
18
import Ubuntu.Components 0.1
18
import Ubuntu.Components 1.3
424
19
import "../Components"
19
import "../Components"
425
20
20
426
21
DashRenderer {
21
DashRenderer {
427
22
22
428
=== modified file 'qml/Dash/CardHorizontalList.qml'
429
--- qml/Dash/CardHorizontalList.qml	2015-05-13 10:21:18 +0000
430
+++ qml/Dash/CardHorizontalList.qml	2015-07-22 14:32:16 +0000
431
@@ -15,7 +15,7 @@
432
15
 */
15
 */
433
16
16
434
17
import QtQuick 2.3
17
import QtQuick 2.3
436
18
import Ubuntu.Components 1.1
18
import Ubuntu.Components 1.3
437
19
import "../Components"
19
import "../Components"
438
20
20
439
21
DashRenderer {
21
DashRenderer {
440
22
22
441
=== modified file 'qml/Dash/CardVerticalJournal.qml'
442
--- qml/Dash/CardVerticalJournal.qml	2015-05-13 10:21:18 +0000
443
+++ qml/Dash/CardVerticalJournal.qml	2015-07-22 14:32:16 +0000
444
@@ -15,7 +15,7 @@
445
15
 */
15
 */
446
16
16
447
17
import QtQuick 2.0
17
import QtQuick 2.0
449
18
import Ubuntu.Components 0.1
18
import Ubuntu.Components 1.3
450
19
import "../Components"
19
import "../Components"
451
20
20
452
21
DashRenderer {
21
DashRenderer {
453
22
22
454
=== modified file 'qml/Dash/Dash.qml'
455
--- qml/Dash/Dash.qml	2015-05-18 23:04:12 +0000
456
+++ qml/Dash/Dash.qml	2015-07-22 14:32:16 +0000
457
@@ -15,7 +15,7 @@
458
15
 */
15
 */
459
16
16
460
17
import QtQuick 2.2
17
import QtQuick 2.2
462
18
import Ubuntu.Components 0.1
18
import Ubuntu.Components 1.3
463
19
import Ubuntu.Gestures 0.1
19
import Ubuntu.Gestures 0.1
464
20
import Unity 0.2
20
import Unity 0.2
465
21
import Utils 0.1
21
import Utils 0.1
466
22
22
467
=== modified file 'qml/Dash/DashApplication.qml'
468
--- qml/Dash/DashApplication.qml	2015-05-12 14:39:11 +0000
469
+++ qml/Dash/DashApplication.qml	2015-07-22 14:32:16 +0000
470
@@ -15,14 +15,15 @@
471
15
 */
15
 */
472
16
16
473
17
import QtQuick 2.2
17
import QtQuick 2.2
475
18
import Ubuntu.Components 1.0
18
import Ubuntu.Components 1.3
476
19
import Ubuntu.Thumbnailer 0.1 // Register support for image://thumbnailer/ and image://albumart/
19
import Ubuntu.Thumbnailer 0.1 // Register support for image://thumbnailer/ and image://albumart/
477
20
20
478
21
MainView {
21
MainView {
479
22
    implicitWidth: units.gu(40)
22
    implicitWidth: units.gu(40)
480
23
    implicitHeight: units.gu(68)
23
    implicitHeight: units.gu(68)
481
24
24
483
25
    useDeprecatedToolbar: false
25
    // Workaround bug #1475643
484
26
    headerColor: Qt.rgba(0, 0, 0, 0)
485
26
27
486
27
    Dash {
28
    Dash {
487
28
        anchors.fill: parent
29
        anchors.fill: parent
488
29
30
489
=== modified file 'qml/Dash/DashCategoryBase.qml'
490
--- qml/Dash/DashCategoryBase.qml	2014-10-09 17:41:49 +0000
491
+++ qml/Dash/DashCategoryBase.qml	2015-07-22 14:32:16 +0000
492
@@ -15,7 +15,7 @@
493
15
 */
15
 */
494
16
16
495
17
import QtQuick 2.0
17
import QtQuick 2.0
497
18
import Ubuntu.Components 0.1
18
import Ubuntu.Components 1.3
498
19
19
499
20
Item {
20
Item {
500
21
    width: parent.width
21
    width: parent.width
501
22
22
502
=== modified file 'qml/Dash/DashContent.qml'
503
--- qml/Dash/DashContent.qml	2015-03-19 15:25:45 +0000
504
+++ qml/Dash/DashContent.qml	2015-07-22 14:32:16 +0000
505
@@ -15,7 +15,7 @@
506
15
 */
15
 */
507
16
16
508
17
import QtQuick 2.0
17
import QtQuick 2.0
510
18
import Ubuntu.Components 0.1
18
import Ubuntu.Components 1.3
511
19
import Unity 0.2
19
import Unity 0.2
512
20
import Utils 0.1
20
import Utils 0.1
513
21
import "../Components"
21
import "../Components"
514
22
22
515
=== modified file 'qml/Dash/DashContentTabBarStyle.qml'
516
--- qml/Dash/DashContentTabBarStyle.qml	2014-02-19 13:30:38 +0000
517
+++ qml/Dash/DashContentTabBarStyle.qml	2015-07-22 14:32:16 +0000
518
@@ -14,7 +14,7 @@
519
14
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
14
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
520
15
 */
15
 */
521
16
16
523
17
import Ubuntu.Components.Themes.Ambiance 0.1
17
import Ubuntu.Components.Themes.Ambiance 1.3
524
18
18
525
19
TabBarStyle {
19
TabBarStyle {
526
20
    indicatorImageSource: "graphics/tabbarchevron.png"
20
    indicatorImageSource: "graphics/tabbarchevron.png"
527
21
21
528
=== modified file 'qml/Dash/DashNavigation.qml'
529
--- qml/Dash/DashNavigation.qml	2015-01-05 15:08:04 +0000
530
+++ qml/Dash/DashNavigation.qml	2015-07-22 14:32:16 +0000
531
@@ -1,5 +1,5 @@
532
1
/*
1
/*
534
2
 * Copyright (C) 2014 Canonical, Ltd.
2
 * Copyright (C) 2014,2015 Canonical, Ltd.
535
3
 *
3
 *
536
4
 * This program is free software; you can redistribute it and/or modify
4
 * This program is free software; you can redistribute it and/or modify
537
5
 * it under the terms of the GNU General Public License as published by
5
 * it under the terms of the GNU General Public License as published by
538
@@ -15,7 +15,7 @@
539
15
 */
15
 */
540
16
16
541
17
import QtQuick 2.2
17
import QtQuick 2.2
543
18
import Ubuntu.Components 1.1
18
import Ubuntu.Components 1.3
544
19
import Dash 0.1
19
import Dash 0.1
545
20
import "../Components"
20
import "../Components"
546
21
21
547
@@ -48,7 +48,7 @@
548
48
        id: d
48
        id: d
549
49
        readonly property color foregroundColor: root.scopeStyle
49
        readonly property color foregroundColor: root.scopeStyle
550
50
                                                 ? root.scopeStyle.getTextColor(backgroundItem.luminance)
50
                                                 ? root.scopeStyle.getTextColor(backgroundItem.luminance)
552
51
                                                 : Theme.palette.normal.baseText
51
                                                 : theme.palette.normal.baseText
553
52
        readonly property bool bothVisible: altNavigationButton.visible && navigationButton.visible
52
        readonly property bool bothVisible: altNavigationButton.visible && navigationButton.visible
554
53
        readonly property real navigationWidth: root.width >= units.gu(60) ? units.gu(40) : root.width
53
        readonly property real navigationWidth: root.width >= units.gu(60) ? units.gu(40) : root.width
555
54
        readonly property real buttonWidth: navigationWidth / (bothVisible ? 2 : 1)
54
        readonly property real buttonWidth: navigationWidth / (bothVisible ? 2 : 1)
556
55
55
557
=== modified file 'qml/Dash/DashNavigationButton.qml'
558
--- qml/Dash/DashNavigationButton.qml	2015-01-05 15:08:04 +0000
559
+++ qml/Dash/DashNavigationButton.qml	2015-07-22 14:32:16 +0000
560
@@ -1,5 +1,5 @@
561
1
/*
1
/*
563
2
 * Copyright (C) 2014 Canonical, Ltd.
2
 * Copyright (C) 2014,2015 Canonical, Ltd.
564
3
 *
3
 *
565
4
 * This program is free software; you can redistribute it and/or modify
4
 * This program is free software; you can redistribute it and/or modify
566
5
 * it under the terms of the GNU General Public License as published by
5
 * it under the terms of the GNU General Public License as published by
567
@@ -15,7 +15,7 @@
568
15
 */
15
 */
569
16
16
570
17
import QtQuick 2.2
17
import QtQuick 2.2
572
18
import Ubuntu.Components 1.1
18
import Ubuntu.Components 1.3
573
19
19
574
20
AbstractButton {
20
AbstractButton {
575
21
    id: root
21
    id: root
576
@@ -24,7 +24,7 @@
577
24
    // Set by parent
24
    // Set by parent
578
25
    property var scope: null
25
    property var scope: null
579
26
    property var scopeStyle: null
26
    property var scopeStyle: null
581
27
    property color foregroundColor: Theme.palette.normal.baseText
27
    property color foregroundColor: theme.palette.normal.baseText
582
28
    property bool isAltNavigation: false
28
    property bool isAltNavigation: false
583
29
    property bool showDivider: false
29
    property bool showDivider: false
584
30
30
585
31
31
586
=== modified file 'qml/Dash/DashNavigationList.qml'
587
--- qml/Dash/DashNavigationList.qml	2014-10-23 11:59:22 +0000
588
+++ qml/Dash/DashNavigationList.qml	2015-07-22 14:32:16 +0000
589
@@ -1,5 +1,5 @@
590
1
/*
1
/*
592
2
 * Copyright (C) 2014 Canonical, Ltd.
2
 * Copyright (C) 2014,2015 Canonical, Ltd.
593
3
 *
3
 *
594
4
 * This program is free software; you can redistribute it and/or modify
4
 * This program is free software; you can redistribute it and/or modify
595
5
 * it under the terms of the GNU General Public License as published by
5
 * it under the terms of the GNU General Public License as published by
596
@@ -15,7 +15,7 @@
597
15
 */
15
 */
598
16
16
599
17
import QtQuick 2.2
17
import QtQuick 2.2
601
18
import Ubuntu.Components 1.1
18
import Ubuntu.Components 1.3
602
19
import "../Components"
19
import "../Components"
603
20
20
604
21
Item {
21
Item {
605
@@ -23,7 +23,7 @@
606
23
    property var navigation: null
23
    property var navigation: null
607
24
    property var currentNavigation: null
24
    property var currentNavigation: null
608
25
    property var scopeStyle: null
25
    property var scopeStyle: null
610
26
    property color foregroundColor: Theme.palette.normal.baseText
26
    property color foregroundColor: theme.palette.normal.baseText
611
27
    signal enterNavigation(var newNavigationId, bool hasChildren)
27
    signal enterNavigation(var newNavigationId, bool hasChildren)
612
28
    signal goBackToParentClicked()
28
    signal goBackToParentClicked()
613
29
    signal allNavigationClicked()
29
    signal allNavigationClicked()
614
30
30
615
=== modified file 'qml/Dash/GenericScopeView.qml'
616
--- qml/Dash/GenericScopeView.qml	2015-07-03 14:24:08 +0000
617
+++ qml/Dash/GenericScopeView.qml	2015-07-22 14:32:16 +0000
618
@@ -15,7 +15,7 @@
619
15
 */
15
 */
620
16
16
621
17
import QtQuick 2.0
17
import QtQuick 2.0
623
18
import Ubuntu.Components 1.1
18
import Ubuntu.Components 1.3
624
19
import Utils 0.1
19
import Utils 0.1
625
20
import Unity 0.2
20
import Unity 0.2
626
21
import Dash 0.1
21
import Dash 0.1
627
@@ -543,7 +543,7 @@
628
543
                    }
543
                    }
629
544
                    fontSize: "small"
544
                    fontSize: "small"
630
545
                    font.weight: Font.Bold
545
                    font.weight: Font.Bold
632
546
                    color: scopeStyle ? scopeStyle.foreground : Theme.palette.normal.baseText
546
                    color: scopeStyle ? scopeStyle.foreground : theme.palette.normal.baseText
633
547
                }
547
                }
634
548
            }
548
            }
635
549
549
636
@@ -580,7 +580,7 @@
637
580
            width: categoryView.width
580
            width: categoryView.width
638
581
            height: section != "" ? units.gu(5) : 0
581
            height: section != "" ? units.gu(5) : 0
639
582
            text: section
582
            text: section
641
583
            color: scopeStyle ? scopeStyle.foreground : Theme.palette.normal.baseText
583
            color: scopeStyle ? scopeStyle.foreground : theme.palette.normal.baseText
642
584
            iconName: delegate && delegate.headerLink ? "go-next" : ""
584
            iconName: delegate && delegate.headerLink ? "go-next" : ""
643
585
            onClicked: {
585
            onClicked: {
644
586
                if (delegate.headerLink) scopeView.scope.performQuery(delegate.headerLink);
586
                if (delegate.headerLink) scopeView.scope.performQuery(delegate.headerLink);
645
@@ -701,7 +701,7 @@
646
701
            }
701
            }
647
702
            fontSize: "small"
702
            fontSize: "small"
648
703
            font.weight: Font.Bold
703
            font.weight: Font.Bold
650
704
            color: scopeStyle ? scopeStyle.foreground : Theme.palette.normal.baseText
704
            color: scopeStyle ? scopeStyle.foreground : theme.palette.normal.baseText
651
705
        }
705
        }
652
706
706
653
707
        Connections {
707
        Connections {
654
708
708
655
=== modified file 'qml/Dash/PageHeader.qml'
656
--- qml/Dash/PageHeader.qml	2015-03-13 10:07:57 +0000
657
+++ qml/Dash/PageHeader.qml	2015-07-22 14:32:16 +0000
658
@@ -1,5 +1,5 @@
659
1
/*
1
/*
661
2
 * Copyright (C) 2013 Canonical, Ltd.
2
 * Copyright (C) 2013,2015 Canonical, Ltd.
662
3
 *
3
 *
663
4
 * This program is free software; you can redistribute it and/or modify
4
 * This program is free software; you can redistribute it and/or modify
664
5
 * it under the terms of the GNU General Public License as published by
5
 * it under the terms of the GNU General Public License as published by
665
@@ -15,10 +15,10 @@
666
15
 */
15
 */
667
16
16
668
17
import QtQuick 2.2
17
import QtQuick 2.2
673
18
import Ubuntu.Components 1.1
18
import Ubuntu.Components 1.3
674
19
import Ubuntu.Components.Themes.Ambiance 1.1
19
import Ubuntu.Components.Themes.Ambiance 1.3
675
20
import Ubuntu.Components.Popups 1.0
20
import Ubuntu.Components.Popups 1.3
676
21
import Ubuntu.Components.ListItems 1.0
21
import Ubuntu.Components.ListItems 1.3
677
22
import "../Components"
22
import "../Components"
678
23
import "../Components/SearchHistoryModel"
23
import "../Components/SearchHistoryModel"
679
24
24
680
@@ -136,7 +136,7 @@
681
136
        objectName: "headerContainer"
136
        objectName: "headerContainer"
682
137
        clip: contentY < height
137
        clip: contentY < height
683
138
        anchors { left: parent.left; top: parent.top; right: parent.right }
138
        anchors { left: parent.left; top: parent.top; right: parent.right }
685
139
        height: units.gu(7)
139
        height: header.contentHeight
686
140
        contentHeight: headersColumn.height
140
        contentHeight: headersColumn.height
687
141
        interactive: false
141
        interactive: false
688
142
        contentY: showSearch ? 0 : height
142
        contentY: showSearch ? 0 : height
689
@@ -171,8 +171,6 @@
690
171
            PageHeadStyle {
171
            PageHeadStyle {
691
172
                id: searchHeader
172
                id: searchHeader
692
173
                anchors { left: parent.left; right: parent.right }
173
                anchors { left: parent.left; right: parent.right }
693
174
                height: headerContainer.height
694
175
                contentHeight: height
695
176
                opacity: headerContainer.clip || headerContainer.showSearch ? 1 : 0 // setting visible false cause column to relayout
174
                opacity: headerContainer.clip || headerContainer.showSearch ? 1 : 0 // setting visible false cause column to relayout
696
177
                __separator_visible: false
175
                __separator_visible: false
697
178
                // Required to keep PageHeadStyle noise down as it expects the Page's properties around.
176
                // Required to keep PageHeadStyle noise down as it expects the Page's properties around.
698
@@ -182,7 +180,7 @@
699
182
                property color panelColor: background.topColor
180
                property color panelColor: background.topColor
700
183
                panelForegroundColor: config.foregroundColor
181
                panelForegroundColor: config.foregroundColor
701
184
                property var config: PageHeadConfiguration {
182
                property var config: PageHeadConfiguration {
703
185
                    foregroundColor: root.scopeStyle ? root.scopeStyle.headerForeground : Theme.palette.normal.baseText
183
                    foregroundColor: root.scopeStyle ? root.scopeStyle.headerForeground : theme.palette.normal.baseText
704
186
                    backAction: Action {
184
                    backAction: Action {
705
187
                        iconName: "back"
185
                        iconName: "back"
706
188
                        onTriggered: {
186
                        onTriggered: {
707
@@ -247,7 +245,6 @@
708
247
                objectName: "innerPageHeader"
245
                objectName: "innerPageHeader"
709
248
                anchors { left: parent.left; right: parent.right }
246
                anchors { left: parent.left; right: parent.right }
710
249
                height: headerContainer.height
247
                height: headerContainer.height
711
250
                contentHeight: height
712
251
                opacity: headerContainer.clip || !headerContainer.showSearch ? 1 : 0 // setting visible false cause column to relayout
248
                opacity: headerContainer.clip || !headerContainer.showSearch ? 1 : 0 // setting visible false cause column to relayout
713
252
                __separator_visible: false
249
                __separator_visible: false
714
253
                property var styledItem: header
250
                property var styledItem: header
715
@@ -256,7 +253,7 @@
716
256
                property color panelColor: background.topColor
253
                property color panelColor: background.topColor
717
257
                panelForegroundColor: config.foregroundColor
254
                panelForegroundColor: config.foregroundColor
718
258
                property var config: PageHeadConfiguration {
255
                property var config: PageHeadConfiguration {
720
259
                    foregroundColor: root.scopeStyle ? root.scopeStyle.headerForeground : Theme.palette.normal.baseText
256
                    foregroundColor: root.scopeStyle ? root.scopeStyle.headerForeground : theme.palette.normal.baseText
721
260
                    backAction: Action {
257
                    backAction: Action {
722
261
                        iconName: backIsClose ? "close" : "back"
258
                        iconName: backIsClose ? "close" : "back"
723
262
                        visible: root.showBackButton
259
                        visible: root.showBackButton
724
263
260
725
=== modified file 'qml/Dash/PreviewListView.qml'
726
--- qml/Dash/PreviewListView.qml	2014-10-23 11:59:22 +0000
727
+++ qml/Dash/PreviewListView.qml	2015-07-22 14:32:16 +0000
728
@@ -15,7 +15,7 @@
729
15
 */
15
 */
730
16
16
731
17
import QtQuick 2.0
17
import QtQuick 2.0
733
18
import Ubuntu.Components 0.1
18
import Ubuntu.Components 1.3
734
19
import Unity 0.2
19
import Unity 0.2
735
20
import "../Components"
20
import "../Components"
736
21
import "Previews" as Previews
21
import "Previews" as Previews
737
22
22
738
=== modified file 'qml/Dash/Previews/Preview.qml'
739
--- qml/Dash/Previews/Preview.qml	2015-02-12 10:44:27 +0000
740
+++ qml/Dash/Previews/Preview.qml	2015-07-22 14:32:16 +0000
741
@@ -15,7 +15,7 @@
742
15
 */
15
 */
743
16
16
744
17
import QtQuick 2.0
17
import QtQuick 2.0
746
18
import Ubuntu.Components 0.1
18
import Ubuntu.Components 1.3
747
19
19
748
20
/*! \brief This component constructs the Preview UI.
20
/*! \brief This component constructs the Preview UI.
749
21
 *
21
 *
750
22
22
751
=== modified file 'qml/Dash/Previews/PreviewActionButton.qml'
752
--- qml/Dash/Previews/PreviewActionButton.qml	2014-08-14 12:01:03 +0000
753
+++ qml/Dash/Previews/PreviewActionButton.qml	2015-07-22 14:32:16 +0000
754
@@ -15,7 +15,7 @@
755
15
 */
15
 */
756
16
16
757
17
import QtQuick 2.0
17
import QtQuick 2.0
759
18
import Ubuntu.Components 1.1
18
import Ubuntu.Components 1.3
760
19
19
761
20
Button {
20
Button {
762
21
    signal triggeredAction(var actionData)
21
    signal triggeredAction(var actionData)
763
22
22
764
=== modified file 'qml/Dash/Previews/PreviewActionCombo.qml'
765
--- qml/Dash/Previews/PreviewActionCombo.qml	2014-08-15 08:40:36 +0000
766
+++ qml/Dash/Previews/PreviewActionCombo.qml	2015-07-22 14:32:16 +0000
767
@@ -1,5 +1,5 @@
768
1
/*
1
/*
770
2
 * Copyright (C) 2014 Canonical, Ltd.
2
 * Copyright (C) 2014,2015 Canonical, Ltd.
771
3
 *
3
 *
772
4
 * This program is free software; you can redistribute it and/or modify
4
 * This program is free software; you can redistribute it and/or modify
773
5
 * it under the terms of the GNU General Public License as published by
5
 * it under the terms of the GNU General Public License as published by
774
@@ -15,7 +15,7 @@
775
15
 */
15
 */
776
16
16
777
17
import QtQuick 2.0
17
import QtQuick 2.0
779
18
import Ubuntu.Components 1.1
18
import Ubuntu.Components 1.3
780
19
19
781
20
Item {
20
Item {
782
21
    id: root
21
    id: root
783
@@ -33,7 +33,7 @@
784
33
33
785
34
        objectName: "moreLessButton"
34
        objectName: "moreLessButton"
786
35
        text: !expanded ? i18n.tr("More...") : i18n.tr("Less...")
35
        text: !expanded ? i18n.tr("More...") : i18n.tr("Less...")
788
36
        strokeColor: Theme.palette.normal.baseText
36
        strokeColor: theme.palette.normal.baseText
789
37
        onClicked: expanded = !expanded
37
        onClicked: expanded = !expanded
790
38
        width: parent.width
38
        width: parent.width
791
39
    }
39
    }
792
40
40
793
=== modified file 'qml/Dash/Previews/PreviewActions.qml'
794
--- qml/Dash/Previews/PreviewActions.qml	2015-02-12 10:44:27 +0000
795
+++ qml/Dash/Previews/PreviewActions.qml	2015-07-22 14:32:16 +0000
796
@@ -1,5 +1,5 @@
797
1
/*
1
/*
799
2
 * Copyright (C) 2014 Canonical, Ltd.
2
 * Copyright (C) 2014,2015 Canonical, Ltd.
800
3
 *
3
 *
801
4
 * This program is free software; you can redistribute it and/or modify
4
 * This program is free software; you can redistribute it and/or modify
802
5
 * it under the terms of the GNU General Public License as published by
5
 * it under the terms of the GNU General Public License as published by
803
@@ -15,7 +15,7 @@
804
15
 */
15
 */
805
16
16
806
17
import QtQuick 2.1
17
import QtQuick 2.1
808
18
import Ubuntu.Components 1.1
18
import Ubuntu.Components 1.3
809
19
19
810
20
/*! This preview widget shows either one button, two buttons or one button
20
/*! This preview widget shows either one button, two buttons or one button
811
21
 *  and a combo button depending on the number of items in widgetData["actions"].
21
 *  and a combo button depending on the number of items in widgetData["actions"].
812
@@ -50,7 +50,7 @@
813
50
            Binding {
50
            Binding {
814
51
                target: loader.item
51
                target: loader.item
815
52
                property: "strokeColor"
52
                property: "strokeColor"
817
53
                value: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText
53
                value: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText
818
54
            }
54
            }
819
55
            Connections {
55
            Connections {
820
56
                target: loader.item
56
                target: loader.item
821
57
57
822
=== modified file 'qml/Dash/Previews/PreviewAudioPlayback.qml'
823
--- qml/Dash/Previews/PreviewAudioPlayback.qml	2014-08-13 10:29:21 +0000
824
+++ qml/Dash/Previews/PreviewAudioPlayback.qml	2015-07-22 14:32:16 +0000
825
@@ -1,5 +1,5 @@
826
1
/*
1
/*
828
2
 * Copyright (C) 2014 Canonical, Ltd.
2
 * Copyright (C) 2014,2015 Canonical, Ltd.
829
3
 *
3
 *
830
4
 * This program is free software; you can redistribute it and/or modify
4
 * This program is free software; you can redistribute it and/or modify
831
5
 * it under the terms of the GNU General Public License as published by
5
 * it under the terms of the GNU General Public License as published by
832
@@ -16,7 +16,7 @@
833
16
16
834
17
import QtQuick 2.0
17
import QtQuick 2.0
835
18
import QtMultimedia 5.0
18
import QtMultimedia 5.0
837
19
import Ubuntu.Components 0.1
19
import Ubuntu.Components 1.3
838
20
20
839
21
/*! \brief Preview widget for audio tracks.
21
/*! \brief Preview widget for audio tracks.
840
22
22
841
@@ -139,7 +139,7 @@
842
139
                            objectName: "trackTitleLabel"
139
                            objectName: "trackTitleLabel"
843
140
                            anchors { top: parent.top; left: parent.left; right: parent.right }
140
                            anchors { top: parent.top; left: parent.left; right: parent.right }
844
141
                            opacity: 0.9
141
                            opacity: 0.9
846
142
                            color: scopeStyle ? scopeStyle.foreground : Theme.palette.normal.baseText
142
                            color: scopeStyle ? scopeStyle.foreground : theme.palette.normal.baseText
847
143
                            fontSize: "small"
143
                            fontSize: "small"
848
144
                            horizontalAlignment: Text.AlignLeft
144
                            horizontalAlignment: Text.AlignLeft
849
145
                            text: modelData["title"]
145
                            text: modelData["title"]
850
@@ -152,7 +152,7 @@
851
152
                            anchors { top: trackTitleLabel.bottom; left: parent.left; right: parent.right }
152
                            anchors { top: trackTitleLabel.bottom; left: parent.left; right: parent.right }
852
153
                            visible: text !== ""
153
                            visible: text !== ""
853
154
                            opacity: 0.9
154
                            opacity: 0.9
855
155
                            color: scopeStyle ? scopeStyle.foreground : Theme.palette.normal.baseText
155
                            color: scopeStyle ? scopeStyle.foreground : theme.palette.normal.baseText
856
156
                            font.weight: Font.Light
156
                            font.weight: Font.Light
857
157
                            fontSize: "small"
157
                            fontSize: "small"
858
158
                            horizontalAlignment: Text.AlignLeft
158
                            horizontalAlignment: Text.AlignLeft
859
@@ -193,7 +193,7 @@
860
193
                        anchors.verticalCenter: parent.verticalCenter
193
                        anchors.verticalCenter: parent.verticalCenter
861
194
                        width: parent.column3Width
194
                        width: parent.column3Width
862
195
                        opacity: 0.9
195
                        opacity: 0.9
864
196
                        color: scopeStyle ? scopeStyle.foreground : Theme.palette.normal.baseText
196
                        color: scopeStyle ? scopeStyle.foreground : theme.palette.normal.baseText
865
197
                        fontSize: "small"
197
                        fontSize: "small"
866
198
                        horizontalAlignment: Text.AlignRight
198
                        horizontalAlignment: Text.AlignRight
867
199
                        text: audio.lengthToString(modelData["length"])
199
                        text: audio.lengthToString(modelData["length"])
868
200
200
869
=== modified file 'qml/Dash/Previews/PreviewComment.qml'
870
--- qml/Dash/Previews/PreviewComment.qml	2015-07-06 15:33:11 +0000
871
+++ qml/Dash/Previews/PreviewComment.qml	2015-07-22 14:32:16 +0000
872
@@ -15,7 +15,7 @@
873
15
 */
15
 */
874
16
16
875
17
import QtQuick 2.0
17
import QtQuick 2.0
877
18
import Ubuntu.Components 1.2
18
import Ubuntu.Components 1.3
878
19
19
879
20
/*! \brief Preview widget for comments.
20
/*! \brief Preview widget for comments.
880
21
21
881
22
22
882
=== modified file 'qml/Dash/Previews/PreviewCommentInput.qml'
883
--- qml/Dash/Previews/PreviewCommentInput.qml	2015-07-06 13:14:35 +0000
884
+++ qml/Dash/Previews/PreviewCommentInput.qml	2015-07-22 14:32:16 +0000
885
@@ -15,7 +15,7 @@
886
15
 */
15
 */
887
16
16
888
17
import QtQuick 2.0
17
import QtQuick 2.0
890
18
import Ubuntu.Components 1.1
18
import Ubuntu.Components 1.3
891
19
import "../../Components"
19
import "../../Components"
892
20
20
893
21
/*! \brief Preview widget for commenting.
21
/*! \brief Preview widget for commenting.
894
22
22
895
=== modified file 'qml/Dash/Previews/PreviewExpandable.qml'
896
--- qml/Dash/Previews/PreviewExpandable.qml	2014-08-26 10:54:49 +0000
897
+++ qml/Dash/Previews/PreviewExpandable.qml	2015-07-22 14:32:16 +0000
898
@@ -1,5 +1,5 @@
899
1
/*
1
/*
901
2
 * Copyright (C) 2014 Canonical, Ltd.
2
 * Copyright (C) 2014,2015 Canonical, Ltd.
902
3
 *
3
 *
903
4
 * This program is free software; you can redistribute it and/or modify
4
 * This program is free software; you can redistribute it and/or modify
904
5
 * it under the terms of the GNU General Public License as published by
5
 * it under the terms of the GNU General Public License as published by
905
@@ -15,7 +15,7 @@
906
15
 */
15
 */
907
16
16
908
17
import QtQuick 2.3
17
import QtQuick 2.3
910
18
import Ubuntu.Components 1.1
18
import Ubuntu.Components 1.3
911
19
import "../../Components"
19
import "../../Components"
912
20
20
913
21
/*! \brief Preview widget for expandable widgets.
21
/*! \brief Preview widget for expandable widgets.
914
@@ -41,7 +41,7 @@
915
41
            right: expandButton.left
41
            right: expandButton.left
916
42
        }
42
        }
917
43
        fontSize: "large"
43
        fontSize: "large"
919
44
        color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText
44
        color: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText
920
45
        visible: text !== ""
45
        visible: text !== ""
921
46
        opacity: .8
46
        opacity: .8
922
47
        text: widgetData["title"] || ""
47
        text: widgetData["title"] || ""
923
@@ -62,7 +62,7 @@
924
62
            width: units.gu(3)
62
            width: units.gu(3)
925
63
            height: units.gu(3)
63
            height: units.gu(3)
926
64
            name: root.expanded ? "view-collapse" : "view-expand"
64
            name: root.expanded ? "view-collapse" : "view-expand"
928
65
            color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText
65
            color: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText
929
66
        }
66
        }
930
67
    }
67
    }
931
68
68
932
69
69
933
=== modified file 'qml/Dash/Previews/PreviewHeader.qml'
934
--- qml/Dash/Previews/PreviewHeader.qml	2015-05-06 15:05:06 +0000
935
+++ qml/Dash/Previews/PreviewHeader.qml	2015-07-22 14:32:16 +0000
936
@@ -1,5 +1,5 @@
937
1
/*
1
/*
939
2
 * Copyright (C) 2014 Canonical, Ltd.
2
 * Copyright (C) 2014,2015 Canonical, Ltd.
940
3
 *
3
 *
941
4
 * This program is free software; you can redistribute it and/or modify
4
 * This program is free software; you can redistribute it and/or modify
942
5
 * it under the terms of the GNU General Public License as published by
5
 * it under the terms of the GNU General Public License as published by
943
@@ -15,7 +15,7 @@
944
15
 */
15
 */
945
16
16
946
17
import QtQuick 2.0
17
import QtQuick 2.0
948
18
import Ubuntu.Components 0.1
18
import Ubuntu.Components 1.3
949
19
import Dash 0.1
19
import Dash 0.1
950
20
import "../"
20
import "../"
951
21
21
952
@@ -40,7 +40,7 @@
953
40
        readonly property string title: root.widgetData["title"] || ""
40
        readonly property string title: root.widgetData["title"] || ""
954
41
        readonly property string subtitle: root.widgetData["subtitle"] || ""
41
        readonly property string subtitle: root.widgetData["subtitle"] || ""
955
42
        readonly property var attributes: root.widgetData["attributes"] || null
42
        readonly property var attributes: root.widgetData["attributes"] || null
957
43
        readonly property color fontColor: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText
43
        readonly property color fontColor: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText
958
44
44
959
45
        // Rewire the source since we may have unwired it on onStatusChanged
45
        // Rewire the source since we may have unwired it on onStatusChanged
960
46
        onMascotChanged: if (mascotShapeLoader.item) mascotShapeLoader.item.image.source = mascot;
46
        onMascotChanged: if (mascotShapeLoader.item) mascotShapeLoader.item.image.source = mascot;
961
47
47
962
=== modified file 'qml/Dash/Previews/PreviewImageGallery.qml'
963
--- qml/Dash/Previews/PreviewImageGallery.qml	2015-05-06 15:05:06 +0000
964
+++ qml/Dash/Previews/PreviewImageGallery.qml	2015-07-22 14:32:16 +0000
965
@@ -15,7 +15,7 @@
966
15
 */
15
 */
967
16
16
968
17
import QtQuick 2.0
17
import QtQuick 2.0
970
18
import Ubuntu.Components 1.1
18
import Ubuntu.Components 1.3
971
19
import "../../Components"
19
import "../../Components"
972
20
20
973
21
/*! This preview widget shows a horizontal list of images.
21
/*! This preview widget shows a horizontal list of images.
974
22
22
975
=== modified file 'qml/Dash/Previews/PreviewOverlay.qml'
976
--- qml/Dash/Previews/PreviewOverlay.qml	2015-03-10 12:23:46 +0000
977
+++ qml/Dash/Previews/PreviewOverlay.qml	2015-07-22 14:32:16 +0000
978
@@ -1,5 +1,5 @@
979
1
/*
1
/*
981
2
 * Copyright (C) 2014 Canonical, Ltd.
2
 * Copyright (C) 2014,2015 Canonical, Ltd.
982
3
 *
3
 *
983
4
 * This program is free software; you can redistribute it and/or modify
4
 * This program is free software; you can redistribute it and/or modify
984
5
 * it under the terms of the GNU General Public License as published by
5
 * it under the terms of the GNU General Public License as published by
985
@@ -15,7 +15,7 @@
986
15
 */
15
 */
987
16
16
988
17
import QtQuick 2.0
17
import QtQuick 2.0
990
18
import Ubuntu.Components 1.1
18
import Ubuntu.Components 1.3
991
19
import "../../Components"
19
import "../../Components"
992
20
20
993
21
Rectangle {
21
Rectangle {
994
@@ -158,7 +158,7 @@
995
158
                anchors.centerIn: parent
158
                anchors.centerIn: parent
996
159
                width: units.gu(2.5)
159
                width: units.gu(2.5)
997
160
                height: width
160
                height: width
999
161
                color: Theme.palette.normal.foregroundText
161
                color: theme.palette.normal.foregroundText
1000
162
                name: "close"
162
                name: "close"
1001
163
            }
163
            }
1002
164
        }
164
        }
1003
165
165
1004
=== modified file 'qml/Dash/Previews/PreviewPayments.qml'
1005
--- qml/Dash/Previews/PreviewPayments.qml	2014-11-20 11:44:44 +0000
1006
+++ qml/Dash/Previews/PreviewPayments.qml	2015-07-22 14:32:16 +0000
1007
@@ -15,7 +15,7 @@
1008
15
 */
15
 */
1009
16
16
1010
17
import QtQuick 2.1
17
import QtQuick 2.1
1012
18
import Ubuntu.Components 0.1
18
import Ubuntu.Components 1.3
1013
19
import Ubuntu.Payments 0.1
19
import Ubuntu.Payments 0.1
1014
20
20
1015
21
/*! \brief Preview widget for a purchase button.
21
/*! \brief Preview widget for a purchase button.
1016
22
22
1017
=== modified file 'qml/Dash/Previews/PreviewProgress.qml'
1018
--- qml/Dash/Previews/PreviewProgress.qml	2014-04-30 10:51:30 +0000
1019
+++ qml/Dash/Previews/PreviewProgress.qml	2015-07-22 14:32:16 +0000
1020
@@ -15,7 +15,7 @@
1021
15
 */
15
 */
1022
16
16
1023
17
import QtQuick 2.1
17
import QtQuick 2.1
1025
18
import Ubuntu.Components 0.1
18
import Ubuntu.Components 1.3
1026
19
import Ubuntu.DownloadDaemonListener 0.1
19
import Ubuntu.DownloadDaemonListener 0.1
1027
20
20
1028
21
/*! \brief Preview widget for a progress bar.
21
/*! \brief Preview widget for a progress bar.
1029
22
22
1030
=== modified file 'qml/Dash/Previews/PreviewRatingDisplay.qml'
1031
--- qml/Dash/Previews/PreviewRatingDisplay.qml	2015-05-11 07:33:41 +0000
1032
+++ qml/Dash/Previews/PreviewRatingDisplay.qml	2015-07-22 14:32:16 +0000
1033
@@ -1,5 +1,5 @@
1034
1
/*
1
/*
1036
2
 * Copyright (C) 2014 Canonical, Ltd.
2
 * Copyright (C) 2014,2015 Canonical, Ltd.
1037
3
 *
3
 *
1038
4
 * This program is free software; you can redistribute it and/or modify
4
 * This program is free software; you can redistribute it and/or modify
1039
5
 * it under the terms of the GNU General Public License as published by
5
 * it under the terms of the GNU General Public License as published by
1040
@@ -15,7 +15,7 @@
1041
15
 */
15
 */
1042
16
16
1043
17
import QtQuick 2.0
17
import QtQuick 2.0
1045
18
import Ubuntu.Components 0.1
18
import Ubuntu.Components 1.3
1046
19
import "../../Components"
19
import "../../Components"
1047
20
20
1048
21
/*! \brief Preview widget for rating display.
21
/*! \brief Preview widget for rating display.
1049
@@ -60,7 +60,7 @@
1050
60
                urlIconEmpty: widgetData["rating-icon-empty"]
60
                urlIconEmpty: widgetData["rating-icon-empty"]
1051
61
                urlIconFull: widgetData["rating-icon-full"]
61
                urlIconFull: widgetData["rating-icon-full"]
1052
62
                urlIconHalf: widgetData["rating-icon-half"]
62
                urlIconHalf: widgetData["rating-icon-half"]
1054
63
                labelColor: scopeStyle ? scopeStyle.foreground : Theme.palette.normal.baseText
63
                labelColor: scopeStyle ? scopeStyle.foreground : theme.palette.normal.baseText
1055
64
            }
64
            }
1056
65
        }
65
        }
1057
66
    }
66
    }
1058
67
67
1059
=== modified file 'qml/Dash/Previews/PreviewRatingEdit.qml'
1060
--- qml/Dash/Previews/PreviewRatingEdit.qml	2015-05-08 13:12:02 +0000
1061
+++ qml/Dash/Previews/PreviewRatingEdit.qml	2015-07-22 14:32:16 +0000
1062
@@ -15,7 +15,7 @@
1063
15
 */
15
 */
1064
16
16
1065
17
import QtQuick 2.4
17
import QtQuick 2.4
1067
18
import Ubuntu.Components 0.1
18
import Ubuntu.Components 1.3
1068
19
import "../../Components"
19
import "../../Components"
1069
20
20
1070
21
/*! \brief Preview widget for editable rating.
21
/*! \brief Preview widget for editable rating.
1071
@@ -56,7 +56,7 @@
1072
56
        urlIconEmpty: widgetData["rating-icon-empty"]
56
        urlIconEmpty: widgetData["rating-icon-empty"]
1073
57
        urlIconFull: widgetData["rating-icon-full"]
57
        urlIconFull: widgetData["rating-icon-full"]
1074
58
        urlIconHalf: widgetData["rating-icon-half"]
58
        urlIconHalf: widgetData["rating-icon-half"]
1076
59
        labelColor: scopeStyle ? scopeStyle.foreground : Theme.palette.normal.baseText
59
        labelColor: scopeStyle ? scopeStyle.foreground : theme.palette.normal.baseText
1077
60
    }
60
    }
1078
61
61
1079
62
    PreviewRatingInput {
62
    PreviewRatingInput {
1080
63
63
1081
=== modified file 'qml/Dash/Previews/PreviewRatingInput.qml'
1082
--- qml/Dash/Previews/PreviewRatingInput.qml	2015-05-08 13:12:02 +0000
1083
+++ qml/Dash/Previews/PreviewRatingInput.qml	2015-07-22 14:32:16 +0000
1084
@@ -1,5 +1,5 @@
1085
1
/*
1
/*
1087
2
 * Copyright (C) 2014 Canonical, Ltd.
2
 * Copyright (C) 2014,2015 Canonical, Ltd.
1088
3
 *
3
 *
1089
4
 * This program is free software; you can redistribute it and/or modify
4
 * This program is free software; you can redistribute it and/or modify
1090
5
 * it under the terms of the GNU General Public License as published by
5
 * it under the terms of the GNU General Public License as published by
1091
@@ -15,7 +15,7 @@
1092
15
 */
15
 */
1093
16
16
1094
17
import QtQuick 2.0
17
import QtQuick 2.0
1096
18
import Ubuntu.Components 0.1
18
import Ubuntu.Components 1.3
1097
19
import "../../Components"
19
import "../../Components"
1098
20
20
1099
21
/*! \brief Preview widget for rating.
21
/*! \brief Preview widget for rating.
1100
@@ -79,7 +79,7 @@
1101
79
                verticalCenter: parent.verticalCenter
79
                verticalCenter: parent.verticalCenter
1102
80
                left: parent.left
80
                left: parent.left
1103
81
            }
81
            }
1105
82
            color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText
82
            color: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText
1106
83
            opacity: .8
83
            opacity: .8
1107
84
            text: widgetData["rating-label"] || i18n.tr("Rate this")
84
            text: widgetData["rating-label"] || i18n.tr("Rate this")
1108
85
        }
85
        }
1109
@@ -124,7 +124,7 @@
1110
124
                left: parent.left
124
                left: parent.left
1111
125
                right: parent.right
125
                right: parent.right
1112
126
            }
126
            }
1114
127
            color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText
127
            color: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText
1115
128
            opacity: .8
128
            opacity: .8
1116
129
            text: widgetData["review-label"] || i18n.tr("Add a review")
129
            text: widgetData["review-label"] || i18n.tr("Add a review")
1117
130
        }
130
        }
1118
@@ -165,7 +165,7 @@
1119
165
                    top: parent.top
165
                    top: parent.top
1120
166
                    right: parent.right
166
                    right: parent.right
1121
167
                }
167
                }
1123
168
                color: readyToSubmit ? Theme.palette.selected.base : Theme.palette.normal.base
168
                color: readyToSubmit ? theme.palette.selected.base : theme.palette.normal.base
1124
169
                text: widgetData["submit-label"] || i18n.tr("Send")
169
                text: widgetData["submit-label"] || i18n.tr("Send")
1125
170
                onClicked: {
170
                onClicked: {
1126
171
                    if (readyToSubmit) root.submit()
171
                    if (readyToSubmit) root.submit()
1127
172
172
1128
=== modified file 'qml/Dash/Previews/PreviewRatingSingleDisplay.qml'
1129
--- qml/Dash/Previews/PreviewRatingSingleDisplay.qml	2015-05-08 13:12:02 +0000
1130
+++ qml/Dash/Previews/PreviewRatingSingleDisplay.qml	2015-07-22 14:32:16 +0000
1131
@@ -15,7 +15,7 @@
1132
15
 */
15
 */
1133
16
16
1134
17
import QtQuick 2.4
17
import QtQuick 2.4
1136
18
import Ubuntu.Components 0.1
18
import Ubuntu.Components 1.3
1137
19
import "../../Components"
19
import "../../Components"
1138
20
20
1139
21
Column {
21
Column {
1140
22
22
1141
=== modified file 'qml/Dash/Previews/PreviewTable.qml'
1142
--- qml/Dash/Previews/PreviewTable.qml	2015-04-13 10:37:41 +0000
1143
+++ qml/Dash/Previews/PreviewTable.qml	2015-07-22 14:32:16 +0000
1144
@@ -1,5 +1,5 @@
1145
1
/*
1
/*
1147
2
 * Copyright (C) 2014 Canonical, Ltd.
2
 * Copyright (C) 2014,2015 Canonical, Ltd.
1148
3
 *
3
 *
1149
4
 * This program is free software; you can redistribute it and/or modify
4
 * This program is free software; you can redistribute it and/or modify
1150
5
 * it under the terms of the GNU General Public License as published by
5
 * it under the terms of the GNU General Public License as published by
1151
@@ -16,7 +16,7 @@
1152
16
16
1153
17
import QtQuick 2.0
17
import QtQuick 2.0
1154
18
import QtQuick.Layouts 1.1
18
import QtQuick.Layouts 1.1
1156
19
import Ubuntu.Components 0.1
19
import Ubuntu.Components 1.3
1157
20
import "../../Components"
20
import "../../Components"
1158
21
21
1159
22
/*! \brief Preview widget for table.
22
/*! \brief Preview widget for table.
1160
@@ -48,7 +48,7 @@
1161
48
            }
48
            }
1162
49
            height: visible ? implicitHeight : 0
49
            height: visible ? implicitHeight : 0
1163
50
            fontSize: "large"
50
            fontSize: "large"
1165
51
            color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText
51
            color: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText
1166
52
            visible: text !== ""
52
            visible: text !== ""
1167
53
            opacity: .8
53
            opacity: .8
1168
54
            text: widgetData["title"] || ""
54
            text: widgetData["title"] || ""
1169
@@ -72,7 +72,7 @@
1170
72
                        fontSize: "small"
72
                        fontSize: "small"
1171
73
                        text: perRowRepeater.model[index]
73
                        text: perRowRepeater.model[index]
1172
74
                        visible: root.expanded || rowIndex < maximumCollapsedRowCount
74
                        visible: root.expanded || rowIndex < maximumCollapsedRowCount
1174
75
                        color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText
75
                        color: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText
1175
76
                        font.bold: index == 0
76
                        font.bold: index == 0
1176
77
                        wrapMode: Text.Wrap
77
                        wrapMode: Text.Wrap
1177
78
                        Layout.alignment: Qt.AlignTop
78
                        Layout.alignment: Qt.AlignTop
1178
79
79
1179
=== modified file 'qml/Dash/Previews/PreviewTextSummary.qml'
1180
--- qml/Dash/Previews/PreviewTextSummary.qml	2014-10-10 10:37:03 +0000
1181
+++ qml/Dash/Previews/PreviewTextSummary.qml	2015-07-22 14:32:16 +0000
1182
@@ -1,5 +1,5 @@
1183
1
/*
1
/*
1185
2
 * Copyright (C) 2014 Canonical, Ltd.
2
 * Copyright (C) 2014,2015 Canonical, Ltd.
1186
3
 *
3
 *
1187
4
 * This program is free software; you can redistribute it and/or modify
4
 * This program is free software; you can redistribute it and/or modify
1188
5
 * it under the terms of the GNU General Public License as published by
5
 * it under the terms of the GNU General Public License as published by
1189
@@ -15,7 +15,7 @@
1190
15
 */
15
 */
1191
16
16
1192
17
import QtQuick 2.0
17
import QtQuick 2.0
1194
18
import Ubuntu.Components 0.1
18
import Ubuntu.Components 1.3
1195
19
import "../../Components"
19
import "../../Components"
1196
20
20
1197
21
/*! \brief Preview widget for text.
21
/*! \brief Preview widget for text.
1198
@@ -39,7 +39,7 @@
1199
39
        }
39
        }
1200
40
        height: visible ? implicitHeight : 0
40
        height: visible ? implicitHeight : 0
1201
41
        fontSize: "large"
41
        fontSize: "large"
1203
42
        color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText
42
        color: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText
1204
43
        visible: text !== ""
43
        visible: text !== ""
1205
44
        opacity: .8
44
        opacity: .8
1206
45
        text: widgetData["title"] || ""
45
        text: widgetData["title"] || ""
1207
@@ -61,7 +61,7 @@
1208
61
        clip: true
61
        clip: true
1209
62
        fontSize: "small"
62
        fontSize: "small"
1210
63
        lineHeight: 1.2
63
        lineHeight: 1.2
1212
64
        color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText
64
        color: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText
1213
65
        opacity: .8
65
        opacity: .8
1214
66
        text: widgetData["text"] || ""
66
        text: widgetData["text"] || ""
1215
67
        wrapMode: Text.Wrap
67
        wrapMode: Text.Wrap
1216
68
68
1217
=== modified file 'qml/Dash/Previews/PreviewVideoPlayback.qml'
1218
--- qml/Dash/Previews/PreviewVideoPlayback.qml	2014-03-31 13:06:36 +0000
1219
+++ qml/Dash/Previews/PreviewVideoPlayback.qml	2015-07-22 14:32:16 +0000
1220
@@ -15,7 +15,7 @@
1221
15
 */
15
 */
1222
16
16
1223
17
import QtQuick 2.0
17
import QtQuick 2.0
1225
18
import Ubuntu.Components 0.1
18
import Ubuntu.Components 1.3
1226
19
import Ubuntu.Thumbnailer 0.1
19
import Ubuntu.Thumbnailer 0.1
1227
20
import "../../Components"
20
import "../../Components"
1228
21
21
1229
22
22
1230
=== modified file 'qml/Dash/Previews/PreviewZoomableImage.qml'
1231
--- qml/Dash/Previews/PreviewZoomableImage.qml	2015-05-06 15:05:06 +0000
1232
+++ qml/Dash/Previews/PreviewZoomableImage.qml	2015-07-22 14:32:16 +0000
1233
@@ -15,7 +15,7 @@
1234
15
 */
15
 */
1235
16
16
1236
17
import QtQuick 2.0
17
import QtQuick 2.0
1238
18
import Ubuntu.Components 0.1
18
import Ubuntu.Components 1.3
1239
19
import "../../Components"
19
import "../../Components"
1240
20
20
1241
21
/*! \brief Preview widget for image.
21
/*! \brief Preview widget for image.
1242
22
22
1243
=== modified file 'qml/Dash/PullToRefreshScopeStyle.qml'
1244
--- qml/Dash/PullToRefreshScopeStyle.qml	2014-09-30 14:22:22 +0000
1245
+++ qml/Dash/PullToRefreshScopeStyle.qml	2015-07-22 14:32:16 +0000
1246
@@ -15,8 +15,8 @@
1247
15
 */
15
 */
1248
16
16
1249
17
import QtQuick 2.3
17
import QtQuick 2.3
1252
18
import Ubuntu.Components 1.1
18
import Ubuntu.Components 1.3
1253
19
import Ubuntu.Components.Styles 1.1
19
import Ubuntu.Components.Styles 1.3
1254
20
20
1255
21
/**
21
/**
1256
22
 * TODO: Once the SDK version of PullToRefreshStyle doesn't have bug 1375799
22
 * TODO: Once the SDK version of PullToRefreshStyle doesn't have bug 1375799
1257
23
23
1258
=== modified file 'qml/Dash/ScopeSettings/ScopeSetting.qml'
1259
--- qml/Dash/ScopeSettings/ScopeSetting.qml	2014-08-26 12:27:36 +0000
1260
+++ qml/Dash/ScopeSettings/ScopeSetting.qml	2015-07-22 14:32:16 +0000
1261
@@ -15,7 +15,7 @@
1262
15
 */
15
 */
1263
16
16
1264
17
import QtQuick 2.2
17
import QtQuick 2.2
1266
18
import Ubuntu.Components 1.1
18
import Ubuntu.Components 1.3
1267
19
19
1268
20
/*! Interface for settings widgets. */
20
/*! Interface for settings widgets. */
1269
21
21
1270
22
22
1271
=== modified file 'qml/Dash/ScopeSettings/ScopeSettingBoolean.qml'
1272
--- qml/Dash/ScopeSettings/ScopeSettingBoolean.qml	2015-02-10 11:35:11 +0000
1273
+++ qml/Dash/ScopeSettings/ScopeSettingBoolean.qml	2015-07-22 14:32:16 +0000
1274
@@ -1,5 +1,5 @@
1275
1
/*
1
/*
1277
2
 * Copyright (C) 2014 Canonical, Ltd.
2
 * Copyright (C) 2015 Canonical, Ltd.
1278
3
 *
3
 *
1279
4
 * This program is free software; you can redistribute it and/or modify
4
 * This program is free software; you can redistribute it and/or modify
1280
5
 * it under the terms of the GNU General Public License as published by
5
 * it under the terms of the GNU General Public License as published by
1281
@@ -15,8 +15,8 @@
1282
15
 */
15
 */
1283
16
16
1284
17
import QtQuick 2.2
17
import QtQuick 2.2
1287
18
import Ubuntu.Components 1.1
18
import Ubuntu.Components 1.3
1288
19
import Ubuntu.Components.ListItems 1.0 as ListItem
19
import Ubuntu.Components.ListItems 1.3 as ListItem
1289
20
20
1290
21
ScopeSetting {
21
ScopeSetting {
1291
22
    id: root
22
    id: root
1292
@@ -44,7 +44,7 @@
1293
44
            elide: Text.ElideMiddle
44
            elide: Text.ElideMiddle
1294
45
            maximumLineCount: 2
45
            maximumLineCount: 2
1295
46
            wrapMode: Text.Wrap
46
            wrapMode: Text.Wrap
1297
47
            color: scopeStyle ? scopeStyle.foreground : Theme.palette.normal.baseText
47
            color: scopeStyle ? scopeStyle.foreground : theme.palette.normal.baseText
1298
48
        }
48
        }
1299
49
49
1300
50
        CheckBox {
50
        CheckBox {
1301
51
51
1302
=== modified file 'qml/Dash/ScopeSettings/ScopeSettingList.qml'
1303
--- qml/Dash/ScopeSettings/ScopeSettingList.qml	2014-08-26 12:33:32 +0000
1304
+++ qml/Dash/ScopeSettings/ScopeSettingList.qml	2015-07-22 14:32:16 +0000
1305
@@ -15,8 +15,8 @@
1306
15
 */
15
 */
1307
16
16
1308
17
import QtQuick 2.2
17
import QtQuick 2.2
1311
18
import Ubuntu.Components 1.1
18
import Ubuntu.Components 1.3
1312
19
import Ubuntu.Components.ListItems 1.0 as ListItem
19
import Ubuntu.Components.ListItems 1.3 as ListItem
1313
20
20
1314
21
ScopeSetting {
21
ScopeSetting {
1315
22
    id: root
22
    id: root
1316
23
23
1317
=== modified file 'qml/Dash/ScopeSettings/ScopeSettingString.qml'
1318
--- qml/Dash/ScopeSettings/ScopeSettingString.qml	2014-08-26 12:27:36 +0000
1319
+++ qml/Dash/ScopeSettings/ScopeSettingString.qml	2015-07-22 14:32:16 +0000
1320
@@ -1,5 +1,5 @@
1321
1
/*
1
/*
1323
2
 * Copyright (C) 2014 Canonical, Ltd.
2
 * Copyright (C) 2015 Canonical, Ltd.
1324
3
 *
3
 *
1325
4
 * This program is free software; you can redistribute it and/or modify
4
 * This program is free software; you can redistribute it and/or modify
1326
5
 * it under the terms of the GNU General Public License as published by
5
 * it under the terms of the GNU General Public License as published by
1327
@@ -15,8 +15,8 @@
1328
15
 */
15
 */
1329
16
16
1330
17
import QtQuick 2.2
17
import QtQuick 2.2
1333
18
import Ubuntu.Components 1.1
18
import Ubuntu.Components 1.3
1334
19
import Ubuntu.Components.ListItems 1.0 as ListItem
19
import Ubuntu.Components.ListItems 1.3 as ListItem
1335
20
20
1336
21
ScopeSetting {
21
ScopeSetting {
1337
22
    id: root
22
    id: root
1338
@@ -44,7 +44,7 @@
1339
44
            elide: Text.ElideMiddle
44
            elide: Text.ElideMiddle
1340
45
            maximumLineCount: 2
45
            maximumLineCount: 2
1341
46
            wrapMode: Text.Wrap
46
            wrapMode: Text.Wrap
1343
47
            color: scopeStyle ? scopeStyle.foreground : Theme.palette.normal.baseText
47
            color: scopeStyle ? scopeStyle.foreground : theme.palette.normal.baseText
1344
48
        }
48
        }
1345
49
49
1346
50
        TextField {
50
        TextField {
1347
@@ -57,7 +57,7 @@
1348
57
            }
57
            }
1349
58
            width: root.mode == "number" ? units.gu(8) : units.gu(12)
58
            width: root.mode == "number" ? units.gu(8) : units.gu(12)
1350
59
            text: widgetData.value
59
            text: widgetData.value
1352
60
            color: scopeStyle ? scopeStyle.foreground : Theme.palette.normal.fieldText
60
            color: scopeStyle ? scopeStyle.foreground : theme.palette.normal.fieldText
1353
61
            validator: root.mode == "number" ? doubleValidator : null
61
            validator: root.mode == "number" ? doubleValidator : null
1354
62
            hasClearButton: root.mode == "number" ? false : true
62
            hasClearButton: root.mode == "number" ? false : true
1355
63
63
1356
64
64
1357
=== modified file 'qml/Dash/ScopeSettingsPage.qml'
1358
--- qml/Dash/ScopeSettingsPage.qml	2014-10-23 11:59:22 +0000
1359
+++ qml/Dash/ScopeSettingsPage.qml	2015-07-22 14:32:16 +0000
1360
@@ -15,7 +15,7 @@
1361
15
 */
15
 */
1362
16
16
1363
17
import QtQuick 2.2
17
import QtQuick 2.2
1365
18
import Ubuntu.Components 1.1
18
import Ubuntu.Components 1.3
1366
19
import Unity 0.2
19
import Unity 0.2
1367
20
import "../Components"
20
import "../Components"
1368
21
import "ScopeSettings"
21
import "ScopeSettings"
1369
22
22
1370
=== modified file 'qml/Dash/ScopesListCategory.qml'
1371
--- qml/Dash/ScopesListCategory.qml	2015-04-24 07:33:59 +0000
1372
+++ qml/Dash/ScopesListCategory.qml	2015-07-22 14:32:16 +0000
1373
@@ -1,5 +1,5 @@
1374
1
/*
1
/*
1376
2
 * Copyright (C) 2014 Canonical, Ltd.
2
 * Copyright (C) 2014,2015 Canonical, Ltd.
1377
3
 *
3
 *
1378
4
 * This program is free software; you can redistribute it and/or modify
4
 * This program is free software; you can redistribute it and/or modify
1379
5
 * it under the terms of the GNU General Public License as published by
5
 * it under the terms of the GNU General Public License as published by
1380
@@ -15,7 +15,7 @@
1381
15
 */
15
 */
1382
16
16
1383
17
import QtQuick 2.3
17
import QtQuick 2.3
1385
18
import Ubuntu.Components 1.1
18
import Ubuntu.Components 1.3
1386
19
import Dash 0.1
19
import Dash 0.1
1387
20
import "../Components/ListItems" as ListItems
20
import "../Components/ListItems" as ListItems
1388
21
21
1389
@@ -43,7 +43,7 @@
1390
43
        id: header
43
        id: header
1391
44
        width: root.width
44
        width: root.width
1392
45
        height: units.gu(5)
45
        height: units.gu(5)
1394
46
        color: scopeStyle ? scopeStyle.foreground : Theme.palette.normal.baseText
46
        color: scopeStyle ? scopeStyle.foreground : theme.palette.normal.baseText
1395
47
    }
47
    }
1396
48
48
1397
49
    readonly property double listItemHeight: units.gu(6)
49
    readonly property double listItemHeight: units.gu(6)
1398
50
50
1399
=== modified file 'qml/Dash/ScopesListCategoryItem.qml'
1400
--- qml/Dash/ScopesListCategoryItem.qml	2015-02-13 12:03:32 +0000
1401
+++ qml/Dash/ScopesListCategoryItem.qml	2015-07-22 14:32:16 +0000
1402
@@ -16,7 +16,7 @@
1403
16
16
1404
17
import QtQuick 2.3
17
import QtQuick 2.3
1405
18
import QtQuick.Layouts 1.1
18
import QtQuick.Layouts 1.1
1407
19
import Ubuntu.Components 1.1
19
import Ubuntu.Components 1.3
1408
20
20
1409
21
MouseArea {
21
MouseArea {
1410
22
    id: root
22
    id: root
1411
23
23
1412
=== modified file 'qml/Greeter/Clock.qml'
1413
--- qml/Greeter/Clock.qml	2014-12-11 14:10:18 +0000
1414
+++ qml/Greeter/Clock.qml	2015-07-22 14:32:16 +0000
1415
@@ -15,7 +15,7 @@
1416
15
 */
15
 */
1417
16
16
1418
17
import QtQuick 2.0
17
import QtQuick 2.0
1420
18
import Ubuntu.Components 0.1
18
import Ubuntu.Components 1.3
1421
19
import "../Panel/Indicators"
19
import "../Panel/Indicators"
1422
20
import Unity.Indicators 0.1 as Indicators
20
import Unity.Indicators 0.1 as Indicators
1423
21
21
1424
22
22
1425
=== modified file 'qml/Greeter/CoverPage.qml'
1426
--- qml/Greeter/CoverPage.qml	2015-05-11 14:36:03 +0000
1427
+++ qml/Greeter/CoverPage.qml	2015-07-22 14:32:16 +0000
1428
@@ -15,7 +15,7 @@
1429
15
 */
15
 */
1430
16
16
1431
17
import QtQuick 2.3
17
import QtQuick 2.3
1433
18
import Ubuntu.Components 1.1
18
import Ubuntu.Components 1.3
1434
19
import Ubuntu.Gestures 0.1
19
import Ubuntu.Gestures 0.1
1435
20
import "../Components"
20
import "../Components"
1436
21
21
1437
22
22
1438
=== modified file 'qml/Greeter/Greeter.qml'
1439
--- qml/Greeter/Greeter.qml	2015-06-12 16:07:43 +0000
1440
+++ qml/Greeter/Greeter.qml	2015-07-22 14:32:16 +0000
1441
@@ -17,7 +17,7 @@
1442
17
import QtQuick 2.3
17
import QtQuick 2.3
1443
18
import AccountsService 0.1
18
import AccountsService 0.1
1444
19
import LightDM 0.1 as LightDM
19
import LightDM 0.1 as LightDM
1446
20
import Ubuntu.Components 1.1
20
import Ubuntu.Components 1.3
1447
21
import Ubuntu.SystemImage 0.1
21
import Ubuntu.SystemImage 0.1
1448
22
import Unity.Launcher 0.1
22
import Unity.Launcher 0.1
1449
23
import "../Components"
23
import "../Components"
1450
24
24
1451
=== modified file 'qml/Greeter/Infographics.qml'
1452
--- qml/Greeter/Infographics.qml	2015-02-12 14:48:06 +0000
1453
+++ qml/Greeter/Infographics.qml	2015-07-22 14:32:16 +0000
1454
@@ -17,7 +17,7 @@
1455
17
import "../Components"
17
import "../Components"
1456
18
import "Gradient.js" as Gradient
18
import "Gradient.js" as Gradient
1457
19
import QtQuick 2.0
19
import QtQuick 2.0
1459
20
import Ubuntu.Components 0.1
20
import Ubuntu.Components 1.3
1460
21
21
1461
22
Item {
22
Item {
1462
23
    id: infographic
23
    id: infographic
1463
24
24
1464
=== modified file 'qml/Greeter/LoginList.qml'
1465
--- qml/Greeter/LoginList.qml	2015-02-01 19:53:29 +0000
1466
+++ qml/Greeter/LoginList.qml	2015-07-22 14:32:16 +0000
1467
@@ -15,7 +15,7 @@
1468
15
 */
15
 */
1469
16
16
1470
17
import QtQuick 2.3
17
import QtQuick 2.3
1472
18
import Ubuntu.Components 1.1
18
import Ubuntu.Components 1.3
1473
19
import "../Components"
19
import "../Components"
1474
20
20
1475
21
Item {
21
Item {
1476
22
22
1477
=== modified file 'qml/Greeter/NarrowView.qml'
1478
--- qml/Greeter/NarrowView.qml	2015-03-04 13:23:34 +0000
1479
+++ qml/Greeter/NarrowView.qml	2015-07-22 14:32:16 +0000
1480
@@ -15,7 +15,7 @@
1481
15
 */
15
 */
1482
16
16
1483
17
import QtQuick 2.3
17
import QtQuick 2.3
1485
18
import Ubuntu.Components 1.1
18
import Ubuntu.Components 1.3
1486
19
import "../Components"
19
import "../Components"
1487
20
20
1488
21
FocusScope {
21
FocusScope {
1489
22
22
1490
=== modified file 'qml/Greeter/ObjectPositioner.qml'
1491
--- qml/Greeter/ObjectPositioner.qml	2013-06-05 22:03:08 +0000
1492
+++ qml/Greeter/ObjectPositioner.qml	2015-07-22 14:32:16 +0000
1493
@@ -15,7 +15,7 @@
1494
15
 */
15
 */
1495
16
16
1496
17
import QtQuick 2.0
17
import QtQuick 2.0
1498
18
import Ubuntu.Components 0.1
18
import Ubuntu.Components 1.3
1499
19
19
1500
20
Item {
20
Item {
1501
21
    property int count
21
    property int count
1502
22
22
1503
=== modified file 'qml/Greeter/WideView.qml'
1504
--- qml/Greeter/WideView.qml	2015-03-04 13:23:34 +0000
1505
+++ qml/Greeter/WideView.qml	2015-07-22 14:32:16 +0000
1506
@@ -15,7 +15,7 @@
1507
15
 */
15
 */
1508
16
16
1509
17
import QtQuick 2.3
17
import QtQuick 2.3
1511
18
import Ubuntu.Components 1.1
18
import Ubuntu.Components 1.3
1512
19
19
1513
20
FocusScope {
20
FocusScope {
1514
21
    id: root
21
    id: root
1515
22
22
1516
=== modified file 'qml/Launcher/FoldingLauncherDelegate.qml'
1517
--- qml/Launcher/FoldingLauncherDelegate.qml	2013-08-27 18:30:55 +0000
1518
+++ qml/Launcher/FoldingLauncherDelegate.qml	2015-07-22 14:32:16 +0000
1519
@@ -15,7 +15,7 @@
1520
15
 */
15
 */
1521
16
16
1522
17
import QtQuick 2.0
17
import QtQuick 2.0
1524
18
import Ubuntu.Components 0.1
18
import Ubuntu.Components 1.3
1525
19
19
1526
20
LauncherDelegate {
20
LauncherDelegate {
1527
21
    id: root
21
    id: root
1528
22
22
1529
=== modified file 'qml/Launcher/Launcher.qml'
1530
--- qml/Launcher/Launcher.qml	2015-04-15 20:21:11 +0000
1531
+++ qml/Launcher/Launcher.qml	2015-07-22 14:32:16 +0000
1532
@@ -16,7 +16,7 @@
1533
16
16
1534
17
import QtQuick 2.0
17
import QtQuick 2.0
1535
18
import "../Components"
18
import "../Components"
1537
19
import Ubuntu.Components 0.1
19
import Ubuntu.Components 1.3
1538
20
import Ubuntu.Gestures 0.1
20
import Ubuntu.Gestures 0.1
1539
21
import Unity.Launcher 0.1
21
import Unity.Launcher 0.1
1540
22
22
1541
23
23
1542
=== modified file 'qml/Launcher/LauncherDelegate.qml'
1543
--- qml/Launcher/LauncherDelegate.qml	2014-10-14 12:28:07 +0000
1544
+++ qml/Launcher/LauncherDelegate.qml	2015-07-22 14:32:16 +0000
1545
@@ -15,7 +15,7 @@
1546
15
 */
15
 */
1547
16
16
1548
17
import QtQuick 2.0
17
import QtQuick 2.0
1550
18
import Ubuntu.Components 0.1
18
import Ubuntu.Components 1.3
1551
19
19
1552
20
Item {
20
Item {
1553
21
    id: root
21
    id: root
1554
22
22
1555
=== modified file 'qml/Launcher/LauncherPanel.qml'
1556
--- qml/Launcher/LauncherPanel.qml	2015-07-01 11:39:49 +0000
1557
+++ qml/Launcher/LauncherPanel.qml	2015-07-22 14:32:16 +0000
1558
@@ -15,10 +15,10 @@
1559
15
 */
15
 */
1560
16
16
1561
17
import QtQuick 2.3
17
import QtQuick 2.3
1564
18
import Ubuntu.Components 1.1
18
import Ubuntu.Components 1.3
1565
19
import Ubuntu.Components.ListItems 1.0 as ListItems
19
import Ubuntu.Components.ListItems 1.3 as ListItems
1566
20
import Unity.Launcher 0.1
20
import Unity.Launcher 0.1
1568
21
import Ubuntu.Components.Popups 0.1
21
import Ubuntu.Components.Popups 1.3
1569
22
import "../Components/ListItems"
22
import "../Components/ListItems"
1570
23
import "../Components/"
23
import "../Components/"
1571
24
24
1572
25
25
1573
=== modified file 'qml/Notifications/Notification.qml'
1574
--- qml/Notifications/Notification.qml	2015-01-21 17:19:13 +0000
1575
+++ qml/Notifications/Notification.qml	2015-07-22 14:32:16 +0000
1576
@@ -1,5 +1,5 @@
1577
1
/*
1
/*
1579
2
 * Copyright (C) 2013 Canonical, Ltd.
2
 * Copyright (C) 2013,2015 Canonical, Ltd.
1580
3
 *
3
 *
1581
4
 * This program is free software; you can redistribute it and/or modify
4
 * This program is free software; you can redistribute it and/or modify
1582
5
 * it under the terms of the GNU General Public License as published by
5
 * it under the terms of the GNU General Public License as published by
1583
@@ -16,12 +16,12 @@
1584
16
16
1585
17
import QtQuick 2.0
17
import QtQuick 2.0
1586
18
import QtMultimedia 5.0
18
import QtMultimedia 5.0
1588
19
import Ubuntu.Components 1.1
19
import Ubuntu.Components 1.3
1589
20
import Unity.Notifications 1.0
20
import Unity.Notifications 1.0
1590
21
import QMenuModel 0.1
21
import QMenuModel 0.1
1591
22
import Utils 0.1
22
import Utils 0.1
1592
23
23
1594
24
import Ubuntu.Components.ListItems 0.1 as ListItem
24
import Ubuntu.Components.ListItems 1.3 as ListItem
1595
25
25
1596
26
Item {
26
Item {
1597
27
    id: notification
27
    id: notification
1598
@@ -269,7 +269,7 @@
1599
269
                        }
269
                        }
1600
270
                        visible: type !== Notification.Confirmation
270
                        visible: type !== Notification.Confirmation
1601
271
                        fontSize: "medium"
271
                        fontSize: "medium"
1603
272
                        color: darkOnBright ? sdFontColor : Theme.palette.selected.backgroundText
272
                        color: darkOnBright ? sdFontColor : theme.palette.selected.backgroundText
1604
273
                        elide: Text.ElideRight
273
                        elide: Text.ElideRight
1605
274
                        textFormat: Text.PlainText
274
                        textFormat: Text.PlainText
1606
275
                    }
275
                    }
1607
@@ -284,7 +284,7 @@
1608
284
                        }
284
                        }
1609
285
                        visible: body != "" && type !== Notification.Confirmation
285
                        visible: body != "" && type !== Notification.Confirmation
1610
286
                        fontSize: "small"
286
                        fontSize: "small"
1612
287
                        color: darkOnBright ? sdFontColor : Theme.palette.selected.backgroundText
287
                        color: darkOnBright ? sdFontColor : theme.palette.selected.backgroundText
1613
288
                        wrapMode: Text.WordWrap
288
                        wrapMode: Text.WordWrap
1614
289
                        maximumLineCount: type == Notification.SnapDecision ? 12 : 2
289
                        maximumLineCount: type == Notification.SnapDecision ? 12 : 2
1615
290
                        elide: Text.ElideRight
290
                        elide: Text.ElideRight
1616
@@ -325,7 +325,7 @@
1617
325
                anchors.horizontalCenter: parent.horizontalCenter
325
                anchors.horizontalCenter: parent.horizontalCenter
1618
326
                visible: type === Notification.Confirmation && body !== ""
326
                visible: type === Notification.Confirmation && body !== ""
1619
327
                fontSize: "medium"
327
                fontSize: "medium"
1621
328
                color: darkOnBright ? sdFontColor : Theme.palette.selected.backgroundText
328
                color: darkOnBright ? sdFontColor : theme.palette.selected.backgroundText
1622
329
                wrapMode: Text.WordWrap
329
                wrapMode: Text.WordWrap
1623
330
                maximumLineCount: 1
330
                maximumLineCount: 1
1624
331
                elide: Text.ElideRight
331
                elide: Text.ElideRight
1625
332
332
1626
=== modified file 'qml/Notifications/NotificationMenuItemFactory.qml'
1627
--- qml/Notifications/NotificationMenuItemFactory.qml	2014-11-17 13:46:56 +0000
1628
+++ qml/Notifications/NotificationMenuItemFactory.qml	2015-07-22 14:32:16 +0000
1629
@@ -18,7 +18,7 @@
1630
18
 */
18
 */
1631
19
19
1632
20
import QtQuick 2.0
20
import QtQuick 2.0
1634
21
import Ubuntu.Components 0.1
21
import Ubuntu.Components 1.3
1635
22
import QMenuModel 0.1
22
import QMenuModel 0.1
1636
23
import "../Components"
23
import "../Components"
1637
24
24
1638
25
25
1639
=== modified file 'qml/Notifications/Notifications.qml'
1640
--- qml/Notifications/Notifications.qml	2015-07-01 11:41:38 +0000
1641
+++ qml/Notifications/Notifications.qml	2015-07-22 14:32:16 +0000
1642
@@ -15,7 +15,7 @@
1643
15
 */
15
 */
1644
16
16
1645
17
import QtQuick 2.0
17
import QtQuick 2.0
1647
18
import Ubuntu.Components 0.1
18
import Ubuntu.Components 1.3
1648
19
import Unity.Notifications 1.0 as UnityNotifications
19
import Unity.Notifications 1.0 as UnityNotifications
1649
20
import Utils 0.1
20
import Utils 0.1
1650
21
import "../Components"
21
import "../Components"
1651
22
22
1652
=== modified file 'qml/Notifications/OptionToggle.qml'
1653
--- qml/Notifications/OptionToggle.qml	2014-11-07 10:55:22 +0000
1654
+++ qml/Notifications/OptionToggle.qml	2015-07-22 14:32:16 +0000
1655
@@ -1,5 +1,5 @@
1656
1
/*
1
/*
1658
2
 * Copyright (C) 2014 Canonical, Ltd.
2
 * Copyright (C) 2014,2015 Canonical, Ltd.
1659
3
 *
3
 *
1660
4
 * This program is free software; you can redistribute it and/or modify
4
 * This program is free software; you can redistribute it and/or modify
1661
5
 * it under the terms of the GNU General Public License as published by
5
 * it under the terms of the GNU General Public License as published by
1662
@@ -15,9 +15,9 @@
1663
15
 */
15
 */
1664
16
16
1665
17
import QtQuick 2.0
17
import QtQuick 2.0
1669
18
import Ubuntu.Components 0.1
18
import Ubuntu.Components 1.3
1670
19
import Ubuntu.Components.ListItems 0.1 as ListItem
19
import Ubuntu.Components.ListItems 1.3 as ListItem
1671
20
import Ubuntu.Components.Popups 0.1
20
import Ubuntu.Components.Popups 1.3
1672
21
21
1673
22
UbuntuShape {
22
UbuntuShape {
1674
23
    id: optionToggle
23
    id: optionToggle
1675
@@ -29,7 +29,7 @@
1676
29
29
1677
30
    signal triggered(string id)
30
    signal triggered(string id)
1678
31
31
1680
32
    color: Theme.palette.normal.base
32
    color: theme.palette.normal.base
1681
33
    borderSource: "none"
33
    borderSource: "none"
1682
34
    height: expanded ? (optionToggleRepeater.count - startIndex) * itemHeight : itemHeight
34
    height: expanded ? (optionToggleRepeater.count - startIndex) * itemHeight : itemHeight
1683
35
    width: parent.width
35
    width: parent.width
1684
36
36
1685
=== modified file 'qml/Notifications/ShapedIcon.qml'
1686
--- qml/Notifications/ShapedIcon.qml	2015-05-08 14:09:26 +0000
1687
+++ qml/Notifications/ShapedIcon.qml	2015-07-22 14:32:16 +0000
1688
@@ -1,5 +1,5 @@
1689
1
/*
1
/*
1691
2
 * Copyright (C) 2013 Canonical, Ltd.
2
 * Copyright (C) 2013,2015 Canonical, Ltd.
1692
3
 *
3
 *
1693
4
 * This program is free software; you can redistribute it and/or modify
4
 * This program is free software; you can redistribute it and/or modify
1694
5
 * it under the terms of the GNU General Public License as published by
5
 * it under the terms of the GNU General Public License as published by
1695
@@ -15,7 +15,7 @@
1696
15
 */
15
 */
1697
16
16
1698
17
import QtQuick 2.3
17
import QtQuick 2.3
1700
18
import Ubuntu.Components 1.2
18
import Ubuntu.Components 1.3
1701
19
19
1702
20
Item {
20
Item {
1703
21
    property string fileSource
21
    property string fileSource
1704
22
22
1705
=== modified file 'qml/Notifications/SwipeToAct.qml'
1706
--- qml/Notifications/SwipeToAct.qml	2015-03-17 11:02:43 +0000
1707
+++ qml/Notifications/SwipeToAct.qml	2015-07-22 14:32:16 +0000
1708
@@ -15,7 +15,7 @@
1709
15
 */
15
 */
1710
16
16
1711
17
import QtQuick 2.3
17
import QtQuick 2.3
1713
18
import Ubuntu.Components 1.1
18
import Ubuntu.Components 1.3
1714
19
19
1715
20
Item {
20
Item {
1716
21
    id: swipeToAct
21
    id: swipeToAct
1717
22
22
1718
=== modified file 'qml/Panel/ActiveCallHint.qml'
1719
--- qml/Panel/ActiveCallHint.qml	2014-10-08 21:05:50 +0000
1720
+++ qml/Panel/ActiveCallHint.qml	2015-07-22 14:32:16 +0000
1721
@@ -16,7 +16,7 @@
1722
16
16
1723
17
import QtQuick 2.0
17
import QtQuick 2.0
1724
18
import Ubuntu.Telephony 0.1 as Telephony
18
import Ubuntu.Telephony 0.1 as Telephony
1726
19
import Ubuntu.Components 0.1
19
import Ubuntu.Components 1.3
1727
20
import Unity.Application 0.1
20
import Unity.Application 0.1
1728
21
import "../Components"
21
import "../Components"
1729
22
22
1730
23
23
1731
=== modified file 'qml/Panel/Handle.qml'
1732
--- qml/Panel/Handle.qml	2014-10-09 12:01:57 +0000
1733
+++ qml/Panel/Handle.qml	2015-07-22 14:32:16 +0000
1734
@@ -15,7 +15,7 @@
1735
15
 */
15
 */
1736
16
16
1737
17
import QtQuick 2.2
17
import QtQuick 2.2
1739
18
import Ubuntu.Components 1.1
18
import Ubuntu.Components 1.3
1740
19
19
1741
20
Rectangle {
20
Rectangle {
1742
21
    id: handle
21
    id: handle
1743
22
22
1744
=== modified file 'qml/Panel/IndicatorItem.qml'
1745
--- qml/Panel/IndicatorItem.qml	2015-07-01 11:08:59 +0000
1746
+++ qml/Panel/IndicatorItem.qml	2015-07-22 14:32:16 +0000
1747
@@ -15,7 +15,7 @@
1748
15
 */
15
 */
1749
16
16
1750
17
import QtQuick 2.2
17
import QtQuick 2.2
1752
18
import Ubuntu.Components 1.1
18
import Ubuntu.Components 1.3
1753
19
import Ubuntu.Settings.Components 0.1
19
import Ubuntu.Settings.Components 0.1
1754
20
import "Indicators"
20
import "Indicators"
1755
21
21
1756
22
22
1757
=== modified file 'qml/Panel/IndicatorItemRow.qml'
1758
--- qml/Panel/IndicatorItemRow.qml	2014-10-17 14:55:35 +0000
1759
+++ qml/Panel/IndicatorItemRow.qml	2015-07-22 14:32:16 +0000
1760
@@ -15,7 +15,7 @@
1761
15
 */
15
 */
1762
16
16
1763
17
import QtQuick 2.2
17
import QtQuick 2.2
1765
18
import Ubuntu.Components 1.1
18
import Ubuntu.Components 1.3
1766
19
19
1767
20
Item {
20
Item {
1768
21
    id: root
21
    id: root
1769
22
22
1770
=== modified file 'qml/Panel/IndicatorPage.qml'
1771
--- qml/Panel/IndicatorPage.qml	2014-11-17 23:04:48 +0000
1772
+++ qml/Panel/IndicatorPage.qml	2015-07-22 14:32:16 +0000
1773
@@ -15,7 +15,7 @@
1774
15
 */
15
 */
1775
16
16
1776
17
import QtQuick 2.0
17
import QtQuick 2.0
1778
18
import Ubuntu.Components 0.1 as Components
18
import Ubuntu.Components 1.3 as Components
1779
19
import Unity.Indicators 0.1 as Indicators
19
import Unity.Indicators 0.1 as Indicators
1780
20
import "Indicators"
20
import "Indicators"
1781
21
21
1782
22
22
1783
=== modified file 'qml/Panel/Indicators/MenuItemFactory.qml'
1784
--- qml/Panel/Indicators/MenuItemFactory.qml	2015-06-13 11:30:34 +0000
1785
+++ qml/Panel/Indicators/MenuItemFactory.qml	2015-07-22 14:32:16 +0000
1786
@@ -1,5 +1,5 @@
1787
1
/*
1
/*
1789
2
 * Copyright 2013 Canonical Ltd.
2
 * Copyright 2013,2015 Canonical Ltd.
1790
3
 *
3
 *
1791
4
 * This program is free software; you can redistribute it and/or modify
4
 * This program is free software; you can redistribute it and/or modify
1792
5
 * it under the terms of the GNU Lesser General Public License as published by
5
 * it under the terms of the GNU Lesser General Public License as published by
1793
@@ -22,8 +22,8 @@
1794
22
import Ubuntu.Settings.Components 0.1
22
import Ubuntu.Settings.Components 0.1
1795
23
import QMenuModel 0.1
23
import QMenuModel 0.1
1796
24
import Utils 0.1 as Utils
24
import Utils 0.1 as Utils
1799
25
import Ubuntu.Components.ListItems 0.1 as ListItems
25
import Ubuntu.Components.ListItems 1.3 as ListItems
1800
26
import Ubuntu.Components 1.1
26
import Ubuntu.Components 1.3
1801
27
27
1802
28
Item {
28
Item {
1803
29
    id: menuFactory
29
    id: menuFactory
1804
@@ -245,7 +245,7 @@
1805
245
                    name: "settings"
245
                    name: "settings"
1806
246
                    height: units.gu(3)
246
                    height: units.gu(3)
1807
247
                    width: height
247
                    width: height
1809
248
                    color: Theme.palette.selected.backgroundText
248
                    color: theme.palette.selected.backgroundText
1810
249
                }
249
                }
1811
250
            }
250
            }
1812
251
        }
251
        }
1813
@@ -277,7 +277,7 @@
1814
277
                    source: menuData.icon
277
                    source: menuData.icon
1815
278
                    height: units.gu(3)
278
                    height: units.gu(3)
1816
279
                    width: height
279
                    width: height
1818
280
                    color: Theme.palette.selected.backgroundText
280
                    color: theme.palette.selected.backgroundText
1819
281
                }
281
                }
1820
282
            }
282
            }
1821
283
        }
283
        }
1822
@@ -836,7 +836,7 @@
1823
836
            enabled: menuData && menuData.sensitive || false
836
            enabled: menuData && menuData.sensitive || false
1824
837
            highlightWhenPressed: false
837
            highlightWhenPressed: false
1825
838
            text: menuData && menuData.label || ""
838
            text: menuData && menuData.label || ""
1827
839
            foregroundColor: Theme.palette.normal.backgroundText
839
            foregroundColor: theme.palette.normal.backgroundText
1828
840
840
1829
841
            onMenuModelChanged: {
841
            onMenuModelChanged: {
1830
842
                loadAttributes();
842
                loadAttributes();
1831
843
843
1832
=== modified file 'qml/Panel/Indicators/MessageMenuItemFactory.qml'
1833
--- qml/Panel/Indicators/MessageMenuItemFactory.qml	2015-03-13 10:07:57 +0000
1834
+++ qml/Panel/Indicators/MessageMenuItemFactory.qml	2015-07-22 14:32:16 +0000
1835
@@ -19,7 +19,7 @@
1836
19
 */
19
 */
1837
20
20
1838
21
import QtQuick 2.0
21
import QtQuick 2.0
1840
22
import Ubuntu.Components 0.1
22
import Ubuntu.Components 1.3
1841
23
import Ubuntu.Settings.Menus 0.1 as Menus
23
import Ubuntu.Settings.Menus 0.1 as Menus
1842
24
import QMenuModel 0.1 as QMenuModel
24
import QMenuModel 0.1 as QMenuModel
1843
25
import Utils 0.1 as Utils
25
import Utils 0.1 as Utils
1844
26
26
1845
=== modified file 'qml/Panel/Indicators/ModemInfoItem.qml'
1846
--- qml/Panel/Indicators/ModemInfoItem.qml	2014-07-31 13:31:32 +0000
1847
+++ qml/Panel/Indicators/ModemInfoItem.qml	2015-07-22 14:32:16 +0000
1848
@@ -1,5 +1,5 @@
1849
1
/*
1
/*
1851
2
 * Copyright 2014 Canonical Ltd.
2
 * Copyright 2014,2015 Canonical Ltd.
1852
3
 *
3
 *
1853
4
 * This program is free software; you can redistribute it and/or modify
4
 * This program is free software; you can redistribute it and/or modify
1854
5
 * it under the terms of the GNU Lesser General Public License as published by
5
 * it under the terms of the GNU Lesser General Public License as published by
1855
@@ -16,8 +16,8 @@
1856
16
16
1857
17
import QtQuick 2.0
17
import QtQuick 2.0
1858
18
import QtQuick.Layouts 1.1
18
import QtQuick.Layouts 1.1
1861
19
import Ubuntu.Components 0.1
19
import Ubuntu.Components 1.3
1862
20
import Ubuntu.Components.ListItems 0.1 as ListItem
20
import Ubuntu.Components.ListItems 1.3 as ListItem
1863
21
21
1864
22
ListItem.Empty {
22
ListItem.Empty {
1865
23
    id: menu
23
    id: menu
1866
@@ -65,7 +65,7 @@
1867
65
                height: parent.height
65
                height: parent.height
1868
66
                Icon {
66
                Icon {
1869
67
                    id: statusIcon
67
                    id: statusIcon
1871
68
                    color: Theme.palette.selected.backgroundText
68
                    color: theme.palette.selected.backgroundText
1872
69
69
1873
70
                    Layout.preferredHeight: parent.height
70
                    Layout.preferredHeight: parent.height
1874
71
                    Layout.preferredWidth: Layout.preferredHeight
71
                    Layout.preferredWidth: Layout.preferredHeight
1875
@@ -75,7 +75,7 @@
1876
75
75
1877
76
                Icon {
76
                Icon {
1878
77
                    id: iconConnectivity
77
                    id: iconConnectivity
1880
78
                    color: Theme.palette.selected.backgroundText
78
                    color: theme.palette.selected.backgroundText
1881
79
79
1882
80
                    Layout.preferredHeight: parent.height
80
                    Layout.preferredHeight: parent.height
1883
81
                    Layout.preferredWidth: Layout.preferredHeight
81
                    Layout.preferredWidth: Layout.preferredHeight
1884
82
82
1885
=== modified file 'qml/Panel/Indicators/RoamingIndication.qml'
1886
--- qml/Panel/Indicators/RoamingIndication.qml	2014-07-31 13:31:32 +0000
1887
+++ qml/Panel/Indicators/RoamingIndication.qml	2015-07-22 14:32:16 +0000
1888
@@ -1,5 +1,5 @@
1889
1
/*
1
/*
1891
2
 * Copyright 2014 Canonical Ltd.
2
 * Copyright 2014,2015 Canonical Ltd.
1892
3
 *
3
 *
1893
4
 * This program is free software; you can redistribute it and/or modify
4
 * This program is free software; you can redistribute it and/or modify
1894
5
 * it under the terms of the GNU Lesser General Public License as published by
5
 * it under the terms of the GNU Lesser General Public License as published by
1895
@@ -16,7 +16,7 @@
1896
16
16
1897
17
import QtQuick 2.0
17
import QtQuick 2.0
1898
18
import QtQuick.Layouts 1.1
18
import QtQuick.Layouts 1.1
1900
19
import Ubuntu.Components 0.1
19
import Ubuntu.Components 1.3
1901
20
20
1902
21
RowLayout {
21
RowLayout {
1903
22
    spacing: units.gu(0.5)
22
    spacing: units.gu(0.5)
1904
@@ -30,7 +30,7 @@
1905
30
30
1906
31
    Icon {
31
    Icon {
1907
32
        id: iconRoaming
32
        id: iconRoaming
1909
33
        color: Theme.palette.selected.backgroundText
33
        color: theme.palette.selected.backgroundText
1910
34
34
1911
35
        Layout.preferredHeight: parent.height
35
        Layout.preferredHeight: parent.height
1912
36
        Layout.preferredWidth: Layout.preferredHeight
36
        Layout.preferredWidth: Layout.preferredHeight
1913
37
37
1914
=== modified file 'qml/Panel/Indicators/client/IndicatorRepresentation.qml'
1915
--- qml/Panel/Indicators/client/IndicatorRepresentation.qml	2014-10-03 10:10:31 +0000
1916
+++ qml/Panel/Indicators/client/IndicatorRepresentation.qml	2015-07-22 14:32:16 +0000
1917
@@ -19,8 +19,8 @@
1918
19
 */
19
 */
1919
20
20
1920
21
import QtQuick 2.0
21
import QtQuick 2.0
1923
22
import Ubuntu.Components 0.1
22
import Ubuntu.Components 1.3
1924
23
import Ubuntu.Components.ListItems 0.1 as ListItem
23
import Ubuntu.Components.ListItems 1.3 as ListItem
1925
24
import "../.."
24
import "../.."
1926
25
25
1927
26
Page {
26
Page {
1928
27
27
1929
=== modified file 'qml/Panel/Indicators/client/IndicatorsClient.qml'
1930
--- qml/Panel/Indicators/client/IndicatorsClient.qml	2014-07-25 17:52:39 +0000
1931
+++ qml/Panel/Indicators/client/IndicatorsClient.qml	2015-07-22 14:32:16 +0000
1932
@@ -18,15 +18,15 @@
1933
18
 */
18
 */
1934
19
19
1935
20
import QtQuick 2.0
20
import QtQuick 2.0
1938
21
import Ubuntu.Components 0.1
21
import Ubuntu.Components 1.3
1939
22
import Ubuntu.Components.ListItems 0.1 as ListItem
22
import Ubuntu.Components.ListItems 1.3 as ListItem
1940
23
23
1941
24
Rectangle {
24
Rectangle {
1942
25
    color: "black"
25
    color: "black"
1943
26
    id: root
26
    id: root
1944
27
27
1945
28
    Component.onCompleted: {
28
    Component.onCompleted: {
1947
29
        Theme.name = "Ubuntu.Components.Themes.SuruGradient"
29
        theme.name = "Ubuntu.Components.Themes.SuruGradient"
1948
30
    }
30
    }
1949
31
31
1950
32
    PageStack {
32
    PageStack {
1951
33
33
1952
=== modified file 'qml/Panel/Indicators/client/IndicatorsList.qml'
1953
--- qml/Panel/Indicators/client/IndicatorsList.qml	2015-03-11 08:07:31 +0000
1954
+++ qml/Panel/Indicators/client/IndicatorsList.qml	2015-07-22 14:32:16 +0000
1955
@@ -18,8 +18,8 @@
1956
18
 */
18
 */
1957
19
19
1958
20
import QtQuick 2.0
20
import QtQuick 2.0
1961
21
import Ubuntu.Components 0.1
21
import Ubuntu.Components 1.3
1962
22
import Ubuntu.Components.ListItems 0.1 as ListItem
22
import Ubuntu.Components.ListItems 1.3 as ListItem
1963
23
import Unity.Indicators 0.1 as Indicators
23
import Unity.Indicators 0.1 as Indicators
1964
24
import "../.."
24
import "../.."
1965
25
25
1966
26
26
1967
=== modified file 'qml/Panel/Indicators/client/IndicatorsTree.qml'
1968
--- qml/Panel/Indicators/client/IndicatorsTree.qml	2014-11-11 15:28:13 +0000
1969
+++ qml/Panel/Indicators/client/IndicatorsTree.qml	2015-07-22 14:32:16 +0000
1970
@@ -18,7 +18,7 @@
1971
18
 */
18
 */
1972
19
19
1973
20
import QtQuick 2.0
20
import QtQuick 2.0
1975
21
import Ubuntu.Components 0.1
21
import Ubuntu.Components 1.3
1976
22
import Unity.Indicators 0.1 as Indicators
22
import Unity.Indicators 0.1 as Indicators
1977
23
import ".."
23
import ".."
1978
24
24
1979
25
25
1980
=== modified file 'qml/Panel/IndicatorsBar.qml'
1981
--- qml/Panel/IndicatorsBar.qml	2014-12-03 10:57:01 +0000
1982
+++ qml/Panel/IndicatorsBar.qml	2015-07-22 14:32:16 +0000
1983
@@ -15,7 +15,7 @@
1984
15
 */
15
 */
1985
16
16
1986
17
import QtQuick 2.2
17
import QtQuick 2.2
1988
18
import Ubuntu.Components 1.1
18
import Ubuntu.Components 1.3
1989
19
import "../Components"
19
import "../Components"
1990
20
20
1991
21
Item {
21
Item {
1992
22
22
1993
=== modified file 'qml/Panel/IndicatorsMenu.qml'
1994
--- qml/Panel/IndicatorsMenu.qml	2015-05-18 23:04:12 +0000
1995
+++ qml/Panel/IndicatorsMenu.qml	2015-07-22 14:32:16 +0000
1996
@@ -15,7 +15,7 @@
1997
15
 */
15
 */
1998
16
16
1999
17
import QtQuick 2.2
17
import QtQuick 2.2
2001
18
import Ubuntu.Components 1.1
18
import Ubuntu.Components 1.3
2002
19
import Ubuntu.Gestures 0.1
19
import Ubuntu.Gestures 0.1
2003
20
import "../Components"
20
import "../Components"
2004
21
import "Indicators"
21
import "Indicators"
2005
22
22
2006
=== modified file 'qml/Panel/MenuContent.qml'
2007
--- qml/Panel/MenuContent.qml	2014-11-17 23:04:48 +0000
2008
+++ qml/Panel/MenuContent.qml	2015-07-22 14:32:16 +0000
2009
@@ -16,7 +16,7 @@
2010
16
16
2011
17
import QtQuick 2.2
17
import QtQuick 2.2
2012
18
import QtQuick.Layouts 1.1
18
import QtQuick.Layouts 1.1
2014
19
import Ubuntu.Components 1.1
19
import Ubuntu.Components 1.3
2015
20
import Unity.Indicators 0.1 as Indicators
20
import Unity.Indicators 0.1 as Indicators
2016
21
import Utils 0.1
21
import Utils 0.1
2017
22
import "../Components"
22
import "../Components"
2018
23
23
2019
=== modified file 'qml/Panel/Panel.qml'
2020
--- qml/Panel/Panel.qml	2015-04-15 11:37:00 +0000
2021
+++ qml/Panel/Panel.qml	2015-07-22 14:32:16 +0000
2022
@@ -15,7 +15,7 @@
2023
15
 */
15
 */
2024
16
16
2025
17
import QtQuick 2.2
17
import QtQuick 2.2
2027
18
import Ubuntu.Components 1.1
18
import Ubuntu.Components 1.3
2028
19
import Unity.Application 0.1
19
import Unity.Application 0.1
2029
20
import "../Components"
20
import "../Components"
2030
21
import "../Components/PanelState"
21
import "../Components/PanelState"
2031
22
22
2032
=== modified file 'qml/Rotation/RotationStates.qml'
2033
--- qml/Rotation/RotationStates.qml	2015-05-11 14:36:03 +0000
2034
+++ qml/Rotation/RotationStates.qml	2015-07-22 14:32:16 +0000
2035
@@ -15,7 +15,7 @@
2036
15
 */
15
 */
2037
16
16
2038
17
import QtQuick 2.0
17
import QtQuick 2.0
2040
18
import Ubuntu.Components 1.1
18
import Ubuntu.Components 1.3
2041
19
import Powerd 0.1
19
import Powerd 0.1
2042
20
20
2043
21
// Why the state machine is done that way:
21
// Why the state machine is done that way:
2044
22
22
2045
=== modified file 'qml/ScopeTool.qml'
2046
--- qml/ScopeTool.qml	2014-08-07 15:29:12 +0000
2047
+++ qml/ScopeTool.qml	2015-07-22 14:32:16 +0000
2048
@@ -15,8 +15,8 @@
2049
15
*/
15
*/
2050
16
16
2051
17
import QtQuick 2.0
17
import QtQuick 2.0
2054
18
import Ubuntu.Components 0.1
18
import Ubuntu.Components 1.3
2055
19
import Ubuntu.Components.Popups 0.1
19
import Ubuntu.Components.Popups 1.3
2056
20
import Ubuntu.Thumbnailer 0.1 // Register support for image://thumbnailer/ and image://albumart/
20
import Ubuntu.Thumbnailer 0.1 // Register support for image://thumbnailer/ and image://albumart/
2057
21
import Utils 0.1
21
import Utils 0.1
2058
22
import Unity 0.2
22
import Unity 0.2
2059
23
23
2060
=== modified file 'qml/Shell.qml'
2061
--- qml/Shell.qml	2015-07-10 14:44:55 +0000
2062
+++ qml/Shell.qml	2015-07-22 14:32:16 +0000
2063
@@ -19,8 +19,8 @@
2064
19
import AccountsService 0.1
19
import AccountsService 0.1
2065
20
import GSettings 1.0
20
import GSettings 1.0
2066
21
import Unity.Application 0.1
21
import Unity.Application 0.1
2069
22
import Ubuntu.Components 0.1
22
import Ubuntu.Components 1.3
2070
23
import Ubuntu.Components.Popups 1.0
23
import Ubuntu.Components.Popups 1.3
2071
24
import Ubuntu.Gestures 0.1
24
import Ubuntu.Gestures 0.1
2072
25
import Ubuntu.Telephony 0.1 as Telephony
25
import Ubuntu.Telephony 0.1 as Telephony
2073
26
import Unity.Connectivity 0.1
26
import Unity.Connectivity 0.1
2074
@@ -160,7 +160,7 @@
2075
160
    }
160
    }
2076
161
161
2077
162
    Component.onCompleted: {
162
    Component.onCompleted: {
2079
163
        Theme.name = "Ubuntu.Components.Themes.SuruGradient"
163
        theme.name = "Ubuntu.Components.Themes.SuruGradient"
2080
164
        if (ApplicationManager.count > 0) {
164
        if (ApplicationManager.count > 0) {
2081
165
            ApplicationManager.focusApplication(ApplicationManager.get(0).appId);
165
            ApplicationManager.focusApplication(ApplicationManager.get(0).appId);
2082
166
        }
166
        }
2083
167
167
2084
=== modified file 'qml/Stages/Animations/SwipeFromBottomAnimation.qml'
2085
--- qml/Stages/Animations/SwipeFromBottomAnimation.qml	2014-09-01 12:46:31 +0000
2086
+++ qml/Stages/Animations/SwipeFromBottomAnimation.qml	2015-07-22 14:32:16 +0000
2087
@@ -15,7 +15,7 @@
2088
15
 */
15
 */
2089
16
16
2090
17
import QtQuick 2.0
17
import QtQuick 2.0
2092
18
import Ubuntu.Components 1.1
18
import Ubuntu.Components 1.3
2093
19
19
2094
20
BaseSessionAnimation {
20
BaseSessionAnimation {
2095
21
    id: animation
21
    id: animation
2096
22
22
2097
=== modified file 'qml/Stages/ApplicationWindow.qml'
2098
--- qml/Stages/ApplicationWindow.qml	2015-07-10 15:55:50 +0000
2099
+++ qml/Stages/ApplicationWindow.qml	2015-07-22 14:32:16 +0000
2100
@@ -15,7 +15,7 @@
2101
15
 */
15
 */
2102
16
16
2103
17
import QtQuick 2.0
17
import QtQuick 2.0
2105
18
import Ubuntu.Components 1.1
18
import Ubuntu.Components 1.3
2106
19
import Unity.Application 0.1
19
import Unity.Application 0.1
2107
20
20
2108
21
FocusScope {
21
FocusScope {
2109
22
22
2110
=== modified file 'qml/Stages/DecoratedWindow.qml'
2111
--- qml/Stages/DecoratedWindow.qml	2015-04-24 17:42:11 +0000
2112
+++ qml/Stages/DecoratedWindow.qml	2015-07-22 14:32:16 +0000
2113
@@ -17,7 +17,7 @@
2114
17
 */
17
 */
2115
18
18
2116
19
import QtQuick 2.3
19
import QtQuick 2.3
2118
20
import Ubuntu.Components 1.1
20
import Ubuntu.Components 1.3
2119
21
import Unity.Application 0.1
21
import Unity.Application 0.1
2120
22
22
2121
23
FocusScope {
23
FocusScope {
2122
24
24
2123
=== modified file 'qml/Stages/DesktopStage.qml'
2124
--- qml/Stages/DesktopStage.qml	2015-06-12 16:07:43 +0000
2125
+++ qml/Stages/DesktopStage.qml	2015-07-22 14:32:16 +0000
2126
@@ -17,7 +17,7 @@
2127
17
 */
17
 */
2128
18
18
2129
19
import QtQuick 2.3
19
import QtQuick 2.3
2131
20
import Ubuntu.Components 1.1
20
import Ubuntu.Components 1.3
2132
21
import Unity.Application 0.1
21
import Unity.Application 0.1
2133
22
import "../Components/PanelState"
22
import "../Components/PanelState"
2134
23
23
2135
24
24
2136
=== modified file 'qml/Stages/MainViewStyle.qml'
2137
--- qml/Stages/MainViewStyle.qml	2014-09-12 20:16:54 +0000
2138
+++ qml/Stages/MainViewStyle.qml	2015-07-22 14:32:16 +0000
2139
@@ -14,7 +14,7 @@
2140
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
2141
15
 */
15
 */
2142
16
import QtQuick 2.0
16
import QtQuick 2.0
2144
17
import Ubuntu.Components 1.1
17
import Ubuntu.Components 1.3
2145
18
18
2146
19
// FIXME: copied with slight modifications from Ubuntu UI Toolkit's Ambiance's theme
19
// FIXME: copied with slight modifications from Ubuntu UI Toolkit's Ambiance's theme
2147
20
Item {
20
Item {
2148
@@ -65,8 +65,7 @@
2149
65
65
2150
66
          Qt bug: https://bugreports.qt-project.org/browse/QTBUG-11712
66
          Qt bug: https://bugreports.qt-project.org/browse/QTBUG-11712
2151
67
          */
67
          */
2154
68
        property string theme: (ColorUtils.luminance(styledItem.backgroundColor) >= 0.85) ? "Ambiance" :
68
        property string theme: (ColorUtils.luminance(styledItem.backgroundColor) >= 0.85) ? "Ambiance" : "SuruDark"
2153
69
                                (isGradient ? "SuruGradient" : "SuruDark")
2155
70
    }
69
    }
2156
71
70
2157
72
    // automatically select the appropriate theme depending on the background colors
71
    // automatically select the appropriate theme depending on the background colors
2158
73
72
2159
=== modified file 'qml/Stages/PageHeadStyle.qml'
2160
--- qml/Stages/PageHeadStyle.qml	2014-08-27 18:50:43 +0000
2161
+++ qml/Stages/PageHeadStyle.qml	2015-07-22 14:32:16 +0000
2162
@@ -14,8 +14,8 @@
2163
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
2164
15
 */
15
 */
2165
16
import QtQuick 2.2
16
import QtQuick 2.2
2168
17
import Ubuntu.Components 1.1
17
import Ubuntu.Components 1.3
2169
18
import Ubuntu.Components.Styles 1.1 as Style
18
import Ubuntu.Components.Styles 1.3 as Style
2170
19
19
2171
20
// FIXME: copied with large modifications from Ubuntu UI Toolkit's Ambiance's theme
20
// FIXME: copied with large modifications from Ubuntu UI Toolkit's Ambiance's theme
2172
21
Style.PageHeadStyle {
21
Style.PageHeadStyle {
2173
22
22
2174
=== modified file 'qml/Stages/PhoneStage.qml'
2175
--- qml/Stages/PhoneStage.qml	2015-07-10 14:44:55 +0000
2176
+++ qml/Stages/PhoneStage.qml	2015-07-22 14:32:16 +0000
2177
@@ -15,7 +15,7 @@
2178
15
 */
15
 */
2179
16
16
2180
17
import QtQuick 2.2
17
import QtQuick 2.2
2182
18
import Ubuntu.Components 0.1
18
import Ubuntu.Components 1.3
2183
19
import Ubuntu.Gestures 0.1
19
import Ubuntu.Gestures 0.1
2184
20
import Unity.Application 0.1
20
import Unity.Application 0.1
2185
21
import Unity.Session 0.1
21
import Unity.Session 0.1
2186
22
22
2187
=== modified file 'qml/Stages/ShimStage.qml'
2188
--- qml/Stages/ShimStage.qml	2015-04-21 19:43:25 +0000
2189
+++ qml/Stages/ShimStage.qml	2015-07-22 14:32:16 +0000
2190
@@ -15,7 +15,7 @@
2191
15
 */
15
 */
2192
16
16
2193
17
import QtQuick 2.3
17
import QtQuick 2.3
2195
18
import Ubuntu.Components 0.1
18
import Ubuntu.Components 1.3
2196
19
19
2197
20
Rectangle {
20
Rectangle {
2198
21
    id: shimStage
21
    id: shimStage
2199
22
22
2200
=== modified file 'qml/Stages/Splash.qml'
2201
--- qml/Stages/Splash.qml	2015-07-10 15:55:50 +0000
2202
+++ qml/Stages/Splash.qml	2015-07-22 14:32:16 +0000
2203
@@ -15,11 +15,11 @@
2204
15
*/
15
*/
2205
16
16
2206
17
import QtQuick 2.2
17
import QtQuick 2.2
2209
18
import Ubuntu.Components 1.1
18
import Ubuntu.Components 1.3
2210
19
import Ubuntu.Components.Themes 0.1
19
import Ubuntu.Components.Themes 1.3
2211
20
import "../Components"
20
import "../Components"
2212
21
21
2214
22
import Ubuntu.Components.Themes.Ambiance 1.1 as Ambiance
22
import Ubuntu.Components.Themes.Ambiance 1.3 as Ambiance
2215
23
23
2216
24
Item {
24
Item {
2217
25
    id: root
25
    id: root
2218
@@ -62,17 +62,17 @@
2219
62
                                                                                      : root.footerColor
62
                                                                                      : root.footerColor
2220
63
63
2221
64
        // FIXME: fake a Theme object as to expose the Palette corresponding to the backgroundColor (see MainViewStyle.qml)
64
        // FIXME: fake a Theme object as to expose the Palette corresponding to the backgroundColor (see MainViewStyle.qml)
2223
65
        property var theme: QtObject {
65
        readonly property var fakeTheme: QtObject {
2224
66
            property string name
66
            property string name
2225
67
            property Palette palette: Qt.createQmlObject("import QtQuick 2.2;\
67
            property Palette palette: Qt.createQmlObject("import QtQuick 2.2;\
2228
68
                                                          import Ubuntu.Components.Themes.%1 1.1;\
68
                                                          import Ubuntu.Components.Themes.%1 1.3;\
2229
69
                                                          Palette {}".arg(styledItem.theme.name),
69
                                                          Palette {}".arg(styledItem.fakeTheme.name),
2230
70
                                                         styledItem, "dynamicPalette");
70
                                                         styledItem, "dynamicPalette");
2231
71
        }
71
        }
2232
72
72
2233
73
        // FIXME: should instead use future toolkit API:
73
        // FIXME: should instead use future toolkit API:
2234
74
        // style: theme.createStyleComponent("MainViewStyle.qml", styledItem)
74
        // style: theme.createStyleComponent("MainViewStyle.qml", styledItem)
2236
75
        style: Component { MainViewStyle {theme: styledItem.theme} }
75
        style: Component { MainViewStyle {theme: styledItem.fakeTheme} }
2237
76
    }
76
    }
2238
77
77
2239
78
    StyledItem {
78
    StyledItem {
2240
@@ -89,13 +89,13 @@
2241
89
        property string title
89
        property string title
2242
90
        property var tabsModel
90
        property var tabsModel
2243
91
        property var config: QtObject {
91
        property var config: QtObject {
2245
92
            property color foregroundColor: styledItem.theme.palette.selected.backgroundText
92
            property color foregroundColor: styledItem.fakeTheme.palette.selected.backgroundText
2246
93
            property var sections: QtObject {}
93
            property var sections: QtObject {}
2247
94
        }
94
        }
2248
95
95
2249
96
        // FIXME: should instead use future toolkit API:
96
        // FIXME: should instead use future toolkit API:
2250
97
        // style: theme.createStyleComponent("PageHeadStyle.qml", header)
97
        // style: theme.createStyleComponent("PageHeadStyle.qml", header)
2252
98
        style: Component { PageHeadStyle {theme: styledItem.theme} }
98
        style: Component { PageHeadStyle {theme: styledItem.fakeTheme} }
2253
99
    }
99
    }
2254
100
100
2255
101
    Image {
101
    Image {
2256
@@ -139,7 +139,7 @@
2257
139
        anchors.topMargin: units.gu(2)
139
        anchors.topMargin: units.gu(2)
2258
140
        fontSize: "large"
140
        fontSize: "large"
2259
141
141
2261
142
        color: styledItem.theme.palette.selected.backgroundText
142
        color: styledItem.fakeTheme.palette.selected.backgroundText
2262
143
        visible: d.showIcon
143
        visible: d.showIcon
2263
144
    }
144
    }
2264
145
145
2265
146
146
2266
=== modified file 'qml/Stages/SpreadDelegate.qml'
2267
--- qml/Stages/SpreadDelegate.qml	2015-07-10 15:55:50 +0000
2268
+++ qml/Stages/SpreadDelegate.qml	2015-07-22 14:32:16 +0000
2269
@@ -19,7 +19,7 @@
2270
19
19
2271
20
import QtQuick 2.0
20
import QtQuick 2.0
2272
21
import QtQuick.Window 2.0
21
import QtQuick.Window 2.0
2274
22
import Ubuntu.Components 1.1
22
import Ubuntu.Components 1.3
2275
23
import "../Components"
23
import "../Components"
2276
24
24
2277
25
FocusScope {
25
FocusScope {
2278
26
26
2279
=== modified file 'qml/Stages/SurfaceContainer.qml'
2280
--- qml/Stages/SurfaceContainer.qml	2015-04-15 11:37:00 +0000
2281
+++ qml/Stages/SurfaceContainer.qml	2015-07-22 14:32:16 +0000
2282
@@ -15,7 +15,7 @@
2283
15
*/
15
*/
2284
16
16
2285
17
import QtQuick 2.0
17
import QtQuick 2.0
2287
18
import Ubuntu.Components 1.1
18
import Ubuntu.Components 1.3
2288
19
import Ubuntu.Gestures 0.1 // For TouchGate
19
import Ubuntu.Gestures 0.1 // For TouchGate
2289
20
import Utils 0.1 // for InputWatcher
20
import Utils 0.1 // for InputWatcher
2290
21
21
2291
22
22
2292
=== modified file 'qml/Stages/TabletStage.qml'
2293
--- qml/Stages/TabletStage.qml	2015-06-23 14:20:23 +0000
2294
+++ qml/Stages/TabletStage.qml	2015-07-22 14:32:16 +0000
2295
@@ -15,7 +15,7 @@
2296
15
 */
15
 */
2297
16
16
2298
17
import QtQuick 2.0
17
import QtQuick 2.0
2300
18
import Ubuntu.Components 0.1
18
import Ubuntu.Components 1.3
2301
19
import Ubuntu.Gestures 0.1
19
import Ubuntu.Gestures 0.1
2302
20
import Unity.Application 0.1
20
import Unity.Application 0.1
2303
21
import Utils 0.1
21
import Utils 0.1
2304
22
22
2305
=== modified file 'qml/Stages/TransformedSpreadDelegate.qml'
2306
--- qml/Stages/TransformedSpreadDelegate.qml	2015-04-28 20:20:23 +0000
2307
+++ qml/Stages/TransformedSpreadDelegate.qml	2015-07-22 14:32:16 +0000
2308
@@ -18,7 +18,7 @@
2309
18
18
2310
19
import QtQuick 2.0
19
import QtQuick 2.0
2311
20
import Utils 0.1
20
import Utils 0.1
2313
21
import Ubuntu.Components 0.1
21
import Ubuntu.Components 1.3
2314
22
22
2315
23
SpreadDelegate {
23
SpreadDelegate {
2316
24
    id: root
24
    id: root
2317
25
25
2318
=== modified file 'qml/Stages/TransformedTabletSpreadDelegate.qml'
2319
--- qml/Stages/TransformedTabletSpreadDelegate.qml	2015-03-06 04:44:11 +0000
2320
+++ qml/Stages/TransformedTabletSpreadDelegate.qml	2015-07-22 14:32:16 +0000
2321
@@ -18,7 +18,7 @@
2322
18
18
2323
19
import QtQuick 2.0
19
import QtQuick 2.0
2324
20
import Utils 0.1
20
import Utils 0.1
2326
21
import Ubuntu.Components 0.1
21
import Ubuntu.Components 1.3
2327
22
import Unity.Application 0.1
22
import Unity.Application 0.1
2328
23
23
2329
24
SpreadDelegate {
24
SpreadDelegate {
2330
25
25
2331
=== modified file 'qml/Stages/WindowDecoration.qml'
2332
--- qml/Stages/WindowDecoration.qml	2015-03-13 19:18:35 +0000
2333
+++ qml/Stages/WindowDecoration.qml	2015-07-22 14:32:16 +0000
2334
@@ -17,7 +17,7 @@
2335
17
 */
17
 */
2336
18
18
2337
19
import QtQuick 2.3
19
import QtQuick 2.3
2339
20
import Ubuntu.Components 1.1
20
import Ubuntu.Components 1.3
2340
21
import "../Components"
21
import "../Components"
2341
22
22
2342
23
Item {
23
Item {
2343
24
24
2344
=== modified file 'qml/Stages/WindowMoveResizeArea.qml'
2345
--- qml/Stages/WindowMoveResizeArea.qml	2015-03-13 19:01:32 +0000
2346
+++ qml/Stages/WindowMoveResizeArea.qml	2015-07-22 14:32:16 +0000
2347
@@ -17,7 +17,7 @@
2348
17
 */
17
 */
2349
18
18
2350
19
import QtQuick 2.3
19
import QtQuick 2.3
2352
20
import Ubuntu.Components 1.1
20
import Ubuntu.Components 1.3
2353
21
import Utils 0.1
21
import Utils 0.1
2354
22
22
2355
23
MouseArea {
23
MouseArea {
2356
24
24
2357
=== modified file 'qml/Tutorial/Arrow.qml'
2358
--- qml/Tutorial/Arrow.qml	2014-12-18 23:32:42 +0000
2359
+++ qml/Tutorial/Arrow.qml	2015-07-22 14:32:16 +0000
2360
@@ -15,7 +15,7 @@
2361
15
 */
15
 */
2362
16
16
2363
17
import QtQuick 2.3
17
import QtQuick 2.3
2365
18
import Ubuntu.Components 1.1
18
import Ubuntu.Components 1.3
2366
19
19
2367
20
Item {
20
Item {
2368
21
    id: root
21
    id: root
2369
22
22
2370
=== modified file 'qml/Tutorial/Slider.qml'
2371
--- qml/Tutorial/Slider.qml	2015-01-09 21:51:24 +0000
2372
+++ qml/Tutorial/Slider.qml	2015-07-22 14:32:16 +0000
2373
@@ -15,7 +15,7 @@
2374
15
 */
15
 */
2375
16
16
2376
17
import QtQuick 2.3
17
import QtQuick 2.3
2378
18
import Ubuntu.Components 1.1
18
import Ubuntu.Components 1.3
2379
19
19
2380
20
Item {
20
Item {
2381
21
    id: root
21
    id: root
2382
22
22
2383
=== modified file 'qml/Tutorial/Tick.qml'
2384
--- qml/Tutorial/Tick.qml	2015-01-06 14:46:52 +0000
2385
+++ qml/Tutorial/Tick.qml	2015-07-22 14:32:16 +0000
2386
@@ -15,7 +15,7 @@
2387
15
 */
15
 */
2388
16
16
2389
17
import QtQuick 2.3
17
import QtQuick 2.3
2391
18
import Ubuntu.Components 1.1
18
import Ubuntu.Components 1.3
2392
19
19
2393
20
MouseArea {
20
MouseArea {
2394
21
    implicitHeight: tick.height
21
    implicitHeight: tick.height
2395
22
22
2396
=== modified file 'qml/Tutorial/Tutorial.qml'
2397
--- qml/Tutorial/Tutorial.qml	2015-04-03 14:23:02 +0000
2398
+++ qml/Tutorial/Tutorial.qml	2015-07-22 14:32:16 +0000
2399
@@ -15,7 +15,7 @@
2400
15
 */
15
 */
2401
16
16
2402
17
import QtQuick 2.3
17
import QtQuick 2.3
2404
18
import Ubuntu.Components 1.1
18
import Ubuntu.Components 1.3
2405
19
19
2406
20
Item {
20
Item {
2407
21
    id: root
21
    id: root
2408
22
22
2409
=== modified file 'qml/Tutorial/TutorialBottom.qml'
2410
--- qml/Tutorial/TutorialBottom.qml	2015-04-10 21:16:37 +0000
2411
+++ qml/Tutorial/TutorialBottom.qml	2015-07-22 14:32:16 +0000
2412
@@ -15,7 +15,7 @@
2413
15
 */
15
 */
2414
16
16
2415
17
import QtQuick 2.3
17
import QtQuick 2.3
2417
18
import Ubuntu.Components 1.1
18
import Ubuntu.Components 1.3
2418
19
import Ubuntu.Gestures 0.1
19
import Ubuntu.Gestures 0.1
2419
20
import "../Components"
20
import "../Components"
2420
21
import "." as LocalComponents
21
import "." as LocalComponents
2421
22
22
2422
=== modified file 'qml/Tutorial/TutorialBottomFinish.qml'
2423
--- qml/Tutorial/TutorialBottomFinish.qml	2015-01-06 14:46:52 +0000
2424
+++ qml/Tutorial/TutorialBottomFinish.qml	2015-07-22 14:32:16 +0000
2425
@@ -15,7 +15,7 @@
2426
15
 */
15
 */
2427
16
16
2428
17
import QtQuick 2.3
17
import QtQuick 2.3
2430
18
import Ubuntu.Components 1.1
18
import Ubuntu.Components 1.3
2431
19
import "." as LocalComponents
19
import "." as LocalComponents
2432
20
20
2433
21
TutorialPage {
21
TutorialPage {
2434
22
22
2435
=== modified file 'qml/Tutorial/TutorialContent.qml'
2436
--- qml/Tutorial/TutorialContent.qml	2015-04-03 14:23:02 +0000
2437
+++ qml/Tutorial/TutorialContent.qml	2015-07-22 14:32:16 +0000
2438
@@ -15,7 +15,7 @@
2439
15
 */
15
 */
2440
16
16
2441
17
import QtQuick 2.3
17
import QtQuick 2.3
2443
18
import Ubuntu.Components 1.1
18
import Ubuntu.Components 1.3
2444
19
19
2445
20
Item {
20
Item {
2446
21
    id: root
21
    id: root
2447
22
22
2448
=== modified file 'qml/Tutorial/TutorialLeft.qml'
2449
--- qml/Tutorial/TutorialLeft.qml	2015-06-16 22:25:29 +0000
2450
+++ qml/Tutorial/TutorialLeft.qml	2015-07-22 14:32:16 +0000
2451
@@ -15,7 +15,7 @@
2452
15
 */
15
 */
2453
16
16
2454
17
import QtQuick 2.3
17
import QtQuick 2.3
2456
18
import Ubuntu.Components 1.1
18
import Ubuntu.Components 1.3
2457
19
import "." as LocalComponents
19
import "." as LocalComponents
2458
20
20
2459
21
TutorialPage {
21
TutorialPage {
2460
22
22
2461
=== modified file 'qml/Tutorial/TutorialLeftFinish.qml'
2462
--- qml/Tutorial/TutorialLeftFinish.qml	2015-01-06 14:46:52 +0000
2463
+++ qml/Tutorial/TutorialLeftFinish.qml	2015-07-22 14:32:16 +0000
2464
@@ -15,7 +15,7 @@
2465
15
 */
15
 */
2466
16
16
2467
17
import QtQuick 2.3
17
import QtQuick 2.3
2469
18
import Ubuntu.Components 1.1
18
import Ubuntu.Components 1.3
2470
19
import "." as LocalComponents
19
import "." as LocalComponents
2471
20
20
2472
21
TutorialPage {
21
TutorialPage {
2473
22
22
2474
=== modified file 'qml/Tutorial/TutorialPage.qml'
2475
--- qml/Tutorial/TutorialPage.qml	2015-01-09 21:51:24 +0000
2476
+++ qml/Tutorial/TutorialPage.qml	2015-07-22 14:32:16 +0000
2477
@@ -15,7 +15,7 @@
2478
15
 */
15
 */
2479
16
16
2480
17
import QtQuick 2.3
17
import QtQuick 2.3
2482
18
import Ubuntu.Components 1.1
18
import Ubuntu.Components 1.3
2483
19
import "../Components"
19
import "../Components"
2484
20
20
2485
21
Showable {
21
Showable {
2486
22
22
2487
=== modified file 'qml/Tutorial/TutorialRight.qml'
2488
--- qml/Tutorial/TutorialRight.qml	2015-02-18 21:31:54 +0000
2489
+++ qml/Tutorial/TutorialRight.qml	2015-07-22 14:32:16 +0000
2490
@@ -15,7 +15,7 @@
2491
15
 */
15
 */
2492
16
16
2493
17
import QtQuick 2.3
17
import QtQuick 2.3
2495
18
import Ubuntu.Components 1.1
18
import Ubuntu.Components 1.3
2496
19
import Ubuntu.Gestures 0.1
19
import Ubuntu.Gestures 0.1
2497
20
import Unity.Application 0.1
20
import Unity.Application 0.1
2498
21
import "../Components"
21
import "../Components"
2499
22
22
2500
=== modified file 'qml/Wizard/CheckableSetting.qml'
2501
--- qml/Wizard/CheckableSetting.qml	2014-11-14 17:47:00 +0000
2502
+++ qml/Wizard/CheckableSetting.qml	2015-07-22 14:32:16 +0000
2503
@@ -1,5 +1,5 @@
2504
1
/*
1
/*
2506
2
 * Copyright (C) 2014 Canonical, Ltd.
2
 * Copyright (C) 2014,2015 Canonical, Ltd.
2507
3
 *
3
 *
2508
4
 * This program is free software; you can redistribute it and/or modify
4
 * This program is free software; you can redistribute it and/or modify
2509
5
 * it under the terms of the GNU General Public License as published by
5
 * it under the terms of the GNU General Public License as published by
2510
@@ -15,8 +15,8 @@
2511
15
 */
15
 */
2512
16
16
2513
17
import QtQuick 2.3
17
import QtQuick 2.3
2516
18
import Ubuntu.Components 1.1
18
import Ubuntu.Components 1.3
2517
19
import Ubuntu.Components.ListItems 1.0 as ListItem
19
import Ubuntu.Components.ListItems 1.3 as ListItem
2518
20
20
2519
21
ListItem.Empty {
21
ListItem.Empty {
2520
22
    id: listItem
22
    id: listItem
2521
@@ -77,7 +77,7 @@
2522
77
                rightMargin: listItem.rightMargin
77
                rightMargin: listItem.rightMargin
2523
78
            }
78
            }
2524
79
            wrapMode: Text.Wrap
79
            wrapMode: Text.Wrap
2526
80
            linkColor: Theme.palette.normal.foregroundText
80
            linkColor: theme.palette.normal.foregroundText
2527
81
            onLinkActivated: listItem.linkActivated(link)
81
            onLinkActivated: listItem.linkActivated(link)
2528
82
        }
82
        }
2529
83
    }
83
    }
2530
84
84
2531
=== modified file 'qml/Wizard/Page.qml'
2532
--- qml/Wizard/Page.qml	2015-03-13 10:07:57 +0000
2533
+++ qml/Wizard/Page.qml	2015-07-22 14:32:16 +0000
2534
@@ -1,5 +1,5 @@
2535
1
/*
1
/*
2537
2
 * Copyright (C) 2013 Canonical, Ltd.
2
 * Copyright (C) 2013,2015 Canonical, Ltd.
2538
3
 *
3
 *
2539
4
 * This program is free software; you can redistribute it and/or modify
4
 * This program is free software; you can redistribute it and/or modify
2540
5
 * it under the terms of the GNU General Public License as published by
5
 * it under the terms of the GNU General Public License as published by
2541
@@ -15,7 +15,7 @@
2542
15
 */
15
 */
2543
16
16
2544
17
import QtQuick 2.3
17
import QtQuick 2.3
2546
18
import Ubuntu.Components 1.1
18
import Ubuntu.Components 1.3
2547
19
19
2548
20
Item {
20
Item {
2549
21
    readonly property real buttonMargin: units.gu(2)
21
    readonly property real buttonMargin: units.gu(2)
2550
@@ -57,7 +57,7 @@
2551
57
        }
57
        }
2552
58
        wrapMode: Text.Wrap
58
        wrapMode: Text.Wrap
2553
59
        text: title
59
        text: title
2555
60
        color: Theme.palette.normal.baseText
60
        color: theme.palette.normal.baseText
2556
61
        font.pixelSize: units.gu(4)
61
        font.pixelSize: units.gu(4)
2557
62
    }
62
    }
2558
63
63
2559
64
64
2560
=== modified file 'qml/Wizard/Pages.qml'
2561
--- qml/Wizard/Pages.qml	2015-03-03 14:42:10 +0000
2562
+++ qml/Wizard/Pages.qml	2015-07-22 14:32:16 +0000
2563
@@ -15,7 +15,7 @@
2564
15
 */
15
 */
2565
16
16
2566
17
import QtQuick 2.3
17
import QtQuick 2.3
2568
18
import Ubuntu.Components 1.1
18
import Ubuntu.Components 1.3
2569
19
import Ubuntu.SystemSettings.SecurityPrivacy 1.0
19
import Ubuntu.SystemSettings.SecurityPrivacy 1.0
2570
20
import Wizard 0.1
20
import Wizard 0.1
2571
21
import "../Components"
21
import "../Components"
2572
22
22
2573
=== modified file 'qml/Wizard/Pages/10-welcome.qml'
2574
--- qml/Wizard/Pages/10-welcome.qml	2014-11-21 19:28:16 +0000
2575
+++ qml/Wizard/Pages/10-welcome.qml	2015-07-22 14:32:16 +0000
2576
@@ -15,8 +15,8 @@
2577
15
 */
15
 */
2578
16
16
2579
17
import QtQuick 2.3
17
import QtQuick 2.3
2582
18
import Ubuntu.Components 1.1
18
import Ubuntu.Components 1.3
2583
19
import Ubuntu.Components.ListItems 0.1
19
import Ubuntu.Components.ListItems 1.3
2584
20
import Ubuntu.SystemSettings.LanguagePlugin 1.0
20
import Ubuntu.SystemSettings.LanguagePlugin 1.0
2585
21
import Wizard 0.1
21
import Wizard 0.1
2586
22
import ".." as LocalComponents
22
import ".." as LocalComponents
2587
23
23
2588
=== modified file 'qml/Wizard/Pages/20-sim.qml'
2589
--- qml/Wizard/Pages/20-sim.qml	2015-05-19 18:56:17 +0000
2590
+++ qml/Wizard/Pages/20-sim.qml	2015-07-22 14:32:16 +0000
2591
@@ -16,7 +16,7 @@
2592
16
16
2593
17
import QtQuick 2.0
17
import QtQuick 2.0
2594
18
import MeeGo.QOfono 0.2
18
import MeeGo.QOfono 0.2
2596
19
import Ubuntu.Components 0.1
19
import Ubuntu.Components 1.3
2597
20
import ".." as LocalComponents
20
import ".." as LocalComponents
2598
21
21
2599
22
LocalComponents.Page {
22
LocalComponents.Page {
2600
23
23
2601
=== modified file 'qml/Wizard/Pages/30-passwd-type.qml'
2602
--- qml/Wizard/Pages/30-passwd-type.qml	2015-03-13 10:07:57 +0000
2603
+++ qml/Wizard/Pages/30-passwd-type.qml	2015-07-22 14:32:16 +0000
2604
@@ -1,5 +1,5 @@
2605
1
/*
1
/*
2607
2
 * Copyright (C) 2014 Canonical, Ltd.
2
 * Copyright (C) 2014,2015 Canonical, Ltd.
2608
3
 *
3
 *
2609
4
 * This program is free software; you can redistribute it and/or modify
4
 * This program is free software; you can redistribute it and/or modify
2610
5
 * it under the terms of the GNU General Public License as published by
5
 * it under the terms of the GNU General Public License as published by
2611
@@ -15,8 +15,8 @@
2612
15
 */
15
 */
2613
16
16
2614
17
import QtQuick 2.3
17
import QtQuick 2.3
2617
18
import Ubuntu.Components 1.1
18
import Ubuntu.Components 1.3
2618
19
import Ubuntu.Components.ListItems 1.0
19
import Ubuntu.Components.ListItems 1.3
2619
20
import Ubuntu.SystemSettings.SecurityPrivacy 1.0
20
import Ubuntu.SystemSettings.SecurityPrivacy 1.0
2620
21
import ".." as LocalComponents
21
import ".." as LocalComponents
2621
22
22
2622
@@ -111,13 +111,13 @@
2623
111
111
2624
112
            Component.onCompleted: {
112
            Component.onCompleted: {
2625
113
                // A visible selected background looks bad in ListItem widgets with our theme
113
                // A visible selected background looks bad in ListItem widgets with our theme
2628
114
                originalBackground = Theme.palette.selected.background
114
                originalBackground = theme.palette.selected.background
2629
115
                Theme.palette.selected.background = "transparent"
115
                theme.palette.selected.background = "transparent"
2630
116
            }
116
            }
2631
117
117
2632
118
            Component.onDestruction: {
118
            Component.onDestruction: {
2633
119
                // Restore original theme background
119
                // Restore original theme background
2635
120
                Theme.palette.selected.background = originalBackground
120
                theme.palette.selected.background = originalBackground
2636
121
            }
121
            }
2637
122
        }
122
        }
2638
123
    }
123
    }
2639
124
124
2640
=== modified file 'qml/Wizard/Pages/40-wifi.qml'
2641
--- qml/Wizard/Pages/40-wifi.qml	2015-02-03 15:00:26 +0000
2642
+++ qml/Wizard/Pages/40-wifi.qml	2015-07-22 14:32:16 +0000
2643
@@ -17,8 +17,8 @@
2644
17
import QtQuick 2.0
17
import QtQuick 2.0
2645
18
import QMenuModel 0.1 as QMenuModel
18
import QMenuModel 0.1 as QMenuModel
2646
19
import QtSystemInfo 5.0
19
import QtSystemInfo 5.0
2649
20
import Ubuntu.Components 0.1
20
import Ubuntu.Components 1.3
2650
21
import Ubuntu.Components.ListItems 0.1 as ListItem
21
import Ubuntu.Components.ListItems 1.3 as ListItem
2651
22
import Ubuntu.Settings.Menus 0.1 as Menus
22
import Ubuntu.Settings.Menus 0.1 as Menus
2652
23
import ".." as LocalComponents
23
import ".." as LocalComponents
2653
24
24
2654
25
25
2655
=== modified file 'qml/Wizard/Pages/50-location.qml'
2656
--- qml/Wizard/Pages/50-location.qml	2015-06-22 10:01:15 +0000
2657
+++ qml/Wizard/Pages/50-location.qml	2015-07-22 14:32:16 +0000
2658
@@ -1,5 +1,5 @@
2659
1
/*
1
/*
2661
2
 * Copyright (C) 2013,2014 Canonical, Ltd.
2
 * Copyright (C) 2013-2015 Canonical, Ltd.
2662
3
 *
3
 *
2663
4
 * This program is free software; you can redistribute it and/or modify
4
 * This program is free software; you can redistribute it and/or modify
2664
5
 * it under the terms of the GNU General Public License as published by
5
 * it under the terms of the GNU General Public License as published by
2665
@@ -18,7 +18,7 @@
2666
18
import AccountsService 0.1
18
import AccountsService 0.1
2667
19
import QMenuModel 0.1 as QMenuModel
19
import QMenuModel 0.1 as QMenuModel
2668
20
import Qt.labs.folderlistmodel 2.1
20
import Qt.labs.folderlistmodel 2.1
2670
21
import Ubuntu.Components 1.1
21
import Ubuntu.Components 1.3
2671
22
import ".." as LocalComponents
22
import ".." as LocalComponents
2672
23
23
2673
24
LocalComponents.Page {
24
LocalComponents.Page {
2674
@@ -98,7 +98,7 @@
2675
98
                anchors.leftMargin: hereCheck.labelOffset
98
                anchors.leftMargin: hereCheck.labelOffset
2676
99
                anchors.right: parent.right
99
                anchors.right: parent.right
2677
100
                wrapMode: Text.Wrap
100
                wrapMode: Text.Wrap
2679
101
                linkColor: Theme.palette.normal.foregroundText
101
                linkColor: theme.palette.normal.foregroundText
2680
102
                // Translators: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
102
                // Translators: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
2681
103
                text: i18n.tr("By selecting this option you agree to the Nokia HERE <a href='#'>terms and conditions</a>.")
103
                text: i18n.tr("By selecting this option you agree to the Nokia HERE <a href='#'>terms and conditions</a>.")
2682
104
                onLinkActivated: pageStack.load(Qt.resolvedUrl("here-terms.qml"))
104
                onLinkActivated: pageStack.load(Qt.resolvedUrl("here-terms.qml"))
2683
105
105
2684
=== modified file 'qml/Wizard/Pages/60-reporting.qml'
2685
--- qml/Wizard/Pages/60-reporting.qml	2014-11-21 19:28:16 +0000
2686
+++ qml/Wizard/Pages/60-reporting.qml	2015-07-22 14:32:16 +0000
2687
@@ -15,7 +15,7 @@
2688
15
 */
15
 */
2689
16
16
2690
17
import QtQuick 2.0
17
import QtQuick 2.0
2692
18
import Ubuntu.Components 0.1
18
import Ubuntu.Components 1.3
2693
19
import ".." as LocalComponents
19
import ".." as LocalComponents
2694
20
20
2695
21
LocalComponents.Page {
21
LocalComponents.Page {
2696
22
22
2697
=== modified file 'qml/Wizard/Pages/80-finished.qml'
2698
--- qml/Wizard/Pages/80-finished.qml	2014-11-21 19:28:16 +0000
2699
+++ qml/Wizard/Pages/80-finished.qml	2015-07-22 14:32:16 +0000
2700
@@ -15,7 +15,7 @@
2701
15
 */
15
 */
2702
16
16
2703
17
import QtQuick 2.0
17
import QtQuick 2.0
2705
18
import Ubuntu.Components 0.1
18
import Ubuntu.Components 1.3
2706
19
import ".." as LocalComponents
19
import ".." as LocalComponents
2707
20
20
2708
21
LocalComponents.Page {
21
LocalComponents.Page {
2709
22
22
2710
=== modified file 'qml/Wizard/Pages/here-terms.qml'
2711
--- qml/Wizard/Pages/here-terms.qml	2014-11-21 19:28:16 +0000
2712
+++ qml/Wizard/Pages/here-terms.qml	2015-07-22 14:32:16 +0000
2713
@@ -1,5 +1,5 @@
2714
1
/*
1
/*
2716
2
 * Copyright (C) 2014 Canonical, Ltd.
2
 * Copyright (C) 2014,2015 Canonical, Ltd.
2717
3
 *
3
 *
2718
4
 * This program is free software; you can redistribute it and/or modify
4
 * This program is free software; you can redistribute it and/or modify
2719
5
 * it under the terms of the GNU General Public License as published by
5
 * it under the terms of the GNU General Public License as published by
2720
@@ -17,7 +17,7 @@
2721
17
import QtQuick 2.3
17
import QtQuick 2.3
2722
18
import AccountsService 0.1
18
import AccountsService 0.1
2723
19
import Qt.labs.folderlistmodel 2.1
19
import Qt.labs.folderlistmodel 2.1
2725
20
import Ubuntu.Components 1.1
20
import Ubuntu.Components 1.3
2726
21
import Ubuntu.Web 0.2
21
import Ubuntu.Web 0.2
2727
22
import ".." as LocalComponents
22
import ".." as LocalComponents
2728
23
23
2729
@@ -102,7 +102,7 @@
2730
102
            anchors.left: parent.left
102
            anchors.left: parent.left
2731
103
            anchors.right: parent.right
103
            anchors.right: parent.right
2732
104
            wrapMode: Text.Wrap
104
            wrapMode: Text.Wrap
2734
105
            linkColor: Theme.palette.normal.foregroundText
105
            linkColor: theme.palette.normal.foregroundText
2735
106
            onLinkActivated: {
106
            onLinkActivated: {
2736
107
                webview.url = link
107
                webview.url = link
2737
108
                termsLabel.visible = false
108
                termsLabel.visible = false
2738
109
109
2739
=== modified file 'qml/Wizard/Pages/passwd-confirm.qml'
2740
--- qml/Wizard/Pages/passwd-confirm.qml	2014-11-21 19:28:16 +0000
2741
+++ qml/Wizard/Pages/passwd-confirm.qml	2015-07-22 14:32:16 +0000
2742
@@ -15,7 +15,7 @@
2743
15
 */
15
 */
2744
16
16
2745
17
import QtQuick 2.3
17
import QtQuick 2.3
2747
18
import Ubuntu.Components 1.1
18
import Ubuntu.Components 1.3
2748
19
import Ubuntu.SystemSettings.SecurityPrivacy 1.0
19
import Ubuntu.SystemSettings.SecurityPrivacy 1.0
2749
20
import ".." as LocalComponents
20
import ".." as LocalComponents
2750
21
import "../../Components" as UnityComponents
21
import "../../Components" as UnityComponents
2751
22
22
2752
=== modified file 'qml/Wizard/Pages/passwd-set.qml'
2753
--- qml/Wizard/Pages/passwd-set.qml	2014-11-21 19:28:16 +0000
2754
+++ qml/Wizard/Pages/passwd-set.qml	2015-07-22 14:32:16 +0000
2755
@@ -15,7 +15,7 @@
2756
15
 */
15
 */
2757
16
16
2758
17
import QtQuick 2.3
17
import QtQuick 2.3
2760
18
import Ubuntu.Components 1.1
18
import Ubuntu.Components 1.3
2761
19
import Ubuntu.SystemSettings.SecurityPrivacy 1.0
19
import Ubuntu.SystemSettings.SecurityPrivacy 1.0
2762
20
import ".." as LocalComponents
20
import ".." as LocalComponents
2763
21
import "../../Components" as UnityComponents
21
import "../../Components" as UnityComponents
2764
22
22
2765
=== modified file 'qml/Wizard/StackButton.qml'
2766
--- qml/Wizard/StackButton.qml	2014-11-14 17:47:00 +0000
2767
+++ qml/Wizard/StackButton.qml	2015-07-22 14:32:16 +0000
2768
@@ -1,5 +1,5 @@
2769
1
/*
1
/*
2771
2
 * Copyright (C) 2014 Canonical, Ltd.
2
 * Copyright (C) 2014,2015 Canonical, Ltd.
2772
3
 *
3
 *
2773
4
 * This program is free software; you can redistribute it and/or modify
4
 * This program is free software; you can redistribute it and/or modify
2774
5
 * it under the terms of the GNU General Public License as published by
5
 * it under the terms of the GNU General Public License as published by
2775
@@ -15,7 +15,7 @@
2776
15
 */
15
 */
2777
16
16
2778
17
import QtQuick 2.3
17
import QtQuick 2.3
2780
18
import Ubuntu.Components 1.1
18
import Ubuntu.Components 1.3
2781
19
19
2782
20
AbstractButton {
20
AbstractButton {
2783
21
    id: stackButton
21
    id: stackButton
2784
@@ -32,7 +32,7 @@
2785
32
        anchors.verticalCenter: parent.verticalCenter
32
        anchors.verticalCenter: parent.verticalCenter
2786
33
        anchors.left: parent.left
33
        anchors.left: parent.left
2787
34
        anchors.right: parent.right
34
        anchors.right: parent.right
2789
35
        color: enabled ? Theme.palette.selected.backgroundText : Qt.darker(Theme.palette.selected.backgroundText, 1.5)
35
        color: enabled ? theme.palette.selected.backgroundText : Qt.darker(theme.palette.selected.backgroundText, 1.5)
2790
36
        text: {
36
        text: {
2791
37
            if (backArrow) {
37
            if (backArrow) {
2792
38
                // Translators: This is the arrow for "Back" buttons
38
                // Translators: This is the arrow for "Back" buttons
2793
39
39
2794
=== modified file 'qml/Wizard/Wizard.qml'
2795
--- qml/Wizard/Wizard.qml	2015-03-11 14:48:45 +0000
2796
+++ qml/Wizard/Wizard.qml	2015-07-22 14:32:16 +0000
2797
@@ -15,7 +15,7 @@
2798
15
 */
15
 */
2799
16
16
2800
17
import QtQuick 2.3
17
import QtQuick 2.3
2802
18
import Ubuntu.Components 1.1
18
import Ubuntu.Components 1.3
2803
19
import Wizard 0.1
19
import Wizard 0.1
2804
20
import "../Components"
20
import "../Components"
2805
21
21
2806
22
22
2807
=== modified file 'tests/CMakeLists.txt'
2808
--- tests/CMakeLists.txt	2015-07-09 20:22:36 +0000
2809
+++ tests/CMakeLists.txt	2015-07-22 14:32:16 +0000
2810
@@ -126,3 +126,4 @@
2811
126
add_subdirectory(plugins)
126
add_subdirectory(plugins)
2812
127
add_subdirectory(qmltests)
127
add_subdirectory(qmltests)
2813
128
add_subdirectory(whitespace)
128
add_subdirectory(whitespace)
2814
129
add_subdirectory(sdk)
2815
129
130
2816
=== modified file 'tests/plugins/Dash/cardcreator/1.res'
2817
--- tests/plugins/Dash/cardcreator/1.res	2015-06-22 08:29:55 +0000
2818
+++ tests/plugins/Dash/cardcreator/1.res	2015-07-22 14:32:16 +0000
2819
@@ -87,7 +87,7 @@
2820
87
                        wrapMode: Text.Wrap; 
87
                        wrapMode: Text.Wrap; 
2821
88
                        maximumLineCount: 2; 
88
                        maximumLineCount: 2; 
2822
89
                        font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); 
89
                        font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); 
2824
90
                        color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText;
90
                        color: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText;
2825
91
                        visible: showHeader ; 
91
                        visible: showHeader ; 
2826
92
                        width: undefined;
92
                        width: undefined;
2827
93
                        text: root.title; 
93
                        text: root.title; 
2828
94
94
2829
=== modified file 'tests/plugins/Dash/cardcreator/2.res'
2830
--- tests/plugins/Dash/cardcreator/2.res	2015-06-22 08:29:55 +0000
2831
+++ tests/plugins/Dash/cardcreator/2.res	2015-07-22 14:32:16 +0000
2832
@@ -88,7 +88,7 @@
2833
88
                        wrapMode: Text.Wrap; 
88
                        wrapMode: Text.Wrap; 
2834
89
                        maximumLineCount: 2; 
89
                        maximumLineCount: 2; 
2835
90
                        font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); 
90
                        font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); 
2837
91
                        color: backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? Theme.palette.normal.baseText : "white");
91
                        color: backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? theme.palette.normal.baseText : "white");
2838
92
                        visible: showHeader ; 
92
                        visible: showHeader ; 
2839
93
                        width: undefined;
93
                        width: undefined;
2840
94
                        text: root.title; 
94
                        text: root.title; 
2841
@@ -108,7 +108,7 @@
2842
108
                            maximumLineCount: 1; 
108
                            maximumLineCount: 1; 
2843
109
                            fontSize: "x-small"; 
109
                            fontSize: "x-small"; 
2844
110
                            font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); 
110
                            font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); 
2846
111
                            color: backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? Theme.palette.normal.baseText : "white");
111
                            color: backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? theme.palette.normal.baseText : "white");
2847
112
                            visible: titleLabel.visible && titleLabel.text; 
112
                            visible: titleLabel.visible && titleLabel.text; 
2848
113
                            text: cardData && cardData["subtitle"] || ""; 
113
                            text: cardData && cardData["subtitle"] || ""; 
2849
114
                            font.weight: Font.Light; 
114
                            font.weight: Font.Light; 
2850
115
115
2851
=== modified file 'tests/plugins/Dash/cardcreator/3.res'
2852
--- tests/plugins/Dash/cardcreator/3.res	2015-06-22 08:29:55 +0000
2853
+++ tests/plugins/Dash/cardcreator/3.res	2015-07-22 14:32:16 +0000
2854
@@ -87,7 +87,7 @@
2855
87
                        wrapMode: Text.Wrap; 
87
                        wrapMode: Text.Wrap; 
2856
88
                        maximumLineCount: 2; 
88
                        maximumLineCount: 2; 
2857
89
                        font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); 
89
                        font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); 
2859
90
                        color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText;
90
                        color: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText;
2860
91
                        visible: showHeader ; 
91
                        visible: showHeader ; 
2861
92
                        width: undefined;
92
                        width: undefined;
2862
93
                        text: root.title; 
93
                        text: root.title; 
2863
@@ -107,7 +107,7 @@
2864
107
                            maximumLineCount: 1; 
107
                            maximumLineCount: 1; 
2865
108
                            fontSize: "x-small"; 
108
                            fontSize: "x-small"; 
2866
109
                            font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); 
109
                            font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); 
2868
110
                            color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText;
110
                            color: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText;
2869
111
                            visible: titleLabel.visible && titleLabel.text; 
111
                            visible: titleLabel.visible && titleLabel.text; 
2870
112
                            text: cardData && cardData["subtitle"] || ""; 
112
                            text: cardData && cardData["subtitle"] || ""; 
2871
113
                            font.weight: Font.Light; 
113
                            font.weight: Font.Light; 
2872
114
114
2873
=== modified file 'tests/plugins/Dash/cardcreator/4.res'
2874
--- tests/plugins/Dash/cardcreator/4.res	2015-06-22 08:29:55 +0000
2875
+++ tests/plugins/Dash/cardcreator/4.res	2015-07-22 14:32:16 +0000
2876
@@ -72,7 +72,7 @@
2877
72
                    wrapMode: Text.Wrap; 
72
                    wrapMode: Text.Wrap; 
2878
73
                    maximumLineCount: 2; 
73
                    maximumLineCount: 2; 
2879
74
                    font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); 
74
                    font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); 
2881
75
                    color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText;
75
                    color: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText;
2882
76
                    visible: showHeader ; 
76
                    visible: showHeader ; 
2883
77
                    width: undefined;
77
                    width: undefined;
2884
78
                    text: root.title; 
78
                    text: root.title; 
2885
@@ -92,7 +92,7 @@
2886
92
                        maximumLineCount: 1; 
92
                        maximumLineCount: 1; 
2887
93
                        fontSize: "x-small"; 
93
                        fontSize: "x-small"; 
2888
94
                        font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); 
94
                        font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); 
2890
95
                        color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText;
95
                        color: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText;
2891
96
                        visible: titleLabel.visible && titleLabel.text; 
96
                        visible: titleLabel.visible && titleLabel.text; 
2892
97
                        text: cardData && cardData["subtitle"] || ""; 
97
                        text: cardData && cardData["subtitle"] || ""; 
2893
98
                        font.weight: Font.Light; 
98
                        font.weight: Font.Light; 
2894
99
99
2895
=== modified file 'tests/plugins/Dash/cardcreator/5.res'
2896
--- tests/plugins/Dash/cardcreator/5.res	2015-06-22 08:29:55 +0000
2897
+++ tests/plugins/Dash/cardcreator/5.res	2015-07-22 14:32:16 +0000
2898
@@ -131,7 +131,7 @@
2899
131
                        wrapMode: Text.Wrap; 
131
                        wrapMode: Text.Wrap; 
2900
132
                        maximumLineCount: 2; 
132
                        maximumLineCount: 2; 
2901
133
                        font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); 
133
                        font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); 
2903
134
                        color: root.scopeStyle && overlayLoader.item ? root.scopeStyle.getTextColor(overlayLoader.item.luminance) : (overlayLoader.item && overlayLoader.item.luminance > 0.7 ? Theme.palette.normal.baseText : "white");
134
                        color: root.scopeStyle && overlayLoader.item ? root.scopeStyle.getTextColor(overlayLoader.item.luminance) : (overlayLoader.item && overlayLoader.item.luminance > 0.7 ? theme.palette.normal.baseText : "white");
2904
135
                        visible: showHeader && overlayLoader.active; 
135
                        visible: showHeader && overlayLoader.active; 
2905
136
                        width: undefined;
136
                        width: undefined;
2906
137
                        text: root.title; 
137
                        text: root.title; 
2907
@@ -152,7 +152,7 @@
2908
152
                            maximumLineCount: 1; 
152
                            maximumLineCount: 1; 
2909
153
                            fontSize: "x-small"; 
153
                            fontSize: "x-small"; 
2910
154
                            font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); 
154
                            font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); 
2912
155
                            color: root.scopeStyle && overlayLoader.item ? root.scopeStyle.getTextColor(overlayLoader.item.luminance) : (overlayLoader.item && overlayLoader.item.luminance > 0.7 ? Theme.palette.normal.baseText : "white");
155
                            color: root.scopeStyle && overlayLoader.item ? root.scopeStyle.getTextColor(overlayLoader.item.luminance) : (overlayLoader.item && overlayLoader.item.luminance > 0.7 ? theme.palette.normal.baseText : "white");
2913
156
                            visible: titleLabel.visible && titleLabel.text; 
156
                            visible: titleLabel.visible && titleLabel.text; 
2914
157
                            text: cardData && cardData["subtitle"] || ""; 
157
                            text: cardData && cardData["subtitle"] || ""; 
2915
158
                            font.weight: Font.Light; 
158
                            font.weight: Font.Light; 
2916
159
159
2917
=== modified file 'tests/plugins/Dash/cardcreator/6.res'
2918
--- tests/plugins/Dash/cardcreator/6.res	2015-06-22 08:29:55 +0000
2919
+++ tests/plugins/Dash/cardcreator/6.res	2015-07-22 14:32:16 +0000
2920
@@ -67,7 +67,7 @@
2921
67
                        wrapMode: Text.Wrap; 
67
                        wrapMode: Text.Wrap; 
2922
68
                        maximumLineCount: 2; 
68
                        maximumLineCount: 2; 
2923
69
                        font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); 
69
                        font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); 
2925
70
                        color: backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? Theme.palette.normal.baseText : "white");
70
                        color: backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? theme.palette.normal.baseText : "white");
2926
71
                        visible: showHeader ; 
71
                        visible: showHeader ; 
2927
72
                        width: undefined;
72
                        width: undefined;
2928
73
                        text: root.title; 
73
                        text: root.title; 
2929
@@ -87,7 +87,7 @@
2930
87
                            maximumLineCount: 1; 
87
                            maximumLineCount: 1; 
2931
88
                            fontSize: "x-small"; 
88
                            fontSize: "x-small"; 
2932
89
                            font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); 
89
                            font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); 
2934
90
                            color: backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? Theme.palette.normal.baseText : "white");
90
                            color: backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? theme.palette.normal.baseText : "white");
2935
91
                            visible: titleLabel.visible && titleLabel.text; 
91
                            visible: titleLabel.visible && titleLabel.text; 
2936
92
                            text: cardData && cardData["subtitle"] || ""; 
92
                            text: cardData && cardData["subtitle"] || ""; 
2937
93
                            font.weight: Font.Light; 
93
                            font.weight: Font.Light; 
2938
@@ -101,7 +101,7 @@
2939
101
                            rightMargin: units.gu(1); 
101
                            rightMargin: units.gu(1); 
2940
102
                            } 
102
                            } 
2941
103
                            source: cardData && cardData["emblem"] || ""; 
103
                            source: cardData && cardData["emblem"] || ""; 
2943
104
                            color: backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? Theme.palette.normal.baseText : "white");
104
                            color: backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? theme.palette.normal.baseText : "white");
2944
105
                            height: source != "" ? titleLabel.font.pixelSize : 0; 
105
                            height: source != "" ? titleLabel.font.pixelSize : 0; 
2945
106
                            width: implicitWidth > 0 && implicitHeight > 0 ? (implicitWidth / implicitHeight * height) : implicitWidth;
106
                            width: implicitWidth > 0 && implicitHeight > 0 ? (implicitWidth / implicitHeight * height) : implicitWidth;
2946
107
                        }
107
                        }
2947
108
108
2948
=== modified file 'tests/plugins/Dash/cardcreator/7.res'
2949
--- tests/plugins/Dash/cardcreator/7.res	2015-06-22 08:29:55 +0000
2950
+++ tests/plugins/Dash/cardcreator/7.res	2015-07-22 14:32:16 +0000
2951
@@ -89,7 +89,7 @@
2952
89
                        wrapMode: Text.Wrap; 
89
                        wrapMode: Text.Wrap; 
2953
90
                        maximumLineCount: 2; 
90
                        maximumLineCount: 2; 
2954
91
                        font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); 
91
                        font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); 
2956
92
                        color: backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? Theme.palette.normal.baseText : "white");
92
                        color: backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? theme.palette.normal.baseText : "white");
2957
93
                        visible: showHeader ; 
93
                        visible: showHeader ; 
2958
94
                        width: undefined;
94
                        width: undefined;
2959
95
                        text: root.title; 
95
                        text: root.title; 
2960
@@ -109,7 +109,7 @@
2961
109
                            maximumLineCount: 1; 
109
                            maximumLineCount: 1; 
2962
110
                            fontSize: "x-small"; 
110
                            fontSize: "x-small"; 
2963
111
                            font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); 
111
                            font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); 
2965
112
                            color: backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? Theme.palette.normal.baseText : "white");
112
                            color: backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? theme.palette.normal.baseText : "white");
2966
113
                            visible: titleLabel.visible && titleLabel.text; 
113
                            visible: titleLabel.visible && titleLabel.text; 
2967
114
                            text: cardData && cardData["subtitle"] || ""; 
114
                            text: cardData && cardData["subtitle"] || ""; 
2968
115
                            font.weight: Font.Light; 
115
                            font.weight: Font.Light; 
2969
@@ -122,7 +122,7 @@
2970
122
                            rightMargin: units.gu(1);
122
                            rightMargin: units.gu(1);
2971
123
                            top: subtitleLabel.bottom; 
123
                            top: subtitleLabel.bottom; 
2972
124
                            } 
124
                            } 
2974
125
                            color: backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? Theme.palette.normal.baseText : "white");
125
                            color: backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? theme.palette.normal.baseText : "white");
2975
126
                            fontScale: root.fontScale; 
126
                            fontScale: root.fontScale; 
2976
127
                            model: cardData && cardData["attributes"]; 
127
                            model: cardData && cardData["attributes"]; 
2977
128
                          }
128
                          }
2978
129
129
2979
=== modified file 'tests/plugins/Dash/cardcreator/8.res'
2980
--- tests/plugins/Dash/cardcreator/8.res	2015-06-22 08:29:55 +0000
2981
+++ tests/plugins/Dash/cardcreator/8.res	2015-07-22 14:32:16 +0000
2982
@@ -80,7 +80,7 @@
2983
80
                        wrapMode: Text.Wrap; 
80
                        wrapMode: Text.Wrap; 
2984
81
                        maximumLineCount: 2; 
81
                        maximumLineCount: 2; 
2985
82
                        font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); 
82
                        font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); 
2987
83
                        color: backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? Theme.palette.normal.baseText : "white"); 
83
                        color: backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? theme.palette.normal.baseText : "white"); 
2988
84
                        visible: showHeader ; 
84
                        visible: showHeader ; 
2989
85
                        width: parent.width - x; 
85
                        width: parent.width - x; 
2990
86
                        text: root.title; 
86
                        text: root.title; 
2991
87
87
2992
=== modified file 'tests/plugins/Dash/tst_CroppedImageMinimumSourceSize.qml'
2993
--- tests/plugins/Dash/tst_CroppedImageMinimumSourceSize.qml	2014-10-31 15:13:24 +0000
2994
+++ tests/plugins/Dash/tst_CroppedImageMinimumSourceSize.qml	2015-07-22 14:32:16 +0000
2995
@@ -16,7 +16,7 @@
2996
16
16
2997
17
import QtQuick 2.3
17
import QtQuick 2.3
2998
18
import QtTest 1.0
18
import QtTest 1.0
3000
19
import Ubuntu.Components 1.1
19
import Ubuntu.Components 1.3
3001
20
import Dash 0.1
20
import Dash 0.1
3002
21
21
3003
22
Rectangle {
22
Rectangle {
3004
23
23
3005
=== modified file 'tests/plugins/Dash/tst_ScopeStyle.qml'
3006
--- tests/plugins/Dash/tst_ScopeStyle.qml	2014-11-20 11:44:44 +0000
3007
+++ tests/plugins/Dash/tst_ScopeStyle.qml	2015-07-22 14:32:16 +0000
3008
@@ -17,7 +17,7 @@
3009
17
import QtQuick 2.2
17
import QtQuick 2.2
3010
18
import QtTest 1.0
18
import QtTest 1.0
3011
19
import Dash 0.1
19
import Dash 0.1
3013
20
import Ubuntu.Components 1.1
20
import Ubuntu.Components 1.3
3014
21
import Utils 0.1
21
import Utils 0.1
3015
22
22
3016
23
Rectangle {
23
Rectangle {
3017
24
24
3018
=== modified file 'tests/plugins/Ubuntu/Gestures/DownwardsLauncher.qml'
3019
--- tests/plugins/Ubuntu/Gestures/DownwardsLauncher.qml	2015-04-10 21:16:37 +0000
3020
+++ tests/plugins/Ubuntu/Gestures/DownwardsLauncher.qml	2015-07-22 14:32:16 +0000
3021
@@ -16,7 +16,7 @@
3022
16
16
3023
17
import QtQuick 2.0
17
import QtQuick 2.0
3024
18
import Ubuntu.Gestures 0.1
18
import Ubuntu.Gestures 0.1
3026
19
import Ubuntu.Components 0.1
19
import Ubuntu.Components 1.3
3027
20
20
3028
21
Item {
21
Item {
3029
22
22
3030
23
23
3031
=== modified file 'tests/plugins/Ubuntu/Gestures/LeftwardsLauncher.qml'
3032
--- tests/plugins/Ubuntu/Gestures/LeftwardsLauncher.qml	2015-04-10 21:16:37 +0000
3033
+++ tests/plugins/Ubuntu/Gestures/LeftwardsLauncher.qml	2015-07-22 14:32:16 +0000
3034
@@ -16,7 +16,7 @@
3035
16
16
3036
17
import QtQuick 2.0
17
import QtQuick 2.0
3037
18
import Ubuntu.Gestures 0.1
18
import Ubuntu.Gestures 0.1
3039
19
import Ubuntu.Components 0.1
19
import Ubuntu.Components 1.3
3040
20
20
3041
21
Item {
21
Item {
3042
22
    id: root
22
    id: root
3043
23
23
3044
=== modified file 'tests/plugins/Ubuntu/Gestures/RightwardsLauncher.qml'
3045
--- tests/plugins/Ubuntu/Gestures/RightwardsLauncher.qml	2015-04-10 21:16:37 +0000
3046
+++ tests/plugins/Ubuntu/Gestures/RightwardsLauncher.qml	2015-07-22 14:32:16 +0000
3047
@@ -16,7 +16,7 @@
3048
16
16
3049
17
import QtQuick 2.0
17
import QtQuick 2.0
3050
18
import Ubuntu.Gestures 0.1
18
import Ubuntu.Gestures 0.1
3052
19
import Ubuntu.Components 0.1
19
import Ubuntu.Components 1.3
3053
20
20
3054
21
Item {
21
Item {
3055
22
    objectName: "rightwardsLauncher"
22
    objectName: "rightwardsLauncher"
3056
23
23
3057
=== modified file 'tests/plugins/Ubuntu/Gestures/UpwardsLauncher.qml'
3058
--- tests/plugins/Ubuntu/Gestures/UpwardsLauncher.qml	2015-04-10 21:16:37 +0000
3059
+++ tests/plugins/Ubuntu/Gestures/UpwardsLauncher.qml	2015-07-22 14:32:16 +0000
3060
@@ -16,7 +16,7 @@
3061
16
16
3062
17
import QtQuick 2.0
17
import QtQuick 2.0
3063
18
import Ubuntu.Gestures 0.1
18
import Ubuntu.Gestures 0.1
3065
19
import Ubuntu.Components 0.1
19
import Ubuntu.Components 1.3
3066
20
20
3067
21
Item {
21
Item {
3068
22
    id: root
22
    id: root
3069
23
23
3070
=== modified file 'tests/plugins/Ubuntu/Gestures/tst_DirectionalDragArea.qml'
3071
--- tests/plugins/Ubuntu/Gestures/tst_DirectionalDragArea.qml	2015-04-10 21:16:37 +0000
3072
+++ tests/plugins/Ubuntu/Gestures/tst_DirectionalDragArea.qml	2015-07-22 14:32:16 +0000
3073
@@ -15,7 +15,7 @@
3074
15
 */
15
 */
3075
16
16
3076
17
import QtQuick 2.0
17
import QtQuick 2.0
3078
18
import Ubuntu.Components 0.1
18
import Ubuntu.Components 1.3
3079
19
import Unity.Test 0.1
19
import Unity.Test 0.1
3080
20
20
3081
21
Rectangle {
21
Rectangle {
3082
22
22
3083
=== modified file 'tests/plugins/Ubuntu/Gestures/tst_FloatingFlickable.qml'
3084
--- tests/plugins/Ubuntu/Gestures/tst_FloatingFlickable.qml	2015-04-17 14:21:43 +0000
3085
+++ tests/plugins/Ubuntu/Gestures/tst_FloatingFlickable.qml	2015-07-22 14:32:16 +0000
3086
@@ -15,7 +15,7 @@
3087
15
 */
15
 */
3088
16
16
3089
17
import QtQuick 2.0
17
import QtQuick 2.0
3091
18
import Ubuntu.Components 0.1
18
import Ubuntu.Components 1.3
3092
19
import Ubuntu.Gestures 0.1
19
import Ubuntu.Gestures 0.1
3093
20
import Unity.Test 0.1
20
import Unity.Test 0.1
3094
21
21
3095
22
22
3096
=== modified file 'tests/plugins/Ubuntu/Gestures/tst_PressedOutsideNotifier.qml'
3097
--- tests/plugins/Ubuntu/Gestures/tst_PressedOutsideNotifier.qml	2013-11-22 13:43:40 +0000
3098
+++ tests/plugins/Ubuntu/Gestures/tst_PressedOutsideNotifier.qml	2015-07-22 14:32:16 +0000
3099
@@ -15,7 +15,7 @@
3100
15
 */
15
 */
3101
16
16
3102
17
import QtQuick 2.0
17
import QtQuick 2.0
3104
18
import Ubuntu.Components 0.1
18
import Ubuntu.Components 1.3
3105
19
import Ubuntu.Gestures 0.1
19
import Ubuntu.Gestures 0.1
3106
20
20
3107
21
/*
21
/*
3108
22
22
3109
=== modified file 'tests/qmltests/Components/tst_Dialogs.qml'
3110
--- tests/qmltests/Components/tst_Dialogs.qml	2015-03-26 15:39:30 +0000
3111
+++ tests/qmltests/Components/tst_Dialogs.qml	2015-07-22 14:32:16 +0000
3112
@@ -16,7 +16,7 @@
3113
16
16
3114
17
import QtQuick 2.2
17
import QtQuick 2.2
3115
18
import QtTest 1.0
18
import QtTest 1.0
3117
19
import Ubuntu.Components 1.1
19
import Ubuntu.Components 1.3
3118
20
import Unity.Test 0.1
20
import Unity.Test 0.1
3119
21
21
3120
22
import "../../../qml/Components"
22
import "../../../qml/Components"
3121
23
23
3122
=== modified file 'tests/qmltests/Components/tst_DragHandle.qml'
3123
--- tests/qmltests/Components/tst_DragHandle.qml	2015-04-10 21:16:37 +0000
3124
+++ tests/qmltests/Components/tst_DragHandle.qml	2015-07-22 14:32:16 +0000
3125
@@ -17,7 +17,7 @@
3126
17
import QtQuick 2.0
17
import QtQuick 2.0
3127
18
import "../../../qml/Components"
18
import "../../../qml/Components"
3128
19
import "tst_DragHandle"
19
import "tst_DragHandle"
3130
20
import Ubuntu.Components 0.1
20
import Ubuntu.Components 1.3
3131
21
import Ubuntu.Gestures 0.1
21
import Ubuntu.Gestures 0.1
3132
22
import Unity.Test 0.1
22
import Unity.Test 0.1
3133
23
23
3134
24
24
3135
=== modified file 'tests/qmltests/Components/tst_DragHandle/BidirectionalShowable.qml'
3136
--- tests/qmltests/Components/tst_DragHandle/BidirectionalShowable.qml	2015-04-10 21:16:37 +0000
3137
+++ tests/qmltests/Components/tst_DragHandle/BidirectionalShowable.qml	2015-07-22 14:32:16 +0000
3138
@@ -16,7 +16,7 @@
3139
16
16
3140
17
import QtQuick 2.0
17
import QtQuick 2.0
3141
18
import "../../../../qml/Components"
18
import "../../../../qml/Components"
3143
19
import Ubuntu.Components 0.1
19
import Ubuntu.Components 1.3
3144
20
import Ubuntu.Gestures 0.1
20
import Ubuntu.Gestures 0.1
3145
21
21
3146
22
Item {
22
Item {
3147
23
23
3148
=== modified file 'tests/qmltests/Components/tst_DragHandle/HorizontalShowable.qml'
3149
--- tests/qmltests/Components/tst_DragHandle/HorizontalShowable.qml	2015-04-10 21:16:37 +0000
3150
+++ tests/qmltests/Components/tst_DragHandle/HorizontalShowable.qml	2015-07-22 14:32:16 +0000
3151
@@ -16,7 +16,7 @@
3152
16
16
3153
17
import QtQuick 2.0
17
import QtQuick 2.0
3154
18
import "../../../../qml/Components"
18
import "../../../../qml/Components"
3156
19
import Ubuntu.Components 0.1
19
import Ubuntu.Components 1.3
3157
20
import Ubuntu.Gestures 0.1
20
import Ubuntu.Gestures 0.1
3158
21
21
3159
22
Showable {
22
Showable {
3160
23
23
3161
=== modified file 'tests/qmltests/Components/tst_DragHandle/VerticalShowable.qml'
3162
--- tests/qmltests/Components/tst_DragHandle/VerticalShowable.qml	2015-04-10 21:16:37 +0000
3163
+++ tests/qmltests/Components/tst_DragHandle/VerticalShowable.qml	2015-07-22 14:32:16 +0000
3164
@@ -16,7 +16,7 @@
3165
16
16
3166
17
import QtQuick 2.0
17
import QtQuick 2.0
3167
18
import "../../../../qml/Components"
18
import "../../../../qml/Components"
3169
19
import Ubuntu.Components 0.1
19
import Ubuntu.Components 1.3
3170
20
import Ubuntu.Gestures 0.1
20
import Ubuntu.Gestures 0.1
3171
21
21
3172
22
Showable {
22
Showable {
3173
23
23
3174
=== modified file 'tests/qmltests/Components/tst_LazyImage.qml'
3175
--- tests/qmltests/Components/tst_LazyImage.qml	2014-08-13 10:29:21 +0000
3176
+++ tests/qmltests/Components/tst_LazyImage.qml	2015-07-22 14:32:16 +0000
3177
@@ -1,5 +1,5 @@
3178
1
/*
1
/*
3180
2
 * Copyright 2013 Canonical Ltd.
2
 * Copyright 2013,2015 Canonical Ltd.
3181
3
 *
3
 *
3182
4
 * This program is free software; you can redistribute it and/or modify
4
 * This program is free software; you can redistribute it and/or modify
3183
5
 * it under the terms of the GNU General Public License as published by
5
 * it under the terms of the GNU General Public License as published by
3184
@@ -17,7 +17,7 @@
3185
17
import QtQuick 2.0
17
import QtQuick 2.0
3186
18
import QtTest 1.0
18
import QtTest 1.0
3187
19
import "../../../qml/Components"
19
import "../../../qml/Components"
3189
20
import Ubuntu.Components 0.1
20
import Ubuntu.Components 1.3
3190
21
import Unity.Test 0.1 as UT
21
import Unity.Test 0.1 as UT
3191
22
import "tst_LazyImage"
22
import "tst_LazyImage"
3192
23
23
3193
@@ -32,7 +32,7 @@
3194
32
            rightMargin: 2 * parent.width / 3
32
            rightMargin: 2 * parent.width / 3
3195
33
        }
33
        }
3196
34
34
3198
35
        color: Theme.palette.normal.baseText
35
        color: theme.palette.normal.baseText
3199
36
36
3200
37
        Column {
37
        Column {
3201
38
            anchors { fill: parent; margins: units.gu(5) }
38
            anchors { fill: parent; margins: units.gu(5) }
3202
39
39
3203
=== modified file 'tests/qmltests/Components/tst_LazyImage/ImageControls.qml'
3204
--- tests/qmltests/Components/tst_LazyImage/ImageControls.qml	2013-12-17 16:04:47 +0000
3205
+++ tests/qmltests/Components/tst_LazyImage/ImageControls.qml	2015-07-22 14:32:16 +0000
3206
@@ -15,7 +15,7 @@
3207
15
 */
15
 */
3208
16
16
3209
17
import QtQuick 2.0
17
import QtQuick 2.0
3211
18
import Ubuntu.Components 0.1
18
import Ubuntu.Components 1.3
3212
19
import "../../../../qml/Components"
19
import "../../../../qml/Components"
3213
20
20
3214
21
Row {
21
Row {
3215
22
22
3216
=== modified file 'tests/qmltests/Components/tst_Lockscreen.qml'
3217
--- tests/qmltests/Components/tst_Lockscreen.qml	2015-03-18 12:32:08 +0000
3218
+++ tests/qmltests/Components/tst_Lockscreen.qml	2015-07-22 14:32:16 +0000
3219
@@ -18,7 +18,7 @@
3220
18
import QtTest 1.0
18
import QtTest 1.0
3221
19
import ".."
19
import ".."
3222
20
import "../../../qml/Components"
20
import "../../../qml/Components"
3224
21
import Ubuntu.Components 0.1
21
import Ubuntu.Components 1.3
3225
22
import Unity.Test 0.1 as UT
22
import Unity.Test 0.1 as UT
3226
23
23
3227
24
Rectangle {
24
Rectangle {
3228
25
25
3229
=== modified file 'tests/qmltests/Components/tst_Rating.qml'
3230
--- tests/qmltests/Components/tst_Rating.qml	2014-02-13 17:00:06 +0000
3231
+++ tests/qmltests/Components/tst_Rating.qml	2015-07-22 14:32:16 +0000
3232
@@ -1,5 +1,5 @@
3233
1
/*
1
/*
3235
2
 * Copyright 2013 Canonical Ltd.
2
 * Copyright 2013,2015 Canonical Ltd.
3236
3
 *
3
 *
3237
4
 * This program is free software; you can redistribute it and/or modify
4
 * This program is free software; you can redistribute it and/or modify
3238
5
 * it under the terms of the GNU General Public License as published by
5
 * it under the terms of the GNU General Public License as published by
3239
@@ -17,14 +17,14 @@
3240
17
import QtQuick 2.0
17
import QtQuick 2.0
3241
18
import QtTest 1.0
18
import QtTest 1.0
3242
19
import "../../../qml/Components"
19
import "../../../qml/Components"
3244
20
import Ubuntu.Components 0.1
20
import Ubuntu.Components 1.3
3245
21
import Unity.Test 0.1 as UT
21
import Unity.Test 0.1 as UT
3246
22
22
3247
23
Rectangle {
23
Rectangle {
3248
24
    id: root
24
    id: root
3249
25
    width: units.gu(40)
25
    width: units.gu(40)
3250
26
    height: units.gu(10)
26
    height: units.gu(10)
3252
27
    color: Theme.palette.selected.background
27
    color: theme.palette.selected.background
3253
28
28
3254
29
    Rating {
29
    Rating {
3255
30
        id: rating
30
        id: rating
3256
31
31
3257
=== modified file 'tests/qmltests/Components/tst_ResponsiveGridView.qml'
3258
--- tests/qmltests/Components/tst_ResponsiveGridView.qml	2014-01-27 18:03:45 +0000
3259
+++ tests/qmltests/Components/tst_ResponsiveGridView.qml	2015-07-22 14:32:16 +0000
3260
@@ -18,8 +18,8 @@
3261
18
import QtTest 1.0
18
import QtTest 1.0
3262
19
import ".."
19
import ".."
3263
20
import "../../../qml/Components"
20
import "../../../qml/Components"
3266
21
import Ubuntu.Components.ListItems 0.1 as ListItem
21
import Ubuntu.Components.ListItems 1.3 as ListItem
3267
22
import Ubuntu.Components 0.1
22
import Ubuntu.Components 1.3
3268
23
import Unity.Test 0.1 as UT
23
import Unity.Test 0.1 as UT
3269
24
24
3270
25
Item {
25
Item {
3271
26
26
3272
=== modified file 'tests/qmltests/Components/tst_ResponsiveVerticalJournal.qml'
3273
--- tests/qmltests/Components/tst_ResponsiveVerticalJournal.qml	2014-12-19 14:51:35 +0000
3274
+++ tests/qmltests/Components/tst_ResponsiveVerticalJournal.qml	2015-07-22 14:32:16 +0000
3275
@@ -18,8 +18,8 @@
3276
18
import QtTest 1.0
18
import QtTest 1.0
3277
19
import ".."
19
import ".."
3278
20
import "../../../qml/Components"
20
import "../../../qml/Components"
3281
21
import Ubuntu.Components.ListItems 0.1 as ListItem
21
import Ubuntu.Components.ListItems 1.3 as ListItem
3282
22
import Ubuntu.Components 0.1
22
import Ubuntu.Components 1.3
3283
23
import Utils 0.1
23
import Utils 0.1
3284
24
import Unity.Test 0.1 as UT
24
import Unity.Test 0.1 as UT
3285
25
25
3286
26
26
3287
=== modified file 'tests/qmltests/Components/tst_Showable.qml'
3288
--- tests/qmltests/Components/tst_Showable.qml	2015-04-10 15:10:51 +0000
3289
+++ tests/qmltests/Components/tst_Showable.qml	2015-07-22 14:32:16 +0000
3290
@@ -16,7 +16,7 @@
3291
16
16
3292
17
import QtQuick 2.0
17
import QtQuick 2.0
3293
18
import QtTest 1.0
18
import QtTest 1.0
3295
19
import Ubuntu.Components 0.1
19
import Ubuntu.Components 1.3
3296
20
import Unity.Test 0.1 as UT
20
import Unity.Test 0.1 as UT
3297
21
import ".."
21
import ".."
3298
22
import "../../../qml/Components"
22
import "../../../qml/Components"
3299
23
23
3300
=== modified file 'tests/qmltests/Dash/Previews/tst_Preview.qml'
3301
--- tests/qmltests/Dash/Previews/tst_Preview.qml	2015-03-12 16:08:14 +0000
3302
+++ tests/qmltests/Dash/Previews/tst_Preview.qml	2015-07-22 14:32:16 +0000
3303
@@ -1,5 +1,5 @@
3304
1
/*
1
/*
3306
2
 * Copyright 2014 Canonical Ltd.
2
 * Copyright 2014,2015 Canonical Ltd.
3307
3
 *
3
 *
3308
4
 * This program is free software; you can redistribute it and/or modify
4
 * This program is free software; you can redistribute it and/or modify
3309
5
 * it under the terms of the GNU General Public License as published by
5
 * it under the terms of the GNU General Public License as published by
3310
@@ -24,7 +24,7 @@
3311
24
    id: root
24
    id: root
3312
25
    width: units.gu(60)
25
    width: units.gu(60)
3313
26
    height: units.gu(60)
26
    height: units.gu(60)
3315
27
    color: Theme.palette.selected.background
27
    color: theme.palette.selected.background
3316
28
28
3317
29
    Item {
29
    Item {
3318
30
        id: shell
30
        id: shell
3319
31
31
3320
=== modified file 'tests/qmltests/Dash/Previews/tst_PreviewActions.qml'
3321
--- tests/qmltests/Dash/Previews/tst_PreviewActions.qml	2015-01-09 09:15:45 +0000
3322
+++ tests/qmltests/Dash/Previews/tst_PreviewActions.qml	2015-07-22 14:32:16 +0000
3323
@@ -18,7 +18,7 @@
3324
18
import QtTest 1.0
18
import QtTest 1.0
3325
19
import "../../../../qml/Dash/Previews"
19
import "../../../../qml/Dash/Previews"
3326
20
import Unity.Test 0.1 as UT
20
import Unity.Test 0.1 as UT
3328
21
import Ubuntu.Components 0.1
21
import Ubuntu.Components 1.3
3329
22
22
3330
23
23
3331
24
Rectangle {
24
Rectangle {
3332
25
25
3333
=== modified file 'tests/qmltests/Dash/Previews/tst_PreviewAudioPlayback.qml'
3334
--- tests/qmltests/Dash/Previews/tst_PreviewAudioPlayback.qml	2015-01-09 09:15:45 +0000
3335
+++ tests/qmltests/Dash/Previews/tst_PreviewAudioPlayback.qml	2015-07-22 14:32:16 +0000
3336
@@ -1,5 +1,5 @@
3337
1
/*
1
/*
3339
2
 * Copyright 2014 Canonical Ltd.
2
 * Copyright 2014,2015 Canonical Ltd.
3340
3
 *
3
 *
3341
4
 * This program is free software; you can redistribute it and/or modify
4
 * This program is free software; you can redistribute it and/or modify
3342
5
 * it under the terms of the GNU General Public License as published by
5
 * it under the terms of the GNU General Public License as published by
3343
@@ -16,7 +16,7 @@
3344
16
16
3345
17
import QtQuick 2.0
17
import QtQuick 2.0
3346
18
import QtTest 1.0
18
import QtTest 1.0
3348
19
import Ubuntu.Components 0.1
19
import Ubuntu.Components 1.3
3349
20
import "../../../../qml/Dash/Previews"
20
import "../../../../qml/Dash/Previews"
3350
21
import Unity.Test 0.1 as UT
21
import Unity.Test 0.1 as UT
3351
22
import QtMultimedia 5.0
22
import QtMultimedia 5.0
3352
@@ -25,7 +25,7 @@
3353
25
    id: root
25
    id: root
3354
26
    width: units.gu(60)
26
    width: units.gu(60)
3355
27
    height: units.gu(80)
27
    height: units.gu(80)
3357
28
    color: Theme.palette.selected.background
28
    color: theme.palette.selected.background
3358
29
29
3359
30
    property var tracksModel0: {
30
    property var tracksModel0: {
3360
31
        "tracks": [ ]
31
        "tracks": [ ]
3361
32
32
3362
=== modified file 'tests/qmltests/Dash/Previews/tst_PreviewComment.qml'
3363
--- tests/qmltests/Dash/Previews/tst_PreviewComment.qml	2015-07-01 15:48:29 +0000
3364
+++ tests/qmltests/Dash/Previews/tst_PreviewComment.qml	2015-07-22 14:32:16 +0000
3365
@@ -16,7 +16,7 @@
3366
16
16
3367
17
import QtQuick 2.0
17
import QtQuick 2.0
3368
18
import QtTest 1.0
18
import QtTest 1.0
3370
19
import Ubuntu.Components 1.1
19
import Ubuntu.Components 1.3
3371
20
import "../../../../qml/Dash/Previews"
20
import "../../../../qml/Dash/Previews"
3372
21
import Unity.Test 0.1 as UT
21
import Unity.Test 0.1 as UT
3373
22
22
3374
23
23
3375
=== modified file 'tests/qmltests/Dash/Previews/tst_PreviewCommentInput.qml'
3376
--- tests/qmltests/Dash/Previews/tst_PreviewCommentInput.qml	2015-07-06 11:15:25 +0000
3377
+++ tests/qmltests/Dash/Previews/tst_PreviewCommentInput.qml	2015-07-22 14:32:16 +0000
3378
@@ -16,7 +16,7 @@
3379
16
16
3380
17
import QtQuick 2.0
17
import QtQuick 2.0
3381
18
import QtTest 1.0
18
import QtTest 1.0
3383
19
import Ubuntu.Components 1.1
19
import Ubuntu.Components 1.3
3384
20
import "../../../../qml/Dash/Previews"
20
import "../../../../qml/Dash/Previews"
3385
21
import Unity.Test 0.1 as UT
21
import Unity.Test 0.1 as UT
3386
22
22
3387
23
23
3388
=== modified file 'tests/qmltests/Dash/Previews/tst_PreviewExpandable.qml'
3389
--- tests/qmltests/Dash/Previews/tst_PreviewExpandable.qml	2015-01-09 09:15:45 +0000
3390
+++ tests/qmltests/Dash/Previews/tst_PreviewExpandable.qml	2015-07-22 14:32:16 +0000
3391
@@ -1,5 +1,5 @@
3392
1
/*
1
/*
3394
2
 * Copyright 2014 Canonical Ltd.
2
 * Copyright 2014,2015 Canonical Ltd.
3395
3
 *
3
 *
3396
4
 * This program is free software; you can redistribute it and/or modify
4
 * This program is free software; you can redistribute it and/or modify
3397
5
 * it under the terms of the GNU General Public License as published by
5
 * it under the terms of the GNU General Public License as published by
3398
@@ -16,7 +16,7 @@
3399
16
16
3400
17
import QtQuick 2.0
17
import QtQuick 2.0
3401
18
import QtTest 1.0
18
import QtTest 1.0
3403
19
import Ubuntu.Components 0.1
19
import Ubuntu.Components 1.3
3404
20
import "../../../../qml/Dash/Previews"
20
import "../../../../qml/Dash/Previews"
3405
21
import Unity.Test 0.1 as UT
21
import Unity.Test 0.1 as UT
3406
22
22
3407
@@ -24,7 +24,7 @@
3408
24
    id: root
24
    id: root
3409
25
    width: units.gu(40)
25
    width: units.gu(40)
3410
26
    height: units.gu(80)
26
    height: units.gu(80)
3412
27
    color: Theme.palette.selected.background
27
    color: theme.palette.selected.background
3413
28
28
3414
29
    property string longText: "Lorem ipsum dolor sit amet, consectetur adipiscing elit.\nPhasellus a mi vitae augue rhoncus lobortis ut rutrum metus.\nCurabitur tortor leo, tristique sed mollis quis, condimentum venenatis nibh.\nLorem ipsum dolor sit amet, consectetur adipiscing elit.\nPhasellus a mi vitae augue rhoncus lobortis ut rutrum metus.\nCurabitur tortor leo, tristique sed mollis quis, condimentum venenatis nibh."
29
    property string longText: "Lorem ipsum dolor sit amet, consectetur adipiscing elit.\nPhasellus a mi vitae augue rhoncus lobortis ut rutrum metus.\nCurabitur tortor leo, tristique sed mollis quis, condimentum venenatis nibh.\nLorem ipsum dolor sit amet, consectetur adipiscing elit.\nPhasellus a mi vitae augue rhoncus lobortis ut rutrum metus.\nCurabitur tortor leo, tristique sed mollis quis, condimentum venenatis nibh."
3415
30
    property string longText2: "This is a very very very long text. 1 This is a very very very long text. 2 This is a very very very long text. 3 This is a very very very long text. 4 This is a very very very long text. 5 This is a very very very long text. 6 This is a very very very long text. 7 This is a very very very long text. 8 This is a very very very long text. 9 This is a very very very long text. 10 This is a very very very long text. 11 This is a very very very long text."
30
    property string longText2: "This is a very very very long text. 1 This is a very very very long text. 2 This is a very very very long text. 3 This is a very very very long text. 4 This is a very very very long text. 5 This is a very very very long text. 6 This is a very very very long text. 7 This is a very very very long text. 8 This is a very very very long text. 9 This is a very very very long text. 10 This is a very very very long text. 11 This is a very very very long text."
3416
31
31
3417
=== modified file 'tests/qmltests/Dash/Previews/tst_PreviewPayments.qml'
3418
--- tests/qmltests/Dash/Previews/tst_PreviewPayments.qml	2015-01-09 09:40:52 +0000
3419
+++ tests/qmltests/Dash/Previews/tst_PreviewPayments.qml	2015-07-22 14:32:16 +0000
3420
@@ -18,7 +18,7 @@
3421
18
import QtTest 1.0
18
import QtTest 1.0
3422
19
import "../../../../qml/Dash/Previews"
19
import "../../../../qml/Dash/Previews"
3423
20
import Unity.Test 0.1 as UT
20
import Unity.Test 0.1 as UT
3425
21
import Ubuntu.Components 0.1
21
import Ubuntu.Components 1.3
3426
22
22
3427
23
Rectangle {
23
Rectangle {
3428
24
    id: root
24
    id: root
3429
25
25
3430
=== modified file 'tests/qmltests/Dash/Previews/tst_PreviewProgress.qml'
3431
--- tests/qmltests/Dash/Previews/tst_PreviewProgress.qml	2014-02-12 16:28:08 +0000
3432
+++ tests/qmltests/Dash/Previews/tst_PreviewProgress.qml	2015-07-22 14:32:16 +0000
3433
@@ -18,7 +18,7 @@
3434
18
import QtTest 1.0
18
import QtTest 1.0
3435
19
import "../../../../qml/Dash/Previews"
19
import "../../../../qml/Dash/Previews"
3436
20
import Unity.Test 0.1 as UT
20
import Unity.Test 0.1 as UT
3438
21
import Ubuntu.Components 0.1
21
import Ubuntu.Components 1.3
3439
22
22
3440
23
Rectangle {
23
Rectangle {
3441
24
    id: root
24
    id: root
3442
25
25
3443
=== modified file 'tests/qmltests/Dash/Previews/tst_PreviewRatingDisplay.qml'
3444
--- tests/qmltests/Dash/Previews/tst_PreviewRatingDisplay.qml	2015-01-09 09:15:45 +0000
3445
+++ tests/qmltests/Dash/Previews/tst_PreviewRatingDisplay.qml	2015-07-22 14:32:16 +0000
3446
@@ -1,5 +1,5 @@
3447
1
/*
1
/*
3449
2
 * Copyright 2014 Canonical Ltd.
2
 * Copyright 2014,2015 Canonical Ltd.
3450
3
 *
3
 *
3451
4
 * This program is free software; you can redistribute it and/or modify
4
 * This program is free software; you can redistribute it and/or modify
3452
5
 * it under the terms of the GNU General Public License as published by
5
 * it under the terms of the GNU General Public License as published by
3453
@@ -16,7 +16,7 @@
3454
16
16
3455
17
import QtQuick 2.0
17
import QtQuick 2.0
3456
18
import QtTest 1.0
18
import QtTest 1.0
3458
19
import Ubuntu.Components 0.1
19
import Ubuntu.Components 1.3
3459
20
import "../../../../qml/Dash/Previews"
20
import "../../../../qml/Dash/Previews"
3460
21
import Unity.Test 0.1 as UT
21
import Unity.Test 0.1 as UT
3461
22
22
3462
@@ -24,7 +24,7 @@
3463
24
    id: root
24
    id: root
3464
25
    width: units.gu(40)
25
    width: units.gu(40)
3465
26
    height: units.gu(80)
26
    height: units.gu(80)
3467
27
    color: Theme.palette.selected.background
27
    color: theme.palette.selected.background
3468
28
28
3469
29
    property var reviewsModel0: {
29
    property var reviewsModel0: {
3470
30
        "reviews": [ ]
30
        "reviews": [ ]
3471
31
31
3472
=== modified file 'tests/qmltests/Dash/Previews/tst_PreviewRatingEdit.qml'
3473
--- tests/qmltests/Dash/Previews/tst_PreviewRatingEdit.qml	2015-05-08 13:12:02 +0000
3474
+++ tests/qmltests/Dash/Previews/tst_PreviewRatingEdit.qml	2015-07-22 14:32:16 +0000
3475
@@ -1,5 +1,5 @@
3476
1
/*
1
/*
3478
2
 * Copyright 2014 Canonical Ltd.
2
 * Copyright 2014,2015 Canonical Ltd.
3479
3
 *
3
 *
3480
4
 * This program is free software; you can redistribute it and/or modify
4
 * This program is free software; you can redistribute it and/or modify
3481
5
 * it under the terms of the GNU General Public License as published by
5
 * it under the terms of the GNU General Public License as published by
3482
@@ -16,7 +16,7 @@
3483
16
16
3484
17
import QtQuick 2.0
17
import QtQuick 2.0
3485
18
import QtTest 1.0
18
import QtTest 1.0
3487
19
import Ubuntu.Components 0.1
19
import Ubuntu.Components 1.3
3488
20
import "../../../../qml/Dash/Previews"
20
import "../../../../qml/Dash/Previews"
3489
21
import Unity.Test 0.1 as UT
21
import Unity.Test 0.1 as UT
3490
22
22
3491
@@ -24,7 +24,7 @@
3492
24
    id: root
24
    id: root
3493
25
    width: units.gu(40)
25
    width: units.gu(40)
3494
26
    height: units.gu(80)
26
    height: units.gu(80)
3496
27
    color: Theme.palette.selected.background
27
    color: theme.palette.selected.background
3497
28
28
3498
29
    property var widgetData0: { "visible": "both", "required": "both", author: "Some dude", rating: 4.5, review: "Very cool app" }
29
    property var widgetData0: { "visible": "both", "required": "both", author: "Some dude", rating: 4.5, review: "Very cool app" }
3499
30
30
3500
31
31
3501
=== modified file 'tests/qmltests/Dash/Previews/tst_PreviewRatingInput.qml'
3502
--- tests/qmltests/Dash/Previews/tst_PreviewRatingInput.qml	2015-02-17 15:06:33 +0000
3503
+++ tests/qmltests/Dash/Previews/tst_PreviewRatingInput.qml	2015-07-22 14:32:16 +0000
3504
@@ -1,5 +1,5 @@
3505
1
/*
1
/*
3507
2
 * Copyright 2014 Canonical Ltd.
2
 * Copyright 2014,2015 Canonical Ltd.
3508
3
 *
3
 *
3509
4
 * This program is free software; you can redistribute it and/or modify
4
 * This program is free software; you can redistribute it and/or modify
3510
5
 * it under the terms of the GNU General Public License as published by
5
 * it under the terms of the GNU General Public License as published by
3511
@@ -16,7 +16,7 @@
3512
16
16
3513
17
import QtQuick 2.0
17
import QtQuick 2.0
3514
18
import QtTest 1.0
18
import QtTest 1.0
3516
19
import Ubuntu.Components 0.1
19
import Ubuntu.Components 1.3
3517
20
import "../../../../qml/Dash/Previews"
20
import "../../../../qml/Dash/Previews"
3518
21
import Unity.Test 0.1 as UT
21
import Unity.Test 0.1 as UT
3519
22
22
3520
@@ -24,7 +24,7 @@
3521
24
    id: root
24
    id: root
3522
25
    width: units.gu(40)
25
    width: units.gu(40)
3523
26
    height: units.gu(80)
26
    height: units.gu(80)
3525
27
    color: Theme.palette.selected.background
27
    color: theme.palette.selected.background
3526
28
28
3527
29
    property real validInputRating: 1
29
    property real validInputRating: 1
3528
30
    property real invalidInputRating: -1
30
    property real invalidInputRating: -1
3529
31
31
3530
=== modified file 'tests/qmltests/Dash/Previews/tst_PreviewTable.qml'
3531
--- tests/qmltests/Dash/Previews/tst_PreviewTable.qml	2015-04-13 11:08:53 +0000
3532
+++ tests/qmltests/Dash/Previews/tst_PreviewTable.qml	2015-07-22 14:32:16 +0000
3533
@@ -1,5 +1,5 @@
3534
1
/*
1
/*
3536
2
 * Copyright 2014 Canonical Ltd.
2
 * Copyright 2014,2015 Canonical Ltd.
3537
3
 *
3
 *
3538
4
 * This program is free software; you can redistribute it and/or modify
4
 * This program is free software; you can redistribute it and/or modify
3539
5
 * it under the terms of the GNU General Public License as published by
5
 * it under the terms of the GNU General Public License as published by
3540
@@ -16,7 +16,7 @@
3541
16
16
3542
17
import QtQuick 2.0
17
import QtQuick 2.0
3543
18
import QtTest 1.0
18
import QtTest 1.0
3545
19
import Ubuntu.Components 0.1
19
import Ubuntu.Components 1.3
3546
20
import "../../../../qml/Dash/Previews"
20
import "../../../../qml/Dash/Previews"
3547
21
import Unity.Test 0.1 as UT
21
import Unity.Test 0.1 as UT
3548
22
22
3549
@@ -24,7 +24,7 @@
3550
24
    id: root
24
    id: root
3551
25
    width: units.gu(40)
25
    width: units.gu(40)
3552
26
    height: units.gu(80)
26
    height: units.gu(80)
3554
27
    color: Theme.palette.selected.background
27
    color: theme.palette.selected.background
3555
28
28
3556
29
    property var widgetDataComplete: {
29
    property var widgetDataComplete: {
3557
30
        "title": "Title here longa long long long long long long long long long long",
30
        "title": "Title here longa long long long long long long long long long long",
3558
31
31
3559
=== modified file 'tests/qmltests/Dash/Previews/tst_PreviewTextSummary.qml'
3560
--- tests/qmltests/Dash/Previews/tst_PreviewTextSummary.qml	2014-08-01 09:55:04 +0000
3561
+++ tests/qmltests/Dash/Previews/tst_PreviewTextSummary.qml	2015-07-22 14:32:16 +0000
3562
@@ -1,5 +1,5 @@
3563
1
/*
1
/*
3565
2
 * Copyright 2014 Canonical Ltd.
2
 * Copyright 2014,2015 Canonical Ltd.
3566
3
 *
3
 *
3567
4
 * This program is free software; you can redistribute it and/or modify
4
 * This program is free software; you can redistribute it and/or modify
3568
5
 * it under the terms of the GNU General Public License as published by
5
 * it under the terms of the GNU General Public License as published by
3569
@@ -16,7 +16,7 @@
3570
16
16
3571
17
import QtQuick 2.0
17
import QtQuick 2.0
3572
18
import QtTest 1.0
18
import QtTest 1.0
3574
19
import Ubuntu.Components 0.1
19
import Ubuntu.Components 1.3
3575
20
import "../../../../qml/Dash/Previews"
20
import "../../../../qml/Dash/Previews"
3576
21
import Unity.Test 0.1 as UT
21
import Unity.Test 0.1 as UT
3577
22
22
3578
@@ -24,7 +24,7 @@
3579
24
    id: root
24
    id: root
3580
25
    width: units.gu(40)
25
    width: units.gu(40)
3581
26
    height: units.gu(80)
26
    height: units.gu(80)
3583
27
    color: Theme.palette.selected.background
27
    color: theme.palette.selected.background
3584
28
28
3585
29
    property var widgetDataComplete: {
29
    property var widgetDataComplete: {
3586
30
        "title": "Title here",
30
        "title": "Title here",
3587
31
31
3588
=== modified file 'tests/qmltests/Dash/Previews/tst_PreviewWidgetFactory.qml'
3589
--- tests/qmltests/Dash/Previews/tst_PreviewWidgetFactory.qml	2015-07-01 15:48:29 +0000
3590
+++ tests/qmltests/Dash/Previews/tst_PreviewWidgetFactory.qml	2015-07-22 14:32:16 +0000
3591
@@ -1,5 +1,5 @@
3592
1
/*
1
/*
3594
2
 * Copyright 2014 Canonical Ltd.
2
 * Copyright 2014,2015 Canonical Ltd.
3595
3
 *
3
 *
3596
4
 * This program is free software; you can redistribute it and/or modify
4
 * This program is free software; you can redistribute it and/or modify
3597
5
 * it under the terms of the GNU General Public License as published by
5
 * it under the terms of the GNU General Public License as published by
3598
@@ -23,7 +23,7 @@
3599
23
    id: root
23
    id: root
3600
24
    width: units.gu(60)
24
    width: units.gu(60)
3601
25
    height: units.gu(80)
25
    height: units.gu(80)
3603
26
    color: Theme.palette.selected.background
26
    color: theme.palette.selected.background
3604
27
27
3605
28
    PreviewWidgetFactory {
28
    PreviewWidgetFactory {
3606
29
        id: factory
29
        id: factory
3607
30
30
3608
=== modified file 'tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingBoolean.qml'
3609
--- tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingBoolean.qml	2015-01-09 09:15:45 +0000
3610
+++ tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingBoolean.qml	2015-07-22 14:32:16 +0000
3611
@@ -15,7 +15,7 @@
3612
15
 */
15
 */
3613
16
16
3614
17
import QtQuick 2.0
17
import QtQuick 2.0
3616
18
import Ubuntu.Components 1.1
18
import Ubuntu.Components 1.3
3617
19
import QtTest 1.0
19
import QtTest 1.0
3618
20
import "../../../../qml/Dash/ScopeSettings"
20
import "../../../../qml/Dash/ScopeSettings"
3619
21
import Unity.Test 0.1 as UT
21
import Unity.Test 0.1 as UT
3620
22
22
3621
=== modified file 'tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingList.qml'
3622
--- tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingList.qml	2014-08-27 08:07:33 +0000
3623
+++ tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingList.qml	2015-07-22 14:32:16 +0000
3624
@@ -15,7 +15,7 @@
3625
15
 */
15
 */
3626
16
16
3627
17
import QtQuick 2.0
17
import QtQuick 2.0
3629
18
import Ubuntu.Components 1.1
18
import Ubuntu.Components 1.3
3630
19
import QtTest 1.0
19
import QtTest 1.0
3631
20
import "../../../../qml/Dash/ScopeSettings"
20
import "../../../../qml/Dash/ScopeSettings"
3632
21
import Unity.Test 0.1 as UT
21
import Unity.Test 0.1 as UT
3633
22
22
3634
=== modified file 'tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingNumber.qml'
3635
--- tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingNumber.qml	2015-01-09 09:15:45 +0000
3636
+++ tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingNumber.qml	2015-07-22 14:32:16 +0000
3637
@@ -15,7 +15,7 @@
3638
15
 */
15
 */
3639
16
16
3640
17
import QtQuick 2.0
17
import QtQuick 2.0
3642
18
import Ubuntu.Components 1.1
18
import Ubuntu.Components 1.3
3643
19
import QtTest 1.0
19
import QtTest 1.0
3644
20
import "../../../../qml/Dash/ScopeSettings"
20
import "../../../../qml/Dash/ScopeSettings"
3645
21
import Unity.Test 0.1 as UT
21
import Unity.Test 0.1 as UT
3646
22
22
3647
=== modified file 'tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingString.qml'
3648
--- tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingString.qml	2015-01-09 09:15:45 +0000
3649
+++ tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingString.qml	2015-07-22 14:32:16 +0000
3650
@@ -15,7 +15,7 @@
3651
15
 */
15
 */
3652
16
16
3653
17
import QtQuick 2.0
17
import QtQuick 2.0
3655
18
import Ubuntu.Components 1.1
18
import Ubuntu.Components 1.3
3656
19
import QtTest 1.0
19
import QtTest 1.0
3657
20
import "../../../../qml/Dash/ScopeSettings"
20
import "../../../../qml/Dash/ScopeSettings"
3658
21
import Unity.Test 0.1 as UT
21
import Unity.Test 0.1 as UT
3659
22
22
3660
=== modified file 'tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingsWidgetFactory.qml'
3661
--- tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingsWidgetFactory.qml	2014-08-26 14:21:29 +0000
3662
+++ tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingsWidgetFactory.qml	2015-07-22 14:32:16 +0000
3663
@@ -15,7 +15,7 @@
3664
15
 */
15
 */
3665
16
16
3666
17
import QtQuick 2.0
17
import QtQuick 2.0
3668
18
import Ubuntu.Components 1.1
18
import Ubuntu.Components 1.3
3669
19
import QtTest 1.0
19
import QtTest 1.0
3670
20
import "../../../../qml/Dash/ScopeSettings"
20
import "../../../../qml/Dash/ScopeSettings"
3671
21
import Unity.Test 0.1 as UT
21
import Unity.Test 0.1 as UT
3672
22
22
3673
=== modified file 'tests/qmltests/Dash/tst_Card.qml'
3674
--- tests/qmltests/Dash/tst_Card.qml	2015-07-08 09:11:50 +0000
3675
+++ tests/qmltests/Dash/tst_Card.qml	2015-07-22 14:32:16 +0000
3676
@@ -1,5 +1,5 @@
3677
1
/*
1
/*
3679
2
 * Copyright (C) 2013 Canonical, Ltd.
2
 * Copyright (C) 2013,2015 Canonical, Ltd.
3680
3
 *
3
 *
3681
4
 * This program is free software; you can redistribute it and/or modify
4
 * This program is free software; you can redistribute it and/or modify
3682
5
 * it under the terms of the GNU General Public License as published by
5
 * it under the terms of the GNU General Public License as published by
3683
@@ -16,7 +16,7 @@
3684
16
16
3685
17
import QtQuick 2.0
17
import QtQuick 2.0
3686
18
import QtTest 1.0
18
import QtTest 1.0
3688
19
import Ubuntu.Components 0.1
19
import Ubuntu.Components 1.3
3689
20
import Unity.Test 0.1 as UT
20
import Unity.Test 0.1 as UT
3690
21
import "../../../qml/Dash"
21
import "../../../qml/Dash"
3691
22
import "CardHelpers.js" as Helpers
22
import "CardHelpers.js" as Helpers
3692
@@ -522,7 +522,7 @@
3693
522
522
3694
523
            background.color = data.tag;
523
            background.color = data.tag;
3695
524
524
3697
525
            var fontColor = data.dark ? Theme.palette.normal.baseText : "white";
525
            var fontColor = data.dark ? theme.palette.normal.baseText : "white";
3698
526
526
3699
527
            tryCompareFunction(function() { return Qt.colorEqual(summary.color, fontColor); }, true);
527
            tryCompareFunction(function() { return Qt.colorEqual(summary.color, fontColor); }, true);
3700
528
            tryCompareFunction(function() { return Qt.colorEqual(title.color, fontColor); }, true);
528
            tryCompareFunction(function() { return Qt.colorEqual(title.color, fontColor); }, true);
3701
529
529
3702
=== modified file 'tests/qmltests/Dash/tst_CardBenchmark.qml'
3703
--- tests/qmltests/Dash/tst_CardBenchmark.qml	2014-05-02 14:57:27 +0000
3704
+++ tests/qmltests/Dash/tst_CardBenchmark.qml	2015-07-22 14:32:16 +0000
3705
@@ -16,7 +16,7 @@
3706
16
16
3707
17
import QtQuick 2.0
17
import QtQuick 2.0
3708
18
import QtTest 1.0
18
import QtTest 1.0
3710
19
import Ubuntu.Components 0.1
19
import Ubuntu.Components 1.3
3711
20
import Unity.Test 0.1 as UT
20
import Unity.Test 0.1 as UT
3712
21
import "../../../qml/Dash"
21
import "../../../qml/Dash"
3713
22
import "CardHelpers.js" as Helpers
22
import "CardHelpers.js" as Helpers
3714
23
23
3715
=== modified file 'tests/qmltests/Dash/tst_CardTool.qml'
3716
--- tests/qmltests/Dash/tst_CardTool.qml	2015-07-08 09:00:00 +0000
3717
+++ tests/qmltests/Dash/tst_CardTool.qml	2015-07-22 14:32:16 +0000
3718
@@ -16,7 +16,7 @@
3719
16
16
3720
17
import QtQuick 2.0
17
import QtQuick 2.0
3721
18
import QtTest 1.0
18
import QtTest 1.0
3723
19
import Ubuntu.Components 0.1
19
import Ubuntu.Components 1.3
3724
20
import Unity.Test 0.1 as UT
20
import Unity.Test 0.1 as UT
3725
21
import "../../../qml/Dash"
21
import "../../../qml/Dash"
3726
22
import "CardHelpers.js" as Helpers
22
import "CardHelpers.js" as Helpers
3727
23
23
3728
=== modified file 'tests/qmltests/Dash/tst_Dash.qml'
3729
--- tests/qmltests/Dash/tst_Dash.qml	2015-03-27 12:30:24 +0000
3730
+++ tests/qmltests/Dash/tst_Dash.qml	2015-07-22 14:32:16 +0000
3731
@@ -17,7 +17,7 @@
3732
17
import QtQuick 2.0
17
import QtQuick 2.0
3733
18
import QtTest 1.0
18
import QtTest 1.0
3734
19
import "../../../qml/Dash"
19
import "../../../qml/Dash"
3736
20
import Ubuntu.Components 0.1
20
import Ubuntu.Components 1.3
3737
21
import Unity.Test 0.1 as UT
21
import Unity.Test 0.1 as UT
3738
22
22
3739
23
Item {
23
Item {
3740
@@ -319,7 +319,7 @@
3741
319
319
3742
320
            // Click on the store
320
            // Click on the store
3743
321
            var scopesListPageHeader = findChild(scopesList, "pageHeader");
321
            var scopesListPageHeader = findChild(scopesList, "pageHeader");
3745
322
            var searchButton = findChild(scopesListPageHeader, "store_header_button");
322
            var searchButton = findChild(scopesListPageHeader, "store_action_button");
3746
323
            mouseClick(searchButton);
323
            mouseClick(searchButton);
3747
324
324
3748
325
            spy.wait();
325
            spy.wait();
3749
326
326
3750
=== modified file 'tests/qmltests/Dash/tst_DashContent.qml'
3751
--- tests/qmltests/Dash/tst_DashContent.qml	2015-05-07 10:32:17 +0000
3752
+++ tests/qmltests/Dash/tst_DashContent.qml	2015-07-22 14:32:16 +0000
3753
@@ -18,7 +18,7 @@
3754
18
import QtTest 1.0
18
import QtTest 1.0
3755
19
import "../../../qml/Dash"
19
import "../../../qml/Dash"
3756
20
import "../../../qml/Components"
20
import "../../../qml/Components"
3758
21
import Ubuntu.Components 0.1
21
import Ubuntu.Components 1.3
3759
22
import Unity 0.2
22
import Unity 0.2
3760
23
import Unity.Test 0.1 as UT
23
import Unity.Test 0.1 as UT
3761
24
import Utils 0.1
24
import Utils 0.1
3762
25
25
3763
=== modified file 'tests/qmltests/Dash/tst_GenericScopeView.qml'
3764
--- tests/qmltests/Dash/tst_GenericScopeView.qml	2015-07-08 09:24:12 +0000
3765
+++ tests/qmltests/Dash/tst_GenericScopeView.qml	2015-07-22 14:32:16 +0000
3766
@@ -20,7 +20,7 @@
3767
20
import ".."
20
import ".."
3768
21
import "../../../qml/Dash"
21
import "../../../qml/Dash"
3769
22
import "../../../qml/Components"
22
import "../../../qml/Components"
3771
23
import Ubuntu.Components 1.1
23
import Ubuntu.Components 1.3
3772
24
import Unity.Test 0.1 as UT
24
import Unity.Test 0.1 as UT
3773
25
25
3774
26
Item {
26
Item {
3775
@@ -429,7 +429,7 @@
3776
429
                // open
429
                // open
3777
430
                tryCompare(testCase.subPageLoader, "open", false);
430
                tryCompare(testCase.subPageLoader, "open", false);
3778
431
                tryCompare(testCase.subPageLoader, "visible", false);
431
                tryCompare(testCase.subPageLoader, "visible", false);
3780
432
                var settings = findChild(innerHeader, "settings_header_button");
432
                var settings = findChild(innerHeader, "settings_action_button");
3781
433
                mouseClick(settings);
433
                mouseClick(settings);
3782
434
                tryCompare(testCase.subPageLoader, "open", true);
434
                tryCompare(testCase.subPageLoader, "open", true);
3783
435
                tryCompareFunction(function() { return (String(subPageLoader.source)).indexOf("ScopeSettingsPage.qml") != -1; }, true);
435
                tryCompareFunction(function() { return (String(subPageLoader.source)).indexOf("ScopeSettingsPage.qml") != -1; }, true);
3784
@@ -500,7 +500,7 @@
3785
500
                mouseClick(seeAll0);
500
                mouseClick(seeAll0);
3786
501
                verify(category0.expanded);
501
                verify(category0.expanded);
3787
502
                tryCompare(category0, "height", category0.item.expandedHeight + seeAll0.height);
502
                tryCompare(category0, "height", category0.item.expandedHeight + seeAll0.height);
3789
503
                tryCompare(genericScopeView.categoryView, "contentY", units.gu(14));
503
                tryCompare(genericScopeView.categoryView, "contentY", units.gu(13));
3790
504
504
3791
505
                scrollToEnd();
505
                scrollToEnd();
3792
506
506
3793
@@ -577,7 +577,7 @@
3794
577
                verify(innerHeader, "Could not find the inner header");
577
                verify(innerHeader, "Could not find the inner header");
3795
578
578
3796
579
                expectFail("Apps", "Click scope should not have a favorite button");
579
                expectFail("Apps", "Click scope should not have a favorite button");
3798
580
                var favoriteAction = findChild(innerHeader, "favorite_header_button");
580
                var favoriteAction = findChild(innerHeader, "favorite_action_button");
3799
581
                verify(favoriteAction, "Could not find the favorite action.");
581
                verify(favoriteAction, "Could not find the favorite action.");
3800
582
                mouseClick(favoriteAction);
582
                mouseClick(favoriteAction);
3801
583
583
3802
584
584
3803
=== modified file 'tests/qmltests/Dash/tst_PageHeader.qml'
3804
--- tests/qmltests/Dash/tst_PageHeader.qml	2015-01-09 09:15:45 +0000
3805
+++ tests/qmltests/Dash/tst_PageHeader.qml	2015-07-22 14:32:16 +0000
3806
@@ -1,5 +1,5 @@
3807
1
/*
1
/*
3809
2
 * Copyright 2013 Canonical Ltd.
2
 * Copyright 2013,2015 Canonical Ltd.
3810
3
 *
3
 *
3811
4
 * This program is free software; you can redistribute it and/or modify
4
 * This program is free software; you can redistribute it and/or modify
3812
5
 * it under the terms of the GNU General Public License as published by
5
 * it under the terms of the GNU General Public License as published by
3813
@@ -18,7 +18,7 @@
3814
18
import QtTest 1.0
18
import QtTest 1.0
3815
19
import ".."
19
import ".."
3816
20
import "../../../qml/Dash"
20
import "../../../qml/Dash"
3818
21
import Ubuntu.Components 0.1
21
import Ubuntu.Components 1.3
3819
22
import Unity 0.2
22
import Unity 0.2
3820
23
import Unity.Test 0.1 as UT
23
import Unity.Test 0.1 as UT
3821
24
24
3822
@@ -244,7 +244,7 @@
3823
244
            searchEntryEnabled: true
244
            searchEntryEnabled: true
3824
245
            title: "%^$%^%^&%^&%^$%GHR%"
245
            title: "%^$%^%^&%^&%^$%GHR%"
3825
246
            scopeStyle: QtObject {
246
            scopeStyle: QtObject {
3827
247
                readonly property color foreground: Theme.palette.normal.baseText
247
                readonly property color foreground: theme.palette.normal.baseText
3828
248
                readonly property url headerLogo: showImageCheckBox.checked ? pageHeader.titleImageSource : ""
248
                readonly property url headerLogo: showImageCheckBox.checked ? pageHeader.titleImageSource : ""
3829
249
            }
249
            }
3830
250
            showBackButton: showBackButtonCheckBox.checked
250
            showBackButton: showBackButtonCheckBox.checked
3831
251
251
3832
=== modified file 'tests/qmltests/Dash/tst_PreviewListView.qml'
3833
--- tests/qmltests/Dash/tst_PreviewListView.qml	2015-03-20 17:31:23 +0000
3834
+++ tests/qmltests/Dash/tst_PreviewListView.qml	2015-07-22 14:32:16 +0000
3835
@@ -1,5 +1,5 @@
3836
1
/*
1
/*
3838
2
 * Copyright 2014 Canonical Ltd.
2
 * Copyright 2014,2015 Canonical Ltd.
3839
3
 *
3
 *
3840
4
 * This program is free software; you can redistribute it and/or modify
4
 * This program is free software; you can redistribute it and/or modify
3841
5
 * it under the terms of the GNU General Public License as published by
5
 * it under the terms of the GNU General Public License as published by
3842
@@ -16,7 +16,7 @@
3843
16
16
3844
17
import QtQuick 2.0
17
import QtQuick 2.0
3845
18
import QtTest 1.0
18
import QtTest 1.0
3847
19
import Ubuntu.Components 1.1
19
import Ubuntu.Components 1.3
3848
20
import "../../../qml/Dash"
20
import "../../../qml/Dash"
3849
21
import Unity.Test 0.1 as UT
21
import Unity.Test 0.1 as UT
3850
22
import Unity 0.2 as Unity
22
import Unity 0.2 as Unity
3851
@@ -26,7 +26,7 @@
3852
26
    id: root
26
    id: root
3853
27
    width: units.gu(60)
27
    width: units.gu(60)
3854
28
    height: units.gu(60)
28
    height: units.gu(60)
3856
29
    color: Theme.palette.selected.background
29
    color: theme.palette.selected.background
3857
30
30
3858
31
    Unity.MockScope {
31
    Unity.MockScope {
3859
32
        id: mockScope
32
        id: mockScope
3860
33
33
3861
=== modified file 'tests/qmltests/Greeter/TestView.qml'
3862
--- tests/qmltests/Greeter/TestView.qml	2015-02-23 15:43:41 +0000
3863
+++ tests/qmltests/Greeter/TestView.qml	2015-07-22 14:32:16 +0000
3864
@@ -15,7 +15,7 @@
3865
15
 */
15
 */
3866
16
16
3867
17
import QtQuick 2.3
17
import QtQuick 2.3
3869
18
import Ubuntu.Components 1.1
18
import Ubuntu.Components 1.3
3870
19
import "../Components"
19
import "../Components"
3871
20
20
3872
21
Item {
21
Item {
3873
22
22
3874
=== modified file 'tests/qmltests/Greeter/tst_Clock.qml'
3875
--- tests/qmltests/Greeter/tst_Clock.qml	2014-10-17 14:55:35 +0000
3876
+++ tests/qmltests/Greeter/tst_Clock.qml	2015-07-22 14:32:16 +0000
3877
@@ -18,7 +18,7 @@
3878
18
import QtTest 1.0
18
import QtTest 1.0
3879
19
import ".."
19
import ".."
3880
20
import "../../../qml/Greeter"
20
import "../../../qml/Greeter"
3882
21
import Ubuntu.Components 0.1
21
import Ubuntu.Components 1.3
3883
22
import Unity.Indicators 0.1 as Indicators
22
import Unity.Indicators 0.1 as Indicators
3884
23
import Unity.Test 0.1 as UT
23
import Unity.Test 0.1 as UT
3885
24
24
3886
25
25
3887
=== modified file 'tests/qmltests/Greeter/tst_Greeter.qml'
3888
--- tests/qmltests/Greeter/tst_Greeter.qml	2015-03-02 21:34:02 +0000
3889
+++ tests/qmltests/Greeter/tst_Greeter.qml	2015-07-22 14:32:16 +0000
3890
@@ -18,7 +18,7 @@
3891
18
import QtTest 1.0
18
import QtTest 1.0
3892
19
import ".."
19
import ".."
3893
20
import "../../../qml/Greeter"
20
import "../../../qml/Greeter"
3895
21
import Ubuntu.Components 0.1
21
import Ubuntu.Components 1.3
3896
22
import AccountsService 0.1
22
import AccountsService 0.1
3897
23
import LightDM 0.1 as LightDM
23
import LightDM 0.1 as LightDM
3898
24
import Unity.Test 0.1 as UT
24
import Unity.Test 0.1 as UT
3899
25
25
3900
=== modified file 'tests/qmltests/Greeter/tst_Infographics.qml'
3901
--- tests/qmltests/Greeter/tst_Infographics.qml	2015-01-20 11:50:19 +0000
3902
+++ tests/qmltests/Greeter/tst_Infographics.qml	2015-07-22 14:32:16 +0000
3903
@@ -18,7 +18,7 @@
3904
18
import QtTest 1.0
18
import QtTest 1.0
3905
19
import ".."
19
import ".."
3906
20
import "../../../qml/Greeter"
20
import "../../../qml/Greeter"
3908
21
import Ubuntu.Components 0.1
21
import Ubuntu.Components 1.3
3909
22
import Unity.Test 0.1 as UT
22
import Unity.Test 0.1 as UT
3910
23
import LightDM 0.1 as LightDM
23
import LightDM 0.1 as LightDM
3911
24
24
3912
25
25
3913
=== modified file 'tests/qmltests/Greeter/tst_NarrowView.qml'
3914
--- tests/qmltests/Greeter/tst_NarrowView.qml	2015-02-23 15:43:41 +0000
3915
+++ tests/qmltests/Greeter/tst_NarrowView.qml	2015-07-22 14:32:16 +0000
3916
@@ -19,7 +19,7 @@
3917
19
import ".."
19
import ".."
3918
20
import "../../../qml/Greeter"
20
import "../../../qml/Greeter"
3919
21
import LightDM 0.1 as LightDM
21
import LightDM 0.1 as LightDM
3921
22
import Ubuntu.Components 0.1
22
import Ubuntu.Components 1.3
3922
23
import Unity.Test 0.1 as UT
23
import Unity.Test 0.1 as UT
3923
24
24
3924
25
Item {
25
Item {
3925
26
26
3926
=== modified file 'tests/qmltests/Greeter/tst_WideView.qml'
3927
--- tests/qmltests/Greeter/tst_WideView.qml	2015-03-10 17:59:41 +0000
3928
+++ tests/qmltests/Greeter/tst_WideView.qml	2015-07-22 14:32:16 +0000
3929
@@ -19,7 +19,7 @@
3930
19
import ".."
19
import ".."
3931
20
import "../../../qml/Greeter"
20
import "../../../qml/Greeter"
3932
21
import LightDM 0.1 as LightDM
21
import LightDM 0.1 as LightDM
3934
22
import Ubuntu.Components 0.1
22
import Ubuntu.Components 1.3
3935
23
import Unity.Test 0.1 as UT
23
import Unity.Test 0.1 as UT
3936
24
24
3937
25
Item {
25
Item {
3938
26
26
3939
=== modified file 'tests/qmltests/Launcher/tst_Launcher.qml'
3940
--- tests/qmltests/Launcher/tst_Launcher.qml	2015-04-24 09:53:37 +0000
3941
+++ tests/qmltests/Launcher/tst_Launcher.qml	2015-07-22 14:32:16 +0000
3942
@@ -18,7 +18,7 @@
3943
18
import QtQuick.Layouts 1.1
18
import QtQuick.Layouts 1.1
3944
19
import QtTest 1.0
19
import QtTest 1.0
3945
20
import Unity.Test 0.1
20
import Unity.Test 0.1
3947
21
import Ubuntu.Components 1.1
21
import Ubuntu.Components 1.3
3948
22
import ".."
22
import ".."
3949
23
import "../../../qml/Launcher"
23
import "../../../qml/Launcher"
3950
24
import Unity.Launcher 0.1
24
import Unity.Launcher 0.1
3951
25
25
3952
=== modified file 'tests/qmltests/Notifications/tst_Notifications.qml'
3953
--- tests/qmltests/Notifications/tst_Notifications.qml	2015-02-13 11:40:07 +0000
3954
+++ tests/qmltests/Notifications/tst_Notifications.qml	2015-07-22 14:32:16 +0000
3955
@@ -21,7 +21,7 @@
3956
21
import QtTest 1.0
21
import QtTest 1.0
3957
22
import ".."
22
import ".."
3958
23
import "../../../qml/Notifications"
23
import "../../../qml/Notifications"
3960
24
import Ubuntu.Components 0.1
24
import Ubuntu.Components 1.3
3961
25
import Unity.Test 0.1
25
import Unity.Test 0.1
3962
26
import Unity.Notifications 1.0
26
import Unity.Notifications 1.0
3963
27
import QtMultimedia 5.0
27
import QtMultimedia 5.0
3964
28
28
3965
=== modified file 'tests/qmltests/Notifications/tst_OptionToggle.qml'
3966
--- tests/qmltests/Notifications/tst_OptionToggle.qml	2015-01-26 14:25:29 +0000
3967
+++ tests/qmltests/Notifications/tst_OptionToggle.qml	2015-07-22 14:32:16 +0000
3968
@@ -21,7 +21,7 @@
3969
21
import QtTest 1.0
21
import QtTest 1.0
3970
22
import ".."
22
import ".."
3971
23
import "../../../qml/Notifications"
23
import "../../../qml/Notifications"
3973
24
import Ubuntu.Components 0.1
24
import Ubuntu.Components 1.3
3974
25
import Unity.Test 0.1
25
import Unity.Test 0.1
3975
26
import Unity.Notifications 1.0
26
import Unity.Notifications 1.0
3976
27
import QtMultimedia 5.0
27
import QtMultimedia 5.0
3977
28
28
3978
=== modified file 'tests/qmltests/Notifications/tst_SwipeToAct.qml'
3979
--- tests/qmltests/Notifications/tst_SwipeToAct.qml	2015-01-26 12:16:11 +0000
3980
+++ tests/qmltests/Notifications/tst_SwipeToAct.qml	2015-07-22 14:32:16 +0000
3981
@@ -18,7 +18,7 @@
3982
18
import QtTest 1.0
18
import QtTest 1.0
3983
19
import ".."
19
import ".."
3984
20
import "../../../qml/Notifications"
20
import "../../../qml/Notifications"
3986
21
import Ubuntu.Components 0.1
21
import Ubuntu.Components 1.3
3987
22
import Unity.Test 0.1
22
import Unity.Test 0.1
3988
23
import Unity.Notifications 1.0
23
import Unity.Notifications 1.0
3989
24
24
3990
25
25
3991
=== modified file 'tests/qmltests/Notifications/tst_VisualSnapDecisionsQueue.qml'
3992
--- tests/qmltests/Notifications/tst_VisualSnapDecisionsQueue.qml	2015-01-09 09:15:45 +0000
3993
+++ tests/qmltests/Notifications/tst_VisualSnapDecisionsQueue.qml	2015-07-22 14:32:16 +0000
3994
@@ -18,7 +18,7 @@
3995
18
import QtTest 1.0
18
import QtTest 1.0
3996
19
import ".."
19
import ".."
3997
20
import "../../../qml/Notifications"
20
import "../../../qml/Notifications"
3999
21
import Ubuntu.Components 0.1
21
import Ubuntu.Components 1.3
4000
22
import Unity.Test 0.1
22
import Unity.Test 0.1
4001
23
import Unity.Notifications 1.0
23
import Unity.Notifications 1.0
4002
24
24
4003
25
25
4004
=== modified file 'tests/qmltests/Panel/IndicatorTest.qml'
4005
--- tests/qmltests/Panel/IndicatorTest.qml	2015-01-20 16:21:07 +0000
4006
+++ tests/qmltests/Panel/IndicatorTest.qml	2015-07-22 14:32:16 +0000
4007
@@ -18,7 +18,7 @@
4008
18
import QtQuick.Layouts 1.1
18
import QtQuick.Layouts 1.1
4009
19
import QtTest 1.0
19
import QtTest 1.0
4010
20
import "../../../qml/Panel"
20
import "../../../qml/Panel"
4012
21
import Ubuntu.Components 0.1
21
import Ubuntu.Components 1.3
4013
22
import Unity.Test 0.1 as UT
22
import Unity.Test 0.1 as UT
4014
23
import Unity.Indicators 0.1 as Indicators
23
import Unity.Indicators 0.1 as Indicators
4015
24
24
4016
25
25
4017
=== modified file 'tests/qmltests/Panel/Indicators/tst_IndicatorsLight.qml'
4018
--- tests/qmltests/Panel/Indicators/tst_IndicatorsLight.qml	2014-12-11 14:10:18 +0000
4019
+++ tests/qmltests/Panel/Indicators/tst_IndicatorsLight.qml	2015-07-22 14:32:16 +0000
4020
@@ -18,7 +18,7 @@
4021
18
import QtQuick.Layouts 1.1
18
import QtQuick.Layouts 1.1
4022
19
import Unity.Test 0.1 as UT
19
import Unity.Test 0.1 as UT
4023
20
import Unity.Indicators 0.1 as Indicators
20
import Unity.Indicators 0.1 as Indicators
4025
21
import Ubuntu.Components 1.1
21
import Ubuntu.Components 1.3
4026
22
import Powerd 0.1
22
import Powerd 0.1
4027
23
import Lights 0.1
23
import Lights 0.1
4028
24
import QMenuModel 0.1
24
import QMenuModel 0.1
4029
25
25
4030
=== modified file 'tests/qmltests/Panel/tst_IndicatorItem.qml'
4031
--- tests/qmltests/Panel/tst_IndicatorItem.qml	2014-10-06 09:17:49 +0000
4032
+++ tests/qmltests/Panel/tst_IndicatorItem.qml	2015-07-22 14:32:16 +0000
4033
@@ -17,7 +17,7 @@
4034
17
import QtQuick 2.1
17
import QtQuick 2.1
4035
18
import QtQuick.Layouts 1.1
18
import QtQuick.Layouts 1.1
4036
19
import QtTest 1.0
19
import QtTest 1.0
4038
20
import Ubuntu.Components 0.1
20
import Ubuntu.Components 1.3
4039
21
import Unity.Test 0.1 as UT
21
import Unity.Test 0.1 as UT
4040
22
import "../../../qml/Panel"
22
import "../../../qml/Panel"
4041
23
23
4042
24
24
4043
=== modified file 'tests/qmltests/Panel/tst_IndicatorItemRow.qml'
4044
--- tests/qmltests/Panel/tst_IndicatorItemRow.qml	2014-10-17 14:55:35 +0000
4045
+++ tests/qmltests/Panel/tst_IndicatorItemRow.qml	2015-07-22 14:32:16 +0000
4046
@@ -18,7 +18,7 @@
4047
18
import QtQuick.Layouts 1.1
18
import QtQuick.Layouts 1.1
4048
19
import QtTest 1.0
19
import QtTest 1.0
4049
20
import "../../../qml/Panel"
20
import "../../../qml/Panel"
4051
21
import Ubuntu.Components 0.1
21
import Ubuntu.Components 1.3
4052
22
import Unity.Test 0.1 as UT
22
import Unity.Test 0.1 as UT
4053
23
import Unity.Indicators 0.1 as Indicators
23
import Unity.Indicators 0.1 as Indicators
4054
24
24
4055
25
25
4056
=== modified file 'tests/qmltests/Panel/tst_IndicatorsBar.qml'
4057
--- tests/qmltests/Panel/tst_IndicatorsBar.qml	2015-01-09 09:15:45 +0000
4058
+++ tests/qmltests/Panel/tst_IndicatorsBar.qml	2015-07-22 14:32:16 +0000
4059
@@ -18,7 +18,7 @@
4060
18
import QtQuick.Layouts 1.1
18
import QtQuick.Layouts 1.1
4061
19
import QtTest 1.0
19
import QtTest 1.0
4062
20
import "../../../qml/Panel"
20
import "../../../qml/Panel"
4064
21
import Ubuntu.Components 0.1
21
import Ubuntu.Components 1.3
4065
22
import Unity.Test 0.1 as UT
22
import Unity.Test 0.1 as UT
4066
23
import Unity.Indicators 0.1 as Indicators
23
import Unity.Indicators 0.1 as Indicators
4067
24
24
4068
25
25
4069
=== modified file 'tests/qmltests/Panel/tst_IndicatorsMenu.qml'
4070
--- tests/qmltests/Panel/tst_IndicatorsMenu.qml	2015-03-06 04:44:11 +0000
4071
+++ tests/qmltests/Panel/tst_IndicatorsMenu.qml	2015-07-22 14:32:16 +0000
4072
@@ -18,7 +18,7 @@
4073
18
import QtQuick.Layouts 1.1
18
import QtQuick.Layouts 1.1
4074
19
import QtTest 1.0
19
import QtTest 1.0
4075
20
import "../../../qml/Panel"
20
import "../../../qml/Panel"
4077
21
import Ubuntu.Components 0.1
21
import Ubuntu.Components 1.3
4078
22
import Unity.Test 0.1 as UT
22
import Unity.Test 0.1 as UT
4079
23
import Unity.Indicators 0.1 as Indicators
23
import Unity.Indicators 0.1 as Indicators
4080
24
24
4081
25
25
4082
=== modified file 'tests/qmltests/Panel/tst_Panel.qml'
4083
--- tests/qmltests/Panel/tst_Panel.qml	2015-04-15 11:37:00 +0000
4084
+++ tests/qmltests/Panel/tst_Panel.qml	2015-07-22 14:32:16 +0000
4085
@@ -18,7 +18,7 @@
4086
18
import QtQuick.Layouts 1.1
18
import QtQuick.Layouts 1.1
4087
19
import QtTest 1.0
19
import QtTest 1.0
4088
20
import Unity.Test 0.1
20
import Unity.Test 0.1
4090
21
import Ubuntu.Components 0.1
21
import Ubuntu.Components 1.3
4091
22
import Unity.Indicators 0.1 as Indicators
22
import Unity.Indicators 0.1 as Indicators
4092
23
import Ubuntu.Telephony 0.1 as Telephony
23
import Ubuntu.Telephony 0.1 as Telephony
4093
24
import "../../../qml/Panel"
24
import "../../../qml/Panel"
4094
25
25
4095
=== modified file 'tests/qmltests/Stages/ApplicationCheckBox.qml'
4096
--- tests/qmltests/Stages/ApplicationCheckBox.qml	2015-06-12 16:07:43 +0000
4097
+++ tests/qmltests/Stages/ApplicationCheckBox.qml	2015-07-22 14:32:16 +0000
4098
@@ -16,7 +16,7 @@
4099
16
16
4100
17
import QtQuick 2.0
17
import QtQuick 2.0
4101
18
import QtQuick.Layouts 1.1
18
import QtQuick.Layouts 1.1
4103
19
import Ubuntu.Components 1.1
19
import Ubuntu.Components 1.3
4104
20
import Unity.Application 0.1
20
import Unity.Application 0.1
4105
21
21
4106
22
RowLayout {
22
RowLayout {
4107
23
23
4108
=== modified file 'tests/qmltests/Stages/RecursingChildSessionControl.qml'
4109
--- tests/qmltests/Stages/RecursingChildSessionControl.qml	2015-02-12 18:58:35 +0000
4110
+++ tests/qmltests/Stages/RecursingChildSessionControl.qml	2015-07-22 14:32:16 +0000
4111
@@ -16,7 +16,7 @@
4112
16
16
4113
17
import QtQuick 2.1
17
import QtQuick 2.1
4114
18
import QtQuick.Layouts 1.1
18
import QtQuick.Layouts 1.1
4116
19
import Ubuntu.Components 0.1
19
import Ubuntu.Components 1.3
4117
20
import Unity.Application 0.1
20
import Unity.Application 0.1
4118
21
21
4119
22
ColumnLayout {
22
ColumnLayout {
4120
23
23
4121
=== modified file 'tests/qmltests/Stages/tst_ApplicationWindow.qml'
4122
--- tests/qmltests/Stages/tst_ApplicationWindow.qml	2015-07-10 15:55:50 +0000
4123
+++ tests/qmltests/Stages/tst_ApplicationWindow.qml	2015-07-22 14:32:16 +0000
4124
@@ -20,8 +20,8 @@
4125
20
import Unity.Test 0.1 as UT
20
import Unity.Test 0.1 as UT
4126
21
import ".."
21
import ".."
4127
22
import "../../../qml/Stages"
22
import "../../../qml/Stages"
4130
23
import Ubuntu.Components 0.1
23
import Ubuntu.Components 1.3
4131
24
import Ubuntu.Components.ListItems 1.0 as ListItem
24
import Ubuntu.Components.ListItems 1.3 as ListItem
4132
25
import Unity.Application 0.1
25
import Unity.Application 0.1
4133
26
26
4134
27
Rectangle {
27
Rectangle {
4135
28
28
4136
=== modified file 'tests/qmltests/Stages/tst_DesktopStage.qml'
4137
--- tests/qmltests/Stages/tst_DesktopStage.qml	2015-05-01 13:21:30 +0000
4138
+++ tests/qmltests/Stages/tst_DesktopStage.qml	2015-07-22 14:32:16 +0000
4139
@@ -16,8 +16,8 @@
4140
16
16
4141
17
import QtQuick 2.0
17
import QtQuick 2.0
4142
18
import QtTest 1.0
18
import QtTest 1.0
4145
19
import Ubuntu.Components 1.1
19
import Ubuntu.Components 1.3
4146
20
import Ubuntu.Components.ListItems 1.0 as ListItem
20
import Ubuntu.Components.ListItems 1.3 as ListItem
4147
21
import Unity.Application 0.1
21
import Unity.Application 0.1
4148
22
import Unity.Test 0.1
22
import Unity.Test 0.1
4149
23
import Utils 0.1
23
import Utils 0.1
4150
24
24
4151
=== modified file 'tests/qmltests/Stages/tst_PhoneStage.qml'
4152
--- tests/qmltests/Stages/tst_PhoneStage.qml	2015-06-23 14:20:23 +0000
4153
+++ tests/qmltests/Stages/tst_PhoneStage.qml	2015-07-22 14:32:16 +0000
4154
@@ -19,7 +19,7 @@
4155
19
import Unity.Test 0.1 as UT
19
import Unity.Test 0.1 as UT
4156
20
import ".."
20
import ".."
4157
21
import "../../../qml/Stages"
21
import "../../../qml/Stages"
4159
22
import Ubuntu.Components 0.1
22
import Ubuntu.Components 1.3
4160
23
import Unity.Application 0.1
23
import Unity.Application 0.1
4161
24
24
4162
25
Item {
25
Item {
4163
26
26
4164
=== modified file 'tests/qmltests/Stages/tst_SessionContainer.qml'
4165
--- tests/qmltests/Stages/tst_SessionContainer.qml	2015-03-06 04:44:11 +0000
4166
+++ tests/qmltests/Stages/tst_SessionContainer.qml	2015-07-22 14:32:16 +0000
4167
@@ -18,7 +18,7 @@
4168
18
import QtQuick.Layouts 1.1
18
import QtQuick.Layouts 1.1
4169
19
import QtTest 1.0
19
import QtTest 1.0
4170
20
import Unity.Test 0.1 as UT
20
import Unity.Test 0.1 as UT
4172
21
import Ubuntu.Components 0.1
21
import Ubuntu.Components 1.3
4173
22
import Unity.Application 0.1
22
import Unity.Application 0.1
4174
23
import "../../../qml/Stages"
23
import "../../../qml/Stages"
4175
24
24
4176
25
25
4177
=== modified file 'tests/qmltests/Stages/tst_Splash.qml'
4178
--- tests/qmltests/Stages/tst_Splash.qml	2014-09-15 19:05:32 +0000
4179
+++ tests/qmltests/Stages/tst_Splash.qml	2015-07-22 14:32:16 +0000
4180
@@ -19,7 +19,7 @@
4181
19
import Unity.Test 0.1 as UT
19
import Unity.Test 0.1 as UT
4182
20
import ".."
20
import ".."
4183
21
import "../../../qml/Stages"
21
import "../../../qml/Stages"
4185
22
import Ubuntu.Components 0.1
22
import Ubuntu.Components 1.3
4186
23
import Unity.Application 0.1
23
import Unity.Application 0.1
4187
24
24
4188
25
Rectangle {
25
Rectangle {
4189
26
26
4190
=== modified file 'tests/qmltests/Stages/tst_SpreadDelegate.qml'
4191
--- tests/qmltests/Stages/tst_SpreadDelegate.qml	2015-03-06 04:44:11 +0000
4192
+++ tests/qmltests/Stages/tst_SpreadDelegate.qml	2015-07-22 14:32:16 +0000
4193
@@ -19,8 +19,8 @@
4194
19
import Unity.Test 0.1 as UT
19
import Unity.Test 0.1 as UT
4195
20
import ".."
20
import ".."
4196
21
import "../../../qml/Stages"
21
import "../../../qml/Stages"
4199
22
import Ubuntu.Components 0.1
22
import Ubuntu.Components 1.3
4200
23
import Ubuntu.Components.ListItems 1.0 as ListItem
23
import Ubuntu.Components.ListItems 1.3 as ListItem
4201
24
import Unity.Application 0.1
24
import Unity.Application 0.1
4202
25
25
4203
26
Rectangle {
26
Rectangle {
4204
27
27
4205
=== modified file 'tests/qmltests/Stages/tst_SurfaceContainer.qml'
4206
--- tests/qmltests/Stages/tst_SurfaceContainer.qml	2015-06-25 19:24:41 +0000
4207
+++ tests/qmltests/Stages/tst_SurfaceContainer.qml	2015-07-22 14:32:16 +0000
4208
@@ -19,7 +19,7 @@
4209
19
import Unity.Test 0.1
19
import Unity.Test 0.1
4210
20
import ".."
20
import ".."
4211
21
import "../../../qml/Stages"
21
import "../../../qml/Stages"
4213
22
import Ubuntu.Components 0.1
22
import Ubuntu.Components 1.3
4214
23
import Unity.Application 0.1
23
import Unity.Application 0.1
4215
24
24
4216
25
Rectangle {
25
Rectangle {
4217
26
26
4218
=== modified file 'tests/qmltests/Stages/tst_TabletStage.qml'
4219
--- tests/qmltests/Stages/tst_TabletStage.qml	2015-06-12 16:07:43 +0000
4220
+++ tests/qmltests/Stages/tst_TabletStage.qml	2015-07-22 14:32:16 +0000
4221
@@ -16,8 +16,8 @@
4222
16
16
4223
17
import QtQuick 2.0
17
import QtQuick 2.0
4224
18
import QtTest 1.0
18
import QtTest 1.0
4227
19
import Ubuntu.Components 1.1
19
import Ubuntu.Components 1.3
4228
20
import Ubuntu.Components.ListItems 1.0 as ListItem
20
import Ubuntu.Components.ListItems 1.3 as ListItem
4229
21
import Unity.Application 0.1
21
import Unity.Application 0.1
4230
22
import Unity.Test 0.1
22
import Unity.Test 0.1
4231
23
23
4232
24
24
4233
=== modified file 'tests/qmltests/Stages/tst_WindowMoveResizeArea.qml'
4234
--- tests/qmltests/Stages/tst_WindowMoveResizeArea.qml	2015-05-01 10:24:08 +0000
4235
+++ tests/qmltests/Stages/tst_WindowMoveResizeArea.qml	2015-07-22 14:32:16 +0000
4236
@@ -20,8 +20,8 @@
4237
20
import Unity.Test 0.1 as UT
20
import Unity.Test 0.1 as UT
4238
21
import ".."
21
import ".."
4239
22
import "../../../qml/Stages"
22
import "../../../qml/Stages"
4242
23
import Ubuntu.Components 0.1
23
import Ubuntu.Components 1.3
4243
24
import Ubuntu.Components.ListItems 1.0 as ListItem
24
import Ubuntu.Components.ListItems 1.3 as ListItem
4244
25
import Unity.Application 0.1
25
import Unity.Application 0.1
4245
26
26
4246
27
Item {
27
Item {
4247
28
28
4248
=== modified file 'tests/qmltests/Tutorial/tst_Tutorial.qml'
4249
--- tests/qmltests/Tutorial/tst_Tutorial.qml	2015-07-09 12:44:35 +0000
4250
+++ tests/qmltests/Tutorial/tst_Tutorial.qml	2015-07-22 14:32:16 +0000
4251
@@ -18,7 +18,7 @@
4252
18
import QtTest 1.0
18
import QtTest 1.0
4253
19
import AccountsService 0.1
19
import AccountsService 0.1
4254
20
import LightDM 0.1 as LightDM
20
import LightDM 0.1 as LightDM
4256
21
import Ubuntu.Components 1.1
21
import Ubuntu.Components 1.3
4257
22
import Unity.Application 0.1
22
import Unity.Application 0.1
4258
23
import Unity.Test 0.1 as UT
23
import Unity.Test 0.1 as UT
4259
24
24
4260
25
25
4261
=== modified file 'tests/qmltests/Wizard/tst_Wizard.qml'
4262
--- tests/qmltests/Wizard/tst_Wizard.qml	2015-03-03 14:42:10 +0000
4263
+++ tests/qmltests/Wizard/tst_Wizard.qml	2015-07-22 14:32:16 +0000
4264
@@ -19,7 +19,7 @@
4265
19
import AccountsService 0.1
19
import AccountsService 0.1
4266
20
import MeeGo.QOfono 0.2
20
import MeeGo.QOfono 0.2
4267
21
import QMenuModel 0.1
21
import QMenuModel 0.1
4269
22
import Ubuntu.Components 1.1
22
import Ubuntu.Components 1.3
4270
23
import Ubuntu.SystemSettings.SecurityPrivacy 1.0
23
import Ubuntu.SystemSettings.SecurityPrivacy 1.0
4271
24
import Unity.Test 0.1 as UT
24
import Unity.Test 0.1 as UT
4272
25
import Wizard 0.1
25
import Wizard 0.1
4273
@@ -96,7 +96,7 @@
4274
96
    }
96
    }
4275
97
97
4276
98
    Component.onCompleted: {
98
    Component.onCompleted: {
4278
99
        Theme.name = "Ubuntu.Components.Themes.SuruGradient";
99
        theme.name = "Ubuntu.Components.Themes.SuruGradient";
4279
100
        setup();
100
        setup();
4280
101
    }
101
    }
4281
102
102
4282
103
103
4283
=== modified file 'tests/qmltests/tst_OrientedShell.qml'
4284
--- tests/qmltests/tst_OrientedShell.qml	2015-07-10 14:44:55 +0000
4285
+++ tests/qmltests/tst_OrientedShell.qml	2015-07-22 14:32:16 +0000
4286
@@ -17,8 +17,8 @@
4287
17
import QtQuick 2.0
17
import QtQuick 2.0
4288
18
import QtQuick.Layouts 1.1
18
import QtQuick.Layouts 1.1
4289
19
import QtTest 1.0
19
import QtTest 1.0
4292
20
import Ubuntu.Components 1.1
20
import Ubuntu.Components 1.3
4293
21
import Ubuntu.Components.ListItems 1.0 as ListItem
21
import Ubuntu.Components.ListItems 1.3 as ListItem
4294
22
import Unity.Application 0.1
22
import Unity.Application 0.1
4295
23
import Unity.Test 0.1
23
import Unity.Test 0.1
4296
24
import LightDM 0.1 as LightDM
24
import LightDM 0.1 as LightDM
4297
25
25
4298
=== modified file 'tests/qmltests/tst_Shell.qml'
4299
--- tests/qmltests/tst_Shell.qml	2015-06-23 17:40:03 +0000
4300
+++ tests/qmltests/tst_Shell.qml	2015-07-22 14:32:16 +0000
4301
@@ -19,8 +19,8 @@
4302
19
import AccountsService 0.1
19
import AccountsService 0.1
4303
20
import GSettings 1.0
20
import GSettings 1.0
4304
21
import LightDM 0.1 as LightDM
21
import LightDM 0.1 as LightDM
4307
22
import Ubuntu.Components 1.1
22
import Ubuntu.Components 1.3
4308
23
import Ubuntu.Components.ListItems 1.0 as ListItem
23
import Ubuntu.Components.ListItems 1.3 as ListItem
4309
24
import Ubuntu.Telephony 0.1 as Telephony
24
import Ubuntu.Telephony 0.1 as Telephony
4310
25
import Unity.Application 0.1
25
import Unity.Application 0.1
4311
26
import Unity.Connectivity 0.1
26
import Unity.Connectivity 0.1
4312
27
27
4313
=== modified file 'tests/qmltests/tst_ShellWithPin.qml'
4314
--- tests/qmltests/tst_ShellWithPin.qml	2015-07-14 14:46:16 +0000
4315
+++ tests/qmltests/tst_ShellWithPin.qml	2015-07-22 14:32:16 +0000
4316
@@ -15,7 +15,7 @@
4317
15
 */
15
 */
4318
16
16
4319
17
import QtQuick 2.0
17
import QtQuick 2.0
4321
18
import Ubuntu.Components 1.0
18
import Ubuntu.Components 1.3
4322
19
import QtTest 1.0
19
import QtTest 1.0
4323
20
import AccountsService 0.1
20
import AccountsService 0.1
4324
21
import GSettings 1.0
21
import GSettings 1.0
4325
22
22
4326
=== added directory 'tests/sdk'
4327
=== added file 'tests/sdk/CMakeLists.txt'
4328
--- tests/sdk/CMakeLists.txt	1970-01-01 00:00:00 +0000
4329
+++ tests/sdk/CMakeLists.txt	2015-07-22 14:32:16 +0000
4330
@@ -0,0 +1,6 @@
4331
1
4332
2
#
4333
3
# Test that all imports for Ubuntu.Components use the wanted version
4334
4
#
4335
5
4336
6
add_test(SDK ${CMAKE_CURRENT_SOURCE_DIR}/check_sdk.py ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR})
4337
0
7
4338
=== added file 'tests/sdk/check_sdk.py'
4339
--- tests/sdk/check_sdk.py	1970-01-01 00:00:00 +0000
4340
+++ tests/sdk/check_sdk.py	2015-07-22 14:32:16 +0000
4341
@@ -0,0 +1,114 @@
4342
1
#! /usr/bin/env python3
4343
2
4344
3
#
4345
4
# Copyright (C) 2015 Canonical Ltd
4346
5
#
4347
6
# This program is free software: you can redistribute it and/or modify
4348
7
# it under the terms of the GNU General Public License version 3 as
4349
8
# published by the Free Software Foundation.
4350
9
#
4351
10
# This program is distributed in the hope that it will be useful,
4352
11
# but WITHOUT ANY WARRANTY; without even the implied warranty of
4353
12
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
4354
13
# GNU General Public License for more details.
4355
14
#
4356
15
# You should have received a copy of the GNU General Public License
4357
16
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
4358
17
#
4359
18
# Authored by: Michi Henning <michi.henning@canonical.com>
4360
19
#
4361
20
4362
21
#
4363
22
# Little helper program to test that all source files import
4364
23
# the wanted SDK version
4365
24
#
4366
25
# Usage: check_sdk.py directory [ignore_prefix]
4367
26
#
4368
27
# The directory specifies the (recursive) location of the source files. Any
4369
28
# files with a path that starts with ignore_prefix are not checked. This is
4370
29
# useful to exclude files that are generated into the build directory.
4371
30
#
4372
31
# See the file_pat definition below for a list of files that are checked.
4373
32
#
4374
33
4375
34
from __future__ import print_function
4376
35
4377
36
import argparse
4378
37
import os
4379
38
import re
4380
39
import sys
4381
40
4382
41
4383
42
# Print msg on stderr, preceded by program name and followed by newline
4384
43
def error(msg):
4385
44
    print(os.path.basename(sys.argv[0]) + ": " + msg, file=sys.stderr)
4386
45
4387
46
4388
47
# Function to raise errors encountered by os.walk
4389
48
def raise_error(e):
4390
49
    raise e
4391
50
4392
51
# Scan lines in file_path for bad SDK version. For each file,
4393
52
# print the line numbers that have SDK version issues
4394
53
4395
54
ubuntu_components_pat = re.compile(r'.*import Ubuntu.Components.*')
4396
55
ubuntu_good_components_pat = re.compile(r'.*import Ubuntu.Components.*1\.3.*')
4397
56
4398
57
def scan_for_bad_sdk(file_path):
4399
58
    global ubuntu_components_pat
4400
59
    errors = []
4401
60
    with open(file_path, 'rt', encoding='utf-8') as ifile:
4402
61
        for lino, line in enumerate(ifile, start=1):
4403
62
            if ubuntu_components_pat.match(line) and not ubuntu_good_components_pat.match(line):
4404
63
                errors.append(lino)
4405
64
    if 0 < len(errors) <= 10:
4406
65
        if len(errors) > 1:
4407
66
            plural = 's'
4408
67
        else:
4409
68
            plural = ''
4410
69
        print(
4411
70
            "%s: bad SDK Version in line%s %s" % (
4412
71
                file_path, plural, ", ".join((str(i) for i in errors))))
4413
72
    elif errors:
4414
73
        print("%s: bad SDK Version in multiple lines" % file_path)
4415
74
    return bool(errors)
4416
75
4417
76
# Parse args
4418
77
4419
78
parser = argparse.ArgumentParser(
4420
79
    description='Test that source files contain the wanted SDK version.')
4421
80
parser.add_argument(
4422
81
    'dir', nargs=1,
4423
82
    help='The directory to (recursively) search for source files')
4424
83
parser.add_argument(
4425
84
    'ignore_prefix', nargs='?', default=None,
4426
85
    help='Ignore source files with a path that starts with the given prefix.')
4427
86
args = parser.parse_args()
4428
87
4429
88
# Files we want to check for SDK version.
4430
89
4431
90
file_pat = (
4432
91
    r'(.*\.(js|qml)$)')
4433
92
pat = re.compile(file_pat)
4434
93
4435
94
# Find all the files with matching file extension in the specified
4436
95
# directory and check them
4437
96
4438
97
directory = os.path.abspath(args.dir[0])
4439
98
ignore = args.ignore_prefix and os.path.abspath(args.ignore_prefix) or None
4440
99
4441
100
found_bad_sdk = False
4442
101
try:
4443
102
    for root, dirs, files in os.walk(directory, onerror=raise_error):
4444
103
        for file in files:
4445
104
            path = os.path.join(root, file)
4446
105
            if not (ignore and path.startswith(ignore)) and pat.match(file):
4447
106
                if scan_for_bad_sdk(path):
4448
107
                    found_bad_sdk = True
4449
108
4450
109
except OSError as e:
4451
110
    error("cannot create file list for \"" + dir + "\": " + e.strerror)
4452
111
    sys.exit(1)
4453
112
4454
113
if found_bad_sdk:
4455
114
    sys.exit(1)
4456
0
115
4457
=== modified file 'tests/utils/modules/Unity/Test/MouseTouchEmulationCheckbox.qml'
4458
--- tests/utils/modules/Unity/Test/MouseTouchEmulationCheckbox.qml	2015-04-13 13:12:18 +0000
4459
+++ tests/utils/modules/Unity/Test/MouseTouchEmulationCheckbox.qml	2015-07-22 14:32:16 +0000
4460
@@ -16,7 +16,7 @@
4461
16
16
4462
17
import QtQuick 2.0
17
import QtQuick 2.0
4463
18
import QtQuick.Layouts 1.1
18
import QtQuick.Layouts 1.1
4465
19
import Ubuntu.Components 1.1
19
import Ubuntu.Components 1.3
4466
20
import Unity.Test 0.1
20
import Unity.Test 0.1
4467
21
21
4468
22
RowLayout {
22
RowLayout {
4469
23
23
4470
=== modified file 'tests/utils/modules/Unity/Test/UnityTestCase.qml'
4471
--- tests/utils/modules/Unity/Test/UnityTestCase.qml	2015-06-22 12:36:47 +0000
4472
+++ tests/utils/modules/Unity/Test/UnityTestCase.qml	2015-07-22 14:32:16 +0000
4473
@@ -16,7 +16,7 @@
4474
16
16
4475
17
import QtQuick 2.0
17
import QtQuick 2.0
4476
18
import QtTest 1.0
18
import QtTest 1.0
4478
19
import Ubuntu.Components 0.1
19
import Ubuntu.Components 1.3
4479
20
import Unity.Test 0.1 as UT
20
import Unity.Test 0.1 as UT
4480
21
21
4481
22
TestCase {
22
TestCase {
Status:	Superseded
Proposed branch:	lp:~aacid/unity8/use_sdk_13
Merge into:	lp:unity8
Diff against target:	4481 lines (+537/-419) 246 files modified plugins/Dash/CardAttributes.qml (+2/-2) plugins/Dash/CardCreator.js (+5/-5) plugins/Dash/ScopeStyle.qml (+1/-1) qml/Components/Background.qml (+1/-1) qml/Components/BaseCarouselDelegate.qml (+1/-1) qml/Components/Carousel.qml (+1/-1) qml/Components/DelayedLockscreen.qml (+1/-1) qml/Components/Dialogs.qml (+1/-1) qml/Components/DragHandle.qml (+1/-1) qml/Components/DraggingArea.qml (+1/-1) qml/Components/EdgeDragEvaluator.qml (+1/-1) qml/Components/Header.qml (+2/-2) qml/Components/InputMethod.qml (+1/-1) qml/Components/LazyImage.qml (+1/-1) qml/Components/ListItems/Header.qml (+1/-1) qml/Components/Lockscreen.qml (+2/-2) qml/Components/PassphraseLockscreen.qml (+1/-1) qml/Components/PinLockscreen.qml (+2/-2) qml/Components/PinPadButton.qml (+1/-1) qml/Components/Rating.qml (+1/-1) qml/Components/RatingStyle.qml (+1/-1) qml/Components/ResponsiveGridView.qml (+1/-1) qml/Components/ResponsiveVerticalJournal.qml (+1/-1) qml/Components/ScrollCalculator.qml (+1/-1) qml/Components/ShellDialog.qml (+2/-2) qml/Components/UbuntuShapeForItem.qml (+1/-1) qml/Components/WindowControlButtons.qml (+1/-1) qml/Components/ZoomableImage.qml (+1/-1) qml/Dash/CardCarousel.qml (+1/-1) qml/Dash/CardHorizontalList.qml (+1/-1) qml/Dash/CardVerticalJournal.qml (+1/-1) qml/Dash/Dash.qml (+1/-1) qml/Dash/DashApplication.qml (+3/-2) qml/Dash/DashCategoryBase.qml (+1/-1) qml/Dash/DashContent.qml (+1/-1) qml/Dash/DashContentTabBarStyle.qml (+1/-1) qml/Dash/DashNavigation.qml (+3/-3) qml/Dash/DashNavigationButton.qml (+3/-3) qml/Dash/DashNavigationList.qml (+3/-3) qml/Dash/GenericScopeView.qml (+4/-4) qml/Dash/PageHeader.qml (+8/-11) qml/Dash/PreviewListView.qml (+1/-1) qml/Dash/Previews/Preview.qml (+1/-1) qml/Dash/Previews/PreviewActionButton.qml (+1/-1) qml/Dash/Previews/PreviewActionCombo.qml (+3/-3) qml/Dash/Previews/PreviewActions.qml (+3/-3) qml/Dash/Previews/PreviewAudioPlayback.qml (+5/-5) qml/Dash/Previews/PreviewComment.qml (+1/-1) qml/Dash/Previews/PreviewCommentInput.qml (+1/-1) qml/Dash/Previews/PreviewExpandable.qml (+4/-4) qml/Dash/Previews/PreviewHeader.qml (+3/-3) qml/Dash/Previews/PreviewImageGallery.qml (+1/-1) qml/Dash/Previews/PreviewOverlay.qml (+3/-3) qml/Dash/Previews/PreviewPayments.qml (+1/-1) qml/Dash/Previews/PreviewProgress.qml (+1/-1) qml/Dash/Previews/PreviewRatingDisplay.qml (+3/-3) qml/Dash/Previews/PreviewRatingEdit.qml (+2/-2) qml/Dash/Previews/PreviewRatingInput.qml (+5/-5) qml/Dash/Previews/PreviewRatingSingleDisplay.qml (+1/-1) qml/Dash/Previews/PreviewTable.qml (+4/-4) qml/Dash/Previews/PreviewTextSummary.qml (+4/-4) qml/Dash/Previews/PreviewVideoPlayback.qml (+1/-1) qml/Dash/Previews/PreviewZoomableImage.qml (+1/-1) qml/Dash/PullToRefreshScopeStyle.qml (+2/-2) qml/Dash/ScopeSettings/ScopeSetting.qml (+1/-1) qml/Dash/ScopeSettings/ScopeSettingBoolean.qml (+4/-4) qml/Dash/ScopeSettings/ScopeSettingList.qml (+2/-2) qml/Dash/ScopeSettings/ScopeSettingString.qml (+5/-5) qml/Dash/ScopeSettingsPage.qml (+1/-1) qml/Dash/ScopesListCategory.qml (+3/-3) qml/Dash/ScopesListCategoryItem.qml (+1/-1) qml/Greeter/Clock.qml (+1/-1) qml/Greeter/CoverPage.qml (+1/-1) qml/Greeter/Greeter.qml (+1/-1) qml/Greeter/Infographics.qml (+1/-1) qml/Greeter/LoginList.qml (+1/-1) qml/Greeter/NarrowView.qml (+1/-1) qml/Greeter/ObjectPositioner.qml (+1/-1) qml/Greeter/WideView.qml (+1/-1) qml/Launcher/FoldingLauncherDelegate.qml (+1/-1) qml/Launcher/Launcher.qml (+1/-1) qml/Launcher/LauncherDelegate.qml (+1/-1) qml/Launcher/LauncherPanel.qml (+3/-3) qml/Notifications/Notification.qml (+6/-6) qml/Notifications/NotificationMenuItemFactory.qml (+1/-1) qml/Notifications/Notifications.qml (+1/-1) qml/Notifications/OptionToggle.qml (+5/-5) qml/Notifications/ShapedIcon.qml (+2/-2) qml/Notifications/SwipeToAct.qml (+1/-1) qml/Panel/ActiveCallHint.qml (+1/-1) qml/Panel/Handle.qml (+1/-1) qml/Panel/IndicatorItem.qml (+1/-1) qml/Panel/IndicatorItemRow.qml (+1/-1) qml/Panel/IndicatorPage.qml (+1/-1) qml/Panel/Indicators/MenuItemFactory.qml (+6/-6) qml/Panel/Indicators/MessageMenuItemFactory.qml (+1/-1) qml/Panel/Indicators/ModemInfoItem.qml (+5/-5) qml/Panel/Indicators/RoamingIndication.qml (+3/-3) qml/Panel/Indicators/client/IndicatorRepresentation.qml (+2/-2) qml/Panel/Indicators/client/IndicatorsClient.qml (+3/-3) qml/Panel/Indicators/client/IndicatorsList.qml (+2/-2) qml/Panel/Indicators/client/IndicatorsTree.qml (+1/-1) qml/Panel/IndicatorsBar.qml (+1/-1) qml/Panel/IndicatorsMenu.qml (+1/-1) qml/Panel/MenuContent.qml (+1/-1) qml/Panel/Panel.qml (+1/-1) qml/Rotation/RotationStates.qml (+1/-1) qml/ScopeTool.qml (+2/-2) qml/Shell.qml (+3/-3) qml/Stages/Animations/SwipeFromBottomAnimation.qml (+1/-1) qml/Stages/ApplicationWindow.qml (+1/-1) qml/Stages/DecoratedWindow.qml (+1/-1) qml/Stages/DesktopStage.qml (+1/-1) qml/Stages/MainViewStyle.qml (+2/-3) qml/Stages/PageHeadStyle.qml (+2/-2) qml/Stages/PhoneStage.qml (+1/-1) qml/Stages/ShimStage.qml (+1/-1) qml/Stages/Splash.qml (+10/-10) qml/Stages/SpreadDelegate.qml (+1/-1) qml/Stages/SurfaceContainer.qml (+1/-1) qml/Stages/TabletStage.qml (+1/-1) qml/Stages/TransformedSpreadDelegate.qml (+1/-1) qml/Stages/TransformedTabletSpreadDelegate.qml (+1/-1) qml/Stages/WindowDecoration.qml (+1/-1) qml/Stages/WindowMoveResizeArea.qml (+1/-1) qml/Tutorial/Arrow.qml (+1/-1) qml/Tutorial/Slider.qml (+1/-1) qml/Tutorial/Tick.qml (+1/-1) qml/Tutorial/Tutorial.qml (+1/-1) qml/Tutorial/TutorialBottom.qml (+1/-1) qml/Tutorial/TutorialBottomFinish.qml (+1/-1) qml/Tutorial/TutorialContent.qml (+1/-1) qml/Tutorial/TutorialLeft.qml (+1/-1) qml/Tutorial/TutorialLeftFinish.qml (+1/-1) qml/Tutorial/TutorialPage.qml (+1/-1) qml/Tutorial/TutorialRight.qml (+1/-1) qml/Wizard/CheckableSetting.qml (+4/-4) qml/Wizard/Page.qml (+3/-3) qml/Wizard/Pages.qml (+1/-1) qml/Wizard/Pages/10-welcome.qml (+2/-2) qml/Wizard/Pages/20-sim.qml (+1/-1) qml/Wizard/Pages/30-passwd-type.qml (+6/-6) qml/Wizard/Pages/40-wifi.qml (+2/-2) qml/Wizard/Pages/50-location.qml (+3/-3) qml/Wizard/Pages/60-reporting.qml (+1/-1) qml/Wizard/Pages/80-finished.qml (+1/-1) qml/Wizard/Pages/here-terms.qml (+3/-3) qml/Wizard/Pages/passwd-confirm.qml (+1/-1) qml/Wizard/Pages/passwd-set.qml (+1/-1) qml/Wizard/StackButton.qml (+3/-3) qml/Wizard/Wizard.qml (+1/-1) tests/CMakeLists.txt (+1/-0) tests/plugins/Dash/cardcreator/1.res (+1/-1) tests/plugins/Dash/cardcreator/2.res (+2/-2) tests/plugins/Dash/cardcreator/3.res (+2/-2) tests/plugins/Dash/cardcreator/4.res (+2/-2) tests/plugins/Dash/cardcreator/5.res (+2/-2) tests/plugins/Dash/cardcreator/6.res (+3/-3) tests/plugins/Dash/cardcreator/7.res (+3/-3) tests/plugins/Dash/cardcreator/8.res (+1/-1) tests/plugins/Dash/tst_CroppedImageMinimumSourceSize.qml (+1/-1) tests/plugins/Dash/tst_ScopeStyle.qml (+1/-1) tests/plugins/Ubuntu/Gestures/DownwardsLauncher.qml (+1/-1) tests/plugins/Ubuntu/Gestures/LeftwardsLauncher.qml (+1/-1) tests/plugins/Ubuntu/Gestures/RightwardsLauncher.qml (+1/-1) tests/plugins/Ubuntu/Gestures/UpwardsLauncher.qml (+1/-1) tests/plugins/Ubuntu/Gestures/tst_DirectionalDragArea.qml (+1/-1) tests/plugins/Ubuntu/Gestures/tst_FloatingFlickable.qml (+1/-1) tests/plugins/Ubuntu/Gestures/tst_PressedOutsideNotifier.qml (+1/-1) tests/qmltests/Components/tst_Dialogs.qml (+1/-1) tests/qmltests/Components/tst_DragHandle.qml (+1/-1) tests/qmltests/Components/tst_DragHandle/BidirectionalShowable.qml (+1/-1) tests/qmltests/Components/tst_DragHandle/HorizontalShowable.qml (+1/-1) tests/qmltests/Components/tst_DragHandle/VerticalShowable.qml (+1/-1) tests/qmltests/Components/tst_LazyImage.qml (+3/-3) tests/qmltests/Components/tst_LazyImage/ImageControls.qml (+1/-1) tests/qmltests/Components/tst_Lockscreen.qml (+1/-1) tests/qmltests/Components/tst_Rating.qml (+3/-3) tests/qmltests/Components/tst_ResponsiveGridView.qml (+2/-2) tests/qmltests/Components/tst_ResponsiveVerticalJournal.qml (+2/-2) tests/qmltests/Components/tst_Showable.qml (+1/-1) tests/qmltests/Dash/Previews/tst_Preview.qml (+2/-2) tests/qmltests/Dash/Previews/tst_PreviewActions.qml (+1/-1) tests/qmltests/Dash/Previews/tst_PreviewAudioPlayback.qml (+3/-3) tests/qmltests/Dash/Previews/tst_PreviewComment.qml (+1/-1) tests/qmltests/Dash/Previews/tst_PreviewCommentInput.qml (+1/-1) tests/qmltests/Dash/Previews/tst_PreviewExpandable.qml (+3/-3) tests/qmltests/Dash/Previews/tst_PreviewPayments.qml (+1/-1) tests/qmltests/Dash/Previews/tst_PreviewProgress.qml (+1/-1) tests/qmltests/Dash/Previews/tst_PreviewRatingDisplay.qml (+3/-3) tests/qmltests/Dash/Previews/tst_PreviewRatingEdit.qml (+3/-3) tests/qmltests/Dash/Previews/tst_PreviewRatingInput.qml (+3/-3) tests/qmltests/Dash/Previews/tst_PreviewTable.qml (+3/-3) tests/qmltests/Dash/Previews/tst_PreviewTextSummary.qml (+3/-3) tests/qmltests/Dash/Previews/tst_PreviewWidgetFactory.qml (+2/-2) tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingBoolean.qml (+1/-1) tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingList.qml (+1/-1) tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingNumber.qml (+1/-1) tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingString.qml (+1/-1) tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingsWidgetFactory.qml (+1/-1) tests/qmltests/Dash/tst_Card.qml (+3/-3) tests/qmltests/Dash/tst_CardBenchmark.qml (+1/-1) tests/qmltests/Dash/tst_CardTool.qml (+1/-1) tests/qmltests/Dash/tst_Dash.qml (+2/-2) tests/qmltests/Dash/tst_DashContent.qml (+1/-1) tests/qmltests/Dash/tst_GenericScopeView.qml (+4/-4) tests/qmltests/Dash/tst_PageHeader.qml (+3/-3) tests/qmltests/Dash/tst_PreviewListView.qml (+3/-3) tests/qmltests/Greeter/TestView.qml (+1/-1) tests/qmltests/Greeter/tst_Clock.qml (+1/-1) tests/qmltests/Greeter/tst_Greeter.qml (+1/-1) tests/qmltests/Greeter/tst_Infographics.qml (+1/-1) tests/qmltests/Greeter/tst_NarrowView.qml (+1/-1) tests/qmltests/Greeter/tst_WideView.qml (+1/-1) tests/qmltests/Launcher/tst_Launcher.qml (+1/-1) tests/qmltests/Notifications/tst_Notifications.qml (+1/-1) tests/qmltests/Notifications/tst_OptionToggle.qml (+1/-1) tests/qmltests/Notifications/tst_SwipeToAct.qml (+1/-1) tests/qmltests/Notifications/tst_VisualSnapDecisionsQueue.qml (+1/-1) tests/qmltests/Panel/IndicatorTest.qml (+1/-1) tests/qmltests/Panel/Indicators/tst_IndicatorsLight.qml (+1/-1) tests/qmltests/Panel/tst_IndicatorItem.qml (+1/-1) tests/qmltests/Panel/tst_IndicatorItemRow.qml (+1/-1) tests/qmltests/Panel/tst_IndicatorsBar.qml (+1/-1) tests/qmltests/Panel/tst_IndicatorsMenu.qml (+1/-1) tests/qmltests/Panel/tst_Panel.qml (+1/-1) tests/qmltests/Stages/ApplicationCheckBox.qml (+1/-1) tests/qmltests/Stages/RecursingChildSessionControl.qml (+1/-1) tests/qmltests/Stages/tst_ApplicationWindow.qml (+2/-2) tests/qmltests/Stages/tst_DesktopStage.qml (+2/-2) tests/qmltests/Stages/tst_PhoneStage.qml (+1/-1) tests/qmltests/Stages/tst_SessionContainer.qml (+1/-1) tests/qmltests/Stages/tst_Splash.qml (+1/-1) tests/qmltests/Stages/tst_SpreadDelegate.qml (+2/-2) tests/qmltests/Stages/tst_SurfaceContainer.qml (+1/-1) tests/qmltests/Stages/tst_TabletStage.qml (+2/-2) tests/qmltests/Stages/tst_WindowMoveResizeArea.qml (+2/-2) tests/qmltests/Tutorial/tst_Tutorial.qml (+1/-1) tests/qmltests/Wizard/tst_Wizard.qml (+2/-2) tests/qmltests/tst_OrientedShell.qml (+2/-2) tests/qmltests/tst_Shell.qml (+2/-2) tests/qmltests/tst_ShellWithPin.qml (+1/-1) tests/sdk/CMakeLists.txt (+6/-0) tests/sdk/check_sdk.py (+114/-0) tests/utils/modules/Unity/Test/MouseTouchEmulationCheckbox.qml (+1/-1) tests/utils/modules/Unity/Test/UnityTestCase.qml (+1/-1)
To merge this branch:	bzr merge lp:~aacid/unity8/use_sdk_13
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration		Needs Fixing on 2015-07-22
Mirco Müller (community)		2015-07-10	Abstain on 2015-07-17
Andrea Cimitan (community)			Needs Fixing on 2015-07-17
Review via email: mp+264392@code.launchpad.net