@@ -25,11 +25,12 @@ Item {
2525 property Item dash
2626 property Item launcher
2727 property Item indicators
28− property Item overlay
28+ property Item underlay
2929
3030 property bool launcherEnabled: true
3131 property bool dashEnabled: true
3232 property bool panelEnabled: true
33+ property bool panelContentEnabled: true
3334
3435 property bool paused: false
3536
@@ -62,6 +63,7 @@ Item {
6263 launcherEnabled = true
6364 dashEnabled = true
6465 panelEnabled = true
66+ panelContentEnabled = true
6567 if (d.rightEdgeDemo) d.rightEdgeDemo.destroy()
6668 if (d.topEdgeDemo) d.topEdgeDemo.destroy()
6769 if (d.bottomEdgeDemo) d.bottomEdgeDemo.destroy()
@@ -92,6 +94,7 @@ Item {
9294 launcherEnabled = false;
9395 demo.dashEnabled = false;
9496 demo.panelEnabled = false;
97+ demo.panelContentEnabled = false;
9598 if (demo.greeter) {
9699 d.rightEdgeDemo = d.overlay.createObject(demo.greeter, {
97100 "edge": "right",
@@ -111,7 +114,7 @@ Item {
111114 target: demo.greeter
112115
113116 function hide() {
114− if (d.rightEdgeDemo && d.rightEdgeDemo.active) {
117+ if (d.rightEdgeDemo && d.rightEdgeDemo.available) {
115118 d.rightEdgeDemo.hide()
116119 hideEdgeDemoInGreeter()
117120 startTopEdgeDemo()
@@ -129,8 +132,8 @@ Item {
129132
130133 function startTopEdgeDemo() {
131134 demo.panelEnabled = true;
132− if (demo.dash) {
133− d.topEdgeDemo = d.overlay.createObject(demo.dash, {
135+ if (demo.dash && demo.underlay) {
136+ d.topEdgeDemo = d.overlay.createObject(demo.underlay, {
134137 "edge": "top",
135138 "title": i18n.tr("Top edge"),
136139 "text": i18n.tr("Try swiping from the top edge to access the indicators"),
@@ -147,7 +150,7 @@ Item {
147150 Connections {
148151 target: demo.indicators
149152 onFullyOpenedChanged: {
150− if (d.topEdgeDemo && d.topEdgeDemo.active && demo.indicators.fullyOpened) {
153+ if (d.topEdgeDemo && d.topEdgeDemo.available && demo.indicators.fullyOpened) {
151154 d.topEdgeDemo.hideNow()
152155 startBottomEdgeDemo()
153156 }
@@ -173,7 +176,7 @@ Item {
173176 Connections {
174177 target: demo.indicators
175178 onPartiallyOpenedChanged: {
176− if (d.bottomEdgeDemo && d.bottomEdgeDemo.active && !demo.indicators.partiallyOpened && !demo.indicators.fullyOpened) {
179+ if (d.bottomEdgeDemo && d.bottomEdgeDemo.available && !demo.indicators.partiallyOpened && !demo.indicators.fullyOpened) {
177180 d.bottomEdgeDemo.hideNow()
178181 startLeftEdgeDemo()
179182 }
@@ -183,8 +186,8 @@ Item {
183186 function startLeftEdgeDemo() {
184187 demo.panelEnabled = false;
185188 demo.launcherEnabled = true;
186− if (demo.dash) {
187− d.leftEdgeDemo = d.overlay.createObject(demo.dash, {
189+ if (demo.dash && demo.underlay) {
190+ d.leftEdgeDemo = d.overlay.createObject(demo.underlay, {
188191 "edge": "left",
189192 "title": i18n.tr("Left edge"),
190193 "text": i18n.tr("Swipe from the left to reveal the launcher for quick access to apps"),
@@ -201,7 +204,7 @@ Item {
201204 Connections {
202205 target: demo.launcher
203206 onStateChanged: {
204− if (d.leftEdgeDemo && d.leftEdgeDemo.active && launcher.state == "visible") {
207+ if (d.leftEdgeDemo && d.leftEdgeDemo.available && launcher.state == "visible") {
205208 d.leftEdgeDemo.hide()
206209 launcher.hide()
207210 startFinalEdgeDemo()
@@ -211,12 +214,12 @@ Item {
211214
212215 function startFinalEdgeDemo() {
213216 demo.launcherEnabled = false;
214− if (demo.dash) {
215− d.finalEdgeDemo = d.overlay.createObject(demo.overlay, {
217+ if (demo.dash && demo.underlay) {
218+ d.finalEdgeDemo = d.overlay.createObject(demo.underlay, {
216219 "edge": "none",
217220 "title": i18n.tr("Well done"),
218221 "text": i18n.tr("You have now mastered the edge gestures and can start using the phone"),
219− "anchors.fill": demo.overlay,
222+ "anchors.fill": demo.dash,
220223 });
221224 }
222225 if (d.finalEdgeDemo) {