git.iko.soy/unity8
on xenial help sign in
Fix interaction papercuts with the Wizard
eefa5c8Dalton Durst
debian/changelog+8
compare with xenial
unifiedsplit
@@ -1,3 +1,11 @@
1+unity8 (8.17+ubports3) xenial; urgency=medium
2+
3+ * Fix papercuts in Wizard update page interaction:
4+ * Remove "Stop" button for app update check
5+ * Make "not connected to internet" message more clear
6+
7+ -- Dalton Durst <dalton@ubports.com> Fri, 28 Sep 2018 14:08:00 -0500
8+
1unity8 (8.17+ubports2) xenial; urgency=medium
9unity8 (8.17+ubports2) xenial; urgency=medium
2
10
3 * Fix for https://github.com/ubports/ubuntu-touch/issues/624
11 * Fix for https://github.com/ubports/ubuntu-touch/issues/624
qml/Wizard/Pages/76-app-update.qml+12−3
@@ -124,12 +124,14 @@ LocalComponents.Page {
124 text: {
124 text: {
125 var s = UpdateManager.status;
125 var s = UpdateManager.status;
126 if (!appUpdatePage.online) {
126 if (!appUpdatePage.online) {
127− return i18n.tr("Connect to the Internet to check for updates.");
127+ return i18n.tr("This device is not connected to the internet.") + " " +
128+ i18n.tr("Use the OpenStore app to check for updates once connected.");
128 } else if (s === UpdateManager.StatusIdle && updatesCount === 0) {
129 } else if (s === UpdateManager.StatusIdle && updatesCount === 0) {
129 return i18n.tr("Software is up to date");
130 return i18n.tr("Software is up to date");
130 } else if (s === UpdateManager.StatusServerError ||
131 } else if (s === UpdateManager.StatusServerError ||
131 s === UpdateManager.StatusNetworkError) {
132 s === UpdateManager.StatusNetworkError) {
132− return i18n.tr("The update server is not responding. Try again later.");
133+ return i18n.tr("The update server is not responding.") + " " +
134+ i18n.tr("Use the OpenStore app to check for updates once connected.");
133 }
135 }
134 return "";
136 return "";
135 }
137 }
@@ -228,7 +230,14 @@ LocalComponents.Page {
228 Component {
230 Component {
229 id: forwardButton
231 id: forwardButton
230 LocalComponents.StackButton {
232 LocalComponents.StackButton {
233+ text: {
234+ var s = UpdateManager.status;
231− text: (UpdateManager.status === UpdateManager.StatusIdle && updatesCount === 0) ? i18n.tr("Next") : i18n.tr("Skip")
235+ if (s === UpdateManager.StatusIdle && updatesCount === 0) {
236+ return i18n.tr("Next");
237+ } else {
238+ return i18n.tr("Skip");
239+ }
240+ }
232 onClicked: pageStack.next()
241 onClicked: pageStack.next()
233 }
242 }
234 }
243 }
qml/Wizard/Pages/GlobalUpdateControls.qml−7
@@ -83,13 +83,6 @@ Item {
83 elide: Text.ElideRight
83 elide: Text.ElideRight
84 text: i18n.tr("Checking for updates…")
84 text: i18n.tr("Checking for updates…")
85 }
85 }
86−
87− Button {
88− objectName: "updatesGlobalStopButton"
89− text: i18n.tr("Stop")
90− onClicked: g.stop()
91− Layout.alignment: Qt.AlignRight | Qt.AlignVCenter
92− }
93 }
86 }
94
87
95 RowLayout {
88 RowLayout {