1
=== modified file 'components.api'
2
--- components.api	2015-04-25 05:31:43 +0000
3
+++ components.api	2015-05-02 11:10:54 +0000
4
@@ -246,7 +246,7 @@
5
246
    property Flickable flickable
246
    property Flickable flickable
6
247
    property list<Action> actions
247
    property list<Action> actions
7
248
Page 1.1
248
Page 1.1
9
249
Toolkit10.Page
249
Page10
10
250
    readonly property PageHeadConfiguration head
250
    readonly property PageHeadConfiguration head
11
251
Page 1.3
251
Page 1.3
12
252
PageTreeNode
252
PageTreeNode
13
253
253
14
=== modified file 'debian/ubuntu-ui-toolkit-theme.install'
15
--- debian/ubuntu-ui-toolkit-theme.install	2013-06-26 22:44:07 +0000
16
+++ debian/ubuntu-ui-toolkit-theme.install	2015-05-02 11:10:54 +0000
17
@@ -1,1 +1,17 @@
19
1
usr/lib/*/qt5/qml/Ubuntu/Components/Themes
1
usr/lib/*/qt5/qml/Ubuntu/Components/Themes/qmldir
20
2
usr/lib/*/qt5/qml/Ubuntu/Components/Themes/1.2/*.qml
21
3
usr/lib/*/qt5/qml/Ubuntu/Components/Themes/1.3/*.qml
22
4
usr/lib/*/qt5/qml/Ubuntu/Components/Themes/Ambiance/qmldir
23
5
usr/lib/*/qt5/qml/Ubuntu/Components/Themes/Ambiance/artwork
24
6
usr/lib/*/qt5/qml/Ubuntu/Components/Themes/Ambiance/1.2/*.qml
25
7
usr/lib/*/qt5/qml/Ubuntu/Components/Themes/Ambiance/1.3/*.qml
26
8
usr/lib/*/qt5/qml/Ubuntu/Components/Themes/SuruDark/qmldir
27
9
usr/lib/*/qt5/qml/Ubuntu/Components/Themes/SuruDark/parent_theme
28
10
usr/lib/*/qt5/qml/Ubuntu/Components/Themes/SuruDark/artwork
29
11
usr/lib/*/qt5/qml/Ubuntu/Components/Themes/SuruDark/1.2/*.qml
30
12
usr/lib/*/qt5/qml/Ubuntu/Components/Themes/SuruDark/1.3/*.qml
31
13
usr/lib/*/qt5/qml/Ubuntu/Components/Themes/SuruGradient/qmldir
32
14
usr/lib/*/qt5/qml/Ubuntu/Components/Themes/SuruGradient/deprecated
33
15
usr/lib/*/qt5/qml/Ubuntu/Components/Themes/SuruGradient/parent_theme
34
16
usr/lib/*/qt5/qml/Ubuntu/Components/Themes/SuruGradient/artwork
35
17
usr/lib/*/qt5/qml/Ubuntu/Components/Themes/SuruGradient/*.qml
36
2
18
37
=== modified file 'documentation/ubuntu-ui-toolkit-common.qdocconf'
38
--- documentation/ubuntu-ui-toolkit-common.qdocconf	2015-04-17 07:39:12 +0000
39
+++ documentation/ubuntu-ui-toolkit-common.qdocconf	2015-05-02 11:10:54 +0000
40
@@ -11,7 +11,7 @@
41
11
sourcedirs += ../modules/Ubuntu/Test
11
sourcedirs += ../modules/Ubuntu/Test
42
12
headerdirs += ../modules/Ubuntu/Test/plugin
12
headerdirs += ../modules/Ubuntu/Test/plugin
43
13
exampledirs += snippets
13
exampledirs += snippets
45
14
exampledirs += ../examples
14
exampledirs += ../examples/1.3
46
15
exampledirs += ../modules/Ubuntu/Components
15
exampledirs += ../modules/Ubuntu/Components
47
16
excludedirs += ../modules/Ubuntu/Components/Themes/Ambiance
16
excludedirs += ../modules/Ubuntu/Components/Themes/Ambiance
48
17
excludedirs += ../modules/Ubuntu/Components/Themes/SuruDark
17
excludedirs += ../modules/Ubuntu/Components/Themes/SuruDark
49
18
18
50
=== added directory 'examples/1.3'
51
=== added file 'examples/1.3/1.3.pro'
52
--- examples/1.3/1.3.pro	1970-01-01 00:00:00 +0000
53
+++ examples/1.3/1.3.pro	2015-05-02 11:10:54 +0000
54
@@ -0,0 +1,10 @@
55
1
TEMPLATE = subdirs
56
2
57
3
SUBDIRS += \ 
58
4
    ubuntu-ui-toolkit-gallery\
59
5
    locale \
60
6
    jokes \
61
7
    unit-converter \
62
8
    calculator \
63
9
    customtheme
64
10
65
0
11
66
=== renamed directory 'examples/calculator' => 'examples/1.3/calculator'
67
=== modified file 'examples/1.3/calculator/calculator.qml'
68
--- examples/calculator/calculator.qml	2015-03-03 13:47:48 +0000
69
+++ examples/1.3/calculator/calculator.qml	2015-05-02 11:10:54 +0000
70
@@ -17,7 +17,7 @@
71
17
 */
17
 */
72
18
18
73
19
import QtQuick 2.0
19
import QtQuick 2.0
75
20
import Ubuntu.Components 1.2
20
import Ubuntu.Components 1.3
76
21
import Ubuntu.Layouts 1.0
21
import Ubuntu.Layouts 1.0
77
22
import "components"
22
import "components"
78
23
import "components/calculator.js" as Calculator
23
import "components/calculator.js" as Calculator
79
24
24
80
=== modified file 'examples/1.3/calculator/components/DefaultLayout.qml'
81
--- examples/calculator/components/DefaultLayout.qml	2015-03-03 13:47:48 +0000
82
+++ examples/1.3/calculator/components/DefaultLayout.qml	2015-05-02 11:10:54 +0000
83
@@ -17,7 +17,7 @@
84
17
 */
17
 */
