Correct searchbox, split view transitions between tabs

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

diff --git a/src/search/dolphinsearchbox.cpp b/src/search/dolphinsearchbox.cpp
index 08d0433920046bb7e15e4550b67ca89fcdb5bd75..c6943c60881c6dcfe8fc6c5bf2b3729e318d3742 100644 (file)
--- a/src/search/dolphinsearchbox.cpp
+++ b/src/search/dolphinsearchbox.cpp
@@ -21,17 +21,16 @@
 
 #include "dolphin_searchsettings.h"
 #include "dolphinfacetswidget.h"
 
 #include "dolphin_searchsettings.h"
 #include "dolphinfacetswidget.h"

-#include "dolphinsearchinformation.h"

 
 

-#include <KIcon>
-#include <KLineEdit>
-#include <KLocale>
+#include <QIcon>
+#include <QLineEdit>
+#include <KLocalizedString>

 #include <KSeparator>
 #include <KSeparator>

+#include <KNS3/KMoreToolsMenuFactory>

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

-#include <QFormLayout>

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


@@ -39,25 +38,19 @@
 #include <QTimer>
 #include <QToolButton>
 #include <QVBoxLayout>
 #include <QTimer>
 #include <QToolButton>
 #include <QVBoxLayout>

+#include <QUrlQuery>

 
 

-#include <config-nepomuk.h>
-#ifdef HAVE_NEPOMUK
-    #include <Nepomuk2/Query/AndTerm>
-    #include <Nepomuk2/Query/FileQuery>
-    #include <Nepomuk2/Query/LiteralTerm>
-    #include <Nepomuk2/Query/OrTerm>
-    #include <Nepomuk2/Query/Query>
-    #include <Nepomuk2/Query/QueryParser>
-    #include <Nepomuk2/Query/ResourceTypeTerm>
-    #include <Nepomuk2/Query/ComparisonTerm>
-    #include <Nepomuk2/ResourceManager>
-    #include <Nepomuk2/Vocabulary/NFO>
+#include <config-baloo.h>
+#ifdef HAVE_BALOO
+    #include <Baloo/Query>
+    #include <Baloo/IndexerConfig>

 #endif
 #endif

+#include <QFontDatabase>

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

-    m_readOnly(false),
+    m_active(true),

     m_topLayout(0),
     m_searchLabel(0),
     m_searchInput(0),
     m_topLayout(0),
     m_searchLabel(0),
     m_searchInput(0),


@@ -70,7 +63,6 @@ DolphinSearchBox::DolphinSearchBox(QWidget* parent) :
     m_facetsToggleButton(0),
     m_facetsWidget(0),
     m_searchPath(),
     m_facetsToggleButton(0),
     m_facetsWidget(0),
     m_searchPath(),

-    m_readOnlyQuery(),

     m_startSearchTimer(0)
 {
 }
     m_startSearchTimer(0)
 {
 }


@@ -90,7 +82,7 @@ QString DolphinSearchBox::text() const
     return m_searchInput->text();
 }
 
     return m_searchInput->text();
 }
 

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

 {
     m_searchPath = url;
 
 {
     m_searchPath = url;
 


@@ -100,41 +92,50 @@ void DolphinSearchBox::setSearchPath(const KUrl& url)
     QString location = url.fileName();
     if (location.isEmpty()) {
         if (url.isLocalFile()) {
     QString location = url.fileName();
     if (location.isEmpty()) {
         if (url.isLocalFile()) {

-            location = QLatin1String("/");
+            location = QStringLiteral("/");

         } else {
         } else {

-            location = url.protocol() + QLatin1String(" - ") + url.host();
+            location = url.scheme() + QLatin1String(" - ") + url.host();

         }
     }
 
     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;
+    const bool showSearchFromButtons = url.isLocalFile();

     m_separator->setVisible(showSearchFromButtons);
     m_fromHereButton->setVisible(showSearchFromButtons);
     m_everywhereButton->setVisible(showSearchFromButtons);
 
     m_separator->setVisible(showSearchFromButtons);
     m_fromHereButton->setVisible(showSearchFromButtons);
     m_everywhereButton->setVisible(showSearchFromButtons);
 

-    const DolphinSearchInformation& searchInfo = DolphinSearchInformation::instance();
-    const bool hasFacetsSupport = searchInfo.isIndexingEnabled() && searchInfo.isPathIndexed(m_searchPath);
+    bool hasFacetsSupport = false;
+#ifdef HAVE_BALOO
+    const Baloo::IndexerConfig searchInfo;
+    hasFacetsSupport = searchInfo.fileIndexingEnabled() && searchInfo.shouldBeIndexed(m_searchPath.toLocalFile());
+#endif

     m_facetsWidget->setEnabled(hasFacetsSupport);
 }
 
     m_facetsWidget->setEnabled(hasFacetsSupport);
 }
 

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

 {
     return m_searchPath;
 }
 
 {
     return 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;
+    bool useBalooSearch = false;
+#ifdef HAVE_BALOO
+    const Baloo::IndexerConfig searchInfo;
+    useBalooSearch = searchInfo.fileIndexingEnabled() && searchInfo.shouldBeIndexed(m_searchPath.toLocalFile());
+#endif
+    if (useBalooSearch) {
+        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;
         }
 
         QString encodedUrl;


@@ -146,29 +147,48 @@ KUrl DolphinSearchBox::urlForSearching() const
         } else {
             encodedUrl = m_searchPath.url();
         }
         } else {
             encodedUrl = m_searchPath.url();
         }

-        url.addQueryItem("url", encodedUrl);
+        query.addQueryItem(QStringLiteral("url"), encodedUrl);
+
+        url.setQuery(query);

     }
 
     return url;
 }
 
     }
 
     return url;
 }
 

