Unity 8

Merge lp:~aacid/unity8/emblemInPreviews into lp:unity8

emblemInPreviews
Merge into trunk

Proposed by Albert Astals Cid on 2016-02-15

Status:

Merged

Approved by:

Andrea Cimitan on 2016-02-15

Approved revision:

2182

Merged at revision:

2247

Proposed branch:

lp:~aacid/unity8/emblemInPreviews

Merge into:

lp:unity8

Diff against target:

115 lines (+55/-10)

2 files modified

qml/Dash/Previews/PreviewHeader.qml (+37/-9)
tests/qmltests/Dash/Previews/tst_PreviewHeader.qml (+18/-1)

To merge this branch:

bzr merge lp:~aacid/unity8/emblemInPreviews

Medium

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Andrea Cimitan (community)		2016-02-15	Approve on 2016-02-15
PS Jenkins bot	continuous-integration		Needs Fixing on 2016-02-15
Unity8 CI Bot	continuous-integration		Needs Fixing on 2016-02-15
Review via email: mp+286038@code.launchpad.net

Commit Message

Add emblem to the preview header widget

Description of the Change

* Are there any related MPs required for this MP to build/function as expected?
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?
N/A

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-02-15:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/350/rebuild

review: Needs Fixing (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2016-02-15:

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

review: Needs Fixing (continuous-integration)

Andrea Cimitan (cimi) wrote on 2016-02-15:

* Did you perform an exploratory manual test run of the code change and any related functionality?
y
* Did CI run pass? If not, please explain why.
y
* Did you make sure that the branch does not contain spurious tags?
y

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Albert Astals Cid

Mohammad Rakibul Hasan

Unity Team

 === modified file 'qml/Dash/Previews/PreviewHeader.qml'
 --- qml/Dash/Previews/PreviewHeader.qml	2015-11-04 14:57:13 +0000
 +++ qml/Dash/Previews/PreviewHeader.qml	2016-02-15 11:19:06 +0000
@@ -25,6 +25,7 @@
   *  The mascot fall back image comes in widgetData["fallback"]
   *  The subtitle comes in widgetData["subtitle"]
   *  The attributes comes in widgetData["attributes"]
++ *  The emblem comes in widgetData["emblem"]
   */
  PreviewWidget {
@@ -40,6 +41,7 @@
          readonly property string title: root.widgetData["title"] || ""
          readonly property string subtitle: root.widgetData["subtitle"] || ""
          readonly property var attributes: root.widgetData["attributes"] || null
++        readonly property url emblem: root.widgetData["emblem"] || ""
          readonly property color fontColor: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText
          // Rewire the source since we may have unwired it on onStatusChanged
@@ -98,16 +100,42 @@
                  spacing: units.dp(2)
                  anchors.verticalCenter: parent.verticalCenter
--                Label {
--                    id: titleLabel
--                    objectName: "titleLabel"
++                Item {
                      anchors { left: parent.left; right: parent.right }
--                    elide: Text.ElideRight
--                    font.weight: Font.Normal
--                    fontSize: "large"
--                    wrapMode: Text.Wrap
--                    color: headerRoot.fontColor
--                    text: headerRoot.title
++                    height: titleLabel.height
++
++                    Label {
++                        id: titleLabel
++                        objectName: "titleLabel"
++                        anchors {
++                            left: parent.left;
++                            right: iconLoader.right
++                            rightMargin: iconLoader.width > 0 ? units.gu(0.5) : 0
++                        }
++                        elide: Text.ElideRight
++                        font.weight: Font.Normal
++                        fontSize: "large"
++                        wrapMode: Text.Wrap
++                        color: headerRoot.fontColor
++                        text: headerRoot.title
++                    }
++
++                    Loader {
++                        id: iconLoader
++                        active: headerRoot.emblem != ""
++                        anchors {
++                            bottom: titleLabel.baseline
++                            right: parent.right
++                        }
++                        sourceComponent: Icon {
++                            objectName: "emblemIcon"
++                            source: headerRoot.emblem
++                            color: headerRoot.fontColor
++                            height: source != "" ? titleLabel.font.pixelSize : 0
++                            // FIXME Workaround for bug https://bugs.launchpad.net/ubuntu/+source/ubuntu-ui-toolkit/+bug/1421293
++                            width: implicitWidth > 0 && implicitHeight > 0 ? (implicitWidth / implicitHeight * height) : implicitWidth
++                        }
++                    }
+                 }
                  Loader {
 === modified file 'tests/qmltests/Dash/Previews/tst_PreviewHeader.qml'
 --- tests/qmltests/Dash/Previews/tst_PreviewHeader.qml	2015-11-04 14:57:13 +0000
 +++ tests/qmltests/Dash/Previews/tst_PreviewHeader.qml	2016-02-15 11:19:06 +0000
@@ -38,6 +38,14 @@
          "attributes": [{"value":"text1","icon":"image://theme/ok"},{"value":"text2","icon":"image://theme/cancel"}]
+     }
++    property var emblemheaderjson: {
++        "title": "THE TITLE",
++        "subtitle": "Something catchy",
++        "mascot": "../graphics/play_button.png",
++        "attributes": [{"value":"text1","icon":"image://theme/ok"},{"value":"text2","icon":"image://theme/cancel"}],
++        "emblem": Qt.resolvedUrl("../artwork/emblem.png")
++    }
++
      property var brokenheaderjson: {
          "title": "THE TITLE",
          "subtitle": "Something catchy",
@@ -56,7 +64,7 @@
      PreviewHeader {
          id: previewHeader
--        widgetData: headerjson
++        widgetData: emblemheaderjson
          width: units.gu(30)
          Rectangle {
@@ -128,6 +136,15 @@
+             }
+         }
++        function test_emblem() {
++            previewHeader.widgetData = emblemheaderjson;
++
++            var emblemIcon = findChild(previewHeader, "emblemIcon");
++            var titleLabel = findChild(previewHeader, "titleLabel");
++            verify(emblemIcon.height > 0);
++            compare(emblemIcon.height, titleLabel.font.pixelSize);
++        }
++
          function test_json() {
              headerjson = origHeaderjson;
              previewHeader.widgetData = headerjson;