@@ -25,11 +25,12 @@ Item {
25 property Item dash
25 property Item dash
26 property Item launcher
26 property Item launcher
27 property Item indicators
27 property Item indicators
28− property Item overlay
28+ property Item underlay
30 property bool launcherEnabled: true
30 property bool launcherEnabled: true
31 property bool dashEnabled: true
31 property bool dashEnabled: true
32 property bool panelEnabled: true
32 property bool panelEnabled: true
33+ property bool panelContentEnabled: true
34 property bool paused: false
35 property bool paused: false
@@ -62,6 +63,7 @@ Item {
62 launcherEnabled = true
63 launcherEnabled = true
63 dashEnabled = true
64 dashEnabled = true
64 panelEnabled = true
65 panelEnabled = true
66+ panelContentEnabled = true
65 if (d.rightEdgeDemo) d.rightEdgeDemo.destroy()
67 if (d.rightEdgeDemo) d.rightEdgeDemo.destroy()
66 if (d.topEdgeDemo) d.topEdgeDemo.destroy()
68 if (d.topEdgeDemo) d.topEdgeDemo.destroy()
67 if (d.bottomEdgeDemo) d.bottomEdgeDemo.destroy()
69 if (d.bottomEdgeDemo) d.bottomEdgeDemo.destroy()
@@ -92,6 +94,7 @@ Item {
92 launcherEnabled = false;
94 launcherEnabled = false;
93 demo.dashEnabled = false;
95 demo.dashEnabled = false;
94 demo.panelEnabled = false;
96 demo.panelEnabled = false;
97+ demo.panelContentEnabled = false;
95 if (demo.greeter) {
98 if (demo.greeter) {
96 d.rightEdgeDemo = d.overlay.createObject(demo.greeter, {
99 d.rightEdgeDemo = d.overlay.createObject(demo.greeter, {
97 "edge": "right",
100 "edge": "right",
@@ -111,7 +114,7 @@ Item {
111 target: demo.greeter
114 target: demo.greeter
113 function hide() {
116 function hide() {
114− if (d.rightEdgeDemo && d.rightEdgeDemo.active) {
117+ if (d.rightEdgeDemo && d.rightEdgeDemo.available) {
115 d.rightEdgeDemo.hide()
118 d.rightEdgeDemo.hide()
116 hideEdgeDemoInGreeter()
119 hideEdgeDemoInGreeter()
117 startTopEdgeDemo()
120 startTopEdgeDemo()
@@ -129,8 +132,8 @@ Item {
130 function startTopEdgeDemo() {
133 function startTopEdgeDemo() {
131 demo.panelEnabled = true;
134 demo.panelEnabled = true;
132− if (demo.dash) {
135+ if (demo.dash && demo.underlay) {
133− d.topEdgeDemo = d.overlay.createObject(demo.dash, {
136+ d.topEdgeDemo = d.overlay.createObject(demo.underlay, {
134 "edge": "top",
137 "edge": "top",
135 "title": i18n.tr("Top edge"),
138 "title": i18n.tr("Top edge"),
136 "text": i18n.tr("Try swiping from the top edge to access the indicators"),
139 "text": i18n.tr("Try swiping from the top edge to access the indicators"),
@@ -147,7 +150,7 @@ Item {
147 Connections {
150 Connections {
148 target: demo.indicators
151 target: demo.indicators
149 onFullyOpenedChanged: {
152 onFullyOpenedChanged: {
150− if (d.topEdgeDemo && d.topEdgeDemo.active && demo.indicators.fullyOpened) {
153+ if (d.topEdgeDemo && d.topEdgeDemo.available && demo.indicators.fullyOpened) {
151 d.topEdgeDemo.hideNow()
154 d.topEdgeDemo.hideNow()
152 startBottomEdgeDemo()
155 startBottomEdgeDemo()
@@ -173,7 +176,7 @@ Item {
173 Connections {
176 Connections {
174 target: demo.indicators
177 target: demo.indicators
175 onPartiallyOpenedChanged: {
178 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) {
177 d.bottomEdgeDemo.hideNow()
180 d.bottomEdgeDemo.hideNow()
178 startLeftEdgeDemo()
181 startLeftEdgeDemo()
@@ -183,8 +186,8 @@ Item {
183 function startLeftEdgeDemo() {
186 function startLeftEdgeDemo() {
184 demo.panelEnabled = false;
187 demo.panelEnabled = false;
185 demo.launcherEnabled = true;
188 demo.launcherEnabled = true;
186− if (demo.dash) {
189+ if (demo.dash && demo.underlay) {
187− d.leftEdgeDemo = d.overlay.createObject(demo.dash, {
190+ d.leftEdgeDemo = d.overlay.createObject(demo.underlay, {
188 "edge": "left",
191 "edge": "left",
189 "title": i18n.tr("Left edge"),
192 "title": i18n.tr("Left edge"),
190 "text": i18n.tr("Swipe from the left to reveal the launcher for quick access to apps"),
193 "text": i18n.tr("Swipe from the left to reveal the launcher for quick access to apps"),
@@ -201,7 +204,7 @@ Item {
201 Connections {
204 Connections {
202 target: demo.launcher
205 target: demo.launcher
203 onStateChanged: {
206 onStateChanged: {
204− if (d.leftEdgeDemo && d.leftEdgeDemo.active && launcher.state == "visible") {
207+ if (d.leftEdgeDemo && d.leftEdgeDemo.available && launcher.state == "visible") {
205 d.leftEdgeDemo.hide()
208 d.leftEdgeDemo.hide()
206 launcher.hide()
209 launcher.hide()
207 startFinalEdgeDemo()
210 startFinalEdgeDemo()
@@ -211,12 +214,12 @@ Item {
212 function startFinalEdgeDemo() {
215 function startFinalEdgeDemo() {
213 demo.launcherEnabled = false;
216 demo.launcherEnabled = false;
214− if (demo.dash) {
217+ if (demo.dash && demo.underlay) {
215− d.finalEdgeDemo = d.overlay.createObject(demo.overlay, {
218+ d.finalEdgeDemo = d.overlay.createObject(demo.underlay, {
216 "edge": "none",
219 "edge": "none",
217 "title": i18n.tr("Well done"),
220 "title": i18n.tr("Well done"),
218 "text": i18n.tr("You have now mastered the edge gestures and can start using the phone"),
221 "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,
222 if (d.finalEdgeDemo) {
225 if (d.finalEdgeDemo) {