git.iko.soy/unity8
on xenial help sign in
Added artist label
3ca7520Andrea Cimitan
qml/Dash/Previews/AudioPlayer.qml+36−10
compare with xenial
unifiedsplit
@@ -99,18 +99,44 @@ Item {
99 }
99 }
100 }
100 }
101
101
102− Label {
102+ Item {
103− objectName: "trackTitleLabel"
104− fontSize: "small"
105− opacity: 0.9
106− color: "white"
107− horizontalAlignment: Text.AlignLeft
108 anchors.verticalCenter: parent.verticalCenter
103 anchors.verticalCenter: parent.verticalCenter
109 width: parent.column2Width
104 width: parent.column2Width
105+ height: trackArtistLabel.visible ? trackTitleLabel.height + trackArtistLabel.height : trackTitleLabel.height
106+
107+ Label {
108+ id: trackTitleLabel
109+ objectName: "trackTitleLabel"
110+ anchors.top: parent.top
111+ anchors.left: parent.left
112+ anchors.right: parent.right
113+ fontSize: "small"
114+ opacity: 0.9
115+ color: "white"
116+ horizontalAlignment: Text.AlignLeft
110− text: modelData["title"]
117+ text: modelData["title"]
118+ style: Text.Raised
119+ styleColor: "black"
120+ elide: Text.ElideRight
121+ }
122+
123+ Label {
124+ id: trackArtistLabel
125+ objectName: "trackArtistLabel"
126+ fontSize: "small"
127+ opacity: 0.9
128+ color: "white"
129+ horizontalAlignment: Text.AlignLeft
130+ anchors.top: trackTitleLabel.bottom
131+ anchors.left: parent.left
132+ anchors.right: parent.right
133+ width: parent.column2Width
134+ text: modelData["artist"]
111− style: Text.Raised
135+ style: Text.Raised
112− styleColor: "black"
136+ styleColor: "black"
113− elide: Text.ElideRight
137+ elide: Text.ElideRight
138+ visible: modelData["artist"] !== undefined
139+ }
114
140
115 UbuntuShape {
141 UbuntuShape {
116 id: progressBarFill
142 id: progressBarFill
tests/qmltests/Dash/Previews/tst_AudioPlayer.qml+1−1
@@ -36,7 +36,7 @@ Rectangle {
36
36
37 property var tracksModel2: [
37 property var tracksModel2: [
38 { title: "Some track name", length: "30", source: "../../tests/qmltests/Dash/Music/data/testsound1.ogg" },
38 { title: "Some track name", length: "30", source: "../../tests/qmltests/Dash/Music/data/testsound1.ogg" },
39− { title: "Some other track name", length: "83", source: "../../tests/qmltests/Dash/Music/data/testsound2.ogg" },
39+ { title: "Some other track name", artist: "Artist name", length: "83", source: "../../tests/qmltests/Dash/Music/data/testsound2.ogg" },
40 { title: "And another one", length: "7425", source: "../../tests/qmltests/Dash/Music/data/testsound3.ogg" }
40 { title: "And another one", length: "7425", source: "../../tests/qmltests/Dash/Music/data/testsound3.ogg" }
41 ]
41 ]
42
42