on xenial help sign in
Fix messages.

Remove disable when screen status changed

commit81daf5a765cd8b7912197c309876c0a8d6ecfcac authorYing-Chun Liu <paul.liu@canonical.com> dateFri 15 Aug 2014, 22:27 (12 years ago) parent712f254
2 files changed+9−15
qml/Components/Dialogs.qml+9−9 qml/Shell.qml−6
qml/Components/Dialogs.qml+9−9
@@ -67,10 +67,10 @@ Item {
6767 id: logoutDialog
6868 Dialog {
6969 id: dialogueLogout
70− title: i18n.tr("Logout")
71− text: i18n.tr("Are you sure that you want to logout?")
70+ title: i18n.tr("Log out")
71+ text: i18n.tr("Are you sure you want to log out?")
7272 Button {
73− text: i18n.tr("Cancel")
73+ text: i18n.tr("No")
7474 onClicked: {
7575 PopupUtils.close(dialogueLogout);
7676 d.dialogShown = false;
@@ -91,10 +91,10 @@ Item {
9191 id: shutdownDialog
9292 Dialog {
9393 id: dialogueShutdown
94− title: i18n.tr("Shutdown")
95− text: i18n.tr("Are you sure that you want to shutdown?")
94+ title: i18n.tr("Shut down")
95+ text: i18n.tr("Are you sure you want to shut down?")
9696 Button {
97− text: i18n.tr("Cancel")
97+ text: i18n.tr("No")
9898 onClicked: {
9999 PopupUtils.close(dialogueShutdown);
100100 d.dialogShown = false;
@@ -117,9 +117,9 @@ Item {
117117 Dialog {
118118 id: dialogueReboot
119119 title: i18n.tr("Reboot")
120− text: i18n.tr("Are you sure that you want to reboot?")
120+ text: i18n.tr("Are you sure you want to reboot?")
121121 Button {
122− text: i18n.tr("Cancel")
122+ text: i18n.tr("No")
123123 onClicked: {
124124 PopupUtils.close(dialogueReboot)
125125 d.dialogShown = false;
@@ -142,7 +142,7 @@ Item {
142142 Dialog {
143143 id: dialoguePower
144144 title: i18n.tr("Power")
145− text: i18n.tr("Are you sure you would like to turn power off?")
145+ text: i18n.tr("Are you sure you would like\nto power off?")
146146 Button {
147147 text: i18n.tr("Power off")
148148 onClicked: {
qml/Shell.qml−6
@@ -391,12 +391,6 @@ Item {
391391 } else if (status == Powerd.On) {
392392 edgeDemo.paused = false;
393393 }
394−
395− // Stop the timer to avoid displaying the power dialog when display
396− // state is changed.
397− if (status == Powerd.Off) {
398− dialogs.onPowerKeyReleased();
399− }
400394 }
401395 }
402396