1
=== modified file 'components.api'
2
--- components.api	2015-08-20 08:10:44 +0000
3
+++ components.api	2015-08-25 13:10:33 +0000
4
@@ -4,10 +4,10 @@
5
4
    signal pressAndHold()
4
    signal pressAndHold()
6
5
    property bool pressed
5
    property bool pressed
7
6
Ubuntu.Components.AbstractButton 1.3: ActionItem
6
Ubuntu.Components.AbstractButton 1.3: ActionItem
9
7
    property bool hovered
7
    readonly property bool hovered
10
8
    signal clicked()
8
    signal clicked()
11
9
    signal pressAndHold()
9
    signal pressAndHold()
13
10
    property bool pressed
10
    readonly property bool pressed
14
11
Ubuntu.Components.Action 1.3 1.0 0.1: QtObject
11
Ubuntu.Components.Action 1.3 1.0 0.1: QtObject
15
12
    property string description
12
    property string description
16
13
    property bool enabled
13
    property bool enabled
17
14
14
18
=== removed file 'src/Ubuntu/Components/1.3/AbstractButton.qml'
19
--- src/Ubuntu/Components/1.3/AbstractButton.qml	2015-04-25 08:54:58 +0000
20
+++ src/Ubuntu/Components/1.3/AbstractButton.qml	1970-01-01 00:00:00 +0000
21
@@ -1,109 +0,0 @@
22
1
/*
23
2
 * Copyright 2012 Canonical Ltd.
24
3
 *
25
4
 * This program is free software; you can redistribute it and/or modify
26
5
 * it under the terms of the GNU Lesser General Public License as published by
27
6
 * the Free Software Foundation; version 3.
28
7
 *
29
8
 * This program is distributed in the hope that it will be useful,
30
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
31
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
32
11
 * GNU Lesser General Public License for more details.
33
12
 *
34
13
 * You should have received a copy of the GNU Lesser General Public License
35
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
36
15
 */
37
16
38
17
import QtQuick 2.4
39
18
import Ubuntu.Components 1.3
40
19
41
20
/*!
42
21
    \qmlabstract AbstractButton
43
22
    \inqmlmodule Ubuntu.Components 1.1
44
23
    \ingroup ubuntu
45
24
    \brief The AbstractButton class defines the behavior of the button.
46
25
47
26
    This class defines the behavior of the button: it defines the MouseArea
48
27
    and the states.
49
28
    All components deriving from this class support haptic feedback out of the box.
50
29
*/
51
30
ActionItem {
52
31
    id: button
53
32
54
33
    /*!
55
34
      If an action is specified, the button's clicked signal will trigger the action.
56
35
      Subclasses of AbstractButton can use other properties of action (for example
57
36
      the text and iconName).
58
37
      \qmlproperty Action action
59
38
     */
60
39
61
40
    /*!
62
41
       This handler is called when there is a mouse click on the button
63
42
       and the button is not disabled. If \b action is defined,
64
43
       the action will be triggered.
65
44
    */
66
45
    signal clicked()
67
46
68
47
    /*!
69
48
      If a button is clicked, its triggered() signal will automatically be called.
70
49
     */
71
50
    onClicked: button.trigger()
72
51
73
52
    Keys.onEnterPressed: clicked()
74
53
    Keys.onReturnPressed: clicked()
75
54
76
55
    /*!
77
56
      This handler is called when there is a long press.
78
57
     */
79
58
    signal pressAndHold()
80
59
81
60
    /*!
82
61
      True if the user presses a mouse button in the button's mouse area.
83
62
     */
84
63
    property bool pressed: mouseArea.pressed
85
64
86
65
    /*!
87
66
      True if the mouse cursor hovers over the button's mouse area.
88
67
     */
89
68
    property bool hovered: __acceptEvents && mouseArea.containsMouse
90
69
91
70
    /*!
92
71
      \internal
93
72
      Disable or enable signal emition by default.
94
73
      Some classes want to emit the signal by themselves (ListItem.Standard)
95
74
     */
96
75
    property bool __acceptEvents: true
97
76
98
77
    /*!
99
78
      \internal
100
79
      To get the properties of the mouse area in subclasses.
101
80
     */
102
81
    property alias __mouseArea: mouseArea
103
82
104
83
    activeFocusOnPress: true
105
84
106
85
    MouseArea {
107
86
        id: mouseArea
108
87
        anchors.fill: parent
109
88
        // if mouseArea is given a new value, disable defaultMouseArea
110
89
        // as it might occlude the newly assigned mouse area.
111
90
        hoverEnabled: true
112
91
113
92
        // invoke Haptics singleton earlier than we press the button,
114
93
        // so we give some time for the singleton to sync settings with the service
115
94
        property bool hapticsEnabled: Haptics.enabled
116
95
117
96
        onClicked: {
118
97
            if (button.__acceptEvents) {
119
98
                // FIXME (Vivid) call this in the style rather than from AbstractButton
120
99
                Haptics.play();
121
100
                button.clicked()
122
101
            }
123
102
        }
124
103
        onPressAndHold: {
125
104
            if (button.__acceptEvents) {
126
105
                button.pressAndHold()
127
106
            }
128
107
        }
129
108
    }
130
109
}
131
110
0
132
=== modified file 'src/Ubuntu/Components/1.3/Button.qml'
133
--- src/Ubuntu/Components/1.3/Button.qml	2015-05-26 15:05:46 +0000
134
+++ src/Ubuntu/Components/1.3/Button.qml	2015-08-25 13:10:33 +0000
135
@@ -105,7 +105,7 @@
136
105
    /*!
105
    /*!
137
106
      The font used for the button's text.
106
      The font used for the button's text.
138
107
    */
