Add clang-format and format code as in Frameworks

[dolphin.git] / src / search / dolphinsearchbox.cpp

diff --git a/src/search/dolphinsearchbox.cpp b/src/search/dolphinsearchbox.cpp
index 0ab4d86cdd55fe97b7b6b94add2836bc66684496..b44f19092b6f28cffed82e805d455d6bbe9bc9de 100644 (file)
--- a/src/search/dolphinsearchbox.cpp
+++ b/src/search/dolphinsearchbox.cpp
@@ -1,70 +1,55 @@
-/***************************************************************************
-*    Copyright (C) 2010 by Peter Penz <peter.penz19@gmail.com>            *
-*                                                                         *
-*    This program is free software; you can redistribute it and/or modify *
-*    it under the terms of the GNU General Public License as published by *
-*    the Free Software Foundation; either version 2 of the License, or    *
-*    (at your option) any later version.                                  *
-*                                                                         *
-*    This program is distributed in the hope that it will be useful,      *
-*    but WITHOUT ANY WARRANTY; without even the implied warranty of       *
-*    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the        *
-*    GNU General Public License for more details.                         *
-*                                                                         *
-*    You should have received a copy of the GNU General Public License    *
-*    along with this program; if not, write to the                        *
-*    Free Software Foundation, Inc.,                                      *
-*    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA           *
-* **************************************************************************/
+/*
+ * SPDX-FileCopyrightText: 2010 Peter Penz <peter.penz19@gmail.com>
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */

 
 #include "dolphinsearchbox.h"
 
 #include "dolphinsearchbox.h"

+#include "global.h"

 
 #include "dolphin_searchsettings.h"
 #include "dolphinfacetswidget.h"
 
 #include "dolphin_searchsettings.h"
 #include "dolphinfacetswidget.h"

+#include "dolphinplacesmodelsingleton.h"
+#include "dolphinquery.h"

 
 

-#include <KIcon>
-#include <KLineEdit>
-#include <KLocale>
+#include "config-dolphin.h"
+#include <KLocalizedString>
+#include <KMoreToolsMenuFactory>

 #include <KSeparator>
 #include <KSeparator>

-#include <KGlobalSettings>
+#if HAVE_BALOO
+#include <Baloo/IndexerConfig>
+#include <Baloo/Query>
+#endif

 
 #include <QButtonGroup>
 #include <QDir>
 
 #include <QButtonGroup>
 #include <QDir>

-#include <QEvent>
-#include <QFormLayout>
+#include <QFontDatabase>

 #include <QHBoxLayout>
 #include <QHBoxLayout>

+#include <QIcon>

 #include <QKeyEvent>
 #include <QKeyEvent>

-#include <QLabel>
+#include <QLineEdit>

 #include <QScrollArea>
 #include <QScrollArea>

+#include <QShowEvent>

 #include <QTimer>
 #include <QToolButton>
 #include <QTimer>
 #include <QToolButton>

-#include <QVBoxLayout>
-
-#ifdef HAVE_BALOO
-    #include <Baloo/NaturalFileQueryParser>
-    #include <Baloo/QueryBuilder>
-    #include <Baloo/Query>
-    #include <Baloo/Term>
-    #include <Baloo/IndexerConfig>
-#endif
-
-DolphinSearchBox::DolphinSearchBox(QWidget* parent) :
-    QWidget(parent),
-    m_startedSearching(false),
-    m_active(true),
-    m_topLayout(0),
-    m_searchLabel(0),
-    m_searchInput(0),
-    m_optionsScrollArea(0),
-    m_fileNameButton(0),
-    m_contentButton(0),
-    m_separator(0),
-    m_fromHereButton(0),
-    m_everywhereButton(0),
-    m_facetsToggleButton(0),
-    m_facetsWidget(0),
-    m_searchPath(),
-    m_startSearchTimer(0)
+#include <QUrlQuery>
+
+DolphinSearchBox::DolphinSearchBox(QWidget *parent)
+    : QWidget(parent)
+    , m_startedSearching(false)
+    , m_active(true)
+    , m_topLayout(nullptr)
+    , m_searchInput(nullptr)
+    , m_saveSearchAction(nullptr)
+    , m_optionsScrollArea(nullptr)
+    , m_fileNameButton(nullptr)
+    , m_contentButton(nullptr)
+    , m_separator(nullptr)
+    , m_fromHereButton(nullptr)
+    , m_everywhereButton(nullptr)
+    , m_facetsWidget(nullptr)
+    , m_searchPath()
+    , m_startSearchTimer(nullptr)

 {
 }
 
 {
 }
 


@@ -73,7 +58,7 @@ DolphinSearchBox::~DolphinSearchBox()
     saveSettings();
 }
 
     saveSettings();
 }
 

