Merge lp:~mterry/ubuntu-system-settings/shutdown-dialog-in-wizard into lp:ubuntu-system-settings

[Michael Terry]

When the power button is held down, show the shutdown dialog like we do in the unity8 shell.

When the power button is held down, show the shutdown dialog like we do in the unity8 shell.

This will need a slight change in unity8 to set the domain explicitly for translations, so it can be imported from the wizard like this.

== 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?
 NA, just qml changes

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

 * Has your component "TestPlan” been executed successfully on emulator, N4?
 Yes

 * 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 the wizard

 * Have you requested review by the teams of these owning components?
 I guess that's me

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1132
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1639/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5976
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/4102
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/831
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5617
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7228
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7228/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14740
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/3463
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4434
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4434/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1133
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1641/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5980
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/4105
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/833
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5621
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7232
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7232/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14746
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/3466
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4437
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4437/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[Daniel d'Andrada (dandrader)]

Please add "focus: true" to the root item, even if it doesn't work without the "root.forceActiveFocus();" hack.

Other than that, it looks ok to me.

wizard shares or copies a lot of code from unity8 (InputMethod, notifications and now dialogs). We should figure out a clean solution for that at some point...

review: Approve

[lp:~mterry/ubuntu-system-settings/shutdown-dialog-in-wizard]

1134. By Michael Terry on 2014-10-20

Fix focus more nicely

[Michael Terry (mterry)]

Daniel, fixed focus with "focus: true" and using a FocusScope.

As for sharing code, I think maybe the best long term plan is to move the wizard into unity8 code... We'll figure something out.

[lp:~mterry/ubuntu-system-settings/shutdown-dialog-in-wizard]

1135. By Michael Terry on 2014-10-20

Drop FocusScope

[Michael Terry (mterry)]

Even cleaner now

[Daniel d'Andrada (dandrader)]

It's perfect now. Thanks!

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1134
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1659/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/6061/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/4140
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/851
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5692/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7313
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7313/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14858
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/3501
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4482
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4482/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

=== modified file 'wizard/qml/main.qml'
--- wizard/qml/main.qml	2014-09-29 20:45:30 +0000
+++ wizard/qml/main.qml	2014-10-20 13:58:14 +0000
@@ -20,13 +20,16 @@
 import Ubuntu.SystemSettings.SecurityPrivacy 1.0
 import Unity.Application 0.1
 import Unity.Notifications 1.0 as NotificationBackend
+import Unity.Session 0.1
 import "Components"
 import "file:///usr/share/unity8/Notifications" as Notifications // FIXME This should become a module or go away
+import "file:///usr/share/unity8/Components" as UnityComponents
 
 Item {
     id: root
     width: units.gu(40)
     height: units.gu(71)
+    focus: true
 
     // These should be set by a security page and we apply the settings when
     // the user exits the wizard.
@@ -191,4 +194,53 @@
             }
         ]
     }
+
+    UnityComponents.Dialogs {
+        id: dialogs
+        anchors.fill: parent
+        z: 10
+        onPowerOffClicked: {
+            shutdownFadeOutRectangle.enabled = true;
+            shutdownFadeOutRectangle.visible = true;
+            shutdownFadeOut.start();
+        }
+    }
+
+    Rectangle {
+        id: shutdownFadeOutRectangle
+        z: dialogs.z + 10
+        enabled: false
+        visible: false
+        color: "black"
+        anchors.fill: parent
+        opacity: 0.0
+        NumberAnimation on opacity {
+            id: shutdownFadeOut
+            from: 0.0
+            to: 1.0
+            onStopped: {
+                if (shutdownFadeOutRectangle.enabled && shutdownFadeOutRectangle.visible) {
+                    DBusUnitySessionService.Shutdown();
+                }
+            }
+        }
+    }
+
+    Keys.onPressed: {
+        if (event.key == Qt.Key_PowerOff || event.key == Qt.Key_PowerDown) {
+            dialogs.onPowerKeyPressed();
+            event.accepted = true;
+        } else {
+            event.accepted = false;
+        }
+    }
+
+    Keys.onReleased: {
+        if (event.key == Qt.Key_PowerOff || event.key == Qt.Key_PowerDown) {
+            dialogs.onPowerKeyReleased();
+            event.accepted = true;
+        } else {
+            event.accepted = false;
+        }
+    }
 }