1
=== modified file 'components.api'
2
--- components.api	2014-04-25 12:06:54 +0000
3
+++ components.api	2014-04-25 13:00:38 +0000
4
@@ -45,6 +45,14 @@
5
45
    readonly property color coolGrey
45
    readonly property color coolGrey
6
46
    property Gradient orangeGradient
46
    property Gradient orangeGradient
7
47
    property Gradient greyGradient
47
    property Gradient greyGradient
8
48
ComboButton 1.1
9
49
Button
10
50
    property bool expanded
11
51
    property real collapsedHeight
12
52
    property real expandedHeight
13
53
    readonly property real comboListHeight
14
54
    default property list<Item> comboList
15
55
    property color dropdownColor
16
48
CrossFadeImage 0.1 1.0
56
CrossFadeImage 0.1 1.0
17
49
Item
57
Item
18
50
    property url source
58
    property url source
19
51
59
20
=== modified file 'documentation/overview.qdoc'
21
--- documentation/overview.qdoc	2014-04-20 19:25:12 +0000
22
+++ documentation/overview.qdoc	2014-04-25 13:00:38 +0000
23
@@ -31,7 +31,7 @@
24
31
     \part Basic QML Types
31
     \part Basic QML Types
25
32
     Available through:
32
     Available through:
26
33
     \code
33
     \code
28
34
         import Ubuntu.Components 1.0
34
         import Ubuntu.Components 1.1
29
35
     \endcode
35
     \endcode
30
36
     \annotatedlist ubuntu
36
     \annotatedlist ubuntu
31
37
37
32
@@ -66,28 +66,33 @@
33
66
     \part Theming Elements
66
     \part Theming Elements
34
67
     Available through:
67
     Available through:
35
68
     \code
68
     \code
37
69
         import Ubuntu.Components 1.0
69
         import Ubuntu.Components 1.1
38
70
     \endcode
70
     \endcode
39
71
     \annotatedlist theming
71
     \annotatedlist theming
40
72
72
41
73
     \part Style API
42
74
     The Style API defines the interface components use to style the visuals.
43
75
     Themes must make sure that these interfaces are all implemented.
44
76
     \annotatedlist style-api
45
77
46
73
     \part Resolution Independence Items
78
     \part Resolution Independence Items
47
74
     Available through:
79
     Available through:
48
75
     \code
80
     \code
50
76
         import Ubuntu.Components 1.0
81
         import Ubuntu.Components 1.1
51
77
     \endcode
82
     \endcode
52
78
     \annotatedlist resolution-independence
83
     \annotatedlist resolution-independence
53
79
84
54
80
     \part Parsing Command-Line Arguments
85
     \part Parsing Command-Line Arguments
55
81
     Available through:
86
     Available through:
56
82
     \code
87
     \code
58
83
         import Ubuntu.Components 1.0
88
         import Ubuntu.Components 1.1
59
84
     \endcode
89
     \endcode
60
85
     \annotatedlist ubuntu-commandline
90
     \annotatedlist ubuntu-commandline
61
86
91
62
87
     \part Services
92
     \part Services
63
88
     Available through:
93
     Available through:
64
89
     \code
94
     \code
66
90
         import Ubuntu.Components 1.0
95
         import Ubuntu.Components 1.1
67
91
     \endcode
96
     \endcode
68
92
     \annotatedlist ubuntu-services
97
     \annotatedlist ubuntu-services
69
93
98
70
94
99
71
=== modified file 'documentation/resolution-independence.qdoc'
72
--- documentation/resolution-independence.qdoc	2014-04-20 19:25:12 +0000
73
+++ documentation/resolution-independence.qdoc	2014-04-25 13:00:38 +0000
74
@@ -64,7 +64,7 @@
75
64
64
76
65
    Example Usage:
65
    Example Usage:
77
66
    \code
66
    \code
79
67
    import Ubuntu.Components 1.0
67
    import Ubuntu.Components 1.1