-void DolphinSearchBox::setText(const QString& text)
+void DolphinSearchBox::setText(const QString &text)

 {
     m_searchInput->setText(text);
 }
 {
     m_searchInput->setText(text);
 }


@@ -83,88 +68,88 @@ QString DolphinSearchBox::text() const
     return m_searchInput->text();
 }
 
     return m_searchInput->text();
 }
 

-void DolphinSearchBox::setSearchPath(const KUrl& url)
+void DolphinSearchBox::setSearchPath(const QUrl &url)

 {
 {

+    if (url == m_searchPath) {
+        return;
+    }
+
+    const QUrl cleanedUrl = url.adjusted(QUrl::RemoveUserInfo | QUrl::StripTrailingSlash);
+
+    if (cleanedUrl.path() == QDir::homePath()) {
+        m_fromHereButton->setChecked(false);
+        m_everywhereButton->setChecked(true);
+        if (!m_searchPath.isEmpty()) {
+            return;
+        }
+    } else {
+        m_everywhereButton->setChecked(false);
+        m_fromHereButton->setChecked(true);
+    }
+

     m_searchPath = url;
 
     QFontMetrics metrics(m_fromHereButton->font());
     const int maxWidth = metrics.height() * 8;
 
     m_searchPath = url;
 
     QFontMetrics metrics(m_fromHereButton->font());
     const int maxWidth = metrics.height() * 8;
 

-    QString location = url.fileName();
+    QString location = cleanedUrl.fileName();

     if (location.isEmpty()) {
     if (location.isEmpty()) {

-        if (url.isLocalFile()) {
-            location = QLatin1String("/");
-        } else {
-            location = url.protocol() + QLatin1String(" - ") + url.host();
-        }
+        location = cleanedUrl.toString(QUrl::PreferLocalFile);

     }
     }

-

     const QString elidedLocation = metrics.elidedText(location, Qt::ElideMiddle, maxWidth);
     m_fromHereButton->setText(i18nc("action:button", "From Here (%1)", elidedLocation));
     const QString elidedLocation = metrics.elidedText(location, Qt::ElideMiddle, maxWidth);
     m_fromHereButton->setText(i18nc("action:button", "From Here (%1)", elidedLocation));

-
-    const bool showSearchFromButtons = url.isLocalFile();
-    m_separator->setVisible(showSearchFromButtons);
-    m_fromHereButton->setVisible(showSearchFromButtons);
-    m_everywhereButton->setVisible(showSearchFromButtons);
-
-    bool hasFacetsSupport = false;
-#ifdef HAVE_BALOO
-    const Baloo::IndexerConfig searchInfo;
-    hasFacetsSupport = searchInfo.fileIndexingEnabled() && searchInfo.shouldBeIndexed(m_searchPath.toLocalFile());
-#endif
-    m_facetsWidget->setEnabled(hasFacetsSupport);
+    m_fromHereButton->setToolTip(i18nc("action:button", "Limit search to '%1' and its subfolders", cleanedUrl.toString(QUrl::PreferLocalFile)));

 }
 
 }
 

-KUrl DolphinSearchBox::searchPath() const
+QUrl DolphinSearchBox::searchPath() const

 {
 {

-    return m_searchPath;
+    return m_everywhereButton->isChecked() ? QUrl::fromLocalFile(QDir::homePath()) : m_searchPath;

 }
 
 }
 

-KUrl DolphinSearchBox::urlForSearching() const
+QUrl DolphinSearchBox::urlForSearching() const

 {
 {

-    KUrl url;
-    bool useBalooSearch = false;
-#ifdef HAVE_BALOO
-    const Baloo::IndexerConfig searchInfo;
-    useBalooSearch = searchInfo.fileIndexingEnabled() && searchInfo.shouldBeIndexed(m_searchPath.toLocalFile());
-#endif
-    if (useBalooSearch) {
+    QUrl url;
+
+    if (isIndexingEnabled()) {

         url = balooUrlForSearching();
     } else {
         url = balooUrlForSearching();
     } else {

-        url.setProtocol("filenamesearch");
-        url.addQueryItem("search", m_searchInput->text());
+        url.setScheme(QStringLiteral("filenamesearch"));
+
+        QUrlQuery query;
+        query.addQueryItem(QStringLiteral("search"), m_searchInput->text());

         if (m_contentButton->isChecked()) {
         if (m_contentButton->isChecked()) {

-            url.addQueryItem("checkContent", "yes");
+            query.addQueryItem(QStringLiteral("checkContent"), QStringLiteral("yes"));

         }
 
         }
 

-        QString encodedUrl;
-        if (m_everywhereButton->isChecked()) {
-            // It is very unlikely, that the majority of Dolphins target users
-            // mean "the whole harddisk" instead of "my home folder" when
-            // selecting the "Everywhere" button.
-            encodedUrl = QDir::homePath();
-        } else {
-            encodedUrl = m_searchPath.url();
-        }
-        url.addQueryItem("url", encodedUrl);
+        query.addQueryItem(QStringLiteral("url"), searchPath().url());
+        query.addQueryItem(QStringLiteral("title"), queryTitle(m_searchInput->text()));
+
+        url.setQuery(query);

     }
 
     return url;
 }
 
     }
 
     return url;
 }
 

