Merge lp:~mzanetti/reminders-app/add-reminders into lp:reminders-app

[Michael Zanetti]

Add support for reminders

This adds support for reminders.

Also moves the QAbstractListModel logic into notesstore, so that Notes is just a stupid QSortFilterProxyModel. This additionally has the benefit that we can easily filter for notebookGuid or the reminder flag (and in the future for tags) and sort the model according to the note creation timestamp (or whatever we need in the future).

[lp:~mzanetti/reminders-app/add-reminders]

17. By Michael Zanetti on 2013-11-29

fix savenotejob to also store reminder stuff

18. By Michael Zanetti on 2013-11-29

delete note clone after savejob is done

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

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

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

review: Approve (continuous-integration)

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

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

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

review: Approve (continuous-integration)

[Jordan Keyes (jkeyes0)]

Maybe this is by design, but when you select a note from the Notes tab, then click the "Save" button (or make a change to the text and click "Save"), it adds a reminder to the note. I haven't noticed this behavior from other Evernote clients.
It appears this was added in src/plugin/Evernote/jobs/savenotejob.cpp, in void SaveNoteJob::startJob(), but my C++ is definitely a bit rusty.

Is this something that will need to be pulled out and put into a separate job for when a new reminder is created?

[Michael Zanetti (mzanetti)]

> Maybe this is by design, but when you select a note from the Notes tab, then
> click the "Save" button (or make a change to the text and click "Save"), it
> adds a reminder to the note. I haven't noticed this behavior from other
> Evernote clients.

No, this is a bug in my code. Thanks for finding!

> It appears this was added in src/plugin/Evernote/jobs/savenotejob.cpp, in void
> SaveNoteJob::startJob(), but my C++ is definitely a bit rusty.
>
> Is this something that will need to be pulled out and put into a separate job
> for when a new reminder is created?

Not really no, we just need initialize it with some sane defaults... I'll fix tonight.

Btw. feel free to put "Needs fixing" on my merges. If really unsure, mark it as "Needs information". I'm thankful for every found issue. After all that's what those merge requests are for.

[lp:~mzanetti/reminders-app/add-reminders]

19. By Michael Zanetti on 2013-12-12

fix reminder flag when saving notes

[Michael Zanetti (mzanetti)]

> Maybe this is by design, but when you select a note from the Notes tab, then
> click the "Save" button (or make a change to the text and click "Save"), it
> adds a reminder to the note. I haven't noticed this behavior from other
> Evernote clients.

fixed

[Jordan Keyes (jkeyes0)]

Looks good here.

review: Approve

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

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

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

review: Approve (continuous-integration)

=== modified file 'src/app/qml/ui/NotesPage.qml'
--- src/app/qml/ui/NotesPage.qml	2013-11-26 17:18:33 +0000
+++ src/app/qml/ui/NotesPage.qml	2013-12-12 21:36:37 +0000
@@ -28,8 +28,7 @@
 
     onActiveChanged: {
         if (active) {
-            print("refreshing notes")
-            notes.refresh();
+            NotesStore.refreshNotes();
         }
     }
 
