Merge lp:~vthompson/music-app/wrap-empty-state-text into lp:music-app/remix

[Victor Thompson]

* Wrap text used in empty states.
* Add spacing between Labels in the Column.

This change wraps the text used in the empty states. Translated text can sometimes be rather long, so each of these Labels should allow word wrapping.

[Victor Thompson (vthompson)]

This is what the change looks like in German: http://i.imgur.com/08Hds4n.png

I suggest we add spacing of around 2 GU to the column holding the labels though: http://i.imgur.com/gqQFyon.png

Andrew, could I get your opinion on the matter? :)

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

PASSED: Continuous integration, rev:767
http://91.189.93.70:8080/job/music-app-ci/1177/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-vivid/485
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/485/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-vivid-amd64-ci/29

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

review: Approve (continuous-integration)

[lp:~vthompson/music-app/wrap-empty-state-text]

768. By Victor Thompson on 2014-12-19

* Add spacing between Labels in the Column.

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

PASSED: Continuous integration, rev:768
http://91.189.93.70:8080/job/music-app-ci/1178/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-vivid/486
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/486/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-vivid-amd64-ci/30

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

review: Approve (continuous-integration)

[Andrew Hayzen (ahayzen)]

Looks good in various languages now :)

review: Approve

=== modified file 'music-app.qml'
--- music-app.qml	2014-12-17 02:11:48 +0000
+++ music-app.qml	2014-12-19 22:51:34 +0000
@@ -1109,20 +1109,30 @@
 
             Column {
                 anchors.centerIn: parent
+                spacing: units.gu(2)
+                width: parent.width
 
                 Label {
-                    anchors.horizontalCenter: parent.horizontalCenter
                     color: styleMusic.libraryEmpty.labelColor
+                    elide: Text.ElideRight
                     fontSize: "large"
                     font.bold: true
+                    horizontalAlignment: Text.AlignHCenter
+                    maximumLineCount: 2
                     text: i18n.tr("No music found")
+                    width: parent.width
+                    wrapMode: Text.WordWrap
                 }
 
                 Label {
-                    anchors.horizontalCenter: parent.horizontalCenter
                     color: styleMusic.libraryEmpty.labelColor
+                    elide: Text.ElideRight
                     fontSize: "medium"
+                    horizontalAlignment: Text.AlignHCenter
+                    maximumLineCount: 2
                     text: i18n.tr("Please import music")
+                    width: parent.width
+                    wrapMode: Text.WordWrap
                 }
             }
         }
@@ -1139,20 +1149,30 @@
 
             Column {
                 anchors.centerIn: parent
+                spacing: units.gu(2)
+                width: parent.width
 
                 Label {
-                    anchors.horizontalCenter: parent.horizontalCenter
                     color: styleMusic.libraryEmpty.labelColor
+                    elide: Text.ElideRight
                     fontSize: "large"
                     font.bold: true
+                    horizontalAlignment: Text.AlignHCenter
+                    maximumLineCount: 2
                     text: i18n.tr("No playlists found")
+                    width: parent.width
+                    wrapMode: Text.WordWrap
                 }
 
                 Label {
-                    anchors.horizontalCenter: parent.horizontalCenter
                     color: styleMusic.libraryEmpty.labelColor
+                    elide: Text.ElideRight
                     fontSize: "medium"
+                    horizontalAlignment: Text.AlignHCenter
+                    maximumLineCount: 2
                     text: i18n.tr("Click the + to create a playlist")
+                    width: parent.width
+                    wrapMode: Text.WordWrap
                 }
             }
         }
@@ -1169,20 +1189,30 @@
 
             Column {
                 anchors.centerIn: parent
+                spacing: units.gu(2)
+                width: parent.width
 
                 Label {
-                    anchors.horizontalCenter: parent.horizontalCenter
                     color: styleMusic.libraryEmpty.labelColor
+                    elide: Text.ElideRight
                     fontSize: "large"
                     font.bold: true
+                    horizontalAlignment: Text.AlignHCenter
+                    maximumLineCount: 2
                     text: i18n.tr("No recent albums or playlists found")
+                    width: parent.width
+                    wrapMode: Text.WordWrap
                 }
 
                 Label {
-                    anchors.horizontalCenter: parent.horizontalCenter
                     color: styleMusic.libraryEmpty.labelColor
+                    elide: Text.ElideRight
                     fontSize: "medium"
+                    horizontalAlignment: Text.AlignHCenter
+                    maximumLineCount: 2
                     text: i18n.tr("Play some music to see your favorites")
+                    width: parent.width
+                    wrapMode: Text.WordWrap
                 }
             }
         }