diff options
author | J-P Nurmi <jpnurmi@qt.io> | 2016-11-29 12:57:53 +0100 |
---|---|---|
committer | J-P Nurmi <jpnurmi@qt.io> | 2016-12-02 12:18:20 +0000 |
commit | 0a37852dd814159d901791b9ea7f59a6dd21837c (patch) | |
tree | 861d676751013ac0427467840fafb6e9556e9241 /tests/auto | |
parent | 15fab6e8f81c7fd643f7c4e6a7979a2f66ec4060 (diff) |
Add AbstractButton::toggled() signal
[ChangeLog][Controls][AbstractButton] Added a toggled() signal that
is emitted whenever a checkable button is interactively toggled by
the user by using either touch, mouse, or keys.
Task-number: QTBUG-57203
Change-Id: If0b0d71d19cbed00f04d8a4309894a055c4254c6
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'tests/auto')
-rw-r--r-- | tests/auto/controls/data/tst_button.qml | 4 | ||||
-rw-r--r-- | tests/auto/controls/data/tst_checkbox.qml | 8 | ||||
-rw-r--r-- | tests/auto/controls/data/tst_radiobutton.qml | 4 | ||||
-rw-r--r-- | tests/auto/controls/data/tst_switch.qml | 11 | ||||
-rw-r--r-- | tests/auto/controls/data/tst_switchdelegate.qml | 9 |
5 files changed, 30 insertions, 6 deletions
diff --git a/tests/auto/controls/data/tst_button.qml b/tests/auto/controls/data/tst_button.qml index dcce20d7..ddfd72b7 100644 --- a/tests/auto/controls/data/tst_button.qml +++ b/tests/auto/controls/data/tst_button.qml @@ -58,7 +58,7 @@ TestCase { Component { id: signalSequenceSpy SignalSequenceSpy { - signals: ["pressed", "released", "canceled", "clicked", "doubleClicked", "pressedChanged", "downChanged", "checkedChanged"] + signals: ["pressed", "released", "canceled", "clicked", "toggled", "doubleClicked", "pressedChanged", "downChanged", "checkedChanged"] } } @@ -306,6 +306,7 @@ TestCase { ["pressedChanged", { "pressed": false }], ["downChanged", { "down": false }], ["checkedChanged", { "checked": true }], + "toggled", "released", "clicked"] control.checkable = true @@ -319,6 +320,7 @@ TestCase { ["pressedChanged", { "pressed": false }], ["downChanged", { "down": false }], ["checkedChanged", { "checked": false }], + "toggled", "released", "clicked"] mouseClick(control) diff --git a/tests/auto/controls/data/tst_checkbox.qml b/tests/auto/controls/data/tst_checkbox.qml index b88e6deb..41187aca 100644 --- a/tests/auto/controls/data/tst_checkbox.qml +++ b/tests/auto/controls/data/tst_checkbox.qml @@ -40,7 +40,7 @@ import QtQuick 2.2 import QtTest 1.0 -import QtQuick.Controls 2.1 +import QtQuick.Controls 2.2 TestCase { id: testCase @@ -58,7 +58,7 @@ TestCase { Component { id: signalSequenceSpy SignalSequenceSpy { - signals: ["pressed", "released", "canceled", "clicked", "pressedChanged", "checkedChanged", "checkStateChanged"] + signals: ["pressed", "released", "canceled", "clicked", "toggled", "pressedChanged", "checkedChanged", "checkStateChanged"] } } @@ -147,6 +147,7 @@ TestCase { sequenceSpy.expectedSequence = [["pressedChanged", { "pressed": false, "checked": false, "checkState": Qt.Unchecked }], ["checkStateChanged", { "pressed": false, "checked": true, "checkState": Qt.Checked }], ["checkedChanged", { "pressed": false, "checked": true, "checkState": Qt.Checked }], + "toggled", "released", "clicked"] mouseRelease(control, control.width / 2, control.height / 2, Qt.LeftButton) @@ -164,6 +165,7 @@ TestCase { sequenceSpy.expectedSequence = [["pressedChanged", { "pressed": false, "checked": true, "checkState": Qt.Checked }], ["checkStateChanged", { "pressed": false, "checked": false, "checkState": Qt.Unchecked }], ["checkedChanged", { "pressed": false, "checked": false, "checkState": Qt.Unchecked }], + "toggled", "released", "clicked"] mouseRelease(control, control.width / 2, control.height / 2, Qt.LeftButton) @@ -219,6 +221,7 @@ TestCase { ["pressedChanged", { "pressed": false, "checked": false, "checkState": Qt.Unchecked }], ["checkStateChanged", { "pressed": false, "checked": true, "checkState": Qt.Checked }], ["checkedChanged", { "pressed": false, "checked": true, "checkState": Qt.Checked }], + "toggled", "released", "clicked"] keyClick(Qt.Key_Space) @@ -232,6 +235,7 @@ TestCase { ["pressedChanged", { "pressed": false, "checked": true, "checkState": Qt.Checked }], ["checkStateChanged", { "pressed": false, "checked": false, "checkState": Qt.Unchecked }], ["checkedChanged", { "pressed": false, "checked": false, "checkState": Qt.Unchecked }], + "toggled", "released", "clicked"] keyClick(Qt.Key_Space) diff --git a/tests/auto/controls/data/tst_radiobutton.qml b/tests/auto/controls/data/tst_radiobutton.qml index 9b6a2ae5..56d61b47 100644 --- a/tests/auto/controls/data/tst_radiobutton.qml +++ b/tests/auto/controls/data/tst_radiobutton.qml @@ -58,7 +58,7 @@ TestCase { Component { id: signalSequenceSpy SignalSequenceSpy { - signals: ["pressed", "released", "canceled", "clicked", "pressedChanged", "checkedChanged"] + signals: ["pressed", "released", "canceled", "clicked", "toggled", "pressedChanged", "checkedChanged"] } } @@ -112,6 +112,7 @@ TestCase { verify(sequenceSpy.success) sequenceSpy.expectedSequence = [["pressedChanged", { "pressed": false, "checked": false }], ["checkedChanged", { "pressed": false, "checked": true }], + "toggled", "released", "clicked"] mouseRelease(control, control.width / 2, control.height / 2, Qt.LeftButton) @@ -177,6 +178,7 @@ TestCase { "pressed", ["pressedChanged", { "pressed": false, "checked": false }], ["checkedChanged", { "pressed": false, "checked": true }], + "toggled", "released", "clicked"] keyClick(Qt.Key_Space) diff --git a/tests/auto/controls/data/tst_switch.qml b/tests/auto/controls/data/tst_switch.qml index f3843cf7..4c2147f8 100644 --- a/tests/auto/controls/data/tst_switch.qml +++ b/tests/auto/controls/data/tst_switch.qml @@ -58,7 +58,7 @@ TestCase { Component { id: signalSequenceSpy SignalSequenceSpy { - signals: ["pressed", "released", "canceled", "clicked", "pressedChanged", "checkedChanged"] + signals: ["pressed", "released", "canceled", "clicked", "toggled", "pressedChanged", "checkedChanged"] } } @@ -131,6 +131,7 @@ TestCase { verify(spy.success) spy.expectedSequence = [["pressedChanged", { "pressed": false, "checked": false }], ["checkedChanged", { "pressed": false, "checked": true }], + "toggled", "released", "clicked"] mouseRelease(control, control.width / 2, control.height / 2, Qt.LeftButton) @@ -146,6 +147,7 @@ TestCase { verify(spy.success) spy.expectedSequence = [["pressedChanged", { "pressed": false, "checked": true }], ["checkedChanged", { "pressed": false, "checked": false }], + "toggled", "released", "clicked"] mouseRelease(control, control.width / 2, control.height / 2, Qt.LeftButton) @@ -163,6 +165,7 @@ TestCase { compare(control.pressed, true) spy.expectedSequence = [["pressedChanged", { "pressed": false, "checked": false }], ["checkedChanged", { "pressed": false, "checked": true }], + "toggled", "released", "clicked"] mouseRelease(control, control.width * 2, control.height / 2, Qt.LeftButton) @@ -180,6 +183,7 @@ TestCase { compare(control.pressed, true) spy.expectedSequence = [["pressedChanged", { "pressed": false, "checked": true }], ["checkedChanged", { "pressed": false, "checked": false }], + "toggled", "released", "clicked"] mouseRelease(control, -control.width, control.height / 2, Qt.LeftButton) @@ -225,6 +229,7 @@ TestCase { spy.expectedSequence = [["pressedChanged", { "pressed": false, "checked": false }], ["checkedChanged", { "pressed": false, "checked": true }], + "toggled", "released", "clicked"] mouseRelease(control.indicator, control.indicator.width) @@ -259,6 +264,7 @@ TestCase { spy.expectedSequence = [["pressedChanged", { "pressed": false, "checked": true }], ["checkedChanged", { "pressed": false, "checked": false }], + "toggled", "released", "clicked"] mouseRelease(control, control.width) @@ -293,6 +299,7 @@ TestCase { spy.expectedSequence = [["pressedChanged", { "pressed": false, "checked": false }], ["checkedChanged", { "pressed": false, "checked": true }], + "toggled", "released", "clicked"] mouseRelease(control, control.width) @@ -317,6 +324,7 @@ TestCase { "pressed", ["pressedChanged", { "pressed": false, "checked": false }], ["checkedChanged", { "pressed": false, "checked": true }], + "toggled", "released", "clicked"] keyClick(Qt.Key_Space) @@ -328,6 +336,7 @@ TestCase { "pressed", ["pressedChanged", { "pressed": false, "checked": true }], ["checkedChanged", { "pressed": false, "checked": false }], + "toggled", "released", "clicked"] keyClick(Qt.Key_Space) diff --git a/tests/auto/controls/data/tst_switchdelegate.qml b/tests/auto/controls/data/tst_switchdelegate.qml index 4a5d711f..b1c6c82d 100644 --- a/tests/auto/controls/data/tst_switchdelegate.qml +++ b/tests/auto/controls/data/tst_switchdelegate.qml @@ -58,7 +58,7 @@ TestCase { Component { id: signalSequenceSpy SignalSequenceSpy { - signals: ["pressed", "released", "canceled", "clicked", "pressedChanged", "checkedChanged"] + signals: ["pressed", "released", "canceled", "clicked", "toggled", "pressedChanged", "checkedChanged"] } } @@ -127,6 +127,7 @@ TestCase { verify(spy.success) spy.expectedSequence = [["pressedChanged", { "pressed": false, "checked": false }], ["checkedChanged", { "pressed": false, "checked": true }], + "toggled", "released", "clicked"] mouseRelease(control, control.width / 2, control.height / 2, Qt.LeftButton) @@ -142,6 +143,7 @@ TestCase { verify(spy.success) spy.expectedSequence = [["pressedChanged", { "pressed": false, "checked": true }], ["checkedChanged", { "pressed": false, "checked": false }], + "toggled", "released", "clicked"] mouseRelease(control, control.width / 2, control.height / 2, Qt.LeftButton) @@ -159,6 +161,7 @@ TestCase { compare(control.pressed, true) spy.expectedSequence = [["pressedChanged", { "pressed": false, "checked": false }], ["checkedChanged", { "pressed": false, "checked": true }], + "toggled", "released", "clicked"] mouseRelease(control, control.width * 2, control.height / 2, Qt.LeftButton) @@ -176,6 +179,7 @@ TestCase { compare(control.pressed, true) spy.expectedSequence = [["pressedChanged", { "pressed": false, "checked": true }], ["checkedChanged", { "pressed": false, "checked": false }], + "toggled", "released", "clicked"] mouseRelease(control, -control.width, control.height / 2, Qt.LeftButton) @@ -221,6 +225,7 @@ TestCase { spy.expectedSequence = [["pressedChanged", { "pressed": false, "checked": false }], ["checkedChanged", { "pressed": false, "checked": true }], + "toggled", "released", "clicked"] mouseRelease(control.indicator, control.indicator.width) @@ -255,6 +260,7 @@ TestCase { spy.expectedSequence = [["pressedChanged", { "pressed": false, "checked": true }], ["checkedChanged", { "pressed": false, "checked": false }], + "toggled", "released", "clicked"] mouseRelease(control, control.width) @@ -289,6 +295,7 @@ TestCase { spy.expectedSequence = [["pressedChanged", { "pressed": false, "checked": false }], ["checkedChanged", { "pressed": false, "checked": true }], + "toggled", "released", "clicked"] mouseRelease(control, control.width) |