git.iko.soy/unity8
on xenial help sign in
Only allow tutorials to run serially (#284)
b8eb7f9Dalton Durst
qml/Tutorial/TutorialContent.qml+21−5
compare with xenial
unifiedsplit
@@ -112,7 +112,11 @@ Item {
112 readonly property bool skipped: !d.mobileScenario || d.haveShown("left")
112 readonly property bool skipped: !d.mobileScenario || d.haveShown("left")
113 readonly property bool shown: item && item.shown
113 readonly property bool shown: item && item.shown
114 active: !skipped || (item && item.visible)
114 active: !skipped || (item && item.visible)
115+ onSkippedChanged: {
116+ console.log("SKIPPED HAS CHANGED TO " + skipped);
117+ console.trace();
115− onSkippedChanged: if (skipped && shown) item.hide()
118+ if (skipped && shown) item.hide()
119+ }
116
120
117 sourceComponent: TutorialLeft {
121 sourceComponent: TutorialLeft {
118 id: tutorialLeft
122 id: tutorialLeft
@@ -122,7 +126,10 @@ Item {
122 hides: [launcher, panel.indicators]
126 hides: [launcher, panel.indicators]
123 paused: root.paused
127 paused: root.paused
124
128
125− isReady: !tutorialLeftLoader.skipped && tutorialTopLoader.skipped && !paused && !delayed
129+ isReady: !tutorialLeftLoader.skipped
130+ && tutorialTopLoader.skipped
131+ && !paused
132+ && !delayed
126
133
127 InactivityTimer {
134 InactivityTimer {
128 id: tutorialLeftTimer
135 id: tutorialLeftTimer
@@ -160,7 +167,11 @@ Item {
160 paused: root.paused
167 paused: root.paused
161
168
162 skipped: tutorialLeftLongLoader.skipped
169 skipped: tutorialLeftLongLoader.skipped
163− isReady: tutorialLeftLoader.skipped && !skipped && !paused && !delayed
170+ isReady: tutorialLeftLoader.skipped
171+ && tutorialTopLoader.skipped
172+ && !skipped
173+ && !paused
174+ && !delayed
164
175
165 InactivityTimer {
176 InactivityTimer {
166 id: tutorialLeftLongTimer
177 id: tutorialLeftLongTimer
@@ -195,8 +206,13 @@ Item {
195 paused: root.paused
206 paused: root.paused
196
207
197 skipped: tutorialRightLoader.skipped
208 skipped: tutorialRightLoader.skipped
209+ isReady: tutorialTopLoader.skipped
210+ && tutorialLeftLoader.skipped
198− isReady: tutorialLeftLongLoader.skipped && !skipped && !paused && !delayed &&
211+ && tutorialLeftLongLoader.skipped
212+ && !skipped
213+ && !paused
214+ && !delayed
199− ApplicationManager.count >= 1
215+ && ApplicationManager.count >= 1
200
216
201 InactivityTimer {
217 InactivityTimer {
202 id: tutorialRightTimer
218 id: tutorialRightTimer