80
68
68
81
69
    Item {
69
    Item {
82
70
        width: units.gu(2)
70
        width: units.gu(2)
83
@@ -79,7 +79,7 @@
84
79
79
85
80
    Example Usage:
80
    Example Usage:
86
81
    \code
81
    \code
88
82
    import Ubuntu.Components 1.0
82
    import Ubuntu.Components 1.1
89
83
83
90
84
    Rectangle {
84
    Rectangle {
91
85
        height: units.dp(1)
85
        height: units.dp(1)
92
@@ -143,7 +143,7 @@
93
143
143
94
144
    Example Usage:
144
    Example Usage:
95
145
    \code
145
    \code
97
146
    import Ubuntu.Components 1.0
146
    import Ubuntu.Components 1.1
98
147
147
99
148
    Label {
148
    Label {
100
149
        fontSize: "small"
149
        fontSize: "small"
101
150
150
102
=== modified file 'documentation/snippets/layouts/SimpleLayout.qml'
103
--- documentation/snippets/layouts/SimpleLayout.qml	2014-04-20 19:25:12 +0000
104
+++ documentation/snippets/layouts/SimpleLayout.qml	2014-04-25 13:00:38 +0000
105
@@ -15,7 +15,7 @@
106
15
 */
15
 */
107
16
16
108
17
import QtQuick 2.0
17
import QtQuick 2.0
110
18
import Ubuntu.Components 1.0
18
import Ubuntu.Components 1.1
111
19
import Ubuntu.Layouts 1.0
19
import Ubuntu.Layouts 1.0
112
20
20
113
21
Item {
21
Item {
114
22
22
115
=== modified file 'documentation/snippets/layouts/layout1.qml'
116
--- documentation/snippets/layouts/layout1.qml	2014-04-20 19:25:12 +0000
117
+++ documentation/snippets/layouts/layout1.qml	2014-04-25 13:00:38 +0000
118
@@ -16,7 +16,7 @@
119
16
16
120
17
//![0]
17
//![0]
121
18
import QtQuick 2.0
18
import QtQuick 2.0
123
19
import Ubuntu.Components 1.0
19
import Ubuntu.Components 1.1
124
20
import Ubuntu.Layouts 1.0
20
import Ubuntu.Layouts 1.0
125
21
21
126
22
Item {
22
Item {
127
23
23
128
=== modified file 'documentation/snippets/layouts/layout2.qml'
129
--- documentation/snippets/layouts/layout2.qml	2014-04-20 19:25:12 +0000
130
+++ documentation/snippets/layouts/layout2.qml	2014-04-25 13:00:38 +0000
131
@@ -16,7 +16,7 @@
132
16
16
133
17
//![0]
17
//![0]
134
18
import QtQuick 2.0
18
import QtQuick 2.0
136
19
import Ubuntu.Components 1.0
19
import Ubuntu.Components 1.1
137
20
import Ubuntu.Layouts 1.0
20
import Ubuntu.Layouts 1.0
138
21
21
139
22
Item {
22
Item {
140
23
23
141
=== modified file 'documentation/snippets/layouts/layout3.qml'
142
--- documentation/snippets/layouts/layout3.qml	2014-04-20 19:25:12 +0000
143
+++ documentation/snippets/layouts/layout3.qml	2014-04-25 13:00:38 +0000
144
@@ -16,7 +16,7 @@
145
16
16
146
17
//![0]
17
//![0]
147
18
import QtQuick 2.0
18
import QtQuick 2.0
149
19
import Ubuntu.Components 1.0
19
import Ubuntu.Components 1.1
150
20
import Ubuntu.Layouts 1.0
20
import Ubuntu.Layouts 1.0
151
21
21
152
22
Item {
22
Item {
153
23
23
154
=== modified file 'documentation/snippets/layouts/layout6.qml'
155
--- documentation/snippets/layouts/layout6.qml	2014-04-20 19:25:12 +0000
156
+++ documentation/snippets/layouts/layout6.qml	2014-04-25 13:00:38 +0000
157
@@ -16,7 +16,7 @@
158
16
16
159
17
//![0]
17
//![0]
160
18
import QtQuick 2.0
18
import QtQuick 2.0
162
19
import Ubuntu.Components 1.0
19
import Ubuntu.Components 1.1
163
20
import Ubuntu.Layouts 1.0
20
import Ubuntu.Layouts 1.0
164
21
21
165
22
Item {
22
Item {
166
23
23
167
=== modified file 'documentation/snippets/layouts/layout7.qml'
168
--- documentation/snippets/layouts/layout7.qml	2014-04-20 19:25:12 +0000
169
+++ documentation/snippets/layouts/layout7.qml	2014-04-25 13:00:38 +0000
170
@@ -16,7 +16,7 @@
171
16
16
172
17
//![0]
17
//![0]
173
18
import QtQuick 2.0
18
import QtQuick 2.0
175
19
import Ubuntu.Components 1.0
19
import Ubuntu.Components 1.1
176
20
import Ubuntu.Layouts 1.0
20
import Ubuntu.Layouts 1.0
177
21
21
178
22
Item {
22
Item {
179
23
23
180
=== modified file 'documentation/snippets/statesaver/ColorChanger.qml'
181
--- documentation/snippets/statesaver/ColorChanger.qml	2014-04-20 19:25:12 +0000
182
+++ documentation/snippets/statesaver/ColorChanger.qml	2014-04-25 13:00:38 +0000
183
@@ -16,7 +16,7 @@
184
16
16
185
17
//![color-saver]
17
//![color-saver]
186
18
import QtQuick 2.0
18
import QtQuick 2.0
188
19
import Ubuntu.Components 1.0
19
import Ubuntu.Components 1.1
189
20
20
190
21
Rectangle {
21
Rectangle {
191
22
    id: root
22
    id: root
192
23
23
193
=== modified file 'documentation/snippets/statesaver/MultiplePropertySaver.qml'
194
--- documentation/snippets/statesaver/MultiplePropertySaver.qml	2014-04-20 19:25:12 +0000
195
+++ documentation/snippets/statesaver/MultiplePropertySaver.qml	2014-04-25 13:00:38 +0000
196
@@ -16,7 +16,7 @@
197
16
16
198
17
//![group-saver]
17
//![group-saver]
199
18
import QtQuick 2.0
18
import QtQuick 2.0
201
19
import Ubuntu.Components 1.0
19
import Ubuntu.Components 1.1
202
20
20
203
21
Rectangle {
21
Rectangle {
204
22
    id: root
22
    id: root
205
23
23
206
=== modified file 'documentation/snippets/statesaver/PropertyGroupSaver.qml'
207
--- documentation/snippets/statesaver/PropertyGroupSaver.qml	2014-04-20 19:25:12 +0000
208
+++ documentation/snippets/statesaver/PropertyGroupSaver.qml	2014-04-25 13:00:38 +0000
209
@@ -16,7 +16,7 @@
210
16
16
211
17
//![property-group-saver]
17
//![property-group-saver]
212
18
import QtQuick 2.0
18
import QtQuick 2.0
214
19
import Ubuntu.Components 1.0
19
import Ubuntu.Components 1.1
215
20
20
216
21
Rectangle {
21
Rectangle {
217
22
    id: root
22
    id: root
218
23
23
219
=== modified file 'documentation/snippets/statesaver/PropertyGroupSaver2.qml'
220
--- documentation/snippets/statesaver/PropertyGroupSaver2.qml	2014-04-20 19:25:12 +0000
221
+++ documentation/snippets/statesaver/PropertyGroupSaver2.qml	2014-04-25 13:00:38 +0000
222
@@ -16,7 +16,7 @@
223
16
16
224
17
//![property-group-saver]
17
//![property-group-saver]
225
18
import QtQuick 2.0
18
import QtQuick 2.0
227
19
import Ubuntu.Components 1.0
19
import Ubuntu.Components 1.1
228
20
20
229
21
Rectangle {
21
Rectangle {
230
22
    id: root
22
    id: root
231
23
23
232
=== modified file 'documentation/ubuntu-components.qdoc'
233
--- documentation/ubuntu-components.qdoc	2014-04-20 19:25:12 +0000
234
+++ documentation/ubuntu-components.qdoc	2014-04-25 13:00:38 +0000
235
@@ -15,7 +15,7 @@
236
15
 */
15
 */
237
16
16
238
17
/*!
17
/*!
240
18
    \qmlmodule Ubuntu.Components 1.0
18
    \qmlmodule Ubuntu.Components 1.1
241
19
    \title Basic QML Types
19
    \title Basic QML Types
242
20
    \nextpage {Ubuntu User Interface Toolkit}
20
    \nextpage {Ubuntu User Interface Toolkit}
243
21
*/
21
*/
244
22
22
245
=== modified file 'examples/calculator/calculator.qml'
246
--- examples/calculator/calculator.qml	2014-04-20 19:25:12 +0000
247
+++ examples/calculator/calculator.qml	2014-04-25 13:00:38 +0000
248
@@ -17,7 +17,7 @@
249
17
 */
17
 */
250
18
18
251
19
import QtQuick 2.0
19
import QtQuick 2.0
253
20
import Ubuntu.Components 1.0
20
import Ubuntu.Components 1.1
254
21
import Ubuntu.Layouts 1.0
21
import Ubuntu.Layouts 1.0
255
22
import "components"
22
import "components"
256
23
import "components/calculator.js" as Calculator
23
import "components/calculator.js" as Calculator
257
24
24
258
=== modified file 'examples/calculator/components/DefaultLayout.qml'
259
--- examples/calculator/components/DefaultLayout.qml	2014-04-20 19:25:12 +0000
260
+++ examples/calculator/components/DefaultLayout.qml	2014-04-25 13:00:38 +0000
261
@@ -17,7 +17,7 @@
262
17
 */
17
 */
263
18
18
264
19
import QtQuick 2.0
19
import QtQuick 2.0
266
20
import Ubuntu.Components 1.0
20
import Ubuntu.Components 1.1
267
21
import Ubuntu.Layouts 1.0
21
import Ubuntu.Layouts 1.0
268
22
22
269
23
Item {
23
Item {
270
24
24
271
=== modified file 'examples/calculator/components/Functions.qml'
272
--- examples/calculator/components/Functions.qml	2014-04-20 19:25:12 +0000
273
+++ examples/calculator/components/Functions.qml	2014-04-25 13:00:38 +0000
274
@@ -17,7 +17,7 @@
275
17
 */
17
 */
276
18
18
277
19
import QtQuick 2.0
19
import QtQuick 2.0
279
20
import Ubuntu.Components 1.0
20
import Ubuntu.Components 1.1
280
21
import Ubuntu.Layouts 1.0
21
import Ubuntu.Layouts 1.0
281
22
22
282
23
Grid {
23
Grid {
283
24
24
284
=== modified file 'examples/jokes/jokes.qml'
285
--- examples/jokes/jokes.qml	2014-04-20 19:25:12 +0000
286
+++ examples/jokes/jokes.qml	2014-04-25 13:00:38 +0000
287
@@ -16,7 +16,7 @@
288
16
 */
16
 */
289
17
17
290
18
import QtQuick 2.0
18
import QtQuick 2.0
292
19
import Ubuntu.Components 1.0
19
import Ubuntu.Components 1.1
293
20
import QtMultimedia 5.0
20
import QtMultimedia 5.0
294
21
21
295
22
/*!
22
/*!
296
23
23
297
=== modified file 'examples/locale/locale.qml'
298
--- examples/locale/locale.qml	2014-04-20 19:25:12 +0000
299
+++ examples/locale/locale.qml	2014-04-25 13:00:38 +0000
300
@@ -16,7 +16,7 @@
301
16
 */
16
 */
302
17
17
303
18
import QtQuick 2.0
18
import QtQuick 2.0
305
19
import Ubuntu.Components 1.0
19
import Ubuntu.Components 1.1
306
20
import Ubuntu.Components.ListItems 1.0 as ListItem
20
import Ubuntu.Components.ListItems 1.0 as ListItem
307
21
21
308
22
/*!
22
/*!
309
23
23
310
=== modified file 'examples/ubuntu-ui-toolkit-gallery/Buttons.qml'
311
--- examples/ubuntu-ui-toolkit-gallery/Buttons.qml	2014-04-23 09:21:09 +0000
312
+++ examples/ubuntu-ui-toolkit-gallery/Buttons.qml	2014-04-25 13:00:38 +0000
313
@@ -15,7 +15,8 @@
314
15
 */
15
 */
315
16
16
316
17
import QtQuick 2.0
17
import QtQuick 2.0
318
18
import Ubuntu.Components 0.1
18
import Ubuntu.Components 1.1
319
19
import Ubuntu.Components.ListItems 1.0
320
19
20
321
20
Template {
21
Template {
322
21
    objectName: "buttonsTemplate"
22
    objectName: "buttonsTemplate"
323
@@ -80,4 +81,67 @@
324
80
            }
81
            }
325
81
        }
82
        }
326
82
    }
83
    }
327
84
328
85
    TemplateSection {
329
86
        className: "ComboButton"
330
87
331
88
        TemplateRow {
332
89
            title: i18n.tr("Collapsed")
333
90
334
91
            ComboButton {
335
92
                text: "Press me"
336
93
                objectName: "combobutton_collapsed"
337
94
                comboList:  UbuntuListView {
338
95
                    model: 10
339
96
                    delegate: Standard {
340
97
                        text: "item #" + modelData
341
98
                    }
342
99
                }
343
100
            }
344
101
        }
345
102
346
103
        TemplateRow {
347
104
            title: i18n.tr("Icon")
348
105
349
106
            ComboButton {
350
107
                iconSource: "call.png"
351
108
                comboList:  UbuntuListView {
352
109
                    model: 10
353
110
                    delegate: Standard {
354
111
                        text: "item #" + modelData
355
112
                    }
356
113
                }
357
114
            }
358
115
        }
359
116
360
117
        TemplateRow {
361
118
            title: i18n.tr("Icon+Text")
362
119
363
120
            ComboButton {
364
121
                text: "Answer"
365
122
                iconSource: "call.png"
366
123
                comboList:  UbuntuListView {
367
124
                    model: 10
368
125
                    delegate: Standard {
369
126
                        text: "item #" + modelData
370
127
                    }
371
128
                }
372
129
            }
373
130
        }
374
131
        TemplateRow {
375
132
            title: i18n.tr("Expanded")
376
133
377
134
            ComboButton {
378
135
                text: "Press me"
379
136
                objectName: "combobutton_expanded"
380
137
                expanded: true
381
138
                comboList:  UbuntuListView {
382
139
                    model: 10
383
140
                    delegate: Standard {
384
141
                        text: "item #" + modelData
385
142
                    }
386
143
                }
387
144
            }
388
145
        }
389
146
    }
390
83
}
147
}
391
84
148
392
=== modified file 'examples/unit-converter/unit-converter.qml'
393
--- examples/unit-converter/unit-converter.qml	2014-04-20 19:25:12 +0000
394
+++ examples/unit-converter/unit-converter.qml	2014-04-25 13:00:38 +0000
395
@@ -15,7 +15,7 @@
396
15
 */
15
 */
397
16
16
398
17
import QtQuick 2.0
17
import QtQuick 2.0
400
18
import Ubuntu.Components 1.0
18
import Ubuntu.Components 1.1
401
19
import "conversion.js" as Converter
19
import "conversion.js" as Converter
402
20
20
403
21
/*!
21
/*!
404
22
22
405
=== modified file 'manual-tests/button.qml'
406
--- manual-tests/button.qml	2014-04-20 19:25:12 +0000
407
+++ manual-tests/button.qml	2014-04-25 13:00:38 +0000
408
@@ -15,7 +15,7 @@
409
15
 */
15
 */
410
16
16
411
17
import QtQuick 2.0
17
import QtQuick 2.0
413
18
import Ubuntu.Components 1.0
18
import Ubuntu.Components 1.1
414
19
19
415
20
Button {
20
Button {
416
21
   id: button
21
   id: button
417
22
22
418
=== modified file 'modules/Ubuntu/Components/AbstractButton.qml'
419
--- modules/Ubuntu/Components/AbstractButton.qml	2014-04-20 19:25:12 +0000
420
+++ modules/Ubuntu/Components/AbstractButton.qml	2014-04-25 13:00:38 +0000
421
@@ -19,7 +19,7 @@
422
19
19
423
20
/*!
20
/*!
424
21
    \qmlabstract AbstractButton
21
    \qmlabstract AbstractButton
426
22
    \inqmlmodule Ubuntu.Components 1.0
22
    \inqmlmodule Ubuntu.Components 1.1
427
23
    \ingroup ubuntu
23
    \ingroup ubuntu
428
24
    \brief The AbstractButton class defines the behavior of the button.
24
    \brief The AbstractButton class defines the behavior of the button.
429
25
25
430
26
26
431
=== modified file 'modules/Ubuntu/Components/Action.qml'
432
--- modules/Ubuntu/Components/Action.qml	2014-04-20 19:25:12 +0000
433
+++ modules/Ubuntu/Components/Action.qml	2014-04-25 13:00:38 +0000
434
@@ -19,7 +19,7 @@
435
19
19
436
20
/*!
20
/*!
437
21
    \qmltype Action
21
    \qmltype Action
439
22
    \inqmlmodule Ubuntu.Components 1.0
22
    \inqmlmodule Ubuntu.Components 1.1
440
23
    \ingroup ubuntu
23
    \ingroup ubuntu
441
24
    \brief Describe an action that can be re-used in, for example a \l Button
24
    \brief Describe an action that can be re-used in, for example a \l Button
442
25
25
443
26
26
444
=== modified file 'modules/Ubuntu/Components/ActionItem.qml'
445
--- modules/Ubuntu/Components/ActionItem.qml	2014-04-20 19:25:12 +0000
446
+++ modules/Ubuntu/Components/ActionItem.qml	2014-04-25 13:00:38 +0000
447
@@ -18,7 +18,7 @@
448
18
18
449
19
/*!
19
/*!
450
20
    \qmlabstract ActionItem
20
    \qmlabstract ActionItem
452
21
    \inqmlmodule Ubuntu.Components 1.0
21
    \inqmlmodule Ubuntu.Components 1.1
453
22
    \ingroup ubuntu
22
    \ingroup ubuntu
454
23
    \brief A visual representation of an Action. The API of ActionItem is a
23
    \brief A visual representation of an Action. The API of ActionItem is a
455
24
        copy of the API of \l Action, with additional properties to define
24
        copy of the API of \l Action, with additional properties to define
456
25
25
457
=== modified file 'modules/Ubuntu/Components/ActionList.qml'
458
--- modules/Ubuntu/Components/ActionList.qml	2014-04-20 19:25:12 +0000
459
+++ modules/Ubuntu/Components/ActionList.qml	2014-04-25 13:00:38 +0000
460
@@ -18,7 +18,7 @@
461
18
18
462
19
/*!
19
/*!
463
20
    \qmltype ActionList
20
    \qmltype ActionList
465
21
    \inqmlmodule Ubuntu.Components 1.0
21
    \inqmlmodule Ubuntu.Components 1.1
466
22
    \ingroup ubuntu
22
    \ingroup ubuntu
467
23
    \brief List of \l Action items
23
    \brief List of \l Action items
468
24
*/
24
*/
469
25
25
470
=== modified file 'modules/Ubuntu/Components/ActivityIndicator.qml'
471
--- modules/Ubuntu/Components/ActivityIndicator.qml	2014-04-20 19:25:12 +0000
472
+++ modules/Ubuntu/Components/ActivityIndicator.qml	2014-04-25 13:00:38 +0000
473
@@ -18,7 +18,7 @@
474
18
18
475
19
/*!
19
/*!
476
20
    \qmltype ActivityIndicator
20
    \qmltype ActivityIndicator
478
21
    \inqmlmodule Ubuntu.Components 1.0
21
    \inqmlmodule Ubuntu.Components 1.1
479
22
    \ingroup ubuntu
22
    \ingroup ubuntu
480
23
    \brief The ActivityIndicator component visually indicates that a task of
23
    \brief The ActivityIndicator component visually indicates that a task of
481
24
    unknown duration is in progress, e.g. busy indication, connection in progress
24
    unknown duration is in progress, e.g. busy indication, connection in progress
482
25
25
483
=== modified file 'modules/Ubuntu/Components/AnimatedItem.qml'
484
--- modules/Ubuntu/Components/AnimatedItem.qml	2014-04-20 19:25:12 +0000
485
+++ modules/Ubuntu/Components/AnimatedItem.qml	2014-04-25 13:00:38 +0000
486
@@ -16,7 +16,7 @@
487
16
16
488
17
/*!
17
/*!
489
18
    \qmltype AnimatedItem
18
    \qmltype AnimatedItem
491
19
    \inqmlmodule Ubuntu.Components 1.0
19
    \inqmlmodule Ubuntu.Components 1.1
492
20
    \ingroup ubuntu
20
    \ingroup ubuntu
493
21
    \brief The AnimatedItem drives the animated components behavior inside a Flickable.
21
    \brief The AnimatedItem drives the animated components behavior inside a Flickable.
494
22
    Reports whether the component whos parent is a Flickable is in the visible area or not,
22
    Reports whether the component whos parent is a Flickable is in the visible area or not,
495
23
23
496
=== modified file 'modules/Ubuntu/Components/Button.qml'
497
--- modules/Ubuntu/Components/Button.qml	2014-04-20 19:25:12 +0000
498
+++ modules/Ubuntu/Components/Button.qml	2014-04-25 13:00:38 +0000
499
@@ -18,7 +18,7 @@
500
18
18
501
19
/*!
19
/*!
502
20
    \qmltype Button
20
    \qmltype Button
504
21
    \inqmlmodule Ubuntu.Components 1.0
21
    \inqmlmodule Ubuntu.Components 1.1
505
22
    \ingroup ubuntu
22
    \ingroup ubuntu
506
23
    \brief Standard Ubuntu button.
23
    \brief Standard Ubuntu button.
507
24
24
508
@@ -83,6 +83,11 @@
509
83
    property Gradient gradient: __styleInstance.defaultGradient
83
    property Gradient gradient: __styleInstance.defaultGradient
510
84
84
511
85
    /*!
85
    /*!
512
86
      The font used for the button's text.
513
87
    */
514
88
    property font font: __styleInstance ? __styleInstance.defaultFont : Qt.font({family: "Ubuntu", pixelSize: FontUtils.sizeToPixels("medium")})
515
89
516
90
    /*!
517
86
       The source URL of the icon to display inside the button.
91
       The source URL of the icon to display inside the button.
518
87
       Leave this value blank for a text-only button.
92
       Leave this value blank for a text-only button.
519
88
       If \l action is set, the default iconSource is that of the action.
93
       If \l action is set, the default iconSource is that of the action.
520
89
94
521
=== modified file 'modules/Ubuntu/Components/CheckBox.qml'
522
--- modules/Ubuntu/Components/CheckBox.qml	2014-04-20 19:25:12 +0000
523
+++ modules/Ubuntu/Components/CheckBox.qml	2014-04-25 13:00:38 +0000
524
@@ -18,7 +18,7 @@
525
18
18
526
19
/*!
19
/*!
527
20
    \qmltype CheckBox
20
    \qmltype CheckBox
529
21
    \inqmlmodule Ubuntu.Components 1.0
21
    \inqmlmodule Ubuntu.Components 1.1
530
22
    \ingroup ubuntu
22
    \ingroup ubuntu
531
23
    \brief CheckBox is a component with two states, checked or unchecked. It can
23
    \brief CheckBox is a component with two states, checked or unchecked. It can
532
24
    be used to set boolean options. The behavior is the same as \l Switch, the
24
    be used to set boolean options. The behavior is the same as \l Switch, the
533
25
25
534
=== added file 'modules/Ubuntu/Components/ComboButton.qml'
535
--- modules/Ubuntu/Components/ComboButton.qml	1970-01-01 00:00:00 +0000
536
+++ modules/Ubuntu/Components/ComboButton.qml	2014-04-25 13:00:38 +0000
537
@@ -0,0 +1,366 @@
538
1
/*
539
2
 * Copyright 2014 Canonical Ltd.
540
3
 *
541
4
 * This program is free software; you can redistribute it and/or modify
542
5
 * it under the terms of the GNU Lesser General Public License as published by
543
6
 * the Free Software Foundation; version 3.
544
7
 *
545
8
 * This program is distributed in the hope that it will be useful,
546
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
547
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
548
11
 * GNU Lesser General Public License for more details.
549
12
 *
550
13
 * You should have received a copy of the GNU Lesser General Public License
551
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
552
15
 */
553
16
554
17
import QtQuick 2.0
555
18
import Ubuntu.Components.Popups 1.0
556
19
import "mathUtils.js" as MathUtils
557
20
558
21
/*!
559
22
    \qmltype ComboButton
560
23
    \inqmlmodule Ubuntu.Components 1.1
561
24
    \ingroup ubuntu
562
25
    \brief Ubuntu button providing a drop-down panel visualizing custom options.
563
26
564
27
    The component is composed of three main blocks: \b {main button}, \b {dropdown}
565
28
    and \b {combo list}.
566
29
567
30
    The \a {main button} holds the main functionailty of the component, and it is
568
31
    located at the left-top side of the expanded button. The \a clicked() signal
569
32
    is triggered only when this button is pressed.
570
33
571
34
    The \a {dropdown} is a button located on the right of the main button. Its
572
35
    functionality is to drive the component's expanded state.
573
36
574
37
    The \a {combo list} is a panel showing the content specified in \l comboList
575
38
    property when expanded. The content is stretched horizontally to the component's
576
39
    width, and its height is controlled by the \l expandedHeight property as follows:
577
40
    \list
578
41
    \li If the content height is smaller than the value of \l expandedHeight, the combo
579
42
        list will be expanded only to the height of the content.
580
43
        \qml
581
44
        import QtQuick 2.0
582
45
        import Ubuntu.Components 1.1
583
46
        ComboButton {
584
47
            text: "smaller content"
585
48
            Rectangle {
586
49
                height: units.gu(5) // smaller than the default expandedHeight
587
50
                color: "blue"
588
51
            }
589
52
        }
590
53
        \endqml
591
54
    \li If the content height is greater than \l expandedHeight, the combo list will
592
55
        expand till the height specified by the property and the content will be
593
56
        scrolled; in case the combo list content is one single Flickable, ListView,
594
57
        GridView or PathView, the content scrolling will be provided by the content
595
58
        itself.
596
59
        \qml
597
60
        import QtQuick 2.0
598
61
        import Ubuntu.Components 1.1
599
62
        ComboButton {
600
63
            text: "long scrolled content"
601
64
            Column {
602
65
                Repeater {
603
66
                    model: 5
604
67
                    spacing: units.gu(1)
605
68
                    Rectangle {
606
69
                        height: units.gu(5)
607
70
                        color: "blue"
608
71
                    }
609
72
                }
610
73
            }
611
74
        }
612
75
        \endqml
613
76
    \li In case the content is a single Flickable, ListView, GridView or PathView,
614
77
        the content will be filling the entire combo list area defined.
615
78
        \qml
616
79
        import QtQuick 2.0
617
80
        import Ubuntu.Components 1.1
618
81
        import Ubuntu.Components.ListItems 1.0
619
82
        ComboButton {
620
83
            text: "listview"
621
84
            ListView {
622
85
                model: 10
623
86
                delegate: Standard {
624
87
                    text: "Item #" + modelData
625
88
                }
626
89
            }
627
90
        }
628
91
        \endqml
629
92
    \li Vertical anchoring of combo list content to its parent is not possible
630
93
        as the expansion calculation is done based on the combo list content height.
631
94
        If the content wants to take the size of the entire combo list, it should
632
95
        bind its height to the \l comboListHeight property.
633
96
        \qml
634
97
        import QtQuick 2.0
635
98
        import Ubuntu.Components 1.1
636
99
        ComboButton {
637
100
            id: combo
638
101
            text: "smaller content"
639
102
            Rectangle {
640
103
                height: combo.comboListHeight
641
104
                color: "blue"
642
105
            }
643
106
        }
644
107
        \endqml
645
108
    \li In case the expansion needs to be the size of the combo list content, the \l
646
109
        expandedHeight should be set to -1.
647
110
        \qml
648
111
        import QtQuick 2.0
649
112
        import Ubuntu.Components 1.1
650
113
        ComboButton {
651
114
            text: "auto-sized content"
652
115
            expandedHeight: -1
653
116
            Column {
654
117
                Repeater {
655
118
                    model: 5
656
119
                    spacing: units.gu(1)
657
120
                    Button {
658
121
                        text: "Button #" + modelData
659
122
                    }
660
123
                }
661
124
            }
662
125
        }
663
126
        \endqml
664
127
    \endlist
665
128
666
129
    The combo list can be expanded/collapsed either through the \l expanded property
667
130
    or by clicking on the dropdown button. It is not collapsed when pressing the main
668
131
    button or clicking on the combo list. In order to do an auto-collapsing button
669
132
    you must reset the expanded property (set it to false) when the main button is
670
133
    clicked or when a selection is taken from the combo list content. The following
671
134
    example illustrates a possible implementation.
672
135
673
136
    \qml
674
137
    import QtQuick 2.0
675
138
    import Ubuntu.Components 1.1
676
139
677
140
    ComboButton {
678
141
        id: combo
679
142
        text: "Auto closing"
680
143
        expanded: true
681
144
        expandedHeight: units.gu(30)
682
145
        onClicked: expanded = false
683
146
        UbuntuListView {
684
147
            width: parent.width
685
148
            height: combo.comboListHeight
686
149
            model: 20
687
150
            delegate: Standard {
688
151
                text: "Action #" + modelData
689
152
                onClicked: {
690
153
                    combo.text = text;
691
154
                    combo.expanded = false;
692
155
                }
693
156
            }
694
157
        }
695
158
    }
696
159
    \endqml
697
160
698
161
    \section2 Styling
699
162
    The style of the component is defined in \l ComboButtonStyle.
700
163
  */
701
164
Button {
702
165
    id: combo
703
166
704
167
    /*!
705
168
      Specifies whether the combo list is expanded or not. The default falue is
706
169
      false.
707
170
      */
708
171
    property bool expanded: false
709
172
710
173
    /*!
711
174
      The property holds the height of the component when collapsed. By default
712
175
      the value is the implicit height of the component.
713
176
      */
714
177
    property real collapsedHeight: implicitHeight
715
178
716
179
    /*!
717
180
        The property holds the maximum height value the component should expand.
718
181
        When setting the property, remember to take into account the \l collapsedHeight
719
182
        value. The best practice is to use bind it with collapsedHeight.
720
183
        \qml
721
184
        ComboButton {
722
185
            text: "altered expandedHeight"
723
186
            expandedHeight: collapsedHeight + units.gu(25)
724
187
        }
725
188
        \endqml
726
189
727
190
        A value of -1 will instruct the component to expand the combo list as
728
191
        much as its content height is.
729
192
730
193
        The default value is \l collapsedHeight + 19.5 GU, so at least 3 ListItems
731
194
        can fit in the combo list.
732
195
        \sa collapsedHeight
733
196
      */
734
197
    property real expandedHeight: collapsedHeight + units.gu(19.5)
735
198
736
199
    /*!
737
200
      The property holds the maximum combo list height allowed based on the
738
201
      \l expandedHeight and \l collapsedHeight values. It is a convenience property
739
202
      that can be used to size the combo list content.
740
203
      \qml
741
204
      import QtQuick 2.0
742
205
      import Ubuntu.Components 1.1
743
206
      import Ubuntu.Components.ListItems 0.1
744
207
      ComboButton {
745
208
          id: combo
746
209
          text: "Full comboList size"
747
210
          ListView {
748
211
              anchors {
749
212
                  left: parent.left
750
213
                  right: parent.right
751
214
              }
752
215
              height: combo.comboListHeight
753
216
              model: 20
754
217
              delegate: Standard {
755
218
                  text: "Action #" + modelData
756
219
              }
757
220
          }
758
221
      }
759
222
      \endqml
760
223
761
224
      \sa collapsedHeight, expandedHeight
762
225
      */
763
226
    readonly property real comboListHeight: (expandedHeight < 0) ?
764
227
                            comboListHolder.height :
765
228
                            (expandedHeight - collapsedHeight -
766
229
                            (combo.__styleInstance ? combo.__styleInstance.comboListMargin : 0))
767
230
768
231
    /*!
769
232
        \qmlproperty list<Item> comboList
770
233
        \default
771
234
        Property holding the list of items to be shown in the combo list. Being
772
235
        a default property children items declared will land in the combo list.
773
236
        \note The component is not responsible for layouting the content. It only
774
237
        provides scrolling abilities for the case the content exceeds the defined
775
238
        expanded height.
776
239
      */
777
240
    default property alias comboList: comboListHolder.data
778
241
779
242
    /* ----------------- Color and font configurations ----------------- */
780
243
    /*!
781
244
      The property specifies the color of the dropdown button and the combo list
782
245
      for both collapsed and expanded states. You can use \l expanded to define
783
246
      different colors for expanded or collapsed states.
784
247
      */
785
248
    property color dropdownColor: __styleInstance ? __styleInstance.defaultDropdownColor : color
786
249
787
250
788
251
    style: Theme.createStyleComponent("ComboButtonStyle.qml", combo)
789
252
790
253
    Component.onCompleted: {
791
254
        // update mouse area to report clicks only on the main button area
792
255
        // area excluding dropDown button and combo list
793
256
        // we must do separate bindings as __mouseArea is a read-only property
794
257
        __mouseArea.anchors.fill = undefined;
795
258
        __mouseArea.anchors.left = Qt.binding(function() {return combo.left;});
796
259
        __mouseArea.anchors.top = Qt.binding(function() {return combo.top;});
797
260
        __mouseArea.anchors.right = Qt.binding(function() {return combo.right;});
798
261
        __mouseArea.anchors.rightMargin = Qt.binding(function() {return combo.__styleInstance.dropDownWidth + combo.__styleInstance.dropDownSeparatorWidth;});
799
262
        __mouseArea.height = Qt.binding(function() {return collapsedHeight;});
800
263
        // for autopilot, set the main button name
801
264
        __mouseArea.objectName = "combobutton_mainbutton";
802
265
803
266
        // bind a height calculation to avoid unwanted change
804
267
        combo.height = Qt.binding(function() {return collapsedHeight + __styleInstance.comboListPanel.height});
805
268
    }
806
269
807
270
    // dropdown button
808
271
    AbstractButton {
809
272
        id: dropDown
810
273
        objectName: "combobutton_dropdown"
811
274
        anchors {
812
275
            right: parent.right
813
276
            top: parent.top
814
277
        }
815
278
        width: combo.__styleInstance ? combo.__styleInstance.dropDownWidth : 0
816
279
        height: combo.collapsedHeight
817
280
        // open dropdown when pressed, not when clicked
818
281
        onClicked: {
819
282
            // toggle expanded
820
283
            combo.expanded = !combo.expanded;
821
284
        }
822
285
    }
823
286
824
287
    // expansion list
825
288
    Flickable {
826
289
        id: comboHolder
827
290
        parent: combo.__styleInstance ? combo.__styleInstance.comboListHolder : combo
828
291
        anchors.fill: parent
829
292
        interactive: combo.expanded && !contentIsFlickable() && (combo.expandedHeight > 0)
830
293
        flickableDirection: Flickable.VerticalFlick
831
294
        contentHeight: comboListHolder.height
832
295
833
296
        // consider PathView as Flickable in this case as well!
834
297
        function contentIsFlickable() {
835
298
            return (comboListHolder.children.length === 1) &&
836
299
                    comboListHolder.children[0].hasOwnProperty("flicking");
837
300
        }
838
301
839
302
        Item {
840
303
            id: comboListHolder
841
304
            objectName: "combobutton_combolist"
842
305
            anchors {
843
306
                left: parent.left
844
307
                right: parent.right
845
308
            }
846
309
847
310
            // stretch children width to holder's width
848
311
            // must do binding to height manually to avoid binding loops caused
849
312
            // by the vertical stretching when the component is a single flickable
850
313
            property bool stretch: (combo.expandedHeight > 0 && comboHolder.contentIsFlickable())
851
314
            onStretchChanged: stretchChildren()
852
315
            onChildrenChanged: stretchChildren()
853
316
            function stretchChildren() {
854
317
                for (var i in comboListHolder.children) {
855
318
                    var child = comboListHolder.children[i];
856
319
                    if (comboListHolder.stretch) {
857
320
                        child.anchors.left = undefined;
858
321
                        child.anchors.right = undefined;
859
322
                        child.anchors.fill = comboListHolder;
860
323
                        comboListHolder.height = Qt.binding(function() {
861
324
                            return combo.comboListHeight;
862
325
                        });
863
326
                    } else {
864
327
                        child.anchors.left = comboListHolder.left;
865
328
                        child.anchors.right = comboListHolder.right;
866
329
                        comboListHolder.height = Qt.binding(function() {
867
330
                            return comboListHolder.childrenRect.height;
868
331
                        });
869
332
                    }
870
333
                }
871
334
            }
872
335
        }
873
336
    }
874
337
    Scrollbar {
875
338
        flickableItem: comboHolder
876
339
    }
877
340
878
341
    /*
879
342
      Drive the expansion height of the combo list holder
880
343
      This is a common functionaity in all combo buttons, therefore we can have it
881
344
      in the main component.
882
345
      */
883
346
    Binding {
884
347
        target: combo.__styleInstance.comboListPanel
885
348
        property: "height"
886
349
        value: {
887
350
            if (!expanded) {
888
351
                return 0;
889
352
            }
890
353
            if (comboListHolder.stretch) {
891
354
                return combo.comboListHeight + combo.__styleInstance.comboListMargin;
892
355
            }
893
356
894
357
            var h = comboListHolder.height;
895
358
            var max = combo.comboListHeight + combo.__styleInstance.comboListMargin;
896
359
            if (combo.expandedHeight < 0) {
897
360
                return max;
898
361
            }
899
362
900
363
            return MathUtils.clamp(h, 0, max);
901
364
        }
902
365
    }
903
366
}
904
0
367
905
=== modified file 'modules/Ubuntu/Components/CrossFadeImage.qml'
906
--- modules/Ubuntu/Components/CrossFadeImage.qml	2014-04-20 19:25:12 +0000
907
+++ modules/Ubuntu/Components/CrossFadeImage.qml	2014-04-25 13:00:38 +0000
908
@@ -19,7 +19,7 @@
909
19
// we need to use named imports otherwise namespace collision is reported
19
// we need to use named imports otherwise namespace collision is reported
910
20
// by the QML engine. As workaround, we use Ubuntu named import.
20
// by the QML engine. As workaround, we use Ubuntu named import.
911
21
// Bug to watch: https://bugreports.qt-project.org/browse/QTBUG-27645
21
// Bug to watch: https://bugreports.qt-project.org/browse/QTBUG-27645
913
22
import Ubuntu.Components 1.0 as Ubuntu
22
import Ubuntu.Components 1.1 as Ubuntu
914
23
23
915
24
/*!
24
/*!
916
25
   \qmltype CrossFadeImage
25
   \qmltype CrossFadeImage
917
@@ -28,7 +28,7 @@
918
28
28
919
29
   \qml
29
   \qml
920
30
        import QtQuick 2.0
30
        import QtQuick 2.0
922
31
        import Ubuntu.Components 1.0
31
        import Ubuntu.Components 1.1
923
32
32
924
33
        CrossFadeImage {
33
        CrossFadeImage {
925
34
            width: units.gu(100)
34
            width: units.gu(100)
926
35
35
927
=== modified file 'modules/Ubuntu/Components/Header.qml'
928
--- modules/Ubuntu/Components/Header.qml	2014-04-24 18:21:34 +0000
929
+++ modules/Ubuntu/Components/Header.qml	2014-04-25 13:00:38 +0000
930
@@ -20,7 +20,7 @@
931
20
/*!
20
/*!
932
21
    \internal
21
    \internal
933
22
    \qmltype Header
22
    \qmltype Header
935
23
    \inqmlmodule Ubuntu.Components 1.0
23
    \inqmlmodule Ubuntu.Components 1.1
936
24
    \ingroup ubuntu
24
    \ingroup ubuntu
937
25
*/
25
*/
938
26
StyledItem {
26
StyledItem {
939
27
27
940
=== modified file 'modules/Ubuntu/Components/Icon.qml'
941
--- modules/Ubuntu/Components/Icon.qml	2014-04-20 19:25:12 +0000
942
+++ modules/Ubuntu/Components/Icon.qml	2014-04-25 13:00:38 +0000
943
@@ -18,7 +18,7 @@
944
18
18
945
19
/*!
19
/*!
946
20
    \qmltype Icon
20
    \qmltype Icon
948
21
    \inqmlmodule Ubuntu.Components 1.0
21
    \inqmlmodule Ubuntu.Components 1.1
949
22
    \ingroup ubuntu
22
    \ingroup ubuntu
950
23
    \brief The Icon component displays an icon from the icon theme.
23
    \brief The Icon component displays an icon from the icon theme.
951
24
24
952
25
25
953
=== modified file 'modules/Ubuntu/Components/Label.qml'
954
--- modules/Ubuntu/Components/Label.qml	2014-04-20 19:25:12 +0000
955
+++ modules/Ubuntu/Components/Label.qml	2014-04-25 13:00:38 +0000
956
@@ -18,7 +18,7 @@
957
18
18
958
19
/*!
19
/*!
959
20
    \qmltype Label
20
    \qmltype Label
961
21
    \inqmlmodule Ubuntu.Components 1.0
21
    \inqmlmodule Ubuntu.Components 1.1
962
22
    \ingroup ubuntu
22
    \ingroup ubuntu
963
23
    \brief Text with Ubuntu styling.
23
    \brief Text with Ubuntu styling.
964
24
24
965
25
25
966
=== modified file 'modules/Ubuntu/Components/ListItems/Base.qml'
967
--- modules/Ubuntu/Components/ListItems/Base.qml	2014-04-20 19:25:12 +0000
968
+++ modules/Ubuntu/Components/ListItems/Base.qml	2014-04-25 13:00:38 +0000
969
@@ -15,7 +15,7 @@
970
15
 */
15
 */
971
16
16
972
17
import QtQuick 2.0
17
import QtQuick 2.0
974
18
import Ubuntu.Components 1.0
18
import Ubuntu.Components 1.1
975
19
19
976
20
/*!
20
/*!
977
21
    \qmltype Base
21
    \qmltype Base
978
22
22
979
=== modified file 'modules/Ubuntu/Components/ListItems/Caption.qml'
980
--- modules/Ubuntu/Components/ListItems/Caption.qml	2014-04-20 19:25:12 +0000
981
+++ modules/Ubuntu/Components/ListItems/Caption.qml	2014-04-25 13:00:38 +0000
982
@@ -15,7 +15,7 @@
983
15
 */
15
 */
984
16
16
985
17
import QtQuick 2.0
17
import QtQuick 2.0
987
18
import Ubuntu.Components 1.0
18
import Ubuntu.Components 1.1
988
19
19
989
20
/*!
20
/*!
990
21
    \qmltype Caption
21
    \qmltype Caption
991
22
22
992
=== modified file 'modules/Ubuntu/Components/ListItems/Empty.qml'
993
--- modules/Ubuntu/Components/ListItems/Empty.qml	2014-04-20 19:25:12 +0000
994
+++ modules/Ubuntu/Components/ListItems/Empty.qml	2014-04-25 13:00:38 +0000
995
@@ -15,7 +15,7 @@
996
15
 */
15
 */
997
16
16
998
17
import QtQuick 2.0
17
import QtQuick 2.0
1000
18
import Ubuntu.Components 1.0
18
import Ubuntu.Components 1.1
1001
19
19
1002
20
/*!
20
/*!
1003
21
    \qmltype Empty
21
    \qmltype Empty
1004
@@ -34,7 +34,7 @@
1005
34
34
1006
35
    Examples:
35
    Examples:
1007
36
    \qml
36
    \qml
1009
37
        import Ubuntu.Components 1.0
37
        import Ubuntu.Components 1.1
1010
38
        import Ubuntu.Components.ListItems 1.0 as ListItem
38
        import Ubuntu.Components.ListItems 1.0 as ListItem
1011
39
39
1012
40
        Item {
40
        Item {
1013
41
41
1014
=== modified file 'modules/Ubuntu/Components/ListItems/Expandable.qml'
1015
--- modules/Ubuntu/Components/ListItems/Expandable.qml	2014-04-20 19:25:12 +0000
1016
+++ modules/Ubuntu/Components/ListItems/Expandable.qml	2014-04-25 13:00:38 +0000
1017
@@ -14,7 +14,7 @@
1018
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/>.
1019
15
 */
15
 */
1020
16
import QtQuick 2.0
16
import QtQuick 2.0
1022
17
import Ubuntu.Components 1.0
17
import Ubuntu.Components 1.1
1023
18
18
1024
19
/*!
19
/*!
1025
20
    \qmltype Expandable
20
    \qmltype Expandable
1026
@@ -35,7 +35,7 @@
1027
35
35
1028
36
    Examples:
36
    Examples:
1029
37
    \qml
37
    \qml
1031
38
        import Ubuntu.Components 1.0
38
        import Ubuntu.Components 1.1
1032
39
        import Ubuntu.Components.ListItems 1.0 as ListItem
39
        import Ubuntu.Components.ListItems 1.0 as ListItem
1033
40
40
1034
41
        Item {
41
        Item {
1035
42
42
1036
=== modified file 'modules/Ubuntu/Components/ListItems/ExpandablesColumn.qml'
1037
--- modules/Ubuntu/Components/ListItems/ExpandablesColumn.qml	2014-04-20 19:25:12 +0000
1038
+++ modules/Ubuntu/Components/ListItems/ExpandablesColumn.qml	2014-04-25 13:00:38 +0000
1039
@@ -15,7 +15,7 @@
1040
15
 */
15
 */
1041
16
16
1042
17
import QtQuick 2.0
17
import QtQuick 2.0
1044
18
import Ubuntu.Components 1.0
18
import Ubuntu.Components 1.1
1045
19
19
1046
20
/*!
20
/*!
1047
21
    \qmltype ExpandablesColumn
21
    \qmltype ExpandablesColumn
1048
@@ -29,7 +29,7 @@
1049
29
29
1050
30
    Examples:
30
    Examples:
1051
31
    \qml
31
    \qml
1053
32
        import Ubuntu.Components 1.0
32
        import Ubuntu.Components 1.1
1054
33
        import Ubuntu.Components.ListItems 1.0 as ListItem
33
        import Ubuntu.Components.ListItems 1.0 as ListItem
1055
34
34
1056
35
        ListItem.ExpandablesColumn {
35
        ListItem.ExpandablesColumn {
1057
36
36
1058
=== modified file 'modules/Ubuntu/Components/ListItems/IconVisual.qml'
1059
--- modules/Ubuntu/Components/ListItems/IconVisual.qml	2014-04-20 19:25:12 +0000
1060
+++ modules/Ubuntu/Components/ListItems/IconVisual.qml	2014-04-25 13:00:38 +0000
1061
@@ -15,7 +15,7 @@
1062
15
 */
15
 */
1063
16
16
1064
17
import QtQuick 2.0
17
import QtQuick 2.0
1066
18
import Ubuntu.Components 1.0
18
import Ubuntu.Components 1.1
1067
19
19
1068
20
// internal helper class to create the visuals
20
// internal helper class to create the visuals
1069
21
// for the icon.
21
// for the icon.
1070
22
22
1071
=== modified file 'modules/Ubuntu/Components/ListItems/ItemSelector.qml'
1072
--- modules/Ubuntu/Components/ListItems/ItemSelector.qml	2014-04-20 19:25:12 +0000
1073
+++ modules/Ubuntu/Components/ListItems/ItemSelector.qml	2014-04-25 13:00:38 +0000
1074
@@ -16,7 +16,7 @@
1075
16
16
1076
17
import QtQuick 2.0
17
import QtQuick 2.0
1077
18
import "." as ListItem
18
import "." as ListItem
1079
19
import Ubuntu.Components 1.0
19
import Ubuntu.Components 1.1
1080
20
20
1081
21
/*!
21
/*!
1082
22
    \qmltype ItemSelector
22
    \qmltype ItemSelector
1083
23
23
1084
=== modified file 'modules/Ubuntu/Components/ListItems/LabelVisual.qml'
1085
--- modules/Ubuntu/Components/ListItems/LabelVisual.qml	2014-04-20 19:25:12 +0000
1086
+++ modules/Ubuntu/Components/ListItems/LabelVisual.qml	2014-04-25 13:00:38 +0000
1087
@@ -15,7 +15,7 @@
1088
15
 */
15
 */
1089
16
16
1090
17
import QtQuick 2.0
17
import QtQuick 2.0
1092
18
import Ubuntu.Components 1.0
18
import Ubuntu.Components 1.1
1093
19
19
1094
20
// internal helper class for text inside the list items.
20
// internal helper class for text inside the list items.
1095
21
Label {
21
Label {
1096
22
22
1097
=== modified file 'modules/Ubuntu/Components/ListItems/ProgressionVisual.qml'
1098
--- modules/Ubuntu/Components/ListItems/ProgressionVisual.qml	2014-04-20 19:25:12 +0000
1099
+++ modules/Ubuntu/Components/ListItems/ProgressionVisual.qml	2014-04-25 13:00:38 +0000
1100
@@ -15,7 +15,7 @@
1101
15
 */
15
 */
1102
16
16
1103
17
import QtQuick 2.0
17
import QtQuick 2.0
1105
18
import Ubuntu.Components 1.0
18
import Ubuntu.Components 1.1
1106
19
19
1107
20
// Internal helper class for the visuals of
20
// Internal helper class for the visuals of
1108
21
// the progression symbol.
21
// the progression symbol.
1109
22
22
1110
=== modified file 'modules/Ubuntu/Components/ListItems/SingleControl.qml'
1111
--- modules/Ubuntu/Components/ListItems/SingleControl.qml	2014-04-20 19:25:12 +0000
1112
+++ modules/Ubuntu/Components/ListItems/SingleControl.qml	2014-04-25 13:00:38 +0000
1113
@@ -15,7 +15,7 @@
1114
15
 */
15
 */
1115
16
16
1116
17
import QtQuick 2.0
17
import QtQuick 2.0
1118
18
import Ubuntu.Components 1.0
18
import Ubuntu.Components 1.1
1119
19
import Ubuntu.Components.ListItems 1.0
19
import Ubuntu.Components.ListItems 1.0
1120
20
20
1121
21
/*!
21
/*!
1122
@@ -26,7 +26,7 @@
1123
26
26
1124
27
    Examples:
27
    Examples:
1125
28
    \qml
28
    \qml
1127
29
        import Ubuntu.Components 1.0
29
        import Ubuntu.Components 1.1
1128
30
        import Ubuntu.Components.ListItems 1.0 as ListItem
30
        import Ubuntu.Components.ListItems 1.0 as ListItem
1129
31
        Column {
31
        Column {
1130
32
            ListItem.SingleControl {
32
            ListItem.SingleControl {
1131
33
33
1132
=== modified file 'modules/Ubuntu/Components/ListItems/Standard.qml'
1133
--- modules/Ubuntu/Components/ListItems/Standard.qml	2014-04-20 19:25:12 +0000
1134
+++ modules/Ubuntu/Components/ListItems/Standard.qml	2014-04-25 13:00:38 +0000
1135
@@ -15,7 +15,7 @@
1136
15
 */
15
 */
1137
16
16
1138
17
import QtQuick 2.0
17
import QtQuick 2.0
1140
18
import Ubuntu.Components 1.0
18
import Ubuntu.Components 1.1
1141
19
19
1142
20
/*!
20
/*!
1143
21
    \qmltype Standard
21
    \qmltype Standard
1144
@@ -30,7 +30,7 @@
1145
30
30
1146
31
    Examples:
31
    Examples:
1147
32
    \qml
32
    \qml
1149
33
        import Ubuntu.Components 1.0
33
        import Ubuntu.Components 1.1
1150
34
        import Ubuntu.Components.ListItems 1.0 as ListItem
34
        import Ubuntu.Components.ListItems 1.0 as ListItem
1151
35
        Column {
35
        Column {
1152
36
            ListItem.Standard {
36
            ListItem.Standard {
1153
37
37
1154
=== modified file 'modules/Ubuntu/Components/ListItems/Subtitled.qml'
1155
--- modules/Ubuntu/Components/ListItems/Subtitled.qml	2014-04-20 19:25:12 +0000
1156
+++ modules/Ubuntu/Components/ListItems/Subtitled.qml	2014-04-25 13:00:38 +0000
1157
@@ -15,7 +15,7 @@
1158
15
 */
15
 */
1159
16
16
1160
17
import QtQuick 2.0
17
import QtQuick 2.0
1162
18
import Ubuntu.Components 1.0
18
import Ubuntu.Components 1.1
1163
19
19
1164
20
/*!
20
/*!
1165
21
    \qmltype MultiValue
21
    \qmltype MultiValue
1166
22
22
1167
=== modified file 'modules/Ubuntu/Components/ListItems/ValueSelector.qml'
1168
--- modules/Ubuntu/Components/ListItems/ValueSelector.qml	2014-04-20 19:25:12 +0000
1169
+++ modules/Ubuntu/Components/ListItems/ValueSelector.qml	2014-04-25 13:00:38 +0000
1170
@@ -15,7 +15,7 @@
1171
15
 */
15
 */
1172
16
16
1173
17
import QtQuick 2.0
17
import QtQuick 2.0
1175
18
import Ubuntu.Components 1.0
18
import Ubuntu.Components 1.1
1176
19
19
1177
20
/*!
20
/*!
1178
21
    ****DEPRECATED! PLEASE USE ITEM SELECTOR OR FOR THE UBUNTU SHAPE VERSION THE OPTION SELECTOR.****
21
    ****DEPRECATED! PLEASE USE ITEM SELECTOR OR FOR THE UBUNTU SHAPE VERSION THE OPTION SELECTOR.****
1179
22
22
1180
=== modified file 'modules/Ubuntu/Components/MainView.qml'
1181
--- modules/Ubuntu/Components/MainView.qml	2014-04-24 18:21:34 +0000
1182
+++ modules/Ubuntu/Components/MainView.qml	2014-04-25 13:00:38 +0000
1183
@@ -21,7 +21,7 @@
1184
21
21
1185
22
/*!
22
/*!
1186
23
    \qmltype MainView
23
    \qmltype MainView
1188
24
    \inqmlmodule Ubuntu.Components 1.0
24
    \inqmlmodule Ubuntu.Components 1.1
1189
25
    \ingroup ubuntu
25
    \ingroup ubuntu
1190
26
    \brief MainView is the root Item that should be used for all applications.
26
    \brief MainView is the root Item that should be used for all applications.
1191
27
        It automatically adds a header and toolbar for its contents and can
27
        It automatically adds a header and toolbar for its contents and can
1192
@@ -30,7 +30,7 @@
1193
30
    The simplest way to use a MainView is to include a \l Page object inside the MainView:
30
    The simplest way to use a MainView is to include a \l Page object inside the MainView:
1194
31
    \qml
31
    \qml
1195
32
        import QtQuick 2.0
32
        import QtQuick 2.0
1197
33
        import Ubuntu.Components 1.0
33
        import Ubuntu.Components 1.1
1198
34
34
1199
35
        MainView {
35
        MainView {
1200
36
            width: units.gu(48)
36
            width: units.gu(48)
1201
@@ -57,7 +57,7 @@
1202
57
    will automatically hide and show when the user scrolls up or down:
57
    will automatically hide and show when the user scrolls up or down:
1203
58
    \qml
58
    \qml
1204
59
        import QtQuick 2.0
59
        import QtQuick 2.0
1206
60
        import Ubuntu.Components 1.0
60
        import Ubuntu.Components 1.1
1207
61
61
1208
62
        MainView {
62
        MainView {
1209
63
            width: units.gu(48)
63
            width: units.gu(48)
1210
@@ -89,7 +89,7 @@
1211
89
    A toolbar can be added to the application by setting the tools property of the \l Page:
89
    A toolbar can be added to the application by setting the tools property of the \l Page:
1212
90
    \qml
90
    \qml
1213
91
        import QtQuick 2.0
91
        import QtQuick 2.0
1215
92
        import Ubuntu.Components 1.0
92
        import Ubuntu.Components 1.1
1216
93
93
1217
94
        MainView {
94
        MainView {
1218
95
            width: units.gu(48)
95
            width: units.gu(48)
1219
@@ -169,7 +169,7 @@
1220
169
      the content:
169
      the content:
1221
170
      \qml
170
      \qml
1222
171
          import QtQuick 2.0
171
          import QtQuick 2.0
1224
172
          import Ubuntu.Components 1.0
172
          import Ubuntu.Components 1.1
1225
173
173
1226
174
          MainView {
174
          MainView {
1227
175
              width: units.gu(40)
175
              width: units.gu(40)
1228
176
176
1229
=== modified file 'modules/Ubuntu/Components/Object.qml'
1230
--- modules/Ubuntu/Components/Object.qml	2014-04-20 19:25:12 +0000
1231
+++ modules/Ubuntu/Components/Object.qml	2014-04-25 13:00:38 +0000
1232
@@ -19,7 +19,7 @@
1233
19
/*!
19
/*!
1234
20
    \qmltype Object
20
    \qmltype Object
1235
21
    \internal
21
    \internal
1237
22
    \inqmlmodule Ubuntu.Components 1.0
22
    \inqmlmodule Ubuntu.Components 1.1
1238
23
    \ingroup ubuntu
23
    \ingroup ubuntu
1239
24
    \brief Internal type used for lightweight objects that can have children.
24
    \brief Internal type used for lightweight objects that can have children.
1240
25
*/
25
*/
1241
26
26
1242
=== modified file 'modules/Ubuntu/Components/OptionSelector.qml'
1243
--- modules/Ubuntu/Components/OptionSelector.qml	2014-04-20 19:25:12 +0000
1244
+++ modules/Ubuntu/Components/OptionSelector.qml	2014-04-25 13:00:38 +0000
1245
@@ -16,11 +16,11 @@
1246
16
16
1247
17
import QtQuick 2.0
17
import QtQuick 2.0
1248
18
import "ListItems" as ListItem
18
import "ListItems" as ListItem
1250
19
import Ubuntu.Components 1.0 as Toolkit
19
import Ubuntu.Components 1.1 as Toolkit
1251
20
20
1252
21
/*!
21
/*!
1253
22
    \qmltype OptionSelector
22
    \qmltype OptionSelector
1255
23
    \inqmlmodule Ubuntu.Components 1.0
23
    \inqmlmodule Ubuntu.Components 1.1
1256
24
    \ingroup ubuntu-components
24
    \ingroup ubuntu-components
1257
25
    \brief Component displaying either a single selected value or expanded multiple choice with an optional image and subtext when not expanded, when expanding it opens a
25
    \brief Component displaying either a single selected value or expanded multiple choice with an optional image and subtext when not expanded, when expanding it opens a
1258
26
    listing of all the possible values for selection with an additional option of always being expanded. If multiple choice is selected the list is expanded automatically.
26
    listing of all the possible values for selection with an additional option of always being expanded. If multiple choice is selected the list is expanded automatically.
1259
@@ -29,7 +29,7 @@
1260
29
29
1261
30
    Examples:
30
    Examples:
1262
31
    \qml
31
    \qml
1264
32
        import Ubuntu.Components 1.0
32
        import Ubuntu.Components 1.1
1265
33
        Column {
33
        Column {
1266
34
            spacing: units.gu(3)
34
            spacing: units.gu(3)
1267
35
35
1268
36
36
1269
=== modified file 'modules/Ubuntu/Components/OptionSelectorDelegate.qml'
1270
--- modules/Ubuntu/Components/OptionSelectorDelegate.qml	2014-04-20 19:25:12 +0000
1271
+++ modules/Ubuntu/Components/OptionSelectorDelegate.qml	2014-04-25 13:00:38 +0000
1272
@@ -16,7 +16,7 @@
1273
16
16
1274
17
/*!
17
/*!
1275
18
    \qmltype OptionSelectorDelegate
18
    \qmltype OptionSelectorDelegate
1277
19
    \inqmlmodule Ubuntu.Components 1.0
19
    \inqmlmodule Ubuntu.Components 1.1
1278
20
    \ingroup ubuntu-components
20
    \ingroup ubuntu-components
1279
21
    \brief OptionSelector delegate which can display text, subtext and an image from a custom model.
21
    \brief OptionSelector delegate which can display text, subtext and an image from a custom model.
1280
22
22
1281
@@ -24,7 +24,7 @@
1282
24
24
1283
25
    Examples:
25
    Examples:
1284
26
    \qml
26
    \qml
1286
27
        import Ubuntu.Components 1.0
27
        import Ubuntu.Components 1.1
1287
28
        Column {
28
        Column {
1288
29
            width: 250
29
            width: 250
1289
30
            OptionSelector {
30
            OptionSelector {
1290
@@ -45,7 +45,7 @@
1291
45
45
1292
46
import QtQuick 2.0
46
import QtQuick 2.0
1293
47
import "ListItems" as ListItem
47
import "ListItems" as ListItem
1295
48
import Ubuntu.Components 1.0 as Toolkit
48
import Ubuntu.Components 1.1 as Toolkit
1296
49
49
1297
50
ListItem.Standard {
50
ListItem.Standard {
1298
51
    id: option
51
    id: option
1299
52
52
1300
=== modified file 'modules/Ubuntu/Components/OrientationHelper.qml'
1301
--- modules/Ubuntu/Components/OrientationHelper.qml	2014-04-23 09:10:47 +0000
1302
+++ modules/Ubuntu/Components/OrientationHelper.qml	2014-04-25 13:00:38 +0000
1303
@@ -20,7 +20,7 @@
1304
20
20
1305
21
/*!
21
/*!
1306
22
    \qmltype OrientationHelper
22
    \qmltype OrientationHelper
1308
23
    \inqmlmodule Ubuntu.Components 1.0
23
    \inqmlmodule Ubuntu.Components 1.1
1309
24
    \ingroup ubuntu
24
    \ingroup ubuntu
1310
25
    \brief The OrientationHelper automatically rotates its children following the
25
    \brief The OrientationHelper automatically rotates its children following the
1311
26
           orientation of the device.
26
           orientation of the device.
1312
27
27
1313
=== modified file 'modules/Ubuntu/Components/Page.qml'
1314
--- modules/Ubuntu/Components/Page.qml	2014-04-24 18:21:34 +0000
1315
+++ modules/Ubuntu/Components/Page.qml	2014-04-25 13:00:38 +0000
1316
@@ -19,7 +19,7 @@
1317
19
19
1318
20
/*!
20
/*!
1319
21
    \qmltype Page
21
    \qmltype Page
1321
22
    \inqmlmodule Ubuntu.Components 1.0
22
    \inqmlmodule Ubuntu.Components 1.1
1322
23
    \ingroup ubuntu
23
    \ingroup ubuntu
1323
24
    \brief A page is the basic Item that must be used inside the \l MainView,
24
    \brief A page is the basic Item that must be used inside the \l MainView,
1324
25
        \l PageStack and \l Tabs.
25
        \l PageStack and \l Tabs.
1325
@@ -33,7 +33,7 @@
1326
33
33
1327
34
    \qml
34
    \qml
1328
35
        import QtQuick 2.0
35
        import QtQuick 2.0
1330
36
        import Ubuntu.Components 1.0
36
        import Ubuntu.Components 1.1
1331
37
37
1332
38
        MainView {
38
        MainView {
1333
39
            width: units.gu(48)
39
            width: units.gu(48)
1334
@@ -94,7 +94,7 @@
1335
94
      and anchors to the top of the page or fills the page. For example:
94
      and anchors to the top of the page or fills the page. For example:
1336
95
      \qml
95
      \qml
1337
96
        import QtQuick 2.0
96
        import QtQuick 2.0
1339
97
        import Ubuntu.Components 1.0
97
        import Ubuntu.Components 1.1
1340
98
98
1341
99
        MainView {
99
        MainView {
1342
100
            width: units.gu(30)
100
            width: units.gu(30)
1343
101
101
1344
=== modified file 'modules/Ubuntu/Components/PageStack.qml'
1345
--- modules/Ubuntu/Components/PageStack.qml	2014-04-20 19:25:12 +0000
1346
+++ modules/Ubuntu/Components/PageStack.qml	2014-04-25 13:00:38 +0000
1347
@@ -19,7 +19,7 @@
1348
19
19
1349
20
/*!
20
/*!
1350
21
    \qmltype PageStack
21
    \qmltype PageStack
1352
22
    \inqmlmodule Ubuntu.Components 1.0
22
    \inqmlmodule Ubuntu.Components 1.1
1353
23
    \ingroup ubuntu
23
    \ingroup ubuntu
1354
24
    \brief A stack of \l Page items that is used for inter-Page navigation.
24
    \brief A stack of \l Page items that is used for inter-Page navigation.
1355
25
        Pages on the stack can be popped, and new Pages can be pushed.
25
        Pages on the stack can be popped, and new Pages can be pushed.
1356
@@ -39,7 +39,7 @@
1357
39
    Example:
39
    Example:
1358
40
    \qml
40
    \qml
1359
41
        import QtQuick 2.0
41
        import QtQuick 2.0
1361
42
        import Ubuntu.Components 1.0
42
        import Ubuntu.Components 1.1
1362
43
        import Ubuntu.Components.ListItems 1.0 as ListItem
43
        import Ubuntu.Components.ListItems 1.0 as ListItem
1363
44
44
1364
45
        MainView {
45
        MainView {
1365
46
46
1366
=== modified file 'modules/Ubuntu/Components/PageTreeNode.qml'
1367
--- modules/Ubuntu/Components/PageTreeNode.qml	2014-04-20 19:25:12 +0000
1368
+++ modules/Ubuntu/Components/PageTreeNode.qml	2014-04-25 13:00:38 +0000
1369
@@ -19,7 +19,7 @@
1370
19
/*!
19
/*!
1371
20
    \internal
20
    \internal
1372
21
    \qmltype PageTreeNode
21
    \qmltype PageTreeNode
1374
22
    \inqmlmodule Ubuntu.Components 1.0
22
    \inqmlmodule Ubuntu.Components 1.1
1375
23
    \ingroup ubuntu
23
    \ingroup ubuntu
1376
24
    \brief The common parent of \l Page, \l MainView, \l PageStack and \l Tabs.
24
    \brief The common parent of \l Page, \l MainView, \l PageStack and \l Tabs.
1377
25
25
1378
26
26
1379
=== modified file 'modules/Ubuntu/Components/PageWrapper.qml'
1380
--- modules/Ubuntu/Components/PageWrapper.qml	2014-04-20 19:25:12 +0000
1381
+++ modules/Ubuntu/Components/PageWrapper.qml	2014-04-25 13:00:38 +0000
1382
@@ -20,7 +20,7 @@
1383
20
/*!
20
/*!
1384
21
    \internal
21
    \internal
1385
22
    \qmltype PageWrapper
22
    \qmltype PageWrapper
1387
23
    \inqmlmodule Ubuntu.Components 1.0
23
    \inqmlmodule Ubuntu.Components 1.1
1388
24
    \ingroup ubuntu
24
    \ingroup ubuntu
1389
25
    \brief Internal class used by \l PageStack
25
    \brief Internal class used by \l PageStack
1390
26
26
1391
27
27
1392
=== modified file 'modules/Ubuntu/Components/Panel.qml'
1393
--- modules/Ubuntu/Components/Panel.qml	2014-04-24 18:28:43 +0000
1394
+++ modules/Ubuntu/Components/Panel.qml	2014-04-25 13:00:38 +0000
1395
@@ -15,11 +15,11 @@
1396
15
 */
15
 */
1397
16
16
1398
17
import QtQuick 2.0
17
import QtQuick 2.0
1400
18
import Ubuntu.Components 1.0 as Toolkit
18
import Ubuntu.Components 1.1 as Toolkit
1401
19
19
1402
20
/*!
20
/*!
1403
21
    \qmltype Panel
21
    \qmltype Panel
1405
22
    \inqmlmodule Ubuntu.Components 1.0
22
    \inqmlmodule Ubuntu.Components 1.1
1406
23
    \ingroup ubuntu
23
    \ingroup ubuntu
1407
24
    \brief A panel that can be swiped in and out from an edge of the window by the user.
24
    \brief A panel that can be swiped in and out from an edge of the window by the user.
1408
25
    For most applications, it is highly recommended to use the \l MainView instead which includes
25
    For most applications, it is highly recommended to use the \l MainView instead which includes
1409
@@ -38,7 +38,7 @@
1410
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:
1411
39
    \qml
39
    \qml
1412
40
        import QtQuick 2.0
40
        import QtQuick 2.0
1414
41
        import Ubuntu.Components 1.0
41
        import Ubuntu.Components 1.1
1415
42
42
1416
43
        Item {
43
        Item {
1417
44
            width: units.gu(80)
44
            width: units.gu(80)
1418
@@ -69,7 +69,7 @@
1419
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:
1420
70
    \qml
70
    \qml
1421
71
        import QtQuick 2.0
71
        import QtQuick 2.0
1423
72
        import Ubuntu.Components 1.0
72
        import Ubuntu.Components 1.1
1424
73
73
1425
74
        Item {
74
        Item {
1426
75
            width: units.gu(80)
75
            width: units.gu(80)
1427
@@ -106,7 +106,7 @@
1428
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:
1429
107
    \qml
107
    \qml
1430
108
        import QtQuick 2.0
108
        import QtQuick 2.0
1432
109
        import Ubuntu.Components 1.0
109
        import Ubuntu.Components 1.1
1433
110
110
1434
111
        Rectangle {
111
        Rectangle {
1435
112
            color: Theme.palette.normal.background
112
            color: Theme.palette.normal.background
1436
113
113
1437
=== modified file 'modules/Ubuntu/Components/Pickers/DatePicker.qml'
1438
--- modules/Ubuntu/Components/Pickers/DatePicker.qml	2014-04-20 19:25:12 +0000
1439
+++ modules/Ubuntu/Components/Pickers/DatePicker.qml	2014-04-25 13:00:38 +0000
1440
@@ -15,7 +15,7 @@
1441
15
 */
15
 */
1442
16
16
1443
17
import QtQuick 2.0
17
import QtQuick 2.0
1445
18
import Ubuntu.Components 1.0
18
import Ubuntu.Components 1.1
1446
19
19
1447
20
/*!
20
/*!
1448
21
    \qmltype DatePicker
21
    \qmltype DatePicker
1449
@@ -36,7 +36,7 @@
1450
36
36
1451
37
    \qml
37
    \qml
1452
38
    import QtQuick 2.0
38
    import QtQuick 2.0
1454
39
    import Ubuntu.Components 1.0
39
    import Ubuntu.Components 1.1
1455
40
    import Ubuntu.Components.Pickers 1.0
40
    import Ubuntu.Components.Pickers 1.0
1456
41
41
1457
42
    Column {
42
    Column {
1458
@@ -56,7 +56,7 @@
1459
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:
1460
57
    \qml
57
    \qml
1461
58
    import QtQuick 2.0
58
    import QtQuick 2.0
1463
59
    import Ubuntu.Components 1.0
59
    import Ubuntu.Components 1.1
1464
60
    import Ubuntu.Components.Pickers 1.0
60
    import Ubuntu.Components.Pickers 1.0
1465
61
61
1466
62
    Column {
62
    Column {
1467
@@ -75,7 +75,7 @@
1468
75
    The following example demonstrates how to use DatePicker for time picking.
75
    The following example demonstrates how to use DatePicker for time picking.
1469
76
    \qml
76
    \qml
1470
77
    import QtQuick 2.0
77
    import QtQuick 2.0
1472
78
    import Ubuntu.Components 1.0
78
    import Ubuntu.Components 1.1
1473
79
    import Ubuntu.Components.Pickers 1.0
79
    import Ubuntu.Components.Pickers 1.0
1474
80
80
1475
81
    Column {
81
    Column {
1476
@@ -112,7 +112,7 @@
1477
112
    \endlist
112
    \endlist
1478
113
    \qml
113
    \qml
1479
114
    import QtQuick 2.0
114
    import QtQuick 2.0
1481
115
    import Ubuntu.Components 1.0
115
    import Ubuntu.Components 1.1
1482
116
    import Ubuntu.Components.Pickers 1.0
116
    import Ubuntu.Components.Pickers 1.0
1483
117
117
1484
118
    Column {
118
    Column {
1485
119
119
1486
=== modified file 'modules/Ubuntu/Components/Pickers/DayModel.qml'
1487
--- modules/Ubuntu/Components/Pickers/DayModel.qml	2014-04-20 19:25:12 +0000
1488
+++ modules/Ubuntu/Components/Pickers/DayModel.qml	2014-04-25 13:00:38 +0000
1489
@@ -15,7 +15,7 @@
1490
15
 */
15
 */
1491
16
16
1492
17
import QtQuick 2.0
17
import QtQuick 2.0
1494
18
import Ubuntu.Components 1.0
18
import Ubuntu.Components 1.1
1495
19
19
1496
20
PickerModelBase {
20
PickerModelBase {
1497
21
    circular: true
21
    circular: true
1498
22
22
1499
=== modified file 'modules/Ubuntu/Components/Pickers/Dialer.qml'
1500
--- modules/Ubuntu/Components/Pickers/Dialer.qml	2014-04-23 10:01:42 +0000
1501
+++ modules/Ubuntu/Components/Pickers/Dialer.qml	2014-04-25 13:00:38 +0000
1502
@@ -15,7 +15,7 @@
1503
15
 */
15
 */
1504
16
16
1505
17
import QtQuick 2.0
17
import QtQuick 2.0
1507
18
import Ubuntu.Components 1.0
18
import Ubuntu.Components 1.1
1508
19
19
1509
20
/*!
20
/*!
1510
21
    \qmltype Dialer
21
    \qmltype Dialer
1511
22
22
1512
=== modified file 'modules/Ubuntu/Components/Pickers/DialerHand.qml'
1513
--- modules/Ubuntu/Components/Pickers/DialerHand.qml	2014-04-23 10:01:42 +0000
1514
+++ modules/Ubuntu/Components/Pickers/DialerHand.qml	2014-04-25 13:00:38 +0000
1515
@@ -15,7 +15,7 @@
1516
15
 */
15
 */
1517
16
16
1518
17
import QtQuick 2.0
17
import QtQuick 2.0
1520
18
import Ubuntu.Components 1.0
18
import Ubuntu.Components 1.1
1521
19
19
1522
20
/*!
20
/*!
1523
21
    \qmltype DialerHand
21
    \qmltype DialerHand
1524
22
22
1525
=== modified file 'modules/Ubuntu/Components/Pickers/DialerHandGroup.qml'
1526
--- modules/Ubuntu/Components/Pickers/DialerHandGroup.qml	2014-04-23 10:01:42 +0000
1527
+++ modules/Ubuntu/Components/Pickers/DialerHandGroup.qml	2014-04-25 13:00:38 +0000
1528
@@ -14,7 +14,7 @@
1529
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/>.
1530
15
 */
15
 */
1531
16
import QtQuick 2.0
16
import QtQuick 2.0
1533
17
import Ubuntu.Components 1.0
17
import Ubuntu.Components 1.1
1534
18
18
1535
19
/*!
19
/*!
1536
20
  \internal
20
  \internal
1537
21
21
1538
=== modified file 'modules/Ubuntu/Components/Pickers/HoursModel.qml'
1539
--- modules/Ubuntu/Components/Pickers/HoursModel.qml	2014-04-20 19:25:12 +0000
1540
+++ modules/Ubuntu/Components/Pickers/HoursModel.qml	2014-04-25 13:00:38 +0000
1541
@@ -15,7 +15,7 @@
1542
15
 */
15
 */
1543
16
16
1544
17
import QtQuick 2.0
17
import QtQuick 2.0
1546
18
import Ubuntu.Components 1.0
18
import Ubuntu.Components 1.1
1547
19
19
1548
20
PickerModelBase {
20
PickerModelBase {
1549
21
    property int from
21
    property int from
1550
22
22
1551
=== modified file 'modules/Ubuntu/Components/Pickers/MinutesModel.qml'
1552
--- modules/Ubuntu/Components/Pickers/MinutesModel.qml	2014-04-20 19:25:12 +0000
1553
+++ modules/Ubuntu/Components/Pickers/MinutesModel.qml	2014-04-25 13:00:38 +0000
1554
@@ -15,7 +15,7 @@
1555
15
 */
15
 */
1556
16
16
1557
17
import QtQuick 2.0
17
import QtQuick 2.0
1559
18
import Ubuntu.Components 1.0
18
import Ubuntu.Components 1.1
1560
19
19
1561
20
PickerModelBase {
20
PickerModelBase {
1562
21
    property int from
21
    property int from
1563
22
22
1564
=== modified file 'modules/Ubuntu/Components/Pickers/MonthModel.qml'
1565
--- modules/Ubuntu/Components/Pickers/MonthModel.qml	2014-04-20 19:25:12 +0000
1566
+++ modules/Ubuntu/Components/Pickers/MonthModel.qml	2014-04-25 13:00:38 +0000
1567
@@ -15,7 +15,7 @@
1568
15
 */
15
 */
1569
16
16
1570
17
import QtQuick 2.0
17
import QtQuick 2.0
1572
18
import Ubuntu.Components 1.0
18
import Ubuntu.Components 1.1
1573
19
19
1574
20
PickerModelBase {
20
PickerModelBase {
1575
21
    circular: (count >= 11)
21
    circular: (count >= 11)
1576
22
22
1577
=== modified file 'modules/Ubuntu/Components/Pickers/Picker.qml'
1578
--- modules/Ubuntu/Components/Pickers/Picker.qml	2014-04-20 19:25:12 +0000
1579
+++ modules/Ubuntu/Components/Pickers/Picker.qml	2014-04-25 13:00:38 +0000
1580
@@ -15,7 +15,7 @@
1581
15
 */
15
 */
1582
16
16
1583
17
import QtQuick 2.0
17
import QtQuick 2.0
1585
18
import Ubuntu.Components 1.0
18
import Ubuntu.Components 1.1
1586
19
19
1587
20
/*!
20
/*!
1588
21
    \qmltype Picker
21
    \qmltype Picker
1589
@@ -35,7 +35,7 @@
1590
35
    Example:
35
    Example:
1591
36
    \qml
36
    \qml
1592
37
    import QtQuick 2.0
37
    import QtQuick 2.0
1594
38
    import Ubuntu.Components 1.0
38
    import Ubuntu.Components 1.1
1595
39
    import Ubuntu.Components.Pickers 1.0
39
    import Ubuntu.Components.Pickers 1.0
1596
40
40
1597
41
    Picker {
41
    Picker {
1598
42
42
1599
=== modified file 'modules/Ubuntu/Components/Pickers/PickerDelegate.qml'
1600
--- modules/Ubuntu/Components/Pickers/PickerDelegate.qml	2014-04-23 10:01:42 +0000
1601
+++ modules/Ubuntu/Components/Pickers/PickerDelegate.qml	2014-04-25 13:00:38 +0000
1602
@@ -15,7 +15,7 @@
1603
15
 */
15
 */
1604
16
16
1605
17
import QtQuick 2.0
17
import QtQuick 2.0
1607
18
import Ubuntu.Components 1.0
18
import Ubuntu.Components 1.1
1608
19
19
1609
20
/*!
20
/*!
1610
21
    \qmltype PickerDelegate
21
    \qmltype PickerDelegate
1611
22
22
1612
=== modified file 'modules/Ubuntu/Components/Pickers/PickerPanel.qml'
1613
--- modules/Ubuntu/Components/Pickers/PickerPanel.qml	2014-04-20 19:25:12 +0000
1614
+++ modules/Ubuntu/Components/Pickers/PickerPanel.qml	2014-04-25 13:00:38 +0000
1615
@@ -16,13 +16,13 @@
1616
16
16
1617
17
import QtQuick 2.0
17
import QtQuick 2.0
1618
18
import QtQuick.Window 2.0
18
import QtQuick.Window 2.0
1620
19
import Ubuntu.Components 1.0
19
import Ubuntu.Components 1.1
1621
20
import Ubuntu.Components.ListItems 1.0
20
import Ubuntu.Components.ListItems 1.0
1622
21
import Ubuntu.Components.Popups 1.0
21
import Ubuntu.Components.Popups 1.0
1623
22
22
1624
23
/*!
23
/*!
1625
24
    \qmltype PickerPanel
24
    \qmltype PickerPanel
1627
25
    \inqmlmodule Ubuntu.Components 1.0
25
    \inqmlmodule Ubuntu.Components 1.1
1628
26
    \ingroup ubuntu-pickers
26
    \ingroup ubuntu-pickers
1629
27
    \brief Provides a panel for opening a DatePicker in place of the input panel or
27
    \brief Provides a panel for opening a DatePicker in place of the input panel or
1630
28
    as Popover, depending on the form factor.
28
    as Popover, depending on the form factor.
1631
@@ -32,7 +32,7 @@
1632
32
    on date pickers.
32
    on date pickers.
1633
33
    \qml
33
    \qml
1634
34
    import QtQuick 2.0
34
    import QtQuick 2.0
1636
35
    import Ubuntu.Components 1.0
35
    import Ubuntu.Components 1.1
1637
36
36
1638
37
    MainWindow {
37
    MainWindow {
1639
38
        width: units.gu(40)
38
        width: units.gu(40)
1640
39
39
1641
=== modified file 'modules/Ubuntu/Components/Pickers/PickerRow.qml'
1642
--- modules/Ubuntu/Components/Pickers/PickerRow.qml	2014-04-20 19:25:12 +0000
1643
+++ modules/Ubuntu/Components/Pickers/PickerRow.qml	2014-04-25 13:00:38 +0000
1644
@@ -15,7 +15,7 @@
1645
15
 */
15
 */
1646
16
16
1647
17
import QtQuick 2.0
17
import QtQuick 2.0
1649
18
import Ubuntu.Components 1.0
18
import Ubuntu.Components 1.1
1650
19
19
1651
20
Row {
20
Row {
1652
21
    id: row
21
    id: row
1653
22
22
1654
=== modified file 'modules/Ubuntu/Components/Pickers/SecondsModel.qml'
1655
--- modules/Ubuntu/Components/Pickers/SecondsModel.qml	2014-04-20 19:25:12 +0000
1656
+++ modules/Ubuntu/Components/Pickers/SecondsModel.qml	2014-04-25 13:00:38 +0000
1657
@@ -15,7 +15,7 @@
1658
15
 */
15
 */
1659
16
16
1660
17
import QtQuick 2.0
17
import QtQuick 2.0
1662
18
import Ubuntu.Components 1.0
18
import Ubuntu.Components 1.1
1663
19
19
1664
20
PickerModelBase {
20
PickerModelBase {
1665
21
    property int from
21
    property int from
1666
22
22
1667
=== modified file 'modules/Ubuntu/Components/Pickers/YearModel.qml'
1668
--- modules/Ubuntu/Components/Pickers/YearModel.qml	2014-04-20 19:25:12 +0000
1669
+++ modules/Ubuntu/Components/Pickers/YearModel.qml	2014-04-25 13:00:38 +0000
1670
@@ -15,7 +15,7 @@
1671
15
 */
15
 */
1672
16
16
1673
17
import QtQuick 2.0
17
import QtQuick 2.0
1675
18
import Ubuntu.Components 1.0
18
import Ubuntu.Components 1.1
1676
19
19
1677
20
PickerModelBase {
20
PickerModelBase {
1678
21
    // local properties
21
    // local properties
1679
22
22
1680
=== modified file 'modules/Ubuntu/Components/Popups/ActionSelectionPopover.qml'
1681
--- modules/Ubuntu/Components/Popups/ActionSelectionPopover.qml	2014-04-23 10:01:42 +0000
1682
+++ modules/Ubuntu/Components/Popups/ActionSelectionPopover.qml	2014-04-25 13:00:38 +0000
1683
@@ -15,7 +15,7 @@
1684
15
 */
15
 */
1685
16
16
1686
17
import QtQuick 2.0
17
import QtQuick 2.0
1688
18
import Ubuntu.Components 1.0
18
import Ubuntu.Components 1.1
1689
19
import Ubuntu.Components.ListItems 1.0
19
import Ubuntu.Components.ListItems 1.0
1690
20
20
1691
21
/*!
21
/*!
1692
22
22
1693
=== modified file 'modules/Ubuntu/Components/Popups/ComposerSheet.qml'
1694
--- modules/Ubuntu/Components/Popups/ComposerSheet.qml	2014-04-20 19:25:12 +0000
1695
+++ modules/Ubuntu/Components/Popups/ComposerSheet.qml	2014-04-25 13:00:38 +0000
1696
@@ -15,7 +15,7 @@
1697
15
 */
15
 */
1698
16
16
1699
17
import QtQuick 2.0
17
import QtQuick 2.0
1701
18
import Ubuntu.Components 1.0
18
import Ubuntu.Components 1.1
1702
19
/*!
19
/*!
1703
20
    \qmltype ComposerSheet
20
    \qmltype ComposerSheet
1704
21
    \inherits SheetBase
21
    \inherits SheetBase
1705
@@ -31,7 +31,7 @@
1706
31
31
1707
32
    Example:
32
    Example:
1708
33
    \qml
33
    \qml
1710
34
        import Ubuntu.Components 1.0
34
        import Ubuntu.Components 1.1
1711
35
        import Ubuntu.Components.Popups 1.0
35
        import Ubuntu.Components.Popups 1.0
1712
36
36
1713
37
        Item {
37
        Item {
1714
38
38
1715
=== modified file 'modules/Ubuntu/Components/Popups/DefaultSheet.qml'
1716
--- modules/Ubuntu/Components/Popups/DefaultSheet.qml	2014-04-20 19:25:12 +0000
1717
+++ modules/Ubuntu/Components/Popups/DefaultSheet.qml	2014-04-25 13:00:38 +0000
1718
@@ -15,7 +15,7 @@
1719
15
 */
15
 */
1720
16
16
1721
17
import QtQuick 2.0
17
import QtQuick 2.0
1723
18
import Ubuntu.Components 1.0
18
import Ubuntu.Components 1.1
1724
19
19
1725
20
/*!
20
/*!
1726
21
    \qmltype DefaultSheet
21
    \qmltype DefaultSheet
1727
@@ -32,7 +32,7 @@
1728
32
32
1729
33
    Example:
33
    Example:
1730
34
    \qml
34
    \qml
1732
35
        import Ubuntu.Components 1.0
35
        import Ubuntu.Components 1.1
1733
36
        import Ubuntu.Components.Popups 1.0
36
        import Ubuntu.Components.Popups 1.0
1734
37
37
1735
38
        Item {
38
        Item {
1736
39
39
1737
=== modified file 'modules/Ubuntu/Components/Popups/Dialog.qml'
1738
--- modules/Ubuntu/Components/Popups/Dialog.qml	2014-04-20 19:25:12 +0000
1739
+++ modules/Ubuntu/Components/Popups/Dialog.qml	2014-04-25 13:00:38 +0000
1740
@@ -15,7 +15,7 @@
1741
15
 */
15
 */
1742
16
16
1743
17
import QtQuick 2.0
17
import QtQuick 2.0
1745
18
import Ubuntu.Components 1.0
18
import Ubuntu.Components 1.1
1746
19
import "internalPopupUtils.js" as InternalPopupUtils
19
import "internalPopupUtils.js" as InternalPopupUtils
1747
20
20
1748
21
/*!
21
/*!
1749
@@ -33,7 +33,7 @@
1750
33
    Example:
33
    Example:
1751
34
    \qml
34
    \qml
1752
35
        import QtQuick 2.0
35
        import QtQuick 2.0
1754
36
        import Ubuntu.Components 1.0
36
        import Ubuntu.Components 1.1
1755
37
        import Ubuntu.Components.Popups 1.0
37
        import Ubuntu.Components.Popups 1.0
1756
38
38
1757
39
        Item {
39
        Item {
1758
40
40
1759
=== modified file 'modules/Ubuntu/Components/Popups/Popover.qml'
1760
--- modules/Ubuntu/Components/Popups/Popover.qml	2014-04-20 19:25:12 +0000
1761
+++ modules/Ubuntu/Components/Popups/Popover.qml	2014-04-25 13:00:38 +0000
1762
@@ -16,7 +16,7 @@
1763
16
16
1764
17
import QtQuick 2.0
17
import QtQuick 2.0
1765
18
import "internalPopupUtils.js" as InternalPopupUtils
18
import "internalPopupUtils.js" as InternalPopupUtils
1767
19
import Ubuntu.Components 1.0
19
import Ubuntu.Components 1.1
1768
20
20
1769
21
/*!
21
/*!
1770
22
    \qmltype Popover
22
    \qmltype Popover
1771
@@ -32,7 +32,7 @@
1772
32
    Example:
32
    Example:
1773
33
    \qml
33
    \qml
1774
34
        import QtQuick 2.0
34
        import QtQuick 2.0
1776
35
        import Ubuntu.Components 1.0
35
        import Ubuntu.Components 1.1
1777
36
        import Ubuntu.Components.ListItems 1.0 as ListItem
36
        import Ubuntu.Components.ListItems 1.0 as ListItem
1778
37
        import Ubuntu.Components.Popups 1.0
37
        import Ubuntu.Components.Popups 1.0
1779
38
38
1780
39
39
1781
=== modified file 'modules/Ubuntu/Components/Popups/PopupBase.qml'
1782
--- modules/Ubuntu/Components/Popups/PopupBase.qml	2014-04-20 19:25:12 +0000
1783
+++ modules/Ubuntu/Components/Popups/PopupBase.qml	2014-04-25 13:00:38 +0000
1784
@@ -15,7 +15,7 @@
1785
15
 */
15
 */
1786
16
16
1787
17
import QtQuick 2.0
17
import QtQuick 2.0
1789
18
import Ubuntu.Components 1.0
18
import Ubuntu.Components 1.1
1790
19
19
1791
20
/*!
20
/*!
1792
21
    \qmltype PopupBase
21
    \qmltype PopupBase
1793
22
22
1794
=== modified file 'modules/Ubuntu/Components/Popups/SheetBase.qml'
1795
--- modules/Ubuntu/Components/Popups/SheetBase.qml	2014-04-20 19:25:12 +0000
1796
+++ modules/Ubuntu/Components/Popups/SheetBase.qml	2014-04-25 13:00:38 +0000
1797
@@ -15,7 +15,7 @@
1798
15
 */
15
 */
1799
16
16
1800
17
import QtQuick 2.0
17
import QtQuick 2.0
1802
18
import Ubuntu.Components 1.0
18
import Ubuntu.Components 1.1
1803
19
19
1804
20
/*!
20
/*!
1805
21
    \qmltype SheetBase
21
    \qmltype SheetBase
1806
22
22
1807
=== modified file 'modules/Ubuntu/Components/ProgressBar.qml'
1808
--- modules/Ubuntu/Components/ProgressBar.qml	2014-04-20 19:25:12 +0000
1809
+++ modules/Ubuntu/Components/ProgressBar.qml	2014-04-25 13:00:38 +0000
1810
@@ -18,7 +18,7 @@
1811
18
18
1812
19
/*!
19
/*!
1813
20
    \qmltype ProgressBar
20
    \qmltype ProgressBar
1815
21
    \inqmlmodule Ubuntu.Components 1.0
21
    \inqmlmodule Ubuntu.Components 1.1
1816
22
    \ingroup ubuntu
22
    \ingroup ubuntu
1817
23
    \brief The ProgressBar component visually indicates the progress of a process of
23
    \brief The ProgressBar component visually indicates the progress of a process of
1818
24
    determinate or indeterminate duration.
24
    determinate or indeterminate duration.
1819
25
25
1820
=== modified file 'modules/Ubuntu/Components/Scrollbar.qml'
1821
--- modules/Ubuntu/Components/Scrollbar.qml	2014-04-20 19:25:12 +0000
1822
+++ modules/Ubuntu/Components/Scrollbar.qml	2014-04-25 13:00:38 +0000
1823
@@ -18,7 +18,7 @@
1824
18
18
1825
19
/*!
19
/*!
1826
20
    \qmltype ScrollBar
20
    \qmltype ScrollBar
1828
21
    \inqmlmodule Ubuntu.Components 1.0
21
    \inqmlmodule Ubuntu.Components 1.1
1829
22
    \ingroup ubuntu
22
    \ingroup ubuntu
1830
23
    \brief The ScrollBar component provides scrolling functionality for
23
    \brief The ScrollBar component provides scrolling functionality for
1831
24
    scrollable views (i.e. Flickable, ListView).
24
    scrollable views (i.e. Flickable, ListView).
1832
25
25
1833
=== modified file 'modules/Ubuntu/Components/Slider.qml'
1834
--- modules/Ubuntu/Components/Slider.qml	2014-04-20 19:25:12 +0000
1835
+++ modules/Ubuntu/Components/Slider.qml	2014-04-25 13:00:38 +0000
1836
@@ -21,7 +21,7 @@
1837
21
21
1838
22
/*!
22
/*!
1839
23
    \qmltype Slider
23
    \qmltype Slider
1841
24
    \inqmlmodule Ubuntu.Components 1.0
24
    \inqmlmodule Ubuntu.Components 1.1
1842
25
    \ingroup ubuntu
25
    \ingroup ubuntu
1843
26
    \brief Slider is a component to select a value from a continuous range of
26
    \brief Slider is a component to select a value from a continuous range of
1844
27
     values.
27
     values.
1845
28
28
1846
=== modified file 'modules/Ubuntu/Components/StyledItem.qml'
1847
--- modules/Ubuntu/Components/StyledItem.qml	2014-04-20 19:25:12 +0000
1848
+++ modules/Ubuntu/Components/StyledItem.qml	2014-04-25 13:00:38 +0000
1849
@@ -18,7 +18,7 @@
1850
18
18
1851
19
/*!
19
/*!
1852
20
    \qmlabstract StyledItem
20
    \qmlabstract StyledItem
1854
21
    \inqmlmodule Ubuntu.Components 1.0
21
    \inqmlmodule Ubuntu.Components 1.1
1855
22
    \ingroup theming
22
    \ingroup theming
1856
23
    \brief The StyledItem class allows items to be styled by the theme.
23
    \brief The StyledItem class allows items to be styled by the theme.
1857
24
24
1858
25
25
1859
=== modified file 'modules/Ubuntu/Components/Switch.qml'
1860
--- modules/Ubuntu/Components/Switch.qml	2014-04-20 19:25:12 +0000
1861
+++ modules/Ubuntu/Components/Switch.qml	2014-04-25 13:00:38 +0000
1862
@@ -21,7 +21,7 @@
1863
21
21
1864
22
/*!
22
/*!
1865
23
    \qmltype Switch
23
    \qmltype Switch
1867
24
    \inqmlmodule Ubuntu.Components 1.0
24
    \inqmlmodule Ubuntu.Components 1.1
1868
25
    \ingroup ubuntu
25
    \ingroup ubuntu
1869
26
    \brief Switch is a component with two states, checked or unchecked. It can
26
    \brief Switch is a component with two states, checked or unchecked. It can
1870
27
    be used to set boolean options. The behavior is the same as \l CheckBox, the
27
    be used to set boolean options. The behavior is the same as \l CheckBox, the
1871
28
28
1872
=== modified file 'modules/Ubuntu/Components/Tab.qml'
1873
--- modules/Ubuntu/Components/Tab.qml	2014-04-20 19:25:12 +0000
1874
+++ modules/Ubuntu/Components/Tab.qml	2014-04-25 13:00:38 +0000
1875
@@ -18,7 +18,7 @@
1876
18
18
1877
19
/*!
19
/*!
1878
20
    \qmltype Tab
20
    \qmltype Tab
1880
21
    \inqmlmodule Ubuntu.Components 1.0
21
    \inqmlmodule Ubuntu.Components 1.1
1881
22
    \ingroup ubuntu
22
    \ingroup ubuntu
1882
23
    \brief Component to represent a single tab in a \l Tabs environment.
23
    \brief Component to represent a single tab in a \l Tabs environment.
1883
24
24
1884
25
25
1885
=== modified file 'modules/Ubuntu/Components/TabBar.qml'
1886
--- modules/Ubuntu/Components/TabBar.qml	2014-04-23 15:20:44 +0000
1887
+++ modules/Ubuntu/Components/TabBar.qml	2014-04-25 13:00:38 +0000
1888
@@ -18,7 +18,7 @@
1889
18
18
1890
19
/*!
19
/*!
1891
20
    \qmltype TabBar
20
    \qmltype TabBar
1893
21
    \inqmlmodule Ubuntu.Components 1.0
21
    \inqmlmodule Ubuntu.Components 1.1
1894
22
    \ingroup ubuntu
22
    \ingroup ubuntu
1895
23
    \brief Tab bar that will be shown in the header when \l Tabs is active.
23
    \brief Tab bar that will be shown in the header when \l Tabs is active.
1896
24
        This component does not need to be instantiated by the developer, it is
24
        This component does not need to be instantiated by the developer, it is
1897
25
25
1898
=== modified file 'modules/Ubuntu/Components/Tabs.qml'
1899
--- modules/Ubuntu/Components/Tabs.qml	2014-04-23 22:36:54 +0000
1900
+++ modules/Ubuntu/Components/Tabs.qml	2014-04-25 13:00:38 +0000
1901
@@ -18,7 +18,7 @@
1902
18
18
1903
19
/*!
19
/*!
1904
20
    \qmltype Tabs
20
    \qmltype Tabs
1906
21
    \inqmlmodule Ubuntu.Components 1.0
21
    \inqmlmodule Ubuntu.Components 1.1
1907
22
    \ingroup ubuntu
22
    \ingroup ubuntu
1908
23
    \brief The Tabs class provides an environment where multible \l Tab
23
    \brief The Tabs class provides an environment where multible \l Tab
1909
24
    children can be added, and the user is presented with a tab
24
    children can be added, and the user is presented with a tab
1910
@@ -33,7 +33,7 @@
1911
33
    Example:
33
    Example:
1912
34
    \qml
34
    \qml
1913
35
        import QtQuick 2.0
35
        import QtQuick 2.0
1915
36
        import Ubuntu.Components 1.0
36
        import Ubuntu.Components 1.1
1916
37
        import Ubuntu.Components.ListItems 1.0 as ListItem
37
        import Ubuntu.Components.ListItems 1.0 as ListItem
1917
38
38
1918
39
        MainView {
39
        MainView {
1919
@@ -104,7 +104,7 @@
1920
104
104
1921
105
    \qml
105
    \qml
1922
106
        import QtQuick 2.0
106
        import QtQuick 2.0
1924
107
        import Ubuntu.Components 1.0
107
        import Ubuntu.Components 1.1
1925
108
108
1926
109
        MainView {
109
        MainView {
1927
110
            id: mainView
110
            id: mainView
1928
111
111
1929
=== modified file 'modules/Ubuntu/Components/TextArea.qml'
1930
--- modules/Ubuntu/Components/TextArea.qml	2014-04-23 10:01:42 +0000
1931
+++ modules/Ubuntu/Components/TextArea.qml	2014-04-25 13:00:38 +0000
1932
@@ -20,7 +20,7 @@
1933
20
20
1934
21
/*!
21
/*!
1935
22
    \qmltype TextArea
22
    \qmltype TextArea
1937
23
    \inqmlmodule Ubuntu.Components 1.0
23
    \inqmlmodule Ubuntu.Components 1.1
1938
24
    \ingroup ubuntu
24
    \ingroup ubuntu
1939
25
    \brief The TextArea item displays a block of editable, scrollable, formatted
25
    \brief The TextArea item displays a block of editable, scrollable, formatted
1940
26
    text.
26
    text.
1941
27
27
1942
=== modified file 'modules/Ubuntu/Components/TextField.qml'
1943
--- modules/Ubuntu/Components/TextField.qml	2014-04-23 10:01:42 +0000
1944
+++ modules/Ubuntu/Components/TextField.qml	2014-04-25 13:00:38 +0000
1945
@@ -20,7 +20,7 @@
1946
20
20
1947
21
/*!
21
/*!
1948
22
    \qmltype TextField
22
    \qmltype TextField
1950
23
    \inqmlmodule Ubuntu.Components 1.0
23
    \inqmlmodule Ubuntu.Components 1.1
1951
24
    \ingroup ubuntu
24
    \ingroup ubuntu
1952
25
    \brief The TextField element displays a single line of editable plain text.
25
    \brief The TextField element displays a single line of editable plain text.
1953
26
    Input constraints can be set through validator or inputMask. Setting echoMode
26
    Input constraints can be set through validator or inputMask. Setting echoMode
1954
@@ -529,7 +529,7 @@
1955
529
529
1956
530
      \qml
530
      \qml
1957
531
      import QtQuick 2.0
531
      import QtQuick 2.0
1959
532
      import Ubuntu.Components 1.0
532
      import Ubuntu.Components 1.1
1960
533
      TextField{
533
      TextField{
1961
534
          validator: IntValidator{bottom: 11; top: 31;}
534
          validator: IntValidator{bottom: 11; top: 31;}
1962
535
          focus: true
535
          focus: true
1963
536
536
1964
=== modified file 'modules/Ubuntu/Components/TextInputPopover.qml'
1965
--- modules/Ubuntu/Components/TextInputPopover.qml	2014-04-20 19:25:12 +0000
1966
+++ modules/Ubuntu/Components/TextInputPopover.qml	2014-04-25 13:00:38 +0000
1967
@@ -15,7 +15,7 @@
1968
15
 */
15
 */
1969
16
16
1970
17
import QtQuick 2.0
17
import QtQuick 2.0
1972
18
import Ubuntu.Components 1.0 as Toolkit
18
import Ubuntu.Components 1.1 as Toolkit
1973
19
import "Popups" 0.1
19
import "Popups" 0.1
1974
20
20
1975
21
ActionSelectionPopover {
21
ActionSelectionPopover {
1976
22
22
1977
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/ActivityIndicatorStyle.qml'
1978
--- modules/Ubuntu/Components/Themes/Ambiance/ActivityIndicatorStyle.qml	2014-04-20 19:25:12 +0000
1979
+++ modules/Ubuntu/Components/Themes/Ambiance/ActivityIndicatorStyle.qml	2014-04-25 13:00:38 +0000
1980
@@ -15,7 +15,7 @@
1981
15
 */
15
 */
1982
16
16
1983
17
import QtQuick 2.0
17
import QtQuick 2.0
1985
18
import Ubuntu.Components 1.0
18
import Ubuntu.Components 1.1
1986
19
19
1987
20
Image {
20
Image {
1988
21
    id: container
21
    id: container
1989
22
22
1990
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/BubbleShape.qml'
1991
--- modules/Ubuntu/Components/Themes/Ambiance/BubbleShape.qml	2014-04-20 19:25:12 +0000
1992
+++ modules/Ubuntu/Components/Themes/Ambiance/BubbleShape.qml	2014-04-25 13:00:38 +0000
1993
@@ -15,7 +15,7 @@
1994
15
 */
15
 */
1995
16
16
1996
17
import QtQuick 2.0
17
import QtQuick 2.0
1998
18
import Ubuntu.Components 1.0
18
import Ubuntu.Components 1.1
1999
19
19
2000
20
Item {
20
Item {
2001
21
    id: bubbleShape
21
    id: bubbleShape
2002
22
22
2003
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/ButtonForeground.qml'
2004
--- modules/Ubuntu/Components/Themes/Ambiance/ButtonForeground.qml	2014-04-20 19:25:12 +0000
2005
+++ modules/Ubuntu/Components/Themes/Ambiance/ButtonForeground.qml	2014-04-25 13:00:38 +0000
2006
@@ -17,7 +17,7 @@
2007
17
 */
17
 */
2008
18
18
2009
19
import QtQuick 2.0
19
import QtQuick 2.0
2011
20
import Ubuntu.Components 1.0
20
import Ubuntu.Components 1.1
2012
21
21
2013
22
Item {
22
Item {
2014
23
    id: buttonForeground
23
    id: buttonForeground
2015
@@ -30,6 +30,7 @@
2016
30
    property real spacing
30
    property real spacing
2017
31
    property bool hasIcon: iconSource != ""
31
    property bool hasIcon: iconSource != ""
2018
32
    property bool hasText: text != ""
32
    property bool hasText: text != ""
2019
33
    property alias font: label.font
2020
33
34
2021
34
    opacity: enabled ? 1.0 : 0.5
35
    opacity: enabled ? 1.0 : 0.5
2022
35
    implicitHeight: Math.max(icon.height, label.height)
36
    implicitHeight: Math.max(icon.height, label.height)
2023
36
37
2024
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/ButtonStyle.qml'
2025
--- modules/Ubuntu/Components/Themes/Ambiance/ButtonStyle.qml	2014-04-20 19:25:12 +0000
2026
+++ modules/Ubuntu/Components/Themes/Ambiance/ButtonStyle.qml	2014-04-25 13:00:38 +0000
2027
@@ -17,7 +17,7 @@
2028
17
 */
17
 */
2029
18
18
2030
19
import QtQuick 2.0
19
import QtQuick 2.0
2032
20
import Ubuntu.Components 1.0
20
import Ubuntu.Components 1.1
2033
21
21
2034
22
Item {
22
Item {
2035
23
    id: buttonStyle
23
    id: buttonStyle
2036
@@ -26,7 +26,16 @@
2037
26
    property real minimumWidth: units.gu(10)
26
    property real minimumWidth: units.gu(10)
2038
27
    property real horizontalPadding: units.gu(1)
27
    property real horizontalPadding: units.gu(1)
2039
28
    property color defaultColor: UbuntuColors.orange
28
    property color defaultColor: UbuntuColors.orange
2040
29
    property font defaultFont: Qt.font({family: "Ubuntu", pixelSize: FontUtils.sizeToPixels("medium")})
2041
29
    property Gradient defaultGradient
30
    property Gradient defaultGradient
2042
31
    property real buttonFaceOffset: 0
2043
32
    /*!
2044
33
      The property overrides the button's default background with an item. This
2045
34
      item can be used by derived styles to reuse the ButtonStyle and override
2046
35
      the default coloured background with an image or any other drawing.
2047
36
      The default value is null.
2048
37
      */
2049
38
    property Item backgroundSource: null
2050
30
39
2051
31
    width: button.width
40
    width: button.width
2052
32
    height: button.height
41
    height: button.height
2053
@@ -36,12 +45,22 @@
2054
36
    LayoutMirroring.enabled: Qt.application.layoutDirection == Qt.RightToLeft
45
    LayoutMirroring.enabled: Qt.application.layoutDirection == Qt.RightToLeft
2055
37
    LayoutMirroring.childrenInherit: true
46
    LayoutMirroring.childrenInherit: true
2056
38
47
2057
48
    /*! \internal */
2058
49
    // Color properties in a JS ternary operator don't work as expected in
2059
50
    // QML because it overwrites alpha values with 1. A workaround is to use
2060
51
    // Qt.rgba(). For more information, see
2061
52
    // https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1197802 and
2062
53
    // https://bugreports.qt-project.org/browse/QTBUG-32238.
2063
54
    function __colorHack(color) { return Qt.rgba(color.r, color.g, color.b, color.a); }
2064
55
2065
56
2066
39
    /* The proxy is necessary because Gradient.stops and GradientStop.color are
57
    /* The proxy is necessary because Gradient.stops and GradientStop.color are
2067
40
       non-NOTIFYable properties. They cannot be written to so it is fine but
58
       non-NOTIFYable properties. They cannot be written to so it is fine but
2068
41
       the proxy avoids the warnings.
59
       the proxy avoids the warnings.
2069
42
    */
60
    */
2070
61
    property QtObject gradientProxy: gradientProxyObject
2071
43
    QtObject {
62
    QtObject {
2073
44
        id: gradientProxy
63
        id: gradientProxyObject
2074
45
        property color topColor
64
        property color topColor
2075
46
        property color bottomColor
65
        property color bottomColor
2076
47
66
2077
@@ -67,16 +86,11 @@
2078
67
        id: background
86
        id: background
2079
68
        anchors.fill: parent
87
        anchors.fill: parent
2080
69
        borderSource: "radius_idle.sci"
88
        borderSource: "radius_idle.sci"
2082
70
        visible: color.a != 0.0
89
        visible: (color.a != 0.0) || backgroundSource
2083
90
        image: backgroundSource
2084
71
91
2093
72
        // Color properties in a JS ternary operator don't work as expected in
92
        color: backgroundSource ? "#00000000" : (isGradient ? __colorHack(gradientProxy.topColor) : __colorHack(button.color))
2094
73
        // QML because it overwrites alpha values with 1. A workaround is to use
93
        gradientColor: backgroundSource ? "#00000000" : (isGradient ? __colorHack(gradientProxy.bottomColor) : __colorHack(button.color))
2087
74
        // Qt.rgba(). For more information, see
2088
75
        // https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1197802 and
2089
76
        // https://bugreports.qt-project.org/browse/QTBUG-32238.
2090
77
        function colorHack(color) { return Qt.rgba(color.r, color.g, color.b, color.a); }
2091
78
        color: isGradient ? colorHack(gradientProxy.topColor) : colorHack(button.color)
2092
79
        gradientColor: isGradient ? colorHack(gradientProxy.bottomColor) : colorHack(button.color)
2095
80
    }
94
    }
2096
81
95
2097
82
    UbuntuShape {
96
    UbuntuShape {
2098
@@ -98,7 +112,10 @@
2099
98
    ButtonForeground {
112
    ButtonForeground {
2100
99
        id: foreground
113
        id: foreground
2101
100
        width: parent.width - 2*horizontalPadding
114
        width: parent.width - 2*horizontalPadding
2103
101
        anchors.centerIn: parent
115
        anchors {
2104
116
            centerIn: parent
2105
117
            horizontalCenterOffset: buttonFaceOffset
2106
118
        }
2107
102
        text: button.text
119
        text: button.text
2108
103
        /* Pick either a clear or dark text color depending on the luminance of the
120
        /* Pick either a clear or dark text color depending on the luminance of the
2109
104
           background color to maintain good contrast (works in most cases)
121
           background color to maintain good contrast (works in most cases)
2110
@@ -107,6 +124,7 @@
2111
107
        iconSource: button.iconSource
124
        iconSource: button.iconSource
2112
108
        iconPosition: button.iconPosition
125
        iconPosition: button.iconPosition
2113
109
        iconSize: units.gu(3)
126
        iconSize: units.gu(3)
2114
127
        font: button.font
2115
110
        spacing: horizontalPadding
128
        spacing: horizontalPadding
2116
111
        transformOrigin: Item.Top
129
        transformOrigin: Item.Top
2117
112
        scale: button.pressed ? 0.98 : 1.0
130
        scale: button.pressed ? 0.98 : 1.0
2118
113
131
2119
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/CheckBoxStyle.qml'
2120
--- modules/Ubuntu/Components/Themes/Ambiance/CheckBoxStyle.qml	2014-04-20 19:25:12 +0000
2121
+++ modules/Ubuntu/Components/Themes/Ambiance/CheckBoxStyle.qml	2014-04-25 13:00:38 +0000
2122
@@ -15,7 +15,7 @@
2123
15
 */
15
 */
2124
16
16
2125
17
import QtQuick 2.0
17
import QtQuick 2.0
2127
18
import Ubuntu.Components 1.0
18
import Ubuntu.Components 1.1
2128
19
19
2129
20
Item {
20
Item {
2130
21
    id: checkBoxStyle
21
    id: checkBoxStyle
2131
22
22
2132
=== added file 'modules/Ubuntu/Components/Themes/Ambiance/ComboButtonStyle.qml'
2133
--- modules/Ubuntu/Components/Themes/Ambiance/ComboButtonStyle.qml	1970-01-01 00:00:00 +0000
2134
+++ modules/Ubuntu/Components/Themes/Ambiance/ComboButtonStyle.qml	2014-04-25 13:00:38 +0000
2135
@@ -0,0 +1,243 @@
2136
1
/*
2137
2
 * Copyright 2014 Canonical Ltd.
2138
3
 *
2139
4
 * This program is free software; you can redistribute it and/or modify
2140
5
 * it under the terms of the GNU Lesser General Public License as published by
2141
6
 * the Free Software Foundation; version 3.
2142
7
 *
2143
8
 * This program is distributed in the hope that it will be useful,
2144
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
2145
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
2146
11
 * GNU Lesser General Public License for more details.
2147
12
 *
2148
13
 * You should have received a copy of the GNU Lesser General Public License
2149
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
2150
15
 */
2151
16
2152
17
import QtQuick 2.0
2153
18
import Ubuntu.Components 1.1
2154
19
2155
20
/*!
2156
21
    \qmltype ComboButton
2157
22
    \ingroup style-api
2158
23
    \brief ComboButton style API.
2159
24
2160
25
    The component defines the style of the ComboButton component.
2161
26
  */
2162
27
Item {
2163
28
    id: comboStyle
2164
29
2165
30
    /*!
2166
31
      Width of the drop down button.
2167
32
      */
2168
33
    property real dropDownWidth: units.gu(5)
2169
34
2170
35
    /*!
2171
36
      Width of the dropdown button separator.
2172
37
      */
2173
38
    property real dropDownSeparatorWidth: units.dp(2)
2174
39
2175
40
    /*!
2176
41
      Distance between the combo list and the main button.
2177
42
      */
2178
43
    property real comboListMargin: units.gu(0.8)
2179
44
2180
45
    /*!
2181
46
      The item which will holds the combo list data. Implementations can point both
2182
47
      this \l comboListPanel to the same component, however separate items should be
2183
48
      used if a gap between the panel and the content is required.
2184
49
      See Ambiance theme.
2185
50
      */
2186
51
    property Item comboListHolder: comboListContent
2187
52
2188
53
    /*!
2189
54
      The item pointing to the panel holding the combo list and additional design
2190
55
      artifacts. It is used by the component to drive the expansion size.
2191
56
      */
2192
57
    property Item comboListPanel: panelItem
2193
58
2194
59
    /*!
2195
60
      \qmlproperty color defaultColor
2196
61
      Default color for the main button.
2197
62
      */
2198
63
    property alias defaultColor: mainButton.defaultColor
2199
64
2200
65
    /*!
2201
66
      \qmlproperty Gradient defaultGradient
2202
67
      Default gradient for the main button.
2203
68
      */
2204
69
    property alias defaultGradient: mainButton.defaultGradient
2205
70
2206
71
    /*!
2207
72
      Default color for the dropdown button when released.
2208
73
      */
2209
74
    property color defaultDropdownColor: __combo.expanded ? Qt.rgba(0, 0, 0, 0.05) : defaultColor
2210
75
    /*!
2211
76
      Default button face font.
2212
77
      */
2213
78
    property alias defaultFont: mainButton.defaultFont
2214
79
2215
80
2216
81
    width: __combo.width
2217
82
    height: __combo.collapsedHeight
2218
83
2219
84
    /*! \internal */
2220
85
    property ComboButton __combo: styledItem
2221
86
2222
87
    implicitWidth: mainButton.implicitWidth
2223
88
    implicitHeight: mainButton.implicitHeight
2224
89
2225
90
    LayoutMirroring.enabled: Qt.application.layoutDirection == Qt.RightToLeft
2226
91
    LayoutMirroring.childrenInherit: true
2227
92
2228
93
    ButtonStyle {
2229
94
        id: mainButton
2230
95
        anchors {
2231
96
            left: parent.left
2232
97
            top: parent.top
2233
98
            right: parent.right
2234
99
        }
2235
100
        height: __combo.collapsedHeight
2236
101
        // overrides
2237
102
        backgroundSource: comboFace
2238
103
        buttonFaceOffset: -dropDownWidth/2 - dropDownSeparatorWidth
2239
104
        horizontalPadding: units.gu(4) - dropDownSeparatorWidth
2240
105
        minimumWidth: units.gu(36)
2241
106
2242
107
        // FIXME: use hardcoded color while we get the theme palette updated
2243
108
        defaultColor: "#b2b2b2"
2244
109
        defaultGradient: null
2245
110
2246
111
        // button face
2247
112
        ShaderEffectSource {
2248
113
            id: comboFace
2249
114
            sourceItem: content
2250
115
            hideSource: true
2251
116
            // FIXME: visible: false prevents rendering so make it a nearly
2252
117
            // transparent 1x1 pixel instead
2253
118
            opacity: 0.01
2254
119
            width: 1
2255
120
            height: 1
2256
121
        }
2257
122
2258
123
        Item {
2259
124
            id: content
2260
125
            width: mainButton.width
2261
126
            height: mainButton.height
2262
127
2263
128
            Rectangle {
2264
129
                anchors {
2265
130
                    fill: parent
2266
131
                    rightMargin: comboStyle.dropDownSeparatorWidth + comboStyle.dropDownWidth
2267
132
                }
2268
133
                color: __combo.color
2269
134
                gradient: mainButton.isGradient ? __combo.gradient : null
2270
135
            }
2271
136
2272
137
            // distancer
2273
138
            Item {
2274
139
                anchors {
2275
140
                    right: dropDownButton.right
2276
141
                    top: parent.top
2277
142
                    bottom: parent.bottom
2278
143
                }
2279
144
                width: comboStyle.dropDownSeparatorWidth
2280
145
            }
2281
146
2282
147
            Rectangle {
2283
148
                id: dropDownButton
2284
149
                objectName: "combobutton_dropdown_visuals"
2285
150
                anchors {
2286
151
                    right: parent.right
2287
152
                    top: parent.top
2288
153
                    bottom: parent.bottom
2289
154
                }
2290
155
                width: comboStyle.dropDownWidth
2291
156
                color: mainButton.__colorHack(__combo.dropdownColor)
2292
157
                Image {
2293
158
                    source: "artwork/chevron.png"
2294
159
                    anchors.centerIn: parent
2295
160
                    rotation: __combo.expanded ? -90 : 90
2296
161
                }
2297
162
            }
2298
163
        }
2299
164
    }
2300
165
2301
166
    Item {
2302
167
        id: panelItem
2303
168
        objectName: "combobutton_combopanel"
2304
169
        anchors {
2305
170
            left: parent.left
2306
171
            top: mainButton.bottom
2307
172
            right: parent.right
2308
173
        }
2309
174
        opacity: __combo.expanded && (__combo.comboList.length > 0)? 1.0 : 0.0
2310
175
2311
176
        ShaderEffectSource {
2312
177
            id: listContent
2313
178
            sourceItem: comboListContent
2314
179
            hideSource: true
2315
180
            // FIXME: visible: false prevents rendering so make it a nearly
2316
181
            // transparent 1x1 pixel instead
2317
182
            opacity: 0.01
2318
183
            width: 1
2319
184
            height: 1
2320
185
        }
2321
186
        Rectangle {
2322
187
            id: comboListContent
2323
188
            anchors {
2324
189
                fill: parent
2325
190
                topMargin: comboListMargin
2326
191
            }
2327
192
            clip: true
2328
193
            color: mainButton.__colorHack(__combo.dropdownColor)
2329
194
        }
2330
195
2331
196
        BorderImage {
2332
197
            id: shadow
2333
198
            anchors {
2334
199
                fill: parent
2335
200
                leftMargin: -units.gu(0.5)
2336
201
                topMargin: comboListMargin - units.gu(0.5)
2337
202
                rightMargin: -units.gu(0.5)
2338
203
                bottomMargin: -units.gu(0.5)
2339
204
            }
2340
205
            source: "artwork/bubble_shadow.sci"
2341
206
        }
2342
207
        UbuntuShape {
2343
208
            id: shape
2344
209
            anchors {
2345
210
                fill: parent
2346
211
                topMargin: comboListMargin
2347
212
            }
2348
213
            visible: true
2349
214
            borderSource: "radius_idle.sci"
2350
215
            image: listContent
2351
216
        }
2352
217
2353
218
        Image {
2354
219
            source: "artwork/bubble_arrow.png"
2355
220
            rotation: 180
2356
221
            anchors {
2357
222
                bottom: shape.top
2358
223
                bottomMargin: -1
2359
224
                right: parent.right
2360
225
                rightMargin: dropDownWidth / 2 - units.gu(0.5)
2361
226
            }
2362
227
2363
228
        }
2364
229
2365
230
        Behavior on height {
2366
231
            NumberAnimation {
2367
232
                duration: UbuntuAnimation.FastDuration
2368
233
                easing: UbuntuAnimation.StandardEasing
2369
234
            }
2370
235
        }
2371
236
        Behavior on opacity {
2372
237
            NumberAnimation {
2373
238
                duration: UbuntuAnimation.FastDuration
2374
239
                easing: UbuntuAnimation.StandardEasing
2375
240
            }
2376
241
        }
2377
242
    }
2378
243
}
2379
0
244
2380
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/DatePickerStyle.qml'
2381
--- modules/Ubuntu/Components/Themes/Ambiance/DatePickerStyle.qml	2014-04-20 19:25:12 +0000
2382
+++ modules/Ubuntu/Components/Themes/Ambiance/DatePickerStyle.qml	2014-04-25 13:00:38 +0000
2383
@@ -15,7 +15,7 @@
2384
15
 */
15
 */
2385
16
16
2386
17
import QtQuick 2.0
17
import QtQuick 2.0
2388
18
import Ubuntu.Components 1.0
18
import Ubuntu.Components 1.1
2389
19
import Ubuntu.Components.ListItems 1.0
19
import Ubuntu.Components.ListItems 1.0
2390
20
20
2391
21
Item {
21
Item {
2392
22
22
2393
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/DialerHandStyle.qml'
2394
--- modules/Ubuntu/Components/Themes/Ambiance/DialerHandStyle.qml	2014-04-20 19:25:12 +0000
2395
+++ modules/Ubuntu/Components/Themes/Ambiance/DialerHandStyle.qml	2014-04-25 13:00:38 +0000
2396
@@ -15,7 +15,7 @@
2397
15
 */
15
 */
2398
16
16
2399
17
import QtQuick 2.0
17
import QtQuick 2.0
2401
18
import Ubuntu.Components 1.0
18
import Ubuntu.Components 1.1
2402
19
19
2403
20
Item {
20
Item {
2404
21
    // style API
21
    // style API
2405
22
22
2406
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/DialerStyle.qml'
2407
--- modules/Ubuntu/Components/Themes/Ambiance/DialerStyle.qml	2014-04-20 19:25:12 +0000
2408
+++ modules/Ubuntu/Components/Themes/Ambiance/DialerStyle.qml	2014-04-25 13:00:38 +0000
2409
@@ -15,7 +15,7 @@
2410
15
 */
15
 */
2411
16
16
2412
17
import QtQuick 2.0
17
import QtQuick 2.0
2414
18
import Ubuntu.Components 1.0
18
import Ubuntu.Components 1.1
2415
19
import QtGraphicalEffects 1.0
19
import QtGraphicalEffects 1.0
2416
20
20
2417
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
2418
22
22
2419
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/DialogForegroundStyle.qml'
2420
--- modules/Ubuntu/Components/Themes/Ambiance/DialogForegroundStyle.qml	2014-04-20 19:25:12 +0000
2421
+++ modules/Ubuntu/Components/Themes/Ambiance/DialogForegroundStyle.qml	2014-04-25 13:00:38 +0000
2422
@@ -15,7 +15,7 @@
2423
15
 */
15
 */
2424
16
16
2425
17
import QtQuick 2.0
17
import QtQuick 2.0
2427
18
import Ubuntu.Components 1.0
18
import Ubuntu.Components 1.1
2428
19
19
2429
20
Item {
20
Item {
2430
21
    id: dialogForegroundStyle
21
    id: dialogForegroundStyle
2431
22
22
2432
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/HeaderStyle.qml'
2433
--- modules/Ubuntu/Components/Themes/Ambiance/HeaderStyle.qml	2014-04-23 18:14:56 +0000
2434
+++ modules/Ubuntu/Components/Themes/Ambiance/HeaderStyle.qml	2014-04-25 13:00:38 +0000
2435
@@ -14,7 +14,7 @@
2436
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/>.
2437
15
 */
15
 */
2438
16
import QtQuick 2.0
16
import QtQuick 2.0
2440
17
import Ubuntu.Components 1.0
17
import Ubuntu.Components 1.1
2441
18
18
2442
19
Item {
19
Item {
2443
20
    id: headerStyle
20
    id: headerStyle
2444
21
21
2445
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/ListItemOptionSelectorStyle.qml'
2446
--- modules/Ubuntu/Components/Themes/Ambiance/ListItemOptionSelectorStyle.qml	2014-04-20 19:25:12 +0000
2447
+++ modules/Ubuntu/Components/Themes/Ambiance/ListItemOptionSelectorStyle.qml	2014-04-25 13:00:38 +0000
2448
@@ -16,7 +16,7 @@
2449
16
 */
16
 */
2450
17
17
2451
18
import QtQuick 2.0
18
import QtQuick 2.0
2453
19
import Ubuntu.Components 1.0
19
import Ubuntu.Components 1.1
2454
20
20
2455
21
Item {
21
Item {
2456
22
    id: ambianceStyle
22
    id: ambianceStyle
2457
23
23
2458
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/MainViewStyle.qml'
2459
--- modules/Ubuntu/Components/Themes/Ambiance/MainViewStyle.qml	2014-04-20 19:25:12 +0000
2460
+++ modules/Ubuntu/Components/Themes/Ambiance/MainViewStyle.qml	2014-04-25 13:00:38 +0000
2461
@@ -14,7 +14,7 @@
2462
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/>.
2463
15
 */
15
 */
2464
16
import QtQuick 2.0
16
import QtQuick 2.0
2466
17
import Ubuntu.Components 1.0
17
import Ubuntu.Components 1.1
2467
18
18
2468
19
Item {
19
Item {
2469
20
    // styling properties
20
    // styling properties
2470
21
21
2471
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/OptionSelectorStyle.qml'
2472
--- modules/Ubuntu/Components/Themes/Ambiance/OptionSelectorStyle.qml	2014-04-20 19:25:12 +0000
2473
+++ modules/Ubuntu/Components/Themes/Ambiance/OptionSelectorStyle.qml	2014-04-25 13:00:38 +0000
2474
@@ -16,7 +16,7 @@
2475
16
 */
16
 */
2476
17
17
2477
18
import QtQuick 2.0
18
import QtQuick 2.0
2479
19
import Ubuntu.Components 1.0
19
import Ubuntu.Components 1.1
2480
20
20
2481
21
Item {
21
Item {
2482
22
    id: ambianceStyle
22
    id: ambianceStyle
2483
23
23
2484
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/PickerDelegateStyle.qml'
2485
--- modules/Ubuntu/Components/Themes/Ambiance/PickerDelegateStyle.qml	2014-04-20 19:25:12 +0000
2486
+++ modules/Ubuntu/Components/Themes/Ambiance/PickerDelegateStyle.qml	2014-04-25 13:00:38 +0000
2487
@@ -15,7 +15,7 @@
2488
15
 */
15
 */
2489
16
16
2490
17
import QtQuick 2.0
17
import QtQuick 2.0
2492
18
import Ubuntu.Components 1.0
18
import Ubuntu.Components 1.1
2493
19
19
2494
20
Item {
20
Item {
2495
21
    property real minFade: 0.2
21
    property real minFade: 0.2
2496
22
22
2497
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/PickerStyle.qml'
2498
--- modules/Ubuntu/Components/Themes/Ambiance/PickerStyle.qml	2014-04-20 19:25:12 +0000
2499
+++ modules/Ubuntu/Components/Themes/Ambiance/PickerStyle.qml	2014-04-25 13:00:38 +0000
2500
@@ -15,7 +15,7 @@
2501
15
 */
15
 */
2502
16
16
2503
17
import QtQuick 2.0
17
import QtQuick 2.0
2505
18
import Ubuntu.Components 1.0
18
import Ubuntu.Components 1.1
2506
19
import Ubuntu.Components.ListItems 1.0
19
import Ubuntu.Components.ListItems 1.0
2507
20
20
2508
21
Item {
21
Item {
2509
22
22
2510
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/ProgressBarStyle.qml'
2511
--- modules/Ubuntu/Components/Themes/Ambiance/ProgressBarStyle.qml	2014-04-20 19:25:12 +0000
2512
+++ modules/Ubuntu/Components/Themes/Ambiance/ProgressBarStyle.qml	2014-04-25 13:00:38 +0000
2513
@@ -15,7 +15,7 @@
2514
15
 */
15
 */
2515
16
16
2516
17
import QtQuick 2.0
17
import QtQuick 2.0
2518
18
import Ubuntu.Components 1.0
18
import Ubuntu.Components 1.1
2519
19
19
2520
20
Item {
20
Item {
2521
21
    id: progressBarStyle
21
    id: progressBarStyle
2522
22
22
2523
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/ProgressionVisualStyle.qml'
2524
--- modules/Ubuntu/Components/Themes/Ambiance/ProgressionVisualStyle.qml	2014-04-20 19:25:12 +0000
2525
+++ modules/Ubuntu/Components/Themes/Ambiance/ProgressionVisualStyle.qml	2014-04-25 13:00:38 +0000
2526
@@ -15,7 +15,7 @@
2527
15
 */
15
 */
2528
16
16
2529
17
import QtQuick 2.0
17
import QtQuick 2.0
2531
18
import Ubuntu.Components 1.0
18
import Ubuntu.Components 1.1
2532
19
19
2533
20
Item {
20
Item {
2534
21
    id: progressionVisualStyle
21
    id: progressionVisualStyle
2535
22
22
2536
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/ScrollbarStyle.qml'
2537
--- modules/Ubuntu/Components/Themes/Ambiance/ScrollbarStyle.qml	2014-04-20 19:25:12 +0000
2538
+++ modules/Ubuntu/Components/Themes/Ambiance/ScrollbarStyle.qml	2014-04-25 13:00:38 +0000
2539
@@ -15,7 +15,7 @@
2540
15
 */
15
 */
2541
16
16
2542
17
import QtQuick 2.0
17
import QtQuick 2.0
2544
18
import Ubuntu.Components 1.0
18
import Ubuntu.Components 1.1
2545
19
19
2546
20
/*
20
/*
2547
21
  The visuals handle both active and passive modes. This behavior is driven yet by
21
  The visuals handle both active and passive modes. This behavior is driven yet by
2548
22
22
2549
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/SelectionCursorStyle.qml'
2550
--- modules/Ubuntu/Components/Themes/Ambiance/SelectionCursorStyle.qml	2014-04-20 19:25:12 +0000
2551
+++ modules/Ubuntu/Components/Themes/Ambiance/SelectionCursorStyle.qml	2014-04-25 13:00:38 +0000
2552
@@ -15,7 +15,7 @@
2553
15
 */
15
 */
2554
16
16
2555
17
import QtQuick 2.0
17
import QtQuick 2.0
2557
18
import Ubuntu.Components 1.0
18
import Ubuntu.Components 1.1
2558
19
19
2559
20
EditorCursorStyle {
20
EditorCursorStyle {
2560
21
    id: cursor
21
    id: cursor
2561
22
22
2562
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/SheetForegroundStyle.qml'
2563
--- modules/Ubuntu/Components/Themes/Ambiance/SheetForegroundStyle.qml	2014-04-20 19:25:12 +0000
2564
+++ modules/Ubuntu/Components/Themes/Ambiance/SheetForegroundStyle.qml	2014-04-25 13:00:38 +0000
2565
@@ -15,7 +15,7 @@
2566
15
 */
15
 */
2567
16
16
2568
17
import QtQuick 2.0
17
import QtQuick 2.0
2570
18
import Ubuntu.Components 1.0
18
import Ubuntu.Components 1.1
2571
19
19
2572
20
Item {
20
Item {
2573
21
    id: visuals
21
    id: visuals
2574
22
22
2575
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/SliderStyle.qml'
2576
--- modules/Ubuntu/Components/Themes/Ambiance/SliderStyle.qml	2014-04-20 19:25:12 +0000
2577
+++ modules/Ubuntu/Components/Themes/Ambiance/SliderStyle.qml	2014-04-25 13:00:38 +0000
2578
@@ -15,7 +15,7 @@
2579
15
 */
15
 */
2580
16
16
2581
17
import QtQuick 2.0
17
import QtQuick 2.0
2583
18
import Ubuntu.Components 1.0
18
import Ubuntu.Components 1.1
2584
19
19
2585
20
/*
20
/*
2586
21
  The default slider style consists of a bar and a thumb shape.
21
  The default slider style consists of a bar and a thumb shape.
2587
22
22
2588
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/SwitchStyle.qml'
2589
--- modules/Ubuntu/Components/Themes/Ambiance/SwitchStyle.qml	2014-04-20 19:25:12 +0000
2590
+++ modules/Ubuntu/Components/Themes/Ambiance/SwitchStyle.qml	2014-04-25 13:00:38 +0000
2591
@@ -15,7 +15,7 @@
2592
15
 */
15
 */
2593
16
16
2594
17
import QtQuick 2.0
17
import QtQuick 2.0
2596
18
import Ubuntu.Components 1.0
18
import Ubuntu.Components 1.1
2597
19
19
2598
20
Item {
20
Item {
2599
21
    id: switchStyle
21
    id: switchStyle
2600
22
22
2601
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/TabBarStyle.qml'
2602
--- modules/Ubuntu/Components/Themes/Ambiance/TabBarStyle.qml	2014-04-23 15:20:44 +0000
2603
+++ modules/Ubuntu/Components/Themes/Ambiance/TabBarStyle.qml	2014-04-25 13:00:38 +0000
2604
@@ -15,7 +15,7 @@
2605
15
 */
15
 */
2606
16
16
2607
17
import QtQuick 2.0
17
import QtQuick 2.0
2609
18
import Ubuntu.Components 1.0
18
import Ubuntu.Components 1.1
2610
19
19
2611
20
Item {
20
Item {
2612
21
    id: tabBarStyle
21
    id: tabBarStyle
2613
22
22
2614
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/TextAreaStyle.qml'
2615
--- modules/Ubuntu/Components/Themes/Ambiance/TextAreaStyle.qml	2014-04-23 10:01:42 +0000
2616
+++ modules/Ubuntu/Components/Themes/Ambiance/TextAreaStyle.qml	2014-04-25 13:00:38 +0000
2617
@@ -15,7 +15,7 @@
2618
15
 */
15
 */
2619
16
16
2620
17
import QtQuick 2.0
17
import QtQuick 2.0
2622
18
import Ubuntu.Components 1.0
18
import Ubuntu.Components 1.1
2623
19
19
2624
20
// frame
20
// frame
2625
21
Item {
21
Item {
2626
22
22
2627
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/ToolbarButtonStyle.qml'
2628
--- modules/Ubuntu/Components/Themes/Ambiance/ToolbarButtonStyle.qml	2014-04-20 19:25:12 +0000
2629
+++ modules/Ubuntu/Components/Themes/Ambiance/ToolbarButtonStyle.qml	2014-04-25 13:00:38 +0000
2630
@@ -15,7 +15,7 @@
2631
15
 */
15
 */
2632
16
16
2633
17
import QtQuick 2.0
17
import QtQuick 2.0
2635
18
import Ubuntu.Components 1.0
18
import Ubuntu.Components 1.1
2636
19
19
2637
20
Item {
20
Item {
2638
21
    id: visuals
21
    id: visuals
2639
22
22
2640
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/ToolbarStyle.qml'
2641
--- modules/Ubuntu/Components/Themes/Ambiance/ToolbarStyle.qml	2014-04-20 19:25:12 +0000
2642
+++ modules/Ubuntu/Components/Themes/Ambiance/ToolbarStyle.qml	2014-04-25 13:00:38 +0000
2643
@@ -14,7 +14,7 @@
2644
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/>.
2645
15
 */
15
 */
2646
16
import QtQuick 2.0
16
import QtQuick 2.0
2648
17
import Ubuntu.Components 1.0
17
import Ubuntu.Components 1.1
2649
18
18
2650
19
Item {
19
Item {
2651
20
    id: visuals
20
    id: visuals
2652
21
21
2653
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/qmldir'
2654
--- modules/Ubuntu/Components/Themes/Ambiance/qmldir	2014-03-07 21:09:54 +0000
2655
+++ modules/Ubuntu/Components/Themes/Ambiance/qmldir	2014-04-25 13:00:38 +0000
2656
@@ -27,3 +27,21 @@
2657
27
DialerStyle 0.1 DialerStyle.qml
27
DialerStyle 0.1 DialerStyle.qml
2658
28
DialerHandStyle 0.1 DialerHandStyle.qml
28
DialerHandStyle 0.1 DialerHandStyle.qml
2659
29
internal HighlightMagnifier HighlightMagnifier.qml
29
internal HighlightMagnifier HighlightMagnifier.qml
2660
30
2661
31
#version 1.0
2662
32
2663
33
MainViewStyle 1.0 MainViewStyle.qml
2664
34
ListItemOptionSelector 1.0 ListItemOptionSelector.qml
2665
35
OptionSelectorStyle 1.0 OptionSelectorStyle.qml
2666
36
PopoverForegroundStyle 1.0 PopoverForegroundStyle.qml
2667
37
TabBarStyle 1.0 TabBarStyle.qml
2668
38
TextAreaStyle 1.0 TextAreaStyle.qml
2669
39
TextFieldStyle 1.0 TextFieldStyle.qml
2670
40
PickerStyle 1.0 PickerStyle.qml
2671
41
DatePickerStyle 1.0 DatePickerStyle.qml
2672
42
PickerDelegateStyle 1.0 PickerDelegateStyle.qml
2673
43
DialerStyle 1.0 DialerStyle.qml
2674
44
DialerHandStyle 1.0 DialerHandStyle.qml
2675
45
2676
46
#version 1.1
2677
47
ComboButtonStyle 1.1 ComboButtonStyle.qml
2678
30
48
2679
=== modified file 'modules/Ubuntu/Components/Toolbar.qml'
2680
--- modules/Ubuntu/Components/Toolbar.qml	2014-04-20 19:25:12 +0000
2681
+++ modules/Ubuntu/Components/Toolbar.qml	2014-04-25 13:00:38 +0000
2682
@@ -19,7 +19,7 @@
2683
19
/*!
19
/*!
2684
20
    \internal
20
    \internal
2685
21
    \qmltype Toolbar
21
    \qmltype Toolbar
2687
22
    \inqmlmodule Ubuntu.Components 1.0
22
    \inqmlmodule Ubuntu.Components 1.1
2688
23
    \ingroup ubuntu
23
    \ingroup ubuntu
2689
24
    \brief Application toolbar. This class is not exposed because it will
24
    \brief Application toolbar. This class is not exposed because it will
2690
25
            be automatically added when a Page defines tools.
25
            be automatically added when a Page defines tools.
2691
26
26
2692
=== modified file 'modules/Ubuntu/Components/ToolbarButton.qml'
2693
--- modules/Ubuntu/Components/ToolbarButton.qml	2014-04-20 19:25:12 +0000
2694
+++ modules/Ubuntu/Components/ToolbarButton.qml	2014-04-25 13:00:38 +0000
2695
@@ -18,7 +18,7 @@
2696
18
18
2697
19
/*!
19
/*!
2698
20
    \qmltype ToolbarButton
20
    \qmltype ToolbarButton
2700
21
    \inqmlmodule Ubuntu.Components 1.0
21
    \inqmlmodule Ubuntu.Components 1.1
2701
22
    \ingroup ubuntu
22
    \ingroup ubuntu
2702
23
    \brief An \l ActionItem that represents a button in the toolbar.
23
    \brief An \l ActionItem that represents a button in the toolbar.
2703
24
        ToolbarButtons should be included in \l ToolbarItems to define the tools of a \l Page.
24
        ToolbarButtons should be included in \l ToolbarItems to define the tools of a \l Page.
2704
@@ -28,7 +28,7 @@
2705
28
        Example of different ways to define the toolbar button:
28
        Example of different ways to define the toolbar button:
2706
29
        \qml
29
        \qml
2707
30
        import QtQuick 2.0
30
        import QtQuick 2.0
2709
31
        import Ubuntu.Components 1.0
31
        import Ubuntu.Components 1.1
2710
32
32
2711
33
        MainView {
33
        MainView {
2712
34
            width: units.gu(50)
34
            width: units.gu(50)
2713
35
35
2714
=== modified file 'modules/Ubuntu/Components/ToolbarItems.qml'
2715
--- modules/Ubuntu/Components/ToolbarItems.qml	2014-04-20 19:25:12 +0000
2716
+++ modules/Ubuntu/Components/ToolbarItems.qml	2014-04-25 13:00:38 +0000
2717
@@ -18,7 +18,7 @@
2718
18
18
2719
19
/*!
19
/*!
2720
20
    \qmltype ToolbarItems
20
    \qmltype ToolbarItems
2722
21
    \inqmlmodule Ubuntu.Components 1.0
21
    \inqmlmodule Ubuntu.Components 1.1
2723
22
    \ingroup ubuntu
22
    \ingroup ubuntu
2724
23
    \brief Row of Items to be placed in a toolbar.
23
    \brief Row of Items to be placed in a toolbar.
2725
24
24
2726
@@ -38,7 +38,7 @@
2727
38
    be visible to the user:
38
    be visible to the user:
2728
39
    \qml
39
    \qml
2729
40
        import QtQuick 2.0
40
        import QtQuick 2.0
2731
41
        import Ubuntu.Components 1.0
41
        import Ubuntu.Components 1.1
2732
42
42
2733
43
        MainView {
43
        MainView {
2734
44
            width: units.gu(50)
44
            width: units.gu(50)
2735
@@ -70,7 +70,7 @@
2736
70
    the full height of the toolbar, and other Items you will probably want to center vertically:
70
    the full height of the toolbar, and other Items you will probably want to center vertically:
2737
71
    \qml
71
    \qml
2738
72
        import QtQuick 2.0
72
        import QtQuick 2.0
2740
73
        import Ubuntu.Components 1.0
73
        import Ubuntu.Components 1.1
2741
74
74
2742
75
        MainView {
75
        MainView {
2743
76
            width: units.gu(50)
76
            width: units.gu(50)
2744
@@ -119,7 +119,7 @@
2745
119
      visible in the toolbar, instead of the default toolbar-styled back button:
119
      visible in the toolbar, instead of the default toolbar-styled back button:
2746
120
        \qml
120
        \qml
2747
121
            import QtQuick 2.0
121
            import QtQuick 2.0
2749
122
            import Ubuntu.Components 1.0
122
            import Ubuntu.Components 1.1
2750
123
123
2751
124
            MainView {
124
            MainView {
2752
125
                width: units.gu(50)
125
                width: units.gu(50)
2753
126
126
2754
=== modified file 'modules/Ubuntu/Components/UbuntuListView.qml'
2755
--- modules/Ubuntu/Components/UbuntuListView.qml	2014-04-20 19:25:12 +0000
2756
+++ modules/Ubuntu/Components/UbuntuListView.qml	2014-04-25 13:00:38 +0000
2757
@@ -15,11 +15,11 @@
2758
15
 */
15
 */
2759
16
16
2760
17
import QtQuick 2.0
17
import QtQuick 2.0
2762
18
import Ubuntu.Components 1.0 as Toolkit
18
import Ubuntu.Components 1.1 as Toolkit
2763
19
19
2764
20
/*!
20
/*!
2765
21
    \qmltype UbuntuListView
21
    \qmltype UbuntuListView
2767
22
    \inqmlmodule Ubuntu.Components 1.0
22
    \inqmlmodule Ubuntu.Components 1.1
2768
23
    \ingroup ubuntu
23
    \ingroup ubuntu
2769
24
    \brief A ListView with special features tailored for a look and feel fitting the
24
    \brief A ListView with special features tailored for a look and feel fitting the
2770
25
    Ubuntu Touch platform.
25
    Ubuntu Touch platform.
2771
@@ -30,7 +30,7 @@
2772
30
30
2773
31
    Examples:
31
    Examples:
2774
32
    \qml
32
    \qml
2776
33
        import Ubuntu.Components 1.0
33
        import Ubuntu.Components 1.1
2777
34
        import Ubuntu.Components.ListItems 1.0 as ListItem
34
        import Ubuntu.Components.ListItems 1.0 as ListItem
2778
35
35
2779
36
        Item {
36
        Item {
2780
37
37
2781
=== modified file 'modules/Ubuntu/Components/UbuntuNumberAnimation.qml'
2782
--- modules/Ubuntu/Components/UbuntuNumberAnimation.qml	2014-04-23 09:10:47 +0000
2783
+++ modules/Ubuntu/Components/UbuntuNumberAnimation.qml	2014-04-25 13:00:38 +0000
2784
@@ -20,7 +20,7 @@
2785
20
20
2786
21
/*!
21
/*!
2787
22
    \qmltype UbuntuNumberAnimation
22
    \qmltype UbuntuNumberAnimation
2789
23
    \inqmlmodule Ubuntu.Components 1.0
23
    \inqmlmodule Ubuntu.Components 1.1
2790
24
    \ingroup ubuntu
24
    \ingroup ubuntu
2791
25
    \brief UbuntuNumberAnimation is a NumberAnimation that has predefined
25
    \brief UbuntuNumberAnimation is a NumberAnimation that has predefined
2792
26
           settings to ensure that Ubuntu applications are consistent in their animations.
26
           settings to ensure that Ubuntu applications are consistent in their animations.
2793
@@ -29,7 +29,7 @@
2794
29
29
2795
30
    \qml
30
    \qml
2796
31
    import QtQuick 2.0
31
    import QtQuick 2.0
2798
32
    import Ubuntu.Components 1.0
32
    import Ubuntu.Components 1.1
2799
33
33
2800
34
    Rectangle {
34
    Rectangle {
2801
35
        width: 100; height: 100
35
        width: 100; height: 100
2802
36
36
2803
=== modified file 'modules/Ubuntu/Components/UbuntuShape.qml'
2804
--- modules/Ubuntu/Components/UbuntuShape.qml	2014-04-23 09:10:47 +0000
2805
+++ modules/Ubuntu/Components/UbuntuShape.qml	2014-04-25 13:00:38 +0000
2806
@@ -19,7 +19,7 @@
2807
19
19
2808
20
/*!
20
/*!
2809
21
    \qmltype UbuntuShape
21
    \qmltype UbuntuShape
2811
22
    \inqmlmodule Ubuntu.Components 1.0
22
    \inqmlmodule Ubuntu.Components 1.1
2812
23
    \ingroup ubuntu
23
    \ingroup ubuntu
2813
24
    \brief The UbuntuShape item provides a standard Ubuntu shaped rounded rectangle.
24
    \brief The UbuntuShape item provides a standard Ubuntu shaped rounded rectangle.
2814
25
25
2815
@@ -35,7 +35,7 @@
2816
35
35
2817
36
    Examples:
36
    Examples:
2818
37
    \qml
37
    \qml
2820
38
        import Ubuntu.Components 1.0
38
        import Ubuntu.Components 1.1
2821
39
39
2822
40
        UbuntuShape {
40
        UbuntuShape {
2823
41
            color: "lightblue"
41
            color: "lightblue"
2824
@@ -44,7 +44,7 @@
2825
44
    \endqml
44
    \endqml
2826
45
45
2827
46
    \qml
46
    \qml
2829
47
        import Ubuntu.Components 1.0
47
        import Ubuntu.Components 1.1
2830
48
48
2831
49
        UbuntuShape {
49
        UbuntuShape {
2832
50
            image: Image {
50
            image: Image {
2833
51
51
2834
=== modified file 'modules/Ubuntu/Components/plugin/i18n.cpp'
2835
--- modules/Ubuntu/Components/plugin/i18n.cpp	2014-04-20 19:25:12 +0000
2836
+++ modules/Ubuntu/Components/plugin/i18n.cpp	2014-04-25 13:00:38 +0000
2837
@@ -30,7 +30,7 @@
2838
30
/*!
30
/*!
2839
31
 * \qmltype i18n
31
 * \qmltype i18n
2840
32
 * \instantiates UbuntuI18n
32
 * \instantiates UbuntuI18n
2842
33
 * \inqmlmodule Ubuntu.Components 1.0
33
 * \inqmlmodule Ubuntu.Components 1.1
2843
34
 * \ingroup ubuntu
34
 * \ingroup ubuntu
2844
35
 * \brief i18n is a context property that provides internationalization support.
35
 * \brief i18n is a context property that provides internationalization support.
2845
36
 *
36
 *
2846
37
37
2847
=== modified file 'modules/Ubuntu/Components/plugin/inversemouseareatype.cpp'
2848
--- modules/Ubuntu/Components/plugin/inversemouseareatype.cpp	2014-04-23 22:36:54 +0000
2849
+++ modules/Ubuntu/Components/plugin/inversemouseareatype.cpp	2014-04-25 13:00:38 +0000
2850
@@ -21,7 +21,7 @@
2851
21
/*!
21
/*!
2852
22
  \qmltype InverseMouseArea
22
  \qmltype InverseMouseArea
2853
23
  \instantiates InverseMouseAreaType
23
  \instantiates InverseMouseAreaType
2855
24
  \inqmlmodule Ubuntu.Components 1.0
24
  \inqmlmodule Ubuntu.Components 1.1
2856
25
  \ingroup ubuntu
25
  \ingroup ubuntu
2857
26
  \brief The InverseMouseArea captures mouse events happening outside of a given
26
  \brief The InverseMouseArea captures mouse events happening outside of a given
2858
27
  area.
27
  area.
2859
@@ -33,7 +33,7 @@
2860
33
  Popup.qml
33
  Popup.qml
2861
34
  \qml
34
  \qml
2862
35
  import QtQuick 2.0
35
  import QtQuick 2.0
2864
36
  import Ubuntu.Components 1.0
36
  import Ubuntu.Components 1.1
2865
37
37
2866
38
  Rectangle {
38
  Rectangle {
2867
39
      anchors.centerIn: parent
39
      anchors.centerIn: parent
2868
@@ -53,7 +53,7 @@
2869
53
53
2870
54
  \qml
54
  \qml
2871
55
  import QtQuick 2.0
55
  import QtQuick 2.0
2873
56
  import Ubuntu.Components 1.0
56
  import Ubuntu.Components 1.1
2874
57
57
2875
58
  Item {
58
  Item {
2876
59
      width: 640
59
      width: 640
2877
@@ -77,7 +77,7 @@
2878
77
  a component which is either a parent of the mouse area or a sibling of it.
77
  a component which is either a parent of the mouse area or a sibling of it.
2879
78
  \qml
78
  \qml
2880
79
  import QtQuick 2.0
79
  import QtQuick 2.0
2882
80
  import Ubuntu.Components 1.0
80
  import Ubuntu.Components 1.1
2883
81
81
2884
82
  Item {
82
  Item {
2885
83
      width: units.gu(40)
83
      width: units.gu(40)
2886
84
84
2887
=== modified file 'modules/Ubuntu/Components/plugin/qquickclipboard.cpp'
2888
--- modules/Ubuntu/Components/plugin/qquickclipboard.cpp	2014-04-20 19:25:12 +0000
2889
+++ modules/Ubuntu/Components/plugin/qquickclipboard.cpp	2014-04-25 13:00:38 +0000
2890
@@ -26,7 +26,7 @@
2891
26
/*!
26
/*!
2892
27
 * \qmltype Clipboard
27
 * \qmltype Clipboard
2893
28
 * \instantiates QQuickClipboard
28
 * \instantiates QQuickClipboard
2895
29
 * \inqmlmodule Ubuntu.Components 1.0
29
 * \inqmlmodule Ubuntu.Components 1.1
2896
30
 * \ingroup ubuntu
30
 * \ingroup ubuntu
2897
31
 * \brief This is a singleton type providing access to the system clipboard.
31
 * \brief This is a singleton type providing access to the system clipboard.
2898
32
 *
32
 *
2899
33
33
2900
=== modified file 'modules/Ubuntu/Components/plugin/qquickmimedata.cpp'
2901
--- modules/Ubuntu/Components/plugin/qquickmimedata.cpp	2014-04-20 19:25:12 +0000
2902
+++ modules/Ubuntu/Components/plugin/qquickmimedata.cpp	2014-04-25 13:00:38 +0000
2903
@@ -28,7 +28,7 @@
2904
28
/*!
28
/*!
2905
29
 * \qmltype MimeData
29
 * \qmltype MimeData
2906
30
 * \instantiates QQuickMimeData
30
 * \instantiates QQuickMimeData
2908
31
 * \inqmlmodule Ubuntu.Components 1.0
31
 * \inqmlmodule Ubuntu.Components 1.1
2909
32
 * \ingroup ubuntu
32
 * \ingroup ubuntu
2910
33
 * \brief MimeData type provides interface to access and store data to the
33
 * \brief MimeData type provides interface to access and store data to the
2911
34
 * Clipboard.
34
 * Clipboard.
2912
35
35
2913
=== modified file 'modules/Ubuntu/Components/plugin/ucalarm.cpp'
2914
--- modules/Ubuntu/Components/plugin/ucalarm.cpp	2014-04-20 19:25:12 +0000
2915
+++ modules/Ubuntu/Components/plugin/ucalarm.cpp	2014-04-25 13:00:38 +0000
2916
@@ -219,7 +219,7 @@
2917
219
/*!
219
/*!
2918
220
 * \qmltype Alarm
220
 * \qmltype Alarm
2919
221
 * \instantiates UCAlarm
221
 * \instantiates UCAlarm
2921
222
 * \inqmlmodule Ubuntu.Components 1.0
222
 * \inqmlmodule Ubuntu.Components 1.1
2922
223
 * \ingroup ubuntu-services
223
 * \ingroup ubuntu-services
2923
224
 * \brief Alarm component is a representation of an alarm event.
224
 * \brief Alarm component is a representation of an alarm event.
2924
225
 *
225
 *
2925
@@ -237,7 +237,7 @@
2926
237
 * Example usage:
237
 * Example usage:
2927
238
 * \qml
238
 * \qml
2928
239
 * import QtQuick 2.0
239
 * import QtQuick 2.0
2930
240
 * import Ubuntu.Components 1.0
240
 * import Ubuntu.Components 1.1
2931
241
 *
241
 *
2932
242
 * Rectangle {
242
 * Rectangle {
2933
243
 *     width: units.gu(40)
243
 *     width: units.gu(40)
2934
244
244
2935
=== modified file 'modules/Ubuntu/Components/plugin/ucalarmmodel.cpp'
2936
--- modules/Ubuntu/Components/plugin/ucalarmmodel.cpp	2014-04-20 19:25:12 +0000
2937
+++ modules/Ubuntu/Components/plugin/ucalarmmodel.cpp	2014-04-25 13:00:38 +0000
2938
@@ -25,7 +25,7 @@
2939
25
/*!
25
/*!
2940
26
 * \qmltype AlarmModel
26
 * \qmltype AlarmModel
2941
27
 * \instantiates UCAlarmModel
27
 * \instantiates UCAlarmModel
2943
28
 * \inqmlmodule Ubuntu.Components 1.0
28
 * \inqmlmodule Ubuntu.Components 1.1
2944
29
 * \ingroup ubuntu-services
29
 * \ingroup ubuntu-services
2945
30
 * \brief AlarmModel holds the list of alarms defined.
30
 * \brief AlarmModel holds the list of alarms defined.
2946
31
 *
31
 *
2947
@@ -39,7 +39,7 @@
2948
39
 * Example usage:
39
 * Example usage:
2949
40
 * \qml
40
 * \qml
2950
41
 * import QtQuick 2.0
41
 * import QtQuick 2.0
2952
42
 * import Ubuntu.Components 1.0
42
 * import Ubuntu.Components 1.1
2953
43
 * import Ubuntu.Components.ListItems 1.0
43
 * import Ubuntu.Components.ListItems 1.0
2954
44
 * ListView {
44
 * ListView {
2955
45
 *     model: AlarmModel {}
45
 *     model: AlarmModel {}
2956
46
46
2957
=== modified file 'modules/Ubuntu/Components/plugin/ucapplication.cpp'
2958
--- modules/Ubuntu/Components/plugin/ucapplication.cpp	2014-04-20 19:25:12 +0000
2959
+++ modules/Ubuntu/Components/plugin/ucapplication.cpp	2014-04-25 13:00:38 +0000
2960
@@ -27,7 +27,7 @@
2961
27
/*!
27
/*!
2962
28
 * \qmltype UbuntuApplication
28
 * \qmltype UbuntuApplication
2963
29
 * \instantiates UCApplication
29
 * \instantiates UCApplication
2965
30
 * \inqmlmodule Ubuntu.Components 1.0
30
 * \inqmlmodule Ubuntu.Components 1.1
2966
31
 * \ingroup ubuntu
31
 * \ingroup ubuntu
2967
32
 * \brief UbuntuApplication is a QML binding for a subset of QCoreApplication.
32
 * \brief UbuntuApplication is a QML binding for a subset of QCoreApplication.
2968
33
 *
33
 *
2969
34
34
2970
=== modified file 'modules/Ubuntu/Components/plugin/ucargument.cpp'
2971
--- modules/Ubuntu/Components/plugin/ucargument.cpp	2014-04-20 19:25:12 +0000
2972
+++ modules/Ubuntu/Components/plugin/ucargument.cpp	2014-04-25 13:00:38 +0000
2973
@@ -21,7 +21,7 @@
2974
21
/*!
21
/*!
2975
22
 * \qmltype Argument
22
 * \qmltype Argument
2976
23
 * \instantiates UCArgument
23
 * \instantiates UCArgument
2978
24
 * \inqmlmodule Ubuntu.Components 1.0
24
 * \inqmlmodule Ubuntu.Components 1.1
2979
25
 * \ingroup ubuntu-commandline
25
 * \ingroup ubuntu-commandline
2980
26
 * \brief The Argument class specifies what type a given command line parameter should be.
26
 * \brief The Argument class specifies what type a given command line parameter should be.
2981
27
 *
27
 *
2982
28
28
2983
=== modified file 'modules/Ubuntu/Components/plugin/ucarguments.cpp'
2984
--- modules/Ubuntu/Components/plugin/ucarguments.cpp	2014-04-20 19:25:12 +0000
2985
+++ modules/Ubuntu/Components/plugin/ucarguments.cpp	2014-04-25 13:00:38 +0000
2986
@@ -28,7 +28,7 @@
2987
28
/*!
28
/*!
2988
29
 * \qmltype Arguments
29
 * \qmltype Arguments
2989
30
 * \instantiates UCArguments
30
 * \instantiates UCArguments
2991
31
 * \inqmlmodule Ubuntu.Components 1.0
31
 * \inqmlmodule Ubuntu.Components 1.1
2992
32
 * \ingroup ubuntu-commandline
32
 * \ingroup ubuntu-commandline
2993
33
 * \brief The Arguments class provides a way to declare what command line
33
 * \brief The Arguments class provides a way to declare what command line
2994
34
 *        parameters are expected by the application.
34
 *        parameters are expected by the application.
2995
35
35
2996
=== modified file 'modules/Ubuntu/Components/plugin/ucfontutils.cpp'
2997
--- modules/Ubuntu/Components/plugin/ucfontutils.cpp	2014-04-20 19:25:12 +0000
2998
+++ modules/Ubuntu/Components/plugin/ucfontutils.cpp	2014-04-25 13:00:38 +0000
2999
@@ -21,7 +21,7 @@
3000
21
/*!
21
/*!
3001
22
 * \qmltype FontUtils
22
 * \qmltype FontUtils
3002
23
 * \instantiates UCFontUtils
23
 * \instantiates UCFontUtils
3004
24
 * \inqmlmodule Ubuntu.Components 1.0
24
 * \inqmlmodule Ubuntu.Components 1.1
3005
25
 * \ingroup ubuntu
25
 * \ingroup ubuntu
3006
26
 * \brief FontUtils is a \l {http://qt-project.org/doc/qt-5.0/qtqml/qqmlcontext.html#details} {context property},
26
 * \brief FontUtils is a \l {http://qt-project.org/doc/qt-5.0/qtqml/qqmlcontext.html#details} {context property},
3007
27
 * which provides utility functions for font manipulations.
27
 * which provides utility functions for font manipulations.
3008
@@ -34,7 +34,7 @@
3009
34
 * size:
34
 * size:
3010
35
 * \qml
35
 * \qml
3011
36
 * import QtQuick 2.0
36
 * import QtQuick 2.0
3013
37
 * import Ubuntu.Components 1.0
37
 * import Ubuntu.Components 1.1
3014
38
 *
38
 *
3015
39
 * Text {
39
 * Text {
3016
40
 *     property string fontSize: "medium"
40
 *     property string fontSize: "medium"
3017
@@ -46,7 +46,7 @@
3018
46
 * font unit size to scale its font:
46
 * font unit size to scale its font:
3019
47
 * \qml
47
 * \qml
3020
48
 * import QtQuick 2.0
48
 * import QtQuick 2.0
3022
49
 * import Ubuntu.Components 1.0
49
 * import Ubuntu.Components 1.1
3023
50
 *
50
 *
3024
51
 * TextInput {
51
 * TextInput {
3025
52
 *     property string fontSize: "small"
52
 *     property string fontSize: "small"
3026
53
53
3027
=== modified file 'modules/Ubuntu/Components/plugin/ucmousefilters.cpp'
3028
--- modules/Ubuntu/Components/plugin/ucmousefilters.cpp	2014-04-23 10:01:42 +0000
3029
+++ modules/Ubuntu/Components/plugin/ucmousefilters.cpp	2014-04-25 13:00:38 +0000
3030
@@ -59,7 +59,7 @@
3031
59
/*!
59
/*!
3032
60
   \qmltype Mouse
60
   \qmltype Mouse
3033
61
   \instantiates UCMouse
61
   \instantiates UCMouse
3035
62
   \inqmlmodule Ubuntu.Components 1.0
62
   \inqmlmodule Ubuntu.Components 1.1
3036
63
   \ingroup ubuntu
63
   \ingroup ubuntu
3037
64
   \brief Attached property filtering mouse events occured inside the owner.
64
   \brief Attached property filtering mouse events occured inside the owner.
3038
65
65
3039
@@ -97,7 +97,7 @@
3040
97
   released mouse buttons would look as follows:
97
   released mouse buttons would look as follows:
3041
98
   \qml
98
   \qml
3042
99
   import QtQuick 2.0
99
   import QtQuick 2.0
3044
100
   import Ubuntu.Components 1.0
100
   import Ubuntu.Components 1.1
3045
101
101
3046
102
   TextInput {
102
   TextInput {
3047
103
       width: 100
103
       width: 100
3048
@@ -119,7 +119,7 @@
3049
119
   Example of handling right button clicks over a TextInput:
119
   Example of handling right button clicks over a TextInput:
3050
120
   \qml
120
   \qml
3051
121
   import QtQuick 2.0
121
   import QtQuick 2.0
3053
122
   import Ubuntu.Components 1.0
122
   import Ubuntu.Components 1.1
3054
123
123
3055
124
   TextInput {
124
   TextInput {
3056
125
       width: 100
125
       width: 100
3057
@@ -141,7 +141,7 @@
3058
141
141
3059
142
   \qml
142
   \qml
3060
143
   import QtQuick 2.0
143
   import QtQuick 2.0
3062
144
   import Ubuntu.Components 1.0
144
   import Ubuntu.Components 1.1
3063
145
145
3064
146
   TextInput {
146
   TextInput {
3065
147
       width: 100
147
       width: 100
3066
@@ -201,7 +201,7 @@
3067
201
   will be printed as well as the proxied mouse press from the main item.
201
   will be printed as well as the proxied mouse press from the main item.
3068
202
   \qml
202
   \qml
3069
203
   import QtQuick 2.0
203
   import QtQuick 2.0
3071
204
   import Ubuntu.Components 1.0
204
   import Ubuntu.Components 1.1
3072
205
205
3073
206
   Item {
206
   Item {
3074
207
       id: main
207
       id: main
3075
@@ -254,7 +254,7 @@
3076
254
   will be blocked by the MouseArea still.
254
   will be blocked by the MouseArea still.
3077
255
   \qml
255
   \qml
3078
256
   import QtQuick 2.0
256
   import QtQuick 2.0
3080
257
   import Ubuntu.Components 1.0
257
   import Ubuntu.Components 1.1
3081
258
258
3082
259
   MouseArea {
259
   MouseArea {
3083
260
       id: topArea
260
       id: topArea
3084
@@ -289,7 +289,7 @@
3085
289
   we make sure the TextInput always receives the events before the filter:
289
   we make sure the TextInput always receives the events before the filter:
3086
290
   \qml
290
   \qml
3087
291
   import QtQuick 2.0
291
   import QtQuick 2.0
3089
292
   import Ubuntu.Components 1.0
292
   import Ubuntu.Components 1.1
3090
293
293
3091
294
   TextInput {
294
   TextInput {
3092
295
       id: input
295
       id: input
3093
@@ -316,7 +316,7 @@
3094
316
316
3095
317
   \qml
317
   \qml
3096
318
   import QtQuick 2.0
318
   import QtQuick 2.0
3098
319
   import Ubuntu.Components 1.0
319
   import Ubuntu.Components 1.1
3099
320
320
3100
321
   TextInput {
321
   TextInput {
3101
322
       width: units.gu(40)
322
       width: units.gu(40)
3102
@@ -954,7 +954,7 @@
3103
954
/*!
954
/*!
3104
955
   \qmltype InverseMouse
955
   \qmltype InverseMouse
3105
956
   \instantiates UCInverseMouse
956
   \instantiates UCInverseMouse
3107
957
   \inqmlmodule Ubuntu.Components 1.0
957
   \inqmlmodule Ubuntu.Components 1.1
3108
958
   \ingroup ubuntu
958
   \ingroup ubuntu
3109
959
   \brief Attached object filtering mouse events occured outside the owner.
959
   \brief Attached object filtering mouse events occured outside the owner.
3110
960
960
3111
961
961
3112
=== modified file 'modules/Ubuntu/Components/plugin/ucstatesaver.cpp'
3113
--- modules/Ubuntu/Components/plugin/ucstatesaver.cpp	2014-04-20 19:25:12 +0000
3114
+++ modules/Ubuntu/Components/plugin/ucstatesaver.cpp	2014-04-25 13:00:38 +0000
3115
@@ -140,7 +140,7 @@
3116
140
/*!
140
/*!
3117
141
 * \qmltype StateSaver
141
 * \qmltype StateSaver
3118
142
 * \instantiates UCStateSaverAttached
142
 * \instantiates UCStateSaverAttached
3120
143
 * \inqmlmodule Ubuntu.Components 1.0
143
 * \inqmlmodule Ubuntu.Components 1.1
3121
144
 * \ingroup ubuntu-services
144
 * \ingroup ubuntu-services
3122
145
 * \brief Attached propertyes to save component property states.
145
 * \brief Attached propertyes to save component property states.
3123
146
 *
146
 *
3124
@@ -158,7 +158,7 @@
3125
158
 * Example:
158
 * Example:
3126
159
 * \qml
159
 * \qml
3127
160
 * import QtQuick 2.0
160
 * import QtQuick 2.0
3129
161
 * import Ubuntu.Components 1.0
161
 * import Ubuntu.Components 1.1
3130
162
 *
162
 *
3131
163
 * TextField {
163
 * TextField {
3132
164
 *     id: input
164
 *     id: input
3133
165
165
3134
=== modified file 'modules/Ubuntu/Components/plugin/uctheme.cpp'
3135
--- modules/Ubuntu/Components/plugin/uctheme.cpp	2014-04-20 19:25:12 +0000
3136
+++ modules/Ubuntu/Components/plugin/uctheme.cpp	2014-04-25 13:00:38 +0000
3137
@@ -36,7 +36,7 @@
3138
36
/*!
36
/*!
3139
37
    \qmltype Theme
37
    \qmltype Theme
3140
38
    \instantiates UCTheme
38
    \instantiates UCTheme
3142
39
    \inqmlmodule Ubuntu.Components 1.0
39
    \inqmlmodule Ubuntu.Components 1.1
3143
40
    \ingroup theming
40
    \ingroup theming
3144
41
    \brief The Theme class provides facilities to interact with the current theme.
41
    \brief The Theme class provides facilities to interact with the current theme.
3145
42
42
3146
@@ -48,7 +48,7 @@
3147
48
48
3148
49
    \qml
49
    \qml
3149
50
    import QtQuick 2.0
50
    import QtQuick 2.0
3151
51
    import Ubuntu.Components 1.0
51
    import Ubuntu.Components 1.1
3152
52
52
3153
53
    Item {
53
    Item {
3154
54
        Button {
54
        Button {
3155
@@ -61,7 +61,7 @@
3156
61
61
3157
62
    \qml
62
    \qml
3158
63
    import QtQuick 2.0
63
    import QtQuick 2.0
3160
64
    import Ubuntu.Components 1.0
64
    import Ubuntu.Components 1.1
3161
65
65
3162
66
    StyledItem {
66
    StyledItem {
3163
67
        id: myItem
67
        id: myItem
3164
68
68
3165
=== modified file 'modules/Ubuntu/Components/plugin/ucubuntuanimation.cpp'
3166
--- modules/Ubuntu/Components/plugin/ucubuntuanimation.cpp	2014-04-20 19:25:12 +0000
3167
+++ modules/Ubuntu/Components/plugin/ucubuntuanimation.cpp	2014-04-25 13:00:38 +0000
3168
@@ -21,7 +21,7 @@
3169
21
/*!
21
/*!
3170
22
 * \qmltype UbuntuAnimation
22
 * \qmltype UbuntuAnimation
3171
23
 * \instantiates UCUbuntuAnimation
23
 * \instantiates UCUbuntuAnimation
3173
24
 * \inqmlmodule Ubuntu.Components 1.0
24
 * \inqmlmodule Ubuntu.Components 1.1
3174
25
 * \ingroup ubuntu
25
 * \ingroup ubuntu
3175
26
 * \brief Singleton defining standard Ubuntu durations and easing for animations
26
 * \brief Singleton defining standard Ubuntu durations and easing for animations
3176
27
 *        that should be used to ensure that Ubuntu applications are consistent
27
 *        that should be used to ensure that Ubuntu applications are consistent
3177
28
28
3178
=== modified file 'modules/Ubuntu/Components/plugin/ucunits.cpp'
3179
--- modules/Ubuntu/Components/plugin/ucunits.cpp	2014-04-20 19:25:12 +0000
3180
+++ modules/Ubuntu/Components/plugin/ucunits.cpp	2014-04-25 13:00:38 +0000
3181
@@ -40,7 +40,7 @@
3182
40
/*!
40
/*!
3183
41
    \qmltype Units
41
    \qmltype Units
3184
42
    \instantiates UCUnits
42
    \instantiates UCUnits
3186
43
    \inqmlmodule Ubuntu.Components 1.0
43
    \inqmlmodule Ubuntu.Components 1.1
3187
44
    \ingroup resolution-independence
44
    \ingroup resolution-independence
3188
45
    \brief Units of measurement for sizes, spacing, margin, etc.
45
    \brief Units of measurement for sizes, spacing, margin, etc.
3189
46
46
3190
@@ -52,7 +52,7 @@
3191
52
52
3192
53
    \qml
53
    \qml
3193
54
    import QtQuick 2.0
54
    import QtQuick 2.0
3195
55
    import Ubuntu.Components 1.0
55
    import Ubuntu.Components 1.1
3196
56
56
3197
57
    Item {
57
    Item {
3198
58
        width: units.gu(2)
58
        width: units.gu(2)
3199
59
59
3200
=== modified file 'modules/Ubuntu/Components/plugin/ucurihandler.cpp'
3201
--- modules/Ubuntu/Components/plugin/ucurihandler.cpp	2014-04-20 19:25:12 +0000
3202
+++ modules/Ubuntu/Components/plugin/ucurihandler.cpp	2014-04-25 13:00:38 +0000
3203
@@ -36,7 +36,7 @@
3204
36
/*!
36
/*!
3205
37
 * \qmltype UriHandler
37
 * \qmltype UriHandler
3206
38
 * \instantiates UCUriHandler
38
 * \instantiates UCUriHandler
3208
39
 * \inqmlmodule Ubuntu.Components 1.0
39
 * \inqmlmodule Ubuntu.Components 1.1
3209
40
 * \ingroup ubuntu
40
 * \ingroup ubuntu
3210
41
 * \brief Singleton signalling for opened URIs.
41
 * \brief Singleton signalling for opened URIs.
3211
42
 *
42
 *
3212
43
43
3213
=== modified file 'modules/Ubuntu/Components/qmldir'
3214
--- modules/Ubuntu/Components/qmldir	2014-04-23 10:01:42 +0000
3215
+++ modules/Ubuntu/Components/qmldir	2014-04-25 13:00:38 +0000
3216
@@ -89,3 +89,6 @@
3217
89
ColorUtils 1.0 colorUtils.js
89
ColorUtils 1.0 colorUtils.js
3218
90
DateUtils 1.0 dateUtils.js
90
DateUtils 1.0 dateUtils.js
3219
91
UbuntuListView 1.0 UbuntuListView.qml
91
UbuntuListView 1.0 UbuntuListView.qml
3220
92
3221
93
#version 1.1
3222
94
ComboButton 1.1 ComboButton.qml
3223
92
95
3224
=== modified file 'modules/Ubuntu/PerformanceMetrics/BarGraph.qml'
3225
--- modules/Ubuntu/PerformanceMetrics/BarGraph.qml	2014-04-20 19:25:12 +0000
3226
+++ modules/Ubuntu/PerformanceMetrics/BarGraph.qml	2014-04-25 13:00:38 +0000
3227
@@ -15,7 +15,7 @@
3228
15
 */
15
 */
3229
16
16
3230
17
import QtQuick 2.0
17
import QtQuick 2.0
3232
18
import Ubuntu.Components 1.0
18
import Ubuntu.Components 1.1
3233
19
import Ubuntu.PerformanceMetrics 1.0 as PerformanceMetrics
19
import Ubuntu.PerformanceMetrics 1.0 as PerformanceMetrics
3234
20
20
3235
21
Item {
21
Item {
3236
22
22
3237
=== modified file 'modules/Ubuntu/Test/UbuntuTestCase.qml'
3238
--- modules/Ubuntu/Test/UbuntuTestCase.qml	2014-04-23 10:01:42 +0000
3239
+++ modules/Ubuntu/Test/UbuntuTestCase.qml	2014-04-25 13:00:38 +0000
3240
@@ -16,7 +16,7 @@
3241
16
16
3242
17
import QtQuick 2.0
17
import QtQuick 2.0
3243
18
import QtTest 1.0
18
import QtTest 1.0
3245
19
import Ubuntu.Components 1.0
19
import Ubuntu.Components 1.1
3246
20
20
3247
21
/*!
21
/*!
3248
22
    \qmlabstract UbuntuTestCase
22
    \qmlabstract UbuntuTestCase
3249
23
23
3250
=== modified file 'tests/autopilot/ubuntuuitoolkit/emulators.py'
3251
--- tests/autopilot/ubuntuuitoolkit/emulators.py	2014-04-24 12:07:30 +0000
3252
+++ tests/autopilot/ubuntuuitoolkit/emulators.py	2014-04-25 13:00:38 +0000
3253
@@ -543,6 +543,32 @@
3254
543
        self.checked.wait_for(not original_state, timeout)
543
        self.checked.wait_for(not original_state, timeout)
3255
544
544
3256
545
545
3257
546
class ComboButton(UbuntuUIToolkitEmulatorBase):
3258
547
    """ComboButton Autopilot emulator."""
3259
548
3260
549
    def press_mainbutton(self):
3261
550
        """Presses the main button of the ComboBox."""
3262
551
        main_button = self.select_single(objectName="combobutton_mainbutton")
3263
552
        self.pointing_device.click_object(main_button)
3264
553
3265
554
    def expand(self):
3266
555
        """Expands a combo button by clicking on the dropdown button."""
3267
556
        if not self.expanded:
3268
557
            self._press_dropdown()
3269
558
        return self.expanded
3270
559
3271
560
    def collapse(self):
3272
561
        """Collapses a combo button by clicking on the dropdown button."""
3273
562
        if self.expanded:
3274
563
            self._press_dropdown()
3275
564
        return self.expanded
3276
565
3277
566
    def _press_dropdown(self):
3278
567
        """Presses the dropdown button to togle combo list expansion."""
3279
568
        dropdown_button = self.select_single(objectName="combobutton_dropdown")
3280
569
        return self.pointing_device.click_object(dropdown_button)
3281
570
3282
571
3283
546
class OptionSelector(UbuntuUIToolkitEmulatorBase):
572
class OptionSelector(UbuntuUIToolkitEmulatorBase):
3284
547
    """OptionSelector Autopilot emulator"""
573
    """OptionSelector Autopilot emulator"""
3285
548
574
3286
549
575
3287
=== modified file 'tests/autopilot/ubuntuuitoolkit/fixture_setup.py'
3288
--- tests/autopilot/ubuntuuitoolkit/fixture_setup.py	2014-04-20 19:25:12 +0000
3289
+++ tests/autopilot/ubuntuuitoolkit/fixture_setup.py	2014-04-25 13:00:38 +0000
3290
@@ -25,7 +25,7 @@
3291
25
25
3292
26
DEFAULT_QML_FILE_CONTENTS = ("""
26
DEFAULT_QML_FILE_CONTENTS = ("""
3293
27
import QtQuick 2.0
27
import QtQuick 2.0
3295
28
import Ubuntu.Components 1.0
28
import Ubuntu.Components 1.1
3296
29
29
3297
30
MainView {
30
MainView {
3298
31
    width: units.gu(48)
31
    width: units.gu(48)
3299
32
32
3300
=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/__init__.py'
3301
--- tests/autopilot/ubuntuuitoolkit/tests/__init__.py	2014-04-20 19:25:12 +0000
3302
+++ tests/autopilot/ubuntuuitoolkit/tests/__init__.py	2014-04-25 13:00:38 +0000
3303
@@ -65,7 +65,7 @@
3304
65
65
3305
66
    test_qml = ("""
66
    test_qml = ("""
3306
67
import QtQuick 2.0
67
import QtQuick 2.0
3308
68
import Ubuntu.Components 1.0
68
import Ubuntu.Components 1.1
3309
69
69
3310
70
MainView {
70
MainView {
3311
71
    width: units.gu(48)
71
    width: units.gu(48)
3312
72
72
3313
=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/test_emulators.py'
3314
--- tests/autopilot/ubuntuuitoolkit/tests/test_emulators.py	2014-04-23 22:36:54 +0000
3315
+++ tests/autopilot/ubuntuuitoolkit/tests/test_emulators.py	2014-04-25 13:00:38 +0000
3316
@@ -72,7 +72,7 @@
3317
72
72
3318
73
    test_qml = ("""
73
    test_qml = ("""
3319
74
import QtQuick 2.0
74
import QtQuick 2.0
3321
75
import Ubuntu.Components 1.0
75
import Ubuntu.Components 1.1
3322
76
76
3323
77
MainView {
77
MainView {
3324
78
    width: units.gu(48)
78
    width: units.gu(48)
3325
@@ -125,7 +125,7 @@
3326
125
125
3327
126
    test_qml = ("""
126
    test_qml = ("""
3328
127
import QtQuick 2.0
127
import QtQuick 2.0
3330
128
import Ubuntu.Components 1.0
128
import Ubuntu.Components 1.1
3331
129
129
3332
130
MainView {
130
MainView {
3333
131
    width: units.gu(48)
131
    width: units.gu(48)
3334
@@ -148,7 +148,7 @@
3335
148
148
3336
149
    test_qml = ("""
149
    test_qml = ("""
3337
150
import QtQuick 2.0
150
import QtQuick 2.0
3339
151
import Ubuntu.Components 1.0
151
import Ubuntu.Components 1.1
3340
152
152
3341
153
MainView {
153
MainView {
3342
154
    width: units.gu(50)
154
    width: units.gu(50)
3343
@@ -244,7 +244,7 @@
3344
244
244
3345
245
TEST_TABS_QML_FORMAT = ("""
245
TEST_TABS_QML_FORMAT = ("""
3346
246
import QtQuick 2.0
246
import QtQuick 2.0
3348
247
import Ubuntu.Components 1.0
247
import Ubuntu.Components 1.1
3349
248
248
3350
249
MainView {{
249
MainView {{
3351
250
    width: units.gu(70)
250
    width: units.gu(70)
3352
@@ -382,7 +382,7 @@
3353
382
382
3354
383
    test_qml = ("""
383
    test_qml = ("""
3355
384
import QtQuick 2.0
384
import QtQuick 2.0
3357
385
import Ubuntu.Components 1.0
385
import Ubuntu.Components 1.1
3358
386
import Ubuntu.Components.Popups 1.0
386
import Ubuntu.Components.Popups 1.0
3359
387
387
3360
388
MainView {
388
MainView {
3361
@@ -456,7 +456,7 @@
3362
456
456
3363
457
TEST_QML_WITH_CHECKBOX = ("""
457
TEST_QML_WITH_CHECKBOX = ("""
3364
458
import QtQuick 2.0
458
import QtQuick 2.0
3366
459
import Ubuntu.Components 1.0
459
import Ubuntu.Components 1.1
3367
460
460
3368
461
MainView {
461
MainView {
3369
462
    width: units.gu(48)
462
    width: units.gu(48)
3370
@@ -474,7 +474,7 @@
3371
474
474
3372
475
TEST_QML_WITH_SWITCH = ("""
475
TEST_QML_WITH_SWITCH = ("""
3373
476
import QtQuick 2.0
476
import QtQuick 2.0
3375
477
import Ubuntu.Components 1.0
477
import Ubuntu.Components 1.1
3376
478
478
3377
479
MainView {
479
MainView {
3378
480
    width: units.gu(48)
480
    width: units.gu(48)
3379
@@ -567,7 +567,7 @@
3380
567
567
3381
568
    test_qml = ("""
568
    test_qml = ("""
3382
569
import QtQuick 2.0
569
import QtQuick 2.0
3384
570
import Ubuntu.Components 1.0
570
import Ubuntu.Components 1.1
3385
571
import Ubuntu.Components.ListItems 1.0 as ListItem
571
import Ubuntu.Components.ListItems 1.0 as ListItem
3386
572
572
3387
573
MainView {
573
MainView {
3388
@@ -665,7 +665,7 @@
3389
665
665
3390
666
    test_qml = ("""
666
    test_qml = ("""
3391
667
import QtQuick 2.0
667
import QtQuick 2.0
3393
668
import Ubuntu.Components 1.0
668
import Ubuntu.Components 1.1
3394
669
import Ubuntu.Components.ListItems 1.0 as ListItem
669
import Ubuntu.Components.ListItems 1.0 as ListItem
3395
670
670
3396
671
MainView {
671
MainView {
3397
@@ -740,7 +740,7 @@
3398
740
740
3399
741
    test_qml = ("""
741
    test_qml = ("""
3400
742
import QtQuick 2.0
742
import QtQuick 2.0
3402
743
import Ubuntu.Components 1.0
743
import Ubuntu.Components 1.1
3403
744
import Ubuntu.Components.ListItems 1.0
744
import Ubuntu.Components.ListItems 1.0
3404
745
745
3405
746
746
3406
@@ -892,7 +892,7 @@
3407
892
892
3408
893
    test_qml = ("""
893
    test_qml = ("""
3409
894
import QtQuick 2.0
894
import QtQuick 2.0
3411
895
import Ubuntu.Components 1.0
895
import Ubuntu.Components 1.1
3412
896
896
3413
897
MainView {
897
MainView {
3414
898
    width: units.gu(48)
898
    width: units.gu(48)
3415
@@ -947,7 +947,7 @@
3416
947
947
3417
948
    test_qml = ("""
948
    test_qml = ("""
3418
949
import QtQuick 2.0
949
import QtQuick 2.0
3420
950
import Ubuntu.Components 1.0
950
import Ubuntu.Components 1.1
3421
951
951
3422
952
MainView {
952
MainView {
3423
953
    width: units.gu(48)
953
    width: units.gu(48)
3424
@@ -1020,7 +1020,7 @@
3425
1020
1020
3426
1021
    test_qml = ("""
1021
    test_qml = ("""
3427
1022
import QtQuick 2.0
1022
import QtQuick 2.0
3429
1023
import Ubuntu.Components 1.0
1023
import Ubuntu.Components 1.1
3430
1024
import Ubuntu.Components.Popups 1.0
1024
import Ubuntu.Components.Popups 1.0
3431
1025
1025
3432
1026
MainView {
1026
MainView {
3433
@@ -1091,11 +1091,78 @@
3434
1091
        self._assert_composer_sheet_is_closed()
1091
        self._assert_composer_sheet_is_closed()
3435
1092
1092
3436
1093
1093
3437
1094
class ComboButtonTestCase(tests.QMLStringAppTestCase):
3438
1095
    test_qml = ("""
3439
1096
import QtQuick 2.0
3440
1097
import Ubuntu.Components 1.1
3441
1098
import Ubuntu.Components.ListItems 1.0
3442
1099
3443
1100
MainView {
3444
1101
    width: units.gu(40)
3445
1102
    height: units.gu(60)
3446
1103
3447
1104
    Column {
3448
1105
        anchors.fill: parent
3449
1106
3450
1107
        ComboButton {
3451
1108
            text: "main button"
3452
1109
            objectName: "combo_button"
3453
1110
            ListView {
3454
1111
                model: 10
3455
1112
                delegate: Standard {
3456
1113
                    text: "Item #" + modelData
3457
1114
                }
3458
1115
            }
3459
1116
        }
3460
1117
        ComboButton {
3461
1118
            text: "main button"
3462
1119
            objectName: "autocollapse_button"
3463
1120
            onClicked: expanded = false
3464
1121
            ListView {
3465
1122
                model: 10
3466
1123
                delegate: Standard {
3467
1124
                    text: "Item #" + modelData
3468
1125
                }
3469
1126
            }
3470
1127
        }
3471
1128
    }
3472
1129
}
3473
1130
""")
3474
1131
3475
1132
    def setUp(self):
3476
1133
        super(ComboButtonTestCase, self).setUp()
3477
1134
        self.combo = self.main_view.select_single(
3478
1135
            emulators.ComboButton, objectName="combo_button")
3479
1136
        self.autocombo = self.main_view.select_single(
3480
1137
            emulators.ComboButton, objectName="autocollapse_button")
3481
1138
        self.assertFalse(self.combo.expanded)
3482
1139
        self.assertFalse(self.autocombo.expanded)
3483
1140
3484
1141
    def test_expand_collapse_combo(self):
3485
1142
        self.combo.expand()
3486
1143
        self.assertTrue(self.combo.expanded)
3487
1144
        self.combo.collapse()
3488
1145
        self.assertFalse(self.combo.expanded)
3489
1146
3490
1147
    def test_main_pressed(self):
3491
1148
        self.combo.expand()
3492
1149
        self.assertTrue(self.combo.expanded)
3493
1150
        self.combo.press_mainbutton()
3494
1151
        self.assertTrue(self.combo.expanded)
3495
1152
3496
1153
    def test_autocollapse(self):
3497
1154
        self.autocombo.expand()
3498
1155
        self.assertTrue(self.autocombo.expanded)
3499
1156
        self.autocombo.press_mainbutton()
3500
1157
        self.assertFalse(self.autocombo.expanded)
3501
1158
3502
1159
3503
1094
class OptionSelectorCustomDelegateTestCase(tests.QMLStringAppTestCase):
1160
class OptionSelectorCustomDelegateTestCase(tests.QMLStringAppTestCase):
3504
1095
1161
3505
1096
    test_qml = ("""
1162
    test_qml = ("""
3506
1097
import QtQuick 2.0
1163
import QtQuick 2.0
3508
1098
import Ubuntu.Components 1.0
1164
import Ubuntu.Components 1.1
3509
1165
import Ubuntu.Components.ListItems 1.0
3510
1099
1166
3511
1100
MainView {
1167
MainView {
3512
1101
    width: units.gu(48)
1168
    width: units.gu(48)
3513
@@ -1194,7 +1261,7 @@
3514
1194
1261
3515
1195
    test_qml = ("""
1262
    test_qml = ("""
3516
1196
import QtQuick 2.0
1263
import QtQuick 2.0
3518
1197
import Ubuntu.Components 1.0
1264
import Ubuntu.Components 1.1
3519
1198
1265
3520
1199
MainView {
1266
MainView {
3521
1200
    width: units.gu(48)
1267
    width: units.gu(48)
3522
1201
1268
3523
=== modified file 'tests/resources/alarm/AlarmDays.qml'
3524
--- tests/resources/alarm/AlarmDays.qml	2014-04-20 19:25:12 +0000
3525
+++ tests/resources/alarm/AlarmDays.qml	2014-04-25 13:00:38 +0000
3526
@@ -15,7 +15,7 @@
3527
15
 */
15
 */
3528
16
16
3529
17
import QtQuick 2.0
17
import QtQuick 2.0
3531
18
import Ubuntu.Components 1.0
18
import Ubuntu.Components 1.1
3532
19
import Ubuntu.Components.Popups 1.0
19
import Ubuntu.Components.Popups 1.0
3533
20
import Ubuntu.Components.ListItems 1.0
20
import Ubuntu.Components.ListItems 1.0
3534
21
21
3535
22
22
3536
=== modified file 'tests/resources/alarm/Alarms.qml'
3537
--- tests/resources/alarm/Alarms.qml	2014-04-20 19:25:12 +0000
3538
+++ tests/resources/alarm/Alarms.qml	2014-04-25 13:00:38 +0000
3539
@@ -15,7 +15,7 @@
3540
15
 */
15
 */
3541
16
16
3542
17
import QtQuick 2.0
17
import QtQuick 2.0
3544
18
import Ubuntu.Components 1.0
18
import Ubuntu.Components 1.1
3545
19
import Ubuntu.Components.ListItems 1.0
19
import Ubuntu.Components.ListItems 1.0
3546
20
import Ubuntu.Components.Popups 1.0
20
import Ubuntu.Components.Popups 1.0
3547
21
21
3548
22
22
3549
=== added directory 'tests/resources/buttons'
3550
=== added file 'tests/resources/buttons/ComboTest.qml'
3551
--- tests/resources/buttons/ComboTest.qml	1970-01-01 00:00:00 +0000
3552
+++ tests/resources/buttons/ComboTest.qml	2014-04-25 13:00:38 +0000
3553
@@ -0,0 +1,143 @@
3554
1
/*
3555
2
 * Copyright 2014 Canonical Ltd.
3556
3
 *
3557
4
 * This program is free software; you can redistribute it and/or modify
3558
5
 * it under the terms of the GNU Lesser General Public License as published by
3559
6
 * the Free Software Foundation; version 3.
3560
7
 *
3561
8
 * This program is distributed in the hope that it will be useful,
3562
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
3563
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
3564
11
 * GNU Lesser General Public License for more details.
3565
12
 *
3566
13
 * You should have received a copy of the GNU Lesser General Public License
3567
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
3568
15
 *
3569
16
 * Author: Zsombor Egri <zsombor.egri@canonical.com>
3570
17
 */
3571
18
import QtQuick 2.0
3572
19
import Ubuntu.Components 1.1
3573
20
import Ubuntu.Components.ListItems 1.0
3574
21
3575
22
MainView {
3576
23
    width: units.gu(40)
3577
24
    height: units.gu(71)
3578
25
3579
26
3580
27
    Column {
3581
28
        anchors.fill: parent
3582
29
        spacing: units.gu(2)
3583
30
3584
31
        ComboButton {
3585
32
            id: combo1
3586
33
            text: "collapsedHeight differs"
3587
34
            collapsedHeight: units.gu(6)
3588
35
        }
3589
36
3590
37
        ComboButton {
3591
38
            text: "content is Rectangle > expanded"
3592
39
            Rectangle {
3593
40
                height: units.gu(40)
3594
41
                gradient: Gradient {
3595
42
                    GradientStop {
3596
43
                        position: 0.0
3597
44
                        color: "red"
3598
45
                    }
3599
46
                    GradientStop {
3600
47
                        position: 0.5
3601
48
                        color: "green"
3602
49
                    }
3603
50
                    GradientStop {
3604
51
                        position: 1.0
3605
52
                        color: "blue"
3606
53
                    }
3607
54
                }
3608
55
            }
3609
56
        }
3610
57
3611
58
        ComboButton {
3612
59
            text: "comboList is Flickable"
3613
60
            Flickable {
3614
61
                id: flickable
3615
62
                objectName: "Flickable"
3616
63
                anchors {
3617
64
                    left: parent.left
3618
65
                    right: parent.right
3619
66
                    top: parent.top
3620
67
                }
3621
68
                contentHeight: rect.height
3622
69
3623
70
                Rectangle {
3624
71
                    id: rect
3625
72
                    width: parent.width
3626
73
                    height: units.gu(40)
3627
74
                    gradient: Gradient {
3628
75
                        GradientStop {
3629
76
                            position: 0.0
3630
77
                            color: "red"
3631
78
                        }
3632
79
                        GradientStop {
3633
80
                            position: 0.5
3634
81
                            color: "green"
3635
82
                        }
3636
83
                        GradientStop {
3637
84
                            position: 1.0
3638
85
                            color: "blue"
3639
86
                        }
3640
87
                    }
3641
88
                }
3642
89
            }
3643
90
        }
3644
91
3645
92
        ComboButton {
3646
93
            id: combo2
3647
94
            text: "comboList is ListView"
3648
95
            expanded: true
3649
96
            expandedHeight: units.gu(30)
3650
97
            UbuntuListView {
3651
98
                objectName: "ListView"
3652
99
                model: 20
3653
100
                delegate: Standard {
3654
101
                    text: "Action #" + modelData
3655
102
                    onClicked: {
3656
103
                        combo2.text = text;
3657
104
                        combo2.expanded = false
3658
105
                    }
3659
106
                }
3660
107
            }
3661
108
        }
3662
109
3663
110
        ComboButton {
3664
111
            id: combo3
3665
112
            text: "auto expandHeight"
3666
113
            expandedHeight: -1
3667
114
            Column {
3668
115
                id: column
3669
116
                anchors {
3670
117
                    left: parent.left
3671
118
                    right: parent.right
3672
119
                }
3673
120
                Rectangle {
3674
121
                    width: parent.width
3675
122
                    height: units.gu(6)
3676
123
                    color: "red"
3677
124
                }
3678
125
                Rectangle {
3679
126
                    width: parent.width
3680
127
                    height: units.gu(6)
3681
128
                    color: "green"
3682
129
                }
3683
130
                Rectangle {
3684
131
                    width: parent.width
3685
132
                    height: units.gu(6)
3686
133
                    color: "blue"
3687
134
                }
3688
135
                Rectangle {
3689
136
                    width: parent.width
3690
137
                    height: units.gu(6)
3691
138
                    color: "yellow"
3692
139
                }
3693
140
            }
3694
141
        }
3695
142
    }
3696
143
}
3697
0
144
3698
=== modified file 'tests/resources/filters/MouseFilters.qml'
3699
--- tests/resources/filters/MouseFilters.qml	2014-04-20 19:25:12 +0000
3700
+++ tests/resources/filters/MouseFilters.qml	2014-04-25 13:00:38 +0000
3701
@@ -15,7 +15,7 @@
3702
15
 */
15
 */
3703
16
16
3704
17
import QtQuick 2.0
17
import QtQuick 2.0
3706
18
import Ubuntu.Components 1.0
18
import Ubuntu.Components 1.1
3707
19
19
3708
20
MainView {
20
MainView {
3709
21
    width: units.gu(40)
21
    width: units.gu(40)
3710
22
22
3711
=== modified file 'tests/resources/navigation/MyCustomPage.qml'
3712
--- tests/resources/navigation/MyCustomPage.qml	2014-04-20 19:25:12 +0000
3713
+++ tests/resources/navigation/MyCustomPage.qml	2014-04-25 13:00:38 +0000
3714
@@ -15,7 +15,7 @@
3715
15
 */
15
 */
3716
16
16
3717
17
import QtQuick 2.0
17
import QtQuick 2.0
3719
18
import Ubuntu.Components 1.0
18
import Ubuntu.Components 1.1
3720
19
19
3721
20
Page {
20
Page {
3722
21
    title: i18n.tr("My custom page")
21
    title: i18n.tr("My custom page")
3723
22
22
3724
=== modified file 'tests/resources/navigation/PageStack.qml'
3725
--- tests/resources/navigation/PageStack.qml	2014-04-20 19:25:12 +0000
3726
+++ tests/resources/navigation/PageStack.qml	2014-04-25 13:00:38 +0000
3727
@@ -15,7 +15,7 @@
3728
15
 */
15
 */
3729
16
16
3730
17
import QtQuick 2.0
17
import QtQuick 2.0
3732
18
import Ubuntu.Components 1.0
18
import Ubuntu.Components 1.1
3733
19
import Ubuntu.Components.ListItems 1.0 as ListItem
19
import Ubuntu.Components.ListItems 1.0 as ListItem
3734
20
20
3735
21
Rectangle {
21
Rectangle {
3736
22
22
3737
=== modified file 'tests/resources/navigation/RepeaterTabs.qml'
3738
--- tests/resources/navigation/RepeaterTabs.qml	2014-04-20 19:25:12 +0000
3739
+++ tests/resources/navigation/RepeaterTabs.qml	2014-04-25 13:00:38 +0000
3740
@@ -15,7 +15,7 @@
3741
15
 */
15
 */
3742
16
16
3743
17
import QtQuick 2.0
17
import QtQuick 2.0
3745
18
import Ubuntu.Components 1.0
18
import Ubuntu.Components 1.1
3746
19
19
3747
20
20
3748
21
MainView {
21
MainView {
3749
22
22
3750
=== modified file 'tests/resources/navigation/SimpleTabs.qml'
3751
--- tests/resources/navigation/SimpleTabs.qml	2014-04-23 22:36:54 +0000
3752
+++ tests/resources/navigation/SimpleTabs.qml	2014-04-25 13:00:38 +0000
3753
@@ -15,7 +15,7 @@
3754
15
 */
15
 */
3755
16
16
3756
17
import QtQuick 2.0
17
import QtQuick 2.0
3758
18
import Ubuntu.Components 1.0
18
import Ubuntu.Components 1.1
3759
19
19
3760
20
MainView {
20
MainView {
3761
21
    width: 800
21
    width: 800
3762
22
22
3763
=== modified file 'tests/resources/navigation/StackWithTabs.qml'
3764
--- tests/resources/navigation/StackWithTabs.qml	2014-04-20 19:25:12 +0000
3765
+++ tests/resources/navigation/StackWithTabs.qml	2014-04-25 13:00:38 +0000
3766
@@ -15,7 +15,7 @@
3767
15
 */
15
 */
3768
16
16
3769
17
import QtQuick 2.0
17
import QtQuick 2.0
3771
18
import Ubuntu.Components 1.0
18
import Ubuntu.Components 1.1
3772
19
19
3773
20
MainView {
20
MainView {
3774
21
    id: mainView
21
    id: mainView
3775
22
22
3776
=== modified file 'tests/resources/navigation/TabView.qml'
3777
--- tests/resources/navigation/TabView.qml	2014-04-23 18:14:56 +0000
3778
+++ tests/resources/navigation/TabView.qml	2014-04-25 13:00:38 +0000
3779
@@ -15,7 +15,7 @@
3780
15
 */
15
 */
3781
16
16
3782
17
import QtQuick 2.0
17
import QtQuick 2.0
3784
18
import Ubuntu.Components 1.0
18
import Ubuntu.Components 1.1
3785
19
19
3786
20
20
3787
21
MainView {
21
MainView {
3788
22
22
3789
=== modified file 'tests/resources/navigation/Tabs.qml'
3790
--- tests/resources/navigation/Tabs.qml	2014-04-24 14:55:07 +0000
3791
+++ tests/resources/navigation/Tabs.qml	2014-04-25 13:00:38 +0000
3792
@@ -15,7 +15,7 @@
3793
15
 */
15
 */
3794
16
16
3795
17
import QtQuick 2.0
17
import QtQuick 2.0
3797
18
import Ubuntu.Components 1.0
18
import Ubuntu.Components 1.1
3798
19
import Ubuntu.Components.ListItems 1.0 as ListItem
19
import Ubuntu.Components.ListItems 1.0 as ListItem
3799
20
20
3800
21
MainView {
21
MainView {
3801
22
22
3802
=== modified file 'tests/resources/pickers/DatePickerTest.qml'
3803
--- tests/resources/pickers/DatePickerTest.qml	2014-04-20 19:25:12 +0000
3804
+++ tests/resources/pickers/DatePickerTest.qml	2014-04-25 13:00:38 +0000
3805
@@ -15,7 +15,7 @@
3806
15
 */
15
 */
3807
16
16
3808
17
import QtQuick 2.0
17
import QtQuick 2.0
3810
18
import Ubuntu.Components 1.0
18
import Ubuntu.Components 1.1
3811
19
import Ubuntu.Components.Pickers 1.0
19
import Ubuntu.Components.Pickers 1.0
3812
20
20
3813
21
MainView {
21
MainView {
3814
22
22
3815
=== modified file 'tests/resources/pickers/PanelTest.qml'
3816
--- tests/resources/pickers/PanelTest.qml	2014-04-20 19:25:12 +0000
3817
+++ tests/resources/pickers/PanelTest.qml	2014-04-25 13:00:38 +0000
3818
@@ -15,7 +15,7 @@
3819
15
 */
15
 */
3820
16
16
3821
17
import QtQuick 2.0
17
import QtQuick 2.0
3823
18
import Ubuntu.Components 1.0
18
import Ubuntu.Components 1.1
3824
19
import Ubuntu.Components.Pickers 1.0
19
import Ubuntu.Components.Pickers 1.0
3825
20
20
3826
21
MainView {
21
MainView {
3827
22
22
3828
=== modified file 'tests/resources/pickers/PickerTest.qml'
3829
--- tests/resources/pickers/PickerTest.qml	2014-04-20 19:25:12 +0000
3830
+++ tests/resources/pickers/PickerTest.qml	2014-04-25 13:00:38 +0000
3831
@@ -15,7 +15,7 @@
3832
15
 */
15
 */
3833
16
16
3834
17
import QtQuick 2.0
17
import QtQuick 2.0
3836
18
import Ubuntu.Components 1.0
18
import Ubuntu.Components 1.1
3837
19
import Ubuntu.Components.Pickers 1.0
19
import Ubuntu.Components.Pickers 1.0
3838
20
20
3839
21
MainView {
21
MainView {
3840
22
22
3841
=== modified file 'tests/resources/popover/PopoverTest.qml'
3842
--- tests/resources/popover/PopoverTest.qml	2014-04-20 19:25:12 +0000
3843
+++ tests/resources/popover/PopoverTest.qml	2014-04-25 13:00:38 +0000
3844
@@ -15,7 +15,7 @@
3845
15
 */
15
 */
3846
16
16
3847
17
import QtQuick 2.0
17
import QtQuick 2.0
3849
18
import Ubuntu.Components 1.0
18
import Ubuntu.Components 1.1
3850
19
import Ubuntu.Components.Popups 1.0
19
import Ubuntu.Components.Popups 1.0
3851
20
import Ubuntu.Components.ListItems 1.0 as ListItem
20
import Ubuntu.Components.ListItems 1.0 as ListItem
3852
21
21
3853
22
22
3854
=== modified file 'tests/resources/statesaver/StateSaver.qml'
3855
--- tests/resources/statesaver/StateSaver.qml	2014-04-20 19:25:12 +0000
3856
+++ tests/resources/statesaver/StateSaver.qml	2014-04-25 13:00:38 +0000
3857
@@ -15,7 +15,7 @@
3858
15
 */
15
 */
3859
16
16
3860
17
import QtQuick 2.0
17
import QtQuick 2.0
3862
18
import Ubuntu.Components 1.0
18
import Ubuntu.Components 1.1
3863
19
19
3864
20
MainView {
20
MainView {
3865
21
    id: app
21
    id: app
3866
22
22
3867
=== modified file 'tests/resources/toolbar/LockedToolbar.qml'
3868
--- tests/resources/toolbar/LockedToolbar.qml	2014-04-20 19:25:12 +0000
3869
+++ tests/resources/toolbar/LockedToolbar.qml	2014-04-25 13:00:38 +0000
3870
@@ -15,7 +15,7 @@
3871
15
 */
15
 */
3872
16
16
3873
17
import QtQuick 2.0
17
import QtQuick 2.0
3875
18
import Ubuntu.Components 1.0
18
import Ubuntu.Components 1.1
3876
19
19
3877
20
MainView {
20
MainView {
3878
21
    width: units.gu(50)
21
    width: units.gu(50)
3879
22
22
3880
=== modified file 'tests/resources/toolbar/oldToolbarWithActions.qml'
3881
--- tests/resources/toolbar/oldToolbarWithActions.qml	2014-04-20 19:25:12 +0000
3882
+++ tests/resources/toolbar/oldToolbarWithActions.qml	2014-04-25 13:00:38 +0000
3883
@@ -15,7 +15,7 @@
3884
15
 */
15
 */
3885
16
16
3886
17
import QtQuick 2.0
17
import QtQuick 2.0
3888
18
import Ubuntu.Components 1.0
18
import Ubuntu.Components 1.1
3889
19
19
3890
20
MainView {
20
MainView {
3891
21
    width: units.gu(50)
21
    width: units.gu(50)
3892
22
22
3893
=== modified file 'tests/resources/toolbar/panels.qml'
3894
--- tests/resources/toolbar/panels.qml	2014-04-20 19:25:12 +0000
3895
+++ tests/resources/toolbar/panels.qml	2014-04-25 13:00:38 +0000
3896
@@ -15,7 +15,7 @@
3897
15
 */
15
 */
3898
16
16
3899
17
import QtQuick 2.0
17
import QtQuick 2.0
3901
18
import Ubuntu.Components 1.0
18
import Ubuntu.Components 1.1
3902
19
19
3903
20
Rectangle {
20
Rectangle {
3904
21
    color: "grey"
21
    color: "grey"
3905
22
22
3906
=== modified file 'tests/resources/toolbar/toolbar.qml'
3907
--- tests/resources/toolbar/toolbar.qml	2014-04-20 19:25:12 +0000
3908
+++ tests/resources/toolbar/toolbar.qml	2014-04-25 13:00:38 +0000
3909
@@ -15,7 +15,7 @@
3910
15
 */
15
 */
3911
16
16
3912
17
import QtQuick 2.0
17
import QtQuick 2.0
3914
18
import Ubuntu.Components 1.0
18
import Ubuntu.Components 1.1
3915
19
19
3916
20
MainView {
20
MainView {
3917
21
    width: units.gu(50)
21
    width: units.gu(50)
3918
22
22
3919
=== modified file 'tests/resources/urihandler/UriHandlerTest.qml'
3920
--- tests/resources/urihandler/UriHandlerTest.qml	2014-04-20 19:25:12 +0000
3921
+++ tests/resources/urihandler/UriHandlerTest.qml	2014-04-25 13:00:38 +0000
3922
@@ -17,7 +17,7 @@
3923
17
 */
17
 */
3924
18
18
3925
19
import QtQuick 2.0
19
import QtQuick 2.0
3927
20
import Ubuntu.Components 1.0
20
import Ubuntu.Components 1.1
3928
21
21
3929
22
Item {
22
Item {
3930
23
    id: mainView
23
    id: mainView
3931
24
24
3932
=== modified file 'tests/unit/tst_components/tst_CrossFadeImage.qml'
3933
--- tests/unit/tst_components/tst_CrossFadeImage.qml	2014-04-20 19:25:12 +0000
3934
+++ tests/unit/tst_components/tst_CrossFadeImage.qml	2014-04-25 13:00:38 +0000
3935
@@ -16,7 +16,7 @@
3936
16
16
3937
17
import QtQuick 2.0
17
import QtQuick 2.0
3938
18
import QtTest 1.0
18
import QtTest 1.0
3940
19
import Ubuntu.Components 1.0
19
import Ubuntu.Components 1.1
3941
20
20
3942
21
TestCase {
21
TestCase {
3943
22
    name: "CrossFadeImage"
22
    name: "CrossFadeImage"
3944
23
23
3945
=== modified file 'tests/unit/tst_components/tst_abstractbutton.qml'
3946
--- tests/unit/tst_components/tst_abstractbutton.qml	2014-04-20 19:25:12 +0000
3947
+++ tests/unit/tst_components/tst_abstractbutton.qml	2014-04-25 13:00:38 +0000
3948
@@ -16,7 +16,7 @@
3949
16
16
3950
17
import QtQuick 2.0
17
import QtQuick 2.0
3951
18
import QtTest 1.0
18
import QtTest 1.0
3953
19
import Ubuntu.Components 1.0
19
import Ubuntu.Components 1.1
3954
20
20
3955
21
TestCase {
21
TestCase {
3956
22
     name: "AbstractButtonAPI"
22
     name: "AbstractButtonAPI"
3957
23
23
3958
=== modified file 'tests/unit/tst_components/tst_action.qml'
3959
--- tests/unit/tst_components/tst_action.qml	2014-04-20 19:25:12 +0000
3960
+++ tests/unit/tst_components/tst_action.qml	2014-04-25 13:00:38 +0000
3961
@@ -16,7 +16,7 @@
3962
16
16
3963
17
import QtQuick 2.0
17
import QtQuick 2.0
3964
18
import QtTest 1.0
18
import QtTest 1.0
3966
19
import Ubuntu.Components 1.0
19
import Ubuntu.Components 1.1
3967
20
20
3968
21
TestCase {
21
TestCase {
3969
22
     name: "ActionAPI"
22
     name: "ActionAPI"
3970
23
23
3971
=== modified file 'tests/unit/tst_components/tst_actionitem.qml'
3972
--- tests/unit/tst_components/tst_actionitem.qml	2014-04-20 19:25:12 +0000
3973
+++ tests/unit/tst_components/tst_actionitem.qml	2014-04-25 13:00:38 +0000
3974
@@ -16,7 +16,7 @@
3975
16
16
3976
17
import QtQuick 2.0
17
import QtQuick 2.0
3977
18
import QtTest 1.0
18
import QtTest 1.0
3979
19
import Ubuntu.Components 1.0
19
import Ubuntu.Components 1.1
3980
20
20
3981
21
TestCase {
21
TestCase {
3982
22
     name: "ActionItemAPI"
22
     name: "ActionItemAPI"
3983
23
23
3984
=== modified file 'tests/unit/tst_components/tst_activityindicator.qml'
3985
--- tests/unit/tst_components/tst_activityindicator.qml	2014-04-20 19:25:12 +0000
3986
+++ tests/unit/tst_components/tst_activityindicator.qml	2014-04-25 13:00:38 +0000
3987
@@ -16,7 +16,7 @@
3988
16
16
3989
17
import QtQuick 2.0
17
import QtQuick 2.0
3990
18
import QtTest 1.0
18
import QtTest 1.0
3992
19
import Ubuntu.Components 1.0
19
import Ubuntu.Components 1.1
3993
20
20
3994
21
TestCase {
21
TestCase {
3995
22
     name: "ActivityIndicatorAPI"
22
     name: "ActivityIndicatorAPI"
3996
23
23
3997
=== modified file 'tests/unit/tst_components/tst_button.qml'
3998
--- tests/unit/tst_components/tst_button.qml	2014-04-20 19:25:12 +0000
3999
+++ tests/unit/tst_components/tst_button.qml	2014-04-25 13:00:38 +0000
4000
@@ -16,7 +16,7 @@
4001
16
16
4002
17
import QtQuick 2.0
17
import QtQuick 2.0
4003
18
import QtTest 1.0
18
import QtTest 1.0
4005
19
import Ubuntu.Components 1.0
19
import Ubuntu.Components 1.1
4006
20
20
4007
21
TestCase {
21
TestCase {
4008
22
    name: "ButtonAPI"
22
    name: "ButtonAPI"
4009
@@ -53,6 +53,10 @@
4010
53
        compare(button.color,newColor,"Can set/get color")
53
        compare(button.color,newColor,"Can set/get color")
4011
54
    }
54
    }
4012
55
55
4013
56
    function test_font() {
4014
57
        verify(button.font === Qt.font({family: "Ubuntu", pixelSize: FontUtils.sizeToPixels("medium")}), "Default font differs");
4015
58
    }
4016
59
4017
56
    function test_hovered() {
60
    function test_hovered() {
4018
57
        compare(button.hovered,false,"Hovered is boolean and false by default")
61
        compare(button.hovered,false,"Hovered is boolean and false by default")
4019
58
    }
62
    }
4020
59
63
4021
=== modified file 'tests/unit/tst_components/tst_checkbox.qml'
4022
--- tests/unit/tst_components/tst_checkbox.qml	2014-04-20 19:25:12 +0000
4023
+++ tests/unit/tst_components/tst_checkbox.qml	2014-04-25 13:00:38 +0000
4024
@@ -16,7 +16,7 @@
4025
16
16
4026
17
import QtQuick 2.0
17
import QtQuick 2.0
4027
18
import QtTest 1.0
18
import QtTest 1.0
4029
19
import Ubuntu.Components 1.0
19
import Ubuntu.Components 1.1
4030
20
import Ubuntu.Unity.Action 1.1 as UnityActions
20
import Ubuntu.Unity.Action 1.1 as UnityActions
4031
21
21
4032
22
TestCase {
22
TestCase {
4033
23
23
4034
=== modified file 'tests/unit/tst_components/tst_clipboard.qml'
4035
--- tests/unit/tst_components/tst_clipboard.qml	2014-04-20 19:25:12 +0000
4036
+++ tests/unit/tst_components/tst_clipboard.qml	2014-04-25 13:00:38 +0000
4037
@@ -16,7 +16,7 @@
4038
16
16
4039
17
import QtQuick 2.0
17
import QtQuick 2.0
4040
18
import QtTest 1.0
18
import QtTest 1.0
4042
19
import Ubuntu.Components 1.0
19
import Ubuntu.Components 1.1
4043
20
20
4044
21
TestCase {
21
TestCase {
4045
22
    name: "ClipboardAPI"
22
    name: "ClipboardAPI"
4046
23
23
4047
=== modified file 'tests/unit/tst_components/tst_dateutils.qml'
4048
--- tests/unit/tst_components/tst_dateutils.qml	2014-04-20 19:25:12 +0000
4049
+++ tests/unit/tst_components/tst_dateutils.qml	2014-04-25 13:00:38 +0000
4050
@@ -17,7 +17,7 @@
4051
17
import QtQuick 2.0
17
import QtQuick 2.0
4052
18
import QtTest 1.0
18
import QtTest 1.0
4053
19
import Ubuntu.Test 1.0
19
import Ubuntu.Test 1.0
4055
20
import Ubuntu.Components 1.0
20
import Ubuntu.Components 1.1
4056
21
21
4057
22
/*
22
/*
4058
23
 Implementation note:
23
 Implementation note:
4059
24
24
4060
=== modified file 'tests/unit/tst_components/tst_fontutils.qml'
4061
--- tests/unit/tst_components/tst_fontutils.qml	2014-04-20 19:25:12 +0000
4062
+++ tests/unit/tst_components/tst_fontutils.qml	2014-04-25 13:00:38 +0000
4063
@@ -16,7 +16,7 @@
4064
16
16
4065
17
import QtQuick 2.0
17
import QtQuick 2.0
4066
18
import QtTest 1.0
18
import QtTest 1.0
4068
19
import Ubuntu.Components 1.0
19
import Ubuntu.Components 1.1
4069
20
20
4070
21
TestCase {
21
TestCase {
4071
22
    name: "FontUtilsAPI"
22
    name: "FontUtilsAPI"
4072
23
23
4073
=== modified file 'tests/unit/tst_components/tst_label.qml'
4074
--- tests/unit/tst_components/tst_label.qml	2014-04-20 19:25:12 +0000
4075
+++ tests/unit/tst_components/tst_label.qml	2014-04-25 13:00:38 +0000
4076
@@ -16,7 +16,7 @@
4077
16
16
4078
17
import QtQuick 2.0
17
import QtQuick 2.0
4079
18
import QtTest 1.0
18
import QtTest 1.0
4081
19
import Ubuntu.Components 1.0
19
import Ubuntu.Components 1.1
4082
20
20
4083
21
TestCase {
21
TestCase {
4084
22
    name: "LabelAPI"
22
    name: "LabelAPI"
4085
23
23
4086
=== modified file 'tests/unit/tst_components/tst_listitems_singlecontrol.qml'
4087
--- tests/unit/tst_components/tst_listitems_singlecontrol.qml	2014-04-20 19:25:12 +0000
4088
+++ tests/unit/tst_components/tst_listitems_singlecontrol.qml	2014-04-25 13:00:38 +0000
4089
@@ -16,7 +16,7 @@
4090
16
16
4091
17
import QtQuick 2.0
17
import QtQuick 2.0
4092
18
import QtTest 1.0
18
import QtTest 1.0
4094
19
import Ubuntu.Components 1.0
19
import Ubuntu.Components 1.1
4095
20
import Ubuntu.Components.ListItems 1.0 as ListItem
20
import Ubuntu.Components.ListItems 1.0 as ListItem
4096
21
21
4097
22
TestCase {
22
TestCase {
4098
23
23
4099
=== modified file 'tests/unit/tst_components/tst_mainview.qml'
4100
--- tests/unit/tst_components/tst_mainview.qml	2014-04-20 19:25:12 +0000
4101
+++ tests/unit/tst_components/tst_mainview.qml	2014-04-25 13:00:38 +0000
4102
@@ -16,7 +16,7 @@
4103
16
16
4104
17
import QtQuick 2.0
17
import QtQuick 2.0
4105
18
import QtTest 1.0
18
import QtTest 1.0
4107
19
import Ubuntu.Components 1.0
19
import Ubuntu.Components 1.1
4108
20
20
4109
21
TestCase {
21
TestCase {
4110
22
    name: "MainViewAPI"
22
    name: "MainViewAPI"
4111
23
23
4112
=== modified file 'tests/unit/tst_components/tst_page.qml'
4113
--- tests/unit/tst_components/tst_page.qml	2014-04-20 19:25:12 +0000
4114
+++ tests/unit/tst_components/tst_page.qml	2014-04-25 13:00:38 +0000
4115
@@ -16,7 +16,7 @@
4116
16
16
4117
17
import QtQuick 2.0
17
import QtQuick 2.0
4118
18
import QtTest 1.0
18
import QtTest 1.0
4120
19
import Ubuntu.Components 1.0
19
import Ubuntu.Components 1.1
4121
20
20
4122
21
Item {
21
Item {
4123
22
    width: 200
22
    width: 200
4124
23
23
4125
=== modified file 'tests/unit/tst_components/tst_pagestack.qml'
4126
--- tests/unit/tst_components/tst_pagestack.qml	2014-04-23 18:14:56 +0000
4127
+++ tests/unit/tst_components/tst_pagestack.qml	2014-04-25 13:00:38 +0000
4128
@@ -16,7 +16,7 @@
4129
16
16
4130
17
import QtQuick 2.0
17
import QtQuick 2.0
4131
18
import QtTest 1.0
18
import QtTest 1.0
4133
19
import Ubuntu.Components 1.0
19
import Ubuntu.Components 1.1
4134
20
20
4135
21
TestCase {
21
TestCase {
4136
22
    name: "PageStackAPI"
22
    name: "PageStackAPI"
4137
23
23
4138
=== modified file 'tests/unit/tst_components/tst_plugin_ucunits.qml'
4139
--- tests/unit/tst_components/tst_plugin_ucunits.qml	2014-04-20 19:25:12 +0000
4140
+++ tests/unit/tst_components/tst_plugin_ucunits.qml	2014-04-25 13:00:38 +0000
4141
@@ -16,7 +16,7 @@
4142
16
16
4143
17
import QtQuick 2.0
17
import QtQuick 2.0
4144
18
import QtTest 1.0
18
import QtTest 1.0
4146
19
import Ubuntu.Components 1.0
19
import Ubuntu.Components 1.1
4147
20
20
4148
21
TestCase {
21
TestCase {
4149
22
     name: "UCUnitsAPI"
22
     name: "UCUnitsAPI"
4150
23
23
4151
=== modified file 'tests/unit/tst_components/tst_popups_actionselectionpopover.qml'
4152
--- tests/unit/tst_components/tst_popups_actionselectionpopover.qml	2014-04-20 19:25:12 +0000
4153
+++ tests/unit/tst_components/tst_popups_actionselectionpopover.qml	2014-04-25 13:00:38 +0000
4154
@@ -16,7 +16,7 @@
4155
16
16
4156
17
import QtQuick 2.0
17
import QtQuick 2.0
4157
18
import QtTest 1.0
18
import QtTest 1.0
4159
19
import Ubuntu.Components 1.0
19
import Ubuntu.Components 1.1
4160
20
import Ubuntu.Components.Popups 1.0
20
import Ubuntu.Components.Popups 1.0
4161
21
21
4162
22
TestCase {
22
TestCase {
4163
23
23
4164
=== modified file 'tests/unit/tst_components/tst_popups_composersheet.qml'
4165
--- tests/unit/tst_components/tst_popups_composersheet.qml	2014-04-20 19:25:12 +0000
4166
+++ tests/unit/tst_components/tst_popups_composersheet.qml	2014-04-25 13:00:38 +0000
4167
@@ -16,7 +16,7 @@
4168
16
16
4169
17
import QtQuick 2.0
17
import QtQuick 2.0
4170
18
import QtTest 1.0
18
import QtTest 1.0
4172
19
import Ubuntu.Components 1.0
19
import Ubuntu.Components 1.1
4173
20
import Ubuntu.Components.Popups 1.0
20
import Ubuntu.Components.Popups 1.0
4174
21
21
4175
22
TestCase {
22
TestCase {
4176
23
23
4177
=== modified file 'tests/unit/tst_components/tst_popups_defaultsheet.qml'
4178
--- tests/unit/tst_components/tst_popups_defaultsheet.qml	2014-04-20 19:25:12 +0000
4179
+++ tests/unit/tst_components/tst_popups_defaultsheet.qml	2014-04-25 13:00:38 +0000
4180
@@ -16,7 +16,7 @@
4181
16
16
4182
17
import QtQuick 2.0
17
import QtQuick 2.0
4183
18
import QtTest 1.0
18
import QtTest 1.0
4185
19
import Ubuntu.Components 1.0
19
import Ubuntu.Components 1.1
4186
20
import Ubuntu.Components.Popups 1.0
20
import Ubuntu.Components.Popups 1.0
4187
21
21
4188
22
TestCase {
22
TestCase {
4189
23
23
4190
=== modified file 'tests/unit/tst_components/tst_popups_dialog.qml'
4191
--- tests/unit/tst_components/tst_popups_dialog.qml	2014-04-20 19:25:12 +0000
4192
+++ tests/unit/tst_components/tst_popups_dialog.qml	2014-04-25 13:00:38 +0000
4193
@@ -16,7 +16,7 @@
4194
16
16
4195
17
import QtQuick 2.0
17
import QtQuick 2.0
4196
18
import QtTest 1.0
18
import QtTest 1.0
4198
19
import Ubuntu.Components 1.0
19
import Ubuntu.Components 1.1
4199
20
import Ubuntu.Components.Popups 1.0
20
import Ubuntu.Components.Popups 1.0
4200
21
21
4201
22
TestCase {
22
TestCase {
4202
23
23
4203
=== modified file 'tests/unit/tst_components/tst_popups_popover.qml'
4204
--- tests/unit/tst_components/tst_popups_popover.qml	2014-04-20 19:25:12 +0000
4205
+++ tests/unit/tst_components/tst_popups_popover.qml	2014-04-25 13:00:38 +0000
4206
@@ -15,7 +15,7 @@
4207
15
 */
15
 */
4208
16
import QtQuick 2.0
16
import QtQuick 2.0
4209
17
import QtTest 1.0
17
import QtTest 1.0
4211
18
import Ubuntu.Components 1.0
18
import Ubuntu.Components 1.1
4212
19
import Ubuntu.Components.Popups 1.0
19
import Ubuntu.Components.Popups 1.0
4213
20
20
4214
21
TestCase {
21
TestCase {
4215
22
22
4216
=== modified file 'tests/unit/tst_components/tst_progressbar.qml'
4217
--- tests/unit/tst_components/tst_progressbar.qml	2014-04-20 19:25:12 +0000
4218
+++ tests/unit/tst_components/tst_progressbar.qml	2014-04-25 13:00:38 +0000
4219
@@ -16,7 +16,7 @@
4220
16
16
4221
17
import QtQuick 2.0
17
import QtQuick 2.0
4222
18
import QtTest 1.0
18
import QtTest 1.0
4224
19
import Ubuntu.Components 1.0
19
import Ubuntu.Components 1.1
4225
20
20
4226
21
TestCase {
21
TestCase {
4227
22
     name: "ProgressBarAPI"
22
     name: "ProgressBarAPI"
4228
23
23
4229
=== modified file 'tests/unit/tst_components/tst_quickutils.qml'
4230
--- tests/unit/tst_components/tst_quickutils.qml	2014-04-20 19:25:12 +0000
4231
+++ tests/unit/tst_components/tst_quickutils.qml	2014-04-25 13:00:38 +0000
4232
@@ -16,7 +16,7 @@
4233
16
16
4234
17
import QtQuick 2.0
17
import QtQuick 2.0
4235
18
import QtTest 1.0
18
import QtTest 1.0
4237
19
import Ubuntu.Components 1.0
19
import Ubuntu.Components 1.1
4238
20
import Ubuntu.Components.ListItems 1.0
20
import Ubuntu.Components.ListItems 1.0
4239
21
21
4240
22
Item {
22
Item {
4241
23
23
4242
=== modified file 'tests/unit/tst_components/tst_scrollbar.qml'
4243
--- tests/unit/tst_components/tst_scrollbar.qml	2014-04-20 19:25:12 +0000
4244
+++ tests/unit/tst_components/tst_scrollbar.qml	2014-04-25 13:00:38 +0000
4245
@@ -16,7 +16,7 @@
4246
16
16
4247
17
import QtQuick 2.0
17
import QtQuick 2.0
4248
18
import QtTest 1.0
18
import QtTest 1.0
4250
19
import Ubuntu.Components 1.0
19
import Ubuntu.Components 1.1
4251
20
20
4252
21
TestCase {
21
TestCase {
4253
22
    name: "ScrollbarAPI"
22
    name: "ScrollbarAPI"
4254
23
23
4255
=== modified file 'tests/unit/tst_components/tst_slider.qml'
4256
--- tests/unit/tst_components/tst_slider.qml	2014-04-20 19:25:12 +0000
4257
+++ tests/unit/tst_components/tst_slider.qml	2014-04-25 13:00:38 +0000
4258
@@ -16,7 +16,7 @@
4259
16
16
4260
17
import QtQuick 2.0
17
import QtQuick 2.0
4261
18
import QtTest 1.0
18
import QtTest 1.0
4263
19
import Ubuntu.Components 1.0
19
import Ubuntu.Components 1.1
4264
20
20
4265
21
TestCase {
21
TestCase {
4266
22
     name: "SliderAPI"
22
     name: "SliderAPI"
4267
23
23
4268
=== modified file 'tests/unit/tst_components/tst_switch.qml'
4269
--- tests/unit/tst_components/tst_switch.qml	2014-04-20 19:25:12 +0000
4270
+++ tests/unit/tst_components/tst_switch.qml	2014-04-25 13:00:38 +0000
4271
@@ -16,7 +16,7 @@
4272
16
16
4273
17
import QtQuick 2.0
17
import QtQuick 2.0
4274
18
import QtTest 1.0
18
import QtTest 1.0
4276
19
import Ubuntu.Components 1.0
19
import Ubuntu.Components 1.1
4277
20
20
4278
21
TestCase {
21
TestCase {
4279
22
     name: "SwitchAPI"
22
     name: "SwitchAPI"
4280
23
23
4281
=== modified file 'tests/unit/tst_components/tst_tab.qml'
4282
--- tests/unit/tst_components/tst_tab.qml	2014-04-20 19:25:12 +0000
4283
+++ tests/unit/tst_components/tst_tab.qml	2014-04-25 13:00:38 +0000
4284
@@ -16,7 +16,7 @@
4285
16
16
4286
17
import QtQuick 2.0
17
import QtQuick 2.0
4287
18
import QtTest 1.0
18
import QtTest 1.0
4289
19
import Ubuntu.Components 1.0
19
import Ubuntu.Components 1.1
4290
20
20
4291
21
TestCase {
21
TestCase {
4292
22
     name: "TabAPI"
22
     name: "TabAPI"
4293
23
23
4294
=== modified file 'tests/unit/tst_components/tst_toolbaritems.qml'
4295
--- tests/unit/tst_components/tst_toolbaritems.qml	2014-04-20 19:25:12 +0000
4296
+++ tests/unit/tst_components/tst_toolbaritems.qml	2014-04-25 13:00:38 +0000
4297
@@ -16,7 +16,7 @@
4298
16
16
4299
17
import QtQuick 2.0
17
import QtQuick 2.0
4300
18
import QtTest 1.0
18
import QtTest 1.0
4302
19
import Ubuntu.Components 1.0
19
import Ubuntu.Components 1.1
4303
20
20
4304
21
Item {
21
Item {
4305
22
    width: 200
22
    width: 200
4306
23
23
4307
=== modified file 'tests/unit/tst_components/tst_ubuntushape.qml'
4308
--- tests/unit/tst_components/tst_ubuntushape.qml	2014-04-20 19:25:12 +0000
4309
+++ tests/unit/tst_components/tst_ubuntushape.qml	2014-04-25 13:00:38 +0000
4310
@@ -16,7 +16,7 @@
4311
16
16
4312
17
import QtQuick 2.0
17
import QtQuick 2.0
4313
18
import QtTest 1.0
18
import QtTest 1.0
4315
19
import Ubuntu.Components 1.0
19
import Ubuntu.Components 1.1
4316
20
20
4317
21
TestCase {
21
TestCase {
4318
22
    name: "UbuntuShapeAPI"
22
    name: "UbuntuShapeAPI"
4319
23
23
4320
=== modified file 'tests/unit/tst_i18n/src/LocalizedApp.qml'
4321
--- tests/unit/tst_i18n/src/LocalizedApp.qml	2014-04-20 19:25:12 +0000
4322
+++ tests/unit/tst_i18n/src/LocalizedApp.qml	2014-04-25 13:00:38 +0000
4323
@@ -15,7 +15,7 @@
4324
15
 */
15
 */
4325
16
16
4326
17
import QtQuick 2.0
17
import QtQuick 2.0
4328
18
import Ubuntu.Components 1.0
18
import Ubuntu.Components 1.1
4329
19
19
4330
20
MainView {
20
MainView {
4331
21
    width: units.gu(48)
21
    width: units.gu(48)
4332
22
22
4333
=== modified file 'tests/unit/tst_mainview/AppName.qml'
4334
--- tests/unit/tst_mainview/AppName.qml	2014-04-20 19:25:12 +0000
4335
+++ tests/unit/tst_mainview/AppName.qml	2014-04-25 13:00:38 +0000
4336
@@ -15,7 +15,7 @@
4337
15
 */
15
 */
4338
16
16
4339
17
import QtQuick 2.0
17
import QtQuick 2.0
4341
18
import Ubuntu.Components 1.0
18
import Ubuntu.Components 1.1
4342
19
19
4343
20
MainView {
20
MainView {
4344
21
    objectName: "appName"
21
    objectName: "appName"
4345
22
22
4346
=== modified file 'tests/unit/tst_mainview/LocalStorage.qml'
4347
--- tests/unit/tst_mainview/LocalStorage.qml	2014-04-20 19:25:12 +0000
4348
+++ tests/unit/tst_mainview/LocalStorage.qml	2014-04-25 13:00:38 +0000
4349
@@ -15,7 +15,7 @@
4350
15
 */
15
 */
4351
16
16
4352
17
import QtQuick 2.0
17
import QtQuick 2.0
4354
18
import Ubuntu.Components 1.0
18
import Ubuntu.Components 1.1
4355
19
import QtQuick.LocalStorage 2.0
19
import QtQuick.LocalStorage 2.0
4356
20
20
4357
21
MainView {
21
MainView {
4358
22
22
4359
=== modified file 'tests/unit/tst_mainview/PageStack.qml'
4360
--- tests/unit/tst_mainview/PageStack.qml	2014-04-20 19:25:12 +0000
4361
+++ tests/unit/tst_mainview/PageStack.qml	2014-04-25 13:00:38 +0000
4362
@@ -15,7 +15,7 @@
4363
15
 */
15
 */
4364
16
16
4365
17
import QtQuick 2.0
17
import QtQuick 2.0
4367
18
import Ubuntu.Components 1.0
18
import Ubuntu.Components 1.1
4368
19
19
4369
20
MainView {
20
MainView {
4370
21
    objectName: "pageStack"
21
    objectName: "pageStack"
4371
22
22
4372
=== modified file 'tests/unit/tst_mainview/PageTitle.qml'
4373
--- tests/unit/tst_mainview/PageTitle.qml	2014-04-20 19:25:12 +0000
4374
+++ tests/unit/tst_mainview/PageTitle.qml	2014-04-25 13:00:38 +0000
4375
@@ -15,7 +15,7 @@
4376
15
 */
15
 */
4377
16
16
4378
17
import QtQuick 2.0
17
import QtQuick 2.0
4380
18
import Ubuntu.Components 1.0
18
import Ubuntu.Components 1.1
4381
19
19
4382
20
MainView {
20
MainView {
4383
21
    objectName: "pageTitle"
21
    objectName: "pageTitle"
4384
22
22
4385
=== modified file 'tests/unit/tst_mainview/TabsTitle.qml'
4386
--- tests/unit/tst_mainview/TabsTitle.qml	2014-04-20 19:25:12 +0000
4387
+++ tests/unit/tst_mainview/TabsTitle.qml	2014-04-25 13:00:38 +0000
4388
@@ -15,7 +15,7 @@
4389
15
 */
15
 */
4390
16
16
4391
17
import QtQuick 2.0
17
import QtQuick 2.0
4393
18
import Ubuntu.Components 1.0
18
import Ubuntu.Components 1.1
4394
19
19
4395
20
MainView {
20
MainView {
4396
21
    objectName: "tabsTitle"
21
    objectName: "tabsTitle"
4397
22
22
4398
=== modified file 'tests/unit/tst_page/AnchorToPage.qml'
4399
--- tests/unit/tst_page/AnchorToPage.qml	2014-04-20 19:25:12 +0000
4400
+++ tests/unit/tst_page/AnchorToPage.qml	2014-04-25 13:00:38 +0000
4401
@@ -15,7 +15,7 @@
4402
15
 */
15
 */
4403
16
16
4404
17
import QtQuick 2.0
17
import QtQuick 2.0
4406
18
import Ubuntu.Components 1.0
18
import Ubuntu.Components 1.1
4407
19
19
4408
20
MainView {
20
MainView {
4409
21
    width: units.gu(20)
21
    width: units.gu(20)
4410
22
22
4411
=== modified file 'tests/unit/tst_performance/ButtonGrid.qml'
4412
--- tests/unit/tst_performance/ButtonGrid.qml	2014-04-20 19:25:12 +0000
4413
+++ tests/unit/tst_performance/ButtonGrid.qml	2014-04-25 13:00:38 +0000
4414
@@ -15,7 +15,7 @@
4415
15
 */
15
 */
4416
16
16
4417
17
import QtQuick 2.0
17
import QtQuick 2.0
4419
18
import Ubuntu.Components 1.0
18
import Ubuntu.Components 1.1
4420
19
import Ubuntu.Components.Themes.Ambiance 0.1
19
import Ubuntu.Components.Themes.Ambiance 0.1
4421
20
20
4422
21
Grid {
21
Grid {
4423
22
22
4424
=== modified file 'tests/unit/tst_performance/ButtonStyleGrid.qml'
4425
--- tests/unit/tst_performance/ButtonStyleGrid.qml	2014-04-20 19:25:12 +0000
4426
+++ tests/unit/tst_performance/ButtonStyleGrid.qml	2014-04-25 13:00:38 +0000
4427
@@ -15,7 +15,7 @@
4428
15
 */
15
 */
4429
16
16
4430
17
import QtQuick 2.0
17
import QtQuick 2.0
4432
18
import Ubuntu.Components 1.0
18
import Ubuntu.Components 1.1
4433
19
import Ubuntu.Components.Themes.Ambiance 0.1
19
import Ubuntu.Components.Themes.Ambiance 0.1
4434
20
20
4435
21
Grid {
21
Grid {
4436
22
22
4437
=== modified file 'tests/unit/tst_performance/CheckBoxGrid.qml'
4438
--- tests/unit/tst_performance/CheckBoxGrid.qml	2014-04-20 19:25:12 +0000
4439
+++ tests/unit/tst_performance/CheckBoxGrid.qml	2014-04-25 13:00:38 +0000
4440
@@ -15,7 +15,7 @@
4441
15
 */
15
 */
4442
16
16
4443
17
import QtQuick 2.0
17
import QtQuick 2.0
4445
18
import Ubuntu.Components 1.0
18
import Ubuntu.Components 1.1
4446
19
import Ubuntu.Components.Themes.Ambiance 0.1
19
import Ubuntu.Components.Themes.Ambiance 0.1
4447
20
20
4448
21
Grid {
21
Grid {
4449
22
22
4450
=== modified file 'tests/unit/tst_performance/CheckBoxStyleGrid.qml'
4451
--- tests/unit/tst_performance/CheckBoxStyleGrid.qml	2014-04-20 19:25:12 +0000
4452
+++ tests/unit/tst_performance/CheckBoxStyleGrid.qml	2014-04-25 13:00:38 +0000
4453
@@ -15,7 +15,7 @@
4454
15
 */
15
 */
4455
16
16
4456
17
import QtQuick 2.0
17
import QtQuick 2.0
4458
18
import Ubuntu.Components 1.0
18
import Ubuntu.Components 1.1
4459
19
import Ubuntu.Components.Themes.Ambiance 0.1
19
import Ubuntu.Components.Themes.Ambiance 0.1
4460
20
20
4461
21
Grid {
21
Grid {
4462
22
22
4463
=== modified file 'tests/unit/tst_performance/LabelGrid.qml'
4464
--- tests/unit/tst_performance/LabelGrid.qml	2014-04-20 19:25:12 +0000
4465
+++ tests/unit/tst_performance/LabelGrid.qml	2014-04-25 13:00:38 +0000
4466
@@ -15,7 +15,7 @@
4467
15
 */
15
 */
4468
16
16
4469
17
import QtQuick 2.0
17
import QtQuick 2.0
4471
18
import Ubuntu.Components 1.0
18
import Ubuntu.Components 1.1
4472
19
19
4473
20
Grid {
20
Grid {
4474
21
    width: 800
21
    width: 800
4475
22
22
4476
=== modified file 'tests/unit/tst_performance/PairOfUbuntuShapeGrid.qml'
4477
--- tests/unit/tst_performance/PairOfUbuntuShapeGrid.qml	2014-04-20 19:25:12 +0000
4478
+++ tests/unit/tst_performance/PairOfUbuntuShapeGrid.qml	2014-04-25 13:00:38 +0000
4479
@@ -15,7 +15,7 @@
4480
15
 */
15
 */
4481
16
16
4482
17
import QtQuick 2.0
17
import QtQuick 2.0
4484
18
import Ubuntu.Components 1.0
18
import Ubuntu.Components 1.1
4485
19
19
4486
20
Grid {
20
Grid {
4487
21
    width: 800
21
    width: 800
4488
22
22
4489
=== modified file 'tests/unit/tst_performance/SliderGrid.qml'
4490
--- tests/unit/tst_performance/SliderGrid.qml	2014-04-20 19:25:12 +0000
4491
+++ tests/unit/tst_performance/SliderGrid.qml	2014-04-25 13:00:38 +0000
4492
@@ -15,7 +15,7 @@
4493
15
 */
15
 */
4494
16
16
4495
17
import QtQuick 2.0
17
import QtQuick 2.0
4497
18
import Ubuntu.Components 1.0
18
import Ubuntu.Components 1.1
4498
19
import Ubuntu.Components.Themes.Ambiance 0.1
19
import Ubuntu.Components.Themes.Ambiance 0.1
4499
20
20
4500
21
Grid {
21
Grid {
4501
22
22
4502
=== modified file 'tests/unit/tst_performance/SliderStyleGrid.qml'
4503
--- tests/unit/tst_performance/SliderStyleGrid.qml	2014-04-20 19:25:12 +0000
4504
+++ tests/unit/tst_performance/SliderStyleGrid.qml	2014-04-25 13:00:38 +0000
4505
@@ -15,7 +15,7 @@
4506
15
 */
15
 */
4507
16
16
4508
17
import QtQuick 2.0
17
import QtQuick 2.0
4510
18
import Ubuntu.Components 1.0
18
import Ubuntu.Components 1.1
4511
19
import Ubuntu.Components.Themes.Ambiance 0.1
19
import Ubuntu.Components.Themes.Ambiance 0.1
4512
20
20
4513
21
Grid {
21
Grid {
4514
22
22
4515
=== modified file 'tests/unit/tst_performance/SwitchGrid.qml'
4516
--- tests/unit/tst_performance/SwitchGrid.qml	2014-04-20 19:25:12 +0000
4517
+++ tests/unit/tst_performance/SwitchGrid.qml	2014-04-25 13:00:38 +0000
4518
@@ -15,7 +15,7 @@
4519
15
 */
15
 */
4520
16
16
4521
17
import QtQuick 2.0
17
import QtQuick 2.0
4523
18
import Ubuntu.Components 1.0
18
import Ubuntu.Components 1.1
4524
19
import Ubuntu.Components.Themes.Ambiance 0.1
19
import Ubuntu.Components.Themes.Ambiance 0.1
4525
20
20
4526
21
Grid {
21
Grid {
4527
22
22
4528
=== modified file 'tests/unit/tst_performance/SwitchStyleGrid.qml'
4529
--- tests/unit/tst_performance/SwitchStyleGrid.qml	2014-04-20 19:25:12 +0000
4530
+++ tests/unit/tst_performance/SwitchStyleGrid.qml	2014-04-25 13:00:38 +0000
4531
@@ -15,7 +15,7 @@
4532
15
 */
15
 */
4533
16
16
4534
17
import QtQuick 2.0
17
import QtQuick 2.0
4536
18
import Ubuntu.Components 1.0
18
import Ubuntu.Components 1.1
4537
19
import Ubuntu.Components.Themes.Ambiance 0.1
19
import Ubuntu.Components.Themes.Ambiance 0.1
4538
20
20
4539
21
Grid {
21
Grid {
4540
22
22
4541
=== modified file 'tests/unit/tst_performance/TextWithImport.qml'
4542
--- tests/unit/tst_performance/TextWithImport.qml	2014-04-20 19:25:12 +0000
4543
+++ tests/unit/tst_performance/TextWithImport.qml	2014-04-25 13:00:38 +0000
4544
@@ -15,7 +15,7 @@
4545
15
 */
15
 */
4546
16
16
4547
17
import QtQuick 2.0
17
import QtQuick 2.0
4549
18
import Ubuntu.Components 1.0
18
import Ubuntu.Components 1.1
4550
19
19
4551
20
Text {
20
Text {
4552
21
}
21
}
4553
22
22
4554
=== modified file 'tests/unit/tst_performance/UbuntuShapeGrid.qml'
4555
--- tests/unit/tst_performance/UbuntuShapeGrid.qml	2014-04-20 19:25:12 +0000
4556
+++ tests/unit/tst_performance/UbuntuShapeGrid.qml	2014-04-25 13:00:38 +0000
4557
@@ -15,7 +15,7 @@
4558
15
 */
15
 */
4559
16
16
4560
17
import QtQuick 2.0
17
import QtQuick 2.0
4562
18
import Ubuntu.Components 1.0
18
import Ubuntu.Components 1.1
4563
19
19
4564
20
Grid {
20
Grid {
4565
21
    width: 800
21
    width: 800
4566
22
22
4567
=== modified file 'tests/unit/tst_qmltemplate/tst_example_benchmark.qml'
4568
--- tests/unit/tst_qmltemplate/tst_example_benchmark.qml	2014-04-20 19:25:12 +0000
4569
+++ tests/unit/tst_qmltemplate/tst_example_benchmark.qml	2014-04-25 13:00:38 +0000
4570
@@ -16,7 +16,7 @@
4571
16
16
4572
17
import QtQuick 2.0
17
import QtQuick 2.0
4573
18
import QtTest 1.0
18
import QtTest 1.0
4575
19
import Ubuntu.Components 1.0
19
import Ubuntu.Components 1.1
4576
20
20
4577
21
TestCase {
21
TestCase {
4578
22
    name: "ExampleBenchmarkObject"
22
    name: "ExampleBenchmarkObject"
4579
23
23
4580
=== modified file 'tests/unit/tst_qmltemplate/tst_example_checks.qml'
4581
--- tests/unit/tst_qmltemplate/tst_example_checks.qml	2014-04-20 19:25:12 +0000
4582
+++ tests/unit/tst_qmltemplate/tst_example_checks.qml	2014-04-25 13:00:38 +0000
4583
@@ -16,7 +16,7 @@
4584
16
16
4585
17
import QtQuick 2.0
17
import QtQuick 2.0
4586
18
import QtTest 1.0
18
import QtTest 1.0
4588
19
import Ubuntu.Components 1.0
19
import Ubuntu.Components 1.1
4589
20
20
4590
21
Item {
21
Item {
4591
22
    id: root
22
    id: root
4592
23
23
4593
=== modified file 'tests/unit/tst_qmltemplate/tst_example_keyboard.qml'
4594
--- tests/unit/tst_qmltemplate/tst_example_keyboard.qml	2014-04-20 19:25:12 +0000
4595
+++ tests/unit/tst_qmltemplate/tst_example_keyboard.qml	2014-04-25 13:00:38 +0000
4596
@@ -16,7 +16,7 @@
4597
16
16
4598
17
import QtQuick 2.0
17
import QtQuick 2.0
4599
18
import QtTest 1.0
18
import QtTest 1.0
4601
19
import Ubuntu.Components 1.0
19
import Ubuntu.Components 1.1
4602
20
20
4603
21
Item {
21
Item {
4604
22
    id: root
22
    id: root
4605
23
23
4606
=== modified file 'tests/unit/tst_qmltemplate/tst_example_mouse.qml'
4607
--- tests/unit/tst_qmltemplate/tst_example_mouse.qml	2014-04-20 19:25:12 +0000
4608
+++ tests/unit/tst_qmltemplate/tst_example_mouse.qml	2014-04-25 13:00:38 +0000
4609
@@ -16,7 +16,7 @@
4610
16
16
4611
17
import QtQuick 2.0
17
import QtQuick 2.0
4612
18
import QtTest 1.0
18
import QtTest 1.0
4614
19
import Ubuntu.Components 1.0
19
import Ubuntu.Components 1.1
4615
20
20
4616
21
Item {
21
Item {
4617
22
    id: root
22
    id: root
4618
23
23
4619
=== modified file 'tests/unit/tst_qmltemplate/tst_example_property.qml'
4620
--- tests/unit/tst_qmltemplate/tst_example_property.qml	2014-04-20 19:25:12 +0000
4621
+++ tests/unit/tst_qmltemplate/tst_example_property.qml	2014-04-25 13:00:38 +0000
4622
@@ -16,7 +16,7 @@
4623
16
16
4624
17
import QtQuick 2.0
17
import QtQuick 2.0
4625
18
import QtTest 1.0
18
import QtTest 1.0
4627
19
import Ubuntu.Components 1.0
19
import Ubuntu.Components 1.1
4628
20
20
4629
21
Item {
21
Item {
4630
22
    id: root
22
    id: root
4631
23
23
4632
=== modified file 'tests/unit/tst_qmltemplate/tst_example_signals.qml'
4633
--- tests/unit/tst_qmltemplate/tst_example_signals.qml	2014-04-20 19:25:12 +0000
4634
+++ tests/unit/tst_qmltemplate/tst_example_signals.qml	2014-04-25 13:00:38 +0000
4635
@@ -16,7 +16,7 @@
4636
16
16
4637
17
import QtQuick 2.0
17
import QtQuick 2.0
4638
18
import QtTest 1.0
18
import QtTest 1.0
4640
19
import Ubuntu.Components 1.0
19
import Ubuntu.Components 1.1
4641
20
20
4642
21
Item {
21
Item {
4643
22
    id: root
22
    id: root
4644
23
23
4645
=== modified file 'tests/unit/tst_theme/tst_popoverforegroundstyle.qml'
4646
--- tests/unit/tst_theme/tst_popoverforegroundstyle.qml	2014-04-20 19:25:12 +0000
4647
+++ tests/unit/tst_theme/tst_popoverforegroundstyle.qml	2014-04-25 13:00:38 +0000
4648
@@ -15,7 +15,7 @@
4649
15
 */
15
 */
4650
16
import QtQuick 2.0
16
import QtQuick 2.0
4651
17
import QtTest 1.0
17
import QtTest 1.0
4653
18
import Ubuntu.Components 1.0
18
import Ubuntu.Components 1.1
4654
19
import Ubuntu.Components.Themes.Ambiance 0.1
19
import Ubuntu.Components.Themes.Ambiance 0.1
4655
20
import Ubuntu.Components.Popups 1.0
20
import Ubuntu.Components.Popups 1.0
4656
21
21
4657
22
22
4658
=== modified file 'tests/unit/tst_ubuntu_shape/no_distortion.qml'
4659
--- tests/unit/tst_ubuntu_shape/no_distortion.qml	2014-04-20 19:25:12 +0000
4660
+++ tests/unit/tst_ubuntu_shape/no_distortion.qml	2014-04-25 13:00:38 +0000
4661
@@ -15,7 +15,7 @@
4662
15
 */
15
 */
4663
16
16
4664
17
import QtQuick 2.0
17
import QtQuick 2.0
4666
18
import Ubuntu.Components 1.0
18
import Ubuntu.Components 1.1
4667
19
19
4668
20
Item {
20
Item {
4669
21
    width: 900
21
    width: 900
4670
22
22
4671
=== modified file 'tests/unit_x11/tst_components/tst_alarms.qml'
4672
--- tests/unit_x11/tst_components/tst_alarms.qml	2014-04-20 19:25:12 +0000
4673
+++ tests/unit_x11/tst_components/tst_alarms.qml	2014-04-25 13:00:38 +0000
4674
@@ -17,7 +17,7 @@
4675
17
import QtQuick 2.0
17
import QtQuick 2.0
4676
18
import QtTest 1.0
18
import QtTest 1.0
4677
19
import Ubuntu.Test 1.0
19
import Ubuntu.Test 1.0
4679
20
import Ubuntu.Components 1.0
20
import Ubuntu.Components 1.1
4680
21
21
4681
22
Item {
22
Item {
4682
23
    id: root
23
    id: root
4683
24
24
4684
=== added file 'tests/unit_x11/tst_components/tst_combobutton.qml'
4685
--- tests/unit_x11/tst_components/tst_combobutton.qml	1970-01-01 00:00:00 +0000
4686
+++ tests/unit_x11/tst_components/tst_combobutton.qml	2014-04-25 13:00:38 +0000
4687
@@ -0,0 +1,244 @@
4688
1
/*
4689
2
 * Copyright 2014 Canonical Ltd.
4690
3
 *
4691
4
 * This program is free software; you can redistribute it and/or modify
4692
5
 * it under the terms of the GNU Lesser General Public License as published by
4693
6
 * the Free Software Foundation; version 3.
4694
7
 *
4695
8
 * This program is distributed in the hope that it will be useful,
4696
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
4697
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
4698
11
 * GNU Lesser General Public License for more details.
4699
12
 *
4700
13
 * You should have received a copy of the GNU Lesser General Public License
4701
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
4702
15
 */
4703
16
4704
17
import QtQuick 2.0
4705
18
import QtTest 1.0
4706
19
import Ubuntu.Test 1.0
4707
20
import Ubuntu.Components 1.1
4708
21
import Ubuntu.Components.ListItems 1.0
4709
22
4710
23
Item {
4711
24
    width: units.gu(40)
4712
25
    height: units.gu(71)
4713
26
4714
27
    Column {
4715
28
        ComboButton {
4716
29
            id: combo
4717
30
        }
4718
31
4719
32
        ComboButton {
4720
33
            id: rectCombo
4721
34
            onClicked: expanded = false
4722
35
4723
36
            Rectangle {
4724
37
                id: rect
4725
38
                width: parent.width
4726
39
                height: units.gu(40)
4727
40
                gradient: Gradient {
4728
41
                    GradientStop {
4729
42
                        position: 0.0
4730
43
                        color: "red"
4731
44
                    }
4732
45
                    GradientStop {
4733
46
                        position: 0.5
4734
47
                        color: "green"
4735
48
                    }
4736
49
                    GradientStop {
4737
50
                        position: 1.0
4738
51
                        color: "blue"
4739
52
                    }
4740
53
                }
4741
54
            }
4742
55
        }
4743
56
4744
57
        ComboButton {
4745
58
            id: columnCombo
4746
59
            expandedHeight: -1
4747
60
            Column {
4748
61
                id: column
4749
62
                anchors {
4750
63
                    left: parent.left
4751
64
                    right: parent.right
4752
65
                }
4753
66
                height: childrenRect.height
4754
67
                Repeater {
4755
68
                    model: 5
4756
69
                    Rectangle {
4757
70
                        width: parent.width
4758
71
                        height: units.gu(5)
4759
72
                        color: Qt.rgba(Math.random(1), Math.random(1), Math.random(1), 1);
4760
73
                    }
4761
74
                }
4762
75
            }
4763
76
        }
4764
77
4765
78
        ComboButton {
4766
79
            id: longCombo
4767
80
            expandedHeight: units.gu(40)
4768
81
            Rectangle {
4769
82
                id: longRect
4770
83
                height: units.gu(10)
4771
84
                color: "cyan"
4772
85
            }
4773
86
        }
4774
87
4775
88
        ComboButton {
4776
89
            id: listCombo
4777
90
            ListView {
4778
91
                id: list
4779
92
                model: 20
4780
93
                height: listCombo.comboListHeight
4781
94
                delegate: Standard {
4782
95
                    text: modelData
4783
96
                }
4784
97
            }
4785
98
        }
4786
99
    }
4787
100
4788
101
    SignalSpy { id: spy }
4789
102
4790
103
    UbuntuTestCase {
4791
104
        name: "ComboButton"
4792
105
        when: windowShown
4793
106
4794
107
        function cleanup() {
4795
108
            rectCombo.expanded =
4796
109
            columnCombo.expanded =
4797
110
            longCombo.expanded =
4798
111
            listCombo.expanded = false;
4799
112
            spy.clear();
4800
113
            spy.signalName = "";
4801
114
            spy.target = undefined;
4802
115
        }
4803
116
4804
117
        function test_0_defaults() {
4805
118
            compare(combo.expanded, false, "not expanded by default");
4806
119
            compare(combo.collapsedHeight, combo.implicitHeight, "collapsedHeight is implicitHeight");
4807
120
            compare(combo.expandedHeight, combo.collapsedHeight + units.gu(19.5), "expanded height default");
4808
121
            var lheight = combo.expandedHeight - combo.collapsedHeight - combo.__styleInstance.comboListMargin;
4809
122
            compare(combo.comboListHeight, lheight, "comboListHeight default");
4810
123
            compare(combo.comboList.length, 0, "comboList is empty");
4811
124
            verify(combo.font === Qt.font({family: "Ubuntu", pixelSize: FontUtils.sizeToPixels("medium")}), "Default font differs.");
4812
125
            verify(combo.dropdownColor === combo.__styleInstance.defaultDropdownColor, "Default dropdown color differs");
4813
126
        }
4814
127
4815
128
        function test_dropdownColor() {
4816
129
            rectCombo.dropdownColor = rectCombo.expanded ? "red" : "green";
4817
130
            rectCombo.expanded = false;
4818
131
            var dropdownFace = findChild(rectCombo, "combobutton_dropdown_visuals");
4819
132
            verify(dropdownFace, "Dropdown button visuals cannot be reached");
4820
133
            verify(dropdownFace.color === rectCombo.dropdownColor, "Dropdon color when collapsed wrong");
4821
134
            rectCombo.expanded = true;
4822
135
            waitForRendering(rectCombo);
4823
136
            verify(dropdownFace.color === rectCombo.dropdownColor, "Dropdon color when expanded wrong");
4824
137
        }
4825
138
4826
139
        function test_comboListWidth() {
4827
140
            var comboListHolder = findChild(rectCombo, "combobutton_combolist");
4828
141
            compare(rect.width, comboListHolder.width, "rectCombo list content width is not adjusted");
4829
142
            comboListHolder = findChild(columnCombo, "combobutton_combolist");
4830
143
            compare(column.width, comboListHolder.width, "columnCombo list content width is not adjusted");
4831
144
            comboListHolder = findChild(longCombo, "combobutton_combolist");
4832
145
            compare(longRect.width, comboListHolder.width, "longCombo list content width is not adjusted");
4833
146
            comboListHolder = findChild(listCombo, "combobutton_combolist");
4834
147
            compare(list.width, comboListHolder.width, "listCombo list content width is not adjusted");
4835
148
        }
4836
149
4837
150
        function test_expandRectComboThroughProperty() {
4838
151
            rectCombo.expanded = true;
4839
152
            waitForRendering(rectCombo);
4840
153
            var comboListPanel = findChild(rectCombo, "combobutton_combopanel");
4841
154
            tryCompareFunction(function() { return comboListPanel.opacity}, 1.0);
4842
155
        }
4843
156
4844
157
        function test_expandRectComboThroughClick() {
4845
158
            var dropDown = findChild(rectCombo, "combobutton_dropdown");
4846
159
            mouseClick(dropDown, dropDown.width / 2, dropDown.height / 2);
4847
160
            waitForRendering(rectCombo);
4848
161
            compare(rectCombo.expanded, true, "combo is not expanded");
4849
162
            var comboListPanel = findChild(rectCombo, "combobutton_combopanel");
4850
163
            tryCompareFunction(function() { return comboListPanel.opacity}, 1.0);
4851
164
        }
4852
165
4853
166
        function test_autoCollapse() {
4854
167
            var dropDown = findChild(rectCombo, "combobutton_dropdown");
4855
168
            var comboListPanel = findChild(rectCombo, "combobutton_combopanel");
4856
169
            mouseClick(dropDown, dropDown.width / 2, dropDown.height / 2);
4857
170
            waitForRendering(rectCombo);
4858
171
            compare(rectCombo.expanded, true, "combo is not expanded");
4859
172
            tryCompareFunction(function() { return comboListPanel.opacity}, 1.0);
4860
173
4861
174
            mouseClick(rectCombo, rectCombo.width / 2, rectCombo.collapsedHeight / 2);
4862
175
            waitForRendering(rectCombo);
4863
176
            compare(rectCombo.expanded, false, "combo is not collapsed");
4864
177
            tryCompareFunction(function() { return comboListPanel.opacity}, 0.0);
4865
178
        }
4866
179
4867
180
        function test_flickRectCombo() {
4868
181
            var dropDown = findChild(rectCombo, "combobutton_dropdown");
4869
182
            var comboListPanel = findChild(rectCombo, "combobutton_combopanel");
4870
183
            var comboList = findChild(rectCombo, "combobutton_combolist");
4871
184
            mouseClick(dropDown, dropDown.width / 2, dropDown.height / 2);
4872
185
            waitForRendering(rectCombo);
4873
186
            tryCompareFunction(function() { return comboListPanel.opacity}, 1.0);
4874
187
            verify(comboList.height > rectCombo.expandedHeight);
4875
188
            // comboList flicker is the combolist parent's parent
4876
189
            var comboListFlicker = comboList.parent.parent;
4877
190
            compare(comboListFlicker.interactive, true, "combo list holder must be interactive");
4878
191
4879
192
            // drag the rectangle, the Flickable should be moving
4880
193
            var x = comboListFlicker.width / 2;
4881
194
            var y = comboListFlicker.height / 2;
4882
195
            var dy = comboListFlicker.height / 6;
4883
196
            spy.target = comboListFlicker;
4884
197
            spy.signalName = "onMovementEnded";
4885
198
            mouseDrag(comboListFlicker, x, y, x, dy);
4886
199
            waitForRendering(comboListFlicker);
4887
200
            compare(spy.count, 1, "combo list content did not move");
4888
201
        }
4889
202
4890
203
        function test_autoExpandHeight() {
4891
204
            var comboListPanel = findChild(columnCombo, "combobutton_combopanel");
4892
205
            var comboList = findChild(columnCombo, "combobutton_combolist");
4893
206
            columnCombo.expanded = true;
4894
207
            waitForRendering(columnCombo);
4895
208
            tryCompareFunction(function() { return comboListPanel.opacity}, 1.0);
4896
209
            var comboListFlicker = comboList.parent.parent;
4897
210
            compare(comboListFlicker.interactive, false, "combo list holder must not be interactive");
4898
211
            compare(comboListFlicker.height, columnCombo.comboListHeight, "combo list height differs from the holder height");
4899
212
        }
4900
213
4901
214
        function test_emptyComboExpanded() {
4902
215
            var comboListPanel = findChild(combo, "combobutton_combopanel");
4903
216
            var comboList = findChild(combo, "combobutton_combolist");
4904
217
            combo.expanded = true;
4905
218
            waitForRendering(combo);
4906
219
            waitForRendering(comboListPanel);
4907
220
            tryCompareFunction(function() { return comboListPanel.opacity}, 0.0, 1000);
4908
221
        }
4909
222
4910
223
        function test_longCombo() {
4911
224
            var comboListPanel = findChild(longCombo, "combobutton_combopanel");
4912
225
            var comboList = findChild(longCombo, "combobutton_combolist");
4913
226
            longCombo.expanded = true;
4914
227
            waitForRendering(longCombo);
4915
228
            waitForRendering(comboListPanel);
4916
229
            tryCompareFunction(function() { return comboListPanel.opacity}, 1.0);
4917
230
            verify(comboListPanel.height < longCombo.expandedHeight);
4918
231
        }
4919
232
4920
233
        function test_listCombo() {
4921
234
            var comboListPanel = findChild(listCombo, "combobutton_combopanel");
4922
235
            var comboList = findChild(listCombo, "combobutton_combolist");
4923
236
            listCombo.expanded = true;
4924
237
            waitForRendering(listCombo);
4925
238
            waitForRendering(comboListPanel);
4926
239
            tryCompareFunction(function() { return comboListPanel.opacity}, 1.0);
4927
240
4928
241
            compare(list.height, comboList.height, "list and comboList height differs");
4929
242
        }
4930
243
    }
4931
244
}
4932
0
245
4933
=== modified file 'tests/unit_x11/tst_components/tst_datepicker.qml'
4934
--- tests/unit_x11/tst_components/tst_datepicker.qml	2014-04-20 19:25:12 +0000
4935
+++ tests/unit_x11/tst_components/tst_datepicker.qml	2014-04-25 13:00:38 +0000
4936
@@ -17,7 +17,7 @@
4937
17
import QtQuick 2.0
17
import QtQuick 2.0
4938
18
import QtTest 1.0
18
import QtTest 1.0
4939
19
import Ubuntu.Test 1.0
19
import Ubuntu.Test 1.0
4941
20
import Ubuntu.Components 1.0
20
import Ubuntu.Components 1.1
4942
21
import Ubuntu.Components.Pickers 1.0
21
import Ubuntu.Components.Pickers 1.0
4943
22
22
4944
23
Item {
23
Item {
4945
24
24
4946
=== modified file 'tests/unit_x11/tst_components/tst_dialer.qml'
4947
--- tests/unit_x11/tst_components/tst_dialer.qml	2014-04-20 19:25:12 +0000
4948
+++ tests/unit_x11/tst_components/tst_dialer.qml	2014-04-25 13:00:38 +0000
4949
@@ -17,7 +17,7 @@
4950
17
import QtQuick 2.0
17
import QtQuick 2.0
4951
18
import QtTest 1.0
18
import QtTest 1.0
4952
19
import Ubuntu.Test 1.0
19
import Ubuntu.Test 1.0
4954
20
import Ubuntu.Components 1.0
20
import Ubuntu.Components 1.1
4955
21
import Ubuntu.Components.Pickers 1.0
21
import Ubuntu.Components.Pickers 1.0
4956
22
22
4957
23
Item {
23
Item {
4958
24
24
4959
=== modified file 'tests/unit_x11/tst_components/tst_expandable.qml'
4960
--- tests/unit_x11/tst_components/tst_expandable.qml	2014-04-20 19:25:12 +0000
4961
+++ tests/unit_x11/tst_components/tst_expandable.qml	2014-04-25 13:00:38 +0000
4962
@@ -17,7 +17,7 @@
4963
17
import QtQuick 2.0
17
import QtQuick 2.0
4964
18
import QtTest 1.0
18
import QtTest 1.0
4965
19
import Ubuntu.Test 1.0
19
import Ubuntu.Test 1.0
4967
20
import Ubuntu.Components 1.0
20
import Ubuntu.Components 1.1
4968
21
import Ubuntu.Components.ListItems 1.0
21
import Ubuntu.Components.ListItems 1.0
4969
22
22
4970
23
Item {
23
Item {
4971
24
24
4972
=== modified file 'tests/unit_x11/tst_components/tst_expandablescolumn.qml'
4973
--- tests/unit_x11/tst_components/tst_expandablescolumn.qml	2014-04-20 19:25:12 +0000
4974
+++ tests/unit_x11/tst_components/tst_expandablescolumn.qml	2014-04-25 13:00:38 +0000
4975
@@ -17,7 +17,7 @@
4976
17
import QtQuick 2.0
17
import QtQuick 2.0
4977
18
import QtTest 1.0
18
import QtTest 1.0
4978
19
import Ubuntu.Test 1.0
19
import Ubuntu.Test 1.0
4980
20
import Ubuntu.Components 1.0
20
import Ubuntu.Components 1.1
4981
21
import Ubuntu.Components.ListItems 1.0
21
import Ubuntu.Components.ListItems 1.0
4982
22
22
4983
23
Item {
23
Item {
4984
24
24
4985
=== modified file 'tests/unit_x11/tst_components/tst_header.qml'
4986
--- tests/unit_x11/tst_components/tst_header.qml	2014-04-20 19:25:12 +0000
4987
+++ tests/unit_x11/tst_components/tst_header.qml	2014-04-25 13:00:38 +0000
4988
@@ -16,7 +16,7 @@
4989
16
16
4990
17
import QtQuick 2.0
17
import QtQuick 2.0
4991
18
import QtTest 1.0
18
import QtTest 1.0
4993
19
import Ubuntu.Components 1.0
19
import Ubuntu.Components 1.1
4994
20
20
4995
21
Item {
21
Item {
4996
22
    width: units.gu(50)
22
    width: units.gu(50)
4997
23
23
4998
=== modified file 'tests/unit_x11/tst_components/tst_hide_chrome.qml'
4999
--- tests/unit_x11/tst_components/tst_hide_chrome.qml	2014-04-23 18:14:56 +0000
5000
+++ tests/unit_x11/tst_components/tst_hide_chrome.qml	2014-04-25 13:00:38 +0000
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration	2014-04-23	Approve on 2014-04-25
Tim Peeters		2014-04-23	Approve on 2014-04-25
Nekhelesh Ramananthan		2014-04-23	Pending
Review via email: mp+216819@code.launchpad.net