107
    */
140
108
    property font font: __styleInstance ? __styleInstance.defaultFont : Qt.font({family: "Ubuntu", pixelSize: FontUtils.sizeToPixels("medium")})
108
    property font font: __styleInstance.defaultFont
141
109
109
142
110
    /*!
110
    /*!
143
111
       The position of the icon relative to the text. Options
111
       The position of the icon relative to the text. Options
144
112
112
145
=== modified file 'src/Ubuntu/Components/1.3/ComboButton.qml'
146
--- src/Ubuntu/Components/1.3/ComboButton.qml	2015-05-21 10:50:35 +0000
147
+++ src/Ubuntu/Components/1.3/ComboButton.qml	2015-08-25 13:10:33 +0000
148
@@ -15,6 +15,7 @@
149
15
 */
15
 */
150
16
16
151
17
import QtQuick 2.4
17
import QtQuick 2.4
152
18
import Ubuntu.Components 1.3
153
18
import Ubuntu.Components.Popups 1.3
19
import Ubuntu.Components.Popups 1.3
154
19
20
155
20
/*!
21
/*!
156
21
22
157
=== modified file 'src/Ubuntu/Components/1.3/TextField.qml'
158
--- src/Ubuntu/Components/1.3/TextField.qml	2015-08-18 15:51:43 +0000
159
+++ src/Ubuntu/Components/1.3/TextField.qml	2015-08-25 13:10:33 +0000
160
@@ -896,7 +896,7 @@
161
896
        }
896
        }
162
897
    }
897
    }
163
898
898
165
899
    AbstractButton {
899
    Ubuntu.AbstractButton {
166
900
        id: clearButton
900
        id: clearButton
167
901
        objectName: "clear_button"
901
        objectName: "clear_button"
168
902
        activeFocusOnPress: false
902
        activeFocusOnPress: false
169
903
903
170
=== modified file 'src/Ubuntu/Components/ComponentModule.pro'
171
--- src/Ubuntu/Components/ComponentModule.pro	2015-08-19 08:57:18 +0000
172
+++ src/Ubuntu/Components/ComponentModule.pro	2015-08-25 13:10:33 +0000
173
@@ -80,8 +80,7 @@
174
80
             1.2/UbuntuNumberAnimation.qml
80
             1.2/UbuntuNumberAnimation.qml
175
81
81
176
82
#1.3
82
#1.3
179
83
QML_FILES += 1.3/AbstractButton.qml \
83
QML_FILES += 1.3/ActionBar.qml \
178
84
             1.3/ActionBar.qml \
180
85
             1.3/ActionList.qml \
84
             1.3/ActionList.qml \
181
86
             1.3/ActivityIndicator.qml \
85
             1.3/ActivityIndicator.qml \
182
87
	     1.3/AdaptivePageLayout.qml \
86
	     1.3/AdaptivePageLayout.qml \
183
88
87
184
=== modified file 'src/Ubuntu/Components/ListItems/1.3/SingleControl.qml'
185
--- src/Ubuntu/Components/ListItems/1.3/SingleControl.qml	2015-04-29 07:21:29 +0000
186
+++ src/Ubuntu/Components/ListItems/1.3/SingleControl.qml	2015-08-25 13:10:33 +0000
187
@@ -54,7 +54,8 @@
188
54
54
189
55
    /*! \internal */
55
    /*! \internal */
190
56
    onClicked: if (control && control.enabled && control.hasOwnProperty("clicked")) control.clicked()
56
    onClicked: if (control && control.enabled && control.hasOwnProperty("clicked")) control.clicked()
192
57
    pressed: __mouseArea.pressed || (control && control.hasOwnProperty("pressed") && control.pressed)
57
    /*! \internal */
193
58
    property bool pressed: __mouseArea.pressed || (control && control.hasOwnProperty("pressed") && control.pressed)
194
58
    /*! \internal */
59
    /*! \internal */
195
59
    onPressedChanged: if (control && control.enabled && control.hasOwnProperty("pressed")) control.pressed = singleControlListItem.pressed
60
    onPressedChanged: if (control && control.enabled && control.hasOwnProperty("pressed")) control.pressed = singleControlListItem.pressed
