Merge lp:~mzanetti/reminders-app/fix-label-wrapping into lp:reminders-app

[Michael Zanetti]

fix label growing out of place

[lp:~mzanetti/reminders-app/fix-label-wrapping]

474. By Michael Zanetti on 2015-07-25

also fix the remindersdelegate

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

PASSED: Continuous integration, rev:473
http://91.189.93.70:8080/job/reminders-app-ci/771/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/3125
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/3125/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-ci/373
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-vivid-amd64-ci/193

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/771/rebuild

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:474
http://91.189.93.70:8080/job/reminders-app-ci/772/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/3126
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/3126/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-ci/374
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-vivid-amd64-ci/194

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/772/rebuild

review: Approve (continuous-integration)

[Riccardo Padovani (rpadovani)]

lgtm

review: Approve

=== modified file 'src/app/qml/components/NotesDelegate.qml'
--- src/app/qml/components/NotesDelegate.qml	2015-06-14 23:34:29 +0000
+++ src/app/qml/components/NotesDelegate.qml	2015-07-25 02:42:13 +0000
@@ -137,7 +137,7 @@
                                 text: "<font color=\"" + root.notebookColor + "\">" +
                                     Qt.formatDateTime(root.date, Qt.LocalDate) +
                                     " </font>" + root.content.replace("\n", " ").trim()
-                                wrapMode: Text.WordWrap
+                                wrapMode: Text.WrapAtWordBoundaryOrAnywhere
                                 textFormat: Text.StyledText
                                 maximumLineCount: 2
                                 fontSize: "small"
 
=== modified file 'src/app/qml/components/RemindersDelegate.qml'
--- src/app/qml/components/RemindersDelegate.qml	2015-03-15 20:00:21 +0000
+++ src/app/qml/components/RemindersDelegate.qml	2015-07-25 02:42:13 +0000
@@ -109,13 +109,13 @@
             }
 
             Label {
-                text: note.tagline
+                text: note.tagline.replace("\n", " ").trim()
                 fontSize: "small"
                 horizontalAlignment: Text.AlignLeft
                 Layout.fillWidth: true
                 maximumLineCount: 2
                 width: parent.width
-                wrapMode: Text.WordWrap
+                wrapMode: Text.WrapAtWordBoundaryOrAnywhere
                 color: "black"
             }
         }