Merge lp:~mzanetti/reminders-app/notes-headers-to-trunk into lp:reminders-app

[Michael Zanetti]

cherry-picks notes-headers from new-design branch into trunk

[David Planella (dpm)]

82 + return createdDate.toString("MMMM yyyy");

Could we make this something along the lines of:

const QLocale l = QLocale::system();

return QString(gettext("%1 %2")).arg(l.standaloneMonthName(createdDate.month())).arg(createdDate.year());

The issue here is that the QDate formats don't work very well for all locales. So "MMMM" does not return the standalone month name in e.g. Catalan. I.e. instead of "gener" it returns "de gener" - the translation in English would be "January" vs. "of January"

review: Needs Fixing

[David Planella (dpm)]

Also, as per the IRC conversation, we'll need to wait for qtdeclarative5-quicklayouts-plugin to land in an image before this can land.

[David Planella (dpm)]

80 + return gettext("Two weeks ago");

It's just a nitpick, so I won't mark it as "Needs fixing", but for the sake of being pedantic :) Generally gettext calls are done using the _() macro in C, although I'm not sure what the general practice is for C++ code using it.

[lp:~mzanetti/reminders-app/notes-headers-to-trunk]

118. By Michael Zanetti on 2014-05-06

use QLocale to obtain the Month to work around some language corner cases

119. By Michael Zanetti on 2014-05-06

don't use QtQuick.Layouts just yet

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

PASSED: Continuous integration, rev:117
http://91.189.93.70:8080/job/reminders-app-ci/288/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2433
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-saucy-amd64-ci/288
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-trusty-amd64-ci/288

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

review: Approve (continuous-integration)

[David Planella (dpm)]

Looks good to me and works well, thanks for getting around the Layouts dependency!

review: Approve

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

PASSED: Continuous integration, rev:119
http://91.189.93.70:8080/job/reminders-app-ci/289/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2440
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-saucy-amd64-ci/289
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-trusty-amd64-ci/289

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

review: Approve (continuous-integration)

=== modified file 'src/app/qml/ui/NotesPage.qml'
--- src/app/qml/ui/NotesPage.qml	2014-04-30 21:53:07 +0000
+++ src/app/qml/ui/NotesPage.qml	2014-05-06 17:04:10 +0000
@@ -120,6 +120,26 @@
                 root.selectedNote = NotesStore.note(guid);
             }
         }
+
+        section.criteria: ViewSection.FullString
+        section.property: "createdString"
+        section.delegate: Empty {
+            height: units.gu(5)
+            Item {
+                anchors { left: parent.left; right: parent.right; verticalCenter: parent.verticalCenter; margins: units.gu(1) }
+                Label {
+                    text: section
+                    anchors.left: parent.left
+                    anchors.verticalCenter: parent.verticalCenter
+                }
+                Label {
+                    text: "(" + notes.sectionCount("createdString", section) + ")"
+                    anchors.right: parent.right
+                    anchors.verticalCenter: parent.verticalCenter
+                }
+            }
+        }
+
         ActivityIndicator {
             anchors.centerIn: parent
             running: notes.loading

=== modified file 'src/plugin/Evernote/note.cpp'
--- src/plugin/Evernote/note.cpp	2014-04-30 16:52:15 +0000
+++ src/plugin/Evernote/note.cpp	2014-05-06 17:04:10 +0000
@@ -22,6 +22,8 @@
 
 #include "notesstore.h"
 
+#include <libintl.h>
+
 #include <QDateTime>
 #include <QUrl>
 #include <QUrlQuery>
@@ -72,6 +74,26 @@
     return m_created;
 }
 
+QString Note::createdString() const
+{
+    QDate createdDate = m_created.date();
+    QDate today = QDate::currentDate();
+    if (createdDate == today) {
+        return gettext("Today");
+    }
+    if (createdDate == today.addDays(-1)) {
+        return gettext("Yesterday");
+    }
+    if (createdDate >= today.addDays(-7)) {
+        return gettext("Last week");
+    }
+    if (createdDate >= today.addDays(-14)) {
+        return gettext("Two weeks ago");
+    }
+
+    return QString(gettext("%1 %2")).arg(QLocale::system().standaloneMonthName(createdDate.month())).arg(createdDate.year());
+}
+
 QString Note::title() const
 {
     return m_title;
@@ -204,21 +226,21 @@
     QDate reminderDate = m_reminderTime.date();
     QDate today = QDate::currentDate();
     if (reminderDate < today) {
-        return QStringLiteral("Overdue");
+        return gettext("Overdue");
     }
     if (reminderDate == today) {
-        return QStringLiteral("Today");
+        return gettext("Today");
     }
     if (reminderDate == today.addDays(1)) {
-        return QStringLiteral("Tomorrow");
+        return gettext("Tomorrow");
     }
     if (reminderDate <= today.addDays(7)) {
-        return QStringLiteral("Next week");
+        return gettext("Next week");
     }
     if (reminderDate <= today.addDays(14)) {
-        return QStringLiteral("In two weeks");
+        return gettext("In two weeks");
     }
-    return QStringLiteral("Later");
+    return gettext("Later");
 }
 
 QDateTime Note::reminderDoneTime() const

