git.iko.soy/unity8
on xenial help sign in
Only show info text once checking is done, and if no network, set isChecking to false
69948b1Marius Gripsgard
qml/Wizard/Pages/78-firmware-update.qml+7−3
compare with xenial
unifiedsplit
@@ -100,6 +100,7 @@ LocalComponents.Page {
100 }
100 }
101
101
102 Label {
102 Label {
103+ visible: !systemUpdatePage.isChecking
103 anchors.horizontalCenter: parent.horizontalCenter
104 anchors.horizontalCenter: parent.horizontalCenter
104 font.weight: Font.Light
105 font.weight: Font.Light
105 wrapMode: Text.Wrap
106 wrapMode: Text.Wrap
@@ -213,17 +214,20 @@ LocalComponents.Page {
213 Component.onCompleted: {
214 Component.onCompleted: {
214 if (online)
215 if (online)
215 systemUpdatePage.check();
216 systemUpdatePage.check();
217+ else
218+ systemUpdatePage.isChecking = false;
216 }
219 }
217 }
220 }
218
221
219 Connections {
222 Connections {
220 target: NetworkingStatus
223 target: NetworkingStatus
221 onOnlineChanged: {
224 onOnlineChanged: {
222− if (online) {
225+ if (online)
223− systemUpdatePage.check()
226+ systemUpdatePage.check();
227+ else
228+ systemUpdatePage.isChecking = false;
224 }
229 }
225 }
230 }
226− }
227
231
228 Component {
232 Component {
229 id: forwardButton
233 id: forwardButton