196
60
61
197
61
62
198
=== modified file 'src/Ubuntu/Components/plugin/plugin.cpp'
199
--- src/Ubuntu/Components/plugin/plugin.cpp	2015-08-19 08:44:45 +0000
200
+++ src/Ubuntu/Components/plugin/plugin.cpp	2015-08-25 13:10:33 +0000
201
@@ -64,6 +64,7 @@
202
64
#include "ucnamespace.h"
64
#include "ucnamespace.h"
203
65
#include "ucactionitem.h"
65
#include "ucactionitem.h"
204
66
#include "uchaptics.h"
66
#include "uchaptics.h"
205
67
#include "ucabstractbutton.h"
206
67
68
207
68
#include <sys/types.h>
69
#include <sys/types.h>
208
69
#include <unistd.h>
70
#include <unistd.h>
209
@@ -232,6 +233,7 @@
210
232
    qmlRegisterType<UCUbuntuShape, 2>(uri, 1, 3, "UbuntuShape");
233
    qmlRegisterType<UCUbuntuShape, 2>(uri, 1, 3, "UbuntuShape");
211
233
    qmlRegisterType<UCProportionalShape>(uri, 1, 3, "ProportionalShape");
234
    qmlRegisterType<UCProportionalShape>(uri, 1, 3, "ProportionalShape");
212
234
    qmlRegisterType<LiveTimer>(uri, 1, 3, "LiveTimer");
235
    qmlRegisterType<LiveTimer>(uri, 1, 3, "LiveTimer");
213
236
    qmlRegisterType<UCAbstractButton>(uri, 1, 3, "AbstractButton");
214
235
}
237
}
215
236
238
216
237
void UbuntuComponentsPlugin::initializeEngine(QQmlEngine *engine, const char *uri)
239
void UbuntuComponentsPlugin::initializeEngine(QQmlEngine *engine, const char *uri)
217
238
240
218
=== modified file 'src/Ubuntu/Components/plugin/plugin.pri'
219
--- src/Ubuntu/Components/plugin/plugin.pri	2015-08-20 11:35:51 +0000
220
+++ src/Ubuntu/Components/plugin/plugin.pri	2015-08-25 13:10:33 +0000
221
@@ -82,7 +82,8 @@
222
82
    $$PWD/livetimer_p.h \
82
    $$PWD/livetimer_p.h \
223
83
    $$PWD/timeutils_p.h \
83
    $$PWD/timeutils_p.h \
224
84
    $$PWD/ucactionitem.h \
84
    $$PWD/ucactionitem.h \
226
85
    $$PWD/uchaptics.h
85
    $$PWD/uchaptics.h \
227
86
    $$PWD/ucabstractbutton.h
228
86
87
229
87
SOURCES += $$PWD/plugin.cpp \
88
SOURCES += $$PWD/plugin.cpp \
230
88
    $$PWD/uctheme.cpp \
89
    $$PWD/uctheme.cpp \
231
@@ -136,7 +137,8 @@
232
136
    $$PWD/livetimer.cpp \
137
    $$PWD/livetimer.cpp \
233
137
    $$PWD/livetimer_p.cpp \
138
    $$PWD/livetimer_p.cpp \
234
138
    $$PWD/ucactionitem.cpp \
139
    $$PWD/ucactionitem.cpp \
236
139
    $$PWD/uchaptics.cpp
140
    $$PWD/uchaptics.cpp \
237
141
    $$PWD/ucabstractbutton.cpp
238
140
142
239
141
# adapters
143
# adapters
240
142
SOURCES += $$PWD/adapters/alarmsadapter_organizer.cpp
144
SOURCES += $$PWD/adapters/alarmsadapter_organizer.cpp
241
143
145
242
=== added file 'src/Ubuntu/Components/plugin/ucabstractbutton.cpp'
243
--- src/Ubuntu/Components/plugin/ucabstractbutton.cpp	1970-01-01 00:00:00 +0000
244
+++ src/Ubuntu/Components/plugin/ucabstractbutton.cpp	2015-08-25 13:10:33 +0000
245
@@ -0,0 +1,156 @@
246
1
/*
247
2
 * Copyright 2015 Canonical Ltd.
248
3
 *
249
4
 * This program is free software; you can redistribute it and/or modify
250
5
 * it under the terms of the GNU Lesser General Public License as published by
251
6
 * the Free Software Foundation; version 3.
252
7
 *
253
8
 * This program is distributed in the hope that it will be useful,
254
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
255
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
256
11
 * GNU Lesser General Public License for more details.
257
12
 *
258
13
 * You should have received a copy of the GNU Lesser General Public License
259
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
260
15
 */
261
16
262
17
#include "ucabstractbutton.h"
263
18
#include "uchaptics.h"
264
19
#include <QtQuick/private/qquickitem_p.h>
265
20
#include <QtQuick/private/qquickmousearea_p.h>
266
21
#include <QtQml/private/qqmlglobal_p.h>
267
22
268
23
/*!
269
24
    \qmltype AbstractButton
270
25
    \instantiates UCAbstractButton
271
26
    \inqmlmodule Ubuntu.Components 1.1
272
27
    \ingroup ubuntu
273
28
    \brief The AbstractButton class defines the behavior of the button.
274
29
275
30
    This class defines the behavior of the button. All components deriving from
276
31
    this class support haptic feedback out of the box.
277
32
278
33
    If an action is specified, the button's clicked signal will trigger the action.
279
34
    Subclasses of AbstractButton can use other properties of action (for example
280
35
    the text and iconName).
281
36
*/
282
37
283
38
/*!
284
39
 *
285
40
 * \qmlsignal AbstractButton::clicked()
286
41
 * This handler is called when there is a mouse click on the button and the button
287
42
 * is not disabled. If \l {ActionItem::action}{action} is defined, the action will be triggered.
288
43
 */
