Move search and filter bar close buttons to the right

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

diff --git a/src/search/dolphinsearchbox.cpp b/src/search/dolphinsearchbox.cpp
index 3a6120d413eea9f5c7f1fe37042c87ce8f93b532..f0d8c541653478c3b71f18cc0df3a2548baeea54 100644 (file)
--- a/src/search/dolphinsearchbox.cpp
+++ b/src/search/dolphinsearchbox.cpp
@@ -17,58 +17,53 @@
 *    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA           *
 * **************************************************************************/
 
 *    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA           *
 * **************************************************************************/
 

+#include "global.h"

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

-#include "dolphinsearchinformation.h"
+#include "dolphinfacetswidget.h"
+#include "dolphinquery.h"
+#include "panels/places/placesitemmodel.h"

 
 

-#include <KIcon>
-#include <KLineEdit>
-#include <KLocale>
+#include <KLocalizedString>
+#include <KNS3/KMoreToolsMenuFactory>

 #include <KSeparator>
 #include <KSeparator>

+#include <config-baloo.h>
+#ifdef HAVE_BALOO
+#include <Baloo/Query>
+#include <Baloo/IndexerConfig>
+#endif

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

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

 #include <QHBoxLayout>
 #include <QHBoxLayout>

+#include <QIcon>

 #include <QKeyEvent>
 #include <QLabel>
 #include <QKeyEvent>
 #include <QLabel>

-#include <QPushButton>
+#include <QLineEdit>

 #include <QScrollArea>
 #include <QScrollArea>

+#include <QShowEvent>

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

-#include <QVBoxLayout>
-
-#include <config-nepomuk.h>
-#ifdef HAVE_NEPOMUK
-    #include <Nepomuk/Query/FileQuery>
-    #include <Nepomuk/Query/LiteralTerm>
-    #include <Nepomuk/Query/OrTerm>
-    #include <Nepomuk/Query/Query>
-    #include <Nepomuk/Query/QueryParser>
-    #include <Nepomuk/Query/ResourceTypeTerm>
-    #include <Nepomuk/Query/ComparisonTerm>
-    #include <Nepomuk/ResourceManager>
-    #include <Nepomuk/Vocabulary/NFO>
-#endif
+#include <QUrlQuery>

 
 DolphinSearchBox::DolphinSearchBox(QWidget* parent) :
     QWidget(parent),
     m_startedSearching(false),
 
 DolphinSearchBox::DolphinSearchBox(QWidget* parent) :
     QWidget(parent),
     m_startedSearching(false),

-    m_readOnly(false),
-    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_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_searchPath(),

-    m_readOnlyQuery(),
-    m_startSearchTimer(0)
+    m_startSearchTimer(nullptr)

 {
 }
 
 {
 }
 


@@ -87,81 +82,109 @@ 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());
     m_searchPath = url;
 
     QFontMetrics metrics(m_fromHereButton->font());

-    const int maxWidth = metrics.averageCharWidth() * 15;
+    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_readOnly;
-    m_separator->setVisible(showSearchFromButtons);
-    m_fromHereButton->setVisible(showSearchFromButtons);
-    m_everywhereButton->setVisible(showSearchFromButtons);
+    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;
-    const DolphinSearchInformation& searchInfo = DolphinSearchInformation::instance();
-    if (searchInfo.isIndexingEnabled() && searchInfo.isPathIndexed(m_searchPath)) {
-        url = nepomukUrlForSearching();
+    QUrl url;
+
+    if (isIndexingEnabled()) {
+        url = balooUrlForSearching();

     } else {
     } 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 QUrl& url)
+{
+    if (url.scheme() == QLatin1String("baloosearch")) {
+        const DolphinQuery query = DolphinQuery::fromBalooSearchUrl(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());
+        m_searchPath = QUrl();
+        setSearchPath(url);
+    }
+
+    updateFacetsVisible();
+}
+

 void DolphinSearchBox::selectAll()
 {
     m_searchInput->selectAll();
 }
 
 void DolphinSearchBox::selectAll()
 {
     m_searchInput->selectAll();
 }
 

