Merge lp:~mzanetti/reminders-app/fix-filter-init into lp:reminders-app

[Michael Zanetti]

small fixes

* fixes an issue where notebooks would be empty sometimes
* drop the old error label that's sometimes painted on top of other text

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

PASSED: Continuous integration, rev:353
http://91.189.93.70:8080/job/reminders-app-ci/671/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2113
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2113/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-vivid-amd64-ci/92

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

review: Approve (continuous-integration)

[Riccardo Padovani (rpadovani)]

Why did you add m_onlySearchResults?

review: Needs Information

[Michael Zanetti (mzanetti)]

for
* fixes an issue where notebooks would be empty sometimes

(see inline explanation)

[Riccardo Padovani (rpadovani)]

Thanks for the explanation :-)

review: Approve

=== modified file 'src/app/qml/ui/NotesPage.qml'
--- src/app/qml/ui/NotesPage.qml	2015-02-23 11:31:34 +0000
+++ src/app/qml/ui/NotesPage.qml	2015-02-25 23:19:24 +0000
@@ -231,11 +231,11 @@
         }
         Label {
             anchors.centerIn: parent
-            visible: !notes.loading && (notes.error || notesListView.count == 0)
+            visible: !notes.loading && notesListView.count == 0
             width: parent.width - units.gu(4)
             wrapMode: Text.WordWrap
             horizontalAlignment: Text.AlignHCenter
-            text: notes.error ? notes.error : i18n.tr("No notes available. You can create new notes using the \"Add note\" button.")
+            text: i18n.tr("No notes available. You can create new notes using the \"Add note\" button.")
         }
 
         Scrollbar {

=== modified file 'src/libqtevernote/notes.cpp'
--- src/libqtevernote/notes.cpp	2015-02-17 21:35:50 +0000
+++ src/libqtevernote/notes.cpp	2015-02-25 23:19:24 +0000
@@ -26,6 +26,7 @@
 Notes::Notes(QObject *parent) :
     QSortFilterProxyModel(parent),
     m_onlyReminders(false),
+    m_onlySearchResults(false),
     m_showDeleted(false),
     m_sortOrder(SortOrderDateCreatedNewest)
 {