289
44
290
45
/*!
291
46
 *
292
47
 * \qmlsignal AbstractButton::pressAndHold()
293
48
 * This handler is called when there is a long press.
294
49
 */
295
50
296
51
UCAbstractButton::UCAbstractButton(QQuickItem *parent)
297
52
    : UCActionItem(parent)
298
53
    , m_mouseArea(new QQuickMouseArea)
299
54
    , m_acceptEvents(true)
300
55
{
301
56
    setActiveFocusOnPress(true);
302
57
}
303
58
304
59
bool UCAbstractButton::isPressAndHoldConnected()
305
60
{
306
61
    static QMetaMethod method = QMetaMethod::fromSignal(&UCAbstractButton::pressAndHold);
307
62
    static int signalIdx = QMetaObjectPrivate::signalIndex(method);
308
63
    return QObjectPrivate::get(this)->isSignalConnected(signalIdx);
309
64
}
310
65
311
66
void UCAbstractButton::classBegin()
312
67
{
313
68
    UCActionItem::classBegin();
314
69
315
70
    // make sure we have the haptics set up!
316
71
    HapticsProxy::instance().initialize();
317
72
318
73
    // set up mouse area
319
74
    QQml_setParent_noEvent(m_mouseArea, this);
320
75
    m_mouseArea->setParentItem(this);
321
76
    QQuickAnchors *anchors = QQuickItemPrivate::get(m_mouseArea)->anchors();
322
77
    anchors->setFill(this);
323
78
    m_mouseArea->setHoverEnabled(true);
324
79
}
325
80
326
81
void UCAbstractButton::componentComplete()
327
82
{
328
83
    UCActionItem::componentComplete();
329
84
    // connect to the right slot, using macros so we get the proper slot
330
85
    connect(this, SIGNAL(clicked()), this, SLOT(trigger()));
331
86
332
87
    // bind mouse area
333
88
    connect(m_mouseArea, &QQuickMouseArea::pressedChanged, this, &UCAbstractButton::pressedChanged);
334
89
    connect(m_mouseArea, &QQuickMouseArea::hoveredChanged, this, &UCAbstractButton::hoveredChanged);
335
90
    connect(m_mouseArea, SIGNAL(clicked(QQuickMouseEvent*)), this, SLOT(_q_mouseAreaClicked()));
336
91
    if (isPressAndHoldConnected()) {
337
92
        connect(m_mouseArea, SIGNAL(pressAndHold(QQuickMouseEvent*)), this, SLOT(_q_mouseAreaPressAndHold()));
338
93
    }
339
94
}
340
95
341
96
// handle mouseClicked with Haptics
342
97
void UCAbstractButton::_q_mouseAreaClicked()
343
98
{
344
99
    // required by the deprecated ListItem module
345
100
    if (!m_acceptEvents) {
346
101
        return;
347
102
    }
348
103
    // play haptics
349
104
    HapticsProxy::instance().play(QVariant());
350
105
    Q_EMIT clicked();
351
106
}
352
107
353
108
// handle pressAndHold
354
109
void UCAbstractButton::_q_mouseAreaPressAndHold()
355
110
{
356
111
    // required by the deprecated ListItem module
357
112
    if (!m_acceptEvents) {
358
113
        return;
359
114
    }
360
115
    Q_EMIT pressAndHold();
361
116
}
362
117
363
118
// emit clicked when Enter/Return is pressed
364
119
void UCAbstractButton::keyPressEvent(QKeyEvent *event)
365
120
{
366
121
    UCActionItem::keyPressEvent(event);
367
122
368
123
    switch (event->key()) {
369
124
        case Qt::Key_Enter:
370
125
        case Qt::Key_Return:
371
126
        // FIXME: space may also come here, however that depends on the button type
372
127
        // (i.e default Dialog btn) so we may need to add that to Button
373
128
        {
374
129
            Q_EMIT clicked();
375
130
            break;
376
131
        }
377
132
    }
378
133
}
379
134
380
135
/*!
381
136
 * \qmlproperty bool AbstractButton::pressed
382
137
 * True if the user presses a mouse button in the button's mouse area.
383
138
 */
384
139
bool UCAbstractButton::pressed() const
385
140
{
386
141
    return m_mouseArea ? m_mouseArea->pressed() : false;
387
142
}
388
143
389
144
/*!
390
145
 * \qmlproperty bool AbstractButton::hovered
391
146
 * True if the mouse cursor hovers over the button's mouse area.
392
147
 */
