@@ -63,7 +63,7 @@ Item {
6363
6464 readonly property bool locked: LightDM.Greeter.active && !LightDM.Greeter.authenticated && !forcedUnlock
6565 readonly property alias hasLockedApp: greeter.hasLockedApp
66− readonly property bool forcedUnlock: edgeDemo.running
66+ readonly property bool forcedUnlock: tutorial.running
6767 onForcedUnlockChanged: if (forcedUnlock) lockscreen.hide()
6868
6969 property bool sideStageEnabled: shell.width >= units.gu(100)
@@ -162,7 +162,7 @@ Item {
162162
163163 ScreenGrabber {
164164 id: screenGrabber
165− z: edgeDemo.z + 10
165+ z: dialogs.z + 10
166166 enabled: Powerd.status === Powerd.On
167167 }
168168
@@ -247,8 +247,8 @@ Item {
247247 // If this happens on first boot, we may be in edge
248248 // tutorial or wizard while receiving a call. But a call
249249 // is more important than wizard so just bail out of those.
250− if (edgeDemo.running) {
251− edgeDemo.hideEdgeDemos();
250+ if (tutorial.running) {
251+ tutorial.finish();
252252 wizard.hide();
253253 }
254254 }
@@ -256,9 +256,6 @@ Item {
256256 lockscreen.hide() // show locked app
257257 }
258258 launcher.hide();
259− if (appId != "unity8-dash") {
260− edgeDemo.finish(); // accepting a call makes the tutorial go away
261− }
262259 }
263260 }
264261
@@ -298,12 +295,12 @@ Item {
298295 Binding {
299296 target: applicationsDisplayLoader.item
300297 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
302299 }
303300 Binding {
304301 target: applicationsDisplayLoader.item
305302 property: "spreadEnabled"
306− value: edgeDemo.stagesEnabled && !greeter.hasLockedApp
303+ value: tutorial.stagesEnabled && !greeter.hasLockedApp
307304 }
308305 Binding {
309306 target: applicationsDisplayLoader.item
@@ -667,14 +664,14 @@ Item {
667664
668665 onStatusChanged: {
669666 if (Powerd.status === Powerd.Off && reason !== Powerd.Proximity &&
670− !callManager.hasCalls && !edgeDemo.running) {
667+ !callManager.hasCalls && !tutorial.running) {
671668 greeter.showNow()
672669 }
673670 }
674671 }
675672
676673 function showHome() {
677− if (edgeDemo.running) {
674+ if (tutorial.running) {
678675 return
679676 }
680677
@@ -716,8 +713,8 @@ Item {
716713 anchors.fill: parent //because this draws indicator menus
717714 indicators {
718715 hides: [launcher]
719− available: edgeDemo.panelEnabled && (!shell.locked || AccountsService.enableIndicatorsWhileLocked) && !greeter.hasLockedApp
720− contentEnabled: edgeDemo.panelContentEnabled
716+ available: tutorial.panelEnabled && (!shell.locked || AccountsService.enableIndicatorsWhileLocked) && !greeter.hasLockedApp
717+ contentEnabled: tutorial.panelContentEnabled
721718 width: parent.width > units.gu(60) ? units.gu(40) : parent.width
722719
723720 minimizedPanelHeight: units.gu(3)
@@ -754,9 +751,9 @@ Item {
754751 anchors.bottom: parent.bottom
755752 width: parent.width
756753 dragAreaWidth: shell.edgeSize
757− available: edgeDemo.launcherEnabled && (!shell.locked || AccountsService.enableLauncherWhileLocked) && !greeter.hasLockedApp
754+ available: tutorial.launcherEnabled && (!shell.locked || AccountsService.enableLauncherWhileLocked) && !greeter.hasLockedApp
758755 inverted: usageModeSettings.usageMode === "Staged"
759− shadeBackground: !edgeDemo.running
756+ shadeBackground: !tutorial.running
760757
761758 onShowDashHome: showHome()
762759 onDash: showDash()
@@ -769,7 +766,7 @@ Item {
769766 if (greeter.hasLockedApp) {
770767 greeter.startUnlock()
771768 }
772− if (!edgeDemo.running)
769+ if (!tutorial.running)
773770 shell.activateApplication(appId)
774771 }
775772 onShownChanged: {
@@ -843,7 +840,7 @@ Item {
843840 }
844841
845842 Tutorial {
846− id: edgeDemo
843+ id: tutorial
847844 objectName: "tutorial"
848845 visible: AccountsService.demoEdges
849846 paused: Powerd.status === Powerd.Off || LightDM.Greeter.active
@@ -862,7 +859,7 @@ Item {
862859
863860 Rectangle {
864861 id: shutdownFadeOutRectangle
865− z: dialogs.z + 10
862+ z: screenGrabber.z + 10
866863 enabled: false
867864 visible: false
868865 color: "black"