git.iko.soy/unity8
on xenial help sign in
Fix more wizard papercuts
99fdac3Dalton Durst
debian/changelog+10
compare with xenial
unifiedsplit
@@ -1,3 +1,13 @@
1+unity8 (8.17+ubports5) xenial; urgency=medium
2+
3+ * Yet more papercuts in Wizard update interaction:
4+ * It's not possible to skip the app update page while it's checking for
5+ updates, so make it say "Please wait..." while checking
6+ * Make Changelog page indicate that the next page is loading after the next
7+ button has been clicked. This avoids skipping the app update page.
8+
9+-- Dalton Durst <dalton@ubports.com> Mon, 8 Oct 2018 13:32:13 -0500
10+
1unity8 (8.17+ubports4) xenial; urgency=medium
11unity8 (8.17+ubports4) xenial; urgency=medium
2
12
3 * Replace dependency on ubuntu-wallpapers with ubports-wallpapers
13 * Replace dependency on ubuntu-wallpapers with ubports-wallpapers
po/unity8.pot+11−3
@@ -8,7 +8,7 @@ msgid ""
8msgstr ""
8msgstr ""
9"Project-Id-Version: unity8\n"
9"Project-Id-Version: unity8\n"
10"Report-Msgid-Bugs-To: \n"
10"Report-Msgid-Bugs-To: \n"
11−"POT-Creation-Date: 2018-09-28 14:00-0500\n"
11+"POT-Creation-Date: 2018-10-08 13:29-0500\n"
12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14"Language-Team: LANGUAGE <LL@li.org>\n"
14"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -588,7 +588,7 @@ msgstr ""
588
588
589#: qml/Wizard/Pages/10-welcome.qml:175
589#: qml/Wizard/Pages/10-welcome.qml:175
590#: qml/Wizard/Pages/10-welcome-update.qml:126
590#: qml/Wizard/Pages/10-welcome-update.qml:126
591−#: qml/Wizard/Pages/11-changelog.qml:70 qml/Wizard/Pages/20-keyboard.qml:152
591+#: qml/Wizard/Pages/11-changelog.qml:74 qml/Wizard/Pages/20-keyboard.qml:152
592#: qml/Wizard/Pages/30-wifi.qml:208 qml/Wizard/Pages/50-timezone.qml:272
592#: qml/Wizard/Pages/30-wifi.qml:208 qml/Wizard/Pages/50-timezone.qml:272
593#: qml/Wizard/Pages/60-account.qml:66 qml/Wizard/Pages/70-passwd-type.qml:146
593#: qml/Wizard/Pages/60-account.qml:66 qml/Wizard/Pages/70-passwd-type.qml:146
594#: qml/Wizard/Pages/75-report-check.qml:85
594#: qml/Wizard/Pages/75-report-check.qml:85
@@ -610,6 +610,10 @@ msgstr ""
610msgid "What's new"
610msgid "What's new"
611msgstr ""
611msgstr ""
612
612
613+#: qml/Wizard/Pages/11-changelog.qml:74
614+msgid "Loading..."
615+msgstr ""
616+
613#: qml/Wizard/Pages/20-keyboard.qml:31
617#: qml/Wizard/Pages/20-keyboard.qml:31
614msgid "Select Keyboard"
618msgid "Select Keyboard"
615msgstr ""
619msgstr ""
@@ -623,7 +627,7 @@ msgid "Keyboard layout"
623msgstr ""
627msgstr ""
624
628
625#: qml/Wizard/Pages/20-keyboard.qml:152 qml/Wizard/Pages/30-wifi.qml:208
629#: qml/Wizard/Pages/20-keyboard.qml:152 qml/Wizard/Pages/30-wifi.qml:208
626−#: qml/Wizard/Pages/60-account.qml:66 qml/Wizard/Pages/76-app-update.qml:238
630+#: qml/Wizard/Pages/60-account.qml:66 qml/Wizard/Pages/76-app-update.qml:240
627#: qml/Wizard/Pages/79-system-update.qml:152 qml/Wizard/Pages/sim.qml:101
631#: qml/Wizard/Pages/79-system-update.qml:152 qml/Wizard/Pages/sim.qml:101
628msgid "Skip"
632msgid "Skip"
629msgstr ""
633msgstr ""
@@ -716,6 +720,10 @@ msgstr ""
716msgid "The update server is not responding."
720msgid "The update server is not responding."
717msgstr ""
721msgstr ""
718
722
723+#: qml/Wizard/Pages/76-app-update.qml:238
724+msgid "Please wait..."
725+msgstr ""
726+
719#: qml/Wizard/Pages/79-system-update.qml:28
727#: qml/Wizard/Pages/79-system-update.qml:28
720msgid "Update Device"
728msgid "Update Device"
721msgstr ""
729msgstr ""
qml/Wizard/Pages/11-changelog.qml+21−5
@@ -26,6 +26,10 @@ import ".." as LocalComponents
26LocalComponents.Page {
26LocalComponents.Page {
27 objectName: "changelogPage"
27 objectName: "changelogPage"
28 title: i18n.tr("What's new")
28 title: i18n.tr("What's new")
29+ id: changelogPage
30+
31+ // See skipTimer below for information about this hack
32+ property bool loading: false
29
33
30 forwardButtonSourceComponent: forwardButton
34 forwardButtonSourceComponent: forwardButton
31 onlyOnUpdate: true
35 onlyOnUpdate: true
@@ -67,13 +71,25 @@ LocalComponents.Page {
67 Component {
71 Component {
68 id: forwardButton
72 id: forwardButton
69 LocalComponents.StackButton {
73 LocalComponents.StackButton {
70− text: i18n.tr("Next")
74+ text: loading ? i18n.tr("Loading...") : i18n.tr("Next")
71 onClicked: {
75 onClicked: {
72− if (d.validName) {
76+ changelogPage.loading = true;
73− AccountsService.realName = d.validName;
77+ skipTimer.restart();
74− }
75− pageStack.next();
76 }
78 }
77 }
79 }
78 }
80 }
81+
82+ // A horrible hack to make sure the UI refreshes before actually skipping
83+ // Without this, people press the Next button multiple times and skip
84+ // multiple pages at once.
85+ Timer {
86+ id: skipTimer
87+ interval: 100
88+ repeat: false
89+ running: false
90+ onTriggered: {
91+ changelogPage.loading = false;
92+ pageStack.next();
93+ }
94+ }
79}
95}
qml/Wizard/Pages/76-app-update.qml+2
@@ -234,6 +234,8 @@ LocalComponents.Page {
234 var s = UpdateManager.status;
234 var s = UpdateManager.status;
235 if (s === UpdateManager.StatusIdle && updatesCount === 0) {
235 if (s === UpdateManager.StatusIdle && updatesCount === 0) {
236 return i18n.tr("Next");
236 return i18n.tr("Next");
237+ } else if (s === UpdateManager.StatusCheckingClickUpdates) {
238+ return i18n.tr("Please wait...")
237 } else {
239 } else {
238 return i18n.tr("Skip");
240 return i18n.tr("Skip");
239 }
241 }