393
148
bool UCAbstractButton::hovered() const
394
149
{
395
150
    return m_mouseArea ? m_mouseArea->hovered() : false;
396
151
}
397
152
398
153
QQuickMouseArea *UCAbstractButton::privateMouseArea() const
399
154
{
400
155
    return m_mouseArea;
401
156
}
402
0
157
403
=== added file 'src/Ubuntu/Components/plugin/ucabstractbutton.h'
404
--- src/Ubuntu/Components/plugin/ucabstractbutton.h	1970-01-01 00:00:00 +0000
405
+++ src/Ubuntu/Components/plugin/ucabstractbutton.h	2015-08-25 13:10:33 +0000
406
@@ -0,0 +1,64 @@
407
1
/*
408
2
 * Copyright 2015 Canonical Ltd.
409
3
 *
410
4
 * This program is free software; you can redistribute it and/or modify
411
5
 * it under the terms of the GNU Lesser General Public License as published by
412
6
 * the Free Software Foundation; version 3.
413
7
 *
414
8
 * This program is distributed in the hope that it will be useful,
415
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
416
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
417
11
 * GNU Lesser General Public License for more details.
418
12
 *
419
13
 * You should have received a copy of the GNU Lesser General Public License
420
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
421
15
 */
422
16
423
17
#ifndef UCABSTRACTBUTTON_H
424
18
#define UCABSTRACTBUTTON_H
425
19
426
20
#include "ucactionitem.h"
427
21
428
22
class QQuickMouseArea;
429
23
class UCAbstractButton : public UCActionItem
430
24
{
431
25
    Q_OBJECT
432
26
    Q_PROPERTY(bool pressed READ pressed NOTIFY pressedChanged)
433
27
    Q_PROPERTY(bool hovered READ hovered NOTIFY hoveredChanged)
434
28
435
29
    // internal, declared to support the deprecated ListItem module
436
30
    Q_PROPERTY(bool __acceptEvents MEMBER m_acceptEvents)
437
31
    Q_PROPERTY(QQuickMouseArea *__mouseArea READ privateMouseArea CONSTANT)
438
32
public:
439
33
    explicit UCAbstractButton(QQuickItem *parent = 0);
440
34
441
35
    bool pressed() const;
442
36
    bool hovered() const;
443
37
444
38
    bool privateAcceptEvents() const;
445
39
    void setPrivateAcceptEvents(bool accept);
446
40
    QQuickMouseArea *privateMouseArea() const;
447
41
448
42
protected:
449
43
    void classBegin();
450
44
    void componentComplete();
451
45
    void keyPressEvent(QKeyEvent *key);
452
46
453
47
Q_SIGNALS:
454
48
    void pressedChanged();
455
49
    void hoveredChanged();
456
50
    void clicked();
457
51
    void pressAndHold();
458
52
459
53
protected Q_SLOTS:
460
54
    void _q_mouseAreaClicked();
461
55
    void _q_mouseAreaPressAndHold();
462
56
463
57
protected:
464
58
    QQuickMouseArea *m_mouseArea;
465
59
    bool m_acceptEvents:1;
466
60
467
61
    bool isPressAndHoldConnected();
468
62
};
469
63
470
64
#endif // UCABSTRACTBUTTON_H
471
0
65
472
=== modified file 'src/Ubuntu/Components/plugin/ucaction.cpp'
473
--- src/Ubuntu/Components/plugin/ucaction.cpp	2015-08-18 15:51:43 +0000
474
+++ src/Ubuntu/Components/plugin/ucaction.cpp	2015-08-25 13:10:33 +0000
475
@@ -301,7 +301,8 @@
476
301
        return false;
301
        return false;
477
302
    }
302
    }
478
303
303
480
304
    trigger();
304
    // do not call trigger() directly but invoke, as it may get overridden in QML
481
305
    metaObject()->invokeMethod(this, "trigger");
482
305
    return true;
306
    return true;
483
306
}
307
}
484
307
308
485
308
309
486
=== modified file 'src/Ubuntu/Components/plugin/ucactionitem.cpp'
487
--- src/Ubuntu/Components/plugin/ucactionitem.cpp	2015-08-19 06:56:56 +0000
488
+++ src/Ubuntu/Components/plugin/ucactionitem.cpp	2015-08-25 13:10:33 +0000
489
@@ -44,6 +44,17 @@
490
44
    connect(this, &UCActionItem::enabledChanged, this, &UCActionItem::_q_enabledChanged);
44
    connect(this, &UCActionItem::enabledChanged, this, &UCActionItem::_q_enabledChanged);
