1
=== modified file 'components.api'
2
--- components.api	2016-04-05 05:56:32 +0000
3
+++ components.api	2016-04-08 16:09:06 +0000
4
@@ -246,12 +246,13 @@
5
246
    property Gradient gradient
246
    property Gradient gradient
6
247
    property string iconPosition
247
    property string iconPosition
7
248
    property color strokeColor
248
    property color strokeColor
9
249
Ubuntu.Components.Button 1.3: AbstractButton
249
Ubuntu.Components.Button 1.3 UbuntuToolkit::Button: AbstractButton
10
250
    property color color
250
    property color color
11
251
    property QFont font
251
    property QFont font
14
252
    property Gradient gradient
252
    property QGradient gradient
15
253
    property string iconPosition
253
    property IconPosition iconPosition
16
254
    property color strokeColor
254
    property color strokeColor
17
255
    property Type type
18
255
Ubuntu.Components.ListItems.Caption 1.0 0.1: Item
256
Ubuntu.Components.ListItems.Caption 1.0 0.1: Item
19
256
    property string text
257
    property string text
20
257
Ubuntu.Components.ListItems.Caption 1.3: Item
258
Ubuntu.Components.ListItems.Caption 1.3: Item
21
@@ -1398,6 +1399,8 @@
22
1398
    property int textFormat
1399
    property int textFormat
23
1399
    property int verticalAlignment
1400
    property int verticalAlignment
24
1400
    property int wrapMode
1401
    property int wrapMode
25
1402
Ubuntu.Components.TextButton 1.3 UbuntuToolkit::TextButton: AbstractButton
26
1403
    property bool strong
27
1401
Ubuntu.Components.TextField 1.0 0.1: ActionItem
1404
Ubuntu.Components.TextField 1.0 0.1: ActionItem
28
1402
    readonly property bool acceptableInput
1405
    readonly property bool acceptableInput
29
1403
    property bool autoScroll
1406
    property bool autoScroll
30
@@ -1743,6 +1746,16 @@
31
1743
    function var warningFormat(var line, var column, var message)
1746
    function var warningFormat(var line, var column, var message)
32
1744
    function var waitForHeaderAnimation(var mainView)
1747
    function var waitForHeaderAnimation(var mainView)
33
1745
    readonly property QuickTestUtil testUtil
1748
    readonly property QuickTestUtil testUtil
34
1749
Ubuntu.Components.UbuntuToolkit.Button: Enum
35
1750
    Negative
36
1751
    Normal
37
1752
    Outline
38
1753
    Positive
39
1754
Ubuntu.Components.UbuntuToolkit.Button: Enum
40
1755
    After
41
1756
    Before
42
1757
    left
43
1758
    right
44
1746
Ubuntu.Components.UriHandler 1.0 0.1: QtObject singleton
1759
Ubuntu.Components.UriHandler 1.0 0.1: QtObject singleton
45
1747
    signal opened(QStringList uris)
1760
    signal opened(QStringList uris)
46
1748
Ubuntu.Components.ListItems.ValueSelector 1.0 0.1: Empty
1761
Ubuntu.Components.ListItems.ValueSelector 1.0 0.1: Empty
47
1749
1762
48
=== modified file 'examples/ubuntu-ui-toolkit-gallery/Buttons.qml'
49
--- examples/ubuntu-ui-toolkit-gallery/Buttons.qml	2016-02-12 10:55:51 +0000
50
+++ examples/ubuntu-ui-toolkit-gallery/Buttons.qml	2016-04-08 16:09:06 +0000
51
@@ -25,85 +25,150 @@
52
25
        className: "Button"
25
        className: "Button"
53
26
26
54
27
        TemplateFlow {
27
        TemplateFlow {
56
28
            title: i18n.tr("Standard")
28
            title: i18n.tr("Types")
57
29
29
58
30
            Button {
30
            Button {
61
31
                objectName: "button_text"
31
                objectName: "button_neutral"
62
32
                text: i18n.tr("Call")
32
                text: i18n.tr("Normal")
63
33
            }
64
34
            Button {
65
35
                objectName: "button_positive"
66
36
                text: i18n.tr("Positive")
67
37
                type: Button.Positive
68
38
            }
69
39
            Button {
70
40
                objectName: "button_negative"
71
41
                text: i18n.tr("Negative")
72
42
                type: Button.Negative
73
43
            }
74
44
            Button {
75
45
                objectName: "button_outline"
76
46
                text: i18n.tr("Outline")
77
47
                type: Button.Outline
78
33
            }
48
            }
79
34
        }
49
        }
80
35
50
81
36
        TemplateFlow {
51
        TemplateFlow {
83
37
            title: i18n.tr("Stroke")
52
            title: "Disabled"
84
38
53
85
39
            Button {
54
            Button {
89
40
                objectName: "button_stroke"
55
                objectName: "button_normal_disabled"
90
41
                text: i18n.tr("Call")
56
                text: i18n.tr("Neutral")
91
42
                strokeColor: UbuntuColors.warmGrey
57
                enabled: false
92
58
            }
93
59
            Button {
94
60
                objectName: "button_positive_disabled"
95
61
                text: i18n.tr("Positive")
96
62
                type: Button.Positive
97
63
                enabled: false
98
64
            }
99
65
            Button {
100
66
                objectName: "button_negative_disabled"
101
67
                text: i18n.tr("Negative")
102
68
                type: Button.Negative
103
69
                enabled: false
104
70
            }
105
71
            Button {
106
72
                objectName: "button_outline_disabled"
107
73
                text: i18n.tr("Outline")
108
74
                type: Button.Outline
109
75
                enabled: false
110
43
            }
76
            }
111
44
        }
77
        }
112
45
78
113
46
        TemplateFlow {
79
        TemplateFlow {
114
47
            title: i18n.tr("Color")
80
            title: i18n.tr("Color")
115
48
116
49
            Button {
81
            Button {
117
82
                id: buttonColor
118
50
                objectName: "button_color"
83
                objectName: "button_color"
119
51
                width: units.gu(20)
120
52
                action: Action {
84
                action: Action {
123
53
                    text: i18n.tr("C&all %1").arg(shortcut)
85
                    text: i18n.tr("Switch (%1)").arg(shortcut)
124
54
                    shortcut: 'Ctrl+L'
86
                    shortcut: 'Ctrl+C'
125
55
                    property bool flipped
87
                    property bool flipped
126
56
                    onTriggered: flipped = !flipped
88
                    onTriggered: flipped = !flipped
127
57
                }
89
                }
129
58
                color: action.flipped ? UbuntuColors.blue : UbuntuColors.green
90
                StyleHints {
130
91
                    textColor: "white"
131
92
                    color: (
132
93
                        buttonColor.action.flipped? "#3EB34F" : "#19B6EE"
133
94
                    )
134
95
                }
135
59
            }
96
            }
136
60
        }
97
        }
137
61
98
138
62
        TemplateFlow {
99
        TemplateFlow {
139
63
            title: i18n.tr("Icon")
100
            title: i18n.tr("Icon")
178
64
101
            Button {
179
65
            Button {
102
                objectName: "button_icon"
180
66
                objectName: "button_iconsource"
103
                type: Button.Positive
181
67
                iconSource: "call.png"
104
                iconName: "call-start"
182
68
            }
105
                StyleHints {
183
69
        }
106
                    minimumWidth: 0
184
70
107
                }
185
71
        TemplateFlow {
108
            }
186
72
            title: i18n.tr("Icon+Text")
109
        }
187
73
110
188
74
            Button {
111
        TemplateFlow {
189
75
                objectName: "button_iconsource_right_text"
112
            title: i18n.tr("Icon + Text")
190
76
                width: units.gu(10)
113
            Button {
191
77
                text: i18n.tr("Call")
114
                objectName: "button_icon_right_text"
192
78
                iconSource: "call.png"
115
                text: i18n.tr("Delete")
193
79
                iconPosition: "right"
116
                type: Button.Negative
194
80
            }
117
                iconName: "delete"
195
81
118
                StyleHints {
196
82
            Button {
119
                    minimumWidth: 0
197
83
                objectName: "button_iconsource_left_text"
120
                }
198
84
                width: units.gu(10)
121
            }
199
85
                text: i18n.tr("Call")
122
            Button {
200
86
                iconSource: "call.png"
123
                objectName: "button_icon_left_text"
201
87
            }
124
                text: i18n.tr("Call")
202
88
        }
125
                iconName: "call-start"
203
89
126
                type: Button.Positive
204
90
        TemplateFlow {
127
                iconPosition: Button.After
205
91
            title: i18n.tr("Disabled")
128
                StyleHints {
206
92
129
                    minimumWidth: 0
207
93
            Button {
130
                }
208
94
                objectName: "button_text_disabled"
131
            }
209
95
                text: i18n.tr("Call")
132
        }
210
96
                enabled: false
133
    }
211
97
            }
134
212
98
        }
135
    TemplateSection {
213
99
    }
136
        className: "TextButton"
214
100
137
215
101
    TemplateSection {
138
        TemplateFlow {
216
139
            title: i18n.tr("Text")
217
140
            TextButton {
218
141
                objectName: "textbutton_normal"
219
142
                text: i18n.tr("Normal")
220
143
            }
221
144
            TextButton {
222
145
                objectName: "textbutton_strong"
223
146
                text: i18n.tr("Strong")
224
147
                strong: true
225
148
            }
226
149
        }
227
150
228
151
        TemplateFlow {
229
152
            TextButton {
230
153
                objectName: "textbutton_normal_disabled"
231
154
                text: i18n.tr("Normal")
232
155
                enabled: false
233
156
            }
234
157
            TextButton {
235
158
                objectName: "textbutton_strong_disabled"
236
159
                text: i18n.tr("Strong")
237
160
                strong: true
238
161
                enabled: false
239
162
            }
240
163
        }
241
164
    }