@@ -59,7 +58,7 @@
             text: title
 
             onClicked: {
-                pageStack.push(Qt.resolvedUrl("NotePage.qml"), {note: notes.note(guid)})
+                pageStack.push(Qt.resolvedUrl("NotePage.qml"), {note: NotesStore.note(guid)})
             }
 
             onPressAndHold: {

=== modified file 'src/app/qml/ui/RemindersPage.qml'
--- src/app/qml/ui/RemindersPage.qml	2013-11-26 17:18:33 +0000
+++ src/app/qml/ui/RemindersPage.qml	2013-12-12 21:36:37 +0000
@@ -19,28 +19,27 @@
 import QtQuick 2.0
 import Ubuntu.Components 0.1
 import Ubuntu.Components.ListItems 0.1
-//import "../components"
+import Evernote 0.1
 
 Page {
     id: remindersPage
 
-    Label {
-        id: developmentWarning
-        anchors.centerIn: parent
-        text: i18n.tr("This page is still in development")
+    Notes {
+        id: notes
+        onlyReminders: true
     }
 
     ListView {
 
-        width: parent.width; height: parent.height
+        anchors.fill: parent
 
         delegate: Subtitled {
-            text: '<b>Name:</b> ' + model.name
-            subText: '<b>Date:</b> ' + model.date
+            text: '<b>Name:</b> ' + model.title
+            subText: '<b>Date:</b> ' + Qt.formatDateTime(model.created) +
+                     (model.reminderDone ? " - <b>Done:</b> " + Qt.formatDate(model.reminderDoneTime) : "")
         }
 
-//        model: RemindersModel {}
-
+        model: notes
     }
 
 }

=== modified file 'src/plugin/Evernote/jobs/evernotejob.cpp'
--- src/plugin/Evernote/jobs/evernotejob.cpp	2013-12-12 21:36:37 +0000
+++ src/plugin/Evernote/jobs/evernotejob.cpp	2013-12-12 21:36:37 +0000
@@ -48,7 +48,7 @@
 void EvernoteJob::run()
 {
     if (m_token.isEmpty()) {
-        qWarning() << "No token set. Cannot execute job.";
+        qWarning() << "No token set. Cannot execute job. (" << this->metaObject()->className() << ")";
         emitJobDone(EvernoteConnection::ErrorCodeUserException, QStringLiteral("No token set."));
         return;
     }

=== modified file 'src/plugin/Evernote/jobs/fetchnotesjob.cpp'
--- src/plugin/Evernote/jobs/fetchnotesjob.cpp	2013-12-12 21:36:37 +0000
+++ src/plugin/Evernote/jobs/fetchnotesjob.cpp	2013-12-12 21:36:37 +0000
@@ -22,6 +22,9 @@
 
 #include "notesstore.h"
 
+// evernote sdk
+#include "Limits_constants.h"
+
 #include <QDebug>
 
 FetchNotesJob::FetchNotesJob( const QString &filterNotebookGuid, QObject *parent) :
@@ -32,10 +35,10 @@
 
 void FetchNotesJob::startJob()
 {
-    qDebug() << "starting fetch notes job";
     // TODO: fix start/end (use smaller chunks and continue fetching if there are more notes available)
     int32_t start = 0;
-    int32_t end = 10000;
+    evernote::limits::LimitsConstants limits;
+    int32_t end = limits.EDAM_USER_NOTES_MAX;
 
     // Prepare filter
     evernote::edam::NoteFilter filter;
@@ -44,13 +47,20 @@
 
     // Prepare ResultSpec
     evernote::edam::NotesMetadataResultSpec resultSpec;
+
     resultSpec.includeNotebookGuid = true;
     resultSpec.__isset.includeNotebookGuid = true;
+
+    resultSpec.includeCreated = true;
+    resultSpec.__isset.includeCreated = true;
+
     resultSpec.includeTitle = true;
     resultSpec.__isset.includeTitle = true;
 
+    resultSpec.includeAttributes = true;
+    resultSpec.__isset.includeAttributes = true;
+
     client()->findNotesMetadata(m_results, token().toStdString(), filter, start, end, resultSpec);
-    qDebug() << "ending fetch notes job";
 }
 
 void FetchNotesJob::emitJobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage)

=== modified file 'src/plugin/Evernote/jobs/savenotejob.cpp'
--- src/plugin/Evernote/jobs/savenotejob.cpp	2013-12-12 21:36:37 +0000
+++ src/plugin/Evernote/jobs/savenotejob.cpp	2013-12-12 21:36:37 +0000
@@ -24,31 +24,40 @@
 #include <QDebug>
 
 SaveNoteJob::SaveNoteJob(Note *note, QObject *parent) :
-    NotesStoreJob(parent),
-    m_guid(note->guid()),
-    m_title(note->title()),
-    m_notebookGuid(note->notebookGuid()),
-    m_content(note->content())
+    NotesStoreJob(parent)
 {
+    // Need to clone it. As startJob() will run in another thread we can't access the real note from there.
+    m_note = note->clone();
+
+    // Make sure we delete the clone when done
+    m_note->setParent(this);
 }
 
 void SaveNoteJob::startJob()
 {
     evernote::edam::Note note;
-    note.guid = m_guid.toStdString();
+    note.guid = m_note->guid().toStdString();
     note.__isset.guid = true;
-    note.title = m_title.toStdString();
+    note.title = m_note->title().toStdString();
     note.__isset.title = true;
-    note.notebookGuid = m_notebookGuid.toStdString();
+    note.notebookGuid = m_note->notebookGuid().toStdString();
     note.__isset.notebookGuid = true;
-    note.content = m_content.toStdString();
+    note.content = m_note->content().toStdString();
     note.__isset.content = true;
-    note.contentLength = m_content.length();
-
-    client()->updateNote(m_note, token().toStdString(), note);
+    note.contentLength = m_note->content().length();
+
+    note.__isset.attributes = true;
+    note.attributes.reminderOrder = m_note->reminderOrder();
+    note.attributes.__isset.reminderOrder = true;
+    note.attributes.reminderTime = m_note->reminderTime().toMSecsSinceEpoch();
+    note.attributes.__isset.reminderTime = true;
+    note.attributes.reminderDoneTime = m_note->reminderDoneTime().toMSecsSinceEpoch();
+    note.attributes.__isset.reminderDoneTime = true;
+
+    client()->updateNote(m_resultNote, token().toStdString(), note);
 }
 
 void SaveNoteJob::emitJobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage)
 {
-    emit jobDone(errorCode, errorMessage, m_note);
+    emit jobDone(errorCode, errorMessage, m_resultNote);
 }

=== modified file 'src/plugin/Evernote/jobs/savenotejob.h'
--- src/plugin/Evernote/jobs/savenotejob.h	2013-12-12 21:36:37 +0000
+++ src/plugin/Evernote/jobs/savenotejob.h	2013-12-12 21:36:37 +0000
@@ -17,12 +17,8 @@
     void emitJobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage);
 
 private:
