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

Proposed by Michael Terry
Status: Merged
Approved by: Ken VanDine
Approved revision: 1004
Merged at revision: 1004
Proposed branch: lp:~mterry/ubuntu-system-settings/power-dialog-fix-rtm
Merge into: lp:ubuntu-system-settings/rtm-14.09
Diff against target: 30 lines (+5/-15)
1 file modified
wizard/qml/main.qml (+5/-15)
To merge this branch: bzr merge lp:~mterry/ubuntu-system-settings/power-dialog-fix-rtm
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Ken VanDine Approve
Review via email: mp+252639@code.launchpad.net

Commit message

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

Description of the change

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

To post a comment you must log in.
Revision history for this message
Ken VanDine (ken-vandine) wrote :

Thanks!

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'wizard/qml/main.qml'
2--- wizard/qml/main.qml 2015-01-28 21:24:45 +0000
3+++ wizard/qml/main.qml 2015-03-11 18:49:10 +0000
4@@ -228,21 +228,11 @@
5 }
6 }
7
8- Keys.onPressed: {
9- if (event.key == Qt.Key_PowerOff || event.key == Qt.Key_PowerDown) {
10- dialogs.onPowerKeyPressed();
11- event.accepted = true;
12- } else {
13- event.accepted = false;
14- }
15+ UnityComponents.PhysicalKeysMapper {
16+ id: physicalKeysMapper
17+ onPowerKeyLongPressed: dialogs.showPowerDialog()
18 }
19
20- Keys.onReleased: {
21- if (event.key == Qt.Key_PowerOff || event.key == Qt.Key_PowerDown) {
22- dialogs.onPowerKeyReleased();
23- event.accepted = true;
24- } else {
25- event.accepted = false;
26- }
27- }
28+ Keys.onPressed: physicalKeysMapper.onKeyPressed(event)
29+ Keys.onReleased: physicalKeysMapper.onKeyReleased(event)
30 }

Subscribers

People subscribed via source and target branches