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

Proposed by Ying-Chun Liu
Status: Merged
Approved by: Albert Astals Cid
Approved revision: 1289
Merged at revision: 1326
Proposed branch: lp:~paulliu/unity8/previewattribute20140918
Merge into: lp:unity8
Diff against target: 65 lines (+17/-2)
2 files modified
qml/Dash/Previews/PreviewHeader.qml (+13/-0)
tests/qmltests/Dash/Previews/tst_PreviewHeader.qml (+4/-2)
To merge this branch: bzr merge lp:~paulliu/unity8/previewattribute20140918
Reviewer Review Type Date Requested Status
Albert Astals Cid (community) Approve
PS Jenkins bot (community) continuous-integration Needs Fixing
Review via email: mp+236127@code.launchpad.net

Commit message

Add attributes to Preview.

Description of the change

 * 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.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Albert Astals Cid (aacid) wrote :

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
1290. By Ying-Chun Liu on 2014-09-29

merge trunk

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

merge trunk

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
1616
17import QtQuick 2.017import QtQuick 2.0
18import Ubuntu.Components 0.118import Ubuntu.Components 0.1
19import Dash 0.1
19import "../"20import "../"
2021
21/*! This preview widget shows a header22/*! This preview widget shows a header
22 * The title comes in widgetData["title"]23 * The title comes in widgetData["title"]
23 * The mascot comes in widgetData["mascot"]24 * The mascot comes in widgetData["mascot"]
24 * The subtitle comes in widgetData["subtitle"]25 * The subtitle comes in widgetData["subtitle"]
26 * The attributes comes in widgetData["attributes"]
25 */27 */
2628
27PreviewWidget {29PreviewWidget {
@@ -35,6 +37,7 @@
35 readonly property url mascot: root.widgetData["mascot"] || ""37 readonly property url mascot: root.widgetData["mascot"] || ""
36 readonly property string title: root.widgetData["title"] || ""38 readonly property string title: root.widgetData["title"] || ""
37 readonly property string subtitle: root.widgetData["subtitle"] || ""39 readonly property string subtitle: root.widgetData["subtitle"] || ""
40 readonly property var attributes: root.widgetData["attributes"] || null
38 readonly property color fontColor: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText41 readonly property color fontColor: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText
3942
40 implicitHeight: row.height + row.margins * 243 implicitHeight: row.height + row.margins * 2
@@ -114,6 +117,16 @@
114 text: headerRoot.subtitle117 text: headerRoot.subtitle
115 }118 }
116 }119 }
120
121 Loader {
122 active: titleLabel.text && headerRoot.attributes
123 anchors { left: parent.left; right: parent.right }
124 sourceComponent: CardAttributes {
125 id: previewAttributes
126 objectName: "previewAttributes"
127 model: headerRoot.attributes
128 }
129 }
117 }130 }
118 }131 }
119 }132 }
120133
=== 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 @@
27 property var origHeaderjson: {27 property var origHeaderjson: {
28 "title": "THE TITLE",28 "title": "THE TITLE",
29 "subtitle": "Something catchy",29 "subtitle": "Something catchy",
30 "mascot": "../graphics/play_button.png"30 "mascot": "../graphics/play_button.png",
31 "attributes": [{"value":"text1","icon":"image://theme/ok"},{"value":"text2","icon":"image://theme/cancel"}]
31 }32 }
3233
33 property var headerjson: {34 property var headerjson: {
34 "title": "THE TITLE",35 "title": "THE TITLE",
35 "subtitle": "Something catchy",36 "subtitle": "Something catchy",
36 "mascot": "../graphics/play_button.png"37 "mascot": "../graphics/play_button.png",
38 "attributes": [{"value":"text1","icon":"image://theme/ok"},{"value":"text2","icon":"image://theme/cancel"}]
37 }39 }
3840
39 PreviewHeader {41 PreviewHeader {

Subscribers

People subscribed via source and target branches