Merge lp:~paulliu/unity8/reboot_140728 into lp:unity8

[Ying-Chun Liu]

Add button colors and i18n for power off dialog.

* Are there any related MPs required for this MP to build/function as expected?
No

 * Did you perform an exploratory manual test run of your code change and any related functionality?
Yes

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A

 * If you changed the UI, has there been a design review?
Jounih.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1089
http://jenkins.qa.ubuntu.com/job/unity8-ci/3640/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2579
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/642
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/734
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/734
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/734/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/734
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2717
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3822
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3822/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/10529

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/3640/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1089
http://jenkins.qa.ubuntu.com/job/unity8-ci/3648/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2633/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/650
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/742
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/742
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/742/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/742
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2763/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3876
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3876/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/10593

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/3648/rebuild

review: Needs Fixing (continuous-integration)

[Ying-Chun Liu (paulliu)]

Screenshot:

https://lh6.googleusercontent.com/tsgympca0JNJSKNGS5MoS4NX-HEUA7shOQ1xWKbqKQ=w230-h390-no

[Ying-Chun Liu (paulliu)]

Screenshot after using Ubuntu Colors.

https://lh5.googleusercontent.com/-13NBStxI5k4/U9fEKLoN55I/AAAAAAAAAHo/CliXxIT8s0I/w226-h391-no/Screenshot+from+2014-07-29+23%253A53%253A34.png

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1090
http://jenkins.qa.ubuntu.com/job/unity8-ci/3663/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2669
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/665
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/757
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/757
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/757/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/757
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2792
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3912
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3912/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/10635

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/3663/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1092
http://jenkins.qa.ubuntu.com/job/unity8-ci/3666/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2679
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/668
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/760
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/760
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/760/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/760
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2796
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3922
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3922/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/10643

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/3666/rebuild

review: Approve (continuous-integration)

[Albert Astals Cid (aacid)]

Text conflict in qml/Shell.qml
1 conflicts encountered.

review: Needs Fixing

[Ying-Chun Liu (paulliu)]

I'll need more time to figure out the trunk changings.

[Ying-Chun Liu (paulliu)]

Merged.

[Albert Astals Cid (aacid)]

review: Abstain

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1093
http://jenkins.qa.ubuntu.com/job/unity8-ci/3678/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2708
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/680
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/772
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/772
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/772/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/772
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2815
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3951
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3951/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/10668

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/3678/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1092
http://jenkins.qa.ubuntu.com/job/unity8-ci/3684/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2727
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/686
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/778
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/778
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/778/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/778
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2831
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3970
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3970/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/10688

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/3684/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1091
http://jenkins.qa.ubuntu.com/job/unity8-ci/3685/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2728/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/687
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/779
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/779
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/779/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/779
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3971
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3971/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/3685/rebuild

review: Needs Fixing (continuous-integration)

[lp:~paulliu/unity8/reboot_140728]

1092. By Ying-Chun Liu on 2014-07-31

merge trunk

1093. By Ying-Chun Liu on 2014-07-31

Don't show dialog when display power is off

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1093
http://jenkins.qa.ubuntu.com/job/unity8-ci/3706/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2832
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/708
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/800
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/800
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/800/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/800
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2912
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4075
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4075/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/10781

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/3706/rebuild

review: Needs Fixing (continuous-integration)

[lp:~paulliu/unity8/reboot_140728]

1094. By Ying-Chun Liu on 2014-08-01

Merge trunk

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1094
http://jenkins.qa.ubuntu.com/job/unity8-ci/3736/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2906
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/738
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/830
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/830
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/830/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/830
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2970
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4149
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4149/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/10851

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/3736/rebuild

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

19 if (!powerKeyTimer.running) {
20 - powerKeyTimer.start();
21 + powerKeyTimer.restart();
22 }

I don't understand this, if it's not runnign start and restart will do the same, no?

The Restart button is gone altogether?

review: Needs Information

[Michał Sawicz (saviq)]

W dniu 05.08.2014 o 13:29, Albert Astals Cid pisze:
> I don't understand this, if it's not runnign start and restart will do the same, no?

Yeah, but we only do the if(running) because of the bug above.

> The Restart button is gone altogether?

Yeah, no one reboots their phones ;)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1094
http://jenkins.qa.ubuntu.com/job/unity8-ci/3781/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/3076
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/783
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/875
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/875
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/875/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/875
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/3116
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4319
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4319/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/11050

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/3781/rebuild

review: Approve (continuous-integration)

[Michał Sawicz (saviq)]

Please add i18n.tr() to all the strings in the dialog.

review: Needs Fixing

[lp:~paulliu/unity8/reboot_140728]

1095. By Ying-Chun Liu on 2014-08-11

Add i18n to all the dialog texts

1096. By Ying-Chun Liu on 2014-08-11

Merge upstream

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1096
http://jenkins.qa.ubuntu.com/job/unity8-ci/3854/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/3308
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/856
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/948
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/948
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/948/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/948
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/3254
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4553
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4553/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/11242

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/3854/rebuild

review: Needs Fixing (continuous-integration)

