Merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/spaceTriggerButton into lp:ubuntu-ui-toolkit/staging

[Cris Dywan]

Enter/Return/Space should trigger() Button

[Zsombor Egri (zsombi)]

One small thing inline. It's pretty crap that moc compiler doesn't warn you when emit on a slot.

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1743
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2582/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/1310
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1312/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/1309

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2582/rebuild

review: Needs Fixing (continuous-integration)

[lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/spaceTriggerButton]

1744. By Cris Dywan on 2015-12-08

Emit the triggered signal, not the slot

This is the same as we do in UCActionItem

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1744
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2586/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/1314/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1316/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/1313/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2586/rebuild

review: Needs Fixing (continuous-integration)

[lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/spaceTriggerButton]

1745. By Cris Dywan on 2015-12-08

Allow overriding trigger function in AbstractButton

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1745
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2587/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/1315
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1317
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1317/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/1314

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2587/rebuild

review: Needs Fixing (continuous-integration)

[Zsombor Egri (zsombi)]

More.

review: Needs Fixing

[lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/spaceTriggerButton]

1746. By Cris Dywan on 2015-12-11

Call ActionItem.trigger directly

1747. By Cris Dywan on 2015-12-11

Add FIXME with bug number for trigger

[Zsombor Egri (zsombi)]

Ok, I'll patch it once I'm ready with the fix.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1746
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2615/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/1343
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1346
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1346/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/1342

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2615/rebuild

review: Approve (continuous-integration)

=== modified file 'src/Ubuntu/Components/plugin/ucabstractbutton.cpp'
--- src/Ubuntu/Components/plugin/ucabstractbutton.cpp	2015-12-05 05:59:07 +0000
+++ src/Ubuntu/Components/plugin/ucabstractbutton.cpp	2015-12-11 12:39:17 +0000
@@ -138,10 +138,9 @@
     switch (event->key()) {
         case Qt::Key_Enter:
         case Qt::Key_Return:
-        // FIXME: space may also come here, however that depends on the button type
-        // (i.e default Dialog btn) so we may need to add that to Button
+        case Qt::Key_Space:
         {
-            Q_EMIT clicked();
+            trigger();
             break;
         }
     }

=== modified file 'src/Ubuntu/Components/plugin/ucactionitem.cpp'
--- src/Ubuntu/Components/plugin/ucactionitem.cpp	2015-09-16 05:26:36 +0000
+++ src/Ubuntu/Components/plugin/ucactionitem.cpp	2015-12-11 12:39:17 +0000
@@ -336,6 +336,7 @@
 void UCActionItem::trigger(const QVariant &value)
 {
     if (isEnabled()) {
+        // FIXME: bug #1524234: invoke function from QMetaObject (zsombi)
         Q_EMIT triggered(value);
     }
 }

=== modified file 'tests/unit_x11/tst_components/tst_focus.qml'
--- tests/unit_x11/tst_components/tst_focus.qml	2015-11-25 15:09:07 +0000
+++ tests/unit_x11/tst_components/tst_focus.qml	2015-12-11 12:39:17 +0000
@@ -140,6 +140,11 @@
         when: windowShown
 
         SignalSpy {
+            id: buttonTriggerSpy
+            signalName: "onTriggered"
+        }
+
+        SignalSpy {
             id: popupCloseSpy
             signalName: "onDestruction"
         }
@@ -266,6 +271,21 @@
             verify(popoverTest.focus, "Button focus not restored.");
         }
 
+        function test_button_trigger_via_keyboard_data() {
+            return [
+                {tag: "Enter", key: Qt.Key_Enter},
+                {tag: "Return", key: Qt.Key_Return},
+                {tag: "Space", key: Qt.Key_Space},
+            ];
+        }
+        function test_button_trigger_via_keyboard(data) {
+            buttonTriggerSpy.target = button;
+            button.forceActiveFocus();
+            keyClick(data.key);
+            waitForRendering(button);
+            buttonTriggerSpy.wait();
+        }
+
         function test_disabled_component_does_not_focus() {
             mousePress(disabledButton, centerOf(disabledButton).x, centerOf(disabledButton).y);
             compare(disabledButton.focus, false, "Disabled component shoudl not focus");