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

[Sebastien Bacher]

update: tweak a bit the UI, we don't have a description for the updates
so there is no need to keep the stacked UI, we can use one line.
Copy the icon in the source as well since it's not installed on touch.

update: tweak a bit the UI, we don't have a description for the updates
so there is no need to keep the stacked UI, we can use one line.
Copy the icon in the source as well since it's not installed on touch.

[Sebastien Bacher (seb128)]

Some notes:

* you can test on the desktop with "sudo system-image-dbus --testing=update-manual-success" (needs system-images-dev installed)

* the "updateTitleId.height*3" is not new, it's just the height of 3 standard items (we just picked a random one as reference)

* The "Ubuntu Phone" label got replaced by the one mpt recommended (same is the about this device, : "Ubuntu <version> (r<rev>)"

[lp:~seb128/ubuntu-system-settings/update-tweak-ui]

445. By Sebastien Bacher on 2013-10-10

update: tweak a bit the UI, we don't have a description for the updates
so there is no need to keep the stacked UI, we can use one line.
Copy the icon in the source as well since it's not installed on touch.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:445
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/463/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-saucy-amd64-ci/463

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/ubuntu-system-settings-ci/463/rebuild

review: Approve (continuous-integration)

[Iain Lane (laney)]

You forgot to install the icon

review: Needs Fixing

[lp:~seb128/ubuntu-system-settings/update-tweak-ui]

446. By Sebastien Bacher on 2013-10-14

install the icon as well

[Sebastien Bacher (seb128)]

> You forgot to install the icon

yeah, of course I did ... I'm eventually going to learn to do the things right directly rather than copying manually for testing and forgetting then...

Thanks for spotting it, should be fixed with the new commit!

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:446
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/471/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-saucy-amd64-ci/471

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/ubuntu-system-settings-ci/471/rebuild

review: Approve (continuous-integration)

[Iain Lane (laney)]

Cool, looks nicer!

review: Approve

=== modified file 'plugins/system-update/PageComponent.qml'
--- plugins/system-update/PageComponent.qml	2013-10-03 15:28:53 +0000
+++ plugins/system-update/PageComponent.qml	2013-10-14 14:22:03 +0000
@@ -19,6 +19,7 @@
  */
 
 import QtQuick 2.0
+import QtSystemInfo 5.0
 import SystemSettings 1.0
 import Ubuntu.Components 0.1
 import Ubuntu.Components.ListItems 0.1 as ListItem
@@ -31,6 +32,10 @@
     title: i18n.tr("Updates")
     flickable: scrollWidget // TODO: maybe remove
 
+    DeviceInfo {
+        id: deviceInfo
+    }
+
     // TODO: surely needs its own QML as the whole logic is here
     UbuntuUpdatePanel {
         id: updateBackend
@@ -171,7 +176,7 @@
                     right: parent.right
                     margins: units.gu(2)
                 }
-                height: distribLogo.height + standardLabel.height*2 + versionId.height + subtitleId.height +
+                height: updateTitleId.height*3 + subtitleId.height +
                         updateProgress.height + pauseDownloadButton.height + units.gu(4)
 
                 /**********************
@@ -218,36 +223,14 @@
                     width: parent.width
                     spacing: units.gu(2)
 
-                    Icon {
-                        id: distribLogo
-                        anchors.horizontalCenter: parent.horizontalCenter
-                        width: units.gu(6)
-                        height: width
-                        name: "distributor-logo"
-                    }
-
-                    Row {
-                        width: parent.width
-
-                        Label {
-                            id: standardLabel
-                            width: parent.width/2
-                            text: i18n.tr("Ubuntu Phone")
-                        }
-
-                        Label {
-                            horizontalAlignment: Text.AlignRight
-                            width: parent.width/2
-                            text: updateBackend.updateSize;
-                        }
-                    }
-
-                    ListItem.Standard {
-                        id: versionId
-                        // TRANSLATORS: %1 is the version of the update
-                        text: i18n.tr("Version %1").arg(updateBackend.updateVersion)
-                        showDivider: false
-                    }
+                    ListItem.SingleValue {
+                        id: updateTitleId
+                        icon: "file:///usr/share/ubuntu/settings/system/icons/distributor-logo.png"
+                        iconFrame: false
+                        text: "Ubuntu %1 (r%2)".arg(deviceInfo.version(DeviceInfo.Os)).arg(updateBackend.updateVersion)
+                        value: updateBackend.updateSize;
+                    }
+
                     /* TODO: list updateBackend.updateDescriptions once bug #1215586 is resolved */
 
                     ListItem.Subtitled {

=== added file 'plugins/system-update/distributor-logo.png'
Binary files plugins/system-update/distributor-logo.png	1970-01-01 00:00:00 +0000 and plugins/system-update/distributor-logo.png	2013-10-14 14:22:03 +0000 differ
=== modified file 'plugins/system-update/system-update.pro'
--- plugins/system-update/system-update.pro	2013-09-06 10:31:42 +0000
+++ plugins/system-update/system-update.pro	2013-10-14 14:22:03 +0000
@@ -12,7 +12,7 @@
 settings.path = $${PLUGIN_MANIFEST_DIR}
 INSTALLS += settings
 
-image.files = settings-system-update.svg
+image.files = settings-system-update.svg distributor-logo.png
 image.path = $${PLUGIN_MANIFEST_DIR}/icons
 INSTALLS += image