Merge lp:~vthompson/music-app/remix-songs-page-elide into lp:music-app/remix

[Victor Thompson]

* Fix elide in Songs Page header
* Fix elide in MusicRow for Songs Page items

This change fixes the elide on the Songs Page, which is a bit off at the moment.

Before:
http://i.imgur.com/5zqTLGn.png
http://i.imgur.com/Getf5Tp.png

After:
http://i.imgur.com/riIDA3A.png
http://i.imgur.com/41EeEjH.png

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:649
http://91.189.93.70:8080/job/music-app-remix-ci/27/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/698
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/698/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-remix-utopic-amd64-ci/27

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/music-app-remix-ci/27/rebuild

review: Approve (continuous-integration)

[Andrew Hayzen (ahayzen)]

LGTM :)

review: Approve

=== modified file 'common/MusicRow.qml'
--- common/MusicRow.qml	2014-10-02 00:49:08 +0000
+++ common/MusicRow.qml	2014-10-05 06:14:12 +0000
@@ -54,7 +54,8 @@
             top: parent.top
             topMargin: units.gu(1)
         }
-        width: parent.width - coverRow.width - parent.spacing
+        width: showCovers ? parent.width - coverRow.width - parent.spacing
+                          : parent.width - parent.spacing
 
         onSourceComponentChanged: {
             for (var i=0; i < item.children.length; i++) {
 
=== modified file 'common/SongsPage.qml'
--- common/SongsPage.qml	2014-10-04 01:41:50 +0000
+++ common/SongsPage.qml	2014-10-05 06:14:12 +0000
@@ -90,13 +90,15 @@
             Label {
                 id: albumLabel
                 wrapMode: Text.NoWrap
-                maximumLineCount: 2
+                maximumLineCount: 1
                 fontSize: "x-large"
                 color: styleMusic.common.music
                 anchors {
                     top: albumImage.bottom
                     topMargin: units.gu(1)
                     left: albumImage.left
+                    right: parent.right
+                    rightMargin: units.gu(2)
                 }
                 elide: Text.ElideRight
                 text: line2
@@ -115,6 +117,8 @@
                     top: albumLabel.bottom
                     topMargin: units.gu(0.75)
                     left: albumImage.left
+                    right: parent.right
+                    rightMargin: units.gu(2)
                 }
                 elide: Text.ElideRight
                 text: line1
@@ -131,6 +135,8 @@
                                              : albumLabel.bottom
                     topMargin: units.gu(1)
                     left: albumImage.left
+                    right: parent.right
+                    rightMargin: units.gu(2)
                 }
                 elide: Text.ElideRight
                 text: isAlbum && line1 !== i18n.tr("Genre") ? year + " | " + i18n.tr("%1 song", "%1 songs", albumtrackslist.count).arg(albumtrackslist.count)