X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/df9ca5b0c2238a42cfd829ab9ad30d574e4ece29..85241a924:/src/search/dolphinsearchbox.h

diff --git a/src/search/dolphinsearchbox.h b/src/search/dolphinsearchbox.h
index 9ccd50b83..4afd752bc 100644
--- a/src/search/dolphinsearchbox.h
+++ b/src/search/dolphinsearchbox.h
@@ -24,6 +24,7 @@
 #include <QWidget>
 
 class DolphinFacetsWidget;
+class DolphinQuery;
 class QLineEdit;
 class KSeparator;
 class QToolButton;
@@ -62,8 +63,8 @@ public:
     QString text() const;
 
     /**
-     * Sets the current path that is used as root for
-     * searching files, if "From Here" has been selected.
+     * Sets the current path that is used as root for searching files.
+     * If @url is the Home dir, "From Here" is selected instead.
      */
     void setSearchPath(const QUrl& url);
     QUrl searchPath() const;
@@ -117,8 +118,6 @@ signals:
      */
     void searchTextChanged(const QString& text);
 
-    void returnPressed();
-
     /**
      * Emitted as soon as the search box should get closed.
      */
@@ -130,6 +129,7 @@ signals:
      * @see DolphinSearchBox::setActive()
      */
     void activated();
+    void focusViewRequest();
 
 private slots:
     void emitSearchRequest();
@@ -137,7 +137,6 @@ private slots:
     void slotConfigurationChanged();
     void slotSearchTextChanged(const QString& text);
     void slotReturnPressed();
-    void slotFacetsButtonToggled();
     void slotFacetChanged();
     void slotSearchSaved();
 
@@ -153,16 +152,17 @@ private:
     QUrl balooUrlForSearching() const;
 
     /**
-     * Extracts information from the given Baloo search \a url to
-     * initialize the search box properly.
+     * Sets the searchbox UI with the parameters established by the \a query
      */
-    void fromBalooSearchUrl(const QUrl& url);
+    void updateFromQuery(const DolphinQuery& query);
 
-    void updateFacetsToggleButton();
+    void updateFacetsVisible();
 
     bool isIndexingEnabled() const;
 
 private:
+    QString queryTitle(const QString& text) const;
+
     bool m_startedSearching;
     bool m_active;
 
@@ -176,7 +176,6 @@ private:
     KSeparator* m_separator;
     QToolButton* m_fromHereButton;
     QToolButton* m_everywhereButton;
-    QToolButton* m_facetsToggleButton;
     DolphinFacetsWidget* m_facetsWidget;
 
     QUrl m_searchPath;