-void DolphinSearchBox::setReadOnly(bool readOnly, const KUrl& query)
+void DolphinSearchBox::setActive(bool active)

 {
 {

-    if (m_readOnly != readOnly) {
-        m_readOnly = readOnly;
-        m_readOnlyQuery = query;
-        applyReadOnlyState();
+    if (active != m_active) {
+        m_active = active;
+
+        if (active) {
+            emit activated();
+        }

     }
 }
 
     }
 }
 

-bool DolphinSearchBox::isReadOnly() const
+bool DolphinSearchBox::isActive() const

 {
 {

-    return m_readOnly;
+    return m_active;

 }
 
 bool DolphinSearchBox::event(QEvent* event)
 }
 
 bool DolphinSearchBox::event(QEvent* event)


@@ -180,6 +203,13 @@ void DolphinSearchBox::showEvent(QShowEvent* event)
     }
 }
 
     }
 }
 

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

 void DolphinSearchBox::keyReleaseEvent(QKeyEvent* event)
 {
     QWidget::keyReleaseEvent(event);
 void DolphinSearchBox::keyReleaseEvent(QKeyEvent* event)
 {
     QWidget::keyReleaseEvent(event);


@@ -190,51 +220,102 @@ void DolphinSearchBox::keyReleaseEvent(QKeyEvent* event)
             m_searchInput->clear();
         }
     }
             m_searchInput->clear();
         }
     }

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

 }
 
 }
 

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

 {
 {

-    m_startSearchTimer->stop();
-    m_startedSearching = true;
-    emit search(m_searchInput->text());
+    switch (event->type()) {
+    case QEvent::FocusIn:
+        // #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;
+    }
+
+    return QObject::eventFilter(obj, event);

 }
 
 }
 

-void DolphinSearchBox::slotSearchLocationChanged()
+void DolphinSearchBox::emitSearchRequest()

 {
 {

-    emit searchLocationChanged(m_fromHereButton->isChecked() ? SearchFromHere : SearchEverywhere);
+    m_startSearchTimer->stop();
+    m_startedSearching = true;
+    m_saveSearchAction->setEnabled(true);
+    emit searchRequest();

 }
 
 }
 

-void DolphinSearchBox::slotSearchContextChanged()
+void DolphinSearchBox::emitCloseRequest()

 {
 {

-    emit searchContextChanged(m_fileNameButton->isChecked() ? SearchFileName : SearchContent);
+    m_startSearchTimer->stop();
+    m_startedSearching = false;
+    m_saveSearchAction->setEnabled(false);
+    emit closeRequest();

 }
 
 void DolphinSearchBox::slotConfigurationChanged()
 {
     saveSettings();
     if (m_startedSearching) {
 }
 
 void DolphinSearchBox::slotConfigurationChanged()
 {
     saveSettings();
     if (m_startedSearching) {

-        emitSearchSignal();
+        emitSearchRequest();

     }
 }
 
 void DolphinSearchBox::slotSearchTextChanged(const QString& text)
 {
     }
 }
 
 void DolphinSearchBox::slotSearchTextChanged(const QString& text)
 {

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

     emit searchTextChanged(text);
 }
 
     emit searchTextChanged(text);
 }
 

-void DolphinSearchBox::slotReturnPressed(const QString& text)
+void DolphinSearchBox::slotReturnPressed()
+{
+    emitSearchRequest();
+    emit focusViewRequest();
+}
+
+void DolphinSearchBox::slotFacetChanged()

 {
 {

-    emitSearchSignal();
-    emit returnPressed(text);
+    m_startedSearching = true;
+    m_startSearchTimer->stop();
+    emit searchRequest();

 }
 
 }
 

