Merge lp:~mzanetti/unity8/launcher-new-count-emblem into lp:unity8

[Michael Zanetti]

update launcher count emblems to match new spec

Screenshot for easier design review: http://i.imgur.com/bqTxKQx.png

* Are there any related MPs required for this MP to build/function as expected? Please list.

No

 * Did you perform an exploratory manual test run of your code change and any related functionality?

Yes

 * Did you make sure that your branch does not contain spurious tags?

Yes

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?

N/A

 * If you changed the UI, has there been a design review?

requested in here

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1046
http://jenkins.qa.ubuntu.com/job/unity8-ci/3452/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2076
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/453/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/546
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/546
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/546/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/546
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2306
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3210
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3210/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/9935

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/3452/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1046
http://jenkins.qa.ubuntu.com/job/unity8-ci/3463/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2126
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/464/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/557
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/557
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/557/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/557
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2348
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3279
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3279/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/9998

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/3463/rebuild

review: Needs Fixing (continuous-integration)

[Vesa Rautiainen (vesar)]

review: Approve (design)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1046
http://jenkins.qa.ubuntu.com/job/unity8-ci/3616/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2542
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/618
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/710
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/710
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/710/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/710
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2689
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3785
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3785/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/10486

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/3616/rebuild

review: Approve (continuous-integration)

[lp:~mzanetti/unity8/launcher-new-count-emblem]

1047. By Michael Zanetti on 2014-07-29

some tweaks requested by the reviewer

1048. By Michael Zanetti on 2014-07-29

add fixme

[Andrea Cimitan (cimi)]

 * Did you perform an exploratory manual test run of the code change and any related functionality?
Yes
 * Did CI run pass? If not, please explain why.
Yes

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1047
http://jenkins.qa.ubuntu.com/job/unity8-ci/3654/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2643
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/656
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/748
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/748
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/748/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/748
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2772
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3886
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3886/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/10606

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/3654/rebuild

review: Approve (continuous-integration)

=== modified file 'qml/Launcher/LauncherDelegate.qml'
--- qml/Launcher/LauncherDelegate.qml	2014-07-09 19:45:23 +0000
+++ qml/Launcher/LauncherDelegate.qml	2014-07-29 10:22:56 +0000
@@ -70,28 +70,31 @@
             height: root.itemHeight - units.gu(1)
         }
 
-        BorderImage {
+        UbuntuShape {
             objectName: "countEmblem"
             anchors {
                 right: parent.right
                 top: parent.top
                 margins: units.dp(3)
             }
-            width: Math.min(root.itemWidth, Math.max(units.gu(3), countLabel.implicitWidth + units.gu(2.5)))
-            height: units.gu(3)
-            source: "graphics/notification.sci"
+            width: Math.min(root.itemWidth, Math.max(units.gu(2), countLabel.implicitWidth + units.gu(1)))
+            height: units.gu(2)
+            color: UbuntuColors.orange
             visible: root.count > 0
+            borderSource: "none"
 
             Label {
                 id: countLabel
                 text: root.count
                 anchors.centerIn: parent
+                // FIXME: verticalCenter seems to be off wee bit and QML doesn't have a centerLine
+                // property for Text: https://bugreports.qt-project.org/browse/QTBUG-40479
+                anchors.verticalCenterOffset: -units.dp(.5)
                 width: root.itemWidth - units.gu(1)
                 horizontalAlignment: Text.AlignHCenter
                 elide: Text.ElideRight
                 color: "white"
-                fontSize: "small"
-                font.bold: true
+                fontSize: "x-small"
             }
         }
 

=== removed file 'qml/Launcher/graphics/[e-mail]'
Binary files qml/Launcher/graphics/[e-mail]	2013-08-19 19:34:03 +0000 and qml/Launcher/graphics/[e-mail]	1970-01-01 00:00:00 +0000 differ
=== removed file 'qml/Launcher/graphics/[e-mail]'
--- qml/Launcher/graphics/[e-mail]	2013-08-19 19:34:03 +0000
+++ qml/Launcher/graphics/[e-mail]	1970-01-01 00:00:00 +0000
@@ -1,5 +0,0 @@
-border.left: 36
-border.top: 36
-border.bottom: 36
-border.right: 36
-source: [e-mail]
\ No newline at end of file