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

Proposed by Ying-Chun Liu
Status: Merged
Approved by: Michał Sawicz
Approved revision: 1097
Merged at revision: 1167
Proposed branch: lp:~paulliu/unity8/reboot_140728
Merge into: lp:unity8
Diff against target: 126 lines (+21/-25)
1 file modified
qml/Components/Dialogs.qml (+21/-25)
To merge this branch: bzr merge lp:~paulliu/unity8/reboot_140728
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Needs Fixing
Michał Sawicz Approve
Albert Astals Cid (community) Needs Information
Review via email: mp+228485@code.launchpad.net

Commit message

Add button colors and i18n for power off dialog.

Description of the change

* 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.

To post a comment you must log in.
Albert Astals Cid (aacid) wrote :

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

review: Needs Fixing
Ying-Chun Liu (paulliu) wrote :

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

Ying-Chun Liu (paulliu) wrote :

Merged.

Albert Astals Cid (aacid) :
review: Abstain
lp:~paulliu/unity8/reboot_140728 updated
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

lp:~paulliu/unity8/reboot_140728 updated
1094. By Ying-Chun Liu on 2014-08-01

Merge trunk

Albert Astals Cid (aacid) wrote :

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) wrote :

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 ;)

Michał Sawicz (saviq) wrote :

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

review: Needs Fixing
lp:~paulliu/unity8/reboot_140728 updated
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

Michał Sawicz (saviq) wrote :

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) wrote :

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

Michał Sawicz (saviq) wrote :

See inline.

review: Needs Fixing
lp:~paulliu/unity8/reboot_140728 updated
1097. By Ying-Chun Liu on 2014-08-15

Fix messages.
Remove disable when screen status changed

Michał Sawicz (saviq) wrote :

 * 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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'qml/Components/Dialogs.qml'
2--- qml/Components/Dialogs.qml 2014-07-29 14:07:04 +0000
3+++ qml/Components/Dialogs.qml 2014-08-15 14:28:27 +0000
4@@ -18,15 +18,18 @@
5
6 import Unity.Application 0.1
7 import Unity.Session 0.1
8-import Ubuntu.Components 0.1
9+import Ubuntu.Components 1.1
10 import Ubuntu.Components.Popups 0.1
11
12 Item {
13 id: root
14
15 function onPowerKeyPressed() {
16+ // FIXME: event.isAutoRepeat is always false on Nexus 4.
17+ // So we use powerKeyTimer.running to avoid the PowerOff key repeat
18+ // https://launchpad.net/bugs/1349416
19 if (!powerKeyTimer.running) {
20- powerKeyTimer.start();
21+ powerKeyTimer.restart();
22 }
23 }
24
25@@ -64,17 +67,17 @@
26 id: logoutDialog
27 Dialog {
28 id: dialogueLogout
29- title: "Logout"
30- text: "Are you sure that you want to logout?"
31+ title: i18n.tr("Log out")
32+ text: i18n.tr("Are you sure you want to log out?")
33 Button {
34- text: "Cancel"
35+ text: i18n.tr("No")
36 onClicked: {
37 PopupUtils.close(dialogueLogout);
38 d.dialogShown = false;
39 }
40 }
41 Button {
42- text: "Yes"
43+ text: i18n.tr("Yes")
44 onClicked: {
45 DBusUnitySessionService.Logout();
46 PopupUtils.close(dialogueLogout);
47@@ -88,17 +91,17 @@
48 id: shutdownDialog
49 Dialog {
50 id: dialogueShutdown
51- title: "Shutdown"
52- text: "Are you sure that you want to shutdown?"
53+ title: i18n.tr("Shut down")
54+ text: i18n.tr("Are you sure you want to shut down?")
55 Button {
56- text: "Cancel"
57+ text: i18n.tr("No")
58 onClicked: {
59 PopupUtils.close(dialogueShutdown);
60 d.dialogShown = false;
61 }
62 }
63 Button {
64- text: "Yes"
65+ text: i18n.tr("Yes")
66 onClicked: {
67 dBusUnitySessionServiceConnection.closeAllApps();
68 DBusUnitySessionService.Shutdown();
69@@ -113,17 +116,17 @@
70 id: rebootDialog
71 Dialog {
72 id: dialogueReboot
73- title: "Reboot"
74- text: "Are you sure that you want to reboot?"
75+ title: i18n.tr("Reboot")
76+ text: i18n.tr("Are you sure you want to reboot?")
77 Button {
78- text: "Cancel"
79+ text: i18n.tr("No")
80 onClicked: {
81 PopupUtils.close(dialogueReboot)
82 d.dialogShown = false;
83 }
84 }
85 Button {
86- text: "Yes"
87+ text: i18n.tr("Yes")
88 onClicked: {
89 dBusUnitySessionServiceConnection.closeAllApps();
90 DBusUnitySessionService.Reboot();
91@@ -138,8 +141,8 @@
92 id: powerDialog
93 Dialog {
94 id: dialoguePower
95- title: "Power"
96- text: i18n.tr("Are you sure you would like to turn power off?")
97+ title: i18n.tr("Power")
98+ text: i18n.tr("Are you sure you would like\nto power off?")
99 Button {
100 text: i18n.tr("Power off")
101 onClicked: {
102@@ -148,15 +151,7 @@
103 d.dialogShown = false;
104 root.powerOffClicked();
105 }
106- }
107- Button {
108- text: i18n.tr("Restart")
109- onClicked: {
110- dBusUnitySessionServiceConnection.closeAllApps();
111- DBusUnitySessionService.Reboot();
112- PopupUtils.close(dialoguePower);
113- d.dialogShown = false;
114- }
115+ color: UbuntuColors.red
116 }
117 Button {
118 text: i18n.tr("Cancel")
119@@ -164,6 +159,7 @@
120 PopupUtils.close(dialoguePower);
121 d.dialogShown = false;
122 }
123+ color: UbuntuColors.coolGrey
124 }
125 }
126 }

Subscribers

People subscribed via source and target branches