Merge lp:~vthompson/music-app/fix-1416115 into lp:music-app/remix

[Victor Thompson]

* Make stroked buttons elide text

* Make stroked buttons elide text

To test, either change the displayed text for the top 2 buttons in common/SongsPage.qml and common/AlbumsPage.qml, or change your device's language to German to witness the elide on the middle button.

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

PASSED: Continuous integration, rev:820
http://91.189.93.70:8080/job/music-app-ci/1267/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-vivid/895
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/895/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-vivid-amd64-ci/119

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

review: Approve (continuous-integration)

[Andrew Hayzen (ahayzen)]

Allows the buttons in the 'header' of the listview to elide for both AlbumsPage and SongPage :)

review: Approve

=== modified file 'common/AlbumsPage.qml'
--- common/AlbumsPage.qml	2015-01-28 02:32:24 +0000
+++ common/AlbumsPage.qml	2015-01-30 01:25:53 +0000
@@ -60,8 +60,13 @@
                             centerIn: parent
                         }
                         color: "white"
+                        elide: Text.ElideRight
+                        height: parent.height
+                        horizontalAlignment: Text.AlignHCenter
                         // TRANSLATORS: this appears in a button with limited space (around 14 characters)
                         text: i18n.tr("Shuffle")
+                        verticalAlignment: Text.AlignVCenter
+                        width: parent.width - units.gu(2)
                     }
                     onClicked: shuffleModel(songArtistModel)
                 }
@@ -75,8 +80,13 @@
                             centerIn: parent
                         }
                         color: "white"
+                        elide: Text.ElideRight
+                        height: parent.height
+                        horizontalAlignment: Text.AlignHCenter
                         // TRANSLATORS: this appears in a button with limited space (around 14 characters)
                         text: i18n.tr("Queue all")
+                        verticalAlignment: Text.AlignVCenter
+                        width: parent.width - units.gu(2)
                     }
                     onClicked: addQueueFromModel(songArtistModel)
                 }
 
=== modified file 'common/SongsPage.qml'
--- common/SongsPage.qml	2015-01-28 02:27:52 +0000
+++ common/SongsPage.qml	2015-01-30 01:25:53 +0000
@@ -308,8 +308,13 @@
                             centerIn: parent
                         }
                         color: "white"
+                        elide: Text.ElideRight
+                        height: parent.height
+                        horizontalAlignment: Text.AlignHCenter
                         // TRANSLATORS: this appears in a button with limited space (around 14 characters)
                         text: i18n.tr("Shuffle")
+                        verticalAlignment: Text.AlignVCenter
+                        width: parent.width - units.gu(2)
                     }
                     onClicked: {
                         shuffleModel(albumtrackslist.model)  // play track
@@ -335,8 +340,13 @@
                             centerIn: parent
                         }
                         color: "white"
+                        elide: Text.ElideRight
+                        height: parent.height
+                        horizontalAlignment: Text.AlignHCenter
                         // TRANSLATORS: this appears in a button with limited space (around 14 characters)
                         text: i18n.tr("Queue all")
+                        verticalAlignment: Text.AlignVCenter
+                        width: parent.width - units.gu(2)
                     }
                     onClicked: addQueueFromModel(albumtrackslist.model)
                 }