242
165
243
166
    TemplateSection {
244
167
        visible: false
245
102
        className: "ComboButton"
168
        className: "ComboButton"
246
103
169
247
104
        TemplateFlow {
170
        TemplateFlow {
248
105
            title: i18n.tr("Collapsed")
171
            title: i18n.tr("Collapsed")
249
106
250
107
            ComboButton {
172
            ComboButton {
251
108
                text: "Press me"
173
                text: "Press me"
252
109
                objectName: "combobutton_collapsed"
174
                objectName: "combobutton_collapsed"
253
@@ -119,7 +184,6 @@
254
119
184
255
120
        TemplateFlow {
185
        TemplateFlow {
256
121
            title: i18n.tr("Icon")
186
            title: i18n.tr("Icon")
257
122
258
123
            ComboButton {
187
            ComboButton {
259
124
                iconSource: "call.png"
188
                iconSource: "call.png"
260
125
                width: parent.width < units.gu(30)? parent.width : units.gu(30)
189
                width: parent.width < units.gu(30)? parent.width : units.gu(30)
261
@@ -131,10 +195,8 @@
262
131
                }
195
                }
263
132
            }
196
            }
264
133
        }
197
        }
265
134
266
135
        TemplateFlow {
198
        TemplateFlow {
267
136
            title: i18n.tr("Icon+Text")
199
            title: i18n.tr("Icon+Text")
268
137
269
138
            ComboButton {
200
            ComboButton {
270
139
                text: "Answer"
201
                text: "Answer"
271
140
                iconSource: "call.png"
202
                iconSource: "call.png"
272
@@ -149,7 +211,6 @@
273
149
        }
211
        }
274
150
        TemplateFlow {
212
        TemplateFlow {
275
151
            title: i18n.tr("Expanded")
213
            title: i18n.tr("Expanded")
276
152
277
153
            ComboButton {
214
            ComboButton {
278
154
                text: "Press me"
215
                text: "Press me"
279
155
                objectName: "combobutton_expanded"
216
                objectName: "combobutton_expanded"
280
156
217
281
=== removed file 'src/Ubuntu/Components/1.3/Button.qml'
282
--- src/Ubuntu/Components/1.3/Button.qml	2015-09-28 14:36:54 +0000
283
+++ src/Ubuntu/Components/1.3/Button.qml	1970-01-01 00:00:00 +0000
284
@@ -1,125 +0,0 @@
285
1
/*
286
2
 * Copyright 2015 Canonical Ltd.
287
3
 *
288
4
 * This program is free software; you can redistribute it and/or modify
289
5
 * it under the terms of the GNU Lesser General Public License as published by
290
6
 * the Free Software Foundation; version 3.
291
7
 *
292
8
 * This program is distributed in the hope that it will be useful,
293
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
294
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
295
11
 * GNU Lesser General Public License for more details.
296
12
 *
297
13
 * You should have received a copy of the GNU Lesser General Public License
298
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
299
15
 */
300
16
301
17
import QtQuick 2.4
302
18
import Ubuntu.Components 1.3
303
19
304
20
/*!
305
21
    \qmltype Button
306
22
    \inqmlmodule Ubuntu.Components 1.1
307
23
    \ingroup ubuntu
308
24
    \brief Standard Ubuntu button.
309
25
310
26
    \l {http://design.ubuntu.com/apps/building-blocks/buttons}{See also the Design Guidelines on Buttons}.
311
27
312
28
    Examples:
313
29
    \qml
314
30
        Column {
315
31
            Button {
316
32
                text: "Send"
317
33
                onClicked: print("clicked text-only Button")
318
34
            }
319
35
            Button {
320
36
                iconName: "compose"
321
37
                gradient: UbuntuColors.greyGradient
322
38
                onClicked: print("clicked icon-only Button")
323
39
            }
324
40
            Button {
325
41
                iconName: "compose"
326
42
                text: "Icon on left"
327
43
                iconPosition: "left"
328
44
                onClicked: print("clicked text and icon Button")
329
45
            }
330
46
        }
331
47
    \endqml
332
48
    An \l Action can be used to specify \b clicked, iconSource and text. Example:
333
49
    \qml
334
50
        Item {
335
51
            Action {
336
52
                id: action1
337
53
                text: "Click me"
338
54
                onTriggered: print("action!")
339
55
                iconName: "compose"
340
56
            }
341
57
            Button {
342
58
                anchors.centerIn: parent
343
59
                action: action1
344
60
                color: UbuntuColors.warmGrey
345
61
            }
346
62
       }
347
63
    \endqml*/
348
64
AbstractButton {
349
65
    id: button
350
66
    /*!
351
67
      \since Ubuntu.Components 1.1
352
68
      If set to a color, the button has a stroke border instead of a filled shape.
353
69
    */
354
70
    property color strokeColor: Qt.rgba(0.0, 0.0, 0.0, 0.0)
355
71
356
72
    /*!
357
73
         \qmlproperty url Button::iconSource
358
74
       The source URL of the icon to display inside the button.
359
75
       Leave this value blank for a text-only button.
360
76
       If \l action is set, the default iconSource is that of the action.
361
77
    */
362
78
363
79
    /*!
364
80
       The text to display in the button. If an icon was defined,
365
81
       the text will be shown next to the icon, otherwise it will
366
82
       be centered. Leave blank for an icon-only button.
367
83
       If \l action is set, the default text is that of the action.
368
84
       \qmlproperty string Button::text
369
85
    */
370
86
371
87
    /*!
372
88
       The background color of the button.
373
89
374
90
       \sa gradient
375
91
    */
376
92
    property color color: __styleInstance.defaultColor
377
93
378
94
    /*!
379
95
       The gradient used to fill the background of the button.
380
96
381
97
       Standard Ubuntu gradients are defined in \l UbuntuColors.
382
98
383
99
       If both a gradient and a color are specified, the gradient will be used.
384
100
385
101
       \sa color
386
102
    */
387
103
    property Gradient gradient: __styleInstance.defaultGradient
388
104
389
105
    /*!
390
106
      The font used for the button's text.
391
107
    */
392
108
    property font font: __styleInstance.defaultFont
393
109
394
110
    /*!
395
111
       The position of the icon relative to the text. Options
396
112
       are "left" and "right". The default value is "left".
397
113
398
114
       If only text or only an icon is defined, this
399
115
       property is ignored and the text or icon is
400
116
       centered horizontally and vertically in the button.
401
117
402
118
       Currently this is a string value. We are waiting for
403
119
       support for enums:
404
120
       https://bugreports.qt-project.org/browse/QTBUG-14861
405
121
    */
406
122
    property string iconPosition: "left"
407
123
408
124
    styleName: "ButtonStyle"
409
125
}
410
126
0
411
=== modified file 'src/Ubuntu/Components/ComponentModule.pro'
412
--- src/Ubuntu/Components/ComponentModule.pro	2016-02-16 11:39:32 +0000
413
+++ src/Ubuntu/Components/ComponentModule.pro	2016-04-08 16:09:06 +0000
414
@@ -83,7 +83,6 @@
415
83
	     1.3/AdaptivePageLayout.qml \
83
	     1.3/AdaptivePageLayout.qml \
416
84
             1.3/AnimatedItem.qml \
84
             1.3/AnimatedItem.qml \
417
85
             1.3/AppHeader.qml \
85
             1.3/AppHeader.qml \
418
86
             1.3/Button.qml \
419
87
             1.3/Captions.qml \
86
             1.3/Captions.qml \
420
88
             1.3/CheckBox.qml \
87
             1.3/CheckBox.qml \
421
89
             1.3/ComboButton.qml \
88
             1.3/ComboButton.qml \
422
90
89
423
=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/ButtonForeground.qml'
424
--- src/Ubuntu/Components/Themes/Ambiance/1.3/ButtonForeground.qml	2015-09-07 10:05:58 +0000
425
+++ src/Ubuntu/Components/Themes/Ambiance/1.3/ButtonForeground.qml	2016-04-08 16:09:06 +0000
426
@@ -1,5 +1,5 @@
427
1
/*
1
/*
429
2
 * Copyright 2013 Canonical Ltd.
2
 * Copyright 2016 Canonical Ltd.
430
3
 *
3
 *
431
4
 * This program is free software; you can redistribute it and/or modify
4
 * This program is free software; you can redistribute it and/or modify
432
5
 * it under the terms of the GNU Lesser General Public License as published by
5
 * it under the terms of the GNU Lesser General Public License as published by
433
@@ -14,42 +14,47 @@
434
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/>.
435
15
 *
15
 *
436
16
 * Author: Florian Boucault <florian.boucault@canonical.com>
16
 * Author: Florian Boucault <florian.boucault@canonical.com>
437
17
 * Author: Pierre Bertet <pierre.bertet@canonical.com>
438
17
 */
18
 */
439
18
19
440
19
import QtQuick 2.4
20
import QtQuick 2.4
441
20
import Ubuntu.Components 1.3
21
import Ubuntu.Components 1.3
442
21
22
443
22
Item {
23
Item {
445
23
    id: buttonForeground
24
    id: root
446
24
25
447
25
    property alias text: label.text
26
    property alias text: label.text
448
26
    property alias textColor: label.color
27
    property alias textColor: label.color
449
27
    property alias iconSource: icon.source
28
    property alias iconSource: icon.source
450
28
    property string iconPosition
451
29
    property real iconSize
29
    property real iconSize
452
30
    property real spacing
30
    property real spacing
453
31
    property alias font: label.font
454
32
    property int iconPosition
455
31
    property bool hasIcon: iconSource != ""
33
    property bool hasIcon: iconSource != ""
456
32
    property bool hasText: text != ""
34
    property bool hasText: text != ""
458
33
    property alias font: label.font
35
    property bool hasBoth: hasIcon && hasText
459
34
36
461
35
    opacity: enabled ? 1.0 : 0.5
37
    state: hasBoth && iconPosition === Button.After? "right" : "left"
462
38
    implicitWidth: (
463
39
        (hasText? label.width : 0) +
464
40
        (hasBoth? spacing : 0) +
465
41
        (hasIcon? icon.width : 0)
466
42
    )
467
36
    implicitHeight: Math.max(icon.height, label.height)
43
    implicitHeight: Math.max(icon.height, label.height)
468
37
    state: hasIcon && hasText ? iconPosition : "center"
469
38
44
471
39
    Image {
45
    Icon {
472
40
        id: icon
46
        id: icon
473
47
        visible: hasIcon
474
41
        anchors.verticalCenter: parent.verticalCenter
48
        anchors.verticalCenter: parent.verticalCenter
475
42
        fillMode: Image.PreserveAspectFit
476
43
        width: iconSize
49
        width: iconSize
477
44
        height: iconSize
50
        height: iconSize
478
51
        color: textColor
479
45
    }
52
    }
480
46
53
481
47
    Label {
54
    Label {
482
48
        id: label
55
        id: label
487
49
        anchors {
56
        visible: hasText
488
50
            verticalCenter: parent.verticalCenter
57
        anchors.verticalCenter: parent.verticalCenter
485
51
            verticalCenterOffset: units.dp(-1)
486
52
        }
489
53
        elide: Text.ElideRight
58
        elide: Text.ElideRight
490
54
    }
59
    }
491
55
60
492
@@ -58,58 +63,30 @@
493
58
            name: "left"
63
            name: "left"
494
59
            AnchorChanges {
64
            AnchorChanges {
495
60
                target: icon
65
                target: icon
497
61
                anchors.left: buttonForeground.left
66
                anchors.left: root.left
498
62
            }
67
            }
499
63
            AnchorChanges {
68
            AnchorChanges {
500
64
                target: label
69
                target: label
502
65
                anchors.left: icon.right
70
                anchors.left: hasIcon? icon.right : root.left
503
66
            }
71
            }
504
67
            PropertyChanges {
72
            PropertyChanges {
505
68
                target: label
73
                target: label
512
69
                anchors.leftMargin: spacing
74
                anchors.leftMargin: hasIcon? units.gu(1) : 0
507
70
                width: buttonForeground.width - icon.width - spacing
508
71
            }
509
72
            PropertyChanges {
510
73
                target: buttonForeground
511
74
                implicitWidth: icon.implicitWidth + spacing + label.implicitWidth
513
75
            }
75
            }
514
76
        },
76
        },
515
77
        State {
77
        State {
516
78
            name: "right"
78
            name: "right"
517
79
            AnchorChanges {
79
            AnchorChanges {
518
80
                target: icon
80
                target: icon
551
81
                anchors.right: buttonForeground.right
81
                anchors.right: root.right
552
82
            }
82
            }
553
83
            AnchorChanges {
83
            AnchorChanges {
554
84
                target: label
84
                target: label
555
85
                anchors.left: buttonForeground.left
85
                anchors.right: icon.left
556
86
            }
86
            }
557
87
            PropertyChanges {
87
            PropertyChanges {
558
88
                target: label
88
                target: label
559
89
                width: buttonForeground.width - icon.width - spacing
89
                anchors.rightMargin: units.gu(1)
528
90
            }
529
91
            PropertyChanges {
530
92
                target: buttonForeground
531
93
                implicitWidth: label.implicitWidth + spacing + icon.implicitWidth
532
94
            }
533
95
        },
534
96
        State {
535
97
            name: "center"
536
98
            AnchorChanges {
537
99
                target: icon
538
100
                anchors.horizontalCenter: buttonForeground.horizontalCenter
539
101
            }
540
102
            AnchorChanges {
541
103
                target: label
542
104
                anchors.horizontalCenter: buttonForeground.horizontalCenter
543
105
            }
544
106
            PropertyChanges {
545
107
                target: label
546
108
                width: Math.min(label.implicitWidth, buttonForeground.width)
547
109
            }
548
110
            PropertyChanges {
549
111
                target: buttonForeground
550
112
                implicitWidth: hasText ? label.implicitWidth : icon.implicitWidth
560
113
            }
90
            }
561
114
        }
91
        }
562
115
    ]
92
    ]
563
116
93
564
=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/ButtonStyle.qml'
565
--- src/Ubuntu/Components/Themes/Ambiance/1.3/ButtonStyle.qml	2015-12-09 14:45:54 +0000
566
+++ src/Ubuntu/Components/Themes/Ambiance/1.3/ButtonStyle.qml	2016-04-08 16:09:06 +0000
567
@@ -1,5 +1,5 @@
568
1
/*
1
/*
570
2
 * Copyright 2013 Canonical Ltd.
2
 * Copyright 2016 Canonical Ltd.
571
3
 *
3
 *
572
4
 * This program is free software; you can redistribute it and/or modify
4
 * This program is free software; you can redistribute it and/or modify
573
5
 * it under the terms of the GNU Lesser General Public License as published by
5
 * it under the terms of the GNU Lesser General Public License as published by
574
@@ -14,169 +14,172 @@
575
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/>.
576
15
 *
15
 *
577
16
 * Author: Florian Boucault <florian.boucault@canonical.com>
16
 * Author: Florian Boucault <florian.boucault@canonical.com>
578
17
 * Author: Pierre Bertet <pierre.bertet@canonical.com>
579
17
 */
18
 */
580
18
19
581
19
import QtQuick 2.4
20
import QtQuick 2.4
582
20
import Ubuntu.Components 1.3
21
import Ubuntu.Components 1.3
583
22
import Ubuntu.Components.Private 1.3
584
21
23
585
22
Item {
24
Item {
586
23
    id: buttonStyle
25
    id: buttonStyle
587
24
26
588
25
    property var button: styledItem
27
    property var button: styledItem
597
26
    property real minimumWidth: units.gu(10)
28
    property real minimumWidth: button.iconName && button.text? 0 : units.gu(10)
598
27
    property real horizontalPadding: units.gu(1)
29
    property real horizontalPadding: units.gu(2)
599
28
    // FIXME: Add this color to the palette
30
    property real iconSpacing: units.gu(1)
600
29
    property color defaultColor: "#b2b2b2"
31
601
30
    property font defaultFont: Qt.font({family: "Ubuntu", pixelSize: FontUtils.sizeToPixels("medium")})
32
    property QtObject palette: (
602
31
    property Gradient defaultGradient
33
        button.enabled? theme.palette.normal : theme.palette.disabled
603
32
    property real buttonFaceOffset: 0
34
    )
604
33
    property bool stroke: button.hasOwnProperty("strokeColor") && button.strokeColor != Qt.rgba(0.0, 0.0, 0.0, 0.0)
35
605
36
    property color color: {
606
37
        // In Outline mode, the border has the same color than the text
607
38
        if (button.type === Button.Outline) {
608
39
            return textColor
609
40
        }
610
41
        if (button.type === Button.Positive) {
611
42
            return palette.positive
612
43
        }
613
44
        if (button.type === Button.Negative) {
614
45
            return palette.negative
615
46
        }
616
47
        return palette.foreground
617
48
    }
618
49
619
50
    property color textColor: {
620
51
        if (button.type === Button.Positive) {
621
52
            return palette.positiveText
622
53
        }
623
54
        if (button.type === Button.Negative) {
624
55
            return palette.negativeText
625
56
        }
626
57
        return palette.foregroundText
627
58
    }
628
59
629
60
    property real frameThickness: units.dp(1)
630
61
631
62
    property real radius: units.gu(0.6)
632
63
633
64
    property color overlayColor: palette.foregroundText
634
65
635
66
    property font defaultFont: Qt.font({
636
67
        family: "Ubuntu",
637
68
        pixelSize: FontUtils.sizeToPixels("medium"),
638
69
    })
639
70
640
34
    /*!
71
    /*!
641
35
      The property overrides the button's default background with an item. This
72
      The property overrides the button's default background with an item. This
642
36
      item can be used by derived styles to reuse the ButtonStyle and override
73
      item can be used by derived styles to reuse the ButtonStyle and override
643
37
      the default coloured background with an image or any other drawing.
74
      the default coloured background with an image or any other drawing.
644
38
      The default value is null.
75
      The default value is null.
646
39
      */
76
    */
647
40
    property Item backgroundSource: null
77
    property Item backgroundSource: null
648
41
78
649
42
    width: button.width
79
    width: button.width
650
43
    height: button.height
80
    height: button.height
652
44
    implicitWidth: Math.max(minimumWidth, foreground.implicitWidth + 2*horizontalPadding)
81
    implicitWidth: Math.max(minimumWidth, foreground.width + 2 * horizontalPadding)
653
45
    implicitHeight: units.gu(4)
82
    implicitHeight: units.gu(4)
654
46
83
656
47
    LayoutMirroring.enabled: Qt.application.layoutDirection == Qt.RightToLeft
84
    LayoutMirroring.enabled: Qt.application.layoutDirection === Qt.RightToLeft
657
48
    LayoutMirroring.childrenInherit: true
85
    LayoutMirroring.childrenInherit: true
658
49
86
659
50
    /*! \internal */
660
51
    // Color properties in a JS ternary operator don't work as expected in
661
52
    // QML because it overwrites alpha values with 1. A workaround is to use
662
53
    // Qt.rgba(). For more information, see
663
54
    // https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1197802 and
664
55
    // https://bugreports.qt-project.org/browse/QTBUG-32238.
665
56
    function __colorHack(color) { return Qt.rgba(color.r, color.g, color.b, color.a); }
666
57
667
58
668
59
    /* The proxy is necessary because Gradient.stops and GradientStop.color are
669
60
       non-NOTIFYable properties. They cannot be written to so it is fine but
670
61
       the proxy avoids the warnings.
671
62
    */
672
63
    property QtObject gradientProxy: gradientProxyObject
673
64
    QtObject {
674
65
        id: gradientProxyObject
675
66
        property color topColor
676
67
        property color bottomColor
677
68
678
69
        function updateGradient() {
679
70
            if (button.gradient) {
680
71
                topColor = button.gradient.stops[0].color;
681
72
                bottomColor = button.gradient.stops[1].color;
682
73
            }
683
74
        }
684
75
685
76
        Component.onCompleted: {
686
77
            updateGradient();
687
78
            button.gradientChanged.connect(updateGradient);
688
79
        }
689
80
    }
690
81
691
82
    // Use the gradient if it is defined and the color has not been set manually
692
83
    // or the gradient has been set manually
693
84
    property bool isGradient: button.gradient && (button.color == defaultColor ||
694
85
                              button.gradient != defaultGradient)
695
86
696
87
    FocusShape {
87
    FocusShape {
697
88
    }
88
    }
698
89
89
765
90
    Image {
90
    // Drop shadow
766
91
        id: strokeBorder
91
    ShapeShadow {
767
92
        anchors.fill: parent
92
        visible: button.enabled
768
93
        anchors.margins: -units.gu(0.5)
93
        opacity: (
769
94
        // FIXME: this PNG is way too big (462x108) and do not scale properly
94
            button.type === Button.Outline ||
770
95
        // ie. the corners are visually incorrect at most sizes
95
            styledItem.keyNavigationFocus ||
771
96
        source: stroke ? Qt.resolvedUrl("../artwork/stroke_button.png") : ""
96
            button.pressed? 0 : 1
772
97
        visible: false
97
        )
773
98
        cache: false
98
        width: parent.width
774
99
        asynchronous: true
99
        height: parent.height
775
100
    }
100
        radius: buttonStyle.radius
776
101
101
        style: ShapeShadow.Outer
777
102
    ShaderEffect {
102
        angle: 90
778
103
        id: colorizedImage
103
        distance: units.gu(0.1)
779
104
104
        size: units.gu(0.1)
780
105
        anchors.fill: parent
105
        color: Qt.rgba(0, 0, 0, 0.2)
781
106
        visible: stroke && strokeBorder.status == Image.Ready
106
        Behavior on opacity {
782
107
107
            UbuntuNumberAnimation {
783
108
        property Item source: visible ? strokeBorder : null
108
                duration: UbuntuAnimation.SnapDuration
784
109
        property color keyColorOut: stroke ? button.strokeColor : Qt.rgba(0.0, 0.0, 0.0, 0.0)
109
            }
785
110
        property color keyColorIn: Qt.rgba(1.0, 1.0, 1.0, 1.0)
110
        }
786
111
        property real threshold: 1.0
111
    }
787
112
112
788
113
        fragmentShader: "
113
    // Background shape
789
114
            varying highp vec2 qt_TexCoord0;
114
    ShapeFill {
790
115
            uniform sampler2D source;
115
        anchors.fill: parent
791
116
            uniform highp vec4 keyColorOut;
116
        visible: (
792
117
            uniform highp vec4 keyColorIn;
117
            button.type !== Button.Outline ||
793
118
            uniform lowp float threshold;
118
            button.keyNavigationFocus ||
794
119
            uniform lowp float qt_Opacity;
119
            (button.hovered && !button.pressed)
795
120
            void main() {
120
        )
796
121
                lowp vec4 sourceColor = texture2D(source, qt_TexCoord0);
121
        color: {
797
122
                gl_FragColor = mix(vec4(keyColorOut.rgb, 1.0) * sourceColor.a, sourceColor, step(threshold, distance(sourceColor.rgb / sourceColor.a, keyColorIn.rgb))) * qt_Opacity;
122
            var baseColor = buttonStyle.color
798
123
            }"
123
            if (button.keyNavigationFocus && button.type === Button.Outline) {
799
124
    }
124
                return Qt.rgba(0, 0, 0, 0.15)
800
125
125
            }
801
126
    UbuntuShape {
126
            if (button.hovered && !button.pressed) {
802
127
        id: background
127
                return button.type === Button.Outline
803
128
        anchors.fill: parent
128
                    ? Qt.rgba(0, 0, 0, 0.05)
804
129
        borderSource: "radius_idle.sci"  // Deprecated, use a dedicated shape.
129
                    : Qt.tint(buttonStyle.color, Qt.rgba(0, 0, 0, 0.05))
805
130
        visible: stroke ? false : ((backgroundColor.a != 0.0) || backgroundSource)
130
            }
806
131
        source: backgroundSource
131
            return buttonStyle.color
807
132
132
        }
808
133
        backgroundColor: backgroundSource ? "#00000000" : (isGradient ? __colorHack(gradientProxy.topColor) : __colorHack(button.color))
133
        radius: buttonStyle.radius
809
134
        secondaryBackgroundColor: backgroundSource ? "#00000000" : (isGradient ? __colorHack(gradientProxy.bottomColor) : __colorHack(button.color))
134
        Behavior on opacity {
810
135
        backgroundMode: isGradient ? UbuntuShape.VerticalGradient : UbuntuShape.SolidColor
135
            UbuntuNumberAnimation {
811
136
        opacity: styledItem.enabled ? 1.0 : 0.6
136
                duration: UbuntuAnimation.SnapDuration
812
137
    }
137
            }
813
138
138
        }
814
139
    UbuntuShape {
139
        Behavior on color {
815
140
        id: backgroundPressed
140
            enabled: button.type !== Button.Outline
816
141
        anchors.fill: parent
141
            ColorAnimation {
817
142
        backgroundColor: stroke ? button.strokeColor : background.backgroundColor
142
                duration: UbuntuAnimation.SnapDuration
818
143
        secondaryBackgroundColor: background.secondaryBackgroundColor
143
            }
819
144
        backgroundMode: stroke ? UbuntuShape.SolidColor : UbuntuShape.VerticalGradient
144
        }
820
145
        borderSource: "radius_pressed.sci"  // Deprecated, use a dedicated shape.
145
    }
821
146
        opacity: button.pressed ? 1.0 : 0.0
146
822
147
        Behavior on opacity {
147
    // Outline
823
148
            NumberAnimation {
148
    ShapeFrame {
824
149
                duration: UbuntuAnimation.SnapDuration
149
        anchors.fill: parent
825
150
                easing.type: Easing.Linear
150
        visible: button.type === Button.Outline && !button.keyNavigationFocus
826
151
            }
151
        color: buttonStyle.color
827
152
        }
152
        radius: buttonStyle.radius
828
153
        visible: stroke || background.visible
153
        thickness: frameThickness
829
154
    }
154
        Behavior on opacity {
830
155
155
            UbuntuNumberAnimation {
831
156
                duration: UbuntuAnimation.SnapDuration
832
157
            }
833
158
        }
834
159
        Behavior on color {
835
160
            ColorAnimation {
836
161
                duration: UbuntuAnimation.SnapDuration
837
162
            }
838
163
        }
839
164
    }
840
165
841
166
    // Foreground (text and icon)
842
156
    ButtonForeground {
167
    ButtonForeground {
843
157
        id: foreground
168
        id: foreground
844
158
        width: parent.width - 2*horizontalPadding
845
159
        anchors {
169
        anchors {
846
160
            centerIn: parent
170
            centerIn: parent
847
161
            horizontalCenterOffset: buttonFaceOffset
848
162
        }
171
        }
849
163
        text: button.text
172
        text: button.text
854
164
        /* Pick either a clear or dark text color depending on the luminance of the
173
        textColor: buttonStyle.textColor
851
165
           background color to maintain good contrast (works in most cases)
852
166
        */
853
167
        textColor: ColorUtils.luminance(button.color) <= 0.85 && !(stroke && !button.pressed) ? "#FFFFFF" : "#888888"
855
168
        iconSource: button.iconSource
174
        iconSource: button.iconSource
860
169
        iconPosition: button.iconPosition
175
        iconPosition: (
861
170
        iconSize: units.gu(3)
176
            button.iconPosition !== undefined
862
171
        font: button.font
177
                ? button.iconPosition
863
172
        spacing: horizontalPadding
178
                : Button.Before
864
179
        )
865
180
        iconSize: units.gu(2)
866
181
        font: button.font || defaultFont
867
182
        spacing: iconSpacing
868
173
        transformOrigin: Item.Top
183
        transformOrigin: Item.Top
869
174
        scale: button.pressed ? 0.98 : 1.0
870
175
        Behavior on scale {
871
176
            NumberAnimation {
872
177
                duration: UbuntuAnimation.SnapDuration
873
178
                easing.type: Easing.Linear
874
179
            }
875
180
        }
876
181
    }
184
    }
877
182
}
185
}
878
183
186
879
=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/Palette.qml'
880
--- src/Ubuntu/Components/Themes/Ambiance/1.3/Palette.qml	2016-03-01 15:06:38 +0000
881
+++ src/Ubuntu/Components/Themes/Ambiance/1.3/Palette.qml	2016-04-08 16:09:06 +0000
882
@@ -20,14 +20,22 @@
883
20
20
884
21
Palette {
21
Palette {
885
22
    normal: AmbianceNormal {}
22
    normal: AmbianceNormal {}
886
23
887
23
    disabled: AmbianceNormal {
24
    disabled: AmbianceNormal {
888
24
        field: UbuntuColors.porcelain;
889
25
        // inactive is 30% opaque normal
890
26
        Component.onCompleted: {
25
        Component.onCompleted: {
891
26
            // specific disabled colors
892
27
            var diff = {
893
28
                field: UbuntuColors.porcelain,
894
29
                positiveText: normal.positiveText,
895
30
                negativeText: normal.negativeText,
896
31
            };
897
27
            for (var p in normal) {
32
            for (var p in normal) {
898
28
                // skip objectName and all change signals
33
                // skip objectName and all change signals
901
29
                if (p == "objectName" || p == "field" || p.indexOf("Changed") > 0) continue;
34
                if (p === "objectName" || p.indexOf("Changed") > 0) continue;
902
30
                disabled[p] = Qt.rgba(normal[p].r, normal[p].g, normal[p].b, 0.3);
35
                disabled[p] = diff[p] || (
903
36
                    // if not specific, colors are 30% opaque normal
904
37
                    Qt.rgba(normal[p].r, normal[p].g, normal[p].b, 0.3)
905
38
                );
906
31
            }
39
            }
907
32
        }
40
        }
908
33
    }
41
    }
909
@@ -35,18 +43,22 @@
910
35
    // selected differs from normal in background, base, foreground
43
    // selected differs from normal in background, base, foreground
911
36
    selected: AmbianceSelected {}
44
    selected: AmbianceSelected {}
912
37
45
914
38
    // selected differs from normal in background, base, foreground
46
    // selected disabled differs from normal in background, base, foreground
915
39
    selectedDisabled: AmbianceSelected {
47
    selectedDisabled: AmbianceSelected {
916
40
        background: UbuntuColors.porcelain
917
41
        base: UbuntuColors.porcelain
918
42
        foreground: UbuntuColors.porcelain
919
43
        // inactive is 30% opaque normal
920
44
        Component.onCompleted: {
48
        Component.onCompleted: {
921
49
            // specific selected-disabled colors
922
50
            var diff = {
923
51
                background: UbuntuColors.porcelain,
924
52
                base: UbuntuColors.porcelain,
925
53
                foreground: UbuntuColors.porcelain,
926
54
            };
927
45
            for (var p in selected) {
55
            for (var p in selected) {
928
46
                // skip objectName and all change signals
56
                // skip objectName and all change signals
932
47
                if (p == "objectName" || p.indexOf("Changed") > 0
57
                if (p === "objectName" || p.indexOf("Changed") > 0) continue;
933
48
                        || p == "background" || p == "base" || p == "foreground" ) continue;
58
                selectedDisabled[p] = diff[p] || (
934
49
                selectedDisabled[p] = Qt.rgba(selected[p].r, selected[p].g, selected[p].b, 0.3);
59
                    // if not specific, colors are 30% opaque normal
935
60
                    Qt.rgba(selected[p].r, selected[p].g, selected[p].b, 0.3)
936
61
                );
937
50
            }
62
            }
938
51
        }
63
        }
939
52
    }
64
    }
940
53
65
941
=== added file 'src/Ubuntu/Components/Themes/Ambiance/1.3/TextButtonStyle.qml'
942
--- src/Ubuntu/Components/Themes/Ambiance/1.3/TextButtonStyle.qml	1970-01-01 00:00:00 +0000
943
+++ src/Ubuntu/Components/Themes/Ambiance/1.3/TextButtonStyle.qml	2016-04-08 16:09:06 +0000
944
@@ -0,0 +1,76 @@
945
1
/*
946
2
 * Copyright 2016 Canonical Ltd.
947
3
 *
948
4
 * This program is free software; you can redistribute it and/or modify
949
5
 * it under the terms of the GNU Lesser General Public License as published by
950
6
 * the Free Software Foundation; version 3.
951
7
 *
952
8
 * This program is distributed in the hope that it will be useful,
953
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
954
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
955
11
 * GNU Lesser General Public License for more details.
956
12
 *
957
13
 * You should have received a copy of the GNU Lesser General Public License
958
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
959
15
 *
960
16
 * Author: Florian Boucault <florian.boucault@canonical.com>
961
17
 * Author: Pierre Bertet <pierre.bertet@canonical.com>
962
18
 */
963
19
964
20
import QtQuick 2.4
965
21
import Ubuntu.Components 1.3
966
22
import Ubuntu.Components.Private 1.3
967
23
968
24
Item {
969
25
    id: root
970
26
971
27
    property var button: styledItem
972
28
    property real minWidth: units.gu(10)
973
29
    property real hPadding: units.gu(2)
974
30
    property QtObject palette: (
975
31
        button.enabled? theme.palette.normal : theme.palette.disabled
976
32
    )
977
33
    property color bgColor: palette.foreground
978
34
    property color textColor: palette.foregroundText
979
35
    property real radius: units.gu(0.6)
980
36
    property font font: Qt.font({
981
37
        family: "Ubuntu",
982
38
        weight: button.strong? Font.Normal : Font.Light,
983
39
        pixelSize: FontUtils.sizeToPixels("medium"),
984
40
    })
985
41
986
42
    width: button.width
987
43
    height: button.height
988
44
    implicitWidth: Math.max(minWidth, foreground.width + 2 * hPadding)
989
45
    implicitHeight: units.gu(4)
990
46
991
47
    LayoutMirroring.enabled: Qt.application.layoutDirection === Qt.RightToLeft
992
48
    LayoutMirroring.childrenInherit: true
993
49
994
50
    FocusShape {
995
51
    }
996
52
997
53
    // Background (on hover)
998
54
    ShapeFill {
999
55
        id: background
1000
56
        visible: background.color.a > 0
1001
57
        anchors.fill: parent
1002
58
        radius: root.radius
1003
59
        opacity: button.hovered? 1 : 0
1004
60
        color: root.bgColor
1005
61
        Behavior on opacity {
1006
62
            UbuntuNumberAnimation {
1007
63
                duration: UbuntuAnimation.SnapDuration
1008
64
            }
1009
65
        }
1010
66
    }
1011
67
1012
68
    Label {
1013
69
        id: foreground
1014
70
        anchors.centerIn: parent
1015
71
        text: button.text
1016
72
        elide: Text.ElideRight
1017
73
        color: root.textColor
1018
74
        font: root.font
1019
75
    }
1020
76
}
1021
0
77
1022
=== modified file 'src/Ubuntu/Components/Themes/Ambiance/Ambiance.pro'
1023
--- src/Ubuntu/Components/Themes/Ambiance/Ambiance.pro	2016-02-19 11:18:51 +0000
1024
+++ src/Ubuntu/Components/Themes/Ambiance/Ambiance.pro	2016-04-08 16:09:06 +0000
1025
@@ -80,6 +80,7 @@
1026
80
             1.3/BubbleShape.qml \
80
             1.3/BubbleShape.qml \
1027
81
             1.3/ButtonForeground.qml \
81
             1.3/ButtonForeground.qml \
1028
82
             1.3/ButtonStyle.qml \
82
             1.3/ButtonStyle.qml \
1029
83
             1.3/TextButtonStyle.qml \
1030
83
             1.3/CheckBoxStyle.qml \
84
             1.3/CheckBoxStyle.qml \
1031
84
             1.3/ComboButtonStyle.qml \
85
             1.3/ComboButtonStyle.qml \
1032
85
             1.3/DatePickerStyle.qml \
86
             1.3/DatePickerStyle.qml \
1033
86
87
1034
=== modified file 'src/Ubuntu/Components/Themes/Ambiance/qmldir'
1035
--- src/Ubuntu/Components/Themes/Ambiance/qmldir	2016-02-19 11:18:51 +0000
1036
+++ src/Ubuntu/Components/Themes/Ambiance/qmldir	2016-04-08 16:09:06 +0000
1037
@@ -77,6 +77,7 @@
1038
77
PageHeadStyle 1.3 ./1.3/PageHeadStyle.qml
77
PageHeadStyle 1.3 ./1.3/PageHeadStyle.qml
1039
78
Palette 1.3 ./1.3/Palette.qml
78
Palette 1.3 ./1.3/Palette.qml
1040
79
ButtonStyle 1.3 ./1.3/ButtonStyle.qml
79
ButtonStyle 1.3 ./1.3/ButtonStyle.qml
1041
80
TextButtonStyle 1.3 ./1.3/TextButtonStyle.qml
1042
80
SliderStyle 1.3 ./1.3/SliderStyle.qml
81
SliderStyle 1.3 ./1.3/SliderStyle.qml
1043
81
SwitchStyle 1.3 ./1.3/SwitchStyle.qml
82
SwitchStyle 1.3 ./1.3/SwitchStyle.qml
1044
82
CheckBoxStyle 1.3 ./1.3/CheckBoxStyle.qml
83
CheckBoxStyle 1.3 ./1.3/CheckBoxStyle.qml
1045
83
84
1046
=== added file 'src/Ubuntu/Components/plugin/button.cpp'
1047
--- src/Ubuntu/Components/plugin/button.cpp	1970-01-01 00:00:00 +0000
1048
+++ src/Ubuntu/Components/plugin/button.cpp	2016-04-08 16:09:06 +0000
1049
@@ -0,0 +1,268 @@
1050
1
/*
1051
2
 * Copyright 2016 Canonical Ltd.
1052
3
 *
1053
4
 * This program is free software; you can redistribute it and/or modify
1054
5
 * it under the terms of the GNU Lesser General Public License as published by
1055
6
 * the Free Software Foundation; version 3.
1056
7
 *
1057
8
 * This program is distributed in the hope that it will be useful,
1058
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1059
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1060
11
 * GNU Lesser General Public License for more details.
1061
12
 *
1062
13
 * You should have received a copy of the GNU Lesser General Public License
1063
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1064
15
 *
1065
16
 * Author: Pierre Bertet <pierre.bertet@canonical.com>
1066
17
 */
1067
18
1068
19
#include "button_p.h"
1069
20
#include "ucstyleditembase_p.h"
1070
21
#include "ucnamespace.h"
1071
22
1072
23
namespace UbuntuToolkit {
1073
24
1074
25
ButtonPrivate::ButtonPrivate()
1075
26
    : UCAbstractButtonPrivate()
1076
27
    , type(Button::Normal)
1077
28
    , font(QFont())
1078
29
    , iconPosition(Button::Before)
1079
30
    , color(QColor())
1080
31
    , strokeColor(QColor())
1081
32
    , gradient(QGradient())
1082
33
{
1083
34
}
1084
35
1085
36
/*!
1086
37
\qmltype Button
1087
38
\instantiates UbuntuToolkit::Button
1088
39
\inherits UCAbstractButton
1089
40
\inqmlmodule Ubuntu.Components 1.3
1090
41
\ingroup ubuntu
1091
42
\brief Standard Ubuntu button.
1092
43
1093
44
The Button component allows to create a button that follows the Ubuntu visual and behavioral standards.
1094
45
1095
46
Several types are available: normal, the default, will be represented by an opaque shape with the text above it, while the outline type will display a transparent button with a border. The positive and negative types can be used to indicate the nature of the action.
1096
47
1097
48
\l {http://design.ubuntu.com/apps/building-blocks/buttons}{See also the Design Guidelines on Buttons}.
1098
49
1099
50
Example:
1100
51
\qml
1101
52
     Column {
1102
53
         Button {
1103
54
             text: "Send"
1104
55
             onClicked: print("clicked text-only Button")
1105
56
         }
1106
57
         Button {
1107
58
             iconName: "compose"
1108
59
             onClicked: print("clicked icon-only Button")
1109
60
         }
1110
61
     }
1111
62
\endqml
1112
63
1113
64
An \l Action can be used to specify \b clicked, iconSource and text:
1114
65
\qml
1115
66
      Item {
1116
67
          Action {
1117
68
              id: action1
1118
69
              text: "Click me"
1119
70
              onTriggered: print("action!")
1120
71
              iconName: "compose"
1121
72
          }
1122
73
          Button {
1123
74
              anchors.centerIn: parent
1124
75
              action: action1
1125
76
          }
1126
77
     }
1127
78
\endqml
1128
79
1129
80
\sa TextButton
1130
81
*/
1131
82
Button::Button(QQuickItem* parent)
1132
83
    : UCAbstractButton(*(new ButtonPrivate), parent)
1133
84
{
1134
85
    /*
1135
86
     * From ucbottomedgehint.cpp:
1136
87
     * we cannot use setStyleName as that will trigger style loading
1137
88
     * and the qmlEngine is not known at this phase of the of the
1138
89
     * initialization. Therefore we simply set the style name default. Style
1139
90
     * loading will happen during component completion.
1140
91
     */
1141
92
    UCStyledItemBasePrivate::get(this)->styleDocument = QStringLiteral("ButtonStyle");
1142
93
}
1143
94
1144
95
/*!
1145
96
   \qmlproperty url Button::iconSource
1146
97
   The source URL of the icon to display inside the button. Leave this value
1147
98
   blank for a text-only button.
1148
99
   If \l action is set, the default iconSource is that of the action.
1149
100
*/
1150
101
1151
102
/*!
1152
103
   \qmlproperty string Button::text
1153
104
   The text to display in the button. If an icon was defined, the text will be
1154
105
   shown next to the icon, otherwise it will be centered. Leave blank for an
1155
106
   icon-only button.
1156
107
   If \l action is set, the default text is that of the action.
1157
108
*/
1158
109
1159
110
/*!
1160
111
 \qmlsignal Button::clicked()
1161
112
 This handler is called when there is a mouse click on the button and the
1162
113
 button is not disabled. If \l {ActionItem::action}{action} is defined, the
1163
114
 action will be triggered.
1164
115
 */
1165
116
1166
117
/*!
1167
118
 *
1168
119
 * \qmlsignal Button::pressAndHold()
1169
120
 * This handler is called when there is a long press.
1170
121
 */
1171
122
1172
123
/*!
1173
124
   \qmlproperty Action Button::action
1174
125
   An \l Action to specify the \l clicked, \l iconSource and \l text
1175
126
   properties.
1176
127
*/
1177
128
1178
129
/*!
1179
130
  \qmlproperty enumeration Button::type
1180
131
  The type defines the button style. The default value is \c Button.Normal.
1181
132
  \list
1182
133
  \li \b Button.Normal - The button shape is visible.
1183
134
  \li \b Button.Outline - The button shape is transparent but a border is present.
1184
135
  \li \b Button.Positive - The action is positive.
1185
136
  \li \b Button.Negative - The action is negative.
1186
137
  \endlist
1187
138
*/
1188
139
Button::Type Button::type()
1189
140
{
1190
141
    Q_D(Button);
1191
142
    return d->type;
1192
143
}
1193
144
void Button::setType(Type &type)
1194
145
{
1195
146
    Q_D(Button);
1196
147
    d->type = type;
1197
148
    Q_EMIT typeChanged();
1198
149
}
1199
150
1200
151
/*!
1201
152
  \qmlproperty string Button::font
1202
153
  The font used for the button's text.
1203
154
*/
1204
155
QFont Button::font()
1205
156
{
1206
157
    Q_D(Button);
1207
158
    return d->font;
1208
159
}
1209
160
void Button::setFont(QFont &font)
1210
161
{
1211
162
    Q_D(Button);
1212
163
    d->font = font;
1213
164
    Q_EMIT fontChanged();
1214
165
}
1215
166
1216
167
/*!
1217
168
  \qmlproperty enumeration Button::iconPosition
1218
169
1219
170
  Where to position the icon in the button. The default value is \c Button.Before.
1220
171
1221
172
  \note If only text or only an icon is defined, this property is ignored and the
1222
173
  text or icon is centered horizontally and vertically in the button.
1223
174
1224
175
  \list
1225
176
  \li \b Button.Before - The icon is positioned before the text.
1226
177
  \li \b Button.After - The icon is positioned after the text.
1227
178
  \endlist
1228
179
*/
1229
180
Button::IconPosition Button::iconPosition()
1230
181
{
1231
182
    Q_D(Button);
1232
183
    return d->iconPosition;
1233
184
}
1234
185
void Button::setIconPosition(IconPosition &iconPosition)
1235
186
{
1236
187
    Q_D(Button);
1237
188
    d->iconPosition = iconPosition;
1238
189
    Q_EMIT iconPositionChanged();
1239
190
}
1240
191
1241
192
/*!
1242
193
  \qmlproperty string Button::color
1243
194
  \deprecated
1244
195
  The property is deprecated, use `emphasis` or a custom style instead.
1245
196
*/
1246
197
QColor Button::color()
1247
198
{
1248
199
    Q_D(Button);
1249
200
    return d->color;
1250
201
}
1251
202
void Button::setColor(QColor &color)
1252
203
{
1253
204
    Q_D(Button);
1254
205
1255
206
    qDebug() << color;
1256
207
    qDebug() << d->color;
1257
208
1258
209
    if (color == d->color) {
1259
210
        return;
1260
211
    }
1261
212
    d->color = color;
1262
213
1263
214
    qDebug() << color;
1264
215
    qDebug() << d->color;
1265
216
1266
217
    UC_QML_DEPRECATION_WARNING("WARNING: `color` is deprecated. Use `emphasis` or `StyleHint` instead.");
1267
218
1268
219
    Q_EMIT colorChanged();
1269
220
}
1270
221
1271
222
/*!
1272
223
  \qmlproperty string Button::strokeColor
1273
224
  \deprecated
1274
225
  The property is deprecated, set `type` to "outline" instead.
1275
226
*/
1276
227
QColor Button::strokeColor()
1277
228
{
1278
229
    Q_D(Button);
1279
230
    return d->strokeColor;
1280
231
}
1281
232
void Button::setStrokeColor(QColor &strokeColor)
1282
233
{
1283
234
    Q_D(Button);
1284
235
    if (strokeColor == d->strokeColor) {
1285
236
        return;
1286
237
    }
1287
238
    d->strokeColor = strokeColor;
1288
239
1289
240
    UC_QML_DEPRECATION_WARNING("WARNING: `strokeColor` is deprecated. Set the `type` property to Button.Type.Normal, or use `StyleHint` instead.");
1290
241
1291
242
    Q_EMIT strokeColorChanged();
1292
243
}
1293
244
1294
245
/*!
1295
246
  \qmlproperty string Button::gradient
1296
247
  \deprecated
1297
248
  The property is deprecated, use `type` or a custom style instead.
1298
249
*/
1299
250
QGradient Button::gradient()
1300
251
{
1301
252
    Q_D(Button);
1302
253
    return d->gradient;
1303
254
}
1304
255
void Button::setGradient(QGradient &gradient)
1305
256
{
1306
257
    Q_D(Button);
1307
258
    if (gradient == d->gradient) {
1308
259
        return;
1309
260
    }
1310
261
    d->gradient = gradient;
1311
262
1312
263
    UC_QML_DEPRECATION_WARNING("WARNING: `gradient` is deprecated. Use `type`, `type`, or `StyleHint` instead.");
1313
264
1314
265
    Q_EMIT gradientChanged();
1315
266
}
1316
267
1317
268
}
1318
0
269
1319
=== added file 'src/Ubuntu/Components/plugin/button.h'
1320
--- src/Ubuntu/Components/plugin/button.h	1970-01-01 00:00:00 +0000
1321
+++ src/Ubuntu/Components/plugin/button.h	2016-04-08 16:09:06 +0000
1322
@@ -0,0 +1,84 @@
1323
1
/*
1324
2
 * Copyright 2016 Canonical Ltd.
1325
3
 *
1326
4
 * This program is free software; you can redistribute it and/or modify
1327
5
 * it under the terms of the GNU Lesser General Public License as published by
1328
6
 * the Free Software Foundation; version 3.
1329
7
 *
1330
8
 * This program is distributed in the hope that it will be useful,
1331
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1332
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1333
11
 * GNU Lesser General Public License for more details.
1334
12
 *
1335
13
 * You should have received a copy of the GNU Lesser General Public License
1336
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1337
15
 *
1338
16
 * Author: Pierre Bertet <pierre.bertet@canonical.com>
1339
17
 */
1340
18
1341
19
#ifndef BUTTON_H
1342
20
#define BUTTON_H
1343
21
1344
22
#include "ucabstractbutton.h"
1345
23
1346
24
namespace UbuntuToolkit {
1347
25
1348
26
class ButtonPrivate;
1349
27
class Button : public UCAbstractButton
1350
28
{
1351
29
    Q_OBJECT
1352
30
1353
31
    Q_ENUMS(IconPosition)
1354
32
    Q_ENUMS(Type)
1355
33
1356
34
    Q_PROPERTY(Type type READ type WRITE setType NOTIFY typeChanged FINAL)
1357
35
    Q_PROPERTY(QFont font READ font WRITE setFont NOTIFY fontChanged FINAL)
1358
36
    Q_PROPERTY(IconPosition iconPosition READ iconPosition WRITE setIconPosition NOTIFY iconPositionChanged FINAL)
1359
37
1360
38
    // deprecated properties
1361
39
    Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged FINAL)
1362
40
    Q_PROPERTY(QColor strokeColor READ strokeColor WRITE setStrokeColor NOTIFY strokeColorChanged FINAL)
1363
41
    Q_PROPERTY(QGradient gradient READ gradient WRITE setGradient NOTIFY gradientChanged FINAL)
1364
42
1365
43
public:
1366
44
    explicit Button(QQuickItem* parent=0);
1367
45
1368
46
    enum IconPosition { Before, left = Before, After, right = After };
1369
47
    enum Type { Normal, Outline, Positive, Negative };
1370
48
1371
49
    Type type();
1372
50
    void setType(Type &type);
1373
51
1374
52
    QFont font();
1375
53
    void setFont(QFont &font);
1376
54
1377
55
    IconPosition iconPosition();
1378
56
    void setIconPosition(IconPosition &iconPosition);
1379
57
1380
58
    QColor color();
1381
59
    void setColor(QColor &color);
1382
60
1383
61
    QColor strokeColor();
1384
62
    void setStrokeColor(QColor &strokeColor);
1385
63
1386
64
    QGradient gradient();
1387
65
    void setGradient(QGradient &gradient);
1388
66
1389
67
Q_SIGNALS:
1390
68
    void typeChanged();
1391
69
    void fontChanged();
1392
70
    void iconPositionChanged();
1393
71
    void colorChanged();
1394
72
    void strokeColorChanged();
1395
73
    void gradientChanged();
1396
74
1397
75
private:
1398
76
    Q_DECLARE_PRIVATE(Button)
1399
77
    Q_DISABLE_COPY(Button)
1400
78
};
1401
79
1402
80
}
1403
81
1404
82
QML_DECLARE_TYPE(UbuntuToolkit::Button)
1405
83
1406
84
#endif // BUTTON_H
1407
0
85
1408
=== added file 'src/Ubuntu/Components/plugin/button_p.h'
1409
--- src/Ubuntu/Components/plugin/button_p.h	1970-01-01 00:00:00 +0000
1410
+++ src/Ubuntu/Components/plugin/button_p.h	2016-04-08 16:09:06 +0000
1411
@@ -0,0 +1,46 @@
1412
1
/*
1413
2
 * Copyright 2016 Canonical Ltd.
1414
3
 *
1415
4
 * This program is free software; you can redistribute it and/or modify
1416
5
 * it under the terms of the GNU Lesser General Public License as published by
1417
6
 * the Free Software Foundation; version 3.
1418
7
 *
1419
8
 * This program is distributed in the hope that it will be useful,
1420
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1421
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1422
11
 * GNU Lesser General Public License for more details.
1423
12
 *
1424
13
 * You should have received a copy of the GNU Lesser General Public License
1425
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1426
15
 */
1427
16
1428
17
#ifndef BUTTON_P
1429
18
#define BUTTON_P
1430
19
1431
20
#include "button.h"
1432
21
#include "ucabstractbutton_p.h"
1433
22
1434
23
namespace UbuntuToolkit {
1435
24
1436
25
class ButtonPrivate : public UCAbstractButtonPrivate
1437
26
{
1438
27
    Q_DECLARE_PUBLIC(Button)
1439
28
public:
1440
29
    explicit ButtonPrivate();
1441
30
1442
31
    static ButtonPrivate *get(Button *item)
1443
32
    {
1444
33
        return item->d_func();
1445
34
    }
1446
35
1447
36
    Button::Type type;
1448
37
    QFont font;
1449
38
    Button::IconPosition iconPosition;
1450
39
    QColor color;
1451
40
    QColor strokeColor;
1452
41
    QGradient gradient;
1453
42
};
1454
43
1455
44
}
1456
45
1457
46
#endif // BUTTON_P
1458
0
47
1459
=== modified file 'src/Ubuntu/Components/plugin/plugin.cpp'
1460
--- src/Ubuntu/Components/plugin/plugin.cpp	2016-04-08 16:09:04 +0000
1461
+++ src/Ubuntu/Components/plugin/plugin.cpp	2016-04-08 16:09:06 +0000
1462
@@ -80,6 +80,8 @@
1463
80
#include "ucperformancemonitor.h"
80
#include "ucperformancemonitor.h"
1464
81
#include "privates/ucpagewrapper.h"
81
#include "privates/ucpagewrapper.h"
1465
82
#include "privates/appheaderbase.h"
82
#include "privates/appheaderbase.h"
1466
83
#include "button.h"
1467
84
#include "textbutton.h"
1468
83
#include "privates/shape/shadow.h"
85
#include "privates/shape/shadow.h"
1469
84
#include "privates/shape/fill.h"
86
#include "privates/shape/fill.h"
1470
85
#include "privates/shape/frame.h"
87
#include "privates/shape/frame.h"
1471
@@ -237,6 +239,8 @@
1472
237
    qmlRegisterType<UCPageTreeNode>(uri, 1, 3, "PageTreeNode");
239
    qmlRegisterType<UCPageTreeNode>(uri, 1, 3, "PageTreeNode");
1473
238
    qmlRegisterType<UCPopupContext>(uri, 1, 3, "PopupContext");
240
    qmlRegisterType<UCPopupContext>(uri, 1, 3, "PopupContext");
1474
239
    qmlRegisterType<UCMainViewBase>(uri, 1, 3, "MainViewBase");
241
    qmlRegisterType<UCMainViewBase>(uri, 1, 3, "MainViewBase");
1475
242
    qmlRegisterType<UbuntuToolkit::Button>(uri, 1, 3, "Button");
1476
243
    qmlRegisterType<UbuntuToolkit::TextButton>(uri, 1, 3, "TextButton");
1477
240
}
244
}
1478
241
245
1479
242
void UbuntuComponentsPlugin::initializeContextProperties(QQmlEngine *engine)
246
void UbuntuComponentsPlugin::initializeContextProperties(QQmlEngine *engine)
1480
243
247
1481
=== modified file 'src/Ubuntu/Components/plugin/plugin.pri'
1482
--- src/Ubuntu/Components/plugin/plugin.pri	2016-04-08 16:09:04 +0000
1483
+++ src/Ubuntu/Components/plugin/plugin.pri	2016-04-08 16:09:06 +0000
1484
@@ -110,22 +110,20 @@
1485
110
    $$PWD/ucmainviewbase.h \
110
    $$PWD/ucmainviewbase.h \
1486
111
    $$PWD/ucmainviewbase_p.h \
111
    $$PWD/ucmainviewbase_p.h \
1487
112
    $$PWD/ucperformancemonitor.h \
112
    $$PWD/ucperformancemonitor.h \
1488
113
    $$PWD/label_p.h \
1489
114
    $$PWD/privates/listviewextensions.h \
113
    $$PWD/privates/listviewextensions.h \
1490
115
    $$PWD/privates/ucpagewrapper.h \
114
    $$PWD/privates/ucpagewrapper.h \
1491
116
    $$PWD/privates/ucpagewrapper_p.h \
115
    $$PWD/privates/ucpagewrapper_p.h \
1492
117
    $$PWD/privates/ucpagewrapperincubator_p.h \
116
    $$PWD/privates/ucpagewrapperincubator_p.h \
1493
118
    $$PWD/privates/appheaderbase.h \
117
    $$PWD/privates/appheaderbase.h \
1498
119
<<<<<<< TREE
118
    $$PWD/button.h \
1499
120
    $$PWD/label_p.h \
119
    $$PWD/textbutton.h \
1496
121
    $$PWD/ucbottomedgeregion_p.h
1497
122
=======
1500
123
    $$PWD/privates/shape/utils.h \
120
    $$PWD/privates/shape/utils.h \
1501
124
    $$PWD/privates/shape/texturefactory.h \
121
    $$PWD/privates/shape/texturefactory.h \
1502
125
    $$PWD/privates/shape/fill.h \
122
    $$PWD/privates/shape/fill.h \
1503
126
    $$PWD/privates/shape/frame.h \
123
    $$PWD/privates/shape/frame.h \
1506
127
    $$PWD/privates/shape/shadow.h
124
    $$PWD/privates/shape/shadow.h \
1507
128
>>>>>>> MERGE-SOURCE
125
    $$PWD/label_p.h \
1508
126
    $$PWD/ucbottomedgeregion_p.h
1509
129
127
1510
130
SOURCES += $$PWD/plugin.cpp \
128
SOURCES += $$PWD/plugin.cpp \
1511
131
    $$PWD/uctheme.cpp \
129
    $$PWD/uctheme.cpp \
1512
@@ -202,6 +200,8 @@
1513
202
    $$PWD/privates/ucpagewrapper.cpp \
200
    $$PWD/privates/ucpagewrapper.cpp \
1514
203
    $$PWD/privates/ucpagewrapperincubator.cpp \
201
    $$PWD/privates/ucpagewrapperincubator.cpp \
1515
204
    $$PWD/privates/appheaderbase.cpp \
202
    $$PWD/privates/appheaderbase.cpp \
1516
203
    $$PWD/button.cpp \
1517
204
    $$PWD/textbutton.cpp \
1518
205
    $$PWD/privates/shape/utils.cpp \
205
    $$PWD/privates/shape/utils.cpp \
1519
206
    $$PWD/privates/shape/texturefactory.cpp \
206
    $$PWD/privates/shape/texturefactory.cpp \
1520
207
    $$PWD/privates/shape/fill.cpp \
207
    $$PWD/privates/shape/fill.cpp \
1521
208
208
1522
=== added file 'src/Ubuntu/Components/plugin/textbutton.cpp'
1523
--- src/Ubuntu/Components/plugin/textbutton.cpp	1970-01-01 00:00:00 +0000
1524
+++ src/Ubuntu/Components/plugin/textbutton.cpp	2016-04-08 16:09:06 +0000
1525
@@ -0,0 +1,134 @@
1526
1
/*
1527
2
 * Copyright 2016 Canonical Ltd.
1528
3
 *
1529
4
 * This program is free software; you can redistribute it and/or modify
1530
5
 * it under the terms of the GNU Lesser General Public License as published by
1531
6
 * the Free Software Foundation; version 3.
1532
7
 *
1533
8
 * This program is distributed in the hope that it will be useful,
1534
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1535
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1536
11
 * GNU Lesser General Public License for more details.
1537
12
 *
1538
13
 * You should have received a copy of the GNU Lesser General Public License
1539
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1540
15
 *
1541
16
 * Author: Pierre Bertet <pierre.bertet@canonical.com>
1542
17
 */
1543
18
1544
19
#include "textbutton_p.h"
1545
20
#include "ucstyleditembase_p.h"
1546
21
#include "ucnamespace.h"
1547
22
1548
23
namespace UbuntuToolkit {
1549
24
1550
25
TextButtonPrivate::TextButtonPrivate()
1551
26
    : UCAbstractButtonPrivate()
1552
27
    , strong(false)
1553
28
{
1554
29
}
1555
30
1556
31
/*!
1557
32
\qmltype TextButton
1558
33
\instantiates UbuntuToolkit::TextButton
1559
34
\inherits UCAbstractButton
1560
35
\inqmlmodule Ubuntu.Components 1.3
1561
36
\ingroup ubuntu
1562
37
\brief Ubuntu text button.
1563
38
1564
39
The TextButton component allows to create a text-only button that follows the Ubuntu visual and behavioral standards.
1565
40
1566
41
The button can be strong, which will be represented by a bold font.
1567
42
1568
43
\l {http://design.ubuntu.com/apps/building-blocks/buttons}{See also the Design Guidelines on Buttons}.
1569
44
1570
45
Example:
1571
46
1572
47
\qml
1573
48
TextButton {
1574
49
    text: "Send"
1575
50
    onClicked: print("clicked text-only Button")
1576
51
}
1577
52
\endqml
1578
53
1579
54
An \l Action can be used to specify \b clicked and \b text:
1580
55
1581
56
\qml
1582
57
Item {
1583
58
    Action {
1584
59
       id: myAction
1585
60
       text: "Click me"
1586
61
       onTriggered: print("action!")
1587
62
    }
1588
63
    TextButton {
1589
64
       action: myAction
1590
65
    }
1591
66
}
1592
67
\endqml
1593
68
1594
69
\sa Button
1595
70
*/
1596
71
1597
72
TextButton::TextButton(QQuickItem* parent)
1598
73
    : UCAbstractButton(*(new TextButtonPrivate), parent)
1599
74
{
1600
75
    /*
1601
76
     * From ucbottomedgehint.cpp:
1602
77
     * we cannot use setStyleName as that will trigger style loading
1603
78
     * and the qmlEngine is not known at this phase of the of the
1604
79
     * initialization. Therefore we simply set the style name default. Style
1605
80
     * loading will happen during component completion.
1606
81
     */
1607
82
    UCStyledItemBasePrivate::get(this)->styleDocument = QStringLiteral("TextButtonStyle");
1608
83
}
1609
84
1610
85
/*!
1611
86
   \qmlproperty url TextButton::iconSource
1612
87
   The source URL of the icon to display inside the button. Leave this value
1613
88
   blank for a text-only button.
1614
89
   If \l action is set, the default iconSource is that of the action.
1615
90
*/
1616
91
1617
92
/*!
1618
93
    \qmlproperty string TextButton::text
1619
94
    The text to display in the button. If an icon was defined, the text will be
1620
95
    shown next to the icon, otherwise it will be centered. Leave blank for an
1621
96
    icon-only button.
1622
97
    If \l action is set, the default text is that of the action.
1623
98
*/
1624
99
1625
100
/*!
1626
101
    \qmlsignal TextButton::clicked()
1627
102
    This handler is called when there is a mouse click on the button and the
1628
103
    button is not disabled. If \l {ActionItem::action}{action} is defined, the
1629
104
    action will be triggered.
1630
105
*/
1631
106
1632
107
/*!
1633
108
    \qmlsignal TextButton::pressAndHold()
1634
109
    This handler is called when there is a long press.
1635
110
*/
1636
111
1637
112
/*!
1638
113
    \qmlproperty Action TextButton::action
1639
114
    An \l Action to specify the clicked and \l text properties.
1640
115
*/
1641
116
1642
117
/*!
1643
118
    \qmlproperty bool TextButton::strong
1644
119
    Set to `true` to give importance to the button. The button font will appear
1645
120
    in bold.
1646
121
*/
1647
122
bool TextButton::strong()
1648
123
{
1649
124
    Q_D(TextButton);
1650
125
    return d->strong;
1651
126
}
1652
127
void TextButton::setStrong(bool &strong)
1653
128
{
1654
129
    Q_D(TextButton);
1655
130
    d->strong = strong;
1656
131
    Q_EMIT strongChanged();
1657
132
}
1658
133
1659
134
}
1660
0
135
1661
=== added file 'src/Ubuntu/Components/plugin/textbutton.h'
1662
--- src/Ubuntu/Components/plugin/textbutton.h	1970-01-01 00:00:00 +0000
1663
+++ src/Ubuntu/Components/plugin/textbutton.h	2016-04-08 16:09:06 +0000
1664
@@ -0,0 +1,51 @@
1665
1
/*
1666
2
 * Copyright 2016 Canonical Ltd.
1667
3
 *
1668
4
 * This program is free software; you can redistribute it and/or modify
1669
5
 * it under the terms of the GNU Lesser General Public License as published by
1670
6
 * the Free Software Foundation; version 3.
1671
7
 *
1672
8
 * This program is distributed in the hope that it will be useful,
1673
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1674
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1675
11
 * GNU Lesser General Public License for more details.
1676
12
 *
1677
13
 * You should have received a copy of the GNU Lesser General Public License
1678
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1679
15
 *
1680
16
 * Author: Pierre Bertet <pierre.bertet@canonical.com>
1681
17
 */
1682
18
1683
19
#ifndef TEXTBUTTON_H
1684
20
#define TEXTBUTTON_H
1685
21
1686
22
#include "ucabstractbutton.h"
1687
23
1688
24
namespace UbuntuToolkit {
1689
25
1690
26
class TextButtonPrivate;
1691
27
class TextButton : public UCAbstractButton
1692
28
{
1693
29
    Q_OBJECT
1694
30
1695
31
    Q_PROPERTY(bool strong READ strong WRITE setStrong NOTIFY strongChanged)
1696
32
1697
33
public:
1698
34
    explicit TextButton(QQuickItem* parent=0);
1699
35
1700
36
    bool strong();
1701
37
    void setStrong(bool &strong);
1702
38
1703
39
Q_SIGNALS:
1704
40
    void strongChanged();
1705
41
1706
42
private:
1707
43
    Q_DECLARE_PRIVATE(TextButton)
1708
44
    Q_DISABLE_COPY(TextButton)
1709
45
};
1710
46
1711
47
}
1712
48
1713
49
QML_DECLARE_TYPE(UbuntuToolkit::TextButton)
1714
50
1715
51
#endif  // TEXTBUTTON_H
1716
0
52
1717
=== modified file 'src/Ubuntu/Components/plugin/ucabstractbutton.cpp'
1718
--- src/Ubuntu/Components/plugin/ucabstractbutton.cpp	2016-03-01 19:36:40 +0000
1719
+++ src/Ubuntu/Components/plugin/ucabstractbutton.cpp	2016-04-08 16:09:06 +0000
1720
@@ -104,7 +104,7 @@
1721
104
{
104
{
1722
105
    d_func()->init();
105
    d_func()->init();
1723
106
}
106
}
1725
107
UCAbstractButton::UCAbstractButton(UCAbstractButtonPrivate &&dd, QQuickItem *parent)
107
UCAbstractButton::UCAbstractButton(UCAbstractButtonPrivate &dd, QQuickItem *parent)
1726
108
    : UCActionItem(dd, parent)
108
    : UCActionItem(dd, parent)
1727
109
{
109
{
1728
110
    d_func()->init();
110
    d_func()->init();
1729
111
111
1730
=== modified file 'src/Ubuntu/Components/plugin/ucabstractbutton.h'
1731
--- src/Ubuntu/Components/plugin/ucabstractbutton.h	2016-02-10 19:35:49 +0000
1732
+++ src/Ubuntu/Components/plugin/ucabstractbutton.h	2016-04-08 16:09:06 +0000
1733
@@ -60,7 +60,7 @@
1734
60
    void pressAndHold();
60
    void pressAndHold();
1735
61
61
1736
62
protected:
62
protected:
1738
63
    UCAbstractButton(UCAbstractButtonPrivate &&, QQuickItem *parent = 0);
63
    UCAbstractButton(UCAbstractButtonPrivate &, QQuickItem *parent = 0);
1739
64
64
1740
65
    Q_DECLARE_PRIVATE(UCAbstractButton)
65
    Q_DECLARE_PRIVATE(UCAbstractButton)
1741
66
    Q_PRIVATE_SLOT(d_func(), void _q_mouseAreaPressed())
66
    Q_PRIVATE_SLOT(d_func(), void _q_mouseAreaPressed())
1742
67
67
1743
=== modified file 'src/Ubuntu/Components/qmldir'
1744
--- src/Ubuntu/Components/qmldir	2016-02-16 11:39:32 +0000
1745
+++ src/Ubuntu/Components/qmldir	2016-04-08 16:09:06 +0000
1746
@@ -103,7 +103,6 @@
1747
103
ToolbarButton 1.3 1.3/ToolbarButton.qml
103
ToolbarButton 1.3 1.3/ToolbarButton.qml
1748
104
MainView 1.3 1.3/MainView.qml
104
MainView 1.3 1.3/MainView.qml
1749
105
ComboButton 1.3 1.3/ComboButton.qml
105
ComboButton 1.3 1.3/ComboButton.qml
1750
106
Button 1.3 1.3/Button.qml
1751
107
Panel 1.3 1.3/Panel.qml
106
Panel 1.3 1.3/Panel.qml
1752
108
Tab 1.3 1.3/Tab.qml
107
Tab 1.3 1.3/Tab.qml
1753
109
TabBar 1.3 1.3/TabBar.qml
108
TabBar 1.3 1.3/TabBar.qml
1754
110
109
1755
=== added file 'tests/unit/tst_performance/ButtonGrid13.qml'
1756
--- tests/unit/tst_performance/ButtonGrid13.qml	1970-01-01 00:00:00 +0000
1757
+++ tests/unit/tst_performance/ButtonGrid13.qml	2016-04-08 16:09:06 +0000
1758
@@ -0,0 +1,30 @@
1759
1
/*
1760
2
 * Copyright 2016 Canonical Ltd.
1761
3
 *
1762
4
 * This program is free software; you can redistribute it and/or modify
1763
5
 * it under the terms of the GNU Lesser General Public License as published by
1764
6
 * the Free Software Foundation; version 3.
1765
7
 *
1766
8
 * This program is distributed in the hope that it will be useful,
1767
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1768
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1769
11
 * GNU Lesser General Public License for more details.
1770
12
 *
1771
13
 * You should have received a copy of the GNU Lesser General Public License
1772
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1773
15
 */
1774
16
1775
17
import QtQuick 2.3
1776
18
import Ubuntu.Components 1.3
1777
19
1778
20
Grid {
1779
21
    width: 800
1780
22
    height: 600
1781
23
    rows: 16
1782
24
    columns: 16
1783
25
    Repeater {
1784
26
        model: 16*16
1785
27
        Button {
1786
28
        }
1787
29
    }
1788
30
}
1789
0
31
1790
=== modified file 'tests/unit/tst_performance/tst_performance.cpp'
1791
--- tests/unit/tst_performance/tst_performance.cpp	2015-12-07 22:16:52 +0000
1792
+++ tests/unit/tst_performance/tst_performance.cpp	2016-04-08 16:09:06 +0000
1793
@@ -110,7 +110,8 @@
1794
110
        QTest::newRow("grid with Label 1.3") << "LabelGrid13.qml" << QUrl();
110
        QTest::newRow("grid with Label 1.3") << "LabelGrid13.qml" << QUrl();
1795
111
        QTest::newRow("grid with UbuntuShape") << "UbuntuShapeGrid.qml" << QUrl();
111
        QTest::newRow("grid with UbuntuShape") << "UbuntuShapeGrid.qml" << QUrl();
1796
112
        QTest::newRow("grid with UbuntuShapePair") << "PairOfUbuntuShapeGrid.qml" << QUrl();
112
        QTest::newRow("grid with UbuntuShapePair") << "PairOfUbuntuShapeGrid.qml" << QUrl();
1798
113
        QTest::newRow("grid with Button") << "ButtonGrid.qml" << QUrl();
113
        QTest::newRow("grid with Button 1.1") << "ButtonGrid.qml" << QUrl();
1799
114
        QTest::newRow("grid with Button 1.3") << "ButtonGrid13.qml" << QUrl();
1800
114
        QTest::newRow("grid with Slider") << "SliderGrid.qml" << QUrl();
115
        QTest::newRow("grid with Slider") << "SliderGrid.qml" << QUrl();
1801
115
        QTest::newRow("list with QtQuick Item") << "ItemList.qml" << QUrl();
116
        QTest::newRow("list with QtQuick Item") << "ItemList.qml" << QUrl();
1802
116
        QTest::newRow("list with new ListItem") << "ListItemList.qml" << QUrl();
117
        QTest::newRow("list with new ListItem") << "ListItemList.qml" << QUrl();
1803
@@ -131,7 +132,7 @@
1804
131
        QTest::newRow("list of Scrollbar 1.3") << "ListOfScrollbars_1_3.qml" << QUrl();
132
        QTest::newRow("list of Scrollbar 1.3") << "ListOfScrollbars_1_3.qml" << QUrl();
1805
132
        QTest::newRow("list of ScrollView 1.3 with both Scrollbars") << "ListOfScrollView_bothScrollbars_1_3.qml" << QUrl();
133
        QTest::newRow("list of ScrollView 1.3 with both Scrollbars") << "ListOfScrollView_bothScrollbars_1_3.qml" << QUrl();
1806
133
        // disable this test as it takes >20 seconds. Kept still for measurements to be done during development
134
        // disable this test as it takes >20 seconds. Kept still for measurements to be done during development
1808
134
        //        QTest::newRow("list with ListItems.Base (one icon, one label and one chevron)") << "ListItemsBaseList.qml" << QUrl();
135
        // QTest::newRow("list with ListItems.Base (one icon, one label and one chevron)") << "ListItemsBaseList.qml" << QUrl();
1809
135
        QTest::newRow("single MainView") << "MainView.qml" << QUrl();
136
        QTest::newRow("single MainView") << "MainView.qml" << QUrl();
1810
136
    }
137
    }
1811
137
138
Reviewer	Review Type	Date Requested	Status
ubuntu-sdk-build-bot	continuous-integration	2016-04-08	Needs Fixing on 2016-04-08
Zsombor Egri		2016-04-08	Pending
Review via email: mp+291389@code.launchpad.net