git.iko.soy/unity8
on xenial help sign in
More tutorial page trigger fixups
b018d4eMichael Terry
qml/Shell.qml+3−1
compare with xenial
unifiedsplit
@@ -172,6 +172,7 @@ Item {
172 }
172 }
173
173
174 WindowInputFilter {
174 WindowInputFilter {
175+ id: inputFilter
175 Keys.onPressed: physicalKeysMapper.onKeyPressed(event, lastInputTimestamp);
176 Keys.onPressed: physicalKeysMapper.onKeyPressed(event, lastInputTimestamp);
176 Keys.onReleased: physicalKeysMapper.onKeyReleased(event, lastInputTimestamp);
177 Keys.onReleased: physicalKeysMapper.onKeyReleased(event, lastInputTimestamp);
177 }
178 }
@@ -424,7 +425,7 @@ Item {
424
425
425 onStatusChanged: {
426 onStatusChanged: {
426 if (Powerd.status === Powerd.Off && reason !== Powerd.Proximity &&
427 if (Powerd.status === Powerd.Off && reason !== Powerd.Proximity &&
427− !callManager.hasCalls && !tutorial.running) {
428+ !callManager.hasCalls && !wizard.active) {
428 // We don't want to simply call greeter.showNow() here, because
429 // We don't want to simply call greeter.showNow() here, because
429 // that will take too long. Qt will delay button event
430 // that will take too long. Qt will delay button event
430 // handling until the greeter is done loading and may think the
431 // handling until the greeter is done loading and may think the
@@ -540,6 +541,7 @@ Item {
540 paused: callManager.hasCalls || greeter.shown
541 paused: callManager.hasCalls || greeter.shown
541 keyboardVisible: inputMethod.state === "shown"
542 keyboardVisible: inputMethod.state === "shown"
542 usageScenario: shell.usageScenario
543 usageScenario: shell.usageScenario
544+ lastInputTimestamp: inputFilter.lastInputTimestamp
543 launcher: launcher
545 launcher: launcher
544 panel: panel
546 panel: panel
545 stage: applicationsDisplayLoader.item
547 stage: applicationsDisplayLoader.item
qml/Tutorial/TutorialBottom.qml+9−1
@@ -32,12 +32,20 @@ TutorialPage {
32 // eventually consolidate on a version of DirectionalDragArea that will
32 // eventually consolidate on a version of DirectionalDragArea that will
33 // land in the SDK (making our guessing job easier). Though, also in the
33 // land in the SDK (making our guessing job easier). Though, also in the
34 // future, this whole bottom tutorial component will also land in the SDK,
34 // future, this whole bottom tutorial component will also land in the SDK,
35− // rending our version here obsolete.
35+ // rendering our version here obsolete.
36 //
36 //
37 // Anyway, for the moment, we base our guesses on the copied-and-pasted
37 // Anyway, for the moment, we base our guesses on the copied-and-pasted
38 // code used in several of the core apps and only bring this component
38 // code used in several of the core apps and only bring this component
39 // up if we are in those core apps.
39 // up if we are in those core apps.
40
40
41+ function canShowForApp(appId) {
42+ return appId === "address-book-app" ||
43+ appId === "com.ubuntu.calculator_calculator" ||
44+ appId === "com.ubuntu.clock_clock" ||
45+ appId === "dialer-app" ||
46+ appId === "messaging-app";
47+ }
48+
41 readonly property real dragAreaHeight: units.gu(3) // based on PageWithBottomEdge.qml
49 readonly property real dragAreaHeight: units.gu(3) // based on PageWithBottomEdge.qml
42 readonly property real targetDistance: height * 0.2 + dragAreaHeight // based on PageWithBottomEdge.qml
50 readonly property real targetDistance: height * 0.2 + dragAreaHeight // based on PageWithBottomEdge.qml
43
51
qml/Tutorial/TutorialContent.qml+43−59
@@ -46,6 +46,19 @@ Item {
46
46
47 ////
47 ////
48
48
49+ QtObject {
50+ id: d
51+
52+ // We allow "" because it is briefly empty on startup, and we don't
53+ // want to improperly skip any mobile tutorials.
54+ property bool mobileScenario: root.usageScenario === "" ||
55+ root.usageScenario === "phone" ||
56+ root.usageScenario === "tablet"
57+
58+ property bool endPointsFinished: tutorialRight.skipped && tutorialBottom.skipped
59+ onEndPointsFinishedChanged: if (endPointsFinished) root.finish()
60+ }
61+
49 TutorialLeft {
62 TutorialLeft {
50 id: tutorialLeft
63 id: tutorialLeft
51 objectName: "tutorialLeft"
64 objectName: "tutorialLeft"
@@ -54,9 +67,8 @@ Item {
54 hides: [launcher, panel.indicators]
67 hides: [launcher, panel.indicators]
55 paused: root.paused
68 paused: root.paused
56
69
57− readonly property bool skipped: (root.usageScenario !== "phone"
70+ readonly property bool skipped: !d.mobileScenario ||
58− && root.usageScenario !== "tablet")
59− || AccountsService.demoEdgesCompleted.indexOf("left") != -1
71+ AccountsService.demoEdgesCompleted.indexOf("left") != -1
60 isReady: !skipped && !paused && !keyboardVisible
72 isReady: !skipped && !paused && !keyboardVisible
61
73
62 onSkippedChanged: if (skipped && shown) hide()
74 onSkippedChanged: if (skipped && shown) hide()
@@ -72,34 +84,17 @@ Item {
72 hides: [launcher, panel.indicators]
84 hides: [launcher, panel.indicators]
73 paused: root.paused
85 paused: root.paused
74
86
75− readonly property bool skipped: (root.usageScenario !== "phone"
87+ readonly property bool skipped: !d.mobileScenario ||
76− && root.usageScenario !== "tablet")
77− || AccountsService.demoEdgesCompleted.indexOf("top") != -1
88+ AccountsService.demoEdgesCompleted.indexOf("top") != -1
78− isReady: tutorialLeft.skipped && !skipped && !paused && !keyboardVisible && !tutorialBottom.shown
89+ isReady: tutorialLeft.skipped && !skipped && !paused && !keyboardVisible &&
90+ !tutorialBottom.shown && !tutorialBottom.mightShow
79
91
80 // We fire 30s after left edge tutorial, with at least 3s of inactivity
92 // We fire 30s after left edge tutorial, with at least 3s of inactivity
81
93
82− Timer {
94+ InactivityTimer {
83 id: tutorialTopInactivityTimer
95 id: tutorialTopInactivityTimer
84− objectName: "tutorialTopInactivityTimer"
96+ lastInputTimestamp: root.lastInputTimestamp
85− interval: 3000
97+ page: parent
86−
87− Connections {
88− target: root
89− onLastInputTimestampChanged: {
90− if (tutorialTopInactivityTimer.running) {
91− tutorialTopInactivityTimer.restart();
92− }
93− }
94− }
95−
96− onTriggered: {
97− if (tutorialTop.isReady) {
98− tutorialTop.show();
99− } else {
100− restart();
101− }
102− }
103 }
98 }
104
99
105 Timer {
100 Timer {
@@ -124,31 +119,28 @@ Item {
124 paused: root.paused
119 paused: root.paused
125
120
126 readonly property bool skipped: AccountsService.demoEdgesCompleted.indexOf("right") != -1
121 readonly property bool skipped: AccountsService.demoEdgesCompleted.indexOf("right") != -1
127− isReady: tutorialTop.skipped && !skipped && !paused && !keyboardVisible && !tutorialBottom.shown &&
122+ isReady: tutorialTop.skipped && !skipped && !paused && !keyboardVisible &&
123+ !tutorialBottom.shown && !tutorialBottom.mightShow &&
128 ApplicationManager.count >= 3
124 ApplicationManager.count >= 3
129
125
130− Timer {
126+ InactivityTimer {
131− id: tutorialRightTimer
127+ id: tutorialRightInactivityTimer
132− objectName: "tutorialRightTimer"
128+ lastInputTimestamp: root.lastInputTimestamp
133− interval: 3000
129+ page: parent
134− onTriggered: {
135− if (tutorialRight.isReady) {
136− if (!tutorialRight.shown) {
137− tutorialRight.show();
138− }
139− } else {
140− restart();
141− }
142− }
143 }
130 }
144
131
145 Connections {
132 Connections {
146− target: ApplicationManager
133+ target: stage
134+ onMainAppChanged: {
147− onApplicationAdded: if (tutorialRight.isReady && !tutorialRight.shown) tutorialRight.show()
135+ if (tutorialRight.isReady && !tutorialRight.shown && stage.mainApp
136+ && stage.mainApp.state === ApplicationInfoInterface.Starting) {
137+ tutorialRight.show();
138+ }
139+ }
148 }
140 }
149
141
150 onSkippedChanged: if (skipped && shown) hide()
142 onSkippedChanged: if (skipped && shown) hide()
151− onIsReadyChanged: if (isReady && !shown) tutorialRightTimer.start()
143+ onIsReadyChanged: if (isReady && !shown) tutorialRightInactivityTimer.start()
152 onFinished: AccountsService.markDemoEdgeCompleted("right")
144 onFinished: AccountsService.markDemoEdgeCompleted("right")
153 }
145 }
154
146
@@ -159,23 +151,15 @@ Item {
159 hides: [launcher, panel.indicators]
151 hides: [launcher, panel.indicators]
160 paused: root.paused
152 paused: root.paused
161
153
162− readonly property bool skipped: (root.usageScenario !== "phone"
154+ readonly property bool skipped: !d.mobileScenario ||
163− && root.usageScenario !== "tablet")
164− || AccountsService.demoEdgesCompleted.indexOf("bottom") != -1
155+ AccountsService.demoEdgesCompleted.indexOf("bottom") != -1
156+ readonly property bool mightShow: !skipped && stage.mainApp && canShowForApp(stage.mainApp.appId)
165− isReady: !skipped && !paused && !keyboardVisible && !tutorialTop.shown && !tutorialRight.shown &&
157+ isReady: !skipped && !paused && !keyboardVisible &&
166− // focused app is an app known to have a bottom edge
158+ !tutorialTop.shown && !tutorialRight.shown &&
167− (ApplicationManager.focusedApplicationId == "dialer-app" ||
168− ApplicationManager.focusedApplicationId == "messaging-app" ||
169− ApplicationManager.focusedApplicationId == "address-book-app" ||
170− ApplicationManager.focusedApplicationId == "ubuntu-calculator-app" ||
171− ApplicationManager.focusedApplicationId == "ubuntu-clock-app") &&
172− (stage.mainApp && stage.mainApp.state === ApplicationInfoInterface.Running)
159+ mightShow && stage.mainApp.state === ApplicationInfoInterface.Running
173
160
174 onSkippedChanged: if (skipped && shown) hide()
161 onSkippedChanged: if (skipped && shown) hide()
175 onIsReadyChanged: if (isReady && !shown) show()
162 onIsReadyChanged: if (isReady && !shown) show()
176− onFinished: {
177− AccountsService.markDemoEdgeCompleted("bottom");
163+ onFinished: AccountsService.markDemoEdgeCompleted("bottom")
178− root.finish();
179− }
180 }
164 }
181}
165}