Fix search-UI issues in combination with the new places entries

The places-entries for searching revealed some serious issues in
combination with the search-panel. Move the filtering away from
QDockWidget and bring it back below the search-bar.

1 files changed, 6 insertions, 2 deletions

diff --git a/src/search/dolphinsearchbox.h b/src/search/dolphinsearchbox.h
index 8af32b377..2b4632bb1 100644
--- a/src/search/dolphinsearchbox.h
+++ b/src/search/dolphinsearchbox.h
@@ -24,10 +24,9 @@
 #include <QList>
 #include <QWidget>
 
-class AbstractSearchFilterWidget;
+class DolphinFacetsWidget;
 class KLineEdit;
 class KSeparator;
-class QFormLayout;
 class QToolButton;
 class QScrollArea;
 class QLabel;
@@ -141,6 +140,7 @@ private slots:
     void slotConfigurationChanged();
     void slotSearchTextChanged(const QString& text);
     void slotReturnPressed(const QString& text);
+    void slotFacetsButtonToggled();
 
 private:
     void initButton(QToolButton* button);
@@ -155,6 +155,8 @@ private:
 
     void applyReadOnlyState();
 
+    void updateFacetsToggleButtonIcon();
+
 private:
     bool m_startedSearching;
     bool m_readOnly;
@@ -169,6 +171,8 @@ private:
     KSeparator* m_separator;
     QToolButton* m_fromHereButton;
     QToolButton* m_everywhereButton;
+    QToolButton* m_facetsToggleButton;
+    DolphinFacetsWidget* m_facetsWidget;
 
     KUrl m_searchPath;
     KUrl m_readOnlyQuery;