Unity 8

Merge lp:~paulliu/unity8/unity8-fixgenericpreview into lp:unity8

  1. unity8-fixgenericpreview
  2. Merge into trunk
Proposed by Ying-Chun Liu
Status: Rejected
Rejected by: Michael Zanetti
Proposed branch: lp:~paulliu/unity8/unity8-fixgenericpreview
Merge into: lp:unity8
Diff against target: 375 lines (+157/-95)
4 files modified
Dash/Apps/AppPreview.qml (+16/-13)
Dash/DashPreview.qml (+33/-62)
Dash/Generic/GenericPreview.qml (+90/-19)
Dash/Video/VideoPreview.qml (+18/-1)
To merge this branch: bzr merge lp:~paulliu/unity8/unity8-fixgenericpreview
Reviewer Review Type Date Requested Status
Michael Zanetti (community) Disapprove
PS Jenkins bot (community) continuous-integration Needs Fixing
Review via email: mp+187762@code.launchpad.net

Commit message

Rearrange the previews to comply the design.

Description of the change

Rearrange the previews to comply the design.

To post a comment you must log in.
Revision history for this message
Ying-Chun Liu (paulliu) wrote :

https://bugs.launchpad.net/unity8/+bug/1224555

Revision history for this message
Michael Zanetti (mzanetti) wrote :

Videos:

What it is: http://wstaw.org/m/2013/09/26/plasma-desktopS30440.png
What it should be: http://wstaw.org/m/2013/09/26/plasma-desktopB30440.png

* It seems the text is too large. Also I guess it shouldn't wrap but elide.
* Lacks rating stars

Apps:
What it is: http://wstaw.org/m/2013/09/26/plasma-desktopC30440.png
What it should be: http://wstaw.org/m/2013/09/26/plasma-desktopy30440.png

* The title is double here. The one at the top should look exactly like the one at the bottom. The bottom one needs to go away

Overall some margins seem to be wrong. I.e. in the code the stuff is clipped 2 grid units from the bottom while the design spec doesn't do that clipping there.

review: Needs Fixing
lp:~paulliu/unity8/unity8-fixgenericpreview updated
349. By Albert Astals Cid

Remember the expanded categoryId and not the expanded index

The index can change on search, and we still want to maintain it expanded in that case. Fixes: https://bugs.launchpad.net/bugs/1230216.

Approved by PS Jenkins bot, Michael Zanetti.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:342
http://jenkins.qa.ubuntu.com/job/unity8-ci/1139/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/4042
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/1658
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/1888
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-amd64-ci/162
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1139
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1139/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/1138
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/354
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/4141
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/4141/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1660
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1660/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/1390
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/1402

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

review: Needs Fixing (continuous-integration)
lp:~paulliu/unity8/unity8-fixgenericpreview updated
350. By Michał Sawicz

Make SHOW_DASH and HIDE_DASH close the current preview. Fixes: https://bugs.launchpad.net/bugs/1231404.

Approved by PS Jenkins bot, Michał Sawicz, Diego Sarmentero.

351. By Diego Sarmentero