-void DolphinSearchBox::fromSearchUrl(const KUrl& url)
+void DolphinSearchBox::fromSearchUrl(const QUrl &url)

 {
 {

-    if (url.protocol() == "baloosearch") {
-        fromBalooSearchUrl(url);
-    } else if (url.protocol() == "filenamesearch") {
-        const QMap<QString, QString>& queryItems = url.queryItems();
-        setText(queryItems.value("search"));
-        setSearchPath(queryItems.value("url"));
-        m_contentButton->setChecked(queryItems.value("checkContent") == "yes");
+    if (DolphinQuery::supportsScheme(url.scheme())) {
+        const DolphinQuery query = DolphinQuery::fromSearchUrl(url);
+        updateFromQuery(query);
+    } else if (url.scheme() == QLatin1String("filenamesearch")) {
+        const QUrlQuery query(url);
+        setText(query.queryItemValue(QStringLiteral("search")));
+        if (m_searchPath.scheme() != url.scheme()) {
+            m_searchPath = QUrl();
+        }
+        setSearchPath(QUrl::fromUserInput(query.queryItemValue(QStringLiteral("url")), QString(), QUrl::AssumeLocalFile));
+        m_contentButton->setChecked(query.queryItemValue(QStringLiteral("checkContent")) == QLatin1String("yes"));

     } else {
         setText(QString());
     } else {
         setText(QString());

+        m_searchPath = QUrl();

         setSearchPath(url);
     }
         setSearchPath(url);
     }

+
+    updateFacetsVisible();

 }
 
 void DolphinSearchBox::selectAll()
 }
 
 void DolphinSearchBox::selectAll()


@@ -178,7 +163,7 @@ void DolphinSearchBox::setActive(bool active)
         m_active = active;
 
         if (active) {
         m_active = active;
 
         if (active) {

-            emit activated();
+            Q_EMIT activated();

         }
     }
 }
         }
     }
 }


@@ -188,7 +173,7 @@ bool DolphinSearchBox::isActive() const
     return m_active;
 }
 
     return m_active;
 }
 

