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

commite048bd051d454fc6e10e976f493c76fd5cc24872 authorChris Townsend <christopher.townsend@canonical.com> dateTue 3 Feb 2015, 06:04 (12 years ago) parentd565cd2
1 file changed+20−4
qml/Components/Dialogs.qml+20−4
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