Merge lp:~nik90/ubuntu-clock-app/fix-empty-state-wrap into lp:ubuntu-clock-app

[Nekhelesh Ramananthan]

Fixed the empty state message not wrapping correctly.

Fixes the empty state message not wrapping correctly. Tested with a really long string as shown in http://imgur.com/U41ixrZ

[lp:~nik90/ubuntu-clock-app/fix-empty-state-wrap]

208. By Nekhelesh Ramananthan on 2015-03-05

Updated debian changelog

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

PASSED: Continuous integration, rev:208
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/621/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2252
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2252/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/621/rebuild

review: Approve (continuous-integration)

[Niklas Wenzel (nikwen)]

Looks fine to me. I just have one suggestion which I've added to the diff.
That being said, I'll happily approve this if you apply that small change. :)

review: Needs Fixing

[lp:~nik90/ubuntu-clock-app/fix-empty-state-wrap]

209. By Nekhelesh Ramananthan on 2015-03-05

Also ensured empty state title wraps if required

[Nekhelesh Ramananthan (nik90)]

> Looks fine to me. I just have one suggestion which I've added to the diff.
> That being said, I'll happily approve this if you apply that small change. :)

Thanks for the review. Originally I chose not to put wrapMode for title since it is supposed to be short and discourage 3rd party devs from making it too long. But I guess when you translate it, there is the chance it could need more space.

[Niklas Wenzel (nikwen)]

You never know what us translators come up with. :D

But thank you for fixing that now. Shall I do a top-level approve as well?

review: Approve

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

PASSED: Continuous integration, rev:209
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/622/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2253
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2253/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/622/rebuild

review: Approve (continuous-integration)

[Nekhelesh Ramananthan (nik90)]

Yeah sure go ahead ;)

[Niklas Wenzel (nikwen)]

Thanks again. :)

=== modified file 'app/alarm/AlarmPage.qml'
--- app/alarm/AlarmPage.qml	2014-10-28 10:54:45 +0000
+++ app/alarm/AlarmPage.qml	2015-03-05 15:54:04 +0000
@@ -140,7 +140,12 @@
 
     Loader {
         id: emptyStateLoader
-        anchors.centerIn: parent
+        anchors {
+            left: parent.left
+            right: parent.right
+            margins: units.gu(2)
+            verticalCenter: parent.verticalCenter
+        }
         active: alarmModel ? alarmModel.count === 0 : true
         Component.onCompleted: {
             setSource(Qt.resolvedUrl("../components/EmptyState.qml"),

=== modified file 'app/components/EmptyState.qml'
--- app/components/EmptyState.qml	2014-10-16 14:24:25 +0000
+++ app/components/EmptyState.qml	2015-03-05 15:54:04 +0000
@@ -33,6 +33,7 @@
     property alias subTitle: emptySublabel.text
 
     height: childrenRect.height
+    width: parent.width
 
     Icon {
         id: emptyIcon
@@ -44,16 +45,20 @@
 
     Label {
         id: emptyLabel
+        fontSize: "large"
+        font.bold: true
+        width: parent.width
+        wrapMode: Text.WordWrap
         anchors.top: emptyIcon.bottom
         anchors.topMargin: units.gu(5)
-        anchors.horizontalCenter: parent.horizontalCenter
-        fontSize: "large"
-        font.bold: true
+        horizontalAlignment: Text.AlignHCenter
     }
 
     Label {
         id: emptySublabel
+        width: parent.width
+        wrapMode: Text.WordWrap
         anchors.top: emptyLabel.bottom
-        anchors.horizontalCenter: parent.horizontalCenter
+        horizontalAlignment: Text.AlignHCenter
     }
 }

=== modified file 'debian/changelog'
--- debian/changelog	2015-02-26 21:21:41 +0000
+++ debian/changelog	2015-03-05 15:54:04 +0000
@@ -9,6 +9,7 @@
   * Fixed Day-of-Week picker in alarms not respecting user locale (LP: #1372545)
   * Fixed predefined cities and countries not being translatable in the timezone
     selection dialog (LP: #1354466)
+  * Fixed empty state description not wrapping (LP: #1428165)
 
   [Brendan Donegan]
   * Fixed AP failure by waiting for the bottom edge tip visible property to be true

=== modified file 'po/com.ubuntu.clock.pot'
--- po/com.ubuntu.clock.pot	2015-02-27 12:15:58 +0000
+++ po/com.ubuntu.clock.pot	2015-03-05 15:54:04 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-27 13:15+0100\n"
+"POT-Creation-Date: 2015-03-05 13:52+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -48,11 +48,11 @@
 msgid "Select All"
 msgstr ""
 
-#: ../app/alarm/AlarmPage.qml:149
+#: ../app/alarm/AlarmPage.qml:154
 msgid "No saved alarms"
 msgstr ""
 
-#: ../app/alarm/AlarmPage.qml:150
+#: ../app/alarm/AlarmPage.qml:155
 msgid "Tap the + icon to add an alarm"
 msgstr ""