-bool DolphinSearchBox::event(QEvent* event)
+bool DolphinSearchBox::event(QEvent *event)

 {
     if (event->type() == QEvent::Polish) {
         init();
 {
     if (event->type() == QEvent::Polish) {
         init();


@@ -196,7 +181,7 @@ bool DolphinSearchBox::event(QEvent* event)
     return QWidget::event(event);
 }
 
     return QWidget::event(event);
 }
 

-void DolphinSearchBox::showEvent(QShowEvent* event)
+void DolphinSearchBox::showEvent(QShowEvent *event)

 {
     if (!event->spontaneous()) {
         m_searchInput->setFocus();
 {
     if (!event->spontaneous()) {
         m_searchInput->setFocus();


@@ -204,24 +189,42 @@ void DolphinSearchBox::showEvent(QShowEvent* event)
     }
 }
 
     }
 }
 

-void DolphinSearchBox::keyReleaseEvent(QKeyEvent* event)
+void DolphinSearchBox::hideEvent(QHideEvent *event)
+{
+    Q_UNUSED(event)
+    m_startedSearching = false;
+    m_startSearchTimer->stop();
+}
+
+void DolphinSearchBox::keyReleaseEvent(QKeyEvent *event)

 {
     QWidget::keyReleaseEvent(event);
     if (event->key() == Qt::Key_Escape) {
         if (m_searchInput->text().isEmpty()) {
 {
     QWidget::keyReleaseEvent(event);
     if (event->key() == Qt::Key_Escape) {
         if (m_searchInput->text().isEmpty()) {

-            emit closeRequest();
+            Q_EMIT closeRequest();

         } else {
             m_searchInput->clear();
         }
         } else {
             m_searchInput->clear();
         }

+    } else if (event->key() == Qt::Key_Down) {
+        Q_EMIT focusViewRequest();

     }
 }
 
     }
 }
 

-bool DolphinSearchBox::eventFilter(QObject* obj, QEvent* event)
+bool DolphinSearchBox::eventFilter(QObject *obj, QEvent *event)

 {
     switch (event->type()) {
     case QEvent::FocusIn:
 {
     switch (event->type()) {
     case QEvent::FocusIn:

-        setActive(true);
-        setFocus();
+        // #379135: we get the FocusIn event when we close a tab but we don't want to emit
+        // the activated() signal before the removeTab() call in DolphinTabWidget::closeTab() returns.
+        // To avoid this issue, we delay the activation of the search box.
+        // We also don't want to schedule the activation process if we are already active,
+        // otherwise we can enter in a loop of FocusIn/FocusOut events with the searchbox of another tab.
+        if (!isActive()) {
+            QTimer::singleShot(0, this, [this] {
+                setActive(true);
+                setFocus();
+            });
+        }

         break;
 
     default:
         break;
 
     default:


@@ -235,14 +238,16 @@ void DolphinSearchBox::emitSearchRequest()
 {
     m_startSearchTimer->stop();
     m_startedSearching = true;
 {
     m_startSearchTimer->stop();
     m_startedSearching = true;

-    emit searchRequest();
+    m_saveSearchAction->setEnabled(true);
+    Q_EMIT searchRequest();

 }
 
 void DolphinSearchBox::emitCloseRequest()
 {
     m_startSearchTimer->stop();
     m_startedSearching = false;
 }
 
 void DolphinSearchBox::emitCloseRequest()
 {
     m_startSearchTimer->stop();
     m_startedSearching = false;

-    emit closeRequest();
+    m_saveSearchAction->setEnabled(false);
+    Q_EMIT closeRequest();

 }
 
 void DolphinSearchBox::slotConfigurationChanged()
 }
 
 void DolphinSearchBox::slotConfigurationChanged()


@@ -253,46 +258,39 @@ void DolphinSearchBox::slotConfigurationChanged()
     }
 }
 
     }
 }
 

-void DolphinSearchBox::slotSearchTextChanged()
+void DolphinSearchBox::slotSearchTextChanged(const QString &text)

 {
 {

-    const QString text = m_searchInput->text();
-

     if (text.isEmpty()) {
         m_startSearchTimer->stop();
     } else {
         m_startSearchTimer->start();
     }
     if (text.isEmpty()) {
         m_startSearchTimer->stop();
     } else {
         m_startSearchTimer->start();
     }

-    emit searchTextChanged(text);
+    Q_EMIT searchTextChanged(text);

 }
 
 void DolphinSearchBox::slotReturnPressed()
 {
     emitSearchRequest();
 }
 
 void DolphinSearchBox::slotReturnPressed()
 {
     emitSearchRequest();

-    emit returnPressed(m_searchInput->text());
-}
-
-void DolphinSearchBox::updateSearchInputParsing()
-{
-#ifdef HAVE_BALOO
-    m_searchInput->setParsingEnabled(m_contentButton->isChecked());
-#endif
-}
-
-void DolphinSearchBox::slotFacetsButtonToggled()
-{
-    const bool facetsIsVisible = !m_facetsWidget->isVisible();
-    m_facetsWidget->setVisible(facetsIsVisible);
-    updateFacetsToggleButton();
+    Q_EMIT focusViewRequest();

 }
 
 void DolphinSearchBox::slotFacetChanged()
 {
     m_startedSearching = true;
     m_startSearchTimer->stop();
 }
 
 void DolphinSearchBox::slotFacetChanged()
 {
     m_startedSearching = true;
     m_startSearchTimer->stop();

-    emit searchRequest();
+    Q_EMIT searchRequest();

 }
 
 }
 

-void DolphinSearchBox::initButton(QToolButton* button)
+void DolphinSearchBox::slotSearchSaved()
+{
+    const QUrl searchURL = urlForSearching();
+    if (searchURL.isValid()) {
+        const QString label = i18n("Search for %1 in %2", text(), searchPath().fileName());
+        DolphinPlacesModelSingleton::instance().placesModel()->addPlace(label, searchURL, QStringLiteral("folder-saved-search-symbolic"));
+    }
+}
+
+void DolphinSearchBox::initButton(QToolButton *button)

 {
     button->installEventFilter(this);
     button->setAutoExclusive(true);
 {
     button->installEventFilter(this);
     button->setAutoExclusive(true);


@@ -315,56 +313,48 @@ void DolphinSearchBox::loadSettings()
         m_fileNameButton->setChecked(true);
     }
 
         m_fileNameButton->setChecked(true);
     }
 

-    m_facetsWidget->setVisible(SearchSettings::showFacetsWidget());
-    updateSearchInputParsing();
+    updateFacetsVisible();

 }
 
 void DolphinSearchBox::saveSettings()
 {
 }
 
 void DolphinSearchBox::saveSettings()
 {

-    SearchSettings::setLocation(m_fromHereButton->isChecked() ? "FromHere" : "Everywhere");
-    SearchSettings::setWhat(m_fileNameButton->isChecked() ? "FileName" : "Content");
-    SearchSettings::setShowFacetsWidget(m_facetsToggleButton->isChecked());
-    SearchSettings::self()->writeConfig();
+    SearchSettings::setLocation(m_fromHereButton->isChecked() ? QStringLiteral("FromHere") : QStringLiteral("Everywhere"));
+    SearchSettings::setWhat(m_fileNameButton->isChecked() ? QStringLiteral("FileName") : QStringLiteral("Content"));
+    SearchSettings::self()->save();

 }
 
 void DolphinSearchBox::init()
 {
 }
 
 void DolphinSearchBox::init()
 {

+    // Create search box
+    m_searchInput = new QLineEdit(this);
+    m_searchInput->setPlaceholderText(i18n("Search..."));
+    m_searchInput->installEventFilter(this);
+    m_searchInput->setClearButtonEnabled(true);
+    m_searchInput->setFont(QFontDatabase::systemFont(QFontDatabase::GeneralFont));
+    connect(m_searchInput, &QLineEdit::returnPressed, this, &DolphinSearchBox::slotReturnPressed);
+    connect(m_searchInput, &QLineEdit::textChanged, this, &DolphinSearchBox::slotSearchTextChanged);
+    setFocusProxy(m_searchInput);
+
+    // Add "Save search" button inside search box
+    m_saveSearchAction = new QAction(this);
+    m_saveSearchAction->setIcon(QIcon::fromTheme(QStringLiteral("document-save-symbolic")));
+    m_saveSearchAction->setText(i18nc("action:button", "Save this search to quickly access it again in the future"));
+    m_saveSearchAction->setEnabled(false);
+    m_searchInput->addAction(m_saveSearchAction, QLineEdit::TrailingPosition);
+    connect(m_saveSearchAction, &QAction::triggered, this, &DolphinSearchBox::slotSearchSaved);
+

     // Create close button
     // Create close button

-    QToolButton* closeButton = new QToolButton(this);
+    QToolButton *closeButton = new QToolButton(this);

     closeButton->setAutoRaise(true);
     closeButton->setAutoRaise(true);

-    closeButton->setIcon(KIcon("dialog-close"));
+    closeButton->setIcon(QIcon::fromTheme(QStringLiteral("dialog-close")));

     closeButton->setToolTip(i18nc("@info:tooltip", "Quit searching"));
     connect(closeButton, &QToolButton::clicked, this, &DolphinSearchBox::emitCloseRequest);
 
     closeButton->setToolTip(i18nc("@info:tooltip", "Quit searching"));
     connect(closeButton, &QToolButton::clicked, this, &DolphinSearchBox::emitCloseRequest);
 

-    // Create search label
-    m_searchLabel = new QLabel(this);
-
-    // Create search box
-#ifdef HAVE_BALOO
-    m_queryParser.reset(new Baloo::NaturalFileQueryParser);
-    m_searchInput = new Baloo::QueryBuilder(m_queryParser.data(), this);
-    connect(m_searchInput, &Baloo::QueryBuilder::editingFinished,
-            this, &DolphinSearchBox::slotReturnPressed);
-    connect(m_searchInput, &Baloo::QueryBuilder::textChanged,
-            this, &DolphinSearchBox::slotSearchTextChanged);
-#else
-    m_searchInput = new KLineEdit(this);
-    m_searchInput->installEventFilter(this);
-    m_searchInput->setClearButtonShown(true);
-    m_searchInput->setFont(KGlobalSettings::generalFont());
-    connect(m_searchInput, &KLineEdit::returnPressed,
-            this, &DolphinSearchBox::slotReturnPressed);
-    connect(m_searchInput, &KLineEdit::textChanged,
-            this, &DolphinSearchBox::slotSearchTextChanged);
-#endif
-    setFocusProxy(m_searchInput);
-

     // Apply layout for the search input
     // Apply layout for the search input

-    QHBoxLayout* searchInputLayout = new QHBoxLayout();
-    searchInputLayout->setMargin(0);
-    searchInputLayout->addWidget(closeButton);
-    searchInputLayout->addWidget(m_searchLabel);
+    QHBoxLayout *searchInputLayout = new QHBoxLayout();
+    searchInputLayout->setContentsMargins(0, 0, 0, 0);

     searchInputLayout->addWidget(m_searchInput);
     searchInputLayout->addWidget(m_searchInput);

+    searchInputLayout->addWidget(closeButton);

 
     // Create "Filename" and "Content" button
     m_fileNameButton = new QToolButton(this);
 
     // Create "Filename" and "Content" button
     m_fileNameButton = new QToolButton(this);


@@ -375,53 +365,64 @@ void DolphinSearchBox::init()
     m_contentButton->setText(i18nc("action:button", "Content"));
     initButton(m_contentButton);
 
     m_contentButton->setText(i18nc("action:button", "Content"));
     initButton(m_contentButton);
 

-    QButtonGroup* searchWhatGroup = new QButtonGroup(this);
+    QButtonGroup *searchWhatGroup = new QButtonGroup(this);

     searchWhatGroup->addButton(m_fileNameButton);
     searchWhatGroup->addButton(m_contentButton);
     searchWhatGroup->addButton(m_fileNameButton);
     searchWhatGroup->addButton(m_contentButton);

-    connect(searchWhatGroup, static_cast<void (QButtonGroup::*)(int)>(&QButtonGroup::buttonClicked),
-            this, &DolphinSearchBox::updateSearchInputParsing);

 
     m_separator = new KSeparator(Qt::Vertical, this);
 
 
     m_separator = new KSeparator(Qt::Vertical, this);
 

-    // Create "From Here" and "Everywhere"button
+    // Create "From Here" and "Your files" buttons

     m_fromHereButton = new QToolButton(this);
     m_fromHereButton->setText(i18nc("action:button", "From Here"));
     initButton(m_fromHereButton);
 
     m_everywhereButton = new QToolButton(this);
     m_fromHereButton = new QToolButton(this);
     m_fromHereButton->setText(i18nc("action:button", "From Here"));
     initButton(m_fromHereButton);
 
     m_everywhereButton = new QToolButton(this);

-    m_everywhereButton->setText(i18nc("action:button", "Everywhere"));
+    m_everywhereButton->setText(i18nc("action:button", "Your files"));
+    m_everywhereButton->setToolTip(i18nc("action:button", "Search in your home directory"));
+    m_everywhereButton->setIcon(QIcon::fromTheme(QStringLiteral("user-home")));
+    m_everywhereButton->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);

     initButton(m_everywhereButton);
 
     initButton(m_everywhereButton);
 

-    QButtonGroup* searchLocationGroup = new QButtonGroup(this);
+    QButtonGroup *searchLocationGroup = new QButtonGroup(this);

     searchLocationGroup->addButton(m_fromHereButton);
     searchLocationGroup->addButton(m_everywhereButton);
 
     searchLocationGroup->addButton(m_fromHereButton);
     searchLocationGroup->addButton(m_everywhereButton);
 

-    // Create "Facets" widgets
-    m_facetsToggleButton = new QToolButton(this);
-    m_facetsToggleButton->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
-    initButton(m_facetsToggleButton);
-    connect(m_facetsToggleButton, &QToolButton::clicked, this, &DolphinSearchBox::slotFacetsButtonToggled);
-
+    auto moreSearchToolsButton = new QToolButton(this);
+    moreSearchToolsButton->setAutoRaise(true);
+    moreSearchToolsButton->setPopupMode(QToolButton::InstantPopup);
+    moreSearchToolsButton->setIcon(QIcon::fromTheme("arrow-down-double"));
+    moreSearchToolsButton->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
+    moreSearchToolsButton->setText(i18n("More Search Tools"));
+    moreSearchToolsButton->setMenu(new QMenu(this));
+    connect(moreSearchToolsButton->menu(), &QMenu::aboutToShow, moreSearchToolsButton->menu(), [this, moreSearchToolsButton]() {
+        m_menuFactory.reset(new KMoreToolsMenuFactory("dolphin/search-tools"));
+        moreSearchToolsButton->menu()->clear();
+        m_menuFactory->fillMenuFromGroupingNames(moreSearchToolsButton->menu(), {"files-find"}, this->m_searchPath);
+    });
+
+    // Create "Facets" widget

     m_facetsWidget = new DolphinFacetsWidget(this);
     m_facetsWidget->installEventFilter(this);
     m_facetsWidget->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Maximum);
     m_facetsWidget = new DolphinFacetsWidget(this);
     m_facetsWidget->installEventFilter(this);
     m_facetsWidget->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Maximum);

