Merge lp:~vthompson/music-app/shorten-empty-queue-msg-1357625 into lp:music-app/trusty

[Victor Thompson]

* Fix empty queue message length
* Wrap text for empty queue message

This MP changes the empty queue message to simply "Tap play to shuffle music". It also allows this text to wrap to 2 lines.

[Victor Thompson (vthompson)]

This is what my assumed Spanish translation looks like: http://i.imgur.com/V8mXrTm.png

*Note the translation could be bad, but it shows the text wrapping to 2 lines.

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

PASSED: Continuous integration, rev:575
http://91.189.93.70:8080/job/music-app-ci/1029/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1570
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1570/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-utopic-amd64-ci/253

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

review: Approve (continuous-integration)

[Andrew Hayzen (ahayzen)]

Looks good to me, assuming the Spanish translation is as you have assumed :)

review: Approve

=== modified file 'MusicToolbar.qml'
--- MusicToolbar.qml	2014-08-13 20:57:09 +0000
+++ MusicToolbar.qml	2014-08-16 17:22:25 +0000
@@ -750,21 +750,17 @@
 
                     Label {
                         id: noSongsInQueueLabel
-                        anchors.left: parent.left
-                        anchors.margins: units.gu(1)
-                        anchors.top: parent.top
+                        anchors {
+                            left: parent.left
+                            right: disabledPlayerControlsPlayButton.left
+                            margins: units.gu(1)
+                            top: parent.top
+                        }
                         color: styleMusic.playerControls.labelColor
-                        text: i18n.tr("No songs queued")
+                        text: i18n.tr("Tap play to shuffle music")
                         fontSize: "large"
-                    }
-
-                    Label {
-                        id: tabToStartPlayingLabel
-                        color: styleMusic.playerControls.labelColor
-                        anchors.left: parent.left
-                        anchors.margins: units.gu(1)
-                        anchors.top: noSongsInQueueLabel.bottom
-                        text: i18n.tr("Tap play or any item to start")
+                        wrapMode: Text.WordWrap
+                        maximumLineCount: 2
                     }
 
                     Rectangle {

=== modified file 'po/com.ubuntu.music.pot'
--- po/com.ubuntu.music.pot	2014-08-16 03:11:50 +0000
+++ po/com.ubuntu.music.pot	2014-08-16 17:22:25 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: music-app\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-15 22:10-0500\n"
+"POT-Creation-Date: 2014-08-16 12:07-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -125,7 +125,10 @@
 msgid "Cancel"
 msgstr ""
 
-#: ../MusicPlaylists.qml:161 ../MusicStart.qml:202
+#: ../MusicPlaylists.qml:158 ../MusicPlaylists.qml:161 ../MusicStart.qml:120
+#: ../MusicStart.qml:202 ../common/SongsPage.qml:165
+#: ../common/SongsPage.qml:223 ../common/SongsPage.qml:225
+#: ../common/SongsPage.qml:243
 msgid "Playlist"
 msgstr ""
 
@@ -237,16 +240,13 @@
 msgid "Genres"
 msgstr ""
 
-#: ../MusicStart.qml:312
+#: ../MusicStart.qml:310 ../MusicStart.qml:312 ../common/SongsPage.qml:122
+#: ../common/SongsPage.qml:161 ../common/SongsPage.qml:239
 msgid "Genre"
 msgstr ""
 
-#: ../MusicToolbar.qml:757
-msgid "No songs queued"
-msgstr ""
-
-#: ../MusicToolbar.qml:767
-msgid "Tap play or any item to start"
+#: ../MusicToolbar.qml:760
+msgid "Tap play to shuffle music"
 msgstr ""
 
 #: ../MusicTracks.qml:35