remove filter bar, allow filter through the global search

2 files changed, 4 insertions, 10 deletions

diff --git a/components/kube/contents/ui/Kube.qml b/components/kube/contents/ui/Kube.qml
index a56838e5..1012d691 100644
--- a/components/kube/contents/ui/Kube.qml
+++ b/components/kube/contents/ui/Kube.qml
@@ -407,13 +407,14 @@ Controls2.ApplicationWindow {
             Controls2.TextField {
                 id: searchField
                 Layout.fillWidth: true
-                placeholderText: "Search...   is not available in this beta"
+                placeholderText: "Filter...     (only applies to the mail list for now)"
             }
 
             Kube.Button {
                 text: "Go"
 
                 onClicked: {
+                    mailListView.filterString = searchField.text
                     search.close()
                 }
             }
diff --git a/framework/qml/MailListView.qml b/framework/qml/MailListView.qml
index 27fae7c2..fc40074d 100644
--- a/framework/qml/MailListView.qml
+++ b/framework/qml/MailListView.qml
@@ -32,7 +32,7 @@ Item {
     property bool isTrash : false
     property bool isUnread : false
     property int currentIndex
-    property string filterString: searchBar.text;
+    property string filterString
 
     onParentFolderChanged: {
         currentMail = null
@@ -131,13 +131,6 @@ Item {
         }
     }
 
-    TextField {
-        id: searchBar
-        anchors.top: toolbar.bottom
-        width: parent.width
-        placeholderText: qsTr("Filter...")
-    }
-
     Label {
         anchors.top: searchBar.bottom
         visible: listView.count === 0
@@ -148,7 +141,7 @@ Item {
     ListView {
         id: listView
 
-        anchors.top: searchBar.bottom
+        anchors.top: toolbar.bottom
 
         width: parent.width
         height: parent.height - toolbar.height