-    QString m_guid;
-    QString m_title;
-    QString m_notebookGuid;
-    QString m_content;
-
-    evernote::edam::Note m_note;
+    Note* m_note;
+    evernote::edam::Note m_resultNote;
 };
 
 #endif // SAVENOTEJOB_H

=== modified file 'src/plugin/Evernote/note.cpp'
--- src/plugin/Evernote/note.cpp	2013-12-12 21:36:37 +0000
+++ src/plugin/Evernote/note.cpp	2013-12-12 21:36:37 +0000
@@ -22,9 +22,12 @@
 
 #include "notesstore.h"
 
-Note::Note(const QString &guid, QObject *parent) :
+#include <QDateTime>
+
+Note::Note(const QString &guid, const QDateTime &created, QObject *parent) :
     QObject(parent),
-    m_guid(guid)
+    m_guid(guid),
+    m_created(created)
 {
 }
 
@@ -33,14 +36,6 @@
     return m_guid;
 }
 
-void Note::setGuid(const QString &guid)
-{
-    if (m_guid != guid) {
-        m_guid = guid;
-        emit guidChanged();
-    }
-}
-
 QString Note::notebookGuid() const
 {
     return m_notebookGuid;
@@ -54,6 +49,11 @@
     }
 }
 
+QDateTime Note::created() const
+{
+    return m_created;
+}
+
 QString Note::title() const
 {
     return m_title;
@@ -80,6 +80,86 @@
     }
 }
 