-void DolphinSearchBox::initButton(QPushButton* button)
+void DolphinSearchBox::slotSearchSaved()

 {
 {

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

     button->setAutoExclusive(true);
     button->setAutoExclusive(true);

-    button->setFlat(true);
+    button->setAutoRaise(true);

     button->setCheckable(true);
     button->setCheckable(true);

-    connect(button, SIGNAL(clicked(bool)), this, SLOT(slotConfigurationChanged()));
+    connect(button, &QToolButton::clicked, this, &DolphinSearchBox::slotConfigurationChanged);

 }
 
 void DolphinSearchBox::loadSettings()
 }
 
 void DolphinSearchBox::loadSettings()


@@ -250,84 +331,115 @@ void DolphinSearchBox::loadSettings()
     } else {
         m_fileNameButton->setChecked(true);
     }
     } else {
         m_fileNameButton->setChecked(true);
     }

+
+    updateFacetsVisible();

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

-    SearchSettings::setLocation(m_fromHereButton->isChecked() ? "FromHere" : "Everywhere");
-    SearchSettings::setWhat(m_fileNameButton->isChecked() ? "FileName" : "Content");
-    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
     QToolButton* closeButton = new QToolButton(this);
     closeButton->setAutoRaise(true);
     // Create close button
     QToolButton* closeButton = new QToolButton(this);
     closeButton->setAutoRaise(true);

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

     closeButton->setToolTip(i18nc("@info:tooltip", "Quit searching"));
     closeButton->setToolTip(i18nc("@info:tooltip", "Quit searching"));

-    connect(closeButton, SIGNAL(clicked()), SIGNAL(closeRequest()));
-
-    // Create search label
-    m_searchLabel = new QLabel(this);
-
-    // Create search box
-    m_searchInput = new KLineEdit(this);
-    m_searchInput->setClearButtonShown(true);
-    m_searchInput->setFont(KGlobalSettings::generalFont());
-    setFocusProxy(m_searchInput);
-    connect(m_searchInput, SIGNAL(returnPressed(QString)),
-            this, SLOT(slotReturnPressed(QString)));
-    connect(m_searchInput, SIGNAL(textChanged(QString)),
-            this, SLOT(slotSearchTextChanged(QString)));
+    connect(closeButton, &QToolButton::clicked, this, &DolphinSearchBox::emitCloseRequest);

 
     // Apply layout for the search input
     QHBoxLayout* searchInputLayout = new QHBoxLayout();
 
     // Apply layout for the search input
     QHBoxLayout* searchInputLayout = new QHBoxLayout();

-    searchInputLayout->setMargin(0);
-    searchInputLayout->addWidget(closeButton);
-    searchInputLayout->addWidget(m_searchLabel);
+    searchInputLayout->setContentsMargins(0, 0, 0, 0);

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

+    searchInputLayout->addWidget(closeButton);

 
     // Create "Filename" and "Content" button
 
     // Create "Filename" and "Content" button

-    m_fileNameButton = new QPushButton(this);
+    m_fileNameButton = new QToolButton(this);

     m_fileNameButton->setText(i18nc("action:button", "Filename"));
     initButton(m_fileNameButton);
 
     m_fileNameButton->setText(i18nc("action:button", "Filename"));
     initButton(m_fileNameButton);
 

-    m_contentButton = new QPushButton();
+    m_contentButton = new QToolButton();

     m_contentButton->setText(i18nc("action:button", "Content"));
     m_contentButton->setText(i18nc("action:button", "Content"));

-    initButton(m_contentButton);;
+    initButton(m_contentButton);

 
     QButtonGroup* searchWhatGroup = new QButtonGroup(this);
     searchWhatGroup->addButton(m_fileNameButton);
     searchWhatGroup->addButton(m_contentButton);
 
     QButtonGroup* searchWhatGroup = new QButtonGroup(this);
     searchWhatGroup->addButton(m_fileNameButton);
     searchWhatGroup->addButton(m_contentButton);