=== modified file 'src/plugin/Evernote/note.h'
--- src/plugin/Evernote/note.h	2014-04-30 16:52:15 +0000
+++ src/plugin/Evernote/note.h	2014-05-06 17:04:10 +0000
@@ -38,6 +38,7 @@
     Q_PROPERTY(QString guid READ guid CONSTANT)
     Q_PROPERTY(QString notebookGuid READ notebookGuid WRITE setNotebookGuid NOTIFY notebookGuidChanged)
     Q_PROPERTY(QDateTime created READ created CONSTANT)
+    Q_PROPERTY(QString createdString READ createdString CONSTANT)
     Q_PROPERTY(QString title READ title WRITE setTitle NOTIFY titleChanged)
     Q_PROPERTY(QString htmlContent READ htmlContent NOTIFY contentChanged)
     Q_PROPERTY(QString richTextContent READ richTextContent WRITE setRichTextContent NOTIFY contentChanged)
@@ -68,6 +69,7 @@
     void setNotebookGuid(const QString &notebookGuid);
 
     QDateTime created() const;
+    QString createdString() const;
 
     QString title() const;
     void setTitle(const QString &title);

=== modified file 'src/plugin/Evernote/notes.cpp'
--- src/plugin/Evernote/notes.cpp	2014-04-30 21:53:07 +0000
+++ src/plugin/Evernote/notes.cpp	2014-05-06 17:04:10 +0000
@@ -98,6 +98,20 @@
     return NotesStore::instance()->note(guid);
 }
 
+int Notes::sectionCount(const QString &sectionRole, const QString &section)
+{
+    NotesStore::Role role = (NotesStore::Role)roleNames().key(sectionRole.toLatin1());
+    int count = 0;
+    for (int i = 0; i < rowCount(); i++) {
+        QString itemSection;
+        itemSection = data(index(i, 0), role).toString();
+        if (section == itemSection) {
+            count++;
+        }
+    }
+    return count;
+}
+
 bool Notes::filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const
 {
     QModelIndex sourceIndex = sourceModel()->index(sourceRow, 0, sourceParent);

=== modified file 'src/plugin/Evernote/notes.h'
--- src/plugin/Evernote/notes.h	2014-04-30 21:53:07 +0000
+++ src/plugin/Evernote/notes.h	2014-05-06 17:04:10 +0000
@@ -51,6 +51,8 @@
 
     Q_INVOKABLE Note* note(const QString &guid);
 
+    Q_INVOKABLE int sectionCount(const QString &sectionRole, const QString &section);
+
 protected:
     bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const;
 

=== modified file 'src/plugin/Evernote/notesstore.cpp'
--- src/plugin/Evernote/notesstore.cpp	2014-04-30 21:53:07 +0000
+++ src/plugin/Evernote/notesstore.cpp	2014-05-06 17:04:10 +0000
@@ -97,6 +97,8 @@
         return m_notes.at(index.row())->notebookGuid();
     case RoleCreated:
         return m_notes.at(index.row())->created();
+    case RoleCreatedString:
+        return m_notes.at(index.row())->createdString();
     case RoleTitle:
         return m_notes.at(index.row())->title();
     case RoleReminder:
@@ -129,6 +131,7 @@
     roles.insert(RoleGuid, "guid");
     roles.insert(RoleNotebookGuid, "notebookGuid");
     roles.insert(RoleCreated, "created");
+    roles.insert(RoleCreatedString, "createdString");
     roles.insert(RoleTitle, "title");
     roles.insert(RoleReminder, "reminder");
     roles.insert(RoleReminderTime, "reminderTime");

=== modified file 'src/plugin/Evernote/notesstore.h'
--- src/plugin/Evernote/notesstore.h	2014-04-30 21:53:07 +0000
+++ src/plugin/Evernote/notesstore.h	2014-05-06 17:04:10 +0000
@@ -53,10 +53,11 @@
     Q_PROPERTY(QString notebooksError READ notebooksError NOTIFY notebooksErrorChanged)
 
 public:
-    enum Roles {
+    enum Role {
         RoleGuid,
         RoleNotebookGuid,
         RoleCreated,
+        RoleCreatedString,
         RoleTitle,
         RoleReminder,
         RoleReminderTime,