1
=== modified file 'components.api'
2
--- components.api	2014-07-21 13:57:13 +0000
3
+++ components.api	2014-07-29 14:43:30 +0000
4
@@ -33,6 +33,13 @@
5
33
    property Gradient gradient
33
    property Gradient gradient
6
34
    property font font
34
    property font font
7
35
    property string iconPosition
35
    property string iconPosition
8
36
Button 1.1
9
37
AbstractButton
10
38
    property color strokeColor
11
39
    property color color
12
40
    property Gradient gradient
13
41
    property font font
14
42
    property string iconPosition
15
36
CheckBox 0.1 1.0
43
CheckBox 0.1 1.0
16
37
AbstractButton
44
AbstractButton
17
38
    property bool checked
45
    property bool checked
18
39
46
19
=== modified file 'debian/qtdeclarative5-ubuntu-ui-toolkit-plugin.install'
20
--- debian/qtdeclarative5-ubuntu-ui-toolkit-plugin.install	2014-04-29 12:50:32 +0000
21
+++ debian/qtdeclarative5-ubuntu-ui-toolkit-plugin.install	2014-07-29 14:43:30 +0000
22
@@ -6,6 +6,8 @@
23
6
usr/lib/*/qt5/qml/Ubuntu/Layouts/plugins.qmltypes
6
usr/lib/*/qt5/qml/Ubuntu/Layouts/plugins.qmltypes
24
7
usr/lib/*/qt5/qml/Ubuntu/Layouts/libUbuntuLayouts.so
7
usr/lib/*/qt5/qml/Ubuntu/Layouts/libUbuntuLayouts.so
25
8
usr/lib/*/qt5/qml/Ubuntu/Components/*.qml
8
usr/lib/*/qt5/qml/Ubuntu/Components/*.qml
26
9
usr/lib/*/qt5/qml/Ubuntu/Components/10/*.qml
27
10
usr/lib/*/qt5/qml/Ubuntu/Components/11/*.qml
28
9
usr/lib/*/qt5/qml/Ubuntu/Components/*.js
11
usr/lib/*/qt5/qml/Ubuntu/Components/*.js
29
10
usr/lib/*/qt5/qml/Ubuntu/Components/qmldir
12
usr/lib/*/qt5/qml/Ubuntu/Components/qmldir
30
11
usr/lib/*/qt5/qml/Ubuntu/Components/plugins.qmltypes
13
usr/lib/*/qt5/qml/Ubuntu/Components/plugins.qmltypes
31
12
14
32
=== modified file 'documentation/docs.sh'
33
--- documentation/docs.sh	2014-03-27 08:59:19 +0000
34
+++ documentation/docs.sh	2014-07-29 14:43:30 +0000
35
@@ -24,7 +24,7 @@
36
24
# Offline docs for QtCreator
24
# Offline docs for QtCreator
37
25
qdoc $DOC_PATH/ubuntu-ui-toolkit-qtcreator.qdocconf 2> $DOC_PATH/qdoc.log
25
qdoc $DOC_PATH/ubuntu-ui-toolkit-qtcreator.qdocconf 2> $DOC_PATH/qdoc.log
38
26
# FIXME: With Qt 5.2 this warning shows up, forcibly omit it from errors
26
# FIXME: With Qt 5.2 this warning shows up, forcibly omit it from errors
40
27
cat $DOC_PATH/qdoc.log | grep -v "qdoc: warning: No documentation for 'global'" > $DOC_PATH/qdoc.err
27
grep -v "error: HTML file already exists; overwriting" $DOC_PATH/qdoc.log | grep -v "qdoc: warning: No documentation for 'global'" > $DOC_PATH/qdoc.err
41
28
cat $DOC_PATH/qdoc.err
28
cat $DOC_PATH/qdoc.err
42
29
test ! -s $DOC_PATH/qdoc.err || exit 1
29
test ! -s $DOC_PATH/qdoc.err || exit 1
43
30
echo docs: Offline done.
30
echo docs: Offline done.
44
@@ -35,7 +35,7 @@
45
35
# Online docs. Run qdoc twice: the second run with indexes for cross-referencing
35
# Online docs. Run qdoc twice: the second run with indexes for cross-referencing
46
36
# other APIs but discard errors because qdoc inherits all doc bugs otherwise
36
# other APIs but discard errors because qdoc inherits all doc bugs otherwise
47
37
qdoc $DOC_PATH/ubuntu-ui-toolkit-online.qdocconf 2> $DOC_PATH/qdoc.log
37
qdoc $DOC_PATH/ubuntu-ui-toolkit-online.qdocconf 2> $DOC_PATH/qdoc.log
49
38
cat $DOC_PATH/qdoc.log | grep -v "qdoc: warning: No documentation for 'global'" > $DOC_PATH/qdoc.err
38
grep -v "error: HTML file already exists; overwriting" $DOC_PATH/qdoc.log | grep -v "qdoc: warning: No documentation for 'global'" > $DOC_PATH/qdoc.err
50
39
cat $DOC_PATH/qdoc.err
39
cat $DOC_PATH/qdoc.err
51
40
test ! -s $DOC_PATH/qdoc.err || exit 1
40
test ! -s $DOC_PATH/qdoc.err || exit 1
52
41
echo docs: Online done.
41
echo docs: Online done.
53
42
42
54
=== modified file 'examples/ubuntu-ui-toolkit-gallery/Buttons.qml'
55
--- examples/ubuntu-ui-toolkit-gallery/Buttons.qml	2014-04-23 09:39:11 +0000
56
+++ examples/ubuntu-ui-toolkit-gallery/Buttons.qml	2014-07-29 14:43:30 +0000
57
@@ -34,6 +34,16 @@
58
34
        }
34
        }
59
35
35
60
36
        TemplateRow {
36
        TemplateRow {
61
37
            title: i18n.tr("Stroke")
62
38
63
39
            Button {
64
40
                objectName: "button_stroke"
65
41
                text: i18n.tr("Call")
66
42
                strokeColor: UbuntuColors.warmGrey
67
43
            }
68
44
        }
69
45
70
46
        TemplateRow {
71
37
            title: i18n.tr("Color")
47
            title: i18n.tr("Color")
72
38
48
73
39
            Button {
49
            Button {
74
40
50
75
=== added directory 'modules/Ubuntu/Components/10'
76
=== added file 'modules/Ubuntu/Components/10/10.pro'
77
--- modules/Ubuntu/Components/10/10.pro	1970-01-01 00:00:00 +0000
78
+++ modules/Ubuntu/Components/10/10.pro	2014-07-29 14:43:30 +0000
79
@@ -0,0 +1,9 @@
80
1
TEMPLATE = subdirs
81
2
82
3
uri = Ubuntu.Components.10
83
4
installPath = $$[QT_INSTALL_QML]/$$replace(uri, \\., /)
84
5
85
6
qml_files.path = $$installPath
86
7
qml_files.files = *.qml
87
8
88
9
INSTALLS += qml_files
89
0
10
90
=== renamed file 'modules/Ubuntu/Components/Button.qml' => 'modules/Ubuntu/Components/10/Button.qml'
91
--- modules/Ubuntu/Components/Button.qml	2014-04-23 08:50:20 +0000
92
+++ modules/Ubuntu/Components/10/Button.qml	2014-07-29 14:43:30 +0000
93
@@ -15,105 +15,21 @@
94
15
 */
