on xenial help sign in
Make the Unity 8 session dialogs behave in the same fashion as Unity 7.

From indicator-session: - Clicking "Log Out" will now present a dialog to "Lock", "Log Out", or "Cancel". - Clicking "Shut Down" will now present a dialog to "Reboot", "Shut Down", or "Cancel". Fixes: #1416074 Approved by: Albert Astals Cid

commit6ac4a05ffec40deb5d476f4bd733fc1464a0d1ce authorChris Townsend <christopher.townsend@canonical.com> dateMon 2 Mar 2015, 12:09 (12 years ago) parent79aed6b73eb65d
2 files changed+121−86
po/unity8.pot+101−82 qml/Components/Dialogs.qml+20−4
po/unity8.pot+101−82
@@ -8,7 +8,7 @@ msgid ""
88msgstr ""
99"Project-Id-Version: unity8\n"
1010"Report-Msgid-Bugs-To: \n"
11−"POT-Creation-Date: 2015-02-13 11:45+0100\n"
11+"POT-Creation-Date: 2015-02-25 08:57-0500\n"
1212"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -31,81 +31,92 @@ msgstr ""
3131msgid "Unpin shortcut"
3232msgstr ""
3333
34−#: qml/Components/DelayedLockscreen.qml:47
34+#: qml/Components/DelayedLockscreen.qml:49
3535msgid "Device Locked"
3636msgstr ""
3737
38−#: qml/Components/DelayedLockscreen.qml:62
38+#: qml/Components/DelayedLockscreen.qml:64
3939msgid "You have been locked out due to too many failed passphrase attempts."
4040msgstr ""
4141
42−#: qml/Components/DelayedLockscreen.qml:63
42+#: qml/Components/DelayedLockscreen.qml:65
4343msgid "You have been locked out due to too many failed passcode attempts."
4444msgstr ""
4545
46−#: qml/Components/DelayedLockscreen.qml:72
46+#: qml/Components/DelayedLockscreen.qml:74
4747#, qt-format
4848msgid "Please wait %1 minute and then try again…"
4949msgid_plural "Please wait %1 minutes and then try again…"
5050msgstr[0] ""
5151msgstr[1] ""
5252
53−#: qml/Components/Dialogs.qml:86
53+#: qml/Components/Dialogs.qml:87
5454msgid "Log out"
5555msgstr ""
5656
57−#: qml/Components/Dialogs.qml:87
57+#: qml/Components/Dialogs.qml:88
5858msgid "Are you sure you want to log out?"
5959msgstr ""
6060
61−#: qml/Components/Dialogs.qml:89 qml/Components/Dialogs.qml:111
62−#: qml/Components/Dialogs.qml:134
63−msgid "No"
61+#: qml/Components/Dialogs.qml:90
62+msgid "Lock"
6463msgstr ""
6564
66−#: qml/Components/Dialogs.qml:95 qml/Components/Dialogs.qml:117
67−#: qml/Components/Dialogs.qml:140
68−msgid "Yes"
65+#: qml/Components/Dialogs.qml:97
66+msgid "Log Out"
67+msgstr ""
68+
69+#: qml/Components/Dialogs.qml:104 qml/Components/Dialogs.qml:135
70+#: qml/Components/Dialogs.qml:191
71+msgid "Cancel"
6972msgstr ""
7073
71−#: qml/Components/Dialogs.qml:108
74+#: qml/Components/Dialogs.qml:116
7275msgid "Shut down"
7376msgstr ""
7477
75−#: qml/Components/Dialogs.qml:109
78+#: qml/Components/Dialogs.qml:117
7679msgid "Are you sure you want to shut down?"
7780msgstr ""
7881
79−#: qml/Components/Dialogs.qml:131
82+#: qml/Components/Dialogs.qml:119 qml/Components/Dialogs.qml:147
8083msgid "Reboot"
8184msgstr ""
8285
83−#: qml/Components/Dialogs.qml:132
86+#: qml/Components/Dialogs.qml:127
87+msgid "Shutdown"
88+msgstr ""
89+
90+#: qml/Components/Dialogs.qml:148
8491msgid "Are you sure you want to reboot?"
8592msgstr ""
8693
87−#: qml/Components/Dialogs.qml:154
94+#: qml/Components/Dialogs.qml:150
95+msgid "No"
96+msgstr ""
97+
98+#: qml/Components/Dialogs.qml:156
99+msgid "Yes"
100+msgstr ""
101+
102+#: qml/Components/Dialogs.qml:170
88103msgid "Power"
89104msgstr ""
90105
91−#: qml/Components/Dialogs.qml:155
106+#: qml/Components/Dialogs.qml:171
92107msgid ""
93108"Are you sure you would like\n"
94109"to power off?"
95110msgstr ""
96111
97−#: qml/Components/Dialogs.qml:157
112+#: qml/Components/Dialogs.qml:173
98113msgid "Power off"
99114msgstr ""
100115
101−#: qml/Components/Dialogs.qml:166
116+#: qml/Components/Dialogs.qml:182
102117msgid "Restart"
103118msgstr ""
104119
105−#: qml/Components/Dialogs.qml:175
106−msgid "Cancel"
107−msgstr ""
108−
109120#: qml/Components/Lockscreen.qml:238
110121msgid "Return to Call"
111122msgstr ""
@@ -191,10 +202,72 @@ msgstr ""
191202msgid "Also installed"
192203msgstr ""
193204
194−#: qml/Greeter/Greeter.qml:141
205+#: qml/Greeter/CoverPage.qml:107
195206msgid "Unlock"
196207msgstr ""
197208
209+#: qml/Greeter/LoginList.qml:236
210+msgid "Retry"
211+msgstr ""
212+
213+#: qml/Greeter/LoginList.qml:237
214+msgid "Tap to unlock"
215+msgstr ""
216+
217+#: qml/Greeter/NarrowView.qml:53 qml/Wizard/Pages/passwd-confirm.qml:53
218+msgid "Sorry, incorrect passphrase."
219+msgstr ""
220+
221+#: qml/Greeter/NarrowView.qml:54 qml/Wizard/Pages/passwd-confirm.qml:54
222+msgid "Sorry, incorrect passcode."
223+msgstr ""
224+
225+#: qml/Greeter/NarrowView.qml:55
226+msgid "This will be your last attempt."
227+msgstr ""
228+
229+#: qml/Greeter/NarrowView.qml:57
230+msgid ""
231+"If passphrase is entered incorrectly, your phone will conduct a factory "
232+"reset and all personal data will be deleted."
233+msgstr ""
234+
235+#: qml/Greeter/NarrowView.qml:58
236+msgid ""
237+"If passcode is entered incorrectly, your phone will conduct a factory reset "
238+"and all personal data will be deleted."
239+msgstr ""
240+
241+#: qml/Greeter/NarrowView.qml:115
242+#, qt-format
243+msgid "Enter %1"
244+msgstr ""
245+
246+#: qml/Greeter/NarrowView.qml:116 qml/Wizard/Pages/passwd-set.qml:60
247+msgid "Enter passphrase"
248+msgstr ""
249+
250+#: qml/Greeter/NarrowView.qml:117
251+msgid "Enter passcode"
252+msgstr ""
253+
254+#: qml/Greeter/NarrowView.qml:118
255+#, qt-format
256+msgid "Sorry, incorrect %1"
257+msgstr ""
258+
259+#: qml/Greeter/NarrowView.qml:119
260+msgid "Sorry, incorrect passphrase"
261+msgstr ""
262+
263+#: qml/Greeter/NarrowView.qml:120
264+msgid "Please re-enter"
265+msgstr ""
266+
267+#: qml/Greeter/NarrowView.qml:121
268+msgid "Sorry, incorrect passcode"
269+msgstr ""
270+
198271#: qml/Notifications/NotificationMenuItemFactory.qml:128
199272msgid "Show password"
200273msgstr ""
@@ -247,60 +320,6 @@ msgstr ""
247320msgid "Roaming"
248321msgstr ""
249322
250−#: qml/Shell.qml:402
251−#, qt-format
252−msgid "Enter %1"
253−msgstr ""
254−
255−#: qml/Shell.qml:403 qml/Wizard/Pages/passwd-set.qml:60
256−msgid "Enter passphrase"
257−msgstr ""
258−
259−#: qml/Shell.qml:404
260−msgid "Enter passcode"
261−msgstr ""
262−
263−#: qml/Shell.qml:405
264−#, qt-format
265−msgid "Sorry, incorrect %1"
266−msgstr ""
267−
268−#: qml/Shell.qml:406
269−msgid "Sorry, incorrect passphrase"
270−msgstr ""
271−
272−#: qml/Shell.qml:407
273−msgid "Please re-enter"
274−msgstr ""
275−
276−#: qml/Shell.qml:408
277−msgid "Sorry, incorrect passcode"
278−msgstr ""
279−
280−#: qml/Shell.qml:502 qml/Wizard/Pages/passwd-confirm.qml:53
281−msgid "Sorry, incorrect passphrase."
282−msgstr ""
283−
284−#: qml/Shell.qml:503 qml/Wizard/Pages/passwd-confirm.qml:54
285−msgid "Sorry, incorrect passcode."
286−msgstr ""
287−
288−#: qml/Shell.qml:504
289−msgid "This will be your last attempt."
290−msgstr ""
291−
292−#: qml/Shell.qml:506
293−msgid ""
294−"If passphrase is entered incorrectly, your phone will conduct a factory "
295−"reset and all personal data will be deleted."
296−msgstr ""
297−
298−#: qml/Shell.qml:507
299−msgid ""
300−"If passcode is entered incorrectly, your phone will conduct a factory reset "
301−"and all personal data will be deleted."
302−msgstr ""
303−
304323#: qml/Tutorial/TutorialBottomFinish.qml:24
305324msgid "This action does different things for different apps"
306325msgstr ""
@@ -380,11 +399,11 @@ msgstr ""
380399msgid "Add a SIM card and restart your device"
381400msgstr ""
382401
383−#: qml/Wizard/Pages/20-sim.qml:55
402+#: qml/Wizard/Pages/20-sim.qml:59
384403msgid "Without it, you won’t be able to make calls or use text messaging."
385404msgstr ""
386405
387−#: qml/Wizard/Pages/20-sim.qml:69 qml/Wizard/Pages/40-wifi.qml:215
406+#: qml/Wizard/Pages/20-sim.qml:73 qml/Wizard/Pages/40-wifi.qml:215
388407msgid "Skip"
389408msgstr ""
390409
qml/Components/Dialogs.qml+20−4
@@ -19,6 +19,7 @@ import QtQuick 2.0
1919import Unity.Application 0.1
2020import Unity.Session 0.1
2121import Ubuntu.Components 1.1
22+import LightDM 0.1 as LightDM
2223
2324Item {
2425 id: root
@@ -86,18 +87,25 @@ Item {
8687 title: i18n.tr("Log out")
8788 text: i18n.tr("Are you sure you want to log out?")
8889 Button {
89− text: i18n.tr("No")
90+ text: i18n.tr("Lock")
9091 onClicked: {
92+ LightDM.Greeter.showGreeter()
9193 logoutDialog.hide();
9294 }
9395 }
9496 Button {
95− text: i18n.tr("Yes")
97+ text: i18n.tr("Log Out")
9698 onClicked: {
9799 unitySessionService.logout();
98100 logoutDialog.hide();
99101 }
100102 }
103+ Button {
104+ text: i18n.tr("Cancel")
105+ onClicked: {
106+ logoutDialog.hide();
107+ }
108+ }
101109 }
102110 }
103111
@@ -108,19 +116,27 @@ Item {
108116 title: i18n.tr("Shut down")
109117 text: i18n.tr("Are you sure you want to shut down?")
110118 Button {
111− text: i18n.tr("No")
119+ text: i18n.tr("Reboot")
112120 onClicked: {
121+ root.closeAllApps();
122+ unitySessionService.reboot();
113123 shutdownDialog.hide();
114124 }
115125 }
116126 Button {
117− text: i18n.tr("Yes")
127+ text: i18n.tr("Shutdown")
118128 onClicked: {
119129 root.closeAllApps();
120130 unitySessionService.shutdown();
121131 shutdownDialog.hide();
122132 }
123133 }
134+ Button {
135+ text: i18n.tr("Cancel")
136+ onClicked: {
137+ shutdownDialog.hide();
138+ }
139+ }
124140 }
125141 }
126142