@@ -63,7 +63,7 @@ Item {
64 readonly property bool locked: LightDM.Greeter.active && !LightDM.Greeter.authenticated && !forcedUnlock
64 readonly property bool locked: LightDM.Greeter.active && !LightDM.Greeter.authenticated && !forcedUnlock
65 readonly property alias hasLockedApp: greeter.hasLockedApp
65 readonly property alias hasLockedApp: greeter.hasLockedApp
66− readonly property bool forcedUnlock: edgeDemo.running
66+ readonly property bool forcedUnlock: tutorial.running
67 onForcedUnlockChanged: if (forcedUnlock) lockscreen.hide()
67 onForcedUnlockChanged: if (forcedUnlock) lockscreen.hide()
69 property bool sideStageEnabled: shell.width >= units.gu(100)
69 property bool sideStageEnabled: shell.width >= units.gu(100)
@@ -162,7 +162,7 @@ Item {
163 ScreenGrabber {
163 ScreenGrabber {
164 id: screenGrabber
164 id: screenGrabber
165− z: edgeDemo.z + 10
165+ z: dialogs.z + 10
166 enabled: Powerd.status === Powerd.On
166 enabled: Powerd.status === Powerd.On
@@ -247,8 +247,8 @@ Item {
247 // If this happens on first boot, we may be in edge
247 // If this happens on first boot, we may be in edge
248 // tutorial or wizard while receiving a call. But a call
248 // tutorial or wizard while receiving a call. But a call
249 // is more important than wizard so just bail out of those.
249 // is more important than wizard so just bail out of those.
250− if (edgeDemo.running) {
250+ if (tutorial.running) {
251− edgeDemo.hideEdgeDemos();
251+ tutorial.finish();
252 wizard.hide();
252 wizard.hide();
@@ -256,9 +256,6 @@ Item {
256 lockscreen.hide() // show locked app
256 lockscreen.hide() // show locked app
258 launcher.hide();
258 launcher.hide();
259− if (appId != "unity8-dash") {
260− edgeDemo.finish(); // accepting a call makes the tutorial go away
@@ -298,12 +295,12 @@ Item {
298 Binding {
295 Binding {
299 target: applicationsDisplayLoader.item
296 target: applicationsDisplayLoader.item
300 property: "interactive"
297 property: "interactive"
301− value: edgeDemo.stagesEnabled && !greeter.shown && !lockscreen.shown && panel.indicators.fullyClosed && launcher.progress == 0 && !notifications.useModal
298+ value: tutorial.stagesEnabled && !greeter.shown && !lockscreen.shown && panel.indicators.fullyClosed && launcher.progress == 0 && !notifications.useModal
303 Binding {
300 Binding {
304 target: applicationsDisplayLoader.item
301 target: applicationsDisplayLoader.item
305 property: "spreadEnabled"
302 property: "spreadEnabled"
306− value: edgeDemo.stagesEnabled && !greeter.hasLockedApp
303+ value: tutorial.stagesEnabled && !greeter.hasLockedApp
308 Binding {
305 Binding {
309 target: applicationsDisplayLoader.item
306 target: applicationsDisplayLoader.item
@@ -667,14 +664,14 @@ Item {
668 onStatusChanged: {
665 onStatusChanged: {
669 if (Powerd.status === Powerd.Off && reason !== Powerd.Proximity &&
666 if (Powerd.status === Powerd.Off && reason !== Powerd.Proximity &&
670− !callManager.hasCalls && !edgeDemo.running) {
667+ !callManager.hasCalls && !tutorial.running) {
671 greeter.showNow()
668 greeter.showNow()
676 function showHome() {
673 function showHome() {
677− if (edgeDemo.running) {
674+ if (tutorial.running) {
@@ -716,8 +713,8 @@ Item {
716 anchors.fill: parent //because this draws indicator menus
713 anchors.fill: parent //because this draws indicator menus
717 indicators {
714 indicators {
718 hides: [launcher]
715 hides: [launcher]
719− available: edgeDemo.panelEnabled && (!shell.locked || AccountsService.enableIndicatorsWhileLocked) && !greeter.hasLockedApp
716+ available: tutorial.panelEnabled && (!shell.locked || AccountsService.enableIndicatorsWhileLocked) && !greeter.hasLockedApp
720− contentEnabled: edgeDemo.panelContentEnabled
717+ contentEnabled: tutorial.panelContentEnabled
721 width: parent.width > units.gu(60) ? units.gu(40) : parent.width
718 width: parent.width > units.gu(60) ? units.gu(40) : parent.width
723 minimizedPanelHeight: units.gu(3)
720 minimizedPanelHeight: units.gu(3)
@@ -754,9 +751,9 @@ Item {
754 anchors.bottom: parent.bottom
751 anchors.bottom: parent.bottom
755 width: parent.width
752 width: parent.width
756 dragAreaWidth: shell.edgeSize
753 dragAreaWidth: shell.edgeSize
757− available: edgeDemo.launcherEnabled && (!shell.locked || AccountsService.enableLauncherWhileLocked) && !greeter.hasLockedApp
754+ available: tutorial.launcherEnabled && (!shell.locked || AccountsService.enableLauncherWhileLocked) && !greeter.hasLockedApp
758 inverted: usageModeSettings.usageMode === "Staged"
755 inverted: usageModeSettings.usageMode === "Staged"
759− shadeBackground: !edgeDemo.running
756+ shadeBackground: !tutorial.running
761 onShowDashHome: showHome()
758 onShowDashHome: showHome()
762 onDash: showDash()
759 onDash: showDash()
@@ -769,7 +766,7 @@ Item {
769 if (greeter.hasLockedApp) {
766 if (greeter.hasLockedApp) {
770 greeter.startUnlock()
767 greeter.startUnlock()
772− if (!edgeDemo.running)
769+ if (!tutorial.running)
773 shell.activateApplication(appId)
770 shell.activateApplication(appId)
775 onShownChanged: {
772 onShownChanged: {
@@ -843,7 +840,7 @@ Item {
845 Tutorial {
842 Tutorial {
846− id: edgeDemo
843+ id: tutorial
847 objectName: "tutorial"
844 objectName: "tutorial"
848 visible: AccountsService.demoEdges
845 visible: AccountsService.demoEdges
849 paused: Powerd.status === Powerd.Off || LightDM.Greeter.active
846 paused: Powerd.status === Powerd.Off || LightDM.Greeter.active
@@ -862,7 +859,7 @@ Item {
863 Rectangle {
860 Rectangle {
864 id: shutdownFadeOutRectangle
861 id: shutdownFadeOutRectangle
865− z: dialogs.z + 10
862+ z: screenGrabber.z + 10
866 enabled: false
863 enabled: false
867 visible: false
864 visible: false
868 color: "black"
865 color: "black"