Merge lp:~mterry/ubuntu-system-settings/power-dialog-fix-rtm into lp:ubuntu-system-settings/rtm-14.09

[Michael Terry]

Fix power dialog not appearing in the welcome wizard (LP: #1430942)

Fix power dialog not appearing in the welcome wizard (LP: #1430942)

== Checklist ==

 * Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)
 Yes

 * Did you build your software in a clean sbuild/pbuilder chroot or ppa?
 Just qml changes

 * Did you build your software in a clean sbuild/pbuilder armhf chroot or ppa?
 Just qml changes

 * Has your component "TestPlan” been executed successfully on emulator, N4?
 I tested on live N4

 * Has a 5 minute exploratory testing run been executed on N4?
 Yes

 * If you changed the packaging (debian), did you subscribe a core-dev to this MP?
 NA

 * If you changed the UI, did you subscribe the design-reviewers to this MP?
 NA

 * What components might get impacted by your changes?
 Just wizard

 * Have you requested review by the teams of these owning components?
 Yes

[Ken VanDine (ken-vandine)]

Thanks!

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1004
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-rtm-14.09-ci/69/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-14.09-touch/48
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-rtm-14.09-14.09-armhf-ci/70
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-rtm-14.09-14.09-armhf-ci/70/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-14.09-mako/49
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-14.09-armhf/48
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-14.09-armhf/48/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18775

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-rtm-14.09-ci/69/rebuild

review: Approve (continuous-integration)

=== modified file 'wizard/qml/main.qml'
--- wizard/qml/main.qml	2015-01-28 21:24:45 +0000
+++ wizard/qml/main.qml	2015-03-11 18:49:10 +0000
@@ -228,21 +228,11 @@
         }
     }
 
-    Keys.onPressed: {
-        if (event.key == Qt.Key_PowerOff || event.key == Qt.Key_PowerDown) {
-            dialogs.onPowerKeyPressed();
-            event.accepted = true;
-        } else {
-            event.accepted = false;
-        }
+    UnityComponents.PhysicalKeysMapper {
+        id: physicalKeysMapper
+        onPowerKeyLongPressed: dialogs.showPowerDialog()
     }
 
-    Keys.onReleased: {
-        if (event.key == Qt.Key_PowerOff || event.key == Qt.Key_PowerDown) {
-            dialogs.onPowerKeyReleased();
-            event.accepted = true;
-        } else {
-            event.accepted = false;
-        }
-    }
+    Keys.onPressed: physicalKeysMapper.onKeyPressed(event)
+    Keys.onReleased: physicalKeysMapper.onKeyReleased(event)    
 }