+void DolphinSearchBox::fromSearchUrl(const QUrl& url)
+{
+    if (url.scheme() == QLatin1String("baloosearch")) {
+        fromBalooSearchUrl(url);
+    } else if (url.scheme() == QLatin1String("filenamesearch")) {
+        const QUrlQuery query(url);
+        setText(query.queryItemValue(QStringLiteral("search")));
+        setSearchPath(QUrl::fromUserInput(query.queryItemValue(QStringLiteral("url")), QString(), QUrl::AssumeLocalFile));
+        m_contentButton->setChecked(query.queryItemValue(QStringLiteral("checkContent")) == QLatin1String("yes"));
+    } else {
+        setText(QString());
+        setSearchPath(url);
+    }
+}
+

 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)


@@ -187,6 +207,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);


@@ -199,6 +226,26 @@ void DolphinSearchBox::keyReleaseEvent(QKeyEvent* event)
     }
 }
 
     }
 }
 

+bool DolphinSearchBox::eventFilter(QObject* obj, QEvent* event)
+{
+    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.
+        QTimer::singleShot(0, this, [this] {
+            setActive(true);
+            setFocus();
+        });
+        break;
+
+    default:
+        break;
+    }
+
+    return QObject::eventFilter(obj, event);
+}
+

 void DolphinSearchBox::emitSearchRequest()
 {
     m_startSearchTimer->stop();
 void DolphinSearchBox::emitSearchRequest()
 {
     m_startSearchTimer->stop();


@@ -223,6 +270,7 @@ void DolphinSearchBox::slotConfigurationChanged()
 
 void DolphinSearchBox::slotSearchTextChanged(const QString& text)
 {
 
 void DolphinSearchBox::slotSearchTextChanged(const QString& text)
 {

+

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


@@ -231,10 +279,10 @@ void DolphinSearchBox::slotSearchTextChanged(const QString& text)
     emit searchTextChanged(text);
 }
 
     emit searchTextChanged(text);
 }
 

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

 {
     emitSearchRequest();
 {
     emitSearchRequest();

-    emit returnPressed(text);
+    emit returnPressed();

 }
 
 void DolphinSearchBox::slotFacetsButtonToggled()
 }
 
 void DolphinSearchBox::slotFacetsButtonToggled()


@@ -253,10 +301,11 @@ void DolphinSearchBox::slotFacetChanged()
 
 void DolphinSearchBox::initButton(QToolButton* button)
 {
 
 void DolphinSearchBox::initButton(QToolButton* button)
 {

+    button->installEventFilter(this);

     button->setAutoExclusive(true);
     button->setAutoRaise(true);
     button->setCheckable(true);
     button->setAutoExclusive(true);
     button->setAutoRaise(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()


@@ -278,10 +327,10 @@ void DolphinSearchBox::loadSettings()
 
 void DolphinSearchBox::saveSettings()
 {
 
 void DolphinSearchBox::saveSettings()
 {

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

     SearchSettings::setShowFacetsWidget(m_facetsToggleButton->isChecked());
     SearchSettings::setShowFacetsWidget(m_facetsToggleButton->isChecked());

-    SearchSettings::self()->writeConfig();
+    SearchSettings::self()->save();

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


@@ -289,22 +338,23 @@ void DolphinSearchBox::init()
     // 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()), this, SLOT(emitCloseRequest()));
+    connect(closeButton, &QToolButton::clicked, this, &DolphinSearchBox::emitCloseRequest);

 
     // Create search label
     m_searchLabel = new QLabel(this);
 
     // Create search box
 
     // 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());
+    m_searchInput = new QLineEdit(this);
+    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);
     setFocusProxy(m_searchInput);

-    connect(m_searchInput, SIGNAL(returnPressed(QString)),
-            this, SLOT(slotReturnPressed(QString)));
-    connect(m_searchInput, SIGNAL(textChanged(QString)),
-            this, SLOT(slotSearchTextChanged(QString)));

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


@@ -341,15 +391,30 @@ void DolphinSearchBox::init()
     searchLocationGroup->addButton(m_fromHereButton);
     searchLocationGroup->addButton(m_everywhereButton);
 
     searchLocationGroup->addButton(m_fromHereButton);
     searchLocationGroup->addButton(m_everywhereButton);
 

+    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" widgets
     m_facetsToggleButton = new QToolButton(this);
     m_facetsToggleButton->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
     initButton(m_facetsToggleButton);
     // Create "Facets" widgets
     m_facetsToggleButton = new QToolButton(this);
     m_facetsToggleButton->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
     initButton(m_facetsToggleButton);

-    connect(m_facetsToggleButton, SIGNAL(clicked()), this, SLOT(slotFacetsButtonToggled()));
+    connect(m_facetsToggleButton, &QToolButton::clicked, this, &DolphinSearchBox::slotFacetsButtonToggled);

 
     m_facetsWidget = new DolphinFacetsWidget(this);
 
     m_facetsWidget = new DolphinFacetsWidget(this);

+    m_facetsWidget->installEventFilter(this);

     m_facetsWidget->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Maximum);
     m_facetsWidget->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Maximum);

-    connect(m_facetsWidget, SIGNAL(facetChanged()), this, SLOT(slotFacetChanged()));
+    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();


@@ -359,8 +424,10 @@ void DolphinSearchBox::init()
     optionsLayout->addWidget(m_separator);
     optionsLayout->addWidget(m_fromHereButton);
     optionsLayout->addWidget(m_everywhereButton);
     optionsLayout->addWidget(m_separator);
     optionsLayout->addWidget(m_fromHereButton);
     optionsLayout->addWidget(m_everywhereButton);

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

     optionsLayout->addWidget(m_facetsToggleButton);
     optionsLayout->addWidget(m_facetsToggleButton);

+    optionsLayout->addWidget(moreSearchToolsButton);
+    optionsLayout->addStretch(1);

 
     // Put the options into a QScrollArea. This prevents increasing the view width
     // in case that not enough width for the options is available.
 
     // Put the options into a QScrollArea. This prevents increasing the view width
     // in case that not enough width for the options is available.


@@ -389,91 +456,89 @@ 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(emitSearchRequest()));
+    connect(m_startSearchTimer, &QTimer::timeout, this, &DolphinSearchBox::emitSearchRequest);

 
     updateFacetsToggleButton();
 
     updateFacetsToggleButton();

-    applyReadOnlyState();

 }
 
 }
 

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

 {
 {

-#ifdef HAVE_NEPOMUK
-    // Create the term for the text from the input-field
-    // dependent on whether a searching for content or
-    // filename is done
+#ifdef HAVE_BALOO

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

-    Nepomuk2::Query::Term searchLabelTerm;
-    if (m_contentButton->isChecked()) {
-        // Let Nepomuk parse the query
-        searchLabelTerm = Nepomuk2::Query::QueryParser::parseQuery(text, Nepomuk2::Query::QueryParser::DetectFilenamePattern).term();
-    } else {
-        // Search the text in the filename only
-        QString regex = QRegExp::escape(text);
-        regex.replace("\\*", QLatin1String(".*"));
-        regex.replace("\\?", QLatin1String("."));
-        regex.replace("\\", "\\\\");
-        searchLabelTerm = Nepomuk2::Query::ComparisonTerm(
-                                Nepomuk2::Vocabulary::NFO::fileName(),
-                                Nepomuk2::Query::LiteralTerm(regex),
-                                Nepomuk2::Query::ComparisonTerm::Regexp);
+
+    Baloo::Query query;
+    query.addType(m_facetsWidget->facetType());
+
+    QStringList queryStrings;
+    QString ratingQuery = m_facetsWidget->ratingTerm();
+    if (!ratingQuery.isEmpty()) {
+        queryStrings << ratingQuery;

     }
 
     }
 

-    // Get the term from the facets and merge it with the
-    // created term from the input-field.
-    Nepomuk2::Query::Term facetsTerm = m_facetsWidget->facetsTerm();
-
-    Nepomuk2::Query::FileQuery fileQuery;
-    fileQuery.setFileMode(Nepomuk2::Query::FileQuery::QueryFilesAndFolders);
-    if (facetsTerm.isValid()) {
-        Nepomuk2::Query::AndTerm andTerm;
-        andTerm.addSubTerm(searchLabelTerm);
-        andTerm.addSubTerm(facetsTerm);
-        fileQuery.setTerm(andTerm);
-    } else {
-        fileQuery.setTerm(searchLabelTerm);
+    if (m_contentButton->isChecked()) {
+        queryStrings << text;
+    } else if (!text.isEmpty()) {
+        queryStrings << QStringLiteral("filename:\"%1\"").arg(text);

     }
 
     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(QStringLiteral(" ")));
+
+    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));

 #else
 #else

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

 #endif
 }
 
 #endif
 }
 

