Merge lp:~mzanetti/reminders-app/improve-sorting into lp:reminders-app

[Michael Zanetti]

improve sorting by falling back on title if the first sortrole is equal

improve sorting by falling back on title if the first sortrole is equal

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

PASSED: Continuous integration, rev:292
http://91.189.93.70:8080/job/reminders-app-ci/584/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-vivid/38
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/38/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-vivid-amd64-ci/5

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

review: Approve (continuous-integration)

[David Planella (dpm)]

After a discussion on IRC, I understand the context: essentially, if the timestamp is the same, then we compare and sort on title. Works well for me, no more jumping up and down of notes in the list.

review: Approve

=== modified file 'src/plugin/Evernote/notes.cpp'
--- src/plugin/Evernote/notes.cpp	2014-10-20 18:53:50 +0000
+++ src/plugin/Evernote/notes.cpp	2014-11-06 13:08:02 +0000
@@ -163,3 +163,15 @@
     }
     return true;
 }
+
+bool Notes::lessThan(const QModelIndex &left, const QModelIndex &right) const
+{
+    QVariant leftValue = sourceModel()->data(left, sortRole()).toString();
+    QVariant rightValue = sourceModel()->data(right, sortRole()).toString();
+
+    if (leftValue == rightValue) {
+        return sourceModel()->data(left, NotesStore::RoleTitle).toString() < sourceModel()->data(right, NotesStore::RoleTitle).toString();
+    }
+
+    return leftValue < rightValue;
+}

=== modified file 'src/plugin/Evernote/notes.h'
--- src/plugin/Evernote/notes.h	2014-10-09 00:08:52 +0000
+++ src/plugin/Evernote/notes.h	2014-11-06 13:08:02 +0000
@@ -60,7 +60,8 @@
     Q_INVOKABLE int sectionCount(const QString &sectionRole, const QString &section);
 
 protected:
-    bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const;
+    bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const override;
+    bool lessThan(const QModelIndex &left, const QModelIndex &right) const override;
 
 signals:
     void filterNotebookGuidChanged();