git.iko.soy/unity8
on xenial help sign in
remerge
978269dAlbert Astals Cid
qml/Dash/Previews/PreviewAudioPlayback.qml+1
compare with xenial
unifiedsplit
@@ -141,6 +141,7 @@ PreviewWidget {
141 opacity: 0.9
141 opacity: 0.9
142 color: scopeStyle ? scopeStyle.foreground : theme.palette.normal.baseText
142 color: scopeStyle ? scopeStyle.foreground : theme.palette.normal.baseText
143 fontSize: "small"
143 fontSize: "small"
144+ font.weight: Font.Light
144 horizontalAlignment: Text.AlignRight
145 horizontalAlignment: Text.AlignRight
145 text: DashAudioPlayer.lengthToString(modelData["length"])
146 text: DashAudioPlayer.lengthToString(modelData["length"])
146 }
147 }
qml/Dash/Previews/PreviewRatingSingleDisplay.qml+11−11
@@ -30,6 +30,16 @@ Column {
30 property alias urlIconHalf: ratingItem.urlIconHalf
30 property alias urlIconHalf: ratingItem.urlIconHalf
31 property alias labelColor: authorLabel.color
31 property alias labelColor: authorLabel.color
32
32
33+ Label {
34+ id: authorLabel
35+ objectName: "authorLabel"
36+ anchors { left: parent.left; right: parent.right }
37+ opacity: .8
38+ fontSize: "small"
39+ visible: text !== ""
40+ wrapMode: Text.Wrap
41+ }
42+
33 Rating {
43 Rating {
34 id: ratingItem
44 id: ratingItem
35 objectName: "rating"
45 objectName: "rating"
@@ -42,23 +52,13 @@ Column {
42 property var urlIconHalf
52 property var urlIconHalf
43 }
53 }
44
54
45− Label {
46− id: authorLabel
47− objectName: "authorLabel"
48− anchors { left: parent.left; right: parent.right }
49− opacity: .8
50− font.size: "small"
51− visible: text !== ""
52− wrapMode: Text.Wrap
53− }
54−
55 Label {
55 Label {
56 id: reviewLabel
56 id: reviewLabel
57 objectName: "reviewLabel"
57 objectName: "reviewLabel"
58 anchors { left: parent.left; right: parent.right }
58 anchors { left: parent.left; right: parent.right }
59 color: authorLabel.color
59 color: authorLabel.color
60 opacity: .8
60 opacity: .8
61− font.size: "x-small"
61+ fontSize: "x-small"
62 font.weight: Font.Light
62 font.weight: Font.Light
63 visible: text !== ""
63 visible: text !== ""
64 wrapMode: Text.Wrap
64 wrapMode: Text.Wrap
qml/Dash/Previews/PreviewTextSummary.qml+3−2
@@ -57,14 +57,15 @@ PreviewWidget {
57 left: parent.left
57 left: parent.left
58 right: parent.right
58 right: parent.right
59 top: titleLabel.visible ? titleLabel.bottom : parent.top
59 top: titleLabel.visible ? titleLabel.bottom : parent.top
60− topMargin: units.gu(1.5)
60+ topMargin: titleLabel.visible && visible ? units.gu(1.5) : 0
61 }
61 }
62− height: (lineCount <= maximumCollapsedLineCount || root.expanded) ? contentHeight : contentHeight / lineCount * maximumCollapsedLineCount
62+ height: visible ? (lineCount <= maximumCollapsedLineCount || root.expanded) ? contentHeight : contentHeight / lineCount * maximumCollapsedLineCount : 0
63 clip: true
63 clip: true
64 fontSize: "medium"
64 fontSize: "medium"
65 font.weight: Font.Light
65 font.weight: Font.Light
66 lineHeight: 1.2
66 lineHeight: 1.2
67 color: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText
67 color: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText
68+ visible: text !== ""
68 opacity: .8
69 opacity: .8
69 text: widgetData["text"] || ""
70 text: widgetData["text"] || ""
70 wrapMode: Text.Wrap
71 wrapMode: Text.Wrap