-    connect(m_fileNameButton, SIGNAL(clicked()), this, SLOT(slotSearchContextChanged()));
-    connect(m_contentButton, SIGNAL(clicked()), this, SLOT(slotSearchContextChanged()));

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

-    // Create "From Here" and "Everywhere"button
-    m_fromHereButton = new QPushButton(this);
+    // Create "From Here" and "Your files" buttons
+    m_fromHereButton = new QToolButton(this);

     m_fromHereButton->setText(i18nc("action:button", "From Here"));
     initButton(m_fromHereButton);
 
     m_fromHereButton->setText(i18nc("action:button", "From Here"));
     initButton(m_fromHereButton);
 

-    m_everywhereButton = new QPushButton(this);
-    m_everywhereButton->setText(i18nc("action:button", "Everywhere"));
+    m_everywhereButton = new QToolButton(this);
+    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);
 
     QButtonGroup* searchLocationGroup = new QButtonGroup(this);
     searchLocationGroup->addButton(m_fromHereButton);
     searchLocationGroup->addButton(m_everywhereButton);
     initButton(m_everywhereButton);
 
     QButtonGroup* searchLocationGroup = new QButtonGroup(this);
     searchLocationGroup->addButton(m_fromHereButton);
     searchLocationGroup->addButton(m_everywhereButton);

-    connect(m_fromHereButton, SIGNAL(clicked()), this, SLOT(slotSearchLocationChanged()));
-    connect(m_everywhereButton, SIGNAL(clicked()), this, SLOT(slotSearchLocationChanged()));
+
+    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->layout()->setSpacing(Dolphin::LAYOUT_SPACING_SMALL);
+    connect(m_facetsWidget, &DolphinFacetsWidget::facetChanged, this, &DolphinSearchBox::slotFacetChanged);

 
     // Apply layout for the options
     QHBoxLayout* optionsLayout = new QHBoxLayout();
 
     // Apply layout for the options
     QHBoxLayout* optionsLayout = new QHBoxLayout();

-    optionsLayout->setMargin(0);
+    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);
 
     // Put the options into a QScrollArea. This prevents increasing the view width
     optionsLayout->addStretch(1);
 
     // Put the options into a QScrollArea. This prevents increasing the view width


@@ -345,9 +457,11 @@ 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, 0, 0, 0);
+    m_topLayout->setSpacing(Dolphin::LAYOUT_SPACING_SMALL);

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

+    m_topLayout->addWidget(m_facetsWidget);

 
     loadSettings();
 
 
     loadSettings();
 


@@ -356,62 +470,88 @@ void DolphinSearchBox::init()
     m_startSearchTimer = new QTimer(this);
     m_startSearchTimer->setSingleShot(true);
     m_startSearchTimer->setInterval(1000);
     m_startSearchTimer = new QTimer(this);
     m_startSearchTimer->setSingleShot(true);
     m_startSearchTimer->setInterval(1000);

-    connect(m_startSearchTimer, SIGNAL(timeout()), this, SLOT(emitSearchSignal()));
-
-    applyReadOnlyState();
+    connect(m_startSearchTimer, &QTimer::timeout, this, &DolphinSearchBox::emitSearchRequest);

 }
 
 }
 