- Handling error signal from the DownloadTracker plugin (BUG: #1229744). Fixes: https://bugs.launchpad.net/bugs/1229744.

Approved by PS Jenkins bot, Michał Sawicz, Roberto Alsina.

352. By Diego Sarmentero

- Remove "Reviews and Comments" section from Application Preview until the feature is ready (BUG: #1226632)
- Detect when the keyboard is being shown to allow the user to scroll the Preview even more if necessary to interact with the components at the bottom of that preview, and don't leave those components obscured behind the keyboard (BUG: #1226638). Fixes: https://bugs.launchpad.net/bugs/1224717, https://bugs.launchpad.net/bugs/1226632, https://bugs.launchpad.net/bugs/1226638.

Approved by PS Jenkins bot, Michał Sawicz, Alejandro J. Cura.

353. By Nick Dedekind

Brought messaging indicator inline with UnityMenuModel & UnityMenuAction. Fixes: https://bugs.launchpad.net/bugs/1217676, https://bugs.launchpad.net/bugs/1217678.

Approved by PS Jenkins bot, Michael Zanetti.

354. By Albert Astals Cid

Fix showHeader in an edge case of notShownByItsOwn

Not all the tests i've added fail without the code fix, but i've added them just to be more covered
. Fixes: https://bugs.launchpad.net/bugs/1230187.

Approved by PS Jenkins bot, Michał Sawicz.

355. By Launchpad Translations on behalf of unity-team

Launchpad automatic translations update.

356. By Michał Sawicz

Add a LazyImage component that shows an activity spinner for long-loading images and handles aspect ratio properly.

Approved by PS Jenkins bot, Michael Zanetti.

357. By Michał Sawicz

Fix Qt 5.1 FTBFS and suppress some build warnings.

Approved by PS Jenkins bot, Michael Zanetti.

Revision history for this message
Ying-Chun Liu (paulliu) wrote :

Hi, I'll fix the video preview in another branch. lp:~paulliu/unity8/movie-preview

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:343
http://jenkins.qa.ubuntu.com/job/unity8-ci/1159/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/4109
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/1740
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/1919
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-amd64-ci/182
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1159
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1159/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/1158
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/412
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/4223
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/4223/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1742
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1742/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/1455
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/1467

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

review: Needs Fixing (continuous-integration)
lp:~paulliu/unity8/unity8-fixgenericpreview updated
358. By Paweł Stołowski

Cancel previous actions and previews on new activation / preview. Expose previewed data row in Preview object.

Approved by PS Jenkins bot, Michal Hruby, Michał Sawicz.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:344
http://jenkins.qa.ubuntu.com/job/unity8-ci/1160/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/4114
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/1745
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/1920
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-amd64-ci/183
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1160
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1160/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/1159
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/417
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/4228
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/4228/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1747
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1747/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/1460
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/1472

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

review: Needs Fixing (continuous-integration)
lp:~paulliu/unity8/unity8-fixgenericpreview updated
359. By PS Jenkins bot

Releasing 7.81.3+13.10.20130927.3-0ubuntu1 (revision 358 from lp:unity8).

Approved by PS Jenkins bot.

360. By Launchpad Translations on behalf of unity-team

Launchpad automatic translations update.

361. By Launchpad Translations on behalf of unity-team

Launchpad automatic translations update.

364. By Ying-Chun Liu

Fix app preview.

365. By Ying-Chun Liu

Add Displaying the infoHints.

Revision history for this message
Michael Zanetti (mzanetti) wrote :

From the design spec: http://i.imgur.com/up8dETX.png

I see we have Preview, Header, Actions, Description and Rating as elements on the preview. Our code is still structured for the old previews and the new elements somehow squeezed into the old structure. I think in the long run this will cause continuous headaches and would vote for properly doing the rework, splitting up DashPreview.qml into exactly those defined fields. Another thing is that the current code still holds id's etc referring to the old structure. For example the id for the area that holds the screenshots (in the design spec called "Preview") is still named headerIcon in the code. This is quite a mess imho.

Also,
This is how it looks in landscape mode http://i.imgur.com/nAknW9T.jpg , while this is how it should look like http://i.imgur.com/uwHyln6.jpg

I guess that's a side effect of not having it structured properly.

review: Needs Fixing
Revision history for this message
Michal Hruby (mhr3) wrote :

@mzanetti: Isn't that issue with the AppPreview? This branch says it fixes the GenericPreview, not music, not apps.

Revision history for this message
Michael Zanetti (mzanetti) wrote :

No... its really about the structure of the whole thing. The underlaying DashPreview is still the old structure and the new look is squeezed in there somehow.

Revision history for this message
Ying-Chun Liu (paulliu) wrote :

ok.. I'll modify it now. But because generic preview doesn't provide any ratings, I'll call it leftPane, middlePane, and rightPanel. And then I'll use Grid for arranging these panes according to the narrowMode.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:365
http://jenkins.qa.ubuntu.com/job/unity8-ci/1163/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/4162
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/1825
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/1924
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-amd64-ci/186
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1163
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1163/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/1162
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/462
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/29
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/29/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1827
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1827/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/1526
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/1538

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Michael Zanetti (mzanetti) wrote :

Rejecting this because of the complete preview rework in here: https://code.launchpad.net/~unity-team/unity8/fix-genericpreview/+merge/188355

review: Disapprove

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'Dash/Apps/AppPreview.qml'
--- Dash/Apps/AppPreview.qml 2013-09-26 18:55:06 +0000
+++ Dash/Apps/AppPreview.qml 2013-09-30 08:54:15 +0000
@@ -26,8 +26,6 @@
2626
27 signal sendUserReview(string review)27 signal sendUserReview(string review)
2828
29 title: root.previewData.title
30
31 header: ListView {29 header: ListView {
32 spacing: units.gu(1)30 spacing: units.gu(1)
33 orientation: ListView.Horizontal31 orientation: ListView.Horizontal
@@ -57,6 +55,22 @@
57 }55 }
58 }56 }
5957
58 title: AppInfo {
59 objectName: "appInfo"
60 anchors {
61 top: parent.top
62 topMargin: units.gu(2)
63 left: parent.left
64 right: parent.right
65 }
66
67 appName: root.previewData.title
68 icon: root.previewData.appIcon
69 rating: Math.round(root.previewData.rating * 10)
70 reviews: root.previewData.numRatings
71 rated: root.previewData.infoMap["rated"] ? root.previewData.infoMap["rated"].value : 0
72 }
73
60 Component {74 Component {
61 id: buttonsComponent75 id: buttonsComponent
6276
@@ -135,17 +149,6 @@
135 body: Column {149 body: Column {
136 spacing: units.gu(1)150 spacing: units.gu(1)
137151
138 AppInfo {
139 objectName: "appInfo"
140 anchors { left: parent.left; right: parent.right }
141
142 appName: root.previewData.title
143 icon: root.previewData.appIcon
144 rating: Math.round(root.previewData.rating * 10)
145 reviews: root.previewData.numRatings
146 rated: root.previewData.infoMap["rated"] ? root.previewData.infoMap["rated"].value : 0
147 }
148
149 Label {152 Label {
150 anchors { left: parent.left; right: parent.right }153 anchors { left: parent.left; right: parent.right }
151 text: root.previewData.description154 text: root.previewData.description
152155
=== modified file 'Dash/DashPreview.qml'
--- Dash/DashPreview.qml 2013-09-23 12:24:42 +0000
+++ Dash/DashPreview.qml 2013-09-30 08:54:15 +0000
@@ -23,10 +23,10 @@
23 property int keyboardSize: Qt.inputMethod.visible ? Qt.inputMethod.keyboardRectangle.height : 023 property int keyboardSize: Qt.inputMethod.visible ? Qt.inputMethod.keyboardRectangle.height : 0
24 property var previewData24 property var previewData
2525
26 property string title: ""
27 property real previewWidthRatio: 0.526 property real previewWidthRatio: 0.5
2827
29 property Component header28 property Component header
29 property Component title
30 property Component buttons30 property Component buttons
31 property Component body31 property Component body
3232
@@ -62,64 +62,39 @@
62 }62 }
6363
64 Item {64 Item {
65 id: headerIcon
66 height: childrenRect.height
67 anchors {
68 left: parent.left
69 right: parent.right
70 top: parent.top
71 leftMargin: root.contentSpacing
72 topMargin: root.contentSpacing
73 rightMargin: root.contentSpacing
74 }
75 Loader {
76 id: headerLoader
77 anchors.left: parent.left
78 anchors.right: parent.right
79 sourceComponent: root.header
80 }
81 }
82
83 Item {
65 id: headerRow84 id: headerRow
66 height: units.gu(4)85 height: childrenRect.height
67 anchors {86 anchors {
68 top: parent.top87 top: headerIcon.bottom
69 left: parent.left88 left: parent.left
70 right: parent.right89 right: parent.right
71 margins: root.contentSpacing90 leftMargin: root.contentSpacing
72 }91 rightMargin: root.contentSpacing
7392 }
74 MouseArea {93 Loader {
75 anchors {94 id: titleLoader
76 fill: parent95 anchors.left: parent.left
77 leftMargin: -root.contentSpacing96 anchors.right: parent.right
78 rightMargin: -root.contentSpacing97 sourceComponent: root.title
79 topMargin: -root.contentSpacing
80 }
81
82 onClicked: root.close();
83 }
84
85 Item {
86 id: labelItem
87 anchors {
88 fill: parent
89 rightMargin: closePreviewImage.width + spacing
90 }
91
92 property int spacing: units.gu(2)
93
94 Label {
95 id: title
96 objectName: "titleLabel"
97 anchors {
98 left: parent.left
99 right: parent.right
100 }
101
102 elide: Text.ElideRight
103 fontSize: "x-large"
104 font.weight: Font.Light
105 color: Theme.palette.selected.backgroundText
106 opacity: 0.9
107 text: root.title
108 style: Text.Raised
109 styleColor: "black"
110 }
111 Image {
112 id: closePreviewImage
113 source: "graphics/tablet/icon_close_preview.png"
114 width: units.gu(4)
115 height: units.gu(1.5)
116 anchors {
117 bottom: title.bottom
118 bottomMargin: units.dp(7)
119 left: parent.left
120 leftMargin: title.paintedWidth + labelItem.spacing
121 }
122 }
123 }98 }
124 }99 }
125100
@@ -130,7 +105,9 @@
130 right: parent.right105 right: parent.right
131 top: headerRow.bottom106 top: headerRow.bottom
132 bottom: parent.bottom107 bottom: parent.bottom
133 margins: root.contentSpacing108 topMargin: root.contentSpacing
109 leftMargin: root.contentSpacing
110 rightMargin: root.contentSpacing
134 }111 }
135112
136 spacing: units.gu(2)113 spacing: units.gu(2)
@@ -158,12 +135,6 @@
158 spacing: units.gu(1)135 spacing: units.gu(1)
159136
160 Loader {137 Loader {
161 id: headerLoader
162 anchors.left: parent.left
163 anchors.right: parent.right
164 sourceComponent: root.header
165 }
166 Loader {
167 id: buttonLoader138 id: buttonLoader
168 anchors.left: parent.left139 anchors.left: parent.left
169 anchors.right: parent.right140 anchors.right: parent.right
170141
=== modified file 'Dash/Generic/GenericPreview.qml'
--- Dash/Generic/GenericPreview.qml 2013-09-05 10:02:00 +0000
+++ Dash/Generic/GenericPreview.qml 2013-09-30 08:54:15 +0000
@@ -23,7 +23,6 @@
23DashPreview {23DashPreview {
24 id: genericPreview24 id: genericPreview
2525
26 title: previewData.title
27 previewWidthRatio: 0.626 previewWidthRatio: 0.6
2827
29 property url url: previewData.image28 property url url: previewData.image
@@ -42,17 +41,60 @@
42 }41 }
43 }42 }
4443
44 title: Column {
45 anchors {
46 top: parent.top
47 topMargin: units.gu(2)
48 left: parent.left
49 right: parent.right
50 }
51
52 Label {
53 id: title
54 objectName: "titleLabel"
55 anchors { left: parent.left; right: parent.right }
56
57 elide: Text.ElideRight
58 fontSize: "x-large"
59 font.weight: Font.Light
60 color: Theme.palette.selected.backgroundText
61 opacity: 0.9
62 text: previewData.title
63 style: Text.Raised
64 styleColor: "black"
65 maximumLineCount: 2
66 wrapMode: Text.WordWrap
67 }
68
69 Label {
70 anchors { left: parent.left; right: parent.right }
71 visible: text != ""
72 fontSize: "medium"
73 opacity: 0.6
74 color: "white"
75 text: previewData.subtitle.replace(/[\r\n]+/g, "<br />")
76 style: Text.Raised
77 styleColor: "black"
78 wrapMode: Text.WordWrap
79 textFormat: Text.RichText
80 maximumLineCount: 1
81 // FIXME: workaround for https://bugreports.qt-project.org/browse/QTBUG-33020
82 onWidthChanged: { wrapMode = Text.NoWrap; wrapMode = Text.WordWrap }
83 }
84 }
45 buttons: GridView {85 buttons: GridView {
46 id: buttons86 id: buttons
47 model: genericPreview.previewData.actions87 model: genericPreview.previewData.actions
4888
49 property int numOfRows: (count + 1) / 289 property int buttonMaxWidth: units.gu(34)
90 property int numOfColumns: Math.ceil((width + spacing) / (buttonMaxWidth + spacing))
91 property int numOfRows: Math.ceil(count / numOfColumns)
50 property int spacing: units.gu(1)92 property int spacing: units.gu(1)
51 height: Math.max(units.gu(4), units.gu(4)*numOfRows + spacing*(numOfRows - 1))93 height: Math.max(units.gu(4), units.gu(4)*numOfRows + spacing*(numOfRows - 1))
5294
53 cellWidth: Math.max(units.gu(9), width / 2)95 cellWidth: width / numOfColumns
54 cellHeight: buttonHeight + spacing96 cellHeight: buttonHeight + spacing
55 property int buttonWidth: Math.max(0, width / 2 - spacing)97 property int buttonWidth: cellWidth - spacing / 2
56 property int buttonHeight: units.gu(4)98 property int buttonHeight: units.gu(4)
5799
58 delegate: Button {100 delegate: Button {
@@ -69,25 +111,12 @@
69 }111 }
70 focus: false112 focus: false
71 }113 }
114
72 body: Column {115 body: Column {
73 spacing: units.gu(2)116 spacing: units.gu(2)
74117
75 Label {118 Label {
76 anchors { left: parent.left; right: parent.right }119 id: descriptionLabel
77 visible: text != ""
78 fontSize: "medium"
79 opacity: 0.6
80 color: "white"
81 text: previewData.subtitle.replace(/[\r\n]+/g, "<br />")
82 style: Text.Raised
83 styleColor: "black"
84 wrapMode: Text.WordWrap
85 textFormat: Text.RichText
86 // FIXME: workaround for https://bugreports.qt-project.org/browse/QTBUG-33020
87 onWidthChanged: { wrapMode = Text.NoWrap; wrapMode = Text.WordWrap }
88 }
89
90 Label {
91 anchors { left: parent.left; right: parent.right }120 anchors { left: parent.left; right: parent.right }
92 visible: text != ""121 visible: text != ""
93 fontSize: "small"122 fontSize: "small"
@@ -101,5 +130,47 @@
101 // FIXME: workaround for https://bugreports.qt-project.org/browse/QTBUG-33020130 // FIXME: workaround for https://bugreports.qt-project.org/browse/QTBUG-33020
102 onWidthChanged: { wrapMode = Text.NoWrap; wrapMode = Text.WordWrap }131 onWidthChanged: { wrapMode = Text.NoWrap; wrapMode = Text.WordWrap }
103 }132 }
133
134 Column {
135 id: infoItem
136 anchors {
137 left: parent.left
138 right: parent.right
139 }
140 Repeater {
141 model: previewData.infoHints
142
143 delegate: Grid {
144 columns: 2
145 width: parent.width
146 spacing: units.gu(1)
147
148 Label {
149 visible: directedLabel.visible
150 fontSize: "small"
151 opacity: 0.9
152 color: "white"
153 horizontalAlignment: Text.AlignLeft
154 width: infoItem.width / 2
155 text: modelData.displayName
156 style: Text.Raised
157 styleColor: "black"
158 }
159 Label {
160 id: directedLabel
161 visible: modelData.value != ""
162 fontSize: "small"
163 opacity: 0.6
164 color: "white"
165 horizontalAlignment: Text.AlignRight
166 width: infoItem.width / 2
167 text: modelData.value ? modelData.value : ""
168 style: Text.Raised
169 styleColor: "black"
170 wrapMode: Text.WordWrap
171 }
172 }
173 }
174 }
104 }175 }
105}176}
106177
=== modified file 'Dash/Video/VideoPreview.qml'
--- Dash/Video/VideoPreview.qml 2013-08-09 10:12:19 +0000
+++ Dash/Video/VideoPreview.qml 2013-09-30 08:54:15 +0000
@@ -33,7 +33,6 @@
33 source: item ? item.nfoUri : ""33 source: item ? item.nfoUri : ""
34 }34 }
3535
36 title: nfo.ready ? nfo.video.title : ""
37 previewWidthRatio: 0.636 previewWidthRatio: 0.6
3837
39 onPreviewImageClicked: {38 onPreviewImageClicked: {
@@ -74,6 +73,24 @@
74 }73 }
75 }74 }
7675
76 title: Label {
77 id: title
78 objectName: "titleLabel"
79 anchors {
80 left: parent.left
81 right: parent.right
82 }
83
84 elide: Text.ElideRight
85 fontSize: "x-large"
86 font.weight: Font.Light
87 color: Theme.palette.selected.backgroundText
88 opacity: 0.9
89 text: nfo.ready ? nfo.video.title : ""
90 style: Text.Raised
91 styleColor: "black"
92 }
93
77 buttons: Row {94 buttons: Row {
78 spacing: units.gu(2)95 spacing: units.gu(2)
7996

Subscribers

People subscribed via source and target branches