+    m_facetsWidget->layout()->setSpacing(Dolphin::LAYOUT_SPACING_SMALL);

     connect(m_facetsWidget, &DolphinFacetsWidget::facetChanged, this, &DolphinSearchBox::slotFacetChanged);
 
     connect(m_facetsWidget, &DolphinFacetsWidget::facetChanged, this, &DolphinSearchBox::slotFacetChanged);
 

+    // Put the options into a QScrollArea. This prevents increasing the view width
+    // in case that not enough width for the options is available.
+    QWidget *optionsContainer = new QWidget(this);
+

     // Apply layout for the options
     // Apply layout for the options

-    QHBoxLayout* optionsLayout = new QHBoxLayout();
-    optionsLayout->setMargin(0);
+    QHBoxLayout *optionsLayout = new QHBoxLayout(optionsContainer);
+    optionsLayout->setContentsMargins(0, 0, 0, 0);
+    optionsLayout->setSpacing(Dolphin::LAYOUT_SPACING_SMALL);

     optionsLayout->addWidget(m_fileNameButton);
     optionsLayout->addWidget(m_contentButton);
     optionsLayout->addWidget(m_separator);
     optionsLayout->addWidget(m_fromHereButton);
     optionsLayout->addWidget(m_everywhereButton);
     optionsLayout->addWidget(m_fileNameButton);
     optionsLayout->addWidget(m_contentButton);
     optionsLayout->addWidget(m_separator);
     optionsLayout->addWidget(m_fromHereButton);
     optionsLayout->addWidget(m_everywhereButton);

