git.iko.soy/unity8
on xenial help sign in
fixes for the spinner
commit9ae5a0e3c7c352601bb36613afd2cadcd69ad4a9 authorLukáš Tinkl <lukas.tinkl@canonical.com> dateFri 15 Jul 2016, 19:29 (10 years ago) parentab4b8a6
5 files changed+50−5
compare with xenial
unifiedsplit
plugins/Ubuntu/SystemImage/SystemImage.cpp+21−1 plugins/Ubuntu/SystemImage/SystemImage.h+8−2 qml/Wizard/Pages/77-system-update.qml+1−2 tests/mocks/Ubuntu/SystemImage/MockSystemImage.cpp+11 tests/mocks/Ubuntu/SystemImage/MockSystemImage.h+9
plugins/Ubuntu/SystemImage/SystemImage.cpp+21−1
@@ -38,7 +38,8 @@ SystemImage::SystemImage(QObject *parent)
3838 this, SLOT(onUpdateFailed(int,QString)));
3939 QDBusConnection::systemBus().connect(SYSTEMIMAGE_SERVICE, SYSTEMIMAGE_PATH, SYSTEMIMAGE_IFACE, QStringLiteral("Applied"),
4040 this, SLOT(onUpdateApplied(bool)));
41−
41+ QDBusConnection::systemBus().connect(SYSTEMIMAGE_SERVICE, SYSTEMIMAGE_PATH, SYSTEMIMAGE_IFACE, QStringLiteral("Rebooting"),
42+ this, SLOT(onRebooting(bool)));
4243 QDBusConnection::systemBus().connect(SYSTEMIMAGE_SERVICE, SYSTEMIMAGE_PATH, SYSTEMIMAGE_IFACE, QStringLiteral("UpdateProgress"),
4344 this, SLOT(onUpdateProgress(int,double)));
4445}
@@ -54,6 +55,8 @@ void SystemImage::checkForUpdate()
5455void SystemImage::applyUpdate()
5556{
5657 qDebug() << "!!! Applying update";
58+ setUpdateApplying(true);
59+
5760 const QDBusMessage msg = QDBusMessage::createMethodCall(SYSTEMIMAGE_SERVICE, SYSTEMIMAGE_PATH, SYSTEMIMAGE_IFACE,
5861 QStringLiteral("ApplyUpdate"));
5962 QDBusConnection::systemBus().asyncCall(msg);
@@ -99,11 +102,13 @@ void SystemImage::onUpdateFailed(int consecutive_failure_count, const QString &l
99102{
100103 Q_UNUSED(consecutive_failure_count)
101104 qWarning() << Q_FUNC_INFO << "System Update failed:" << last_reason;
105+ setUpdateApplying(false);
102106}
103107
104108void SystemImage::onUpdateApplied(bool applied)
105109{
106110 qDebug() << Q_FUNC_INFO << "System Update applied with status:" << applied;
111+ setUpdateApplying(false);
107112 if (applied) {
108113 resetUpdateStatus();
109114 Q_EMIT updateAvailableStatus();
@@ -115,9 +120,24 @@ void SystemImage::onUpdateProgress(int percentage, double eta)
115120 qDebug() << "!!! Download progress:" << percentage << "%, ETA seconds:" << eta;
116121}
117122
123+void SystemImage::onRebooting(bool status)
124+{
125+ setUpdateApplying(false);
126+ qDebug() << "!!! Rebooting:" << status;
127+}
128+
129+void SystemImage::setUpdateApplying(bool status)
130+{
131+ if (status != m_updateApplying) {
132+ m_updateApplying = status;
133+ Q_EMIT updateApplyingChanged();
134+ }
135+}
136+
118137void SystemImage::resetUpdateStatus()
119138{
120139 m_updateAvailable = false;
140+ m_updateApplying = false;
121141 m_downloading = false;
122142 m_downloaded = false;
123143 m_availableVersion.clear();
plugins/Ubuntu/SystemImage/SystemImage.h+8−2
@@ -29,7 +29,7 @@ class SystemImage : public QObject
2929 Q_PROPERTY(bool updateDownloading READ updateDownloading NOTIFY updateAvailableStatus)
3030 Q_PROPERTY(QString availableVersion READ availableVersion NOTIFY updateAvailableStatus)
3131 Q_PROPERTY(QString updateSize READ updateSize NOTIFY updateAvailableStatus)
32−
32+ Q_PROPERTY(bool updateApplying READ updateApplying NOTIFY updateApplyingChanged)
3333 Q_PROPERTY(bool updateDownloaded READ updateDownloaded NOTIFY updateDownloadedChanged)
3434
3535public:
@@ -40,7 +40,7 @@ public:
4040 bool updateDownloading() const { return m_downloading; }
4141 QString availableVersion() const { return m_availableVersion; }
4242 QString updateSize() const { return m_updateSize; }
43−
43+ bool updateApplying() const { return m_updateApplying; }
4444 bool updateDownloaded() const { return m_downloaded; }
4545
4646public Q_SLOTS:
@@ -55,10 +55,15 @@ private Q_SLOTS:
5555 void onUpdateFailed(int consecutive_failure_count, const QString & last_reason);
5656 void onUpdateApplied(bool applied);
5757 void onUpdateProgress(int percentage, double eta);
58+ void onRebooting(bool status);
5859
5960Q_SIGNALS:
6061 void updateAvailableStatus();
6162 void updateDownloadedChanged();
63+ void updateApplyingChanged();
64+
65+private Q_SLOTS:
66+ void setUpdateApplying(bool status);
6267
6368private:
6469 void resetUpdateStatus();
@@ -66,6 +71,7 @@ private:
6671
6772private:
6873 bool m_updateAvailable = false;
74+ bool m_updateApplying = false;
6975 bool m_downloading = false;
7076 bool m_downloaded = false;
7177 QString m_availableVersion;
qml/Wizard/Pages/77-system-update.qml+1−2
@@ -122,7 +122,6 @@ LocalComponents.Page {
122122 objectName: "installButton"
123123 anchors.fill: parent
124124 onClicked: {
125− spinner.running = true;
126125 SystemImage.applyUpdate(); // TODO mark the wizard to skip until the finished page for the next boot
127126 }
128127 }
@@ -141,7 +140,7 @@ LocalComponents.Page {
141140 ActivityIndicator {
142141 id: spinner
143142 anchors.centerIn: systemUpdatePage
144− running: false
143+ running: SystemImage.updateApplying
145144 visible: running
146145 }
147146
tests/mocks/Ubuntu/SystemImage/MockSystemImage.cpp+11
@@ -15,6 +15,7 @@
1515 */
1616
1717#include <QDebug>
18+#include <QTimer>
1819
1920#include "MockSystemImage.h"
2021
@@ -31,9 +32,19 @@ void MockSystemImage::checkForUpdate()
3132void MockSystemImage::applyUpdate()
3233{
3334 qDebug() << "Applying a fake system update";
35+ setUpdateApplying(true);
36+ QTimer::singleShot(5000, [this] {setUpdateApplying(false);});
3437}
3538
3639void MockSystemImage::factoryReset()
3740{
3841 Q_EMIT resettingDevice();
3942}
43+
44+void MockSystemImage::setUpdateApplying(bool status)
45+{
46+ if (status != m_updateApplying) {
47+ m_updateApplying = status;
48+ Q_EMIT updateApplyingChanged();
49+ }
50+}
tests/mocks/Ubuntu/SystemImage/MockSystemImage.h+9
@@ -27,6 +27,7 @@ class MockSystemImage : public QObject
2727 Q_PROPERTY(bool updateDownloaded READ updateDownloaded CONSTANT)
2828 Q_PROPERTY(QString availableVersion READ availableVersion CONSTANT)
2929 Q_PROPERTY(QString updateSize READ updateSize CONSTANT)
30+ Q_PROPERTY(bool updateApplying READ updateApplying NOTIFY updateApplyingChanged)
3031
3132public:
3233 explicit MockSystemImage(QObject *parent = nullptr);
@@ -35,6 +36,7 @@ public:
3536 Q_INVOKABLE void applyUpdate();
3637 Q_INVOKABLE void factoryReset();
3738
39+ bool updateApplying() const { return m_updateApplying; }
3840 // these are const only in mock
3941 bool updateDownloaded() const { return true; }
4042 QString availableVersion() const { return QStringLiteral("42"); }
@@ -42,6 +44,13 @@ public:
4244
4345Q_SIGNALS:
4446 void resettingDevice(); // only for mock
47+ void updateApplyingChanged();
48+
49+private Q_SLOTS:
50+ void setUpdateApplying(bool status);
51+
52+private:
53+ bool m_updateApplying = false;
4554};
4655
4756#endif // MOCK_SYSTEMIMAGE_H