+bool Note::reminder() const
+{
+    return m_reminderOrder > 0;
+}
+
+void Note::setReminder(bool reminder)
+{
+    if (reminder && m_reminderOrder == 0) {
+        m_reminderOrder = QDateTime::currentMSecsSinceEpoch();
+        emit reminderChanged();
+    } else if (!reminder && m_reminderOrder > 0) {
+        m_reminderOrder = 0;
+        emit reminderChanged();
+    }
+}
+
+qint64 Note::reminderOrder() const
+{
+    return m_reminderOrder;
+}
+
+void Note::setReminderOrder(qint64 reminderOrder)
+{
+    if (m_reminderOrder != reminderOrder) {
+        m_reminderOrder = reminderOrder;
+        emit reminderChanged();
+    }
+}
+
+QDateTime Note::reminderTime() const
+{
+    return m_reminderTime;
+}
+
+void Note::setReminderTime(const QDateTime &reminderTime)
+{
+    if (m_reminderTime != reminderTime) {
+        m_reminderTime = reminderTime;
+        emit reminderTimeChanged();
+    }
+}
+
+bool Note::reminderDone() const
+{
+    return !m_reminderDoneTime.isNull();
+}
+
+void Note::setReminderDone(bool reminderDone)
+{
+    if (reminderDone && m_reminderDoneTime.isNull()) {
+        m_reminderDoneTime = QDateTime::currentDateTime();
+        emit reminderDoneChanged();
+    }
+}
+
+QDateTime Note::reminderDoneTime() const
+{
+    return m_reminderDoneTime;
+}
+
+void Note::setReminderDoneTime(const QDateTime &reminderDoneTime)
+{
+    if (m_reminderDoneTime != reminderDoneTime) {
+        m_reminderDoneTime = reminderDoneTime;
+        emit reminderDoneChanged();
+    }
+}
+
+Note *Note::clone()
+{
+    Note *note = new Note(m_guid, m_created);
+    note->setNotebookGuid(m_notebookGuid);
+    note->setTitle(m_title);
+    note->setContent(m_content);
+    note->setReminderOrder(m_reminderOrder);
+    note->setReminderTime(m_reminderTime);
+    note->setReminderDoneTime(m_reminderDoneTime);
+    return note;
+}
+
 void Note::save()
 {
     NotesStore::instance()->saveNote(m_guid);

=== modified file 'src/plugin/Evernote/note.h'
--- src/plugin/Evernote/note.h	2013-11-25 00:49:48 +0000
+++ src/plugin/Evernote/note.h	2013-12-12 21:36:37 +0000
@@ -2,45 +2,85 @@
 #define NOTE_H
 
 #include <QObject>
+#include <QDateTime>
+#include <QStringList>
 
 class Note : public QObject
 {
     Q_OBJECT
 
-    Q_PROPERTY(QString guid READ guid NOTIFY guidChanged)
+    // Don't forget to update clone() if you add properties!
+    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 title READ title WRITE setTitle NOTIFY titleChanged)
     Q_PROPERTY(QString content READ content WRITE setContent NOTIFY contentChanged)
+    Q_PROPERTY(bool reminder READ reminder WRITE setReminder NOTIFY reminderChanged)
+    Q_PROPERTY(QDateTime reminderTime READ reminderTime WRITE setReminderTime NOTIFY reminderTimeChanged)
+    Q_PROPERTY(bool reminderDone READ reminderDone WRITE setReminderDone NOTIFY reminderDoneChanged)
+    Q_PROPERTY(QDateTime reminderDoneTime READ reminderDoneTime WRITE setReminderDoneTime NOTIFY reminderDoneChanged)
+    // Don't forget to update clone() if you add properties!
+
 public:
-    explicit Note(const QString &guid = QString(), QObject *parent = 0);
+    explicit Note(const QString &guid, const QDateTime &created, QObject *parent = 0);
 
     QString guid() const;
-    void setGuid(const QString &guid);
 
     QString notebookGuid() const;
     void setNotebookGuid(const QString &notebookGuid);
 
+    QDateTime created() const;
+
     QString title() const;
     void setTitle(const QString &title);
 
     QString content() const;
     void setContent(const QString &content);
 
+    // This is the QML representation as we don't want to deal with timestamps there.
+    // setting it to false will reset the reminderOrder to 0, setting it to true will
+    // create a new timestamp for it.
+    bool reminder() const;
+    void setReminder(bool reminder);
+
+    qint64 reminderOrder() const;
+    void setReminderOrder(qint64 reminderOrder);
+
+    QDateTime reminderTime() const;
+    void setReminderTime(const QDateTime &reminderTime);
+
+    // This is the QML representation as we don't want to deal with timestamps there.
+    // setting it to false will reset reminderDoneTime to 0, setting it to true will
+    // create a new timestamp for it.
+    bool reminderDone() const;
+    void setReminderDone(bool reminderDone);
+
+    QDateTime reminderDoneTime() const;
+    void setReminderDoneTime(const QDateTime &reminderDoneTime);
+
+    Note* clone();
+
 public slots:
     void save();
     void remove();
 
 signals:
-    void guidChanged();
     void titleChanged();
     void notebookGuidChanged();
     void contentChanged();
+    void reminderChanged();
+    void reminderTimeChanged();
+    void reminderDoneChanged();
 
 private:
     QString m_guid;
     QString m_notebookGuid;
+    QDateTime m_created;
     QString m_title;
     QString m_content;
+    qint64 m_reminderOrder;
+    QDateTime m_reminderTime;
+    QDateTime m_reminderDoneTime;
 };
 
 #endif // NOTE_H

