@@ -19,7 +19,6 @@ import AccountsService 0.1
1919import GSettings 1.0
2020import Unity.Application 0.1
2121import Ubuntu.Components 0.1
22−import Ubuntu.Components.Popups 0.1
2322import Ubuntu.Gestures 0.1
2423import Unity.Launcher 0.1
2524import Utils 0.1
@@ -94,9 +93,7 @@ Item {
9493
9594 Keys.onPressed: {
9695 if (event.key == Qt.Key_PowerOff || event.key == Qt.Key_PowerDown) {
97− if (!powerKeyTimer.running) {
98− powerKeyTimer.start();
99− }
96+ dialogs.onPowerKeyPressed();
10097 event.accepted = true;
10198 } else {
10299 event.accepted = false;
@@ -105,7 +102,7 @@ Item {
105102
106103 Keys.onReleased: {
107104 if (event.key == Qt.Key_PowerOff || event.key == Qt.Key_PowerDown) {
108− powerKeyTimer.stop();
105+ dialogs.onPowerKeyReleased();
109106 event.accepted = true;
110107 } else {
111108 event.accepted = false;
@@ -271,170 +268,6 @@ Item {
271268 }
272269 }
273270
274− property bool dialogShown: false
275−
276− Component {
277− id: logoutDialog
278− Dialog {
279− id: dialogueLogout
280− title: "Logout"
281− text: "Are you sure that you want to logout?"
282− Button {
283− text: "Cancel"
284− onClicked: {
285− PopupUtils.close(dialogueLogout);
286− stages.dialogShown = false;
287− }
288− }
289− Button {
290− text: "Yes"
291− onClicked: {
292− DBusUnitySessionService.Logout();
293− PopupUtils.close(dialogueLogout);
294− stages.dialogShown = false;
295− }
296− }
297− }
298− }
299−
300− Component {
301− id: shutdownDialog
302− Dialog {
303− id: dialogueShutdown
304− title: "Shutdown"
305− text: "Are you sure that you want to shutdown?"
306− Button {
307− text: "Cancel"
308− onClicked: {
309− PopupUtils.close(dialogueShutdown);
310− stages.dialogShown = false;
311− }
312− }
313− Button {
314− text: "Yes"
315− onClicked: {
316− dBusUnitySessionServiceConnection.closeAllApps();
317− DBusUnitySessionService.Shutdown();
318− PopupUtils.close(dialogueShutdown);
319− stages.dialogShown = false;
320− }
321− }
322− }
323− }
324−
325− Component {
326− id: rebootDialog
327− Dialog {
328− id: dialogueReboot
329− title: "Reboot"
330− text: "Are you sure that you want to reboot?"
331− Button {
332− text: "Cancel"
333− onClicked: {
334− PopupUtils.close(dialogueReboot)
335− stages.dialogShown = false;
336− }
337− }
338− Button {
339− text: "Yes"
340− onClicked: {
341− dBusUnitySessionServiceConnection.closeAllApps();
342− DBusUnitySessionService.Reboot();
343− PopupUtils.close(dialogueReboot);
344− stages.dialogShown = false;
345− }
346− }
347− }
348− }
349−
350− Component {
351− id: powerDialog
352− Dialog {
353− id: dialoguePower
354− title: "Power"
355− text: i18n.tr("Are you sure you would like to turn power off?")
356− Button {
357− text: i18n.tr("Power off")
358− onClicked: {
359− dBusUnitySessionServiceConnection.closeAllApps();
360− PopupUtils.close(dialoguePower);
361− stages.dialogShown = false;
362− shutdownFadeOutRectangle.enabled = true;
363− shutdownFadeOutRectangle.visible = true;
364− shutdownFadeOut.start();
365− }
366− }
367− Button {
368− text: i18n.tr("Restart")
369− onClicked: {
370− dBusUnitySessionServiceConnection.closeAllApps();
371− DBusUnitySessionService.Reboot();
372− PopupUtils.close(dialoguePower);
373− stages.dialogShown = false;
374− }
375− }
376− Button {
377− text: i18n.tr("Cancel")
378− onClicked: {
379− PopupUtils.close(dialoguePower);
380− stages.dialogShown = false;
381− }
382− }
383− }
384− }
385−
386− function showPowerDialog() {
387− if (!stages.dialogShown) {
388− stages.dialogShown = true;
389− PopupUtils.open(powerDialog);
390− }
391− }
392−
393− Connections {
394− id: dBusUnitySessionServiceConnection
395− objectName: "dBusUnitySessionServiceConnection"
396− target: DBusUnitySessionService
397−
398− function closeAllApps() {
399− while (true) {
400− var app = ApplicationManager.get(0);
401− if (app === null) {
402− break;
403− }
404− ApplicationManager.stopApplication(app.appId);
405− }
406− }
407−
408− onLogoutRequested: {
409− // Display a dialog to ask the user to confirm.
410− if (!stages.dialogShown) {
411− stages.dialogShown = true;
412− PopupUtils.open(logoutDialog);
413− }
414− }
415−
416− onShutdownRequested: {
417− // Display a dialog to ask the user to confirm.
418− if (!stages.dialogShown) {
419− stages.dialogShown = true;
420− PopupUtils.open(shutdownDialog);
421− }
422− }
423−
424− onRebootRequested: {
425− // Display a dialog to ask the user to confirm.
426− if (!stages.dialogShown) {
427− stages.dialogShown = true;
428− PopupUtils.open(rebootDialog);
429− }
430− }
431−
432− onLogoutReady: {
433− closeAllApps();
434− Qt.quit();
435− }
436− }
437−
438271 Loader {
439272 id: applicationsDisplayLoader
440273 anchors.fill: parent
@@ -812,11 +645,22 @@ Item {
812645 value: "unity8"
813646 }
814647
648+ Dialogs {
649+ id: dialogs
650+ anchors.fill: parent
651+ z: overlay.z + 10
652+ onPowerOffClicked: {
653+ shutdownFadeOutRectangle.enabled = true;
654+ shutdownFadeOutRectangle.visible = true;
655+ shutdownFadeOut.start();
656+ }
657+ }
658+
815659 Label {
816660 id: alphaDisclaimerLabel
817661 anchors.centerIn: parent
818662 visible: ApplicationManager.fake ? ApplicationManager.fake : false
819− z: overlay.z + 10
663+ z: dialogs.z + 10
820664 text: "EARLY ALPHA\nNOT READY FOR USE"
821665 color: "lightgrey"
822666 opacity: 0.2
@@ -843,19 +687,9 @@ Item {
843687 onShowHome: showHome()
844688 }
845689
846− Timer {
847− id: powerKeyTimer
848− interval: 2000
849− repeat: false
850− triggeredOnStart: false
851−
852− onTriggered: {
853− stages.showPowerDialog();
854− }
855− }
856−
857690 Rectangle {
858691 id: shutdownFadeOutRectangle
692+ z: edgeDemo.z + 10
859693 enabled: false
860694 visible: false
861695 color: "black"
@@ -872,4 +706,5 @@ Item {
872706 }
873707 }
874708 }
709+
875710}