git.iko.soy/unity8
on xenial help sign in
Only open bottom tutorial when an application is opened, not just focused
commit218008ad2e7fbd311853e2ebae0d54b233d4b76e authorMichael Terry <michael.terry@canonical.com> dateTue 20 Oct 2015, 18:43 (11 years ago) parent5e2b709
2 files changed+6−6
compare with xenial
unifiedsplit
qml/Tutorial/TutorialContent.qml+4−4 tests/qmltests/Tutorial/tst_Tutorial.qml+2−2
qml/Tutorial/TutorialContent.qml+4−4
@@ -142,20 +142,20 @@ Item {
142142 ApplicationManager.focusedApplicationId == "ubuntu-calculator-app" ||
143143 ApplicationManager.focusedApplicationId == "ubuntu-clock-app")
144144
145− Timer {
145+ /*Timer {
146146 id: tutorialBottomTimer
147147 objectName: "tutorialBottomTimer"
148148 interval: 3000
149149 onTriggered: if (tutorialBottom.isReady && !tutorialBottom.shown) tutorialBottom.show()
150− }
150+ }*/
151151
152152 Connections {
153153 target: ApplicationManager
154− onFocusedApplicationIdChanged: if (tutorialBottom.isReady && !tutorialBottom.shown) tutorialBottom.show()
154+ onApplicationAdded: if (tutorialBottom.isReady && !tutorialBottom.shown) tutorialBottom.show()
155155 }
156156
157157 onSkippedChanged: if (skipped && shown) hide()
158− onIsReadyChanged: if (isReady && !shown) tutorialBottomTimer.start()
158+ //onIsReadyChanged: if (isReady && !shown) tutorialBottomTimer.start()
159159 onFinished: {
160160 AccountsService.markDemoEdgeCompleted("bottom");
161161 root.finish();
tests/qmltests/Tutorial/tst_Tutorial.qml+2−2
@@ -548,7 +548,7 @@ Item {
548548 tryCompare(AccountsService, "demoEdges", false);
549549 }*/
550550
551− function test_tutorialBottomDelay() {
551+ /*function test_tutorialBottomDelay() {
552552 // Test that if we exit the right tutorial, we don't immediately
553553 // jump into bottom tutorial.
554554 var tutorialBottom = findChild(shell, "tutorialBottom");
@@ -563,7 +563,7 @@ Item {
563563 verify(tutorialBottomTimer.running);
564564 verify(!tutorialBottom.shown);
565565 tryCompare(tutorialBottom, "shown", true);
566− }
566+ }*/
567567
568568 function test_activeCallInterruptsTutorial() {
569569 var tutorialLeft = findChild(shell, "tutorialLeft");