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

[Sebastien Bacher]

updates: tweak the interface
- don't use dividers between list items
- use the labels specified in the design
- show the "install n updates" button only when there are several updates

updates: tweak the interface
- don't use dividers between list items
- use the labels specified in the design
- show the "install n updates" button only when there are several updates

[lp:~seb128/ubuntu-system-settings/update-uis-tweaks]

749. By Sebastien Bacher on 2014-06-25

use explicit objects as requested in review

[Sebastien Bacher (seb128)]

Thanks for the review, I've a one question about one of the review comments, addressed the other ones

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:748
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/897/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1199
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1065
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-amd64-ci/89
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-armhf-ci/89
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-armhf-ci/89/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/89
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/1535
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2074
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2074/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/8842
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/885
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1208
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1208/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[lp:~seb128/ubuntu-system-settings/update-uis-tweaks]

750. By Sebastien Bacher on 2014-06-25

use a property for better readability

[Diego Sarmentero (diegosarmentero)]

+1!

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:749
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/899/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1205
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1072/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-amd64-ci/91
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-armhf-ci/91
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-armhf-ci/91/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/91
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/1540
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2081
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2081/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/8850
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/892/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1215
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1215/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:750
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/900/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1213
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1080
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-amd64-ci/92
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-armhf-ci/92
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-armhf-ci/92/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/92
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/1546
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2091
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2091/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/8859
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/897
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1223
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1223/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[Iain Lane (laney)]

review: Approve

[lp:~seb128/ubuntu-system-settings/update-uis-tweaks]

751. By Sebastien Bacher on 2014-07-03

clean out duplicated visible

=== modified file 'plugins/system-update/PageComponent.qml'
--- plugins/system-update/PageComponent.qml	2014-05-15 12:08:30 +0000
+++ plugins/system-update/PageComponent.qml	2014-07-03 15:25:24 +0000
@@ -35,6 +35,7 @@
     title: i18n.tr("Updates")
 
     property bool installAll: false
+    property bool includeSystemUpdate: false
     property int updatesAvailable: 0
 
     property var notificationAction;
@@ -99,7 +100,7 @@
         State {
             name: "UPDATE"
             PropertyChanges { target: updateList; visible: true}
-            PropertyChanges { target: installAllButton; visible: true}
+            PropertyChanges { target: installAllButton; visible: true && root.updatesAvailable > 1}
             PropertyChanges { target: updateNotification; visible: false}
         }
     ]
@@ -120,6 +121,8 @@
 
         onUpdateAvailableFound: {
             root.updatesAvailable = updateManager.model.length;
+            if (root.updatesAvailable > 0)
+                root.includeSystemUpdate = updateManager.model[0].systemUpdate
             root.state = "UPDATE";
             root.installAll = downloading;
         }
@@ -211,7 +214,7 @@
         id: installAllButton
         objectName: "installAllButton"
 
-        property string primaryText: i18n.tr("Install %1 update", "Install %1 updates", root.updatesAvailable).arg(root.updatesAvailable)
+        property string primaryText: includeSystemUpdate ? i18n.tr("Install %1 updates…").arg(root.updatesAvailable) : i18n.tr("Install %1 updates").arg(root.updatesAvailable)
         property string secondaryText: i18n.tr("Pause All")
         text: root.installAll ? secondaryText : primaryText
         anchors {
@@ -249,7 +252,7 @@
         anchors {
             left: parent.left
             right: parent.right
-            top: installAllButton.bottom
+            top: installAllButton.visible ? installAllButton.bottom : parent.top
             bottom: notification.visible ? notification.top : configuration.top
             margins: units.gu(2)
             bottomMargin: 0
@@ -264,6 +267,7 @@
             iconSource: Qt.resolvedUrl(modelData.iconUrl)
             iconFrame: false
             height: modelData.selected ? units.gu(14) : units.gu(8)
+            showDivider: false
 
             property alias actionButton: buttonAppUpdate