+    optionsLayout->addWidget(new KSeparator(Qt::Vertical, this));
+    optionsLayout->addWidget(moreSearchToolsButton);

     optionsLayout->addStretch(1);
     optionsLayout->addStretch(1);

-    optionsLayout->addWidget(m_facetsToggleButton);
-
-    // Put the options into a QScrollArea. This prevents increasing the view width
-    // in case that not enough width for the options is available.
-    QWidget* optionsContainer = new QWidget(this);
-    optionsContainer->setLayout(optionsLayout);

 
     m_optionsScrollArea = new QScrollArea(this);
     m_optionsScrollArea->setFrameShape(QFrame::NoFrame);
 
     m_optionsScrollArea = new QScrollArea(this);
     m_optionsScrollArea->setFrameShape(QFrame::NoFrame);


@@ -433,7 +434,8 @@ void DolphinSearchBox::init()
     m_optionsScrollArea->setWidgetResizable(true);
 
     m_topLayout = new QVBoxLayout(this);
     m_optionsScrollArea->setWidgetResizable(true);
 
     m_topLayout = new QVBoxLayout(this);

-    m_topLayout->setMargin(0);
+    m_topLayout->setContentsMargins(0, Dolphin::LAYOUT_SPACING_SMALL, 0, 0);
+    m_topLayout->setSpacing(Dolphin::LAYOUT_SPACING_SMALL);

     m_topLayout->addLayout(searchInputLayout);
     m_topLayout->addWidget(m_optionsScrollArea);
     m_topLayout->addWidget(m_facetsWidget);
     m_topLayout->addLayout(searchInputLayout);
     m_topLayout->addWidget(m_optionsScrollArea);
     m_topLayout->addWidget(m_facetsWidget);


