9c92e2f · unity8 · git.iko.soy

plugins/Ubuntu/SystemImage/CMakeLists.txt+5

compare with xenial

unifiedsplit

@@ -1,3 +1,7 @@

1+include_directories(

2+ ${GLIB_INCLUDE_DIRS}

3+)

4+

1set(SYSTEMIMAGE_SOURCES

5set(SYSTEMIMAGE_SOURCES

2 plugin.cpp

6 plugin.cpp

3 SystemImage.cpp

7 SystemImage.cpp

@@ -6,5 +10,6 @@ set(SYSTEMIMAGE_SOURCES

6add_library(SystemImage MODULE ${SYSTEMIMAGE_SOURCES})

10add_library(SystemImage MODULE ${SYSTEMIMAGE_SOURCES})

7

11

8qt5_use_modules(SystemImage Qml DBus Core)

12qt5_use_modules(SystemImage Qml DBus Core)

13+target_link_libraries(SystemImage ${GLIB_LIBRARIES})

9

14

10add_unity8_plugin(Ubuntu.SystemImage 0.1 Ubuntu/SystemImage TARGETS SystemImage)

15add_unity8_plugin(Ubuntu.SystemImage 0.1 Ubuntu/SystemImage TARGETS SystemImage)

plugins/Ubuntu/SystemImage/SystemImage.cpp+15−2

@@ -19,6 +19,8 @@

19#include <QDBusReply>

20#include <QDebug>

21

22+#include <glib.h>

23+

22#include "SystemImage.h"

24#include "SystemImage.h"

23

25

24#define SYSTEMIMAGE_SERVICE QStringLiteral("com.canonical.SystemImage")

26#define SYSTEMIMAGE_SERVICE QStringLiteral("com.canonical.SystemImage")

@@ -71,7 +73,7 @@ void SystemImage::onUpdateAvailableStatus(bool is_available, bool downloading, c

71 m_updateAvailable = is_available;

73 m_updateAvailable = is_available;

72 m_downloading = downloading;

74 m_downloading = downloading;

73 m_availableVersion = available_version;

75 m_availableVersion = available_version;

74− m_updateSize = update_size;

76+ m_updateSize = formatSize(update_size);

75 m_lastUpdateDate = last_update_date;

77 m_lastUpdateDate = last_update_date;

76 m_errorReason = error_reason;

78 m_errorReason = error_reason;

77 Q_EMIT updateAvailableStatus();

79 Q_EMIT updateAvailableStatus();

@@ -106,7 +108,18 @@ void SystemImage::resetUpdateStatus()

106 m_downloading = false;

108 m_downloading = false;

107 m_downloaded = false;

109 m_downloaded = false;

108 m_availableVersion.clear();

110 m_availableVersion.clear();

109− m_updateSize = -1;

111+ m_updateSize.clear();

110 m_lastUpdateDate.clear();

112 m_lastUpdateDate.clear();

111 m_errorReason.clear();

113 m_errorReason.clear();

112}

114}

115+

116+QString SystemImage::formatSize(quint64 size) const

117+{

118+ guint64 g_size = size;

119+

120+ gchar * formatted_size = g_format_size(g_size);

121+ QString q_formatted_size = QString::fromLocal8Bit(formatted_size);

122+ g_free(formatted_size);

123+

124+ return q_formatted_size;

125+}

plugins/Ubuntu/SystemImage/SystemImage.h+4−3

@@ -28,7 +28,7 @@ class SystemImage : public QObject

28 Q_PROPERTY(bool updateAvailable READ updateAvailable NOTIFY updateAvailableStatus)

29 Q_PROPERTY(bool updateDownloading READ updateDownloading NOTIFY updateAvailableStatus)

30 Q_PROPERTY(QString availableVersion READ availableVersion NOTIFY updateAvailableStatus)

31− Q_PROPERTY(int updateSize READ updateSize NOTIFY updateAvailableStatus)

31+ Q_PROPERTY(QString updateSize READ updateSize NOTIFY updateAvailableStatus)

32

33 Q_PROPERTY(bool updateDownloaded READ updateDownloaded NOTIFY updateDownloadedChanged)

34

@@ -39,7 +39,7 @@ public:

39 bool updateAvailable() const { return m_updateAvailable; }

40 bool updateDownloading() const { return m_downloading; }

41 QString availableVersion() const { return m_availableVersion; }

42− int updateSize() const { return m_updateSize; }

42+ QString updateSize() const { return m_updateSize; }

43

44 bool updateDownloaded() const { return m_downloaded; }

45

@@ -61,13 +61,14 @@ Q_SIGNALS:

61

62private:

63 void resetUpdateStatus();

64+ QString formatSize(quint64 size) const;

64

65

65private:

66private:

66 bool m_updateAvailable = false;

67 bool m_updateAvailable = false;

67 bool m_downloading = false;

68 bool m_downloading = false;

68 bool m_downloaded = false;

69 bool m_downloaded = false;

69 QString m_availableVersion;

70 QString m_availableVersion;

70− int m_updateSize = -1;

71+ QString m_updateSize;

71 QString m_lastUpdateDate;

72 QString m_lastUpdateDate;

72 QString m_errorReason;

73 QString m_errorReason;

73 bool m_updateDownloaded;

74 bool m_updateDownloaded;

plugins/Ubuntu/SystemImage/plugin.cpp+1−1

@@ -1,5 +1,5 @@

1/*

3 *

4 * This program is free software; you can redistribute it and/or modify

5 * it under the terms of the GNU General Public License as published by

qml/Wizard/Pages/77-system-update.qmlnew file+121

@@ -0,0 +1,121 @@

1+/*

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+import QtQuick 2.4

18+import QtQuick.Layouts 1.1

19+import Ubuntu.Components 1.3

20+import Ubuntu.SystemImage 0.1

21+import ".." as LocalComponents

22+

23+LocalComponents.Page {

24+ id: reportingPage

25+ objectName: "systemUpdatePage"

26+

27+ title: i18n.tr("Update Device")

28+ forwardButtonSourceComponent: forwardButton

29+

30+ skip: !SystemImage.updateDownloaded // skip the page when the system update is not ready to install

31+

32+ Column {

33+ id: column

34+ anchors {

35+ fill: content

36+ leftMargin: leftMargin

37+ rightMargin: rightMargin

38+ topMargin: customMargin

39+ }

40+ spacing: units.gu(3)

41+

42+ Label {

43+ anchors.left: parent.left

44+ anchors.right: parent.right

45+ anchors.leftMargin: column.anchors.leftMargin == 0 ? staticMargin : 0

46+ font.weight: Font.Light

47+ color: textColor

48+ wrapMode: Text.Wrap

49+ text: i18n.tr("There is a system update available and ready to install. Afterwards, the device will automatically restart.")

50+ }

51+

52+ GridLayout {

53+ anchors.left: parent.left

54+ anchors.right: parent.right

55+ rows: 3

56+ columns: 2

57+ rowSpacing: units.gu(1)

58+ columnSpacing: units.gu(2)

59+

60+ UbuntuShape {

61+ Layout.rowSpan: 3

62+ aspect: UbuntuShape.Flat

63+ backgroundColor: theme.palette.normal.base

64+ width: units.gu(8)

65+ height: width

66+ sourceScale: Qt.vector2d(0.5,0.5)

67+ source: Image {

68+ source: Qt.resolvedUrl("/usr/share/icons/suru/apps/scalable/ubuntu-logo-symbolic.svg")

69+ }

70+ }

71+

72+ Label {

73+ Layout.fillWidth: true

74+ color: textColor

75+ font.weight: Font.Normal

76+ text: i18n.tr("Ubuntu system")

77+ }

78+

79+ Label {

80+ font.weight: Font.Light

81+ color: textColor

82+ text: i18n.tr("Version %1").arg(SystemImage.availableVersion)

83+ }

84+

85+ Label {

86+ font.weight: Font.Light

87+ color: textColor

88+ text: SystemImage.updateSize

89+ }

90+ }

91+

92+ Label {

93+ anchors.left: parent.left

94+ anchors.right: parent.right

95+ anchors.leftMargin: column.anchors.leftMargin == 0 ? staticMargin : 0

96+ font.weight: Font.Light

97+ color: textColor

98+ wrapMode: Text.Wrap

99+ fontSize: "small"

100+ text: i18n.tr("This could take a few minutes...")

101+ }

102+

103+ Button {

104+ anchors.left: parent.left

105+ anchors.leftMargin: column.anchors.leftMargin == 0 ? staticMargin : 0

106+ text: i18n.tr("Install and restart now")

107+ onClicked: {

108+ // TODO mark the wizard to skip until the finished page for the next boot

109+ SystemImage.applyUpdate();

110+ }

111+ }

112+ }

113+

114+ Component {

115+ id: forwardButton

116+ LocalComponents.StackButton {

117+ text: i18n.tr("Skip")

118+ onClicked: pageStack.next()

119+ }

120+ }

121+}

tests/mocks/Ubuntu/SystemImage/MockSystemImage.cpp+13−1

@@ -1,5 +1,5 @@

1/*

3 *

4 * This program is free software; you can redistribute it and/or modify

5 * it under the terms of the GNU General Public License as published by

@@ -14,6 +14,8 @@

14 * along with this program. If not, see <http://www.gnu.org/licenses/>.

15 */

16

17+#include <QDebug>

18+

17#include "MockSystemImage.h"

19#include "MockSystemImage.h"

18

20

19MockSystemImage::MockSystemImage(QObject *parent)

21MockSystemImage::MockSystemImage(QObject *parent)

@@ -21,6 +23,16 @@ MockSystemImage::MockSystemImage(QObject *parent)

21{

23{

22}

24}

23

25

26+void MockSystemImage::checkForUpdate()

27+{

28+ qDebug() << "Doing a fake system update check";

29+}

30+

31+void MockSystemImage::applyUpdate()

32+{

33+ qDebug() << "Applying a fake system update";

34+}

35+

24void MockSystemImage::factoryReset()

36void MockSystemImage::factoryReset()

25{

37{

26 Q_EMIT resettingDevice();

38 Q_EMIT resettingDevice();

tests/mocks/Ubuntu/SystemImage/MockSystemImage.h+12−2

@@ -24,12 +24,22 @@ class MockSystemImage : public QObject

24 Q_OBJECT

25 Q_DISABLE_COPY(MockSystemImage)

26

27+ Q_PROPERTY(bool updateDownloaded READ updateDownloaded CONSTANT)

28+ Q_PROPERTY(QString availableVersion READ availableVersion CONSTANT)

29+ Q_PROPERTY(QString updateSize READ updateSize CONSTANT)

30+

27public:

31public:

28− explicit MockSystemImage(QObject *parent = 0);

32+ explicit MockSystemImage(QObject *parent = nullptr);

29

33

30− Q_INVOKABLE void checkForUpdate() {}

34+ Q_INVOKABLE void checkForUpdate();

35+ Q_INVOKABLE void applyUpdate();

31 Q_INVOKABLE void factoryReset();

36 Q_INVOKABLE void factoryReset();

32

37

38+ // these are const only in mock

39+ bool updateDownloaded() const { return true; }

40+ QString availableVersion() const { return QStringLiteral("42"); }

41+ QString updateSize() const { return QStringLiteral("4.2 MB"); }

42+

33Q_SIGNALS:

43Q_SIGNALS:

34 void resettingDevice(); // only for mock

44 void resettingDevice(); // only for mock

35};

45};