491
45
}
45
}
492
46
46
493
47
void UCActionItem::componentComplete()
494
48
{
495
49
    UCStyledItemBase::componentComplete();
496
50
    // make sure we connect to the right signals, so we detach and re-attach actions
497
51
    // to make sure the SLOT macro picks up the custom trigger() slot
498
52
    if (m_action) {
499
53
        attachAction(false);
500
54
        attachAction(true);
501
55
    }
502
56
}
503
57
504
47
void UCActionItem::_q_visibleChanged()
58
void UCActionItem::_q_visibleChanged()
505
48
{
59
{
506
49
    m_flags |= CustomVisible;
60
    m_flags |= CustomVisible;
507
@@ -96,8 +107,8 @@
508
96
void UCActionItem::attachAction(bool attach)
107
void UCActionItem::attachAction(bool attach)
509
97
{
108
{
510
98
    if (attach) {
109
    if (attach) {
513
99
        connect(this, &UCActionItem::triggered,
110
        connect(this, SIGNAL(triggered(QVariant)),
514
100
                m_action, &UCAction::triggered, Qt::DirectConnection);
111
                m_action, SLOT(trigger(QVariant)), Qt::DirectConnection);
515
101
        connect(m_action, &UCAction::visibleChanged,
112
        connect(m_action, &UCAction::visibleChanged,
516
102
                this, &UCActionItem::_q_updateVisible, Qt::DirectConnection);
113
                this, &UCActionItem::_q_updateVisible, Qt::DirectConnection);
517
103
        connect(m_action, &UCAction::enabledChanged,
114
        connect(m_action, &UCAction::enabledChanged,
518
@@ -115,8 +126,8 @@
519
115
                    this, &UCActionItem::iconNameChanged, Qt::DirectConnection);
126
                    this, &UCActionItem::iconNameChanged, Qt::DirectConnection);
520
116
        }
127
        }
521
117
    } else {
128
    } else {
524
118
        disconnect(this, &UCActionItem::triggered,
129
        disconnect(this, SIGNAL(triggered(QVariant)),
525
119
                   m_action, &UCAction::triggered);
130
                   m_action, SLOT(trigger(QVariant)));
526
120
        disconnect(m_action, &UCAction::visibleChanged,
131
        disconnect(m_action, &UCAction::visibleChanged,
527
121
                   this, &UCActionItem::_q_updateVisible);
132
                   this, &UCActionItem::_q_updateVisible);
528
122
        disconnect(m_action, &UCAction::enabledChanged,
133
        disconnect(m_action, &UCAction::enabledChanged,
529
123
134
530
=== modified file 'src/Ubuntu/Components/plugin/ucactionitem.h'
531
--- src/Ubuntu/Components/plugin/ucactionitem.h	2015-08-19 06:55:11 +0000
532
+++ src/Ubuntu/Components/plugin/ucactionitem.h	2015-08-25 13:10:33 +0000
533
@@ -70,6 +70,8 @@
534
70
    UCAction *m_action;
70
    UCAction *m_action;
535
71
    quint8 m_flags;
71
    quint8 m_flags;
536
72
72
537
73
    void componentComplete();
538
74
539
73
    void updateProperties();
75
    void updateProperties();
540
74
    void attachAction(bool attach);
76
    void attachAction(bool attach);
541
75
};
77
};
542
76
78
543
=== modified file 'src/Ubuntu/Components/qmldir'
544
--- src/Ubuntu/Components/qmldir	2015-08-19 08:44:45 +0000
545
+++ src/Ubuntu/Components/qmldir	2015-08-25 13:10:33 +0000
546
@@ -115,7 +115,6 @@
547
115
TabBar 1.3 1.3/TabBar.qml
115
TabBar 1.3 1.3/TabBar.qml
548
116
Tabs 1.3 1.3/Tabs.qml
116
Tabs 1.3 1.3/Tabs.qml
549
117
Label 1.3 1.3/Label.qml
117
Label 1.3 1.3/Label.qml
550
118
AbstractButton 1.3 1.3/AbstractButton.qml
551
119
ActivityIndicator 1.3 1.3/ActivityIndicator.qml
118
ActivityIndicator 1.3 1.3/ActivityIndicator.qml
552
120
ProgressBar 1.3 1.3/ProgressBar.qml
119
ProgressBar 1.3 1.3/ProgressBar.qml
553
121
TextField 1.3 1.3/TextField.qml
120
TextField 1.3 1.3/TextField.qml
554
122
121
555
=== modified file 'tests/unit/tst_components/tst_action.qml'
556
--- tests/unit/tst_components/tst_action.qml	2015-07-09 17:55:03 +0000
557
+++ tests/unit/tst_components/tst_action.qml	2015-08-25 13:10:33 +0000
558
@@ -34,6 +34,11 @@
559
34
         return false;
34
         return false;
560
35
     }
35
     }
561
36
36
562
37
     function cleanup() {
563
38
         triggeredSignalSpy.target = action;
564
39
         triggeredSignalSpy.clear();
565
40
     }
566
41
567
37
     function initTestCase() {
42
     function initTestCase() {
568
38
         compare(action.text, "", "text is empty string set by default")
43
         compare(action.text, "", "text is empty string set by default")
569
39
         compare(action.iconSource, "", "iconSource is empty string by default")
44
         compare(action.iconSource, "", "iconSource is empty string by default")
570
@@ -132,6 +137,12 @@
571
132
         verify(!data.inactive.active, "Context deactivation error");
137
         verify(!data.inactive.active, "Context deactivation error");
572
133
     }
138
     }
573
134
139
574
140
     function test_overloaded_action_trigger() {
575
141
         triggeredSignalSpy.target = suppressTrigger;
576
142
         suppressTrigger.trigger();
577
143
         compare(triggeredSignalSpy.count, 0, "Overloaded trigger should not trigger action");
578
144
     }
579
145
580
135
     Action {
146
     Action {
581
136
         id: action
147
         id: action
582
137
     }
148
     }
583
@@ -185,4 +196,9 @@
584
185
         id: context2
196
         id: context2
585
186
     }
197
     }