@@ -446,95 +448,89 @@ void DolphinSearchBox::init()
     m_startSearchTimer->setSingleShot(true);
     m_startSearchTimer->setInterval(1000);
     connect(m_startSearchTimer, &QTimer::timeout, this, &DolphinSearchBox::emitSearchRequest);
     m_startSearchTimer->setSingleShot(true);
     m_startSearchTimer->setInterval(1000);
     connect(m_startSearchTimer, &QTimer::timeout, this, &DolphinSearchBox::emitSearchRequest);

+}

 
 

-    updateFacetsToggleButton();
+QString DolphinSearchBox::queryTitle(const QString &text) const
+{
+    return i18nc("@title UDS_DISPLAY_NAME for a KIO directory listing. %1 is the query the user entered.", "Query Results from '%1'", text);

 }
 
 }
 

-KUrl DolphinSearchBox::balooUrlForSearching() const
+QUrl DolphinSearchBox::balooUrlForSearching() const

 {
 {

-#ifdef HAVE_BALOO
+#if HAVE_BALOO

     const QString text = m_searchInput->text();
 
     Baloo::Query query;
     const QString text = m_searchInput->text();
 
     Baloo::Query query;

-
-    if (m_contentButton->isChecked()) {
-        query = m_queryParser->parse(text, Baloo::NaturalQueryParser::DetectFilenamePattern);
-    } else {
-        query.setTerm(Baloo::Term(QLatin1String("filename"), text));
-    }
-
-    // Configure the query so that it returns files and takes the rating into account
-    query.addType("File");

     query.addType(m_facetsWidget->facetType());
 
     query.addType(m_facetsWidget->facetType());
 

-    Baloo::Term term(Baloo::Term::And);
-    Baloo::Term ratingTerm = m_facetsWidget->ratingTerm();
-
-    if (ratingTerm.isValid()) {
-        term.addSubTerm(query.term());
-        term.addSubTerm(ratingTerm);
+    QStringList queryStrings = m_facetsWidget->searchTerms();

 
 

-        query.setTerm(term);
+    if (m_contentButton->isChecked()) {
+        queryStrings << text;
+    } else if (!text.isEmpty()) {
+        queryStrings << QStringLiteral("filename:\"%1\"").arg(text);

     }
 
     if (m_fromHereButton->isChecked()) {
     }
 
     if (m_fromHereButton->isChecked()) {

-        query.addCustomOption("includeFolder", m_searchPath.toLocalFile());
+        query.setIncludeFolder(m_searchPath.toLocalFile());

     }
 
     }
 

-    return query.toSearchUrl(i18nc("@title UDS_DISPLAY_NAME for a KIO directory listing. %1 is the query the user entered.",
-                                   "Query Results from '%1'", text));
+    query.setSearchString(queryStrings.join(QLatin1Char(' ')));
+
+    return query.toSearchUrl(queryTitle(text));

 #else
 #else

-    return KUrl();
+    return QUrl();

 #endif
 }
 
 #endif
 }
 

