Merge lp:~zsombi/ubuntu-ui-toolkit/reset_action_shortcut into lp:ubuntu-ui-toolkit/staging

[Zsombor Egri]

Add reset functionality to Action.shortcut property.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1740
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2566/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/1294
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1296/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/1293

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

review: Needs Fixing (continuous-integration)

[lp:~zsombi/ubuntu-ui-toolkit/reset_action_shortcut]

1741. By Zsombor Egri on 2015-12-08

reset shortcut when Action is destroyed

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1741
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2584/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/1312
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1314
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1314/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/1311

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

review: Approve (continuous-integration)

[Cris Dywan (kalikiana)]

Nice, clean and effective.

review: Approve

=== modified file 'src/Ubuntu/Components/plugin/ucaction.cpp'
--- src/Ubuntu/Components/plugin/ucaction.cpp	2015-09-01 08:44:11 +0000
+++ src/Ubuntu/Components/plugin/ucaction.cpp	2015-12-08 15:14:06 +0000
@@ -160,6 +160,11 @@
     generateName();
 }
 
+UCAction::~UCAction()
+{
+    resetShortcut();
+}
+
 bool UCAction::isValidType(QVariant::Type valueType)
 {
     bool valid = (valueType == QVariant::String && m_parameterType == String) ||
@@ -289,6 +294,15 @@
     m_shortcut = shortcut;
     Q_EMIT shortcutChanged();
 }
+void UCAction::resetShortcut()
+{
+    if (!m_shortcut.isValid()) {
+        return;
+    }
+    QGuiApplicationPrivate::instance()->shortcutMap.removeShortcut(0, this, sequenceFromVariant(m_shortcut));
+    m_shortcut = QVariant();
+    Q_EMIT shortcutChanged();
+}
 
 bool UCAction::event(QEvent *event)
 {

=== modified file 'src/Ubuntu/Components/plugin/ucaction.h'
--- src/Ubuntu/Components/plugin/ucaction.h	2015-11-03 07:36:09 +0000
+++ src/Ubuntu/Components/plugin/ucaction.h	2015-12-08 15:14:06 +0000
@@ -42,7 +42,7 @@
     Q_PROPERTY(QQmlComponent *itemHint MEMBER m_itemHint WRITE setItemHint)
 
     // QtQuickControls.Action
-    Q_PROPERTY(QVariant shortcut MEMBER m_shortcut WRITE setShortcut NOTIFY shortcutChanged REVISION 1)
+    Q_PROPERTY(QVariant shortcut MEMBER m_shortcut WRITE setShortcut RESET resetShortcut NOTIFY shortcutChanged REVISION 1)
 public:
     enum Type {
         None,
@@ -54,6 +54,7 @@
     };
 
     explicit UCAction(QObject *parent = 0);
+    ~UCAction();
 
     inline bool isPublished() const
     {
@@ -65,6 +66,7 @@
     void setIconSource(const QUrl &url);
     void setItemHint(QQmlComponent *);
     void setShortcut(const QVariant&);
+    void resetShortcut();
 
 Q_SIGNALS:
     void nameChanged();

=== modified file 'tests/unit_x11/tst_components/tst_shortcuts.qml'
--- tests/unit_x11/tst_components/tst_shortcuts.qml	2015-07-03 19:16:56 +0000
+++ tests/unit_x11/tst_components/tst_shortcuts.qml	2015-12-08 15:14:06 +0000
@@ -75,7 +75,8 @@
         function test_shortcut_invalid_data() {
             return [
                 { tag: 'Typo', shortcut: 'Ctr+F' },
-                { tag: 'Number', shortcut: 1234567890 }
+                { tag: 'Number', shortcut: 1234567890 },
+                { tag: "Empty string", shortcut: "" }
             ];
         }
         function test_shortcut_invalid(data) {
@@ -88,5 +89,19 @@
             action.shortcut = other.shortcut;
             keyClick(Qt.Key_G, Qt.ControlModifier);
         }
+
+        SignalSpy {
+            id: shortcutSpy
+            signalName: "shortcutChanged"
+        }
+
+        function test_shortcut_reset_bug1518420() {
+            shortcutSpy.target = action;
+            action.shortcut = "Ctrl+A";
+            shortcutSpy.wait(200);
+            shortcutSpy.clear();
+            action.shortcut = undefined;
+            shortcutSpy.wait(200);
+        }
     }
 }