85
18
18
86
19
import QtQuick 2.0
19
import QtQuick 2.0
88
20
import Ubuntu.Components 1.2
20
import Ubuntu.Components 1.3
89
21
import Ubuntu.Layouts 1.0
21
import Ubuntu.Layouts 1.0
90
22
22
91
23
Item {
23
Item {
92
24
24
93
=== modified file 'examples/1.3/calculator/components/Functions.qml'
94
--- examples/calculator/components/Functions.qml	2015-03-03 13:47:48 +0000
95
+++ examples/1.3/calculator/components/Functions.qml	2015-05-02 11:10:54 +0000
96
@@ -17,7 +17,7 @@
97
17
 */
17
 */
98
18
18
99
19
import QtQuick 2.0
19
import QtQuick 2.0
101
20
import Ubuntu.Components 1.2
20
import Ubuntu.Components 1.3
102
21
import Ubuntu.Layouts 1.0
21
import Ubuntu.Layouts 1.0
103
22
22
104
23
Grid {
23
Grid {
105
24
24
106
=== renamed directory 'examples/customtheme' => 'examples/1.3/customtheme'
107
=== renamed directory 'examples/jokes' => 'examples/1.3/jokes'
108
=== modified file 'examples/1.3/jokes/jokes.qml'
109
--- examples/jokes/jokes.qml	2015-03-03 13:47:48 +0000
110
+++ examples/1.3/jokes/jokes.qml	2015-05-02 11:10:54 +0000
111
@@ -16,7 +16,7 @@
112
16
 */
16
 */
113
17
17
114
18
import QtQuick 2.0
18
import QtQuick 2.0
116
19
import Ubuntu.Components 1.2
19
import Ubuntu.Components 1.3
117
20
import QtMultimedia 5.0
20
import QtMultimedia 5.0
118
21
21
119
22
/*!
22
/*!
120
23
23
121
=== renamed directory 'examples/locale' => 'examples/1.3/locale'
122
=== renamed directory 'examples/ubuntu-ui-toolkit-gallery' => 'examples/1.3/ubuntu-ui-toolkit-gallery'
123
=== modified file 'examples/1.3/ubuntu-ui-toolkit-gallery/AnimationCircle.qml'
124
--- examples/ubuntu-ui-toolkit-gallery/AnimationCircle.qml	2015-03-03 13:20:06 +0000
125
+++ examples/1.3/ubuntu-ui-toolkit-gallery/AnimationCircle.qml	2015-05-02 11:10:54 +0000
126
@@ -15,7 +15,7 @@
127
15
 */
15
 */
128
16
16
129
17
import QtQuick 2.0
17
import QtQuick 2.0
131
18
import Ubuntu.Components 0.1
18
import Ubuntu.Components 1.3
132
19
19
133
20
Rectangle {
20
Rectangle {
134
21
    id: circle
21
    id: circle
135
22
22
136
=== modified file 'examples/1.3/ubuntu-ui-toolkit-gallery/Animations.qml'
137
--- examples/ubuntu-ui-toolkit-gallery/Animations.qml	2015-03-03 13:20:06 +0000
138
+++ examples/1.3/ubuntu-ui-toolkit-gallery/Animations.qml	2015-05-02 11:10:54 +0000
139
@@ -15,7 +15,7 @@
140
15
 */
15
 */
141
16
16
142
17
import QtQuick 2.0
17
import QtQuick 2.0
144
18
import Ubuntu.Components 0.1
18
import Ubuntu.Components 1.3
145
19
19
146
20
Template {
20
Template {
147
21
    objectName: "animationsTemplate"
21
    objectName: "animationsTemplate"
148
22
22
149
=== modified file 'examples/1.3/ubuntu-ui-toolkit-gallery/Buttons.qml'
150
--- examples/ubuntu-ui-toolkit-gallery/Buttons.qml	2015-03-03 13:47:48 +0000
151
+++ examples/1.3/ubuntu-ui-toolkit-gallery/Buttons.qml	2015-05-02 11:10:54 +0000
152
@@ -15,7 +15,7 @@
153
15
 */
15
 */
154
16
16
155
17
import QtQuick 2.4
17
import QtQuick 2.4
157
18
import Ubuntu.Components 1.2
18
import Ubuntu.Components 1.3
158
19
import Ubuntu.Components.ListItems 1.0
19
import Ubuntu.Components.ListItems 1.0
159
20
20
160
21
Template {
21
Template {
161
22
22
162
=== modified file 'examples/1.3/ubuntu-ui-toolkit-gallery/Colors.qml'
163
--- examples/ubuntu-ui-toolkit-gallery/Colors.qml	2015-03-03 13:47:48 +0000
164
+++ examples/1.3/ubuntu-ui-toolkit-gallery/Colors.qml	2015-05-02 11:10:54 +0000
165
@@ -15,7 +15,7 @@
166
15
 */
15
 */
167
16
16
168
17
import QtQuick 2.4
17
import QtQuick 2.4
170
18
import Ubuntu.Components 1.2
18
import Ubuntu.Components 1.3
171
19
19
172
20
Template {
20
Template {
173
21
    objectName: "colorsTemplate"
21
    objectName: "colorsTemplate"
174
22
22
175
=== modified file 'examples/1.3/ubuntu-ui-toolkit-gallery/CrossFadeImage.qml'
176
--- examples/ubuntu-ui-toolkit-gallery/CrossFadeImage.qml	2015-03-11 17:10:20 +0000
177
+++ examples/1.3/ubuntu-ui-toolkit-gallery/CrossFadeImage.qml	2015-05-02 11:10:54 +0000
178
@@ -15,7 +15,7 @@
179
15
 */
15
 */
180
16
16
181
17
import QtQuick 2.4
17
import QtQuick 2.4
183
18
import Ubuntu.Components 1.2
18
import Ubuntu.Components 1.3
184
19
19
185
20
Template {
20
Template {
186
21
    objectName: "crossFadeImagesTemplate"
21
    objectName: "crossFadeImagesTemplate"
187
22
22
188
=== modified file 'examples/1.3/ubuntu-ui-toolkit-gallery/Dialog.qml'
189
--- examples/ubuntu-ui-toolkit-gallery/Dialog.qml	2015-03-11 17:10:20 +0000
190
+++ examples/1.3/ubuntu-ui-toolkit-gallery/Dialog.qml	2015-05-02 11:10:54 +0000
191
@@ -15,7 +15,7 @@
192
15
 */
15
 */
193
16
16
194
17
import QtQuick 2.4
17
import QtQuick 2.4
196
18
import Ubuntu.Components 1.2
18
import Ubuntu.Components 1.3
197
19
import Ubuntu.Components.Popups 1.0
19
import Ubuntu.Components.Popups 1.0
198
20
20
199
21
Template {
21
Template {
200
22
22
201
=== modified file 'examples/1.3/ubuntu-ui-toolkit-gallery/Icons.qml'
202
--- examples/ubuntu-ui-toolkit-gallery/Icons.qml	2015-03-03 13:20:06 +0000
203
+++ examples/1.3/ubuntu-ui-toolkit-gallery/Icons.qml	2015-05-02 11:10:54 +0000
204
@@ -15,7 +15,7 @@
205
15
 */
15
 */
206
16
16
207
17
import QtQuick 2.0
17
import QtQuick 2.0
209
18
import Ubuntu.Components 1.0
18
import Ubuntu.Components 1.3
210
19
import Ubuntu.Components.ListItems 0.1 as ListItem
19
import Ubuntu.Components.ListItems 0.1 as ListItem
211
20
import Ubuntu.Components.Popups 1.0
20
import Ubuntu.Components.Popups 1.0
212
21
import Qt.labs.folderlistmodel 2.1
21
import Qt.labs.folderlistmodel 2.1
213
22
22
214
=== modified file 'examples/1.3/ubuntu-ui-toolkit-gallery/Label.qml'
215
--- examples/ubuntu-ui-toolkit-gallery/Label.qml	2015-03-03 13:20:06 +0000
216
+++ examples/1.3/ubuntu-ui-toolkit-gallery/Label.qml	2015-05-02 11:10:54 +0000
217
@@ -15,7 +15,7 @@
218
15
 */
15
 */
219
16
16
220
17
import QtQuick 2.0
17
import QtQuick 2.0
222
18
import Ubuntu.Components 1.0
18
import Ubuntu.Components 1.3
223
19
19
224
20
Template {
20
Template {
225
21
    objectName: "labelsTemplate"
21
    objectName: "labelsTemplate"
226
22
22
227
=== modified file 'examples/1.3/ubuntu-ui-toolkit-gallery/ListItemWithLabel.qml'
228
--- examples/ubuntu-ui-toolkit-gallery/ListItemWithLabel.qml	2015-02-18 11:16:32 +0000
229
+++ examples/1.3/ubuntu-ui-toolkit-gallery/ListItemWithLabel.qml	2015-05-02 11:10:54 +0000
230
@@ -15,7 +15,7 @@
231
15
 */
15
 */
232
16
16
233
17
import QtQuick 2.2
17
import QtQuick 2.2
235
18
import Ubuntu.Components 1.2
18
import Ubuntu.Components 1.3
236
19
19
237
20
ListItem {
20
ListItem {
238
21
    property alias text: label.text
21
    property alias text: label.text
239
22
22
240
=== modified file 'examples/1.3/ubuntu-ui-toolkit-gallery/ListItemsSection.qml'
241
--- examples/ubuntu-ui-toolkit-gallery/ListItemsSection.qml	2015-03-03 13:20:06 +0000
242
+++ examples/1.3/ubuntu-ui-toolkit-gallery/ListItemsSection.qml	2015-05-02 11:10:54 +0000
243
@@ -15,7 +15,7 @@
244
15
 */
15
 */
245
16
16
246
17
import QtQuick 2.0
17
import QtQuick 2.0
248
18
import Ubuntu.Components 0.1
18
import Ubuntu.Components 1.3
249
19
19
250
20
TemplateSection {
20
TemplateSection {
251
21
    id: section
21
    id: section
252
22
22
253
=== modified file 'examples/1.3/ubuntu-ui-toolkit-gallery/Navigation.qml'
254
--- examples/ubuntu-ui-toolkit-gallery/Navigation.qml	2015-03-05 09:35:06 +0000
255
+++ examples/1.3/ubuntu-ui-toolkit-gallery/Navigation.qml	2015-05-02 11:10:54 +0000
256
@@ -15,7 +15,7 @@
257
15
 */
15
 */
258
16
16
259
17
import QtQuick 2.0
17
import QtQuick 2.0
261
18
import Ubuntu.Components 0.1
18
import Ubuntu.Components 1.3
262
19
19
263
20
Template {
20
Template {
264
21
    objectName: "navigationTemplate"
21
    objectName: "navigationTemplate"
265
22
22
266
=== modified file 'examples/1.3/ubuntu-ui-toolkit-gallery/NewListItems.qml'
267
--- examples/ubuntu-ui-toolkit-gallery/NewListItems.qml	2015-02-25 14:14:05 +0000
268
+++ examples/1.3/ubuntu-ui-toolkit-gallery/NewListItems.qml	2015-05-02 11:10:54 +0000
269
@@ -15,7 +15,7 @@
270
15
 */
15
 */
271
16
16
272
17
import QtQuick 2.2
17
import QtQuick 2.2
274
18
import Ubuntu.Components 1.2
18
import Ubuntu.Components 1.3
275
19
19
276
20
Template {
20
Template {
277
21
    objectName: "listItemsTemplate"
21
    objectName: "listItemsTemplate"
278
22
22
279
=== modified file 'examples/1.3/ubuntu-ui-toolkit-gallery/OptionSelectors.qml'
280
--- examples/ubuntu-ui-toolkit-gallery/OptionSelectors.qml	2015-03-11 17:10:20 +0000
281
+++ examples/1.3/ubuntu-ui-toolkit-gallery/OptionSelectors.qml	2015-05-02 11:10:54 +0000
282
@@ -15,7 +15,7 @@
283
15
 */
15
 */
284
16
16
285
17
import QtQuick 2.0
17
import QtQuick 2.0
287
18
import Ubuntu.Components 0.1
18
import Ubuntu.Components 1.3
288
19
19
289
20
Template {
20
Template {
290
21
    objectName: "optionSelectorsTemplate"
21
    objectName: "optionSelectorsTemplate"
291
22
22
292
=== modified file 'examples/1.3/ubuntu-ui-toolkit-gallery/Popover.qml'
293
--- examples/ubuntu-ui-toolkit-gallery/Popover.qml	2015-03-11 17:10:20 +0000
294
+++ examples/1.3/ubuntu-ui-toolkit-gallery/Popover.qml	2015-05-02 11:10:54 +0000
295
@@ -15,7 +15,7 @@
296
15
 */
15
 */
297
16
16
298
17
import QtQuick 2.0
17
import QtQuick 2.0
300
18
import Ubuntu.Components 0.1
18
import Ubuntu.Components 1.3
301
19
import Ubuntu.Components.Popups 0.1
19
import Ubuntu.Components.Popups 0.1
302
20
20
303
21
Template {
21
Template {
304
22
22
305
=== modified file 'examples/1.3/ubuntu-ui-toolkit-gallery/ProgressBars.qml'
306
--- examples/ubuntu-ui-toolkit-gallery/ProgressBars.qml	2015-03-12 09:15:35 +0000
307
+++ examples/1.3/ubuntu-ui-toolkit-gallery/ProgressBars.qml	2015-05-02 11:10:54 +0000
308
@@ -15,7 +15,7 @@
309
15
 */
15
 */
310
16
16
311
17
import QtQuick 2.4
17
import QtQuick 2.4
313
18
import Ubuntu.Components 1.2
18
import Ubuntu.Components 1.3
314
19
19
315
20
Template {
20
Template {
316
21
    objectName: "progressBarsTemplate"
21
    objectName: "progressBarsTemplate"
317
22
22
318
=== modified file 'examples/1.3/ubuntu-ui-toolkit-gallery/Sheet.qml'
319
--- examples/ubuntu-ui-toolkit-gallery/Sheet.qml	2015-03-11 17:10:20 +0000
320
+++ examples/1.3/ubuntu-ui-toolkit-gallery/Sheet.qml	2015-05-02 11:10:54 +0000
321
@@ -15,7 +15,7 @@
322
15
 */
15
 */
323
16
16
324
17
import QtQuick 2.0
17
import QtQuick 2.0
326
18
import Ubuntu.Components 0.1
18
import Ubuntu.Components 1.3
327
19
import Ubuntu.Components.Popups 0.1
19
import Ubuntu.Components.Popups 0.1
328
20
20
329
21
Template {
21
Template {
330
22
22
331
=== modified file 'examples/1.3/ubuntu-ui-toolkit-gallery/Sliders.qml'
332
--- examples/ubuntu-ui-toolkit-gallery/Sliders.qml	2015-03-20 21:25:13 +0000
333
+++ examples/1.3/ubuntu-ui-toolkit-gallery/Sliders.qml	2015-05-02 11:10:54 +0000
334
@@ -15,7 +15,7 @@
335
15
 */
15
 */
336
16
16
337
17
import QtQuick 2.0
17
import QtQuick 2.0
339
18
import Ubuntu.Components 0.1
18
import Ubuntu.Components 1.3
340
19
19
341
20
Template {
20
Template {
342
21
    objectName: "slidersTemplate"
21
    objectName: "slidersTemplate"
343
22
22
344
=== modified file 'examples/1.3/ubuntu-ui-toolkit-gallery/Template.qml'
345
--- examples/ubuntu-ui-toolkit-gallery/Template.qml	2015-03-03 13:20:06 +0000
346
+++ examples/1.3/ubuntu-ui-toolkit-gallery/Template.qml	2015-05-02 11:10:54 +0000
347
@@ -15,7 +15,7 @@
348
15
 */
15
 */
349
16
16
350
17
import QtQuick 2.0
17
import QtQuick 2.0
352
18
import Ubuntu.Components 0.1
18
import Ubuntu.Components 1.3
353
19
19
354
20
Item {
20
Item {
355
21
    id: template
21
    id: template
356
22
22
357
=== modified file 'examples/1.3/ubuntu-ui-toolkit-gallery/TemplateFlow.qml'
358
--- examples/ubuntu-ui-toolkit-gallery/TemplateFlow.qml	2015-03-03 13:20:06 +0000
359
+++ examples/1.3/ubuntu-ui-toolkit-gallery/TemplateFlow.qml	2015-05-02 11:10:54 +0000
360
@@ -15,7 +15,7 @@
361
15
 */
15
 */
362
16
16
363
17
import QtQuick 2.0
17
import QtQuick 2.0
365
18
import Ubuntu.Components 0.1
18
import Ubuntu.Components 1.3
366
19
19
367
20
Item {
20
Item {
368
21
    id: templateFlow
21
    id: templateFlow
369
22
22
370
=== modified file 'examples/1.3/ubuntu-ui-toolkit-gallery/TemplateRow.qml'
371
--- examples/ubuntu-ui-toolkit-gallery/TemplateRow.qml	2015-03-03 13:20:06 +0000
372
+++ examples/1.3/ubuntu-ui-toolkit-gallery/TemplateRow.qml	2015-05-02 11:10:54 +0000
373
@@ -15,7 +15,7 @@
374
15
 */
15
 */
375
16
16
376
17
import QtQuick 2.0
17
import QtQuick 2.0
378
18
import Ubuntu.Components 0.1
18
import Ubuntu.Components 1.3
379
19
19
380
20
Item {
20
Item {
381
21
    id: templateRow
21
    id: templateRow
382
22
22
383
=== modified file 'examples/1.3/ubuntu-ui-toolkit-gallery/TemplateSection.qml'
384
--- examples/ubuntu-ui-toolkit-gallery/TemplateSection.qml	2015-03-03 13:20:06 +0000
385
+++ examples/1.3/ubuntu-ui-toolkit-gallery/TemplateSection.qml	2015-05-02 11:10:54 +0000
386
@@ -15,7 +15,7 @@
387
15
 */
15
 */
388
16
16
389
17
import QtQuick 2.0
17
import QtQuick 2.0
391
18
import Ubuntu.Components 0.1
18
import Ubuntu.Components 1.3
392
19
19
393
20
Column {
20
Column {
394
21
    id: templateSection
21
    id: templateSection
395
22
22
396
=== modified file 'examples/1.3/ubuntu-ui-toolkit-gallery/TemplateSectionNavigation.qml'
397
--- examples/ubuntu-ui-toolkit-gallery/TemplateSectionNavigation.qml	2015-03-03 13:20:06 +0000
398
+++ examples/1.3/ubuntu-ui-toolkit-gallery/TemplateSectionNavigation.qml	2015-05-02 11:10:54 +0000
399
@@ -15,7 +15,7 @@
400
15
 */
15
 */
401
16
16
402
17
import QtQuick 2.0
17
import QtQuick 2.0
404
18
import Ubuntu.Components 0.1
18
import Ubuntu.Components 1.3
405
19
19
406
20
Column {
20
Column {
407
21
    id: templateSection
21
    id: templateSection
408
22
22
409
=== modified file 'examples/1.3/ubuntu-ui-toolkit-gallery/TextInputs.qml'
410
--- examples/ubuntu-ui-toolkit-gallery/TextInputs.qml	2015-03-10 11:49:27 +0000
411
+++ examples/1.3/ubuntu-ui-toolkit-gallery/TextInputs.qml	2015-05-02 11:10:54 +0000
412
@@ -15,7 +15,7 @@
413
15
 */
15
 */
414
16
16
415
17
import QtQuick 2.0
17
import QtQuick 2.0
417
18
import Ubuntu.Components 0.1
18
import Ubuntu.Components 1.3
418
19
19
419
20
Template {
20
Template {
420
21
    objectName: "textinputsTemplate"
21
    objectName: "textinputsTemplate"
421
22
22
422
=== modified file 'examples/1.3/ubuntu-ui-toolkit-gallery/Toggles.qml'
423
--- examples/ubuntu-ui-toolkit-gallery/Toggles.qml	2015-03-03 13:20:06 +0000
424
+++ examples/1.3/ubuntu-ui-toolkit-gallery/Toggles.qml	2015-05-02 11:10:54 +0000
425
@@ -15,7 +15,7 @@
426
15
 */
15
 */
427
16
16
428
17
import QtQuick 2.0
17
import QtQuick 2.0
430
18
import Ubuntu.Components 0.1
18
import Ubuntu.Components 1.3
431
19
19
432
20
Template {
20
Template {
433
21
    objectName: "togglesTemplate"
21
    objectName: "togglesTemplate"
434
22
22
435
=== modified file 'examples/1.3/ubuntu-ui-toolkit-gallery/UbuntuListViews.qml'
436
--- examples/ubuntu-ui-toolkit-gallery/UbuntuListViews.qml	2015-03-03 13:47:48 +0000
437
+++ examples/1.3/ubuntu-ui-toolkit-gallery/UbuntuListViews.qml	2015-05-02 11:10:54 +0000
438
@@ -15,7 +15,7 @@
439
15
 */
15
 */
440
16
16
441
17
import QtQuick 2.4
17
import QtQuick 2.4
443
18
import Ubuntu.Components 1.2
18
import Ubuntu.Components 1.3
444
19
import Ubuntu.Components.ListItems 1.0 as ListItem
19
import Ubuntu.Components.ListItems 1.0 as ListItem
445
20
20
446
21
Template {
21
Template {
447
22
22
448
=== modified file 'examples/1.3/ubuntu-ui-toolkit-gallery/WebLink.qml'
449
--- examples/ubuntu-ui-toolkit-gallery/WebLink.qml	2015-04-01 08:44:56 +0000
450
+++ examples/1.3/ubuntu-ui-toolkit-gallery/WebLink.qml	2015-05-02 11:10:54 +0000
451
@@ -15,7 +15,7 @@
452
15
 */
15
 */
453
16
16
454
17
import QtQuick 2.0
17
import QtQuick 2.0
456
18
import Ubuntu.Components 0.1
18
import Ubuntu.Components 1.3
457
19
19
458
20
Label {
20
Label {
459
21
    id: webLink
21
    id: webLink
460
22
22
461
=== modified file 'examples/1.3/ubuntu-ui-toolkit-gallery/ubuntu-ui-toolkit-gallery.qml'
462
--- examples/ubuntu-ui-toolkit-gallery/ubuntu-ui-toolkit-gallery.qml	2015-03-03 13:47:48 +0000
463
+++ examples/1.3/ubuntu-ui-toolkit-gallery/ubuntu-ui-toolkit-gallery.qml	2015-05-02 11:10:54 +0000
464
@@ -15,7 +15,7 @@
465
15
 */
15
 */
466
16
16
467
17
import QtQuick 2.4
17
import QtQuick 2.4
469
18
import Ubuntu.Components 1.1 // keep 1.1 till we remove the deprecated toolbar and toolbar in general
18
import Ubuntu.Components 1.3
470
19
import Ubuntu.Components.ListItems 0.1 as ListItem
19
import Ubuntu.Components.ListItems 0.1 as ListItem
471
20
20
472
21
MainView {
21
MainView {
473
@@ -26,8 +26,6 @@
474
26
    // Note! applicationName needs to match the .desktop filename
26
    // Note! applicationName needs to match the .desktop filename
475
27
    applicationName: "ubuntu-ui-toolkit-gallery"
27
    applicationName: "ubuntu-ui-toolkit-gallery"
476
28
28
477
29
    useDeprecatedToolbar: false
478
30
479
31
    width: units.gu(120)
29
    width: units.gu(120)
480
32
    height: units.gu(75)
30
    height: units.gu(75)
481
33
31
482
@@ -145,9 +143,6 @@
483
145
                             selectedWidget = null;
143
                             selectedWidget = null;
484
146
                         }
144
                         }
485
147
145
486
148
        ToolbarItems{ id: defTools}
487
149
        tools: contentLoader.item && contentLoader.item.tools ? contentLoader.item.tools : defTools
488
150
489
151
        Loader {
146
        Loader {
490
152
            id: contentLoader
147
            id: contentLoader
491
153
            objectName: "contentLoader"
148
            objectName: "contentLoader"
492
154
149
493
=== renamed directory 'examples/unit-converter' => 'examples/1.3/unit-converter'
494
=== modified file 'examples/1.3/unit-converter/unit-converter.qml'
495
--- examples/unit-converter/unit-converter.qml	2015-03-03 13:47:48 +0000
496
+++ examples/1.3/unit-converter/unit-converter.qml	2015-05-02 11:10:54 +0000
497
@@ -15,7 +15,7 @@
498
15
 */
15
 */
499
16
16
500
17
import QtQuick 2.4
17
import QtQuick 2.4
502
18
import Ubuntu.Components 1.2
18
import Ubuntu.Components 1.3
503
19
import "conversion.js" as Converter
19
import "conversion.js" as Converter
504
20
20
505
21
/*!
21
/*!
506
@@ -140,13 +140,12 @@
507
140
                    }
140
                    }
508
141
                }
141
                }
509
142
            }
142
            }
517
143
            tools: ToolbarActions {
143
518
144
                Action {
144
            head.actions: Action {
519
145
                    objectName: "action"
145
                objectName: "action"
520
146
                    iconSource: Qt.resolvedUrl("toolbarIcon.png")
146
                iconName: "clear"
521
147
                    text: i18n.tr("Clear")
147
                text: i18n.tr("Clear")
522
148
                    onTriggered: Converter.clear(converter)
148
                onTriggered: Converter.clear(converter)
516
149
                }
523
150
            }
149
            }
524
151
        }
150
        }
525
152
    }
151
    }
526
153
152
527
=== modified file 'examples/examples.pro'
528
--- examples/examples.pro	2015-04-15 12:03:50 +0000
529
+++ examples/examples.pro	2015-05-02 11:10:54 +0000
530
@@ -1,11 +1,7 @@
531
1
TEMPLATE = subdirs
1
TEMPLATE = subdirs
532
2
2
533
3
SUBDIRS += \ 
3
SUBDIRS += \ 
539
4
    ubuntu-ui-toolkit-gallery\
4
    1.3
535
5
    locale \
536
6
    unit-converter \
537
7
    calculator \
538
8
    customtheme
540
9
5
541
10
6
542
11
#examples = jokes unit-converter
7
#examples = jokes unit-converter
543
12
8
544
=== modified file 'modules/Ubuntu/Components/ActionList.qml'
545
--- modules/Ubuntu/Components/ActionList.qml	2015-03-03 13:47:48 +0000
546
+++ modules/Ubuntu/Components/ActionList.qml	2015-05-02 11:10:54 +0000
547
@@ -15,7 +15,7 @@
548
15
 */
15
 */
549
16
16
550
17
import QtQuick 2.4
17
import QtQuick 2.4
552
18
import Ubuntu.Components 1.2
18
import Ubuntu.Components 1.3
553
19
19
554
20
/*!
20
/*!
555
21
    \qmltype ActionList
21
    \qmltype ActionList
556
22
22
557
=== modified file 'modules/Ubuntu/Components/Captions.qml'
558
--- modules/Ubuntu/Components/Captions.qml	2015-03-03 14:23:22 +0000
559
+++ modules/Ubuntu/Components/Captions.qml	2015-05-02 11:10:54 +0000
560
@@ -16,7 +16,7 @@
561
16
16
562
17
import QtQuick 2.4
17
import QtQuick 2.4
563
18
import QtQuick.Layouts 1.1
18
import QtQuick.Layouts 1.1
565
19
import Ubuntu.Components 1.2
19
import Ubuntu.Components 1.3
566
20
20
567
21
/*!
21
/*!
568
22
  \qmltype Captions
22
  \qmltype Captions
569
@@ -37,7 +37,7 @@
570
37
37
571
38
  \qml
38
  \qml
572
39
  import QtQuick 2.4
39
  import QtQuick 2.4
574
40
  import Ubuntu.Components 1.2
40
  import Ubuntu.Components 1.3
575
41
41
576
42
  ListItem {
42
  ListItem {
577
43
      RowLayout {
43
      RowLayout {
578
44
44
579
=== modified file 'modules/Ubuntu/Components/ComboButton.qml'
580
--- modules/Ubuntu/Components/ComboButton.qml	2015-04-09 09:42:36 +0000
581
+++ modules/Ubuntu/Components/ComboButton.qml	2015-05-02 11:10:54 +0000
582
@@ -42,7 +42,7 @@
583
42
        list will be expanded only to the height of the content.
42
        list will be expanded only to the height of the content.
584
43
        \qml
43
        \qml
585
44
        import QtQuick 2.4
44
        import QtQuick 2.4
587
45
        import Ubuntu.Components 1.2
45
        import Ubuntu.Components 1.3
588
46
        ComboButton {
46
        ComboButton {
589
47
            text: "smaller content"
47
            text: "smaller content"
590
48
            Rectangle {
48
            Rectangle {
591
@@ -58,7 +58,7 @@
592
58
        itself.
58
        itself.
593
59
        \qml
59
        \qml
594
60
        import QtQuick 2.4
60
        import QtQuick 2.4
596
61
        import Ubuntu.Components 1.2
61
        import Ubuntu.Components 1.3
597
62
        ComboButton {
62
        ComboButton {
598
63
            text: "long scrolled content"
63
            text: "long scrolled content"
599
64
            Column {
64
            Column {
600
@@ -77,7 +77,7 @@
601
77
        the content will be filling the entire combo list area defined.
77
        the content will be filling the entire combo list area defined.
602
78
        \qml
78
        \qml
603
79
        import QtQuick 2.4
79
        import QtQuick 2.4
605
80
        import Ubuntu.Components 1.2
80
        import Ubuntu.Components 1.3
606
81
        import Ubuntu.Components.ListItems 1.0
81
        import Ubuntu.Components.ListItems 1.0
607
82
        ComboButton {
82
        ComboButton {
608
83
            text: "listview"
83
            text: "listview"
609
@@ -95,7 +95,7 @@
610
95
        bind its height to the \l comboListHeight property.
95
        bind its height to the \l comboListHeight property.
611
96
        \qml
96
        \qml
612
97
        import QtQuick 2.4
97
        import QtQuick 2.4
614
98
        import Ubuntu.Components 1.2
98
        import Ubuntu.Components 1.3
615
99
        ComboButton {
99
        ComboButton {
616
100
            id: combo
100
            id: combo
617
101
            text: "smaller content"
101
            text: "smaller content"
618
@@ -109,7 +109,7 @@
619
109
        expandedHeight should be set to -1.
109
        expandedHeight should be set to -1.
620
110
        \qml
110
        \qml
621
111
        import QtQuick 2.4
111
        import QtQuick 2.4
623
112
        import Ubuntu.Components 1.2
112
        import Ubuntu.Components 1.3
624
113
        ComboButton {
113
        ComboButton {
625
114
            text: "auto-sized content"
114
            text: "auto-sized content"
626
115
            expandedHeight: -1
115
            expandedHeight: -1
627
@@ -135,7 +135,7 @@
628
135
135
629
136
    \qml
136
    \qml
630
137
    import QtQuick 2.4
137
    import QtQuick 2.4
632
138
    import Ubuntu.Components 1.2
138
    import Ubuntu.Components 1.3
633
139
139
634
140
    ComboButton {
140
    ComboButton {
635
141
        id: combo
141
        id: combo
636
@@ -202,7 +202,7 @@
637
202
      that can be used to size the combo list content.
202
      that can be used to size the combo list content.
638
203
      \qml
203
      \qml
639
204
      import QtQuick 2.4
204
      import QtQuick 2.4
641
205
      import Ubuntu.Components 1.2
205
      import Ubuntu.Components 1.3
642
206
      import Ubuntu.Components.ListItems 0.1
206
      import Ubuntu.Components.ListItems 0.1
643
207
      ComboButton {
207
      ComboButton {
644
208
          id: combo
208
          id: combo
645
209
209
646
=== modified file 'modules/Ubuntu/Components/CrossFadeImage10.qml'
647
--- modules/Ubuntu/Components/CrossFadeImage10.qml	2015-03-03 13:47:48 +0000
648
+++ modules/Ubuntu/Components/CrossFadeImage10.qml	2015-05-02 11:10:54 +0000
649
@@ -19,7 +19,7 @@
650
19
// we need to use named imports otherwise namespace collision is reported
19
// we need to use named imports otherwise namespace collision is reported
651
20
// by the QML engine. As workaround, we use Ubuntu named import.
20
// by the QML engine. As workaround, we use Ubuntu named import.
652
21
// Bug to watch: https://bugreports.qt-project.org/browse/QTBUG-27645
21
// Bug to watch: https://bugreports.qt-project.org/browse/QTBUG-27645
654
22
import Ubuntu.Components 1.2 as Ubuntu
22
import Ubuntu.Components 1.3 as Ubuntu
655
23
23
656
24
/*!
24
/*!
657
25
  \internal
25
  \internal
658
26
26
659
=== modified file 'modules/Ubuntu/Components/CrossFadeImage11.qml'
660
--- modules/Ubuntu/Components/CrossFadeImage11.qml	2015-03-03 13:47:48 +0000
661
+++ modules/Ubuntu/Components/CrossFadeImage11.qml	2015-05-02 11:10:54 +0000
662
@@ -19,7 +19,7 @@
663
19
// we need to use named imports otherwise namespace collision is reported
19
// we need to use named imports otherwise namespace collision is reported
664
20
// by the QML engine. As workaround, we use Ubuntu named import.
20
// by the QML engine. As workaround, we use Ubuntu named import.
665
21
// Bug to watch: https://bugreports.qt-project.org/browse/QTBUG-27645
21
// Bug to watch: https://bugreports.qt-project.org/browse/QTBUG-27645
667
22
import Ubuntu.Components 1.2 as Ubuntu
22
import Ubuntu.Components 1.3 as Ubuntu
668
23
23
669
24
/*!
24
/*!
670
25
  \internal
25
  \internal
671
26
26
672
=== modified file 'modules/Ubuntu/Components/InputHandler.qml'
673
--- modules/Ubuntu/Components/InputHandler.qml	2015-03-10 11:49:27 +0000
674
+++ modules/Ubuntu/Components/InputHandler.qml	2015-05-02 11:10:54 +0000
675
@@ -15,7 +15,7 @@
676
15
 */
15
 */
677
16
16
678
17
import QtQuick 2.4
17
import QtQuick 2.4
680
18
import Ubuntu.Components 1.2
18
import Ubuntu.Components 1.3
681
19
19
682
20
/*
20
/*
683
21
  This component is a unified text selection and scrolling handler for both
21
  This component is a unified text selection and scrolling handler for both
684
22
22
685
=== modified file 'modules/Ubuntu/Components/ListItems/Base.qml'
686
--- modules/Ubuntu/Components/ListItems/Base.qml	2015-03-03 13:47:48 +0000
687
+++ modules/Ubuntu/Components/ListItems/Base.qml	2015-05-02 11:10:54 +0000
688
@@ -15,7 +15,7 @@
689
15
 */
15
 */
690
16
16
691
17
import QtQuick 2.4
17
import QtQuick 2.4
693
18
import Ubuntu.Components 1.2
18
import Ubuntu.Components 1.3
694
19
19
695
20
/*!
20
/*!
696
21
    \qmltype Base
21
    \qmltype Base
697
22
22
698
=== modified file 'modules/Ubuntu/Components/ListItems/Divider.qml'
699
--- modules/Ubuntu/Components/ListItems/Divider.qml	2015-03-03 13:47:48 +0000
700
+++ modules/Ubuntu/Components/ListItems/Divider.qml	2015-05-02 11:10:54 +0000
701
@@ -15,7 +15,7 @@
702
15
 */
15
 */
703
16
16
704
17
import QtQuick 2.4
17
import QtQuick 2.4
706
18
import Ubuntu.Components 1.2
18
import Ubuntu.Components 1.3
707
19
19
708
20
/*!
20
/*!
709
21
    \qmltype Divider
21
    \qmltype Divider
710
22
22
711
=== modified file 'modules/Ubuntu/Components/ListItems/Empty.qml'
712
--- modules/Ubuntu/Components/ListItems/Empty.qml	2015-04-09 09:42:36 +0000
713
+++ modules/Ubuntu/Components/ListItems/Empty.qml	2015-05-02 11:10:54 +0000
714
@@ -35,7 +35,7 @@
715
35
35
716
36
    Examples:
36
    Examples:
717
37
    \qml
37
    \qml
719
38
        import Ubuntu.Components 1.2
38
        import Ubuntu.Components 1.3
720
39
        import Ubuntu.Components.ListItems 1.0 as ListItem
39
        import Ubuntu.Components.ListItems 1.0 as ListItem
721
40
40
722
41
        Item {
41
        Item {
723
42
42
724
=== modified file 'modules/Ubuntu/Components/ListItems/Expandable.qml'
725
--- modules/Ubuntu/Components/ListItems/Expandable.qml	2015-03-03 13:47:48 +0000
726
+++ modules/Ubuntu/Components/ListItems/Expandable.qml	2015-05-02 11:10:54 +0000
727
@@ -14,7 +14,7 @@
728
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/>.
729
15
 */
15
 */
730
16
import QtQuick 2.4
16
import QtQuick 2.4
732
17
import Ubuntu.Components 1.2
17
import Ubuntu.Components 1.3
733
18
18
734
19
/*!
19
/*!
735
20
    \qmltype Expandable
20
    \qmltype Expandable
736
@@ -35,7 +35,7 @@
737
35
35
738
36
    Examples:
36
    Examples:
739
37
    \qml
37
    \qml
741
38
        import Ubuntu.Components 1.2
38
        import Ubuntu.Components 1.3
742
39
        import Ubuntu.Components.ListItems 1.0 as ListItem
39
        import Ubuntu.Components.ListItems 1.0 as ListItem
743
40
40
744
41
        Item {
41
        Item {
745
42
42
746
=== modified file 'modules/Ubuntu/Components/ListItems/ExpandablesColumn.qml'
747
--- modules/Ubuntu/Components/ListItems/ExpandablesColumn.qml	2015-03-03 13:47:48 +0000
748
+++ modules/Ubuntu/Components/ListItems/ExpandablesColumn.qml	2015-05-02 11:10:54 +0000
749
@@ -15,7 +15,7 @@
750
15
 */
15
 */
751
16
16
752
17
import QtQuick 2.4
17
import QtQuick 2.4
754
18
import Ubuntu.Components 1.2
18
import Ubuntu.Components 1.3
755
19
19
756
20
/*!
20
/*!
757
21
    \qmltype ExpandablesColumn
21
    \qmltype ExpandablesColumn
758
@@ -29,7 +29,7 @@
759
29
29
760
30
    Examples:
30
    Examples:
761
31
    \qml
31
    \qml
763
32
        import Ubuntu.Components 1.2
32
        import Ubuntu.Components 1.3
764
33
        import Ubuntu.Components.ListItems 1.0 as ListItem
33
        import Ubuntu.Components.ListItems 1.0 as ListItem
765
34
34
766
35
        ListItem.ExpandablesColumn {
35
        ListItem.ExpandablesColumn {
767
36
36
768
=== modified file 'modules/Ubuntu/Components/ListItems/IconVisual.qml'
769
--- modules/Ubuntu/Components/ListItems/IconVisual.qml	2015-03-03 13:47:48 +0000
770
+++ modules/Ubuntu/Components/ListItems/IconVisual.qml	2015-05-02 11:10:54 +0000
771
@@ -15,7 +15,7 @@
772
15
 */
15
 */
773
16
16
774
17
import QtQuick 2.4
17
import QtQuick 2.4
776
18
import Ubuntu.Components 1.2
18
import Ubuntu.Components 1.3
777
19
19
778
20
// internal helper class to create the visuals
20
// internal helper class to create the visuals
779
21
// for the icon.
21
// for the icon.
780
22
22
781
=== modified file 'modules/Ubuntu/Components/ListItems/SingleControl.qml'
782
--- modules/Ubuntu/Components/ListItems/SingleControl.qml	2015-03-03 13:47:48 +0000
783
+++ modules/Ubuntu/Components/ListItems/SingleControl.qml	2015-05-02 11:10:54 +0000
784
@@ -15,7 +15,7 @@
785
15
 */
15
 */
786
16
16
787
17
import QtQuick 2.4
17
import QtQuick 2.4
789
18
import Ubuntu.Components 1.2
18
import Ubuntu.Components 1.3
790
19
import Ubuntu.Components.ListItems 1.0
19
import Ubuntu.Components.ListItems 1.0
791
20
20
792
21
/*!
21
/*!
793
@@ -27,7 +27,7 @@
794
27
27
795
28
    Examples:
28
    Examples:
796
29
    \qml
29
    \qml
798
30
        import Ubuntu.Components 1.2
30
        import Ubuntu.Components 1.3
799
31
        import Ubuntu.Components.ListItems 1.0 as ListItem
31
        import Ubuntu.Components.ListItems 1.0 as ListItem
800
32
        Column {
32
        Column {
801
33
            ListItem.SingleControl {
33
            ListItem.SingleControl {
802
34
34
803
=== modified file 'modules/Ubuntu/Components/ListItems/Standard.qml'
804
--- modules/Ubuntu/Components/ListItems/Standard.qml	2015-04-09 09:42:36 +0000
805
+++ modules/Ubuntu/Components/ListItems/Standard.qml	2015-05-02 11:10:54 +0000
806
@@ -31,7 +31,7 @@
807
31
31
808
32
    Examples:
32
    Examples:
809
33
    \qml
33
    \qml
811
34
        import Ubuntu.Components 1.2
34
        import Ubuntu.Components 1.3
812
35
        import Ubuntu.Components.ListItems 1.0 as ListItem
35
        import Ubuntu.Components.ListItems 1.0 as ListItem
813
36
        Column {
36
        Column {
814
37
            ListItem.Standard {
37
            ListItem.Standard {
815
38
38
816
=== modified file 'modules/Ubuntu/Components/ListItems/Subtitled.qml'
817
--- modules/Ubuntu/Components/ListItems/Subtitled.qml	2015-03-03 13:47:48 +0000
818
+++ modules/Ubuntu/Components/ListItems/Subtitled.qml	2015-05-02 11:10:54 +0000
819
@@ -15,7 +15,7 @@
820
15
 */
15
 */
821
16
16
822
17
import QtQuick 2.4
17
import QtQuick 2.4
824
18
import Ubuntu.Components 1.2
18
import Ubuntu.Components 1.3
825
19
19
826
20
/*!
20
/*!
827
21
    \qmltype MultiValue
21
    \qmltype MultiValue
828
22
22
829
=== modified file 'modules/Ubuntu/Components/MainView.qml'
830
--- modules/Ubuntu/Components/MainView.qml	2015-03-20 11:40:48 +0000
831
+++ modules/Ubuntu/Components/MainView.qml	2015-05-02 11:10:54 +0000
832
@@ -15,7 +15,6 @@
833
15
 */
15
 */
834
16
16
835
17
import QtQuick 2.4
17
import QtQuick 2.4
836
18
import Ubuntu.Components 1.2 as Toolkit
837
19
import Ubuntu.PerformanceMetrics 1.0
18
import Ubuntu.PerformanceMetrics 1.0
838
20
import QtQuick.Window 2.0
19
import QtQuick.Window 2.0
839
21
20
840
@@ -137,7 +136,7 @@
841
137
            flickable: internal.activePage ? internal.activePage.flickable : null
136
            flickable: internal.activePage ? internal.activePage.flickable : null
842
138
            pageStack: internal.activePage ? internal.activePage.pageStack : null
137
            pageStack: internal.activePage ? internal.activePage.pageStack : null
843
139
138
845
140
            Toolkit.PageHeadConfiguration {
139
            PageHeadConfiguration11 {
846
141
                id: headerConfig
140
                id: headerConfig
847
142
                // for backwards compatibility with deprecated tools property
141
                // for backwards compatibility with deprecated tools property
848
143
                actions: internal.activePage ?
142
                actions: internal.activePage ?
849
@@ -243,8 +242,8 @@
850
243
        id: internal
242
        id: internal
851
244
243
852
245
        // Even when using MainView 1.1, we still support Page 1.0.
244
        // Even when using MainView 1.1, we still support Page 1.0.
855
246
        // PageBase (=Page 1.0) is the superclass of Page 1.1.
245
        // we use PageTreeNode being the base class of all pages.
856
247
        property PageBase activePage: isPage(mainView.activeLeafNode) ? mainView.activeLeafNode : null
246
        property PageTreeNode activePage: isPage(mainView.activeLeafNode) ? mainView.activeLeafNode : null
857
248
247
858
249
        function isPage(item) {
248
        function isPage(item) {
859
250
            return item && item.hasOwnProperty("__isPageTreeNode") && item.__isPageTreeNode &&
249
            return item && item.hasOwnProperty("__isPageTreeNode") && item.__isPageTreeNode &&
860
251
250
861
=== modified file 'modules/Ubuntu/Components/MainView12.qml'
862
--- modules/Ubuntu/Components/MainView12.qml	2015-03-20 11:40:48 +0000
863
+++ modules/Ubuntu/Components/MainView12.qml	2015-05-02 11:10:54 +0000
864
@@ -15,7 +15,7 @@
865
15
 */
15
 */
866
16
16
867
17
import QtQuick 2.4
17
import QtQuick 2.4
869
18
import Ubuntu.Components 1.2 as Toolkit
18
import Ubuntu.Components 1.3 as Toolkit
870
19
import Ubuntu.PerformanceMetrics 1.0
19
import Ubuntu.PerformanceMetrics 1.0
871
20
import QtQuick.Window 2.2
20
import QtQuick.Window 2.2
872
21
21
873
22
22
874
=== modified file 'modules/Ubuntu/Components/OptionSelector.qml'
875
--- modules/Ubuntu/Components/OptionSelector.qml	2015-04-24 12:00:23 +0000
876
+++ modules/Ubuntu/Components/OptionSelector.qml	2015-05-02 11:10:54 +0000
877
@@ -27,7 +27,7 @@
878
27
27
879
28
    Examples:
28
    Examples:
880
29
    \qml
29
    \qml
882
30
        import Ubuntu.Components 1.2
30
        import Ubuntu.Components 1.3
883
31
        Column {
31
        Column {
884
32
            spacing: units.gu(3)
32
            spacing: units.gu(3)
885
33
33
886
34
34
887
=== modified file 'modules/Ubuntu/Components/OptionSelectorDelegate.qml'
888
--- modules/Ubuntu/Components/OptionSelectorDelegate.qml	2015-03-03 13:47:48 +0000
889
+++ modules/Ubuntu/Components/OptionSelectorDelegate.qml	2015-05-02 11:10:54 +0000
890
@@ -22,7 +22,7 @@
891
22
22
892
23
    Examples:
23
    Examples:
893
24
    \qml
24
    \qml
895
25
        import Ubuntu.Components 1.2
25
        import Ubuntu.Components 1.3
896
26
        Column {
26
        Column {
897
27
            width: 250
27
            width: 250
898
28
            OptionSelector {
28
            OptionSelector {
899
@@ -43,7 +43,7 @@
900
43
43
901
44
import QtQuick 2.4
44
import QtQuick 2.4
902
45
import "ListItems" as ListItem
45
import "ListItems" as ListItem
904
46
import Ubuntu.Components 1.2 as Toolkit
46
import Ubuntu.Components 1.3 as Toolkit
905
47
47
906
48
ListItem.Empty {
48
ListItem.Empty {
907
49
    id: option
49
    id: option
908
50
50
909
=== modified file 'modules/Ubuntu/Components/OrientationHelper.qml'
910
--- modules/Ubuntu/Components/OrientationHelper.qml	2015-03-06 07:55:23 +0000
911
+++ modules/Ubuntu/Components/OrientationHelper.qml	2015-05-02 11:10:54 +0000
912
@@ -16,7 +16,7 @@
913
16
16
914
17
import QtQuick 2.4
17
import QtQuick 2.4
915
18
import QtQuick.Window 2.0
18
import QtQuick.Window 2.0
917
19
import Ubuntu.Components 1.2
19
import Ubuntu.Components 1.3
918
20
20
919
21
/*!
21
/*!
920
22
    \qmltype OrientationHelper
22
    \qmltype OrientationHelper
921
23
23
922
=== modified file 'modules/Ubuntu/Components/Page10.qml'
923
--- modules/Ubuntu/Components/Page10.qml	2015-03-20 11:05:40 +0000
924
+++ modules/Ubuntu/Components/Page10.qml	2015-05-02 11:10:54 +0000
925
@@ -15,6 +15,7 @@
926
15
 */
15
 */
927
16
16
928
17
import QtQuick 2.4
17
import QtQuick 2.4
929
18
// FIXME must merge Page10, Page11 and Page13 files
930
18
import Ubuntu.Components 1.0 as Toolkit
19
import Ubuntu.Components 1.0 as Toolkit
931
19
import "pageUtils.js" as Utils
20
import "pageUtils.js" as Utils
932
20
21
933
21
22
934
=== modified file 'modules/Ubuntu/Components/Page11.qml'
935
--- modules/Ubuntu/Components/Page11.qml	2015-03-23 16:13:33 +0000
936
+++ modules/Ubuntu/Components/Page11.qml	2015-05-02 11:10:54 +0000
937
@@ -15,12 +15,12 @@
938
15
 */
15
 */
939
16
16
940
17
import QtQuick 2.4
17
import QtQuick 2.4
942
18
import Ubuntu.Components 1.0 as Toolkit10
18
// FIXME must merge Page10, Page11 and Page13 files
943
19
import Ubuntu.Components 1.1 as Toolkit11
19
import Ubuntu.Components 1.1 as Toolkit11
944
20
20
945
21
/*! \internal */
21
/*! \internal */
946
22
// Documentation in Page.qdoc
22
// Documentation in Page.qdoc
948
23
Toolkit10.Page {
23
Page10 {
949
24
    id: page
24
    id: page
950
25
    /*!
25
    /*!
951
26
      \qmlproperty PageHeadConfiguration head
26
      \qmlproperty PageHeadConfiguration head
952
27
27
953
=== modified file 'modules/Ubuntu/Components/PageHeadConfiguration13.qml'
954
--- modules/Ubuntu/Components/PageHeadConfiguration13.qml	2015-03-20 12:01:19 +0000
955
+++ modules/Ubuntu/Components/PageHeadConfiguration13.qml	2015-05-02 11:10:54 +0000
956
@@ -14,7 +14,7 @@
957
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/>.
958
15
 */
15
 */
959
16
16
961
17
import Ubuntu.Components 1.2 as Toolkit12
17
import Ubuntu.Components 1.3 as Toolkit12
962
18
18
963
19
/*!
19
/*!
964
20
  \internal
20
  \internal
965
21
21
966
=== modified file 'modules/Ubuntu/Components/PageHeadSections.qml'
967
--- modules/Ubuntu/Components/PageHeadSections.qml	2015-03-03 12:53:42 +0000
968
+++ modules/Ubuntu/Components/PageHeadSections.qml	2015-05-02 11:10:54 +0000
969
@@ -39,7 +39,7 @@
970
39
    /*!
39
    /*!
971
40
      List of strings that represent section names. Example:
40
      List of strings that represent section names. Example:
972
41
      \qml
41
      \qml
974
42
        import Ubuntu.Components 1.2
42
        import Ubuntu.Components 1.3
975
43
        import QtQuick 2.4
43
        import QtQuick 2.4
976
44
44
977
45
        MainView {
45
        MainView {
978
46
46
979
=== modified file 'modules/Ubuntu/Components/PageHeadState.qml'
980
--- modules/Ubuntu/Components/PageHeadState.qml	2015-03-03 13:47:48 +0000
981
+++ modules/Ubuntu/Components/PageHeadState.qml	2015-05-02 11:10:54 +0000
982
@@ -15,7 +15,7 @@
983
15
 */
15
 */
984
16
16
985
17
import QtQuick 2.4
17
import QtQuick 2.4
987
18
import Ubuntu.Components 1.2 // for Action
18
import Ubuntu.Components 1.3 // for Action
988
19
19
989
20
/*!
20
/*!
990
21
    \qmltype PageHeadState
21
    \qmltype PageHeadState
991
@@ -29,7 +29,7 @@
992
29
   enables the user to enter search/input mode:
29
   enables the user to enter search/input mode:
993
30
   \qml
30
   \qml
994
31
        import QtQuick 2.4
31
        import QtQuick 2.4
996
32
        import Ubuntu.Components 1.2
32
        import Ubuntu.Components 1.3
997
33
33
998
34
        MainView {
34
        MainView {
999
35
            id: mainView
35
            id: mainView
1000
36
36
1001
=== modified file 'modules/Ubuntu/Components/PageStack.qml'
1002
--- modules/Ubuntu/Components/PageStack.qml	2015-03-16 21:23:41 +0000
1003
+++ modules/Ubuntu/Components/PageStack.qml	2015-05-02 11:10:54 +0000
1004
@@ -37,7 +37,7 @@
1005
37
    undefined:
37
    undefined:
1006
38
    \qml
38
    \qml
1007
39
        import QtQuick 2.4
39
        import QtQuick 2.4
1009
40
        import Ubuntu.Components 1.2
40
        import Ubuntu.Components 1.3
1010
41
41
1011
42
        MainView {
42
        MainView {
1012
43
            width: units.gu(40)
43
            width: units.gu(40)
1013
@@ -76,7 +76,7 @@
1014
76
    Example:
76
    Example:
1015
77
    \qml
77
    \qml
1016
78
        import QtQuick 2.4
78
        import QtQuick 2.4
1018
79
        import Ubuntu.Components 1.2
79
        import Ubuntu.Components 1.3
1019
80
        import Ubuntu.Components.ListItems 1.0 as ListItem
80
        import Ubuntu.Components.ListItems 1.0 as ListItem
1020
81
81
1021
82
        MainView {
82
        MainView {
1022
83
83
1023
=== modified file 'modules/Ubuntu/Components/Panel.qml'
1024
--- modules/Ubuntu/Components/Panel.qml	2015-04-09 09:42:36 +0000
1025
+++ modules/Ubuntu/Components/Panel.qml	2015-05-02 11:10:54 +0000
1026
@@ -38,7 +38,7 @@
1027
38
    A black panel that can be swiped in from the lower-right of the window can be created like this:
38
    A black panel that can be swiped in from the lower-right of the window can be created like this:
1028
39
    \qml
39
    \qml
1029
40
        import QtQuick 2.4
40
        import QtQuick 2.4
1031
41
        import Ubuntu.Components 1.2
41
        import Ubuntu.Components 1.3
1032
42
42
1033
43
        Item {
43
        Item {
1034
44
            width: units.gu(80)
44
            width: units.gu(80)
1035
@@ -69,7 +69,7 @@
1036
69
    A panel that looks like the standard (bottom-aligned) toolbar, but with custom contents, can be created like this:
69
    A panel that looks like the standard (bottom-aligned) toolbar, but with custom contents, can be created like this:
1037
70
    \qml
70
    \qml
1038
71
        import QtQuick 2.4
71
        import QtQuick 2.4
1040
72
        import Ubuntu.Components 1.2
72
        import Ubuntu.Components 1.3
1041
73
73
1042
74
        Item {
74
        Item {
1043
75
            width: units.gu(80)
75
            width: units.gu(80)
1044
@@ -106,7 +106,7 @@
1045
106
    signals are forwarded from the panel by calling the child's trigger() function. Example:
106
    signals are forwarded from the panel by calling the child's trigger() function. Example:
1046
107
    \qml
107
    \qml
1047
108
        import QtQuick 2.4
108
        import QtQuick 2.4
1049
109
        import Ubuntu.Components 1.2
109
        import Ubuntu.Components 1.3
1050
110
110
1051
111
        Rectangle {
111
        Rectangle {
1052
112
            color: theme.palette.normal.background
112
            color: theme.palette.normal.background
1053
113
113
1054
=== modified file 'modules/Ubuntu/Components/Pickers/DatePicker.qml'
1055
--- modules/Ubuntu/Components/Pickers/DatePicker.qml	2015-04-24 12:00:23 +0000
1056
+++ modules/Ubuntu/Components/Pickers/DatePicker.qml	2015-05-02 11:10:54 +0000
1057
@@ -36,7 +36,7 @@
1058
36
36
1059
37
    \qml
37
    \qml
1060
38
    import QtQuick 2.4
38
    import QtQuick 2.4
1062
39
    import Ubuntu.Components 1.2
39
    import Ubuntu.Components 1.3
1063
40
    import Ubuntu.Components.Pickers 1.0
40
    import Ubuntu.Components.Pickers 1.0
1064
41
41
1065
42
    Column {
42
    Column {
1066
@@ -56,7 +56,7 @@
1067
56
    which shows only year and month date units would look as follows:
56
    which shows only year and month date units would look as follows:
1068
57
    \qml
57
    \qml
1069
58
    import QtQuick 2.4
58
    import QtQuick 2.4
1071
59
    import Ubuntu.Components 1.2
59
    import Ubuntu.Components 1.3
1072
60
    import Ubuntu.Components.Pickers 1.0
60
    import Ubuntu.Components.Pickers 1.0
1073
61
61
1074
62
    Column {
62
    Column {
1075
@@ -75,7 +75,7 @@
1076
75
    The following example demonstrates how to use DatePicker for time picking.
75
    The following example demonstrates how to use DatePicker for time picking.
1077
76
    \qml
76
    \qml
1078
77
    import QtQuick 2.4
77
    import QtQuick 2.4
1080
78
    import Ubuntu.Components 1.2
78
    import Ubuntu.Components 1.3
1081
79
    import Ubuntu.Components.Pickers 1.0
79
    import Ubuntu.Components.Pickers 1.0
1082
80
80
1083
81
    Column {
81
    Column {
1084
@@ -112,7 +112,7 @@
1085
112
    \endlist
112
    \endlist
1086
113
    \qml
113
    \qml
1087
114
    import QtQuick 2.4
114
    import QtQuick 2.4
1089
115
    import Ubuntu.Components 1.2
115
    import Ubuntu.Components 1.3
1090
116
    import Ubuntu.Components.Pickers 1.0
116
    import Ubuntu.Components.Pickers 1.0
1091
117
117
1092
118
    Column {
118
    Column {
1093
119
119
1094
=== modified file 'modules/Ubuntu/Components/Pickers/DayModel.qml'
1095
--- modules/Ubuntu/Components/Pickers/DayModel.qml	2015-03-03 13:47:48 +0000
1096
+++ modules/Ubuntu/Components/Pickers/DayModel.qml	2015-05-02 11:10:54 +0000
1097
@@ -15,7 +15,7 @@
1098
15
 */
15
 */
1099
16
16
1100
17
import QtQuick 2.4
17
import QtQuick 2.4
1102
18
import Ubuntu.Components 1.2
18
import Ubuntu.Components 1.3
1103
19
19
1104
20
PickerModelBase {
20
PickerModelBase {
1105
21
    circular: true
21
    circular: true
1106
22
22
1107
=== modified file 'modules/Ubuntu/Components/Pickers/DialerHandGroup.qml'
1108
--- modules/Ubuntu/Components/Pickers/DialerHandGroup.qml	2015-03-03 13:47:48 +0000
1109
+++ modules/Ubuntu/Components/Pickers/DialerHandGroup.qml	2015-05-02 11:10:54 +0000
1110
@@ -14,7 +14,7 @@
1111
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/>.
1112
15
 */
15
 */
1113
16
import QtQuick 2.4
16
import QtQuick 2.4
1115
17
import Ubuntu.Components 1.2
17
import Ubuntu.Components 1.3
1116
18
18
1117
19
/*!
19
/*!
1118
20
  \internal
20
  \internal
1119
21
21
1120
=== modified file 'modules/Ubuntu/Components/Pickers/HoursModel.qml'
1121
--- modules/Ubuntu/Components/Pickers/HoursModel.qml	2015-03-03 13:47:48 +0000
1122
+++ modules/Ubuntu/Components/Pickers/HoursModel.qml	2015-05-02 11:10:54 +0000
1123
@@ -15,7 +15,7 @@
1124
15
 */
15
 */
1125
16
16
1126
17
import QtQuick 2.4
17
import QtQuick 2.4
1128
18
import Ubuntu.Components 1.2
18
import Ubuntu.Components 1.3
1129
19
19
1130
20
PickerModelBase {
20
PickerModelBase {
1131
21
    property int from
21
    property int from
1132
22
22
1133
=== modified file 'modules/Ubuntu/Components/Pickers/MinutesModel.qml'
1134
--- modules/Ubuntu/Components/Pickers/MinutesModel.qml	2015-03-03 13:47:48 +0000
1135
+++ modules/Ubuntu/Components/Pickers/MinutesModel.qml	2015-05-02 11:10:54 +0000
1136
@@ -15,7 +15,7 @@
1137
15
 */
15
 */
1138
16
16
1139
17
import QtQuick 2.4
17
import QtQuick 2.4
1141
18
import Ubuntu.Components 1.2
18
import Ubuntu.Components 1.3
1142
19
19
1143
20
PickerModelBase {
20
PickerModelBase {
1144
21
    property int from
21
    property int from
1145
22
22
1146
=== modified file 'modules/Ubuntu/Components/Pickers/MonthModel.qml'
1147
--- modules/Ubuntu/Components/Pickers/MonthModel.qml	2015-03-03 13:47:48 +0000
1148
+++ modules/Ubuntu/Components/Pickers/MonthModel.qml	2015-05-02 11:10:54 +0000
1149
@@ -15,7 +15,7 @@
1150
15
 */
15
 */
1151
16
16
1152
17
import QtQuick 2.4
17
import QtQuick 2.4
1154
18
import Ubuntu.Components 1.2
18
import Ubuntu.Components 1.3
1155
19
19
1156
20
PickerModelBase {
20
PickerModelBase {
1157
21
    circular: (count >= 11)
21
    circular: (count >= 11)
1158
22
22
1159
=== modified file 'modules/Ubuntu/Components/Pickers/Picker.qml'
1160
--- modules/Ubuntu/Components/Pickers/Picker.qml	2015-04-24 12:00:23 +0000
1161
+++ modules/Ubuntu/Components/Pickers/Picker.qml	2015-05-02 11:10:54 +0000
1162
@@ -35,7 +35,7 @@
1163
35
    Example:
35
    Example:
1164
36
    \qml
36
    \qml
1165
37
    import QtQuick 2.4
37
    import QtQuick 2.4
1167
38
    import Ubuntu.Components 1.2
38
    import Ubuntu.Components 1.3
1168
39
    import Ubuntu.Components.Pickers 1.0
39
    import Ubuntu.Components.Pickers 1.0
1169
40
40
1170
41
    Picker {
41
    Picker {
1171
42
42
1172
=== modified file 'modules/Ubuntu/Components/Pickers/PickerPanel.qml'
1173
--- modules/Ubuntu/Components/Pickers/PickerPanel.qml	2015-04-09 09:42:36 +0000
1174
+++ modules/Ubuntu/Components/Pickers/PickerPanel.qml	2015-05-02 11:10:54 +0000
1175
@@ -33,7 +33,7 @@
1176
33
    on date pickers.
33
    on date pickers.
1177
34
    \qml
34
    \qml
1178
35
    import QtQuick 2.4
35
    import QtQuick 2.4
1180
36
    import Ubuntu.Components 1.2
36
    import Ubuntu.Components 1.3
1181
37
37
1182
38
    MainWindow {
38
    MainWindow {
1183
39
        width: units.gu(40)
39
        width: units.gu(40)
1184
40
40
1185
=== modified file 'modules/Ubuntu/Components/Pickers/PickerRow.qml'
1186
--- modules/Ubuntu/Components/Pickers/PickerRow.qml	2015-03-03 13:47:48 +0000
1187
+++ modules/Ubuntu/Components/Pickers/PickerRow.qml	2015-05-02 11:10:54 +0000
1188
@@ -15,7 +15,7 @@
1189
15
 */
15
 */
1190
16
16
1191
17
import QtQuick 2.4
17
import QtQuick 2.4
1193
18
import Ubuntu.Components 1.2
18
import Ubuntu.Components 1.3
1194
19
19
1195
20
Row {
20
Row {
1196
21
    id: row
21
    id: row
1197
22
22
1198
=== modified file 'modules/Ubuntu/Components/Pickers/SecondsModel.qml'
1199
--- modules/Ubuntu/Components/Pickers/SecondsModel.qml	2015-03-03 13:47:48 +0000
1200
+++ modules/Ubuntu/Components/Pickers/SecondsModel.qml	2015-05-02 11:10:54 +0000
1201
@@ -15,7 +15,7 @@
1202
15
 */
15
 */
1203
16
16
1204
17
import QtQuick 2.4
17
import QtQuick 2.4
1206
18
import Ubuntu.Components 1.2
18
import Ubuntu.Components 1.3
1207
19
19
1208
20
PickerModelBase {
20
PickerModelBase {
1209
21
    property int from
21
    property int from
1210
22
22
1211
=== modified file 'modules/Ubuntu/Components/Pickers/YearModel.qml'
1212
--- modules/Ubuntu/Components/Pickers/YearModel.qml	2015-03-03 13:47:48 +0000
1213
+++ modules/Ubuntu/Components/Pickers/YearModel.qml	2015-05-02 11:10:54 +0000
1214
@@ -15,7 +15,7 @@
1215
15
 */
15
 */
1216
16
16
1217
17
import QtQuick 2.4
17
import QtQuick 2.4
1219
18
import Ubuntu.Components 1.2
18
import Ubuntu.Components 1.3
1220
19
19
1221
20
PickerModelBase {
20
PickerModelBase {
1222
21
    // local properties
21
    // local properties
1223
22
22
1224
=== modified file 'modules/Ubuntu/Components/Popups/ComposerSheet.qml'
1225
--- modules/Ubuntu/Components/Popups/ComposerSheet.qml	2015-03-03 13:47:48 +0000
1226
+++ modules/Ubuntu/Components/Popups/ComposerSheet.qml	2015-05-02 11:10:54 +0000
1227
@@ -15,7 +15,7 @@
1228
15
 */
15
 */
1229
16
16
1230
17
import QtQuick 2.4
17
import QtQuick 2.4
1232
18
import Ubuntu.Components 1.2
18
import Ubuntu.Components 1.3
1233
19
/*!
19
/*!
1234
20
    \qmltype ComposerSheet
20
    \qmltype ComposerSheet
1235
21
    \inherits SheetBase
21
    \inherits SheetBase
1236
@@ -32,7 +32,7 @@
1237
32
32
1238
33
    Example:
33
    Example:
1239
34
    \qml
34
    \qml
1241
35
        import Ubuntu.Components 1.2
35
        import Ubuntu.Components 1.3
1242
36
        import Ubuntu.Components.Popups 1.0
36
        import Ubuntu.Components.Popups 1.0
1243
37
37
1244
38
        Item {
38
        Item {
1245
39
39
1246
=== modified file 'modules/Ubuntu/Components/Popups/DefaultSheet.qml'
1247
--- modules/Ubuntu/Components/Popups/DefaultSheet.qml	2015-03-03 13:47:48 +0000
1248
+++ modules/Ubuntu/Components/Popups/DefaultSheet.qml	2015-05-02 11:10:54 +0000
1249
@@ -15,7 +15,7 @@
1250
15
 */
15
 */
1251
16
16
1252
17
import QtQuick 2.4
17
import QtQuick 2.4
1254
18
import Ubuntu.Components 1.2
18
import Ubuntu.Components 1.3
1255
19
19
1256
20
/*!
20
/*!
1257
21
    \qmltype DefaultSheet
21
    \qmltype DefaultSheet
1258
@@ -33,7 +33,7 @@
1259
33
33
1260
34
    Example:
34
    Example:
1261
35
    \qml
35
    \qml
1263
36
        import Ubuntu.Components 1.2
36
        import Ubuntu.Components 1.3
1264
37
        import Ubuntu.Components.Popups 1.0
37
        import Ubuntu.Components.Popups 1.0
1265
38
38
1266
39
        Item {
39
        Item {
1267
40
40
1268
=== modified file 'modules/Ubuntu/Components/Popups/Dialog.qml'
1269
--- modules/Ubuntu/Components/Popups/Dialog.qml	2015-04-24 12:00:23 +0000
1270
+++ modules/Ubuntu/Components/Popups/Dialog.qml	2015-05-02 11:10:54 +0000
1271
@@ -33,7 +33,7 @@
1272
33
    Example:
33
    Example:
1273
34
    \qml
34
    \qml
1274
35
        import QtQuick 2.4
35
        import QtQuick 2.4
1276
36
        import Ubuntu.Components 1.2
36
        import Ubuntu.Components 1.3
1277
37
        import Ubuntu.Components.Popups 1.0
37
        import Ubuntu.Components.Popups 1.0
1278
38
38
1279
39
        Item {
39
        Item {
1280
40
40
1281
=== modified file 'modules/Ubuntu/Components/Popups/Popover.qml'
1282
--- modules/Ubuntu/Components/Popups/Popover.qml	2015-04-24 12:00:23 +0000
1283
+++ modules/Ubuntu/Components/Popups/Popover.qml	2015-05-02 11:10:54 +0000
1284
@@ -32,7 +32,7 @@
1285
32
    Example:
32
    Example:
1286
33
    \qml
33
    \qml
1287
34
        import QtQuick 2.4
34
        import QtQuick 2.4
1289
35
        import Ubuntu.Components 1.2
35
        import Ubuntu.Components 1.3
1290
36
        import Ubuntu.Components.ListItems 1.0 as ListItem
36
        import Ubuntu.Components.ListItems 1.0 as ListItem
1291
37
        import Ubuntu.Components.Popups 1.0
37
        import Ubuntu.Components.Popups 1.0
1292
38
38
1293
39
39
1294
=== modified file 'modules/Ubuntu/Components/Popups/PopupBase.qml'
1295
--- modules/Ubuntu/Components/Popups/PopupBase.qml	2015-03-03 13:47:48 +0000
1296
+++ modules/Ubuntu/Components/Popups/PopupBase.qml	2015-05-02 11:10:54 +0000
1297
@@ -15,7 +15,7 @@
1298
15
 */
15
 */
1299
16
16
1300
17
import QtQuick 2.4
17
import QtQuick 2.4
1302
18
import Ubuntu.Components 1.2
18
import Ubuntu.Components 1.3
1303
19
19
1304
20
/*!
20
/*!
1305
21
    \qmltype PopupBase
21
    \qmltype PopupBase
1306
22
22
1307
=== modified file 'modules/Ubuntu/Components/PullToRefresh.qml'
1308
--- modules/Ubuntu/Components/PullToRefresh.qml	2015-04-24 12:00:23 +0000
1309
+++ modules/Ubuntu/Components/PullToRefresh.qml	2015-05-02 11:10:54 +0000
1310
@@ -34,7 +34,7 @@
1311
34
    \qml
34
    \qml
1312
35
    import QtQuick 2.4
35
    import QtQuick 2.4
1313
36
    import QtQuick.XmlListModel 2.0
36
    import QtQuick.XmlListModel 2.0
1315
37
    import Ubuntu.Components 1.2
37
    import Ubuntu.Components 1.3
1316
38
    import Ubuntu.Components.ListItems 1.0
38
    import Ubuntu.Components.ListItems 1.0
1317
39
39
1318
40
    MainView {
40
    MainView {
1319
@@ -84,7 +84,7 @@
1320
84
    \qml
84
    \qml
1321
85
    import QtQuick 2.4
85
    import QtQuick 2.4
1322
86
    import QtQuick.XmlListModel 2.0
86
    import QtQuick.XmlListModel 2.0
1324
87
    import Ubuntu.Components 1.2
87
    import Ubuntu.Components 1.3
1325
88
    import Ubuntu.Components.ListItems 1.0
88
    import Ubuntu.Components.ListItems 1.0
1326
89
89
1327
90
    MainView {
90
    MainView {
1328
@@ -132,7 +132,7 @@
1329
132
    \qml
132
    \qml
1330
133
    import QtQuick 2.4
133
    import QtQuick 2.4
1331
134
    import QtQuick.XmlListModel 2.0
134
    import QtQuick.XmlListModel 2.0
1333
135
    import Ubuntu.Components 1.2
135
    import Ubuntu.Components 1.3
1334
136
    import Ubuntu.Components.ListItems 1.0
136
    import Ubuntu.Components.ListItems 1.0
1335
137
137
1336
138
    MainView {
138
    MainView {
1337
139
139
1338
=== modified file 'modules/Ubuntu/Components/Tab.qml'
1339
--- modules/Ubuntu/Components/Tab.qml	2015-04-08 16:21:42 +0000
1340
+++ modules/Ubuntu/Components/Tab.qml	2015-05-02 11:10:54 +0000
1341
@@ -51,7 +51,7 @@
1342
51
      Example:
51
      Example:
1343
52
      \qml
52
      \qml
1344
53
        import QtQuick 2.4
53
        import QtQuick 2.4
1346
54
        import Ubuntu.Components 1.2
54
        import Ubuntu.Components 1.3
1347
55
        MainView {
55
        MainView {
1348
56
            width: units.gu(40)
56
            width: units.gu(40)
1349
57
            height: units.gu(50)
57
            height: units.gu(50)
1350
58
58
1351
=== modified file 'modules/Ubuntu/Components/Tabs.qml'
1352
--- modules/Ubuntu/Components/Tabs.qml	2015-03-16 21:23:41 +0000
1353
+++ modules/Ubuntu/Components/Tabs.qml	2015-05-02 11:10:54 +0000
1354
@@ -31,7 +31,7 @@
1355
31
    Example:
31
    Example:
1356
32
    \qml
32
    \qml
1357
33
        import QtQuick 2.4
33
        import QtQuick 2.4
1359
34
        import Ubuntu.Components 1.2
34
        import Ubuntu.Components 1.3
1360
35
        import Ubuntu.Components.ListItems 1.0 as ListItem
35
        import Ubuntu.Components.ListItems 1.0 as ListItem
1361
36
36
1362
37
        MainView {
37
        MainView {
1363
@@ -102,7 +102,7 @@
1364
102
102
1365
103
    \qml
103
    \qml
1366
104
        import QtQuick 2.4
104
        import QtQuick 2.4
1368
105
        import Ubuntu.Components 1.2
105
        import Ubuntu.Components 1.3
1369
106
106
1370
107
        MainView {
107
        MainView {
1371
108
            id: mainView
108
            id: mainView
1372
109
109
1373
=== modified file 'modules/Ubuntu/Components/TextField.qml'
1374
--- modules/Ubuntu/Components/TextField.qml	2015-04-24 12:00:23 +0000
1375
+++ modules/Ubuntu/Components/TextField.qml	2015-05-02 11:10:54 +0000
1376
@@ -527,7 +527,7 @@
1377
527
527
1378
528
      \qml
528
      \qml
1379
529
      import QtQuick 2.4
529
      import QtQuick 2.4
1381
530
      import Ubuntu.Components 1.2
530
      import Ubuntu.Components 1.3
1382
531
      TextField{
531
      TextField{
1383
532
          validator: IntValidator{bottom: 11; top: 31;}
532
          validator: IntValidator{bottom: 11; top: 31;}
1384
533
          focus: true
533
          focus: true
1385
534
534
1386
=== added file 'modules/Ubuntu/Components/Themes/1.2/1.2.pro'
1387
--- modules/Ubuntu/Components/Themes/1.2/1.2.pro	1970-01-01 00:00:00 +0000
1388
+++ modules/Ubuntu/Components/Themes/1.2/1.2.pro	2015-05-02 11:10:54 +0000
1389
@@ -0,0 +1,16 @@
1390
1
TEMPLATE=aux
1391
2
1392
3
CONFIG+=ubuntu_qml_module
1393
4
1394
5
uri = Ubuntu.Components.Themes
1395
6
installPath = $$[QT_INSTALL_QML]/$$replace(uri, \\., /)/1.2
1396
7
1397
8
message(Theme install path $$installPath)
1398
9
1399
10
QML_FILES = *.qml
1400
11
1401
12
qml_files.installPath = $$installPath
1402
13
qml_files.files = $$QML_FILES
1403
14
1404
15
UBUNTU_QML_MODULE_FILES += qml_files
1405
16
1406
0
17
1407
=== added file 'modules/Ubuntu/Components/Themes/1.3/1.3.pro'
1408
--- modules/Ubuntu/Components/Themes/1.3/1.3.pro	1970-01-01 00:00:00 +0000
1409
+++ modules/Ubuntu/Components/Themes/1.3/1.3.pro	2015-05-02 11:10:54 +0000
1410
@@ -0,0 +1,14 @@
1411
1
TEMPLATE=aux
1412
2
1413
3
CONFIG+=ubuntu_qml_module
1414
4
1415
5
uri = Ubuntu.Components.Themes
1416
6
installPath = $$[QT_INSTALL_QML]/$$replace(uri, \\., /)/1.3
1417
7
1418
8
QML_FILES = *.qml
1419
9
1420
10
qml_files.installPath = $$installPath
1421
11
qml_files.files = $$QML_FILES
1422
12
1423
13
UBUNTU_QML_MODULE_FILES += qml_files
1424
14
1425
0
15
1426
=== added file 'modules/Ubuntu/Components/Themes/Ambiance/1.2/1.2.pro'
1427
--- modules/Ubuntu/Components/Themes/Ambiance/1.2/1.2.pro	1970-01-01 00:00:00 +0000
1428
+++ modules/Ubuntu/Components/Themes/Ambiance/1.2/1.2.pro	2015-05-02 11:10:54 +0000
1429
@@ -0,0 +1,14 @@
1430
1
TEMPLATE=aux
1431
2
1432
3
CONFIG+=ubuntu_qml_module
1433
4
1434
5
uri = Ubuntu.Components.Themes.Ambiance
1435
6
installPath = $$[QT_INSTALL_QML]/$$replace(uri, \\., /)/1.2
1436
7
1437
8
QML_FILES = *.qml
1438
9
1439
10
qml_files.installPath = $$installPath
1440
11
qml_files.files = $$QML_FILES
1441
12
1442
13
UBUNTU_QML_MODULE_FILES += qml_files
1443
14
1444
0
15
1445
=== added file 'modules/Ubuntu/Components/Themes/Ambiance/1.3/1.3.pro'
1446
--- modules/Ubuntu/Components/Themes/Ambiance/1.3/1.3.pro	1970-01-01 00:00:00 +0000
1447
+++ modules/Ubuntu/Components/Themes/Ambiance/1.3/1.3.pro	2015-05-02 11:10:54 +0000
1448
@@ -0,0 +1,14 @@
1449
1
TEMPLATE=aux
1450
2
1451
3
CONFIG+=ubuntu_qml_module
1452
4
1453
5
uri = Ubuntu.Components.Themes.Ambiance
1454
6
installPath = $$[QT_INSTALL_QML]/$$replace(uri, \\., /)/1.3
1455
7
1456
8
QML_FILES = *.qml
1457
9
1458
10
qml_files.installPath = $$installPath
1459
11
qml_files.files = $$QML_FILES
1460
12
1461
13
UBUNTU_QML_MODULE_FILES += qml_files
1462
14
1463
0
15
1464
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/1.3/ActivityIndicatorStyle.qml'
1465
--- modules/Ubuntu/Components/Themes/Ambiance/1.3/ActivityIndicatorStyle.qml	2015-04-24 14:07:02 +0000
1466
+++ modules/Ubuntu/Components/Themes/Ambiance/1.3/ActivityIndicatorStyle.qml	2015-05-02 11:10:54 +0000
1467
@@ -15,7 +15,7 @@
1468
15
 */
15
 */
1469
16
16
1470
17
import QtQuick 2.4
17
import QtQuick 2.4
1472
18
import Ubuntu.Components 1.2
18
import Ubuntu.Components 1.3
1473
19
19
1474
20
Image {
20
Image {
1475
21
    id: container
21
    id: container
1476
22
22
1477
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/1.3/ButtonForeground.qml'
1478
--- modules/Ubuntu/Components/Themes/Ambiance/1.3/ButtonForeground.qml	2015-04-24 14:07:02 +0000
1479
+++ modules/Ubuntu/Components/Themes/Ambiance/1.3/ButtonForeground.qml	2015-05-02 11:10:54 +0000
1480
@@ -17,7 +17,7 @@
1481
17
 */
17
 */
1482
18
18
1483
19
import QtQuick 2.4
19
import QtQuick 2.4
1485
20
import Ubuntu.Components 1.2
20
import Ubuntu.Components 1.3
1486
21
21
1487
22
Item {
22
Item {
1488
23
    id: buttonForeground
23
    id: buttonForeground
1489
24
24
1490
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/1.3/ButtonStyle.qml'
1491
--- modules/Ubuntu/Components/Themes/Ambiance/1.3/ButtonStyle.qml	2015-04-24 14:07:02 +0000
1492
+++ modules/Ubuntu/Components/Themes/Ambiance/1.3/ButtonStyle.qml	2015-05-02 11:10:54 +0000
1493
@@ -17,7 +17,7 @@
1494
17
 */
17
 */
1495
18
18
1496
19
import QtQuick 2.4
19
import QtQuick 2.4
1498
20
import Ubuntu.Components 1.2
20
import Ubuntu.Components 1.3
1499
21
21
1500
22
Item {
22
Item {
1501
23
    id: buttonStyle
23
    id: buttonStyle
1502
24
24
1503
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/1.3/ComboButtonStyle.qml'
1504
--- modules/Ubuntu/Components/Themes/Ambiance/1.3/ComboButtonStyle.qml	2015-04-24 14:07:02 +0000
1505
+++ modules/Ubuntu/Components/Themes/Ambiance/1.3/ComboButtonStyle.qml	2015-05-02 11:10:54 +0000
1506
@@ -15,7 +15,7 @@
1507
15
 */
15
 */
1508
16
16
1509
17
import QtQuick 2.4
17
import QtQuick 2.4
1511
18
import Ubuntu.Components 1.2
18
import Ubuntu.Components 1.3
1512
19
import Ubuntu.Components.Styles 1.2 as Style
19
import Ubuntu.Components.Styles 1.2 as Style
1513
20
20
1514
21
Style.ComboButtonStyle {
21
Style.ComboButtonStyle {
1515
22
22
1516
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/1.3/DatePickerStyle.qml'
1517
--- modules/Ubuntu/Components/Themes/Ambiance/1.3/DatePickerStyle.qml	2015-04-24 14:07:02 +0000
1518
+++ modules/Ubuntu/Components/Themes/Ambiance/1.3/DatePickerStyle.qml	2015-05-02 11:10:54 +0000
1519
@@ -15,7 +15,7 @@
1520
15
 */
15
 */
1521
16
16
1522
17
import QtQuick 2.4
17
import QtQuick 2.4
1524
18
import Ubuntu.Components 1.2
18
import Ubuntu.Components 1.3
1525
19
import Ubuntu.Components.ListItems 1.0
19
import Ubuntu.Components.ListItems 1.0
1526
20
20
1527
21
Item {
21
Item {
1528
22
22
1529
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/1.3/DialerStyle.qml'
1530
--- modules/Ubuntu/Components/Themes/Ambiance/1.3/DialerStyle.qml	2015-04-24 14:07:02 +0000
1531
+++ modules/Ubuntu/Components/Themes/Ambiance/1.3/DialerStyle.qml	2015-05-02 11:10:54 +0000
1532
@@ -15,7 +15,7 @@
1533
15
 */
15
 */
1534
16
16
1535
17
import QtQuick 2.4
17
import QtQuick 2.4
1537
18
import Ubuntu.Components 1.2
18
import Ubuntu.Components 1.3
1538
19
import QtGraphicalEffects 1.0
19
import QtGraphicalEffects 1.0
1539
20
20
1540
21
// FIXME: Replace this once UbuntuShape support for gradients and shading has landed
21
// FIXME: Replace this once UbuntuShape support for gradients and shading has landed
1541
22
22
1542
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/1.3/DialogForegroundStyle.qml'
1543
--- modules/Ubuntu/Components/Themes/Ambiance/1.3/DialogForegroundStyle.qml	2015-04-24 14:07:02 +0000
1544
+++ modules/Ubuntu/Components/Themes/Ambiance/1.3/DialogForegroundStyle.qml	2015-05-02 11:10:54 +0000
1545
@@ -15,7 +15,7 @@
1546
15
 */
15
 */
1547
16
16
1548
17
import QtQuick 2.4
17
import QtQuick 2.4
1550
18
import Ubuntu.Components 1.2
18
import Ubuntu.Components 1.3
1551
19
19
1552
20
Item {
20
Item {
1553
21
    id: dialogForegroundStyle
21
    id: dialogForegroundStyle
1554
22
22
1555
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/1.3/ListItemOptionSelectorStyle.qml'
1556
--- modules/Ubuntu/Components/Themes/Ambiance/1.3/ListItemOptionSelectorStyle.qml	2015-04-24 14:07:02 +0000
1557
+++ modules/Ubuntu/Components/Themes/Ambiance/1.3/ListItemOptionSelectorStyle.qml	2015-05-02 11:10:54 +0000
1558
@@ -16,7 +16,7 @@
1559
16
 */
16
 */
1560
17
17
1561
18
import QtQuick 2.4
18
import QtQuick 2.4
1563
19
import Ubuntu.Components 1.2
19
import Ubuntu.Components 1.3
1564
20
20
1565
21
Item {
21
Item {
1566
22
    id: ambianceStyle
22
    id: ambianceStyle
1567
23
23
1568
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/1.3/MainViewStyle.qml'
1569
--- modules/Ubuntu/Components/Themes/Ambiance/1.3/MainViewStyle.qml	2015-04-24 14:07:02 +0000
1570
+++ modules/Ubuntu/Components/Themes/Ambiance/1.3/MainViewStyle.qml	2015-05-02 11:10:54 +0000
1571
@@ -14,7 +14,7 @@
1572
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/>.
1573
15
 */
15
 */
1574
16
import QtQuick 2.4
16
import QtQuick 2.4
1576
17
import Ubuntu.Components 1.2
17
import Ubuntu.Components 1.3
1577
18
18
1578
19
Item {
19
Item {
1579
20
    // styling properties
20
    // styling properties
1580
21
21
1581
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/1.3/OptionSelectorStyle.qml'
1582
--- modules/Ubuntu/Components/Themes/Ambiance/1.3/OptionSelectorStyle.qml	2015-04-24 14:07:02 +0000
1583
+++ modules/Ubuntu/Components/Themes/Ambiance/1.3/OptionSelectorStyle.qml	2015-05-02 11:10:54 +0000
1584
@@ -16,7 +16,7 @@
1585
16
 */
16
 */
1586
17
17
1587
18
import QtQuick 2.4
18
import QtQuick 2.4
1589
19
import Ubuntu.Components 1.2
19
import Ubuntu.Components 1.3
1590
20
20
1591
21
Item {
21
Item {
1592
22
    id: ambianceStyle
22
    id: ambianceStyle
1593
23
23
1594
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/1.3/Palette.qml'
1595
--- modules/Ubuntu/Components/Themes/Ambiance/1.3/Palette.qml	2015-04-24 14:34:39 +0000
1596
+++ modules/Ubuntu/Components/Themes/Ambiance/1.3/Palette.qml	2015-05-02 11:10:54 +0000
1597
@@ -15,7 +15,7 @@
1598
15
 */
15
 */
1599
16
16
1600
17
import QtQuick 2.4
17
import QtQuick 2.4
1602
18
import Ubuntu.Components 1.2
18
import Ubuntu.Components 1.3
1603
19
import Ubuntu.Components.Themes 1.3
19
import Ubuntu.Components.Themes 1.3
1604
20
20
1605
21
Palette {
21
Palette {
1606
@@ -34,7 +34,7 @@
1607
34
    selected {
34
    selected {
1608
35
        background: Qt.rgba(0, 0, 0, 0.05)
35
        background: Qt.rgba(0, 0, 0, 0.05)
1609
36
        backgroundText: UbuntuColors.darkGrey
36
        backgroundText: UbuntuColors.darkGrey
1611
37
        selection: selected.foreground // unused
37
        selection: selected.foreground
1612
38
        foreground: Qt.rgba(UbuntuColors.blue.r, UbuntuColors.blue.g, UbuntuColors.blue.b, 0.2)
38
        foreground: Qt.rgba(UbuntuColors.blue.r, UbuntuColors.blue.g, UbuntuColors.blue.b, 0.2)
1613
39
        foregroundText: UbuntuColors.darkGrey
39
        foregroundText: UbuntuColors.darkGrey
1614
40
        field: "#FFFFFF"
40
        field: "#FFFFFF"
1615
41
41
1616
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/1.3/PickerDelegateStyle.qml'
1617
--- modules/Ubuntu/Components/Themes/Ambiance/1.3/PickerDelegateStyle.qml	2015-04-24 14:07:02 +0000
1618
+++ modules/Ubuntu/Components/Themes/Ambiance/1.3/PickerDelegateStyle.qml	2015-05-02 11:10:54 +0000
1619
@@ -15,7 +15,7 @@
1620
15
 */
15
 */
1621
16
16
1622
17
import QtQuick 2.4
17
import QtQuick 2.4
1624
18
import Ubuntu.Components 1.2
18
import Ubuntu.Components 1.3
1625
19
19
1626
20
Item {
20
Item {
1627
21
    property real minFade: 0.2
21
    property real minFade: 0.2
1628
22
22
1629
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/1.3/ProgressionVisualStyle.qml'
1630
--- modules/Ubuntu/Components/Themes/Ambiance/1.3/ProgressionVisualStyle.qml	2015-04-24 14:07:02 +0000
1631
+++ modules/Ubuntu/Components/Themes/Ambiance/1.3/ProgressionVisualStyle.qml	2015-05-02 11:10:54 +0000
1632
@@ -15,7 +15,7 @@
1633
15
 */
15
 */
1634
16
16
1635
17
import QtQuick 2.4
17
import QtQuick 2.4
1637
18
import Ubuntu.Components 1.2
18
import Ubuntu.Components 1.3
1638
19
19
1639
20
Item {
20
Item {
1640
21
    id: progressionVisualStyle
21
    id: progressionVisualStyle
1641
22
22
1642
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/1.3/PullToRefreshStyle.qml'
1643
--- modules/Ubuntu/Components/Themes/Ambiance/1.3/PullToRefreshStyle.qml	2015-04-24 14:07:02 +0000
1644
+++ modules/Ubuntu/Components/Themes/Ambiance/1.3/PullToRefreshStyle.qml	2015-05-02 11:10:54 +0000
1645
@@ -15,7 +15,7 @@
1646
15
 */
15
 */
1647
16
16
1648
17
import QtQuick 2.4
17
import QtQuick 2.4
1650
18
import Ubuntu.Components 1.2
18
import Ubuntu.Components 1.3
1651
19
import Ubuntu.Components.Styles 1.2 as Style
19
import Ubuntu.Components.Styles 1.2 as Style
1652
20
20
1653
21
Style.PullToRefreshStyle {
21
Style.PullToRefreshStyle {
1654
22
22
1655
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/1.3/SheetForegroundStyle.qml'
1656
--- modules/Ubuntu/Components/Themes/Ambiance/1.3/SheetForegroundStyle.qml	2015-04-24 14:07:02 +0000
1657
+++ modules/Ubuntu/Components/Themes/Ambiance/1.3/SheetForegroundStyle.qml	2015-05-02 11:10:54 +0000
1658
@@ -15,7 +15,7 @@
1659
15
 */
15
 */
1660
16
16
1661
17
import QtQuick 2.4
17
import QtQuick 2.4
1663
18
import Ubuntu.Components 1.2
18
import Ubuntu.Components 1.3
1664
19
19
1665
20
Item {
20
Item {
1666
21
    id: visuals
21
    id: visuals
1667
22
22
1668
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/1.3/TextCursorStyle.qml'
1669
--- modules/Ubuntu/Components/Themes/Ambiance/1.3/TextCursorStyle.qml	2015-04-24 14:07:02 +0000
1670
+++ modules/Ubuntu/Components/Themes/Ambiance/1.3/TextCursorStyle.qml	2015-05-02 11:10:54 +0000
1671
@@ -15,7 +15,7 @@
1672
15
 */
15
 */
1673
16
16
1674
17
import QtQuick 2.4
17
import QtQuick 2.4
1676
18
import Ubuntu.Components 1.2
18
import Ubuntu.Components 1.3
1677
19
19
1678
20
// FIXME : move the API into Ubuntu.Components.Style
20
// FIXME : move the API into Ubuntu.Components.Style
1679
21
Item {
21
Item {
1680
22
22
1681
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/1.3/ToolbarButtonStyle.qml'
1682
--- modules/Ubuntu/Components/Themes/Ambiance/1.3/ToolbarButtonStyle.qml	2015-04-24 14:07:02 +0000
1683
+++ modules/Ubuntu/Components/Themes/Ambiance/1.3/ToolbarButtonStyle.qml	2015-05-02 11:10:54 +0000
1684
@@ -15,7 +15,7 @@
1685
15
 */
15
 */
1686
16
16
1687
17
import QtQuick 2.4
17
import QtQuick 2.4
1689
18
import Ubuntu.Components 1.2
18
import Ubuntu.Components 1.3
1690
19
19
1691
20
Item {
20
Item {
1692
21
    id: visuals
21
    id: visuals
1693
22
22
1694
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/Ambiance.pro'
1695
--- modules/Ubuntu/Components/Themes/Ambiance/Ambiance.pro	2015-04-24 14:43:08 +0000
1696
+++ modules/Ubuntu/Components/Themes/Ambiance/Ambiance.pro	2015-05-02 11:10:54 +0000
1697
@@ -1,23 +1,5 @@
1721
1
TEMPLATE = aux
1
TEMPLATE = subdirs
1722
2
2
1723
3
CONFIG+=ubuntu_qml_module
3
SUBDIRS += 1.2 \
1724
4
4
           1.3 \
1725
5
uri = Ubuntu.Components.Themes.Ambiance
5
           AmbianceModule.pro
1703
6
installPath = $$[QT_INSTALL_QML]/$$replace(uri, \\., /)
1704
7
1705
8
QMLDIR_FILE = qmldir
1706
9
QML_FILES = ./1.2/*.qml ./1.3/*.qml
1707
10
ARTWORK_FILES += artwork/*.png \
1708
11
                 artwork/*.svg \
1709
12
                 artwork/*.sci
1710
13
1711
14
qmldir_file.installPath = $$installPath
1712
15
qmldir_file.files = $$QMLDIR_FILE
1713
16
1714
17
qml_files.installPath = $$installPath
1715
18
qml_files.files = $$QML_FILES
1716
19
1717
20
artwork_files.installPath = $$installPath/artwork
1718
21
artwork_files.files = $$ARTWORK_FILES
1719
22
1720
23
UBUNTU_QML_MODULE_FILES += qmldir_file qml_files artwork_files
1726
24
6
1727
=== added file 'modules/Ubuntu/Components/Themes/Ambiance/AmbianceModule.pro'
1728
--- modules/Ubuntu/Components/Themes/Ambiance/AmbianceModule.pro	1970-01-01 00:00:00 +0000
1729
+++ modules/Ubuntu/Components/Themes/Ambiance/AmbianceModule.pro	2015-05-02 11:10:54 +0000
1730
@@ -0,0 +1,20 @@
1731
1
TEMPLATE = aux
1732
2
1733
3
CONFIG+=ubuntu_qml_module
1734
4
1735
5
uri = Ubuntu.Components.Themes.Ambiance
1736
6
installPath = $$[QT_INSTALL_QML]/$$replace(uri, \\., /)
1737
7
1738
8
QMLDIR_FILE = qmldir
1739
9
ARTWORK_FILES += artwork/*.png \
1740
10
                 artwork/*.svg \
1741
11
                 artwork/*.sci
1742
12
1743
13
qmldir_file.installPath = $$installPath
1744
14
qmldir_file.files = $$QMLDIR_FILE
1745
15
1746
16
artwork_files.installPath = $$installPath/artwork
1747
17
artwork_files.files = $$ARTWORK_FILES
1748
18
1749
19
UBUNTU_QML_MODULE_FILES += qmldir_file artwork_files
1750
20
1751
0
21
1752
=== added file 'modules/Ubuntu/Components/Themes/SuruDark/1.2/1.2.pro'
1753
--- modules/Ubuntu/Components/Themes/SuruDark/1.2/1.2.pro	1970-01-01 00:00:00 +0000
1754
+++ modules/Ubuntu/Components/Themes/SuruDark/1.2/1.2.pro	2015-05-02 11:10:54 +0000
1755
@@ -0,0 +1,14 @@
1756
1
TEMPLATE=aux
1757
2
1758
3
CONFIG+=ubuntu_qml_module
1759
4
1760
5
uri = Ubuntu.Components.Themes.SuruDark
1761
6
installPath = $$[QT_INSTALL_QML]/$$replace(uri, \\., /)/1.2
1762
7
1763
8
QML_FILES = *.qml
1764
9
1765
10
qml_files.installPath = $$installPath
1766
11
qml_files.files = $$QML_FILES
1767
12
1768
13
UBUNTU_QML_MODULE_FILES += qml_files
1769
14
1770
0
15
1771
=== added file 'modules/Ubuntu/Components/Themes/SuruDark/1.3/1.3.pro'
1772
--- modules/Ubuntu/Components/Themes/SuruDark/1.3/1.3.pro	1970-01-01 00:00:00 +0000
1773
+++ modules/Ubuntu/Components/Themes/SuruDark/1.3/1.3.pro	2015-05-02 11:10:54 +0000
1774
@@ -0,0 +1,14 @@
1775
1
TEMPLATE=aux
1776
2
1777
3
CONFIG+=ubuntu_qml_module
1778
4
1779
5
uri = Ubuntu.Components.Themes.SuruDark
1780
6
installPath = $$[QT_INSTALL_QML]/$$replace(uri, \\., /)/1.3
1781
7
1782
8
QML_FILES = *.qml
1783
9
1784
10
qml_files.installPath = $$installPath
1785
11
qml_files.files = $$QML_FILES
1786
12
1787
13
UBUNTU_QML_MODULE_FILES += qml_files
1788
14
1789
0
15
1790
=== modified file 'modules/Ubuntu/Components/Themes/SuruDark/SuruDark.pro'
1791
--- modules/Ubuntu/Components/Themes/SuruDark/SuruDark.pro	2015-04-24 14:48:00 +0000
1792
+++ modules/Ubuntu/Components/Themes/SuruDark/SuruDark.pro	2015-05-02 11:10:54 +0000
1793
@@ -1,27 +1,30 @@
1821
1
TEMPLATE = aux
1
TEMPLATE = subdirs
1822
2
CONFIG+=ubuntu_qml_module
2
1823
3
3
SUBDIRS += 1.2 \
1824
4
uri = Ubuntu.Components.Themes.SuruDark
4
           1.3 \
1825
5
installPath = $$[QT_INSTALL_QML]/$$replace(uri, \\., /)
5
           SuruDarkModule.pro
1826
6
6
1827
7
PARENT_THEME_FILE = parent_theme
7
#uri = Ubuntu.Components.Themes.SuruDark
1828
8
QMLDIR_FILE = qmldir
8
#installPath = $$[QT_INSTALL_QML]/$$replace(uri, \\., /)
1829
9
QML_FILES = ./1.2/*.qml ./1.3/*.qml
9
1830
10
ARTWORK_FILES += artwork/*.png \
10
#PARENT_THEME_FILE = parent_theme
1831
11
                 artwork/*.svg \
11
#QMLDIR_FILE = qmldir
1832
12
                 artwork/*.sci
12
#QML_FILES = ./1.2/*.qml ./1.3/*.qml
1833
13
13
#ARTWORK_FILES += artwork/*.png \
1834
14
parent_theme_file.installPath = $$installPath
14
#                 artwork/*.svg \
1835
15
parent_theme_file.files = $$PARENT_THEME_FILE
15
#                 artwork/*.sci
1836
16
16
1837
17
qmldir_file.installPath = $$installPath
17
#parent_theme_file.installPath = $$installPath
1838
18
qmldir_file.files = $$QMLDIR_FILE
18
#parent_theme_file.files = $$PARENT_THEME_FILE
1839
19
19
1840
20
qml_files.installPath = $$installPath
20
#qmldir_file.installPath = $$installPath
1841
21
qml_files.files = $$QML_FILES
21
#qmldir_file.files = $$QMLDIR_FILE
1842
22
22
1843
23
artwork_files.installPath = $$installPath/artwork
23
#qml_files.installPath = $$installPath
1844
24
artwork_files.files = $$ARTWORK_FILES
24
#qml_files.files = $$QML_FILES
1845
25
25
1846
26
26
#artwork_files.installPath = $$installPath/artwork
1847
27
UBUNTU_QML_MODULE_FILES += parent_theme_file qmldir_file qml_files artwork_files
27
#artwork_files.files = $$ARTWORK_FILES
1848
28
1849
29
1850
30
#UBUNTU_QML_MODULE_FILES += parent_theme_file qmldir_file qml_files artwork_files
1851
28
31
1852
=== added file 'modules/Ubuntu/Components/Themes/SuruDark/SuruDarkModule.pro'
1853
--- modules/Ubuntu/Components/Themes/SuruDark/SuruDarkModule.pro	1970-01-01 00:00:00 +0000
1854
+++ modules/Ubuntu/Components/Themes/SuruDark/SuruDarkModule.pro	2015-05-02 11:10:54 +0000
1855
@@ -0,0 +1,22 @@
1856
1
TEMPLATE = aux
1857
2
CONFIG+=ubuntu_qml_module
1858
3
1859
4
uri = Ubuntu.Components.Themes.SuruDark
1860
5
installPath = $$[QT_INSTALL_QML]/$$replace(uri, \\., /)
1861
6
1862
7
PARENT_THEME_FILE = parent_theme
1863
8
QMLDIR_FILE = qmldir
1864
9
ARTWORK_FILES += artwork/*.png \
1865
10
                 artwork/*.svg \
1866
11
                 artwork/*.sci
1867
12
1868
13
parent_theme_file.installPath = $$installPath
1869
14
parent_theme_file.files = $$PARENT_THEME_FILE
1870
15
1871
16
qmldir_file.installPath = $$installPath
1872
17
qmldir_file.files = $$QMLDIR_FILE
1873
18
1874
19
artwork_files.installPath = $$installPath/artwork
1875
20
artwork_files.files = $$ARTWORK_FILES
1876
21
1877
22
UBUNTU_QML_MODULE_FILES += parent_theme_file qmldir_file artwork_files
1878
0
23
1879
=== modified file 'modules/Ubuntu/Components/Themes/SuruGradient/SuruGradient.pro'
1880
--- modules/Ubuntu/Components/Themes/SuruGradient/SuruGradient.pro	2014-11-26 08:35:25 +0000
1881
+++ modules/Ubuntu/Components/Themes/SuruGradient/SuruGradient.pro	2015-05-02 11:10:54 +0000
1882
@@ -5,6 +5,7 @@
1883
5
installPath = $$[QT_INSTALL_QML]/$$replace(uri, \\., /)
5
installPath = $$[QT_INSTALL_QML]/$$replace(uri, \\., /)
1884
6
6
1885
7
PARENT_THEME_FILE = parent_theme
7
PARENT_THEME_FILE = parent_theme
1886
8
DEPRECATED_FILE = deprecated
1887
8
QMLDIR_FILE = qmldir
9
QMLDIR_FILE = qmldir
1888
9
QML_FILES = *.qml
10
QML_FILES = *.qml
1889
10
ARTWORK_FILES += artwork/*.png \
11
ARTWORK_FILES += artwork/*.png \
1890
@@ -14,6 +15,9 @@
1891
14
parent_theme_file.installPath = $$installPath
15
parent_theme_file.installPath = $$installPath
1892
15
parent_theme_file.files = $$PARENT_THEME_FILE
16
parent_theme_file.files = $$PARENT_THEME_FILE
1893
16
17
1894
18
deprecated_file.installPath = $$installPath
1895
19
deprecated_file.files = $$DEPRECATED_FILE
1896
20
1897
17
qmldir_file.installPath = $$installPath
21
qmldir_file.installPath = $$installPath
1898
18
qmldir_file.files = $$QMLDIR_FILE
22
qmldir_file.files = $$QMLDIR_FILE
1899
19
23
1900
@@ -24,4 +28,4 @@
1901
24
artwork_files.files = $$ARTWORK_FILES
28
artwork_files.files = $$ARTWORK_FILES
1902
25
29
1903
26
30
1905
27
UBUNTU_QML_MODULE_FILES += parent_theme_file qmldir_file qml_files artwork_files
31
UBUNTU_QML_MODULE_FILES += parent_theme_file deprecated_file qmldir_file qml_files artwork_files
1906
28
32
1907
=== added file 'modules/Ubuntu/Components/Themes/SuruGradient/deprecated'
1908
=== modified file 'modules/Ubuntu/Components/Themes/Themes.pro'
1909
--- modules/Ubuntu/Components/Themes/Themes.pro	2014-11-24 10:39:15 +0000
1910
+++ modules/Ubuntu/Components/Themes/Themes.pro	2015-05-02 11:10:54 +0000
1911
@@ -1,5 +1,8 @@
1912
1
TEMPLATE = subdirs
1
TEMPLATE = subdirs
1913
2
SUBDIRS += ThemesModule.pro \
2
SUBDIRS += ThemesModule.pro \
1914
3
           1.2 \
1915
4
           1.3 \
1916
3
           Ambiance \
5
           Ambiance \
1917
4
           SuruDark \
6
           SuruDark \
1918
7
           #deprecated, but we keep for compatibility
1919
5
           SuruGradient
8
           SuruGradient
1920
6
9
1921
=== modified file 'modules/Ubuntu/Components/ToolbarButton.qml'
1922
--- modules/Ubuntu/Components/ToolbarButton.qml	2015-04-24 14:07:02 +0000
1923
+++ modules/Ubuntu/Components/ToolbarButton.qml	2015-05-02 11:10:54 +0000
1924
@@ -29,7 +29,7 @@
1925
29
        Example of different ways to define the toolbar button:
29
        Example of different ways to define the toolbar button:
1926
30
        \qml
30
        \qml
1927
31
        import QtQuick 2.4
31
        import QtQuick 2.4
1929
32
        import Ubuntu.Components 1.2
32
        import Ubuntu.Components 1.3
1930
33
33
1931
34
        MainView {
34
        MainView {
1932
35
            width: units.gu(50)
35
            width: units.gu(50)
1933
36
36
1934
=== modified file 'modules/Ubuntu/Components/ToolbarItems.qml'
1935
--- modules/Ubuntu/Components/ToolbarItems.qml	2015-03-05 09:35:06 +0000
1936
+++ modules/Ubuntu/Components/ToolbarItems.qml	2015-05-02 11:10:54 +0000
1937
@@ -39,7 +39,7 @@
1938
39
    be visible to the user:
39
    be visible to the user:
1939
40
    \qml
40
    \qml
1940
41
        import QtQuick 2.4
41
        import QtQuick 2.4
1942
42
        import Ubuntu.Components 1.2
42
        import Ubuntu.Components 1.3
1943
43
43
1944
44
        MainView {
44
        MainView {
1945
45
            width: units.gu(50)
45
            width: units.gu(50)
1946
@@ -71,7 +71,7 @@
1947
71
    the full height of the toolbar, and other Items you will probably want to center vertically:
71
    the full height of the toolbar, and other Items you will probably want to center vertically:
1948
72
    \qml
72
    \qml
1949
73
        import QtQuick 2.4
73
        import QtQuick 2.4
1951
74
        import Ubuntu.Components 1.2
74
        import Ubuntu.Components 1.3
1952
75
75
1953
76
        MainView {
76
        MainView {
1954
77
            width: units.gu(50)
77
            width: units.gu(50)
1955
@@ -120,7 +120,7 @@
1956
120
      visible in the toolbar, instead of the default toolbar-styled back button:
120
      visible in the toolbar, instead of the default toolbar-styled back button:
1957
121
        \qml
121
        \qml
1958
122
            import QtQuick 2.4
122
            import QtQuick 2.4
1960
123
            import Ubuntu.Components 1.2
123
            import Ubuntu.Components 1.3
1961
124
124
1962
125
            MainView {
125
            MainView {
1963
126
                width: units.gu(50)
126
                width: units.gu(50)
1964
127
127
1965
=== modified file 'modules/Ubuntu/Components/UbuntuListView.qml'
1966
--- modules/Ubuntu/Components/UbuntuListView.qml	2015-03-03 13:47:48 +0000
1967
+++ modules/Ubuntu/Components/UbuntuListView.qml	2015-05-02 11:10:54 +0000
1968
@@ -15,7 +15,7 @@
1969
15
 */
15
 */
1970
16
16
1971
17
import QtQuick 2.4
17
import QtQuick 2.4
1973
18
import Ubuntu.Components 1.2 as Toolkit
18
import Ubuntu.Components 1.3 as Toolkit
1974
19
19
1975
20
/*!
20
/*!
1976
21
    \qmltype UbuntuListView
21
    \qmltype UbuntuListView
1977
@@ -30,7 +30,7 @@
1978
30
30
1979
31
    Examples:
31
    Examples:
1980
32
    \qml
32
    \qml
1982
33
        import Ubuntu.Components 1.2
33
        import Ubuntu.Components 1.3
1983
34
        import Ubuntu.Components.ListItems 1.0 as ListItem
34
        import Ubuntu.Components.ListItems 1.0 as ListItem
1984
35
35
1985
36
        Item {
36
        Item {
1986
37
37
1987
=== modified file 'modules/Ubuntu/Components/UbuntuNumberAnimation.qml'
1988
--- modules/Ubuntu/Components/UbuntuNumberAnimation.qml	2015-03-03 13:47:48 +0000
1989
+++ modules/Ubuntu/Components/UbuntuNumberAnimation.qml	2015-05-02 11:10:54 +0000
1990
@@ -16,7 +16,7 @@
1991
16
 */
16
 */
1992
17
17
1993
18
import QtQuick 2.4
18
import QtQuick 2.4
1995
19
import Ubuntu.Components 1.2
19
import Ubuntu.Components 1.3
1996
20
20
1997
21
/*!
21
/*!
1998
22
    \qmltype UbuntuNumberAnimation
22
    \qmltype UbuntuNumberAnimation
1999
@@ -29,7 +29,7 @@
2000
29
29
2001
30
    \qml
30
    \qml
2002
31
    import QtQuick 2.4
31
    import QtQuick 2.4
2004
32
    import Ubuntu.Components 1.2
32
    import Ubuntu.Components 1.3
2005
33
33
2006
34
    Rectangle {
34
    Rectangle {
2007
35
        width: 100; height: 100
35
        width: 100; height: 100
2008
36
36
2009
=== modified file 'modules/Ubuntu/Components/plugin/ucdefaulttheme.cpp'
2010
--- modules/Ubuntu/Components/plugin/ucdefaulttheme.cpp	2015-03-23 16:28:35 +0000
2011
+++ modules/Ubuntu/Components/plugin/ucdefaulttheme.cpp	2015-05-02 11:10:54 +0000
2012
@@ -39,7 +39,7 @@
2013
39
    m_settings(SETTINGS_FILE_FORMAT.arg(QStandardPaths::writableLocation(QStandardPaths::ConfigLocation)), QSettings::IniFormat)
39
    m_settings(SETTINGS_FILE_FORMAT.arg(QStandardPaths::writableLocation(QStandardPaths::ConfigLocation)), QSettings::IniFormat)
2014
40
{
40
{
2015
41
    // fundamental features rely on the default theme, so bail out if it's absent
41
    // fundamental features rely on the default theme, so bail out if it's absent
2017
42
    if (pathFromThemeName(DEFAULT_THEME).isEmpty()) {
42
    if (!pathFromThemeName(DEFAULT_THEME).isValid()) {
2018
43
        qWarning() << "Mandatory default theme" << DEFAULT_THEME << "missing!";
43
        qWarning() << "Mandatory default theme" << DEFAULT_THEME << "missing!";
2019
44
    }
44
    }
2020
45
45
2021
46
46
2022
=== modified file 'modules/Ubuntu/Components/plugin/ucdeprecatedtheme.cpp'
2023
--- modules/Ubuntu/Components/plugin/ucdeprecatedtheme.cpp	2015-04-24 15:16:34 +0000
2024
+++ modules/Ubuntu/Components/plugin/ucdeprecatedtheme.cpp	2015-05-02 11:10:54 +0000
2025
@@ -119,7 +119,7 @@
2026
119
QQmlComponent* UCDeprecatedTheme::createStyleComponent(const QString& styleName, QObject* parent)
119
QQmlComponent* UCDeprecatedTheme::createStyleComponent(const QString& styleName, QObject* parent)
2027
120
{
120
{
2028
121
    showDeprecatedNote(parent, "Theme.createStyleComponent() is deprecated. Use ThemeSettings instead.");
121
    showDeprecatedNote(parent, "Theme.createStyleComponent() is deprecated. Use ThemeSettings instead.");
2030
122
    return UCTheme::defaultTheme().createStyleComponent(styleName, parent);
122
    return UCTheme::defaultTheme().createStyleComponent(styleName, parent, BUILD_VERSION(1, 2));
2031
123
}
123
}
2032
124
124
2033
125
void UCDeprecatedTheme::registerToContext(QQmlContext* context)
125
void UCDeprecatedTheme::registerToContext(QQmlContext* context)
2034
126
126
2035
=== modified file 'modules/Ubuntu/Components/plugin/uctheme.cpp'
2036
--- modules/Ubuntu/Components/plugin/uctheme.cpp	2015-04-25 05:10:08 +0000
2037
+++ modules/Ubuntu/Components/plugin/uctheme.cpp	2015-05-02 11:10:54 +0000
2038
@@ -142,7 +142,8 @@
2039
142
const QString THEME_FOLDER_FORMAT("%1/%2/");
142
const QString THEME_FOLDER_FORMAT("%1/%2/");
2040
143
const QString PARENT_THEME_FILE("parent_theme");
143
const QString PARENT_THEME_FILE("parent_theme");
2041
144
144
2043
145
QStringList themeSearchPath() {
145
QStringList themeSearchPath()
2044
146
{
2045
146
    QString envPath = QLatin1String(getenv("UBUNTU_UI_TOOLKIT_THEMES_PATH"));
147
    QString envPath = QLatin1String(getenv("UBUNTU_UI_TOOLKIT_THEMES_PATH"));
2046
147
    QStringList pathList = envPath.split(':', QString::SkipEmptyParts);
148
    QStringList pathList = envPath.split(':', QString::SkipEmptyParts);
2047
148
    if (pathList.isEmpty()) {
149
    if (pathList.isEmpty()) {
2048
@@ -162,7 +163,6 @@
2049
162
        pathList << qml2ImportPath.split(':', QString::SkipEmptyParts);
163
        pathList << qml2ImportPath.split(':', QString::SkipEmptyParts);
2050
163
    }
164
    }
2051
164
    pathList << QLibraryInfo::location(QLibraryInfo::Qml2ImportsPath).split(':', QString::SkipEmptyParts);
165
    pathList << QLibraryInfo::location(QLibraryInfo::Qml2ImportsPath).split(':', QString::SkipEmptyParts);
2052
165
2053
166
    // fix folders
166
    // fix folders
2054
167
    QStringList result;
167
    QStringList result;
2055
168
    Q_FOREACH(const QString &path, pathList) {
168
    Q_FOREACH(const QString &path, pathList) {
2056
@@ -175,8 +175,10 @@
2057
175
    return result;
175
    return result;
2058
176
}
176
}
2059
177
177
2061
178
QUrl pathFromThemeName(QString themeName)
178
UCTheme::ThemeRecord pathFromThemeName(QString themeName)
2062
179
{
179
{
2063
180
    // the first entry from pathList is the app's current folder
2064
181
    UCTheme::ThemeRecord record(themeName, QUrl(), false, false);
2065
180
    themeName.replace('.', '/');
182
    themeName.replace('.', '/');
2066
181
    QStringList pathList = themeSearchPath();
183
    QStringList pathList = themeSearchPath();
2067
182
    Q_FOREACH(const QString &path, pathList) {
184
    Q_FOREACH(const QString &path, pathList) {
2068
@@ -184,20 +186,22 @@
2069
184
        // QUrl needs a trailing slash to understand it's a directory
186
        // QUrl needs a trailing slash to understand it's a directory
2070
185
        QString absoluteThemeFolder = QDir(themeFolder).absolutePath().append('/');
187
        QString absoluteThemeFolder = QDir(themeFolder).absolutePath().append('/');
2071
186
        if (QDir(absoluteThemeFolder).exists()) {
188
        if (QDir(absoluteThemeFolder).exists()) {
2073
187
            return QUrl::fromLocalFile(absoluteThemeFolder);
189
            record.deprecated = QFile::exists(absoluteThemeFolder + "deprecated");
2074
190
            record.shared = QFile::exists(absoluteThemeFolder + "qmldir");
2075
191
            record.path = QUrl::fromLocalFile(absoluteThemeFolder);
2076
192
            break;
2077
188
        }
193
        }
2078
189
    }
194
    }
2080
190
    return QUrl();
195
    return record;
2081
191
}
196
}
2082
192
197
2084
193
QString parentThemeName(const QString& themeName)
198
QString parentThemeName(const UCTheme::ThemeRecord& themePath)
2085
194
{
199
{
2086
195
    QString parentTheme;
200
    QString parentTheme;
2087
196
    QUrl themePath = pathFromThemeName(themeName);
2088
197
    if (!themePath.isValid()) {
201
    if (!themePath.isValid()) {
2090
198
        qWarning() << qPrintable(UbuntuI18n::instance().tr("Theme not found: \"%1\"").arg(themeName));
202
        qWarning() << qPrintable(UbuntuI18n::instance().tr("Theme not found: \"%1\"").arg(themePath.name));
2091
199
    } else {
203
    } else {
2093
200
        QFile file(themePath.resolved(PARENT_THEME_FILE).toLocalFile());
204
        QFile file(themePath.path.resolved(PARENT_THEME_FILE).toLocalFile());
2094
201
        if (file.open(QIODevice::ReadOnly | QIODevice::Text)) {
205
        if (file.open(QIODevice::ReadOnly | QIODevice::Text)) {
2095
202
            QTextStream in(&file);
206
            QTextStream in(&file);
2096
203
            parentTheme = in.readLine();
207
            parentTheme = in.readLine();
2097
@@ -400,11 +404,11 @@
2098
400
404
2099
401
    QString themeName = name();
405
    QString themeName = name();
2100
402
    while (!themeName.isEmpty()) {
406
    while (!themeName.isEmpty()) {
2102
403
        QUrl themePath = pathFromThemeName(themeName);
407
        ThemeRecord themePath = pathFromThemeName(themeName);
2103
404
        if (themePath.isValid()) {
408
        if (themePath.isValid()) {
2104
405
            m_themePaths.append(themePath);
409
            m_themePaths.append(themePath);
2105
406
        }
410
        }
2107
407
        themeName = parentThemeName(themeName);
411
        themeName = parentThemeName(themePath);
2108
408
    }
412
    }
2109
409
}
413
}
2110
410
414
2111
@@ -549,24 +553,46 @@
2112
549
    setPalette(NULL);
553
    setPalette(NULL);
2113
550
}
554
}
2114
551
555
2116
552
QUrl UCTheme::styleUrl(const QString& styleName, quint16 version)
556
QUrl UCTheme::styleUrl(const QString& styleName, quint16 version, bool *isFallback)
2117
553
{
557
{
2120
554
    Q_FOREACH (const QUrl& themePath, m_themePaths) {
558
    if (isFallback) {
2121
555
        // check versioned style first
559
        (*isFallback) = false;
2122
560
    }
2123
561
    Q_FOREACH (const ThemeRecord &themePath, m_themePaths) {
2124
556
        QUrl styleUrl;
562
        QUrl styleUrl;
2125
563
        /*
2126
564
         * There are two cases where we have to deal with non-versioned styles: application
2127
565
         * themes made for the previous theming and deprecated themes. For shared themes,
2128
566
         * we have to check the fallback case.
2129
567
         */
2130
568
        quint16 styleVersion = version;
2131
569
        if (themePath.deprecated) {
2132
570
            styleVersion = 0;
2133
571
        }
2134
572
        if (themePath.shared && (version < BUILD_VERSION(1, 2))) {
2135
573
            styleVersion = LATEST_UITK_VERSION;
2136
574
        }
2137
575
2138
576
        // loop through the versions to see if we have one matching
2139
557
        // we stop at version 1.2 as we do not have support for earlier themes anymore.
577
        // we stop at version 1.2 as we do not have support for earlier themes anymore.
2143
558
        for (int minor = MINOR_VERSION(version); minor >= 2; minor--) {
578
        for (int minor = MINOR_VERSION(styleVersion); minor >= 2; minor--) {
2144
559
            QString versionedName = QStringLiteral("%1.%2/%3").arg(MAJOR_VERSION(version)).arg(minor).arg(styleName);
579
            QString versionedName = QStringLiteral("%1.%2/%3").arg(MAJOR_VERSION(styleVersion)).arg(minor).arg(styleName);
2145
560
            styleUrl = themePath.resolved(versionedName);
580
            styleUrl = themePath.path.resolved(versionedName);
2146
561
            if (styleUrl.isValid() && QFile::exists(styleUrl.toLocalFile())) {
581
            if (styleUrl.isValid() && QFile::exists(styleUrl.toLocalFile())) {
2147
582
                // set fallback warning if the theme is shared
2148
583
                if (isFallback && themePath.shared && (version != styleVersion)) {
2149
584
                    (*isFallback) = true;
2150
585
                }
2151
562
                return styleUrl;
586
                return styleUrl;
2152
563
            }
587
            }
2153
564
        }
588
        }
2154
565
589
2159
566
        // fall back to the old one
590
        // if we don't get any style, get the non-versioned ones for non-shared and deprecated styles
2160
567
        styleUrl = themePath.resolved(styleName);
591
        if (!themePath.shared || themePath.deprecated) {
2161
568
        if (styleUrl.isValid() && QFile::exists(styleUrl.toLocalFile())) {
592
            styleUrl = themePath.path.resolved(styleName);
2162
569
            return styleUrl;
593
            if (styleUrl.isValid() && QFile::exists(styleUrl.toLocalFile())) {
2163
594
                return styleUrl;
2164
595
            }
2165
570
        }
596
        }
2166
571
    }
597
    }
2167
572
598
2168
@@ -642,8 +668,14 @@
2169
642
        }
668
        }
2170
643
        // make sure we have the paths
669
        // make sure we have the paths
2171
644
        if (engine != NULL) {
670
        if (engine != NULL) {
2173
645
            QUrl url = styleUrl(styleName, version);
671
            bool fallback = false;
2174
672
            QUrl url = styleUrl(styleName, version, &fallback);
2175
646
            if (url.isValid()) {
673
            if (url.isValid()) {
2176
674
                if (fallback) {
2177
675
                    qmlInfo(parent) << QStringLiteral("Theme '%1' has no '%2' style for version %3.%4, fall back to version %5.%6.")
2178
676
                                       .arg(name()).arg(styleName).arg(MAJOR_VERSION(version)).arg(MINOR_VERSION(version))
2179
677
                                       .arg(MAJOR_VERSION(LATEST_UITK_VERSION)).arg(MINOR_VERSION(LATEST_UITK_VERSION));
2180
678
                }
2181
647
                component = new QQmlComponent(engine, url, QQmlComponent::PreferSynchronous, parent);
679
                component = new QQmlComponent(engine, url, QQmlComponent::PreferSynchronous, parent);
2182
648
                if (component->isError()) {
680
                if (component->isError()) {
2183
649
                    qmlInfo(parent) << component->errorString();
681
                    qmlInfo(parent) << component->errorString();
2184
650
682
2185
=== modified file 'modules/Ubuntu/Components/plugin/uctheme.h'
2186
--- modules/Ubuntu/Components/plugin/uctheme.h	2015-04-24 15:16:34 +0000
2187
+++ modules/Ubuntu/Components/plugin/uctheme.h	2015-05-02 11:10:54 +0000
2188
@@ -41,6 +41,24 @@
2189
41
    Q_PROPERTY(QObject* palette READ palette WRITE setPalette RESET resetPalette NOTIFY paletteChanged FINAL)
41
    Q_PROPERTY(QObject* palette READ palette WRITE setPalette RESET resetPalette NOTIFY paletteChanged FINAL)
2190
42
    Q_PROPERTY(quint16 version MEMBER m_version WRITE setVersion NOTIFY versionChanged FINAL)
42
    Q_PROPERTY(quint16 version MEMBER m_version WRITE setVersion NOTIFY versionChanged FINAL)
2191
43
public:
43
public:
2192
44
    struct ThemeRecord {
2193
45
        ThemeRecord() :
2194
46
            shared(false), deprecated(false)
2195
47
        {}
2196
48
        ThemeRecord(const QString &name, const QUrl &path, bool shared, bool deprecated) :
2197
49
            name(name), path(path), shared(shared), deprecated(deprecated)
2198
50
        {}
2199
51
        bool isValid() const
2200
52
        {
2201
53
            return path.isValid();
2202
54
        }
2203
55
2204
56
        QString name;
2205
57
        QUrl path;
2206
58
        bool shared:1;
2207
59
        bool deprecated:1;
2208
60
    };
2209
61
2210
44
    explicit UCTheme(QObject *parent = 0);
62
    explicit UCTheme(QObject *parent = 0);
2211
45
    static UCTheme &defaultTheme()
63
    static UCTheme &defaultTheme()
2212
46
    {
64
    {
2213
@@ -87,7 +105,7 @@
2214
87
    void init();
105
    void init();
2215
88
    void updateEnginePaths();
106
    void updateEnginePaths();
2216
89
    void updateThemePaths();
107
    void updateThemePaths();
2218
90
    QUrl styleUrl(const QString& styleName, quint16 version);
108
    QUrl styleUrl(const QString& styleName, quint16 version, bool *isFallback = NULL);
2219
91
    void loadPalette(bool notify = true);
109
    void loadPalette(bool notify = true);
2220
92
110
2221
93
    class PaletteConfig
111
    class PaletteConfig
2222
@@ -138,7 +156,7 @@
2223
138
    QPointer<QObject> m_palette; // the palette might be from the default style if the theme doesn't define palette
156
    QPointer<QObject> m_palette; // the palette might be from the default style if the theme doesn't define palette
2224
139
    QQmlEngine *m_engine;
157
    QQmlEngine *m_engine;
2225
140
    PaletteConfig m_config;
158
    PaletteConfig m_config;
2227
141
    QList<QUrl> m_themePaths;
159
    QList<ThemeRecord> m_themePaths;
2228
142
    UCDefaultTheme m_defaultTheme;
160
    UCDefaultTheme m_defaultTheme;
2229
143
    quint16 m_version;
161
    quint16 m_version;
2230
144
    bool m_defaultStyle:1;
162
    bool m_defaultStyle:1;
2231
@@ -147,6 +165,6 @@
2232
147
    friend class UCDeprecatedTheme;
165
    friend class UCDeprecatedTheme;
2233
148
};
166
};
2234
149
167
2236
150
QUrl pathFromThemeName(QString themeName);
168
UCTheme::ThemeRecord pathFromThemeName(QString themeName);
2237
151
169
2238
152
#endif // UCTHEME_H
170
#endif // UCTHEME_H
2239
153
171
2240
=== modified file 'modules/Ubuntu/Components/qmldir'
2241
--- modules/Ubuntu/Components/qmldir	2015-04-10 06:52:20 +0000
2242
+++ modules/Ubuntu/Components/qmldir	2015-05-02 11:10:54 +0000
2243
@@ -94,7 +94,6 @@
2244
94
CrossFadeImage 1.1 CrossFadeImage11.qml
94
CrossFadeImage 1.1 CrossFadeImage11.qml
2245
95
PullToRefresh 1.1 PullToRefresh.qml
95
PullToRefresh 1.1 PullToRefresh.qml
2246
96
UbuntuListView 1.1 UbuntuListView11.qml
96
UbuntuListView 1.1 UbuntuListView11.qml
2247
97
internal PageBase Page10.qml
2248
98
Page 1.1 Page11.qml
97
Page 1.1 Page11.qml
2249
99
PageHeadConfiguration 1.1 PageHeadConfiguration11.qml
98
PageHeadConfiguration 1.1 PageHeadConfiguration11.qml
2250
100
PageHeadSections 1.1 PageHeadSections.qml
99
PageHeadSections 1.1 PageHeadSections.qml
2251
101
100
2252
=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/gallery/__init__.py'
2253
--- tests/autopilot/ubuntuuitoolkit/tests/gallery/__init__.py	2015-04-14 21:02:06 +0000
2254
+++ tests/autopilot/ubuntuuitoolkit/tests/gallery/__init__.py	2015-05-02 11:10:54 +0000
2255
@@ -87,7 +87,7 @@
2256
87
    def _get_path_to_gallery_source(self):
87
    def _get_path_to_gallery_source(self):
2257
88
        return os.path.join(
88
        return os.path.join(
2258
89
            ubuntuuitoolkit.tests.get_path_to_source_root(), 'examples',
89
            ubuntuuitoolkit.tests.get_path_to_source_root(), 'examples',
2260
90
            'ubuntu-ui-toolkit-gallery')
90
            '1.3', 'ubuntu-ui-toolkit-gallery')
2261
91
91
2262
92
    def _application_source_exists(self):
92
    def _application_source_exists(self):
2263
93
        return 'UBUNTU_UI_TOOLKIT_AUTOPILOT_FROM_SOURCE' in os.environ
93
        return 'UBUNTU_UI_TOOLKIT_AUTOPILOT_FROM_SOURCE' in os.environ
2264
@@ -98,7 +98,8 @@
2265
98
            'ubuntu-ui-toolkit-gallery.qml')
98
            'ubuntu-ui-toolkit-gallery.qml')
2266
99
99
2267
100
    def _get_path_to_installed_gallery(self):
100
    def _get_path_to_installed_gallery(self):
2269
101
        return '/usr/lib/ubuntu-ui-toolkit/examples/ubuntu-ui-toolkit-gallery'
101
        return '/usr/lib/ubuntu-ui-toolkit/examples/'
2270
102
        '1.3/ubuntu-ui-toolkit-gallery'
2271
102
103
2272
103
    def _get_desktop_file_path(self):
104
    def _get_desktop_file_path(self):
2273
104
        desktop_file_path = os.path.join(
105
        desktop_file_path = os.path.join(
2274
105
106
2275
=== added file 'tests/unit/tst_components/demo_image.jpg'
2276
106
Binary files tests/unit/tst_components/demo_image.jpg	1970-01-01 00:00:00 +0000 and tests/unit/tst_components/demo_image.jpg	2015-05-02 11:10:54 +0000 differ
107
Binary files tests/unit/tst_components/demo_image.jpg	1970-01-01 00:00:00 +0000 and tests/unit/tst_components/demo_image.jpg	2015-05-02 11:10:54 +0000 differ
2277
=== added file 'tests/unit/tst_components/map_icon.png'
2278
107
Binary files tests/unit/tst_components/map_icon.png	1970-01-01 00:00:00 +0000 and tests/unit/tst_components/map_icon.png	2015-05-02 11:10:54 +0000 differ
108
Binary files tests/unit/tst_components/map_icon.png	1970-01-01 00:00:00 +0000 and tests/unit/tst_components/map_icon.png	2015-05-02 11:10:54 +0000 differ
2279
=== modified file 'tests/unit/tst_components/tst_CrossFadeImage.qml'
2280
--- tests/unit/tst_components/tst_CrossFadeImage.qml	2015-03-03 13:20:06 +0000
2281
+++ tests/unit/tst_components/tst_CrossFadeImage.qml	2015-05-02 11:10:54 +0000
2282
@@ -41,7 +41,7 @@
2283
41
            width: 123
41
            width: 123
2284
42
            height: 321
42
            height: 321
2285
43
        }
43
        }
2287
44
        source: Qt.resolvedUrl("../../../examples/ubuntu-ui-toolkit-gallery/demo_image.jpg")
44
        source: Qt.resolvedUrl("demo_image.jpg")
2288
45
    }
45
    }
2289
46
46
2290
47
    function loadImage(url) {
47
    function loadImage(url) {
2291
@@ -91,8 +91,8 @@
2292
91
91
2293
92
    function test_fade(data) {
92
    function test_fade(data) {
2294
93
        crossFadeImage.fadeStyle = data.style;
93
        crossFadeImage.fadeStyle = data.style;
2297
94
        loadImage("../../../examples/ubuntu-ui-toolkit-gallery/demo_image.jpg");
94
        loadImage("demo_image.jpg");
2298
95
        loadImage("../../../examples/ubuntu-ui-toolkit-gallery/map_icon.png");
95
        loadImage("map_icon.png");
2299
96
        waitForAnimation();
96
        waitForAnimation();
2300
97
        cleanupTest();
97
        cleanupTest();
2301
98
    }
98
    }
2302
@@ -107,8 +107,8 @@
2303
107
    function test_fadeDuration(data) {
107
    function test_fadeDuration(data) {
2304
108
        crossFadeImage.fadeStyle = data.style;
108
        crossFadeImage.fadeStyle = data.style;
2305
109
        fadeDuration = UbuntuAnimation.SleepyDuration;
109
        fadeDuration = UbuntuAnimation.SleepyDuration;
2308
110
        loadImage("../../../examples/ubuntu-ui-toolkit-gallery/demo_image.jpg");
110
        loadImage("demo_image.jpg");
2309
111
        loadImage("../../../examples/ubuntu-ui-toolkit-gallery/map_icon.png");
111
        loadImage("map_icon.png");
2310
112
        sleep(UbuntuAnimation.SleepyDuration / 2); // < fadeDuration
112
        sleep(UbuntuAnimation.SleepyDuration / 2); // < fadeDuration
2311
113
        compare(running, true, "Animation stopped before 1000 ms");
113
        compare(running, true, "Animation stopped before 1000 ms");
2312
114
        waitForAnimation();
114
        waitForAnimation();
2313
@@ -116,7 +116,7 @@
2314
116
    }
116
    }
2315
117
117
2316
118
    function test_sourceSize() {
118
    function test_sourceSize() {
2318
119
        loadImage("../../../examples/ubuntu-ui-toolkit-gallery/demo_image.jpg");
119
        loadImage("demo_image.jpg");
2319
120
        compare(crossFadeImage.sourceSize.width, 640, "Source width incorrectly initialized.");
120
        compare(crossFadeImage.sourceSize.width, 640, "Source width incorrectly initialized.");
2320
121
        compare(crossFadeImage.sourceSize.height, 427, "Source height incorrectly initialized.");
121
        compare(crossFadeImage.sourceSize.height, 427, "Source height incorrectly initialized.");
2321
122
        crossFadeImage.sourceSize.width = 100;
122
        crossFadeImage.sourceSize.width = 100;
2322
123
123
2323
=== added directory 'tests/unit_x11/tst_deprecated_theme_engine/themes/TestModule/TestTheme/1.2'
2324
=== renamed file 'tests/unit_x11/tst_deprecated_theme_engine/themes/TestModule/TestTheme/TestStyle.qml' => 'tests/unit_x11/tst_deprecated_theme_engine/themes/TestModule/TestTheme/1.2/TestStyle.qml'
2325
=== removed file 'tests/unit_x11/tst_deprecated_theme_engine/themes/TestModule/TestTheme/parent_theme'
2326
--- tests/unit_x11/tst_deprecated_theme_engine/themes/TestModule/TestTheme/parent_theme	2013-10-11 05:56:57 +0000
2327
+++ tests/unit_x11/tst_deprecated_theme_engine/themes/TestModule/TestTheme/parent_theme	1970-01-01 00:00:00 +0000
2328
@@ -1,1 +0,0 @@
2329
1
Ubuntu.Components.Themes.Ambiance
2330
2
0
2331
=== modified file 'tests/unit_x11/tst_deprecated_theme_engine/themes/TestModule/TestTheme/qmldir'
2332
--- tests/unit_x11/tst_deprecated_theme_engine/themes/TestModule/TestTheme/qmldir	2013-10-11 05:56:57 +0000
2333
+++ tests/unit_x11/tst_deprecated_theme_engine/themes/TestModule/TestTheme/qmldir	2015-05-02 11:10:54 +0000
2334
@@ -1,2 +1,2 @@
2335
1
module TestTheme
1
module TestTheme
2336
2
TestStyle 1.0 TestStyle.qml
2337
3
\ No newline at end of file
2
\ No newline at end of file
2338
3
TestStyle 1.0 1.2/TestStyle.qml
2339
4
4
2340
=== renamed directory 'tests/unit_x11/tst_subtheming/TestModule' => 'tests/unit_x11/tst_subtheming/CustomModule'
2341
=== added file 'tests/unit_x11/tst_subtheming/DeprecatedTheme.qml'
2342
--- tests/unit_x11/tst_subtheming/DeprecatedTheme.qml	1970-01-01 00:00:00 +0000
2343
+++ tests/unit_x11/tst_subtheming/DeprecatedTheme.qml	2015-05-02 11:10:54 +0000
2344
@@ -0,0 +1,25 @@
2345
1
/*
2346
2
 * Copyright 2015 Canonical Ltd.
2347
3
 *
2348
4
 * This program is free software; you can redistribute it and/or modify
2349
5
 * it under the terms of the GNU Lesser General Public License as published by
2350
6
 * the Free Software Foundation; version 3.
2351
7
 *
2352
8
 * This program is distributed in the hope that it will be useful,
2353
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
2354
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
2355
11
 * GNU Lesser General Public License for more details.
2356
12
 *
2357
13
 * You should have received a copy of the GNU Lesser General Public License
2358
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
2359
15
 */
2360
16
import QtQuick 2.4
2361
17
import Ubuntu.Components 1.3
2362
18
2363
19
StyledItem {
2364
20
    id: item
2365
21
    width: units.gu(40)
2366
22
    height: units.gu(40)
2367
23
    theme.name: "Ubuntu.Components.Themes.SuruGradient"
2368
24
    style: theme.createStyleComponent("OptionSelectorStyle.qml", item)
2369
25
}
2370
0
26
2371
=== added file 'tests/unit_x11/tst_subtheming/StyledItemAppThemeFallback.qml'
2372
--- tests/unit_x11/tst_subtheming/StyledItemAppThemeFallback.qml	1970-01-01 00:00:00 +0000
2373
+++ tests/unit_x11/tst_subtheming/StyledItemAppThemeFallback.qml	2015-05-02 11:10:54 +0000
2374
@@ -0,0 +1,24 @@
2375
1
/*
2376
2
 * Copyright 2015 Canonical Ltd.
2377
3
 *
2378
4
 * This program is free software; you can redistribute it and/or modify
2379
5
 * it under the terms of the GNU Lesser General Public License as published by
2380
6
 * the Free Software Foundation; version 3.
2381
7
 *
2382
8
 * This program is distributed in the hope that it will be useful,
2383
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
2384
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
2385
11
 * GNU Lesser General Public License for more details.
2386
12
 *
2387
13
 * You should have received a copy of the GNU Lesser General Public License
2388
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
2389
15
 */
2390
16
import QtQuick 2.4
2391
17
import Ubuntu.Components 1.3
2392
18
2393
19
StyledItem {
2394
20
    id: item
2395
21
    theme.name: "themes.CustomTheme"
2396
22
    theme.version: Ubuntu.version(1, 0)
2397
23
    style: theme.createStyleComponent("TestStyle.qml", item)
2398
24
}
2399
0
25
2400
=== added file 'tests/unit_x11/tst_subtheming/StyledItemAppThemeVersioned.qml'
2401
--- tests/unit_x11/tst_subtheming/StyledItemAppThemeVersioned.qml	1970-01-01 00:00:00 +0000
2402
+++ tests/unit_x11/tst_subtheming/StyledItemAppThemeVersioned.qml	2015-05-02 11:10:54 +0000
2403
@@ -0,0 +1,24 @@
2404
1
/*
2405
2
 * Copyright 2015 Canonical Ltd.
2406
3
 *
2407
4
 * This program is free software; you can redistribute it and/or modify
2408
5
 * it under the terms of the GNU Lesser General Public License as published by
2409
6
 * the Free Software Foundation; version 3.
2410
7
 *
2411
8
 * This program is distributed in the hope that it will be useful,
2412
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
2413
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
2414
11
 * GNU Lesser General Public License for more details.
2415
12
 *
2416
13
 * You should have received a copy of the GNU Lesser General Public License
2417
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
2418
15
 */
2419
16
import QtQuick 2.4
2420
17
import Ubuntu.Components 1.3
2421
18
2422
19
StyledItem {
2423
20
    id: item
2424
21
    theme.name: "themes.CustomTheme"
2425
22
    theme.version: Ubuntu.toolkitVersion
2426
23
    style: theme.createStyleComponent("TestStyle.qml", item)
2427
24
}
2428
0
25
2429
=== added file 'tests/unit_x11/tst_subtheming/StyledItemFallback.qml'
2430
--- tests/unit_x11/tst_subtheming/StyledItemFallback.qml	1970-01-01 00:00:00 +0000
2431
+++ tests/unit_x11/tst_subtheming/StyledItemFallback.qml	2015-05-02 11:10:54 +0000
2432
@@ -0,0 +1,24 @@
2433
1
/*
2434
2
 * Copyright 2015 Canonical Ltd.
2435
3
 *
2436
4
 * This program is free software; you can redistribute it and/or modify
2437
5
 * it under the terms of the GNU Lesser General Public License as published by
2438
6
 * the Free Software Foundation; version 3.
2439
7
 *
2440
8
 * This program is distributed in the hope that it will be useful,
2441
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
2442
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
2443
11
 * GNU Lesser General Public License for more details.
2444
12
 *
2445
13
 * You should have received a copy of the GNU Lesser General Public License
2446
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
2447
15
 */
2448
16
import QtQuick 2.4
2449
17
import Ubuntu.Components 1.3
2450
18
2451
19
StyledItem {
2452
20
    id: item
2453
21
    theme.name: "TestModule.TestTheme"
2454
22
    theme.version: Ubuntu.version(1, 0)
2455
23
    style: theme.createStyleComponent("TestStyle.qml", item)
2456
24
}
2457
0
25
2458
=== modified file 'tests/unit_x11/tst_subtheming/StyledItemV12.qml'
2459
--- tests/unit_x11/tst_subtheming/StyledItemV12.qml	2015-04-25 06:35:16 +0000
2460
+++ tests/unit_x11/tst_subtheming/StyledItemV12.qml	2015-05-02 11:10:54 +0000
2461
@@ -18,7 +18,7 @@
2462
18
18
2463
19
StyledItem {
19
StyledItem {
2464
20
    id: item
20
    id: item
2466
21
    theme.name: "CustomTheme"
21
    theme.name: "themes.CustomTheme"
2467
22
    theme.version: Ubuntu.version(1, 2)
22
    theme.version: Ubuntu.version(1, 2)
2468
23
    style: theme.createStyleComponent("TestStyle.qml", item)
23
    style: theme.createStyleComponent("TestStyle.qml", item)
2469
24
}
24
}
2470
25
25
2471
=== modified file 'tests/unit_x11/tst_subtheming/StyledItemV13.qml'
2472
--- tests/unit_x11/tst_subtheming/StyledItemV13.qml	2015-04-25 06:35:16 +0000
2473
+++ tests/unit_x11/tst_subtheming/StyledItemV13.qml	2015-05-02 11:10:54 +0000
2474
@@ -18,7 +18,7 @@
2475
18
18
2476
19
StyledItem {
19
StyledItem {
2477
20
    id: item
20
    id: item
2479
21
    theme.name: "CustomTheme"
21
    theme.name: "themes.CustomTheme"
2480
22
    theme.version: Ubuntu.toolkitVersion
22
    theme.version: Ubuntu.toolkitVersion
2481
23
    style: theme.createStyleComponent("TestStyle.qml", item)
23
    style: theme.createStyleComponent("TestStyle.qml", item)
2482
24
}
24
}
2483
25
25
2484
=== added directory 'tests/unit_x11/tst_subtheming/themes/TestModule/TestTheme/1.2'
2485
=== renamed file 'tests/unit_x11/tst_subtheming/themes/TestModule/TestTheme/TestStyle.qml' => 'tests/unit_x11/tst_subtheming/themes/TestModule/TestTheme/1.2/TestStyle.qml'
2486
=== modified file 'tests/unit_x11/tst_subtheming/themes/TestModule/TestTheme/qmldir'
2487
--- tests/unit_x11/tst_subtheming/themes/TestModule/TestTheme/qmldir	2015-04-25 06:35:16 +0000
2488
+++ tests/unit_x11/tst_subtheming/themes/TestModule/TestTheme/qmldir	2015-05-02 11:10:54 +0000
2489
@@ -1,5 +1,5 @@
2490
1
module TestTheme
1
module TestTheme
2492
2
TestStyle 1.0 TestStyle.qml
2
TestStyle 1.0 ./1.2/TestStyle.qml
2493
3
3
2494
4
#version 1.3
4
#version 1.3
2495
5
TestStyle 1.3 ./1.3/TestStyle.qml
5
TestStyle 1.3 ./1.3/TestStyle.qml
2496
6
6
2497
=== modified file 'tests/unit_x11/tst_subtheming/tst_subtheming.cpp'
2498
--- tests/unit_x11/tst_subtheming/tst_subtheming.cpp	2015-04-25 06:35:16 +0000
2499
+++ tests/unit_x11/tst_subtheming/tst_subtheming.cpp	2015-05-02 11:10:54 +0000
2500
@@ -146,7 +146,7 @@
2501
146
        if (styleName == "NotExistingTestStyle.qml") {
146
        if (styleName == "NotExistingTestStyle.qml") {
2502
147
            ThemeTestCase::ignoreWarning(parentName, 20, 1, "QML SimpleItem: Warning: Style NotExistingTestStyle.qml not found in theme TestModule.TestTheme");
147
            ThemeTestCase::ignoreWarning(parentName, 20, 1, "QML SimpleItem: Warning: Style NotExistingTestStyle.qml not found in theme TestModule.TestTheme");
2503
148
        }
148
        }
2505
149
        qputenv("UBUNTU_UI_TOOLKIT_THEMES_PATH", ".");
149
        qputenv("UBUNTU_UI_TOOLKIT_THEMES_PATH", "./themes");
2506
150
150
2507
151
        QScopedPointer<ThemeTestCase> view(new ThemeTestCase(parentName));
151
        QScopedPointer<ThemeTestCase> view(new ThemeTestCase(parentName));
2508
152
        view->setTheme("TestModule.TestTheme");
152
        view->setTheme("TestModule.TestTheme");
2509
@@ -165,7 +165,7 @@
2510
165
        QTest::addColumn<bool>("success");
165
        QTest::addColumn<bool>("success");
2511
166
166
2512
167
        QTest::newRow("One toolkit theme path")
167
        QTest::newRow("One toolkit theme path")
2514
168
                << "../tst_theme_engine" << ""
168
                << "./themes" << ""
2515
169
                << "TestModule.TestTheme" << "TestStyle.qml"
169
                << "TestModule.TestTheme" << "TestStyle.qml"
2516
170
                << "" << true;
170
                << "" << true;
2517
171
        QTest::newRow("Two toolkit theme paths")
171
        QTest::newRow("Two toolkit theme paths")
2518
@@ -173,7 +173,7 @@
2519
173
                << "CustomTheme" << "TestStyle.qml"
173
                << "CustomTheme" << "TestStyle.qml"
2520
174
                << "" << true;
174
                << "" << true;
2521
175
        QTest::newRow("One XDG path")
175
        QTest::newRow("One XDG path")
2523
176
                << "" << "../tst_theme_engine"
176
                << "" << "./themes"
2524
177
                << "TestModule.TestTheme" << "TestStyle.qml"
177
                << "TestModule.TestTheme" << "TestStyle.qml"
2525
178
                << "" << true;
178
                << "" << true;
2526
179
        QTest::newRow("Two XDG paths")
179
        QTest::newRow("Two XDG paths")
2527
@@ -244,10 +244,10 @@
2528
244
244
2529
245
        qputenv("UBUNTU_UI_TOOLKIT_THEMES_PATH", "");
245
        qputenv("UBUNTU_UI_TOOLKIT_THEMES_PATH", "");
2530
246
        qputenv("XDG_DATA_DIRS", "");
246
        qputenv("XDG_DATA_DIRS", "");
2532
247
        qputenv("QML2_IMPORT_PATH", "/no/plugins/here:.");
247
        qputenv("QML2_IMPORT_PATH", "/no/plugins/here");
2533
248
248
2534
249
        QScopedPointer<ThemeTestCase> view(new ThemeTestCase("SimpleItem.qml"));
249
        QScopedPointer<ThemeTestCase> view(new ThemeTestCase("SimpleItem.qml"));
2536
250
        view->setTheme("TestModule.TestTheme");
250
        view->setTheme("CustomModule.TestTheme");
2537
251
    }
251
    }
2538
252
252
2539
253
    void test_theme_not_root_theme()
253
    void test_theme_not_root_theme()
2540
@@ -255,7 +255,7 @@
2541
255
        qputenv("UBUNTU_UI_TOOLKIT_THEMES_PATH", ".");
255
        qputenv("UBUNTU_UI_TOOLKIT_THEMES_PATH", ".");
2542
256
256
2543
257
        QScopedPointer<ThemeTestCase> view(new ThemeTestCase("SimpleItem.qml"));
257
        QScopedPointer<ThemeTestCase> view(new ThemeTestCase("SimpleItem.qml"));
2545
258
        view->setTheme("TestModule.TestTheme");
258
        view->setTheme("CustomModule.TestTheme");
2546
259
        UCTheme *theme = view->theme();
259
        UCTheme *theme = view->theme();
2547
260
        UCTheme *globalTheme = view->globalTheme();
260
        UCTheme *globalTheme = view->globalTheme();
2548
261
        QVERIFY(theme);
261
        QVERIFY(theme);
2549
@@ -265,7 +265,7 @@
2550
265
265
2551
266
    void test_theme_reset_name()
266
    void test_theme_reset_name()
2552
267
    {
267
    {
2554
268
        qputenv("UBUNTU_UI_TOOLKIT_THEMES_PATH", ".");
268
        qputenv("UBUNTU_UI_TOOLKIT_THEMES_PATH", "./themes");
2555
269
269
2556
270
        QScopedPointer<ThemeTestCase> view(new ThemeTestCase("SimpleItem.qml"));
270
        QScopedPointer<ThemeTestCase> view(new ThemeTestCase("SimpleItem.qml"));
2557
271
        view->setTheme("TestModule.TestTheme");
271
        view->setTheme("TestModule.TestTheme");
2558
@@ -626,29 +626,63 @@
2559
626
    {
626
    {
2560
627
        QTest::addColumn<QString>("document");
627
        QTest::addColumn<QString>("document");
2561
628
        QTest::addColumn<QString>("testValue");
628
        QTest::addColumn<QString>("testValue");
2562
629
        QTest::addColumn<int>("row");
2563
630
        QTest::addColumn<int>("column");
2564
631
        QTest::addColumn<QString>("warning");
2565
629
632
2566
630
        QTest::newRow("Theming version 1.2")
633
        QTest::newRow("Theming version 1.2")
2567
631
                << "StyledItemV12.qml"
634
                << "StyledItemV12.qml"
2569
632
                << "";
635
                << ""
2570
636
                << 0 << 0 << "";
2571
633
        QTest::newRow("Theming version 1.3")
637
        QTest::newRow("Theming version 1.3")
2572
634
                << "StyledItemV13.qml"
638
                << "StyledItemV13.qml"
2574
635
                << "version1.3";
639
                << "version1.3"
2575
640
                << 0 << 0 << "";
2576
641
        QTest::newRow("Fall back to 1.3")
2577
642
                << "StyledItemFallback.qml"
2578
643
                << "version1.3"
2579
644
                << 19 << 1 << "QML StyledItem: Theme 'TestModule.TestTheme' has no 'TestStyle.qml' style for version 1.0, fall back to version 1.3.";
2580
645
        QTest::newRow("App theme versioned")
2581
646
                << "StyledItemAppThemeVersioned.qml"
2582
647
                << "version1.3"
2583
648
                << 0 << 0 << "";
2584
649
        QTest::newRow("App theme fallback to non-versioned")
2585
650
                << "StyledItemAppThemeFallback.qml"
2586
651
                << ""
2587
652
                << 0 << 0 << "";
2588
636
    }
653
    }
2589
637
    void test_theme_versions()
654
    void test_theme_versions()
2590
638
    {
655
    {
2591
639
        QFETCH(QString, document);
656
        QFETCH(QString, document);
2592
640
        QFETCH(QString, testValue);
657
        QFETCH(QString, testValue);
2593
658
        QFETCH(int, row);
2594
659
        QFETCH(int, column);
2595
660
        QFETCH(QString, warning);
2596
641
661
2597
642
        qputenv("UBUNTU_UI_TOOLKIT_THEMES_PATH", "");
662
        qputenv("UBUNTU_UI_TOOLKIT_THEMES_PATH", "");
2598
643
        qputenv("XDG_DATA_DIRS", "./themes:./themes/TestModule");
663
        qputenv("XDG_DATA_DIRS", "./themes:./themes/TestModule");
2599
664
        if (!warning.isEmpty()) {
2600
665
            ThemeTestCase::ignoreWarning(document, row, column, warning, 2);
2601
666
        }
2602
644
        QScopedPointer<ThemeTestCase> view(new ThemeTestCase(document));
667
        QScopedPointer<ThemeTestCase> view(new ThemeTestCase(document));
2603
645
        UCStyledItemBase *styledItem = qobject_cast<UCStyledItemBase*>(view->rootObject());
668
        UCStyledItemBase *styledItem = qobject_cast<UCStyledItemBase*>(view->rootObject());
2604
669
        QVERIFY(UCStyledItemBasePrivate::get(styledItem)->styleItem);
2605
646
        QString newProperty(UCStyledItemBasePrivate::get(styledItem)->styleItem->property("newProperty").toString());
670
        QString newProperty(UCStyledItemBasePrivate::get(styledItem)->styleItem->property("newProperty").toString());
2606
647
        QCOMPARE(newProperty, testValue);
671
        QCOMPARE(newProperty, testValue);
2607
648
        // NOTE TestTheme resets the theme therefore the theming will look for the tested style under Ambiance theme
672
        // NOTE TestTheme resets the theme therefore the theming will look for the tested style under Ambiance theme
2608
649
        // which will cause a warning; therefore we mark the warning to be ignored
673
        // which will cause a warning; therefore we mark the warning to be ignored
2609
650
        ThemeTestCase::ignoreWarning(document, 19, 1, "QML StyledItem: Warning: Style TestStyle.qml not found in theme Ubuntu.Components.Themes.Ambiance");
674
        ThemeTestCase::ignoreWarning(document, 19, 1, "QML StyledItem: Warning: Style TestStyle.qml not found in theme Ubuntu.Components.Themes.Ambiance");
2610
651
    }
675
    }
2611
676
2612
677
    void test_deprecated_theme()
2613
678
    {
2614
679
        qputenv("UBUNTU_UI_TOOLKIT_THEMES_PATH", "");
2615
680
        qputenv("XDG_DATA_DIRS", "./themes:./themes/TestModule:" + m_themesPath.toLatin1());
2616
681
        QScopedPointer<ThemeTestCase> view(new ThemeTestCase("DeprecatedTheme.qml"));
2617
682
        // NOTE TestTheme resets the theme therefore the theming will look for the tested style version under Ambiance theme
2618
683
        // which will cause a warning; therefore we mark the warning to be ignored
2619
684
        ThemeTestCase::ignoreWarning("DeprecatedTheme.qml", 19, 1, "QML StyledItem: Theme 'Ubuntu.Components.Themes.Ambiance' has no 'OptionSelectorStyle.qml' style for version 1.0, fall back to version 1.3.");
2620
685
    }
2621
652
};
686
};
2622
653
687
2623
654
QTEST_MAIN(tst_Subtheming)
688
QTEST_MAIN(tst_Subtheming)
2624
655
689
2625
=== modified file 'tests/unit_x11/tst_subtheming/tst_subtheming.pro'
2626
--- tests/unit_x11/tst_subtheming/tst_subtheming.pro	2015-04-25 06:35:16 +0000
2627
+++ tests/unit_x11/tst_subtheming/tst_subtheming.pro	2015-05-02 11:10:54 +0000
2628
@@ -8,7 +8,8 @@
2629
8
    themes/CustomTheme/TestStyle.qml \
8
    themes/CustomTheme/TestStyle.qml \
2630
9
    themes/CustomTheme/Palette.qml \
9
    themes/CustomTheme/Palette.qml \
2631
10
    themes/CustomTheme/parent_theme \
10
    themes/CustomTheme/parent_theme \
2633
11
    themes/TestModule/TestTheme/TestStyle.qml \
11
    themes/TestModule/TestTheme/1.2/TestStyle.qml \
2634
12
    themes/TestModule/TestTheme/1.3/TestStyle.qml \
2635
12
    themes/TestModule/TestTheme/qmldir \
13
    themes/TestModule/TestTheme/qmldir \
2636
13
    themes/TestModule/TestTheme/parent_theme \
14
    themes/TestModule/TestTheme/parent_theme \
2637
14
    DynamicAssignment.qml \
15
    DynamicAssignment.qml \
2638
@@ -26,6 +27,10 @@
2639
26
    themes/TestModule/TestTheme/1.3/TestStyle.qml \
27
    themes/TestModule/TestTheme/1.3/TestStyle.qml \
2640
27
    themes/CustomTheme/1.3/TestStyle.qml \
28
    themes/CustomTheme/1.3/TestStyle.qml \
2641
28
    StyledItemV12.qml \
29
    StyledItemV12.qml \
2643
29
    StyledItemV13.qml
30
    StyledItemV13.qml \
2644
31
    StyledItemFallback.qml \
2645
32
    StyledItemAppThemeFallback.qml \
2646
33
    DeprecatedTheme.qml \
2647
34
    StyledItemAppThemeVersioned.qml
2648
30
35
2649
31
36
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Needs Fixing on 2015-05-04
Cris Dywan		2015-04-25	Approve on 2015-05-04
Zoltan Balogh		2015-04-25	Pending
Review via email: mp+257454@code.launchpad.net