[Michał Sawicz (saviq)]

Please delete tag 7.85+14.10.20140428.2-0ubuntu1 in this branch and any local checkouts you might have.

review: Needs Fixing

[Ying-Chun Liu (paulliu)]

> Please delete tag 7.85+14.10.20140428.2-0ubuntu1 in this branch and any local
> checkouts you might have.
Done.

[Michał Sawicz (saviq)]

See inline.

review: Needs Fixing

[lp:~paulliu/unity8/reboot_140728]

1097. By Ying-Chun Liu on 2014-08-15

Fix messages.
Remove disable when screen status changed

[Michał Sawicz (saviq)]

 * Did you perform an exploratory manual test run of the code change and any related functionality?
Yes.

 * Did CI run pass? If not, please explain why.
No, unrelated failures fixed in other branches.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1097
http://jenkins.qa.ubuntu.com/job/unity8-ci/3931/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/3606
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/932
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1025
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/1025
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/1025/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1025
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/3495
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4853
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4853/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/11555

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/3931/rebuild

review: Needs Fixing (continuous-integration)

=== modified file 'qml/Components/Dialogs.qml'
--- qml/Components/Dialogs.qml	2014-07-29 14:07:04 +0000
+++ qml/Components/Dialogs.qml	2014-08-15 14:28:27 +0000
@@ -18,15 +18,18 @@
 
 import Unity.Application 0.1
 import Unity.Session 0.1
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.1
 import Ubuntu.Components.Popups 0.1
 
 Item {
     id: root
 
     function onPowerKeyPressed() {
+        // FIXME: event.isAutoRepeat is always false on Nexus 4.
+        // So we use powerKeyTimer.running to avoid the PowerOff key repeat
+        // https://launchpad.net/bugs/1349416
         if (!powerKeyTimer.running) {
-            powerKeyTimer.start();
+            powerKeyTimer.restart();
         }
     }
 
@@ -64,17 +67,17 @@
         id: logoutDialog
         Dialog {
             id: dialogueLogout
-            title: "Logout"
-            text: "Are you sure that you want to logout?"
+            title: i18n.tr("Log out")
+            text: i18n.tr("Are you sure you want to log out?")
             Button {
-                text: "Cancel"
+                text: i18n.tr("No")
                 onClicked: {
                     PopupUtils.close(dialogueLogout);
                     d.dialogShown = false;
                 }
             }
             Button {
-                text: "Yes"
+                text: i18n.tr("Yes")
                 onClicked: {
                     DBusUnitySessionService.Logout();
                     PopupUtils.close(dialogueLogout);
@@ -88,17 +91,17 @@
         id: shutdownDialog
         Dialog {
             id: dialogueShutdown
-            title: "Shutdown"
-            text: "Are you sure that you want to shutdown?"
+            title: i18n.tr("Shut down")
+            text: i18n.tr("Are you sure you want to shut down?")
             Button {
-                text: "Cancel"
+                text: i18n.tr("No")
                 onClicked: {
                     PopupUtils.close(dialogueShutdown);
                     d.dialogShown = false;
                 }
             }
             Button {
-                text: "Yes"
+                text: i18n.tr("Yes")
                 onClicked: {
                     dBusUnitySessionServiceConnection.closeAllApps();
                     DBusUnitySessionService.Shutdown();
@@ -113,17 +116,17 @@
         id: rebootDialog
         Dialog {
             id: dialogueReboot
-            title: "Reboot"
-            text: "Are you sure that you want to reboot?"
+            title: i18n.tr("Reboot")
+            text: i18n.tr("Are you sure you want to reboot?")
             Button {
-                text: "Cancel"
+                text: i18n.tr("No")
                 onClicked: {
                     PopupUtils.close(dialogueReboot)
                     d.dialogShown = false;
                 }
             }
             Button {
-                text: "Yes"
+                text: i18n.tr("Yes")
                 onClicked: {
                     dBusUnitySessionServiceConnection.closeAllApps();
                     DBusUnitySessionService.Reboot();
@@ -138,8 +141,8 @@
         id: powerDialog
         Dialog {
             id: dialoguePower
-            title: "Power"
-            text: i18n.tr("Are you sure you would like to turn power off?")
+            title: i18n.tr("Power")
+            text: i18n.tr("Are you sure you would like\nto power off?")
             Button {
                 text: i18n.tr("Power off")
                 onClicked: {
@@ -148,15 +151,7 @@
                     d.dialogShown = false;
                     root.powerOffClicked();
                 }
-            }
-            Button {
-                text: i18n.tr("Restart")
-                onClicked: {
-                    dBusUnitySessionServiceConnection.closeAllApps();
-                    DBusUnitySessionService.Reboot();
-                    PopupUtils.close(dialoguePower);
-                    d.dialogShown = false;
-                }
+                color: UbuntuColors.red
             }
             Button {
                 text: i18n.tr("Cancel")
@@ -164,6 +159,7 @@
                     PopupUtils.close(dialoguePower);
                     d.dialogShown = false;
                 }
+                color: UbuntuColors.coolGrey
             }
         }
     }