=== modified file 'src/plugin/Evernote/notebooks.cpp'
--- src/plugin/Evernote/notebooks.cpp	2013-11-26 17:18:33 +0000
+++ src/plugin/Evernote/notebooks.cpp	2013-12-12 21:36:37 +0000
@@ -35,7 +35,6 @@
 
 QVariant Notebooks::data(const QModelIndex &index, int role) const
 {
-
     Notebook *notebook = NotesStore::instance()->notebook(m_list.at(index.row()));
     switch(role) {
     case RoleGuid:

=== modified file 'src/plugin/Evernote/notes.cpp'
--- src/plugin/Evernote/notes.cpp	2013-11-26 17:18:33 +0000
+++ src/plugin/Evernote/notes.cpp	2013-12-12 21:36:37 +0000
@@ -24,37 +24,12 @@
 #include <QDebug>
 
 Notes::Notes(QObject *parent) :
-    QAbstractListModel(parent)
-{
-    connect(NotesStore::instance(), &NotesStore::noteAdded, this, &Notes::noteAdded);
-    connect(NotesStore::instance(), &NotesStore::noteRemoved, this, &Notes::noteRemoved);
-    connect(NotesStore::instance(), &NotesStore::noteChanged, this, &Notes::noteChanged);
-}
-
-QVariant Notes::data(const QModelIndex &index, int role) const
-{
-    Note *note = NotesStore::instance()->note(m_list.at(index.row()));
-    switch(role) {
-    case RoleGuid:
-        return note->guid();
-    case RoleTitle:
-        return note->title();
-    }
-
-    return QVariant();
-}
-
-int Notes::rowCount(const QModelIndex &parent) const
-{
-    return m_list.count();
-}
-
-QHash<int, QByteArray> Notes::roleNames() const
-{
-    QHash<int, QByteArray> roles;
-    roles.insert(RoleGuid, "guid");
-    roles.insert(RoleTitle, "title");
-    return roles;
+    QSortFilterProxyModel(parent),
+    m_onlyReminders(false)
+{
+    setSourceModel(NotesStore::instance());
+    setSortRole(NotesStore::RoleCreated);
+    sort(0, Qt::DescendingOrder);
 }
 
 QString Notes::filterNotebookGuid() const
@@ -67,53 +42,36 @@
     if (m_filterNotebookGuid != notebookGuid) {
         m_filterNotebookGuid = notebookGuid;
         emit filterNotebookGuidChanged();
-    }
-}
-
-Note* Notes::note(const QString &guid)
-{
-    NotesStore::instance()->refreshNoteContent(guid);
-    return NotesStore::instance()->note(guid);
-}
-
-void Notes::componentComplete()
-{
-    foreach (Note *note, NotesStore::instance()->notes()) {
-        if (m_filterNotebookGuid.isEmpty() || note->notebookGuid() == m_filterNotebookGuid) {
-            m_list.append(note->guid());
-        }
-    }
-    beginInsertRows(QModelIndex(), 0, m_list.count() - 1);
-    endInsertRows();
-    refresh();
-}
-
-void Notes::refresh()
-{
-    NotesStore::instance()->refreshNotes(m_filterNotebookGuid);
-}
-
-void Notes::noteAdded(const QString &guid)
-{
-    beginInsertRows(QModelIndex(), m_list.count(), m_list.count());
-    m_list.append(guid);
-    endInsertRows();
-}
-
-void Notes::noteChanged(const QString &guid)
-{
-    int row = m_list.indexOf(guid);
-    if (row >= 0) {
-        emit dataChanged(index(row), index(row));
-    }
-}
-
-void Notes::noteRemoved(const QString &guid)
-{
-    int index = m_list.indexOf(guid);
-    if (index >= 0) {
-        beginRemoveRows(QModelIndex(), index, index);
-        m_list.removeAt(index);
-        endRemoveRows();
-    }
+        invalidateFilter();
+    }
+}
+
+bool Notes::onlyReminders() const
+{
+    return m_onlyReminders;
+}
+
+void Notes::setOnlyReminders(bool onlyReminders)
+{
+    if (m_onlyReminders != onlyReminders) {
+        m_onlyReminders = onlyReminders;
+        emit onlyRemindersChanged();
+        invalidateFilter();
+    }
+}
+
+bool Notes::filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const
+{
+    QModelIndex sourceIndex = sourceModel()->index(sourceRow, 0, sourceParent);
+    if (!m_filterNotebookGuid.isEmpty()) {
+        if (sourceModel()->data(sourceIndex, NotesStore::RoleNotebookGuid).toString() != m_filterNotebookGuid) {
+            return false;
+        }
+    }
+    if (m_onlyReminders) {
+        if (!sourceModel()->data(sourceIndex, NotesStore::RoleReminder).toBool()) {
+            return false;
+        }
+    }
+    return true;
 }

=== modified file 'src/plugin/Evernote/notes.h'
--- src/plugin/Evernote/notes.h	2013-11-25 00:49:48 +0000
+++ src/plugin/Evernote/notes.h	2013-12-12 21:36:37 +0000
@@ -3,46 +3,33 @@
 
 #include "notesstore.h"
 
-#include <QAbstractListModel>
-#include <QQmlParserStatus>
+#include <QSortFilterProxyModel>
 
-class Notes : public QAbstractListModel, public QQmlParserStatus
+class Notes : public QSortFilterProxyModel
 {
     Q_OBJECT
     Q_PROPERTY(QString filterNotebookGuid READ filterNotebookGuid WRITE setFilterNotebookGuid NOTIFY filterNotebookGuidChanged)
+    Q_PROPERTY(bool onlyReminders READ onlyReminders WRITE setOnlyReminders NOTIFY onlyRemindersChanged)
+
 public:
-    enum Roles {
-        RoleGuid,
-        RoleTitle
-    };
     explicit Notes(QObject *parent = 0);
 
-    QVariant data(const QModelIndex &index, int role) const;
-    int rowCount(const QModelIndex &parent) const;
-    QHash<int, QByteArray> roleNames() const;
-
     QString filterNotebookGuid() const;
     void setFilterNotebookGuid(const QString &notebookGuid);
 
-    Q_INVOKABLE Note* note(const QString &guid);
-
-    void classBegin() {}
-    void componentComplete();
-
-public slots:
-    void refresh();
-
-private slots:
-    void noteAdded(const QString &guid);
-    void noteChanged(const QString &guid);
-    void noteRemoved(const QString &guid);
+    bool onlyReminders() const;
+    void setOnlyReminders(bool onlyReminders);
+
+protected:
+    bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const;
 
 signals:
     void filterNotebookGuidChanged();
+    void onlyRemindersChanged();
 
 private:
-    QList<QString> m_list;
     QString m_filterNotebookGuid;
+    bool m_onlyReminders;
 
 };
 

=== modified file 'src/plugin/Evernote/notesstore.cpp'
--- src/plugin/Evernote/notesstore.cpp	2013-12-12 21:36:37 +0000
+++ src/plugin/Evernote/notesstore.cpp	2013-12-12 21:36:37 +0000
@@ -37,7 +37,7 @@
 NotesStore* NotesStore::s_instance = 0;
 
 NotesStore::NotesStore(QObject *parent) :
-    QObject(parent)
+    QAbstractListModel(parent)
 {
     connect(EvernoteConnection::instance(), &EvernoteConnection::tokenChanged, this, &NotesStore::refreshNotebooks);
     connect(EvernoteConnection::instance(), SIGNAL(tokenChanged()), this, SLOT(refreshNotes()));
@@ -57,28 +57,71 @@
     return s_instance;
 }
 
+int NotesStore::rowCount(const QModelIndex &parent) const
+{
+    return m_notes.count();
+}
+
+QVariant NotesStore::data(const QModelIndex &index, int role) const
+{
+    switch (role) {
+    case RoleGuid:
+        return m_notes.at(index.row())->guid();
+    case RoleNotebookGuid:
+        return m_notes.at(index.row())->notebookGuid();
+    case RoleCreated:
+        return m_notes.at(index.row())->created();
+    case RoleTitle:
+        return m_notes.at(index.row())->title();
+    case RoleReminder:
+        return m_notes.at(index.row())->reminder();
+    case RoleReminderTime:
+        return m_notes.at(index.row())->reminderTime();
+    case RoleReminderDone:
+        return m_notes.at(index.row())->reminderDone();
+    case RoleReminderDoneTime:
+        return m_notes.at(index.row())->reminderDoneTime();
+    }
+    return QVariant();
+}
+
+QHash<int, QByteArray> NotesStore::roleNames() const
+{
+    QHash<int, QByteArray> roles;
+    roles.insert(RoleGuid, "guid");
+    roles.insert(RoleNotebookGuid, "notebookGuid");
+    roles.insert(RoleCreated, "created");
+    roles.insert(RoleTitle, "title");
+    roles.insert(RoleReminder, "reminder");
+    roles.insert(RoleReminderTime, "reminderTime");
+    roles.insert(RoleReminderDone, "reminderDone");
+    roles.insert(RoleReminderDoneTime, "reminderDoneTime");
+    return roles;
+}
+
 NotesStore::~NotesStore()
 {
 }
 
 QList<Note*> NotesStore::notes() const
 {
-    return m_notes.values();
+    return m_notes;
 }
 
 Note *NotesStore::note(const QString &guid)
 {
-    return m_notes.value(guid);
+    refreshNoteContent(guid);
+    return m_notesHash.value(guid);
 }
 
 QList<Notebook *> NotesStore::notebooks() const
 {
-    return m_notebooks.values();
+    return m_notebooks;
 }
 
 Notebook *NotesStore::notebook(const QString &guid)
 {
-    return m_notebooks.value(guid);
+    return m_notebooksHash.value(guid);
 }
 
 void NotesStore::refreshNotes(const QString &filterNotebookGuid)
@@ -97,17 +140,33 @@
 
     for (int i = 0; i < results.notes.size(); ++i) {
         evernote::edam::NoteMetadata result = results.notes.at(i);
-        Note *note = m_notes.value(QString::fromStdString(result.guid));
-        if (note) {
-            note->setTitle(QString::fromStdString(result.title));
-            note->setNotebookGuid(QString::fromStdString(result.notebookGuid));
+        Note *note = m_notesHash.value(QString::fromStdString(result.guid));
+        bool newNote = note == 0;
+        if (newNote) {
+            QString guid = QString::fromStdString(result.guid);
+            QDateTime created = QDateTime::fromMSecsSinceEpoch(result.created);
+            note = new Note(guid, created, this);
+        }
+
+        note->setTitle(QString::fromStdString(result.title));
+        note->setNotebookGuid(QString::fromStdString(result.notebookGuid));
+        note->setReminderOrder(result.attributes.reminderOrder);
+        QDateTime reminderDoneTime;
+        if (result.attributes.reminderDoneTime > 0) {
+            reminderDoneTime = QDateTime::fromMSecsSinceEpoch(result.attributes.reminderDoneTime);
+        }
+        note->setReminderDoneTime(reminderDoneTime);
+
+        if (newNote) {
+            beginInsertRows(QModelIndex(), m_notes.count(), m_notes.count());
+            m_notesHash.insert(note->guid(), note);
+            m_notes.append(note);
+            endInsertRows();
+            emit noteAdded(note->guid());
+        } else {
+            QModelIndex noteIndex = index(m_notes.indexOf(note));
+            emit dataChanged(noteIndex, noteIndex);
             emit noteChanged(note->guid());
-        } else {
-            note = new Note(QString::fromStdString(result.guid), this);
-            note->setNotebookGuid(QString::fromStdString(result.notebookGuid));
-            note->setTitle(QString::fromStdString(result.title));
-            m_notes.insert(note->guid(), note);
-            emit noteAdded(note->guid());
         }
     }
 }
@@ -126,11 +185,20 @@
         return;
     }
 
