git.iko.soy/unity8
on xenial help sign in
Only open bottom tutorial when an application is opened, not just focused
218008aMichael Terry
qml/Tutorial/TutorialContent.qml+4−4
compare with xenial
unifiedsplit
@@ -142,20 +142,20 @@ Item {
142 ApplicationManager.focusedApplicationId == "ubuntu-calculator-app" ||
142 ApplicationManager.focusedApplicationId == "ubuntu-calculator-app" ||
143 ApplicationManager.focusedApplicationId == "ubuntu-clock-app")
143 ApplicationManager.focusedApplicationId == "ubuntu-clock-app")
144
144
145− Timer {
145+ /*Timer {
146 id: tutorialBottomTimer
146 id: tutorialBottomTimer
147 objectName: "tutorialBottomTimer"
147 objectName: "tutorialBottomTimer"
148 interval: 3000
148 interval: 3000
149 onTriggered: if (tutorialBottom.isReady && !tutorialBottom.shown) tutorialBottom.show()
149 onTriggered: if (tutorialBottom.isReady && !tutorialBottom.shown) tutorialBottom.show()
150− }
150+ }*/
151
151
152 Connections {
152 Connections {
153 target: ApplicationManager
153 target: ApplicationManager
154− onFocusedApplicationIdChanged: if (tutorialBottom.isReady && !tutorialBottom.shown) tutorialBottom.show()
154+ onApplicationAdded: if (tutorialBottom.isReady && !tutorialBottom.shown) tutorialBottom.show()
155 }
155 }
156
156
157 onSkippedChanged: if (skipped && shown) hide()
157 onSkippedChanged: if (skipped && shown) hide()
158− onIsReadyChanged: if (isReady && !shown) tutorialBottomTimer.start()
158+ //onIsReadyChanged: if (isReady && !shown) tutorialBottomTimer.start()
159 onFinished: {
159 onFinished: {
160 AccountsService.markDemoEdgeCompleted("bottom");
160 AccountsService.markDemoEdgeCompleted("bottom");
161 root.finish();
161 root.finish();
tests/qmltests/Tutorial/tst_Tutorial.qml+2−2
@@ -548,7 +548,7 @@ Item {
548 tryCompare(AccountsService, "demoEdges", false);
548 tryCompare(AccountsService, "demoEdges", false);
549 }*/
549 }*/
550
550
551− function test_tutorialBottomDelay() {
551+ /*function test_tutorialBottomDelay() {
552 // Test that if we exit the right tutorial, we don't immediately
552 // Test that if we exit the right tutorial, we don't immediately
553 // jump into bottom tutorial.
553 // jump into bottom tutorial.
554 var tutorialBottom = findChild(shell, "tutorialBottom");
554 var tutorialBottom = findChild(shell, "tutorialBottom");
@@ -563,7 +563,7 @@ Item {
563 verify(tutorialBottomTimer.running);
563 verify(tutorialBottomTimer.running);
564 verify(!tutorialBottom.shown);
564 verify(!tutorialBottom.shown);
565 tryCompare(tutorialBottom, "shown", true);
565 tryCompare(tutorialBottom, "shown", true);
566− }
566+ }*/
567
567
568 function test_activeCallInterruptsTutorial() {
568 function test_activeCallInterruptsTutorial() {
569 var tutorialLeft = findChild(shell, "tutorialLeft");
569 var tutorialLeft = findChild(shell, "tutorialLeft");