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

[Riccardo Padovani]

Clear a previous search result when you do a new search.

Clear a previous search result when you do a new search.

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

PASSED: Continuous integration, rev:147
http://91.189.93.70:8080/job/reminders-app-ci/361/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2699
        deb: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2699/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/236
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/236/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-trusty-amd64-ci/362
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-ci/56

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

review: Approve (continuous-integration)

[Michael Zanetti (mzanetti)]

looks good. For consistency with the rest of the API I'd like you to rename it to clearSearchResults() instead of clearFoundNotes(). Also, clearFoundNotes sounds a bit like it would clear the found notes, doesn't it? :)

===

8 + tools: ToolbarItems {
9 + back: ToolbarButton {
10 + iconName: 'back'
11 + text: i18n.tr("Back")
12 +
13 + onTriggered: {
14 + pagestack.pop()
15 + NotesStore.clearFoundNotes();
16 + }
17 + }
18 + }

Instead of overriding the back button, may be just call clearSearchResults() in Component.onDestruction?

review: Needs Fixing

[Michael Zanetti (mzanetti)]

36 + emit dataChanged(index(0), index(m_notes.count()), QVector<int>() << RoleIsSearchResult);

Shouldn't the second arg be this?

index(m_notes.count() -1)

if we have 2 entries, you would call changed on items 0 - 2, which in total makes 3, while you should be calling 0 - 1, which is two items only.

review: Needs Fixing

[lp:~rpadovani/reminders-app/1317565]

148. By Riccardo Padovani on 2014-05-20

Changed function name

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

PASSED: Continuous integration, rev:148
http://91.189.93.70:8080/job/reminders-app-ci/362/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2705
        deb: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2705/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/242
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/242/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-trusty-amd64-ci/363
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-ci/57

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

review: Approve (continuous-integration)

[lp:~rpadovani/reminders-app/1317565]

149. By Riccardo Padovani on 2014-05-20

Changed dataChanged call

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

PASSED: Continuous integration, rev:149
http://91.189.93.70:8080/job/reminders-app-ci/363/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2706
        deb: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2706/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/243
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/243/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-trusty-amd64-ci/364
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-ci/58

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

review: Approve (continuous-integration)

[Michael Zanetti (mzanetti)]

lgtm

review: Approve

=== modified file 'src/app/qml/ui/SearchNotesPage.qml'
--- src/app/qml/ui/SearchNotesPage.qml	2014-02-18 09:36:38 +0000
+++ src/app/qml/ui/SearchNotesPage.qml	2014-05-20 09:29:30 +0000
@@ -27,6 +27,18 @@
 
     signal noteSelected(var note)
 
+    tools: ToolbarItems {
+        back: ToolbarButton {
+            iconName: 'back' 
+            text: i18n.tr("Back")
+
+            onTriggered: {
+                pagestack.pop()
+                NotesStore.clearSearchResults();
+            }
+        }
+    }
+
     Column {
         anchors { fill: parent; topMargin: units.gu(2); bottomMargin: units.gu(2) }
         spacing: units.gu(2)

=== modified file 'src/plugin/Evernote/notesstore.cpp'
--- src/plugin/Evernote/notesstore.cpp	2014-05-09 09:02:54 +0000
+++ src/plugin/Evernote/notesstore.cpp	2014-05-20 09:29:30 +0000
@@ -484,6 +484,14 @@
     EvernoteConnection::instance()->enqueue(job);
 }
 
+void NotesStore::clearSearchResults()
+{
+    foreach (Note *note, m_notes) {
+        note->setIsSearchResult(false);
+    }
+    emit dataChanged(index(0), index(m_notes.count()-1), QVector<int>() << RoleIsSearchResult);
+}
+
 void NotesStore::deleteNoteJobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage, const QString &guid)
 {
     if (errorCode != EvernoteConnection::ErrorCodeNoError) {

=== modified file 'src/plugin/Evernote/notesstore.h'
--- src/plugin/Evernote/notesstore.h	2014-05-09 09:02:54 +0000
+++ src/plugin/Evernote/notesstore.h	2014-05-20 09:29:30 +0000
@@ -95,6 +95,7 @@
     Q_INVOKABLE void saveNote(const QString &guid);
     Q_INVOKABLE void deleteNote(const QString &guid);
     Q_INVOKABLE void findNotes(const QString &searchWords);
+    Q_INVOKABLE void clearSearchResults();
 
     QList<Notebook*> notebooks() const;
     Q_INVOKABLE Notebook* notebook(const QString &guid);