git.iko.soy/unity8
on xenial help sign in
GenericPreview and Video fixed
8e12b36Diego Sarmentero
Dash/Apps/AppPreview.qml−2
compare with xenial
unifiedsplit
@@ -23,8 +23,6 @@ import "../../Components"
23DashPreview {
23DashPreview {
24 id: root
24 id: root
25
25
26− property var previewData
27−
28 signal download
26 signal download
29 signal open
27 signal open
30 signal sendUserReview(string review)
28 signal sendUserReview(string review)
Dash/DashPreview.qml+3−1
@@ -19,8 +19,10 @@ import Ubuntu.Components 0.1
19
19
20Rectangle {
20Rectangle {
21 id: root
21 id: root
22+
23+ property var previewData
24+
22 property string title: ""
25 property string title: ""
23− property url url: ""
24 property real previewWidthRatio: 0.5
26 property real previewWidthRatio: 0.5
25
27
26 property Component header
28 property Component header
Dash/Generic/GenericPreview.qml+24−2
@@ -23,12 +23,34 @@ import ".."
23
23
24DashPreview {
24DashPreview {
25 id: genericPreview
25 id: genericPreview
26− property var previewData
27
26
28 title: previewData.title
27 title: previewData.title
29− url: IconUtil.from_gicon(previewData.image)
30 previewWidthRatio: 0.6
28 previewWidthRatio: 0.6
31
29
30+ property url url: IconUtil.from_gicon(previewData.image)
31+
32+ // TODO: replace this UbuntuShape with the Video component once that lands
33+ // with the player.
34+ header: UbuntuShape {
35+ id: urlLoader
36+ anchors.left: parent.left
37+ anchors.right: parent.right
38+ height: width * previewImage.sourceSize.height / previewImage.sourceSize.width
39+ radius: "medium"
40+ image: Image {
41+ id: previewImage
42+ asynchronous: true
43+ source: genericPreview.url
44+ fillMode: Image.PreserveAspectCrop
45+ }
46+
47+ MouseArea {
48+ id: previewImageMouseArea
49+ anchors.fill: parent
50+ onClicked: genericPreview.previewImageClicked()
51+ }
52+ }
53+
32 buttons: GridView {
54 buttons: GridView {
33 id: buttons
55 id: buttons
34 model: genericPreview.previewData.actions
56 model: genericPreview.previewData.actions
Dash/Video/VideoPreview.qml+3−3
@@ -25,7 +25,9 @@ DashPreview {
25 property var item
25 property var item
26 property alias ready: nfo.ready
26 property alias ready: nfo.ready
27 property bool playable: false
27 property bool playable: false
28+ property string filePath: fileUri != ""
28 readonly property url fileUri: item ? item.fileUri : ""
29 readonly property url fileUri: item ? item.fileUri : ""
30+ property url url: item ? item.nfoUri.replace(/\.nfo$/, "-fanart.jpg") : ""
29
31
30 VideoInfo {
32 VideoInfo {
31 id: nfo
33 id: nfo
@@ -33,9 +35,7 @@ DashPreview {
33 }
35 }
34
36
35 title: nfo.ready ? nfo.video.title : ""
37 title: nfo.ready ? nfo.video.title : ""
36− url: item ? item.nfoUri.replace(/\.nfo$/, "-fanart.jpg") : ""
37 previewWidthRatio: 0.6
38 previewWidthRatio: 0.6
38− playable: fileUri != ""
39
39
40 onPreviewImageClicked: {
40 onPreviewImageClicked: {
41 if (playable) {
41 if (playable) {
@@ -64,7 +64,7 @@ DashPreview {
64 readonly property bool bigButton: parent.width > units.gu(40)
64 readonly property bool bigButton: parent.width > units.gu(40)
65 width: bigButton ? units.gu(8) : units.gu(4.5)
65 width: bigButton ? units.gu(8) : units.gu(4.5)
66 height: width
66 height: width
67− source: "graphics/play_button%1%2.png".arg(previewImageMouseArea.pressed ? "_active" : "").arg(bigButton ? "_big" : "")
67+ source: "../graphics/play_button%1%2.png".arg(previewImageMouseArea.pressed ? "_active" : "").arg(bigButton ? "_big" : "")
68 }
68 }
69
69
70 MouseArea {
70 MouseArea {