X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/fa988586bc923b33497cbc97aaac07fc93a4ca83..87e8d0ba:/src/search/dolphinsearchbox.h diff --git a/src/search/dolphinsearchbox.h b/src/search/dolphinsearchbox.h index 2de4c457c..c138cfe7f 100644 --- a/src/search/dolphinsearchbox.h +++ b/src/search/dolphinsearchbox.h @@ -23,20 +23,14 @@ #include #include -#include - class DolphinFacetsWidget; -class KLineEdit; +class QLineEdit; class KSeparator; class QToolButton; class QScrollArea; class QLabel; class QVBoxLayout; - -namespace Baloo { - class QueryBuilder; - class NaturalQueryParser; -} +class KMoreToolsMenuFactory; /** * @brief Input box for searching files with or without Baloo. @@ -52,8 +46,8 @@ class DolphinSearchBox : public QWidget { Q_OBJECT public: - explicit DolphinSearchBox(QWidget* parent = 0); - virtual ~DolphinSearchBox(); + explicit DolphinSearchBox(QWidget* parent = nullptr); + ~DolphinSearchBox() override; /** * Sets the text that should be used as input for @@ -105,10 +99,11 @@ public: bool isActive() const; protected: - virtual bool event(QEvent* event); - virtual void showEvent(QShowEvent* event); - virtual void keyReleaseEvent(QKeyEvent* event); - virtual bool eventFilter(QObject* obj, QEvent* event); + bool event(QEvent* event) override; + void showEvent(QShowEvent* event) override; + void hideEvent(QHideEvent* event) override; + void keyReleaseEvent(QKeyEvent* event) override; + bool eventFilter(QObject* obj, QEvent* event) override; signals: /** @@ -122,7 +117,7 @@ signals: */ void searchTextChanged(const QString& text); - void returnPressed(const QString& text); + void returnPressed(); /** * Emitted as soon as the search box should get closed. @@ -140,11 +135,11 @@ private slots: void emitSearchRequest(); void emitCloseRequest(); void slotConfigurationChanged(); - void slotSearchTextChanged(); + void slotSearchTextChanged(const QString& text); void slotReturnPressed(); void slotFacetsButtonToggled(); void slotFacetChanged(); - void updateSearchInputParsing(); + void slotSearchSaved(); private: void initButton(QToolButton* button); @@ -164,6 +159,7 @@ private: void fromBalooSearchUrl(const QUrl& url); void updateFacetsToggleButton(); + private: bool m_startedSearching; bool m_active; @@ -171,12 +167,8 @@ private: QVBoxLayout* m_topLayout; QLabel* m_searchLabel; -#ifdef HAVE_BALOO - Baloo::QueryBuilder* m_searchInput; - QScopedPointer m_queryParser; -#else - KLineEdit* m_searchInput; -#endif + QLineEdit* m_searchInput; + QAction* m_saveSearchAction; QScrollArea* m_optionsScrollArea; QToolButton* m_fileNameButton; QToolButton* m_contentButton; @@ -187,6 +179,7 @@ private: DolphinFacetsWidget* m_facetsWidget; QUrl m_searchPath; + QScopedPointer m_menuFactory; QTimer* m_startSearchTimer; };