-    Note *note = m_notes.value(QString::fromStdString(result.guid));
+    Note *note = m_notesHash.value(QString::fromStdString(result.guid));
     note->setNotebookGuid(QString::fromStdString(result.notebookGuid));
     note->setTitle(QString::fromStdString(result.title));
     note->setContent(QString::fromStdString(result.content));
+    note->setReminderOrder(result.attributes.reminderOrder);
+    QDateTime reminderDoneTime;
+    if (result.attributes.reminderDoneTime > 0) {
+        reminderDoneTime = QDateTime::fromMSecsSinceEpoch(result.attributes.reminderDoneTime);
+    }
+    note->setReminderDoneTime(reminderDoneTime);
     emit noteChanged(note->guid());
+
+    QModelIndex noteIndex = index(m_notes.indexOf(note));
+    emit dataChanged(noteIndex, noteIndex);
 }
 
 void NotesStore::refreshNotebooks()
@@ -149,17 +217,19 @@
 
     for (int i = 0; i < results.size(); ++i) {
         evernote::edam::Notebook result = results.at(i);
-        Notebook *notebook = m_notebooks.value(QString::fromStdString(result.guid));
-        if (notebook) {
-            qDebug() << "got notebook update";
-            notebook->setName(QString::fromStdString(result.name));
-            emit notebookChanged(notebook->guid());
-        } else {
+        Notebook *notebook = m_notebooksHash.value(QString::fromStdString(result.guid));
+        bool newNoteNotebook = notebook == 0;
+        if (newNoteNotebook) {
             notebook = new Notebook(QString::fromStdString(result.guid), this);
-            notebook->setName(QString::fromStdString(result.name));
-            m_notebooks.insert(notebook->guid(), notebook);
+        }
+        notebook->setName(QString::fromStdString(result.name));
+
+        if (newNoteNotebook) {
+            m_notebooksHash.insert(notebook->guid(), notebook);
+            m_notebooks.append(notebook);
             emit notebookAdded(notebook->guid());
-            qDebug() << "got new notebook" << notebook->guid();
+        } else {
+            emit notebookChanged(notebook->guid());
         }
     }
 }
