git.iko.soy/unity8
on xenial help sign in
Final touches to systemUpdatePage
5b83db9Marius Gripsgard
qml/Wizard/Pages/78-firmware-update.qml+9−7
compare with xenial
unifiedsplit
@@ -19,7 +19,8 @@
19import QtQuick 2.4
19import QtQuick 2.4
20import QtQuick.Layouts 1.1
20import QtQuick.Layouts 1.1
21import Ubuntu.Components 1.3
21import Ubuntu.Components 1.3
22−import Ubuntu.SystemImage 0.1
22+import Ubuntu.SystemSettings.Update 1.0
23+import Ubuntu.Connectivity 1.0
23import Wizard 0.1
24import Wizard 0.1
24import ".." as LocalComponents
25import ".." as LocalComponents
25
26
@@ -30,7 +31,7 @@ LocalComponents.Page {
30 title: i18n.tr("firmware Update")
31 title: i18n.tr("firmware Update")
31 forwardButtonSourceComponent: forwardButton
32 forwardButtonSourceComponent: forwardButton
32
33
33− skip: !SystemImage.SupportsFirmwareUpdate() || !online
34+ skip: !SystemImage.supportsFirmwareUpdate() || !online
34
35
35 property bool online: NetworkingStatus.online
36 property bool online: NetworkingStatus.online
36 property bool hasUpdate: false
37 property bool hasUpdate: false
@@ -39,15 +40,15 @@ LocalComponents.Page {
39 property var partitions: ""
40 property var partitions: ""
40
41
41 function check() {
42 function check() {
42− if (!SystemImage.SupportsFirmwareUpdate())
43+ if (!SystemImage.supportsFirmwareUpdate())
43− return
44+ return pageStack.next();
44 systemUpdatePage.isChecking = true
45 systemUpdatePage.isChecking = true
45 SystemImage.checkForFirmwareUpdate()
46 SystemImage.checkForFirmwareUpdate()
46 }
47 }
47
48
48 function flash() {
49 function flash() {
49− if (!SystemImage.SupportsFirmwareUpdate())
50+ if (!SystemImage.supportsFirmwareUpdate())
50− return
51+ return pageStack.next();
51 systemUpdatePage.isUpdating = true
52 systemUpdatePage.isUpdating = true
52 SystemImage.updateFirmware()
53 SystemImage.updateFirmware()
53 }
54 }
@@ -223,7 +224,8 @@ LocalComponents.Page {
223 Component {
224 Component {
224 id: forwardButton
225 id: forwardButton
225 LocalComponents.StackButton {
226 LocalComponents.StackButton {
226− text: systemUpdatePage.hasUpdate ? i18n.tr("Next") : i18n.tr("Skip")
227+ text: !systemUpdatePage.hasUpdate && !systemUpdatePage.spinner
228+ ? i18n.tr("Next") : i18n.tr("Skip")
227 onClicked: pageStack.next()
229 onClicked: pageStack.next()
228 }
230 }
229 }
231 }