Merge lp:~rpadovani/reminders-app/1382176 into lp:reminders-app

[Riccardo Padovani]

Fixed #1382176 - Tags overlap the date in the notes list

Fixed #1382176 - Tags overlap the date in the notes list

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

PASSED: Continuous integration, rev:317
http://91.189.93.70:8080/job/reminders-app-ci/628/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-vivid/243
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/243/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-vivid-amd64-ci/49

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

review: Approve (continuous-integration)

[Michael Zanetti (mzanetti)]

Not happy with this:

* Date format seems useless, shows the day twice, but the month and year not at all, while still taking a lot of space

* Label should use "elide" instead of wrapmode and maxlinecount...

Anyhow, I've merged this to the offline mode branch and tweaked it

review: Disapprove

Unmerged revisions

=== modified file 'src/app/qml/components/NotesDelegate.qml'
--- src/app/qml/components/NotesDelegate.qml	2014-10-24 17:50:27 +0000
+++ src/app/qml/components/NotesDelegate.qml	2014-11-17 10:21:49 +0000
@@ -84,7 +84,11 @@
                             Label {
                                 Layout.fillWidth: true
                                 Layout.fillHeight: true
-                                text: root.content
+                                // TRANSLATORS: the argument is a modification date that follows this format:
+                                // http://qt-project.org/doc/qt-5/qml-qtqml-date.html
+                                text: "<font color=\"" + root.notebookColor + "\">" +
+                                    Qt.formatDateTime(root.creationDate, i18n.tr("ddd, d hh:mm")) +
+                                    " </font>" + root.content
                                 wrapMode: Text.WordWrap
                                 textFormat: Text.StyledText
                                 maximumLineCount: 2
@@ -92,23 +96,13 @@
                                 color: "black"
                             }
 
-                            RowLayout {
+                            Label {
                                 Layout.fillWidth: true
-                                Label {
-                                    Layout.fillWidth: true
-                                    text: root.tags
-                                    fontSize: "small"
-                                    color: "#b3b3b3"
-
-                                }
-                                Label {
-                                    // TRANSLATORS: the argument is a modification date that follows this format:
-                                    // http://qt-project.org/doc/qt-5/qml-qtqml-date.html
-                                    text: Qt.formatDateTime(root.creationDate, i18n.tr("dddd, d hh:mm"))
-                                    color: "#b3b3b3"
-                                    fontSize: "small"
-                                    horizontalAlignment: Text.AlignRight
-                                }
+                                text: root.tags
+                                wrapMode: Text.WordWrap
+                                maximumLineCount: 1
+                                fontSize: "small"
+                                color: "#b3b3b3"
                             }
                         }
                     }