@@ -178,18 +248,24 @@
         return;
     }
 
-    Note *note = new Note(QString::fromStdString(result.guid));
+    QString guid = QString::fromStdString(result.guid);
+    QDateTime created = QDateTime::fromMSecsSinceEpoch(result.created);
+    Note *note = new Note(guid, created, this);
     note->setNotebookGuid(QString::fromStdString(result.notebookGuid));
     note->setTitle(QString::fromStdString(result.title));
     note->setContent(QString::fromStdString(result.content));
 
-    m_notes.insert(note->guid(), note);
-    noteAdded(note->guid());
+    beginInsertRows(QModelIndex(), m_notes.count(), m_notes.count());
+    m_notesHash.insert(note->guid(), note);
+    m_notes.append(note);
+    endInsertRows();
+
+    emit noteAdded(note->guid());
 }
 
 void NotesStore::saveNote(const QString &guid)
 {
-    Note *note = m_notes.value(guid);
+    Note *note = m_notesHash.value(guid);
 
     QString enml = Html2EnmlConverter::html2enml(note->content());
     note->setContent(enml);
@@ -206,12 +282,15 @@
         return;
     }
 
-    Note *note = m_notes.value(QString::fromStdString(result.guid));
+    Note *note = m_notesHash.value(QString::fromStdString(result.guid));
     if (note) {
         note->setTitle(QString::fromStdString(result.title));
         note->setNotebookGuid(QString::fromStdString(result.notebookGuid));
 
         emit noteChanged(note->guid());
+
+        QModelIndex noteIndex = index(m_notes.indexOf(note));
+        emit dataChanged(noteIndex, noteIndex);
     }
 }
 