-KUrl DolphinSearchBox::nepomukUrlForSearching() const
+QString DolphinSearchBox::queryTitle(const QString& text) const

 {
 {

-#ifdef HAVE_NEPOMUK
-    Nepomuk::Query::OrTerm orTerm;
+    return i18nc("@title UDS_DISPLAY_NAME for a KIO directory listing. %1 is the query the user entered.",
+                             "Query Results from '%1'", text);
+}

 
 

+QUrl DolphinSearchBox::balooUrlForSearching() const
+{
+#ifdef HAVE_BALOO

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

-    // Search the text in the filename in any case
-    QString regex = QRegExp::escape(text);
-    regex.replace("\\*", QLatin1String(".*"));
-    regex.replace("\\?", QLatin1String("."));
-    regex.replace("\\", "\\\\");
-    orTerm.addSubTerm(Nepomuk::Query::ComparisonTerm(
-                            Nepomuk::Vocabulary::NFO::fileName(),
-                            Nepomuk::Query::LiteralTerm(regex),
-                            Nepomuk::Query::ComparisonTerm::Regexp));
+    Baloo::Query query;
+    query.addType(m_facetsWidget->facetType());
+
+    QStringList queryStrings = m_facetsWidget->searchTerms();

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

-        // Search the text also in the content of the files
-        const Nepomuk::Query::Query customQuery = Nepomuk::Query::QueryParser::parseQuery(text, Nepomuk::Query::QueryParser::DetectFilenamePattern);
-        if (customQuery.isValid()) {
-            orTerm.addSubTerm(customQuery.term());
-        }
+        queryStrings << text;
+    } else if (!text.isEmpty()) {
+        queryStrings << QStringLiteral("filename:\"%1\"").arg(text);

     }
 
     }
 

-    Nepomuk::Query::FileQuery fileQuery;
-    fileQuery.setFileMode(Nepomuk::Query::FileQuery::QueryFilesAndFolders);
-    fileQuery.setTerm(orTerm);

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

-        const bool recursive = true;
-        fileQuery.addIncludeFolder(m_searchPath, recursive);
+        query.setIncludeFolder(m_searchPath.toLocalFile());

     }
 
     }
 

-    return fileQuery.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::applyReadOnlyState()
+void DolphinSearchBox::updateFromQuery(const DolphinQuery& query)

 {
 {

-    if (m_readOnly) {
-        m_searchLabel->setText(Nepomuk::Query::Query::titleFromQueryUrl(m_readOnlyQuery));
+    // Block all signals to avoid unnecessary "searchRequest" signals
+    // while we adjust the search text and the facet widget.
+    blockSignals(true);
+
+    const QString customDir = query.includeFolder();
+    if (!customDir.isEmpty()) {
+        setSearchPath(QUrl::fromLocalFile(customDir));

     } else {
     } else {

-        m_searchLabel->setText(i18nc("@label:textbox", "Find:"));
+        setSearchPath(QUrl::fromLocalFile(QDir::homePath()));
+    }
+
+    setText(query.text());
+
+    if (query.hasContentSearch()) {
+        m_contentButton->setChecked(true);
+    } else if (query.hasFileName())  {
+        m_fileNameButton->setChecked(true);
+    }
+
+    m_facetsWidget->resetSearchTerms();
+    m_facetsWidget->setFacetType(query.type());
+    const QStringList searchTerms = query.searchTerms();
+    for (const QString& searchTerm : searchTerms) {
+        m_facetsWidget->setSearchTerm(searchTerm);

     }
 
     }
 

-    m_searchInput->setVisible(!m_readOnly);
-    m_optionsScrollArea->setVisible(!m_readOnly);
+    m_startSearchTimer->stop();
+    blockSignals(false);

 }
 
 }
 

-#include "dolphinsearchbox.moc"
+void DolphinSearchBox::updateFacetsVisible()
+{
+    const bool indexingEnabled = isIndexingEnabled();
+    m_facetsWidget->setEnabled(indexingEnabled);
+    m_facetsWidget->setVisible(indexingEnabled);
+}
+
+bool DolphinSearchBox::isIndexingEnabled() const
+{
+#ifdef HAVE_BALOO
+    const Baloo::IndexerConfig searchInfo;
+    return searchInfo.fileIndexingEnabled() && !searchPath().isEmpty() && searchInfo.shouldBeIndexed(searchPath().toLocalFile());
+#else
+    return false;
+#endif
+}