A basic but working searchview

3 files changed, 36 insertions, 38 deletions

diff --git a/framework/qml/ConversationView.qml b/framework/qml/ConversationView.qml
index f3011f65..2dab92ba 100644
--- a/framework/qml/ConversationView.qml
+++ b/framework/qml/ConversationView.qml
@@ -32,21 +32,6 @@ FocusScope {
     property bool hideTrash: true;
     property bool hideNonTrash: false;
 
-    Kube.Listener {
-        filter: Kube.Messages.mailSelection
-        onMessageReceived: {
-            root.mail = message.mail
-        }
-    }
-
-    Kube.Listener {
-        filter: Kube.Messages.folderSelection
-        onMessageReceived: {
-            root.hideTrash = !message.trash
-            root.hideNonTrash = message.trash
-        }
-    }
-
     Rectangle {
         anchors.fill: parent
         color: Kube.Colors.backgroundColor
diff --git a/framework/qml/MailListView.qml b/framework/qml/MailListView.qml
index 8fed8c9d..69b7d871 100644
--- a/framework/qml/MailListView.qml
+++ b/framework/qml/MailListView.qml
@@ -32,27 +32,18 @@ FocusScope {
     property bool isTrash : false
     property bool isUnread : false
     property variant currentMail: null
+    property bool showFilter: false
+    property string filter: null
 
     onCurrentMailChanged: {
         Kube.Fabric.postMessage(Kube.Messages.markAsRead, {"mail": currentMail})
-        Kube.Fabric.postMessage(Kube.Messages.mailSelection, {"mail": currentMail})
     }
-
-    Kube.Listener {
-        filter: Kube.Messages.folderSelection
-        onMessageReceived: {
-            parentFolder = message.folder
-            currentMail = null
-            filterField.clearSearch()
-        }
+    onParentFolderChanged: {
+        currentMail = null
+        filterField.clearSearch()
     }
-
-    Kube.Listener {
-        filter: Kube.Messages.search
-        onMessageReceived: {
-           filterField.visible = true
-           find.forceActiveFocus()
-        }
+    onShowFilterChanged: {
+        find.forceActiveFocus()
     }
 
     Shortcut {
@@ -78,12 +69,12 @@ FocusScope {
             Layout.fillWidth: true
             height: Kube.Units.gridUnit * 2
             color: Kube.Colors.buttonColor
-            visible: false
+            visible: root.showFilter
 
             function clearSearch() {
-                filterField.visible = false
+                root.showFilter = false
                 find.text = ""
-                mailListModel.filter = ""
+                root.filter = ""
             }
 
             RowLayout {
@@ -104,7 +95,7 @@ FocusScope {
                     id: find
                     Layout.fillWidth: true
                     placeholderText: qsTr("Filter...")
-                    onTextChanged: mailListModel.filter = text
+                    onTextChanged: root.filter = text
                     activeFocusOnTab: visible
                     focus: visible
                     Keys.onEscapePressed: filterField.clearSearch()
@@ -150,6 +141,7 @@ FocusScope {
             model: Kube.MailListModel {
                 id: mailListModel
                 parentFolder: root.parentFolder
+                filter: root.filter
             }
 
             delegate: Kube.ListDelegate {
diff --git a/framework/src/domain/maillistmodel.cpp b/framework/src/domain/maillistmodel.cpp
index e3ef04d6..dcebedbc 100644
--- a/framework/src/domain/maillistmodel.cpp
+++ b/framework/src/domain/maillistmodel.cpp
@@ -48,6 +48,21 @@ void MailListModel::setFilter(const QString &filter)
             f = "\"" + filter + "\"";
         }
         f.append('*');
+        if (mCurrentQueryItem.isEmpty()) {
+            using namespace Sink::ApplicationDomain;
+            query.request<Mail::Subject>();
+            query.request<Mail::Sender>();
+            query.request<Mail::To>();
+            query.request<Mail::Cc>();
+            query.request<Mail::Bcc>();
+            query.request<Mail::Date>();
+            query.request<Mail::Unread>();
+            query.request<Mail::Important>();
+            query.request<Mail::Draft>();
+            query.request<Mail::Sent>();
+            query.request<Mail::Trash>();
+            query.request<Mail::Folder>();
+        }
         query.filter<Sink::ApplicationDomain::Mail::Subject>(Sink::QueryBase::Comparator(f, Sink::QueryBase::Comparator::Fulltext));
     }
     runQuery(query);
@@ -202,9 +217,15 @@ bool MailListModel::filterAcceptsRow(int sourceRow, const QModelIndex &sourcePar
 
 void MailListModel::runQuery(const Sink::Query &query)
 {
-    mQuery = query;
-    m_model = Sink::Store::loadModel<Sink::ApplicationDomain::Mail>(query);
-    setSourceModel(m_model.data());
+    if (query.getBaseFilters().isEmpty() && query.ids().isEmpty()) {
+        mQuery = {};
+        m_model.clear();
+        setSourceModel(nullptr);
+    } else {
+        mQuery = query;
+        m_model = Sink::Store::loadModel<Sink::ApplicationDomain::Mail>(query);
+        setSourceModel(m_model.data());
+    }
 }
 
 bool MailListModel::isThreaded() const