@@ -229,5 +308,11 @@
         return;
     }
     emit noteRemoved(guid);
-    m_notes.take(guid)->deleteLater();
+
+    Note *note = m_notesHash.value(guid);
+    int noteIndex = m_notes.indexOf(note);
+    beginRemoveRows(QModelIndex(), noteIndex, noteIndex);
+    m_notes.takeAt(noteIndex);
+    m_notesHash.take(guid)->deleteLater();
+    endRemoveRows();
 }

=== modified file 'src/plugin/Evernote/notesstore.h'
--- src/plugin/Evernote/notesstore.h	2013-12-12 21:36:37 +0000
+++ src/plugin/Evernote/notesstore.h	2013-12-12 21:36:37 +0000
@@ -15,7 +15,7 @@
 #include <NoteStore_constants.h>
 #include <Errors_types.h>
 
-#include <QObject>
+#include <QAbstractListModel>
 #include <QHash>
 
 class Notebook;
@@ -23,21 +23,36 @@
 
 using namespace apache::thrift::transport;
 
-class NotesStore : public QObject
+class NotesStore : public QAbstractListModel
 {
     Q_OBJECT
 
 public:
-    Q_INVOKABLE void createNote(const QString &title, const QString &notebookGuid, const QString &content);
+    enum Roles {
+        RoleGuid,
+        RoleNotebookGuid,
+        RoleCreated,
+        RoleTitle,
+        RoleReminder,
+        RoleReminderTime,
+        RoleReminderDone,
+        RoleReminderDoneTime
+    };
 
+    ~NotesStore();
     static NotesStore *instance();
 
-    ~NotesStore();
+    // reimplemented from QAbstractListModel
+    int rowCount(const QModelIndex &parent) const;
+    QVariant data(const QModelIndex &index, int role) const;
+    QHash<int, QByteArray> roleNames() const;
 
     QList<Note*> notes() const;
-    Note* note(const QString &guid);
-    void saveNote(const QString &guid);
-    void deleteNote(const QString &guid);
+
+    Q_INVOKABLE Note* note(const QString &guid);
+    Q_INVOKABLE void createNote(const QString &title, const QString &notebookGuid, const QString &content);
+    Q_INVOKABLE void saveNote(const QString &guid);
+    Q_INVOKABLE void deleteNote(const QString &guid);
 
     QList<Notebook*> notebooks() const;
     Notebook* notebook(const QString &guid);
@@ -69,9 +84,12 @@
     explicit NotesStore(QObject *parent = 0);
     static NotesStore *s_instance;
 
-    QHash<QString, Notebook*> m_notebooks;
-    QHash<QString, Note*> m_notes;
+    QList<Note*> m_notes;
+    QList<Notebook*> m_notebooks;
 
+    // Keep hashes for faster lookups as we always identify notes via guid
+    QHash<QString, Note*> m_notesHash;
+    QHash<QString, Notebook*> m_notebooksHash;
 };
 
 #endif // NOTESSTORE_H