586
187
198
587
199
     Action {
588
200
         id: suppressTrigger
589
201
         function trigger() {}
590
202
     }
591
203
592
188
}
204
}
593
189
205
594
=== added file 'tests/unit/tst_performance/AbstractButton13Grid.qml'
595
--- tests/unit/tst_performance/AbstractButton13Grid.qml	1970-01-01 00:00:00 +0000
596
+++ tests/unit/tst_performance/AbstractButton13Grid.qml	2015-08-25 13:10:33 +0000
597
@@ -0,0 +1,30 @@
598
1
/*
599
2
 * Copyright 2015 Canonical Ltd.
600
3
 *
601
4
 * This program is free software; you can redistribute it and/or modify
602
5
 * it under the terms of the GNU Lesser General Public License as published by
603
6
 * the Free Software Foundation; version 3.
604
7
 *
605
8
 * This program is distributed in the hope that it will be useful,
606
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
607
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
608
11
 * GNU Lesser General Public License for more details.
609
12
 *
610
13
 * You should have received a copy of the GNU Lesser General Public License
611
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
612
15
 */
613
16
614
17
import QtQuick 2.0
615
18
import Ubuntu.Components 1.3
616
19
617
20
Grid {
618
21
    width: 800
619
22
    height: 600
620
23
    rows: 16
621
24
    columns: 16
622
25
    Repeater {
623
26
        model: 16*16
624
27
        AbstractButton {
625
28
        }
626
29
    }
627
30
}
628
0
31
629
=== added file 'tests/unit/tst_performance/AbstractButtonGrid.qml'
630
--- tests/unit/tst_performance/AbstractButtonGrid.qml	1970-01-01 00:00:00 +0000
631
+++ tests/unit/tst_performance/AbstractButtonGrid.qml	2015-08-25 13:10:33 +0000
632
@@ -0,0 +1,30 @@
633
1
/*
634
2
 * Copyright 2015 Canonical Ltd.
635
3
 *
636
4
 * This program is free software; you can redistribute it and/or modify
637
5
 * it under the terms of the GNU Lesser General Public License as published by
638
6
 * the Free Software Foundation; version 3.
639
7
 *
640
8
 * This program is distributed in the hope that it will be useful,
641
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
642
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
643
11
 * GNU Lesser General Public License for more details.
644
12
 *
645
13
 * You should have received a copy of the GNU Lesser General Public License
646
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
647
15
 */
648
16
649
17
import QtQuick 2.0
650
18
import Ubuntu.Components 1.1
651
19
652
20
Grid {
653
21
    width: 800
654
22
    height: 600
655
23
    rows: 16
656
24
    columns: 16
657
25
    Repeater {
658
26
        model: 16*16
659
27
        AbstractButton {
660
28
        }
661
29
    }
662
30
}
663
0
31
664
=== modified file 'tests/unit/tst_performance/tst_performance.cpp'
665
--- tests/unit/tst_performance/tst_performance.cpp	2015-04-14 07:41:52 +0000
666
+++ tests/unit/tst_performance/tst_performance.cpp	2015-08-25 13:10:33 +0000
667
@@ -102,6 +102,8 @@
668
102
        QTest::addColumn<QString>("document");
102
        QTest::addColumn<QString>("document");
669
103
        QTest::addColumn<QUrl>("theme");
103
        QTest::addColumn<QUrl>("theme");
670
104
104
671
105
        QTest::newRow("AbstractButton 1.2") << "AbstractButtonGrid.qml" << QUrl();
672
106
        QTest::newRow("AbstractButton 1.3") << "AbstractButton13Grid.qml" << QUrl();
673
105
        QTest::newRow("grid with Rectangle") << "RectangleGrid.qml" << QUrl();
107
        QTest::newRow("grid with Rectangle") << "RectangleGrid.qml" << QUrl();
674
106
        QTest::newRow("grid with Text") << "TextGrid.qml" << QUrl();
108
        QTest::newRow("grid with Text") << "TextGrid.qml" << QUrl();
675
107
        QTest::newRow("grid with Label") << "LabelGrid.qml" << QUrl();
109
        QTest::newRow("grid with Label") << "LabelGrid.qml" << QUrl();
676
108
110
677
=== modified file 'tests/unit/tst_performance/tst_performance.pro'
678
--- tests/unit/tst_performance/tst_performance.pro	2015-04-01 08:33:53 +0000
679
+++ tests/unit/tst_performance/tst_performance.pro	2015-08-25 13:10:33 +0000
680
@@ -30,4 +30,6 @@
681
30
    Styling.qml \
30
    Styling.qml \
682
31
    PaletteConfigurationOneColor.qml \
31
    PaletteConfigurationOneColor.qml \
683
32
    PaletteConfigurationAllColors.qml \
32
    PaletteConfigurationAllColors.qml \
685
33
    StyledItemNewTheming.qml
33
    StyledItemNewTheming.qml \
