git.iko.soy/unity8
on xenial help sign in
address review comments
38c96a3Lukáš Tinkl
plugins/Ubuntu/SystemImage/SystemImage.cpp+1−2
compare with xenial
unifiedsplit
@@ -96,9 +96,8 @@ void SystemImage::onUpdateDownloaded()
96 Q_EMIT updateDownloadedChanged();
96 Q_EMIT updateDownloadedChanged();
97}
97}
98
98
99−void SystemImage::onUpdateFailed(int consecutive_failure_count, const QString &last_reason)
99+void SystemImage::onUpdateFailed(int /*consecutive_failure_count*/, const QString &last_reason)
100{
100{
101− Q_UNUSED(consecutive_failure_count)
102 qWarning() << Q_FUNC_INFO << "System Update failed:" << last_reason;
101 qWarning() << Q_FUNC_INFO << "System Update failed:" << last_reason;
103 setUpdateApplying(false);
102 setUpdateApplying(false);
104}
103}
plugins/Ubuntu/SystemImage/SystemImage.h−1
@@ -18,7 +18,6 @@
18#define SYSTEMIMAGE_H
18#define SYSTEMIMAGE_H
19
19
20#include <QObject>
20#include <QObject>
21−#include <QMap>
22
21
23class SystemImage : public QObject
22class SystemImage : public QObject
24{
23{
qml/Wizard/Pages/77-system-update.qml+5−5
@@ -34,9 +34,9 @@ LocalComponents.Page {
34 id: column
34 id: column
35 anchors {
35 anchors {
36 fill: content
36 fill: content
37− leftMargin: leftMargin
37+ leftMargin: systemUpdatePage.leftMargin
38− rightMargin: rightMargin
38+ rightMargin: systemUpdatePage.rightMargin
39− topMargin: customMargin
39+ topMargin: systemUpdatePage.customMargin
40 }
40 }
41 spacing: units.gu(3)
41 spacing: units.gu(3)
42 opacity: spinner.running ? 0.5 : 1
42 opacity: spinner.running ? 0.5 : 1
@@ -76,14 +76,14 @@ LocalComponents.Page {
76 color: textColor
76 color: textColor
77 font.weight: Font.Normal
77 font.weight: Font.Normal
78 fontSize: "small"
78 fontSize: "small"
79− text: i18n.tr("Ubuntu system")
79+ text: i18n.ctr("string identifying name of the update", "Ubuntu system")
80 }
80 }
81
81
82 Label {
82 Label {
83 font.weight: Font.Light
83 font.weight: Font.Light
84 fontSize: "small"
84 fontSize: "small"
85 color: textColor
85 color: textColor
86− text: i18n.tr("Version %1").arg(SystemImage.availableVersion)
86+ text: i18n.ctr("version of the system update", "Version %1").arg(SystemImage.availableVersion)
87 }
87 }
88
88
89 Label {
89 Label {