-void DolphinSearchBox::fromBalooSearchUrl(const KUrl& url)
+void DolphinSearchBox::updateFromQuery(const DolphinQuery &query)

 {
 {

-#ifdef HAVE_BALOO
-    const Baloo::Query query = Baloo::Query::fromSearchUrl(url);
-    const Baloo::Term term = query.term();
-

     // Block all signals to avoid unnecessary "searchRequest" signals
     // while we adjust the search text and the facet widget.
     blockSignals(true);
 
     // Block all signals to avoid unnecessary "searchRequest" signals
     // while we adjust the search text and the facet widget.
     blockSignals(true);
 

-    const QVariantMap customOptions = query.customOptions();
-    if (customOptions.contains("includeFolder")) {
-        setSearchPath(customOptions.value("includeFolder").toString());
+    const QString customDir = query.includeFolder();
+    if (!customDir.isEmpty()) {
+        setSearchPath(QUrl::fromLocalFile(customDir));

     } else {
     } else {

-        setSearchPath(QDir::homePath());
+        setSearchPath(QUrl::fromLocalFile(QDir::homePath()));

     }
 
     }
 

-    if (!query.searchString().isEmpty()) {
-        setText(query.searchString());
+    // If the input box has focus, do not update to avoid messing with user typing
+    if (!m_searchInput->hasFocus()) {
+        setText(query.text());

     }
 
     }
 

-    QStringList types = query.types();
-    types.removeOne("File"); // We are only interested in facet widget types
-    if (!types.isEmpty()) {
-        m_facetsWidget->setFacetType(types.first());
+    if (query.hasContentSearch()) {
+        m_contentButton->setChecked(true);
+    } else if (query.hasFileName()) {
+        m_fileNameButton->setChecked(true);

     }
 
     }
 

-    foreach (const Baloo::Term& subTerm, term.subTerms()) {
-        const QString property = subTerm.property();
-
-        if (property == QLatin1String("filename")) {
-            setText(subTerm.value().toString());
-        } else if (m_facetsWidget->isRatingTerm(subTerm)) {
-            m_facetsWidget->setRatingTerm(subTerm);
-        }
+    m_facetsWidget->resetSearchTerms();
+    m_facetsWidget->setFacetType(query.type());
+    const QStringList searchTerms = query.searchTerms();
+    for (const QString &searchTerm : searchTerms) {
+        m_facetsWidget->setSearchTerm(searchTerm);

     }
 
     m_startSearchTimer->stop();
     blockSignals(false);
     }
 
     m_startSearchTimer->stop();
     blockSignals(false);

-#endif

 }
 
 }
 

-void DolphinSearchBox::updateFacetsToggleButton()
+void DolphinSearchBox::updateFacetsVisible()

 {
 {

-    const bool facetsIsVisible = SearchSettings::showFacetsWidget();
-    m_facetsToggleButton->setChecked(facetsIsVisible ? true : false);
-    m_facetsToggleButton->setIcon(KIcon(facetsIsVisible ? "arrow-up-double" : "arrow-down-double"));
-    m_facetsToggleButton->setText(facetsIsVisible ? i18nc("action:button", "Fewer Options") : i18nc("action:button", "More Options"));
+    const bool indexingEnabled = isIndexingEnabled();
+    m_facetsWidget->setEnabled(indexingEnabled);
+    m_facetsWidget->setVisible(indexingEnabled);

 }
 
 }
 

+bool DolphinSearchBox::isIndexingEnabled() const
+{
+#if HAVE_BALOO
+    const Baloo::IndexerConfig searchInfo;
+    return searchInfo.fileIndexingEnabled() && !searchPath().isEmpty() && searchInfo.shouldBeIndexed(searchPath().toLocalFile());
+#else
+    return false;
+#endif
+}