686
34
    AbstractButtonGrid.qml \
687
35
    AbstractButton13Grid.qml
688
34
36
689
=== added file 'tests/unit_x11/tst_components/tst_abstractbutton13.qml'
690
--- tests/unit_x11/tst_components/tst_abstractbutton13.qml	1970-01-01 00:00:00 +0000
691
+++ tests/unit_x11/tst_components/tst_abstractbutton13.qml	2015-08-25 13:10:33 +0000
692
@@ -0,0 +1,115 @@
693
1
/*
694
2
 * Copyright 2012 Canonical Ltd.
695
3
 *
696
4
 * This program is free software; you can redistribute it and/or modify
697
5
 * it under the terms of the GNU Lesser General Public License as published by
698
6
 * the Free Software Foundation; version 3.
699
7
 *
700
8
 * This program is distributed in the hope that it will be useful,
701
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
702
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
703
11
 * GNU Lesser General Public License for more details.
704
12
 *
705
13
 * You should have received a copy of the GNU Lesser General Public License
706
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
707
15
 */
708
16
709
17
import QtQuick 2.0
710
18
import QtTest 1.0
711
19
import Ubuntu.Test 1.0
712
20
import Ubuntu.Components 1.3
713
21
714
22
Item {
715
23
    width: units.gu(40)
716
24
    height: units.gu(71)
717
25
718
26
    Column {
719
27
        AbstractButton {
720
28
            id: absButton
721
29
            width: units.gu(10)
722
30
            height: units.gu(10)
723
31
        }
724
32
        AbstractButton {
725
33
            id: absLongTap
726
34
            width: units.gu(10)
727
35
            height: width
728
36
            onPressAndHold: {}
729
37
        }
730
38
        AbstractButton {
731
39
            id: suppressTrigger
732
40
            width: units.gu(10)
733
41
            height: width
734
42
            function trigger() {}
735
43
        }
736
44
    }
737
45
738
46
    Action {
739
47
        id: action1
740
48
        property int triggerCount: 0
741
49
        onTriggered: triggerCount++
742
50
    }
743
51
744
52
    SignalSpy {
745
53
        id: signalSpy
746
54
        target: absButton
747
55
        signalName: "clicked"
748
56
    }
749
57
750
58
    SignalSpy {
751
59
        id: pressAndHoldSpy
752
60
        target: absLongTap
753
61
        signalName: "pressAndHold"
754
62
    }
755
63
756
64
    SignalSpy {
757
65
        id: triggeredSpy
758
66
        signalName: "triggered"
759
67
    }
760
68
761
69
    UbuntuTestCase {
762
70
        name: "AbstractButtonAPI"
763
71
        when: windowShown
764
72
765
73
        function cleanup() {
766
74
            signalSpy.clear();
767
75
            triggeredSpy.clear();
768
76
        }
769
77
770
78
        function test_action() {
771
79
            compare(absButton.action, null,"Action is null by default")
772
80
            absButton.action = action1
773
81
            compare(absButton.action, action1, "Action can be set")
774
82
            var numTriggers = action1.triggerCount
775
83
            absButton.clicked()
776
84
            compare(action1.triggerCount, numTriggers+1, "Button clicked triggers action")
777
85
            absButton.action = null
778
86
        }
779
87
780
88
        function test_custom_trigger_function() {
781
89
            suppressTrigger.action = action1;
782
90
            triggeredSpy.target = action1;
783
91
            mouseClick(suppressTrigger, centerOf(suppressTrigger).x, centerOf(suppressTrigger).y);
784
92
            compare(triggeredSpy.count, 0, "Trigger should be overridden");
785
93
        }
786
94
787
95
        // fixing bugs 1365471 and 1458028
788
96
        function test_no_pressAndHold_connected_clicks_bug1365471_bug1458028() {
789
97
            signalSpy.target = absButton;
790
98
            mouseLongPress(absButton, centerOf(absButton).x, centerOf(absButton).y);
791
99
            mouseRelease(absButton, centerOf(absButton).x, centerOf(absButton).y);
792
100
            signalSpy.wait();
793
101
        }
794
102
795
103
        // fixing bugs 1365471 and 1458028
796
104
        function test_pressAndHold_connected_suppresses_clicks_bug1365471_bug1458028() {
797
105
            function testFunc() {}
798
106
            signalSpy.target = absButton;
799
107
            absLongTap.pressAndHold.connect(testFunc);
800
108
            mouseLongPress(absLongTap, centerOf(absLongTap).x, centerOf(absLongTap).y);
801
109
            absLongTap.pressAndHold.disconnect(testFunc);
802
110
            pressAndHoldSpy.wait();
803
111
            mouseRelease(absLongTap, centerOf(absLongTap).x, centerOf(absLongTap).y);
804
112
            compare(signalSpy.count, 0, "click() must be suppressed when pressAndHold handler is implemented");
805
113
        }
806
114
    }
807
115
}
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Approve on 2015-08-25
Cris Dywan			Approve on 2015-08-25
Tim Peeters		2015-08-19	Approve on 2015-08-24
Review via email: mp+268442@code.launchpad.net