Merge lp:~seb128/ubuntu-system-settings/updates-ellipsize-labels into lp:ubuntu-system-settings

[Sebastien Bacher]

[system-update] ellipsize labels if needed

[system-update] ellipsize labels if needed

[lp:~seb128/ubuntu-system-settings/updates-ellipsize-labels]

1142. By Sebastien Bacher on 2014-10-20

[system-update] ellipsize labels if needed

1143. By Sebastien Bacher on 2014-10-20

ellipsize even if there is no button displayed

[Iain Lane (laney)]

Thanks, this looks good!

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1136
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1664/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/6080
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/4148
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/856
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5708
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7332
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7332/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14879
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/3509
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4491
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4491/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

=== modified file 'plugins/system-update/PageComponent.qml'
--- plugins/system-update/PageComponent.qml	2014-10-08 15:51:44 +0000
+++ plugins/system-update/PageComponent.qml	2014-10-20 20:56:22 +0000
@@ -453,11 +453,12 @@
                                 objectName: "labelTitle"
                                 anchors {
                                     left: parent.left
+                                    right: buttonAppUpdate.visible ? buttonAppUpdate.left : parent.right
                                     verticalCenter: parent.verticalCenter
                                 }
                                 text: modelData.title
                                 font.bold: true
-                                elide: buttonAppUpdate.visible ? Text.ElideRight : Text.ElideNone
+                                elide: Text.ElideMiddle
                             }
 
                             Button {
@@ -514,6 +515,8 @@
                             Label {
                                 objectName: "labelUpdateStatus"
                                 anchors.left: parent.left
+                                anchors.right: updateStatusLabel.left
+                                elide: Text.ElideMiddle
                                 fontSize: "small"
                                 text: {
                                     if (retry)
@@ -526,6 +529,7 @@
                                 }
                             }
                             Label {
+                                id: updateStatusLabel
                                 anchors.right: parent.right
                                 visible: !labelSize.visible && !installing && !installed
                                 fontSize: "small"