git.iko.soy/unity8
on xenial help sign in
Try with lots more logging
a14c0c7Dalton Durst
qml/Wizard/Pages.qml+13−7
compare with xenial
unifiedsplit
@@ -139,18 +139,20 @@ StyledItem {
139
139
140 function load(path) {
140 function load(path) {
141 if (currentPage) {
141 if (currentPage) {
142− currentPage.enabled = false
142+ currentPage.enabled = false;
143 }
143 }
144
144
145 // First load it invisible, check that we should actually use
145 // First load it invisible, check that we should actually use
146 // this page, and either skip it or continue.
146 // this page, and either skip it or continue.
147− push(path, {"opacity": 0, "enabled": false})
147+ push(path, {"opacity": 0, "enabled": false});
148
148
149 timeout.restart();
149 timeout.restart();
150
150
151+ console.info("Loading page " + currentPage.objectName);
152+
151 // Check for immediate skip or not. We may have to wait for
153 // Check for immediate skip or not. We may have to wait for
152 // skipValid to be assigned (see Connections object below)
154 // skipValid to be assigned (see Connections object below)
153− checkSkip()
155+ checkSkip();
154
156
155 var isPrimaryPage = !currentPage.customTitle;
157 var isPrimaryPage = !currentPage.customTitle;
156 if (isPrimaryPage) {
158 if (isPrimaryPage) {
@@ -168,19 +170,23 @@ StyledItem {
168 }
170 }
169
171
170 function checkSkip() {
172 function checkSkip() {
173+ console.warn("Evaluating skip on " + currentPage.objectName);
171 if (!currentPage) { // may have had a parse error
174 if (!currentPage) { // may have had a parse error
172 console.warn("Wizard page skipped due to possible parse error.");
175 console.warn("Wizard page skipped due to possible parse error.");
173− next()
176+ next();
174 } else if (currentPage.skipValid) {
177 } else if (currentPage.skipValid) {
175 if (currentPage.skip) {
178 if (currentPage.skip) {
176− next()
179+ next();
180+ console.warn("Wizard page " + currentPage.objectName + " skipped on request");
177 } else if ( !(itemInArray(root.runningWizardVersion, currentPage.showOnVersions)) &&
181 } else if ( !(itemInArray(root.runningWizardVersion, currentPage.showOnVersions)) &&
178 (currentPage.showOnVersions.length > 0) ) {
182 (currentPage.showOnVersions.length > 0) ) {
179 // The page is not supposed to run on this version of the wizard
183 // The page is not supposed to run on this version of the wizard
184+ console.warn("Wizard page " + currentPage.objectName + " skipped, it is not marked to run on this version.");
180 next();
185 next();
181 } else {
186 } else {
187+ console.warn("Starting wizard page " + currentPage.objectName);
182− currentPage.opacity = 1
188+ currentPage.opacity = 1;
183− currentPage.enabled = true
189+ currentPage.enabled = true;
184 timeout.stop();
190 timeout.stop();
185 }
191 }
186 }
192 }
qml/Wizard/Pages/10-welcome.qml+2
@@ -28,6 +28,8 @@ LocalComponents.Page {
28 title: i18n.tr("Language")
28 title: i18n.tr("Language")
29 forwardButtonSourceComponent: forwardButton
29 forwardButtonSourceComponent: forwardButton
30
30
31+ showOnVersions: []
32+
31 UbuntuLanguagePlugin {
33 UbuntuLanguagePlugin {
32 id: plugin
34 id: plugin
33 }
35 }
qml/Wizard/Pages/80-finished.qml+1
@@ -25,6 +25,7 @@ LocalComponents.Page {
25 customTitle: true
25 customTitle: true
26 lastPage: true
26 lastPage: true
27 buttonBarVisible: false
27 buttonBarVisible: false
28+ showOnVersions: []
28
29
29 Component.onCompleted: {
30 Component.onCompleted: {
30 state = "reanchored";
31 state = "reanchored";