Merge lp:~seb128/ubuntu-system-settings/system-update-logo into lp:ubuntu-system-settings

[Sebastien Bacher]

[system-update] use scalable distributor-logo icon from the theme

[system-update] use scalable distributor-logo icon from the theme

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1507
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2360/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3873
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/135
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/544
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3182
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3870
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3870/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22848

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2360/rebuild

review: Needs Fixing (continuous-integration)

[Ken VanDine (ken-vandine)]

Looks great, thanks!

review: Approve

=== modified file 'plugins/system-update/CMakeLists.txt'
--- plugins/system-update/CMakeLists.txt	2014-10-22 19:37:42 +0000
+++ plugins/system-update/CMakeLists.txt	2015-08-26 16:46:02 +0000
@@ -25,7 +25,7 @@
 install(FILES ${QML_SOURCES} DESTINATION ${PLUGIN_QML_DIR}/system-update)
 
 install(FILES system-update.settings DESTINATION ${PLUGIN_MANIFEST_DIR})
-install(FILES images/settings-system-update.svg images/distributor-logo.png DESTINATION ${PLUGIN_MANIFEST_DIR}/icons)
+install(FILES images/settings-system-update.svg DESTINATION ${PLUGIN_MANIFEST_DIR}/icons)
 
 
 set(QML_SOURCES_NOTIFICATION EntryComponent.qml)

=== modified file 'plugins/system-update/PageComponent.qml'
--- plugins/system-update/PageComponent.qml	2015-06-29 13:06:41 +0000
+++ plugins/system-update/PageComponent.qml	2015-08-26 16:46:02 +0000
@@ -714,8 +714,10 @@
             spacing: units.gu(2)
 
             Image {
-                source: Qt.resolvedUrl("file:///usr/share/ubuntu/settings/system/icons/distributor-logo.png")
+                source: Qt.resolvedUrl("file:///usr/share/icons/suru/places/scalable/distributor-logo.svg")
                 anchors.horizontalCenter: parent.horizontalCenter
+                height: width
+                width: 96
                 NumberAnimation on rotation {
                     from: 0
                     to: 360

=== removed file 'plugins/system-update/images/distributor-logo.png'
Binary files plugins/system-update/images/distributor-logo.png	2014-01-23 19:29:34 +0000 and plugins/system-update/images/distributor-logo.png	1970-01-01 00:00:00 +0000 differ
=== modified file 'plugins/system-update/system_update.cpp'
--- plugins/system-update/system_update.cpp	2015-07-13 18:26:10 +0000
+++ plugins/system-update/system_update.cpp	2015-08-26 16:46:02 +0000
@@ -232,7 +232,7 @@
     update->setSelected(downloading);
     update->setUpdateAvailable(isAvailable);
     update->setLastUpdateDate(lastUpdateDate);
-    update->setIconUrl(QString("file:///usr/share/ubuntu/settings/system/icons/distributor-logo.png"));
+    update->setIconUrl(QString("file:///usr/share/icons/suru/places/scalable/distributor-logo.svg"));
 
     if (update->updateRequired()) {
         Q_EMIT updateAvailable(packageName, update);