-void DolphinSearchBox::applyReadOnlyState()
+void DolphinSearchBox::fromBalooSearchUrl(const QUrl& url)

 {
 {

-#ifdef HAVE_NEPOMUK
-    if (m_readOnly) {
-        m_searchLabel->setText(Nepomuk2::Query::Query::titleFromQueryUrl(m_readOnlyQuery));
+#ifdef HAVE_BALOO
+    const Baloo::Query query = Baloo::Query::fromSearchUrl(url);
+
+    // 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 {

-#else
-    {
-#endif
-        m_searchLabel->setText(i18nc("@label:textbox", "Find:"));
+        setSearchPath(QUrl::fromLocalFile(QDir::homePath()));

     }
 
     }
 

-    m_searchInput->setVisible(!m_readOnly);
-    m_optionsScrollArea->setVisible(!m_readOnly);
+    setText(query.searchString());

 
 

-    if (m_readOnly) {
-        m_facetsWidget->hide();
-    } else {
-        m_facetsWidget->setVisible(SearchSettings::showFacetsWidget());
+    QStringList types = query.types();
+    if (!types.isEmpty()) {
+        m_facetsWidget->setFacetType(types.first());

     }
     }

+
+    const QStringList subTerms = query.searchString().split(' ', QString::SkipEmptyParts);
+    foreach (const QString& subTerm, subTerms) {
+        if (subTerm.startsWith(QLatin1String("filename:"))) {
+            const QString value = subTerm.mid(9);
+            setText(value);
+        } else if (m_facetsWidget->isRatingTerm(subTerm)) {
+            m_facetsWidget->setRatingTerm(subTerm);
+        }
+    }
+
+    m_startSearchTimer->stop();
+    blockSignals(false);
+#else
+    Q_UNUSED(url);
+#endif

 }
 
 void DolphinSearchBox::updateFacetsToggleButton()
 {
     const bool facetsIsVisible = SearchSettings::showFacetsWidget();
     m_facetsToggleButton->setChecked(facetsIsVisible ? true : false);
 }
 
 void DolphinSearchBox::updateFacetsToggleButton()
 {
     const bool facetsIsVisible = SearchSettings::showFacetsWidget();
     m_facetsToggleButton->setChecked(facetsIsVisible ? true : false);

-    m_facetsToggleButton->setIcon(KIcon(facetsIsVisible ? "arrow-up-double" : "arrow-down-double"));
+    m_facetsToggleButton->setIcon(QIcon::fromTheme(facetsIsVisible ? QStringLiteral("arrow-up-double") : QStringLiteral("arrow-down-double")));

     m_facetsToggleButton->setText(facetsIsVisible ? i18nc("action:button", "Fewer Options") : i18nc("action:button", "More Options"));
 }
 
     m_facetsToggleButton->setText(facetsIsVisible ? i18nc("action:button", "Fewer Options") : i18nc("action:button", "More Options"));
 }
 

-#include "dolphinsearchbox.moc"