15
 */
95
16
16
96
17
import QtQuick 2.0
17
import QtQuick 2.0
97
18
import Ubuntu.Components 1.0
98
18
19
99
19
/*!
20
/*!
143
20
    \qmltype Button
21
   \internal
144
21
    \inqmlmodule Ubuntu.Components 1.1
22
   Documentation in 11/Button.qml
102
22
    \ingroup ubuntu
103
23
    \brief Standard Ubuntu button.
104
24
105
25
    \l {http://design.ubuntu.com/apps/building-blocks/buttons}{See also the Design Guidelines on Buttons}.
106
26
107
27
    Examples:
108
28
    \qml
109
29
        Column {
110
30
            Button {
111
31
                text: "Send"
112
32
                onClicked: print("clicked text-only Button")
113
33
            }
114
34
            Button {
115
35
                iconName: "compose"
116
36
                gradient: UbuntuColors.greyGradient
117
37
                onClicked: print("clicked icon-only Button")
118
38
            }
119
39
            Button {
120
40
                iconName: "compose"
121
41
                text: "Icon on left"
122
42
                iconPosition: "left"
123
43
                onClicked: print("clicked text and icon Button")
124
44
            }
125
45
        }
126
46
    \endqml
127
47
    An \l Action can be used to specify \b clicked, iconSource and text. Example:
128
48
    \qml
129
49
        Item {
130
50
            Action {
131
51
                id: action1
132
52
                text: "Click me"
133
53
                onTriggered: print("action!")
134
54
                iconName: "compose"
135
55
            }
136
56
            Button {
137
57
                anchors.centerIn: parent
138
58
                action: action1
139
59
                color: UbuntuColors.warmGrey
140
60
            }
141
61
       }
142
62
    \endqml
145
63
*/
23
*/
146
64
AbstractButton {
24
AbstractButton {
147
65
    id: button
25
    id: button
148
66
26
149
67
    /*!
150
68
       The background color of the button.
151
69
152
70
       \sa gradient
153
71
    */
154
72
    property color color: __styleInstance.defaultColor
27
    property color color: __styleInstance.defaultColor
155
73
28
156
74
    /*!
157
75
       The gradient used to fill the background of the button.
158
76
159
77
       Standard Ubuntu gradients are defined in \l UbuntuColors.
160
78
161
79
       If both a gradient and a color are specified, the gradient will be used.
162
80
163
81
       \sa color
164
82
    */
165
83
    property Gradient gradient: __styleInstance.defaultGradient
29
    property Gradient gradient: __styleInstance.defaultGradient
166
84
30
167
85
    /*!
168
86
      The font used for the button's text.
169
87
    */
170
88
    property font font: __styleInstance ? __styleInstance.defaultFont : Qt.font({family: "Ubuntu", pixelSize: FontUtils.sizeToPixels("medium")})
31
    property font font: __styleInstance ? __styleInstance.defaultFont : Qt.font({family: "Ubuntu", pixelSize: FontUtils.sizeToPixels("medium")})
171
89
32
172
90
    /*!
173
91
       The source URL of the icon to display inside the button.
174
92
       Leave this value blank for a text-only button.
175
93
       If \l action is set, the default iconSource is that of the action.
176
94
       \qmlproperty url iconSource
177
95
    */
178
96
179
97
    /*!
180
98
       The text to display in the button. If an icon was defined,
181
99
       the text will be shown next to the icon, otherwise it will
182
100
       be centered. Leave blank for an icon-only button.
183
101
       If \l action is set, the default text is that of the action.
184
102
       \qmlproperty string text
185
103
    */
186
104
187
105
    /*!
188
106
       The position of the icon relative to the text. Options
189
107
       are "left" and "right". The default value is "left".
190
108
191
109
       If only text or only an icon is defined, this
192
110
       property is ignored and the text or icon is
193
111
       centered horizontally and vertically in the button.
194
112
195
113
       Currently this is a string value. We are waiting for
196
114
       support for enums:
197
115
       https://bugreports.qt-project.org/browse/QTBUG-14861
198
116
    */
199
117
    property string iconPosition: "left"
33
    property string iconPosition: "left"
200
118
34
201
119
    style: Theme.createStyleComponent("ButtonStyle.qml", button)
35
    style: Theme.createStyleComponent("ButtonStyle.qml", button)
202
120
36
203
=== added directory 'modules/Ubuntu/Components/11'
204
=== added file 'modules/Ubuntu/Components/11/11.pro'
205
--- modules/Ubuntu/Components/11/11.pro	1970-01-01 00:00:00 +0000
206
+++ modules/Ubuntu/Components/11/11.pro	2014-07-29 14:43:30 +0000
207
@@ -0,0 +1,9 @@
208
1
TEMPLATE = subdirs
209
2
210
3
uri = Ubuntu.Components.11
211
4
installPath = $$[QT_INSTALL_QML]/$$replace(uri, \\., /)
212
5
213
6
qml_files.path = $$installPath
214
7
qml_files.files = *.qml
215
8
216
9
INSTALLS += qml_files
217
0
10
218
=== added file 'modules/Ubuntu/Components/11/Button.qml'
219
--- modules/Ubuntu/Components/11/Button.qml	1970-01-01 00:00:00 +0000
220
+++ modules/Ubuntu/Components/11/Button.qml	2014-07-29 14:43:30 +0000
221
@@ -0,0 +1,125 @@
222
1
/*
223
2
 * Copyright 2014 Canonical Ltd.
224
3
 *
225
4
 * This program is free software; you can redistribute it and/or modify
226
5
 * it under the terms of the GNU Lesser General Public License as published by
227
6
 * the Free Software Foundation; version 3.
228
7
 *
229
8
 * This program is distributed in the hope that it will be useful,
230
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
231
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
232
11
 * GNU Lesser General Public License for more details.
233
12
 *
234
13
 * You should have received a copy of the GNU Lesser General Public License
235
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
236
15
 */
237
16
238
17
import QtQuick 2.2
239
18
import Ubuntu.Components 1.1
240
19
241
20
/*!
242
21
    \qmltype Button
243
22
    \inqmlmodule Ubuntu.Components 1.1
244
23
    \ingroup ubuntu
245
24
    \brief Standard Ubuntu button.
246
25
247
26
    \l {http://design.ubuntu.com/apps/building-blocks/buttons}{See also the Design Guidelines on Buttons}.
248
27
249
28
    Examples:
250
29
    \qml
251
30
        Column {
252
31
            Button {
253
32
                text: "Send"
254
33
                onClicked: print("clicked text-only Button")
255
34
            }
256
35
            Button {
257
36
                iconName: "compose"
258
37
                gradient: UbuntuColors.greyGradient
259
38
                onClicked: print("clicked icon-only Button")
260
39
            }
261
40
            Button {
262
41
                iconName: "compose"
263
42
                text: "Icon on left"
264
43
                iconPosition: "left"
265
44
                onClicked: print("clicked text and icon Button")
266
45
            }
267
46
        }
268
47
    \endqml
269
48
    An \l Action can be used to specify \b clicked, iconSource and text. Example:
270
49
    \qml
271
50
        Item {
272
51
            Action {
273
52
                id: action1
274
53
                text: "Click me"
275
54
                onTriggered: print("action!")
276
55
                iconName: "compose"
277
56
            }
278
57
            Button {
279
58
                anchors.centerIn: parent
280
59
                action: action1
281
60
                color: UbuntuColors.warmGrey
282
61
            }
283
62
       }
284
63
    \endqml*/
285
64
AbstractButton {
286
65
    id: button
287
66
    /*!
288
67
      \since Ubuntu.Components 1.1
289
68
      If set to a color, the button has a stroke border instead of a filled shape.
290
69
    */
291
70
    property color strokeColor: Qt.rgba(0.0, 0.0, 0.0, 0.0)
292
71
293
72
    /*!
294
73
         \qmlproperty url Button::iconSource
295
74
       The source URL of the icon to display inside the button.
296
75
       Leave this value blank for a text-only button.
297
76
       If \l action is set, the default iconSource is that of the action.
298
77
    */
299
78
300
79
    /*!
301
80
       The text to display in the button. If an icon was defined,
302
81
       the text will be shown next to the icon, otherwise it will
303
82
       be centered. Leave blank for an icon-only button.
304
83
       If \l action is set, the default text is that of the action.
305
84
       \qmlproperty string Button::text
306
85
    */
307
86
308
87
    /*!
309
88
       The background color of the button.
310
89
311
90
       \sa gradient
312
91
    */
313
92
    property color color: __styleInstance.defaultColor
314
93
315
94
    /*!
316
95
       The gradient used to fill the background of the button.
317
96
318
97
       Standard Ubuntu gradients are defined in \l UbuntuColors.
319
98
320
99
       If both a gradient and a color are specified, the gradient will be used.
321
100
322
101
       \sa color
323
102
    */
324
103
    property Gradient gradient: __styleInstance.defaultGradient
325
104
326
105
    /*!
327
106
      The font used for the button's text.
328
107
    */
329
108
    property font font: __styleInstance ? __styleInstance.defaultFont : Qt.font({family: "Ubuntu", pixelSize: FontUtils.sizeToPixels("medium")})
330
109
331
110
    /*!
332
111
       The position of the icon relative to the text. Options
333
112
       are "left" and "right". The default value is "left".
334
113
335
114
       If only text or only an icon is defined, this
336
115
       property is ignored and the text or icon is
337
116
       centered horizontally and vertically in the button.
338
117
339
118
       Currently this is a string value. We are waiting for
340
119
       support for enums:
341
120
       https://bugreports.qt-project.org/browse/QTBUG-14861
342
121
    */
343
122
    property string iconPosition: "left"
344
123
345
124
    style: Theme.createStyleComponent("ButtonStyle.qml", button)
346
125
}
347
0
126
348
=== modified file 'modules/Ubuntu/Components/Components.pro'
349
--- modules/Ubuntu/Components/Components.pro	2013-07-01 05:54:33 +0000
350
+++ modules/Ubuntu/Components/Components.pro	2014-07-29 14:43:30 +0000
351
@@ -1,5 +1,5 @@
352
1
TEMPLATE = subdirs
1
TEMPLATE = subdirs
353
2
2
355
3
SUBDIRS += plugin Themes Colors
3
SUBDIRS += plugin Themes Colors 10 11
356
4
4
357
5
include(deployment.pri)
5
include(deployment.pri)
358
6
6
359
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/ButtonStyle.qml'
360
--- modules/Ubuntu/Components/Themes/Ambiance/ButtonStyle.qml	2014-04-23 08:50:20 +0000
361
+++ modules/Ubuntu/Components/Themes/Ambiance/ButtonStyle.qml	2014-07-29 14:43:30 +0000
362
@@ -22,13 +22,14 @@
363
22
Item {
22
Item {
364
23
    id: buttonStyle
23
    id: buttonStyle
365
24
24
367
25
    property Button button: styledItem
25
    property var button: styledItem
368
26
    property real minimumWidth: units.gu(10)
26
    property real minimumWidth: units.gu(10)
369
27
    property real horizontalPadding: units.gu(1)
27
    property real horizontalPadding: units.gu(1)
370
28
    property color defaultColor: UbuntuColors.orange
28
    property color defaultColor: UbuntuColors.orange
371
29
    property font defaultFont: Qt.font({family: "Ubuntu", pixelSize: FontUtils.sizeToPixels("medium")})
29
    property font defaultFont: Qt.font({family: "Ubuntu", pixelSize: FontUtils.sizeToPixels("medium")})
372
30
    property Gradient defaultGradient
30
    property Gradient defaultGradient
373
31
    property real buttonFaceOffset: 0
31
    property real buttonFaceOffset: 0
374
32
    property bool stroke: button.hasOwnProperty("strokeColor") && button.strokeColor != Qt.rgba(0.0, 0.0, 0.0, 0.0)
375
32
    /*!
33
    /*!
376
33
      The property overrides the button's default background with an item. This
34
      The property overrides the button's default background with an item. This
377
34
      item can be used by derived styles to reuse the ButtonStyle and override
35
      item can be used by derived styles to reuse the ButtonStyle and override
378
@@ -82,22 +83,54 @@
379
82
    property bool isGradient: button.gradient && (button.color == defaultColor ||
83
    property bool isGradient: button.gradient && (button.color == defaultColor ||
380
83
                              button.gradient != defaultGradient)
84
                              button.gradient != defaultGradient)
381
84
85
382
86
    Image {
383
87
        id: strokeBorder
384
88
        anchors.fill: parent
385
89
        anchors.margins: -units.gu(0.5)
386
90
        source: "artwork/stroke_button.png"
387
91
        visible: false
388
92
    }
389
93
390
94
    ShaderEffect {
391
95
        id: colorizedImage
392
96
393
97
        anchors.fill: parent
394
98
        visible: stroke && strokeBorder.status == Image.Ready
395
99
396
100
        property Item source: visible ? strokeBorder : null
397
101
        property color keyColorOut: stroke ? strokeColor : Qt.rgba(0.0, 0.0, 0.0, 0.0)
398
102
        property color keyColorIn: Qt.rgba(1.0, 1.0, 1.0, 1.0)
399
103
        property real threshold: 1.0
400
104
401
105
        fragmentShader: "
402
106
            varying highp vec2 qt_TexCoord0;
403
107
            uniform sampler2D source;
404
108
            uniform highp vec4 keyColorOut;
405
109
            uniform highp vec4 keyColorIn;
406
110
            uniform lowp float threshold;
407
111
            uniform lowp float qt_Opacity;
408
112
            void main() {
409
113
                lowp vec4 sourceColor = texture2D(source, qt_TexCoord0);
410
114
                gl_FragColor = mix(vec4(keyColorOut.rgb, 1.0) * sourceColor.a, sourceColor, step(threshold, distance(sourceColor.rgb / sourceColor.a, keyColorIn.rgb))) * qt_Opacity;
411
115
            }"
412
116
    }
413
117
414
85
    UbuntuShape {
118
    UbuntuShape {
415
86
        id: background
119
        id: background
416
87
        anchors.fill: parent
120
        anchors.fill: parent
417
88
        borderSource: "radius_idle.sci"
121
        borderSource: "radius_idle.sci"
419
89
        visible: (color.a != 0.0) || backgroundSource
122
        visible: stroke ? false : ((color.a != 0.0) || backgroundSource)
420
90
        image: backgroundSource
123
        image: backgroundSource
421
91
124
424
92
        color: backgroundSource ? "#00000000" : (isGradient ? __colorHack(gradientProxy.topColor) : __colorHack(button.color))
125
        color: stroke ? "" : (backgroundSource ? "#00000000" : (isGradient ? __colorHack(gradientProxy.topColor) : __colorHack(button.color)))
425
93
        gradientColor: backgroundSource ? "#00000000" : (isGradient ? __colorHack(gradientProxy.bottomColor) : __colorHack(button.color))
126
        gradientColor: stroke ? "" : (backgroundSource ? "#00000000" : (isGradient ? __colorHack(gradientProxy.bottomColor) : __colorHack(button.color)))
426
94
    }
127
    }
427
95
128
428
96
    UbuntuShape {
129
    UbuntuShape {
429
97
        id: backgroundPressed
130
        id: backgroundPressed
430
98
        anchors.fill: parent
131
        anchors.fill: parent
433
99
        color: background.color
132
        color: stroke ? strokeColor : background.color
434
100
        gradientColor: background.gradientColor
133
        gradientColor: stroke ? strokeColor : background.gradientColor
435
101
        borderSource: "radius_pressed.sci"
134
        borderSource: "radius_pressed.sci"
436
102
        opacity: button.pressed ? 1.0 : 0.0
135
        opacity: button.pressed ? 1.0 : 0.0
437
103
        Behavior on opacity {
136
        Behavior on opacity {
438
@@ -106,7 +139,7 @@
439
106
                easing.type: Easing.Linear
139
                easing.type: Easing.Linear
440
107
            }
140
            }
441
108
        }
141
        }
443
109
        visible: background.visible
142
        visible: stroke || background.visible
444
110
    }
143
    }
445
111
144
446
112
    ButtonForeground {
145
    ButtonForeground {
447
@@ -120,7 +153,7 @@
448
120
        /* Pick either a clear or dark text color depending on the luminance of the
153
        /* Pick either a clear or dark text color depending on the luminance of the
449
121
           background color to maintain good contrast (works in most cases)
154
           background color to maintain good contrast (works in most cases)
450
122
        */
155
        */
452
123
        textColor: ColorUtils.luminance(button.color) <= 0.85 ? "#F3F3E7" : "#888888"
156
        textColor: ColorUtils.luminance(button.color) <= 0.85 && !(stroke && !pressed) ? "#F3F3E7" : "#888888"
453
124
        iconSource: button.iconSource
157
        iconSource: button.iconSource
454
125
        iconPosition: button.iconPosition
158
        iconPosition: button.iconPosition
455
126
        iconSize: units.gu(3)
159
        iconSize: units.gu(3)
456
127
160
457
=== added file 'modules/Ubuntu/Components/Themes/Ambiance/artwork/stroke_button@27.png'
458
128
Binary files modules/Ubuntu/Components/Themes/Ambiance/artwork/stroke_button@27.png	1970-01-01 00:00:00 +0000 and modules/Ubuntu/Components/Themes/Ambiance/artwork/stroke_button@27.png	2014-07-29 14:43:30 +0000 differ
161
Binary files modules/Ubuntu/Components/Themes/Ambiance/artwork/stroke_button@27.png	1970-01-01 00:00:00 +0000 and modules/Ubuntu/Components/Themes/Ambiance/artwork/stroke_button@27.png	2014-07-29 14:43:30 +0000 differ
459
=== modified file 'modules/Ubuntu/Components/qmldir'
460
--- modules/Ubuntu/Components/qmldir	2014-07-16 11:58:43 +0000
461
+++ modules/Ubuntu/Components/qmldir	2014-07-29 14:43:30 +0000
462
@@ -6,7 +6,7 @@
463
6
ToolbarItems 0.1 ToolbarItems.qml
6
ToolbarItems 0.1 ToolbarItems.qml
464
7
ToolbarButton 0.1 ToolbarButton.qml
7
ToolbarButton 0.1 ToolbarButton.qml
465
8
MainView 0.1 MainView.qml
8
MainView 0.1 MainView.qml
467
9
Button 0.1 Button.qml
9
Button 0.1 10/Button.qml
468
10
Panel 0.1 Panel.qml
10
Panel 0.1 Panel.qml
469
11
internal DraggingArea DraggingArea.qml
11
internal DraggingArea DraggingArea.qml
470
12
Tab 0.1 Tab.qml
12
Tab 0.1 Tab.qml
471
@@ -57,7 +57,7 @@
472
57
ToolbarItems 1.0 ToolbarItems.qml
57
ToolbarItems 1.0 ToolbarItems.qml
473
58
ToolbarButton 1.0 ToolbarButton.qml
58
ToolbarButton 1.0 ToolbarButton.qml
474
59
MainView 1.0 MainView.qml
59
MainView 1.0 MainView.qml
476
60
Button 1.0 Button.qml
60
Button 1.0 10/Button.qml
477
61
Panel 1.0 Panel.qml
61
Panel 1.0 Panel.qml
478
62
Tab 1.0 Tab.qml
62
Tab 1.0 Tab.qml
479
63
TabBar 1.0 TabBar.qml
63
TabBar 1.0 TabBar.qml
480
@@ -93,6 +93,7 @@
481
93
93
482
94
#version 1.1
94
#version 1.1
483
95
ComboButton 1.1 ComboButton.qml
95
ComboButton 1.1 ComboButton.qml
484
96
Button 1.1 11/Button.qml
485
96
ProgressBar 1.1 ProgressBar11.qml
97
ProgressBar 1.1 ProgressBar11.qml
486
97
CrossFadeImage 1.1 CrossFadeImage11.qml
98
CrossFadeImage 1.1 CrossFadeImage11.qml
487
98
PullToRefresh 1.1 PullToRefresh.qml
99
PullToRefresh 1.1 PullToRefresh.qml
488
99
100
489
=== modified file 'push_to_phone.sh'
490
--- push_to_phone.sh	2014-07-22 10:47:35 +0000
491
+++ push_to_phone.sh	2014-07-29 14:43:30 +0000
492
@@ -33,7 +33,7 @@
493
33
echo modules/Ubuntu/Components/qmldir '->' /usr/lib/$ARCH/qt5/qml/Ubuntu/Components/
33
echo modules/Ubuntu/Components/qmldir '->' /usr/lib/$ARCH/qt5/qml/Ubuntu/Components/
494
34
adb push Ubuntu/Components/qmldir /usr/lib/$ARCH/qt5/qml/Ubuntu/Components/
34
adb push Ubuntu/Components/qmldir /usr/lib/$ARCH/qt5/qml/Ubuntu/Components/
495
35
cd ..
35
cd ..
497
36
for i in ListItems Pickers Popups Colors Styles Themes artwork; do
36
for i in 10 11 ListItems Pickers Popups Colors Styles Themes artwork; do
498
37
    adb push modules/Ubuntu/Components/$i/ /usr/lib/$ARCH/qt5/qml/Ubuntu/Components/$i || exit 1
37
    adb push modules/Ubuntu/Components/$i/ /usr/lib/$ARCH/qt5/qml/Ubuntu/Components/$i || exit 1
499
38
done
38
done
500
39
# Autopilot tests should always match the Toolkit
39
# Autopilot tests should always match the Toolkit
501
40
40
502
=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_main_view.py'
503
--- tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_main_view.py	2014-04-25 16:49:45 +0000
504
+++ tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_main_view.py	2014-07-29 14:43:30 +0000
505
@@ -134,7 +134,8 @@
506
134
134
507
135
    def _go_to_page1(self):
135
    def _go_to_page1(self):
508
136
        button = self.main_view.select_single(
136
        button = self.main_view.select_single(
510
137
            'Button', objectName='go_to_page1')
137
            'Button',
511
138
            objectName='go_to_page1')
512
138
        self.pointing_device.click_object(button)
139
        self.pointing_device.click_object(button)
513
139
140
514
140
    def test_go_back(self):
141
    def test_go_back(self):
515
141
142
516
=== modified file 'tests/qmlapicheck.py'
517
--- tests/qmlapicheck.py	2014-07-18 15:58:50 +0000
518
+++ tests/qmlapicheck.py	2014-07-29 14:43:30 +0000
519
@@ -74,7 +74,14 @@
520
74
        inputfiles.append(fileinput.filename())
74
        inputfiles.append(fileinput.filename())
521
75
        fileinput.nextfile()
75
        fileinput.nextfile()
522
76
76
524
77
inputfiles.sort()
77
525
78
# Sort filenames to maintain a consistent order
526
79
# Get un/versioned files in the same order
527
80
def skipversion(filename):
528
81
    for v in ['10', '11']:
529
82
        filename = filename.replace(v + '/', '')
530
83
    return filename
531
84
inputfiles.sort(key=skipversion)
532
78
85
533
79
hook = fileinput.hook_encoded('utf-8')
86
hook = fileinput.hook_encoded('utf-8')
534
80
for line in fileinput.input(inputfiles, openhook=hook):
87
for line in fileinput.input(inputfiles, openhook=hook):
Reviewer	Review Type	Date Requested	Status
Tim Peeters			Approve on 2014-07-29
PS Jenkins bot	continuous-integration		Approve on 2014-07-28
Zsombor Egri		2014-06-20	Approve on 2014-06-26
Review via email: mp+223944@code.launchpad.net