Merge lp:~paulliu/unity8/previewattribute20140918 into lp:unity8

[Ying-Chun Liu]

Add attributes to Preview.

 * 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?
No
 * If you changed the UI, has there been a design review?
Need a design review.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1289
http://jenkins.qa.ubuntu.com/job/unity8-ci/4413/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5231/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1409/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1507/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1507/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6483/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1289
http://jenkins.qa.ubuntu.com/job/unity8-ci/4430/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5284
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1426
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1524
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1524
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5006
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6536
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6536/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/13881

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

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

Not a fan of the hardcoded height/width we have in mascotShapeLoader but that was already there so it's not fair to ask you to change it with this.

* 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.
Passed as much as it can

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

review: Approve

[lp:~paulliu/unity8/previewattribute20140918]

1290. By Ying-Chun Liu on 2014-09-29

merge trunk

1291. By Ying-Chun Liu on 2014-10-02

merge trunk

=== modified file 'qml/Dash/Previews/PreviewHeader.qml'
--- qml/Dash/Previews/PreviewHeader.qml	2014-09-18 07:23:35 +0000
+++ qml/Dash/Previews/PreviewHeader.qml	2014-10-02 14:06:19 +0000
@@ -16,12 +16,14 @@
 
 import QtQuick 2.0
 import Ubuntu.Components 0.1
+import Dash 0.1
 import "../"
 
 /*! This preview widget shows a header
  *  The title comes in widgetData["title"]
  *  The mascot comes in widgetData["mascot"]
  *  The subtitle comes in widgetData["subtitle"]
+ *  The attributes comes in widgetData["attributes"]
  */
 
 PreviewWidget {
@@ -35,6 +37,7 @@
         readonly property url mascot: root.widgetData["mascot"] || ""
         readonly property string title: root.widgetData["title"] || ""
         readonly property string subtitle: root.widgetData["subtitle"] || ""
+        readonly property var attributes: root.widgetData["attributes"] || null
         readonly property color fontColor: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText
 
         implicitHeight: row.height + row.margins * 2
@@ -114,6 +117,16 @@
                         text: headerRoot.subtitle
                     }
                 }
+
+                Loader {
+                    active: titleLabel.text && headerRoot.attributes
+                    anchors { left: parent.left; right: parent.right }
+                    sourceComponent: CardAttributes {
+                        id: previewAttributes
+                        objectName: "previewAttributes"
+                        model: headerRoot.attributes
+                    }
+                }
             }
         }
     }
 
=== modified file 'tests/qmltests/Dash/Previews/tst_PreviewHeader.qml'
--- tests/qmltests/Dash/Previews/tst_PreviewHeader.qml	2014-05-14 11:21:32 +0000
+++ tests/qmltests/Dash/Previews/tst_PreviewHeader.qml	2014-10-02 14:06:19 +0000
@@ -27,13 +27,15 @@
     property var origHeaderjson: {
         "title": "THE TITLE",
         "subtitle": "Something catchy",
-        "mascot": "../graphics/play_button.png"
+        "mascot": "../graphics/play_button.png",
+        "attributes": [{"value":"text1","icon":"image://theme/ok"},{"value":"text2","icon":"image://theme/cancel"}]
     }
 
     property var headerjson: {
         "title": "THE TITLE",
         "subtitle": "Something catchy",
-        "mascot": "../graphics/play_button.png"
+        "mascot": "../graphics/play_button.png",
+        "attributes": [{"value":"text1","icon":"image://theme/ok"},{"value":"text2","icon":"image://theme/cancel"}]
     }
 
     PreviewHeader {