Merge branch 'master' into frameworks

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

diff --git a/src/search/dolphinsearchbox.cpp b/src/search/dolphinsearchbox.cpp
index 7c2d152640a8d509e59f496012925b692bf44f4e..ae93030acf7c8a322ee8447e725e7da4bd32c5e6 100644 (file)
--- a/src/search/dolphinsearchbox.cpp
+++ b/src/search/dolphinsearchbox.cpp
@@ -20,11 +20,13 @@
 #include "dolphinsearchbox.h"
 
 #include "dolphin_searchsettings.h"
 #include "dolphinsearchbox.h"
 
 #include "dolphin_searchsettings.h"

+#include "dolphinfacetswidget.h"

 
 

-#include <kicon.h>
-#include <klineedit.h>
-#include <klocale.h>
-#include <kseparator.h>
+#include <KIcon>
+#include <KLineEdit>
+#include <KLocale>
+#include <KSeparator>
+#include <KGlobalSettings>

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


@@ -33,34 +35,33 @@
 #include <QHBoxLayout>
 #include <QKeyEvent>
 #include <QLabel>
 #include <QHBoxLayout>
 #include <QKeyEvent>
 #include <QLabel>

-#include <QPushButton>
+#include <QScrollArea>

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

-#include <config-nepomuk.h>
-#ifdef HAVE_NEPOMUK
-    #include <nepomuk/andterm.h>
-    #include <nepomuk/filequery.h>
-    #include <nepomuk/literalterm.h>
-    #include <nepomuk/query.h>
-    #include <nepomuk/queryparser.h>
-    #include <nepomuk/resourcemanager.h>
-    #include <nepomuk/resourcetypeterm.h>
-    #include <nepomuk/comparisonterm.h>
-    #include <nepomuk/nfo.h>
+#include <config-baloo.h>
+#ifdef HAVE_BALOO
+    #include <Baloo/Query>
+    #include <Baloo/Term>
+    #include <Baloo/IndexerConfig>

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

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

     m_topLayout(0),
     m_topLayout(0),

+    m_searchLabel(0),

     m_searchInput(0),
     m_searchInput(0),

-    m_fromHereButton(0),
-    m_everywhereButton(0),
+    m_optionsScrollArea(0),

     m_fileNameButton(0),
     m_contentButton(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)
 {
     m_searchPath(),
     m_startSearchTimer(0)
 {


@@ -71,6 +72,11 @@ DolphinSearchBox::~DolphinSearchBox()
     saveSettings();
 }
 
     saveSettings();
 }
 

+void DolphinSearchBox::setText(const QString& text)
+{
+    m_searchInput->setText(text);
+}
+

 QString DolphinSearchBox::text() const
 {
     return m_searchInput->text();
 QString DolphinSearchBox::text() const
 {
     return m_searchInput->text();


@@ -81,9 +87,31 @@ void DolphinSearchBox::setSearchPath(const KUrl& url)
     m_searchPath = url;
 
     QFontMetrics metrics(m_fromHereButton->font());
     m_searchPath = url;
 
     QFontMetrics metrics(m_fromHereButton->font());

-    const int maxWidth = metrics.averageCharWidth() * 15;
-    const QString fileName = metrics.elidedText(url.fileName(), Qt::ElideMiddle, maxWidth);
-    m_fromHereButton->setText(i18nc("action:button", "From Here (%1)", fileName));
+    const int maxWidth = metrics.height() * 8;
+
+    QString location = url.fileName();
+    if (location.isEmpty()) {
+        if (url.isLocalFile()) {
+            location = QLatin1String("/");
+        } else {
+            location = url.protocol() + QLatin1String(" - ") + url.host();
+        }
+    }
+
+    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);

 }
 
 KUrl DolphinSearchBox::searchPath() const
 }
 
 KUrl DolphinSearchBox::searchPath() const


@@ -94,8 +122,13 @@ KUrl DolphinSearchBox::searchPath() const
 KUrl DolphinSearchBox::urlForSearching() const
 {
     KUrl url;
 KUrl DolphinSearchBox::urlForSearching() const
 {
     KUrl url;

-    if (m_nepomukActivated && isSearchPathIndexed()) {
-        url = nepomukUrlForSearching();
+    bool useBalooSearch = false;
+#ifdef HAVE_BALOO
+    const Baloo::IndexerConfig searchInfo;
+    useBalooSearch = searchInfo.fileIndexingEnabled() && searchInfo.shouldBeIndexed(m_searchPath.toLocalFile());
+#endif
+    if (useBalooSearch) {
+        url = balooUrlForSearching();

     } else {
         url.setProtocol("filenamesearch");
         url.addQueryItem("search", m_searchInput->text());
     } else {
         url.setProtocol("filenamesearch");
         url.addQueryItem("search", m_searchInput->text());


@@ -118,6 +151,42 @@ KUrl DolphinSearchBox::urlForSearching() const
     return url;
 }
 
     return url;
 }
 

+void DolphinSearchBox::fromSearchUrl(const KUrl& 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");
+    } else {
+        setText(QString());
+        setSearchPath(url);
+    }
+}
+
+void DolphinSearchBox::selectAll()
+{
+    m_searchInput->selectAll();
+}
+
+void DolphinSearchBox::setActive(bool active)
+{
+    if (active != m_active) {
+        m_active = active;
+
+        if (active) {
+            emit activated();
+        }
+    }
+}
+
+bool DolphinSearchBox::isActive() const
+{
+    return m_active;
+}
+

 bool DolphinSearchBox::event(QEvent* event)
 {
     if (event->type() == QEvent::Polish) {
 bool DolphinSearchBox::event(QEvent* event)
 {
     if (event->type() == QEvent::Polish) {


@@ -129,11 +198,6 @@ bool DolphinSearchBox::event(QEvent* event)
 void DolphinSearchBox::showEvent(QShowEvent* event)
 {
     if (!event->spontaneous()) {
 void DolphinSearchBox::showEvent(QShowEvent* event)
 {
     if (!event->spontaneous()) {

-#ifdef HAVE_NEPOMUK
-        m_nepomukActivated = (Nepomuk::ResourceManager::instance()->init() == 0);
-#endif
-
-        m_searchInput->clear();

         m_searchInput->setFocus();
         m_startedSearching = false;
     }
         m_searchInput->setFocus();
         m_startedSearching = false;
     }


@@ -142,7 +206,7 @@ void DolphinSearchBox::showEvent(QShowEvent* event)
 void DolphinSearchBox::keyReleaseEvent(QKeyEvent* event)
 {
     QWidget::keyReleaseEvent(event);
 void DolphinSearchBox::keyReleaseEvent(QKeyEvent* event)
 {
     QWidget::keyReleaseEvent(event);

-    if ((event->key() == Qt::Key_Escape)) {
+    if (event->key() == Qt::Key_Escape) {

         if (m_searchInput->text().isEmpty()) {
             emit closeRequest();
         } else {
         if (m_searchInput->text().isEmpty()) {
             emit closeRequest();
         } else {


@@ -151,17 +215,40 @@ void DolphinSearchBox::keyReleaseEvent(QKeyEvent* event)
     }
 }
 
     }
 }
 

-void DolphinSearchBox::emitSearchSignal()
+bool DolphinSearchBox::eventFilter(QObject* obj, QEvent* event)
+{
+    switch (event->type()) {
+    case QEvent::FocusIn:
+        setActive(true);
+        setFocus();
+        break;
+
+    default:
+        break;
+    }
+
+    return QObject::eventFilter(obj, event);
+}
+
+void DolphinSearchBox::emitSearchRequest()

 {
     m_startSearchTimer->stop();
     m_startedSearching = true;
 {
     m_startSearchTimer->stop();
     m_startedSearching = true;

-    emit search(m_searchInput->text());
+    emit searchRequest();
+}
+
+void DolphinSearchBox::emitCloseRequest()
+{
+    m_startSearchTimer->stop();
+    m_startedSearching = false;
+    emit closeRequest();

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

+    saveSettings();

     if (m_startedSearching) {
     if (m_startedSearching) {

-        emitSearchSignal();
+        emitSearchRequest();

     }
 }
 
     }
 }
 


@@ -177,16 +264,31 @@ void DolphinSearchBox::slotSearchTextChanged(const QString& text)
 
 void DolphinSearchBox::slotReturnPressed(const QString& text)
 {
 
 void DolphinSearchBox::slotReturnPressed(const QString& text)
 {

-    emitSearchSignal();
+    emitSearchRequest();

     emit returnPressed(text);
 }
 
     emit returnPressed(text);
 }
 

-void DolphinSearchBox::initButton(QPushButton* button)
+void DolphinSearchBox::slotFacetsButtonToggled()
+{
+    const bool facetsIsVisible = !m_facetsWidget->isVisible();
+    m_facetsWidget->setVisible(facetsIsVisible);
+    updateFacetsToggleButton();
+}
+
+void DolphinSearchBox::slotFacetChanged()
+{
+    m_startedSearching = true;
+    m_startSearchTimer->stop();
+    emit searchRequest();
+}
+
+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(toggled(bool)), this, SLOT(slotConfigurationChanged()));
+    connect(button, &QToolButton::clicked, this, &DolphinSearchBox::slotConfigurationChanged);

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


@@ -202,12 +304,15 @@ void DolphinSearchBox::loadSettings()
     } else {
         m_fileNameButton->setChecked(true);
     }
     } else {
         m_fileNameButton->setChecked(true);
     }

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

 }
 
 void DolphinSearchBox::saveSettings()
 {
     SearchSettings::setLocation(m_fromHereButton->isChecked() ? "FromHere" : "Everywhere");
     SearchSettings::setWhat(m_fileNameButton->isChecked() ? "FileName" : "Content");
 }
 
 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::self()->writeConfig();
 }
 


@@ -218,33 +323,50 @@ void DolphinSearchBox::init()
     closeButton->setAutoRaise(true);
     closeButton->setIcon(KIcon("dialog-close"));
     closeButton->setToolTip(i18nc("@info:tooltip", "Quit searching"));
     closeButton->setAutoRaise(true);
     closeButton->setIcon(KIcon("dialog-close"));
     closeButton->setToolTip(i18nc("@info:tooltip", "Quit searching"));

-    connect(closeButton, SIGNAL(clicked()), SIGNAL(closeRequest()));
+    connect(closeButton, &QToolButton::clicked, this, &DolphinSearchBox::emitCloseRequest);

 
     // Create search label
 
     // Create search label

-    QLabel* searchLabel = new QLabel(i18nc("@label:textbox", "Find:"), this);
+    m_searchLabel = new QLabel(this);

 
     // Create search box
     m_searchInput = new KLineEdit(this);
 
     // Create search box
     m_searchInput = new KLineEdit(this);

+    m_searchInput->installEventFilter(this);

     m_searchInput->setClearButtonShown(true);
     m_searchInput->setFont(KGlobalSettings::generalFont());
     m_searchInput->setClearButtonShown(true);
     m_searchInput->setFont(KGlobalSettings::generalFont());

-    connect(m_searchInput, SIGNAL(returnPressed(QString)),
-            this, SLOT(slotReturnPressed(QString)));
-    connect(m_searchInput, SIGNAL(textChanged(QString)),
-            this, SLOT(slotSearchTextChanged(QString)));
+    setFocusProxy(m_searchInput);
+    connect(m_searchInput, static_cast<void(KLineEdit::*)(const QString&)>(&KLineEdit::returnPressed),
+            this, &DolphinSearchBox::slotReturnPressed);
+    connect(m_searchInput, &KLineEdit::textChanged,
+            this, &DolphinSearchBox::slotSearchTextChanged);

 
     // Apply layout for the search input
     QHBoxLayout* searchInputLayout = new QHBoxLayout();
     searchInputLayout->setMargin(0);
     searchInputLayout->addWidget(closeButton);
 
     // Apply layout for the search input
     QHBoxLayout* searchInputLayout = new QHBoxLayout();
     searchInputLayout->setMargin(0);
     searchInputLayout->addWidget(closeButton);

-    searchInputLayout->addWidget(searchLabel);
+    searchInputLayout->addWidget(m_searchLabel);

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

+    // Create "Filename" and "Content" button
+    m_fileNameButton = new QToolButton(this);
+    m_fileNameButton->setText(i18nc("action:button", "Filename"));
+    initButton(m_fileNameButton);
+
+    m_contentButton = new QToolButton();
+    m_contentButton->setText(i18nc("action:button", "Content"));
+    initButton(m_contentButton);
+
+    QButtonGroup* searchWhatGroup = new QButtonGroup(this);
+    searchWhatGroup->addButton(m_fileNameButton);
+    searchWhatGroup->addButton(m_contentButton);
+
+    m_separator = new KSeparator(Qt::Vertical, this);
+

     // Create "From Here" and "Everywhere"button
     // Create "From Here" and "Everywhere"button

-    m_fromHereButton = new QPushButton(this);
+    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 = new QToolButton(this);

     m_everywhereButton->setText(i18nc("action:button", "Everywhere"));
     initButton(m_everywhereButton);
 
     m_everywhereButton->setText(i18nc("action:button", "Everywhere"));
     initButton(m_everywhereButton);
 


@@ -252,34 +374,48 @@ void DolphinSearchBox::init()
     searchLocationGroup->addButton(m_fromHereButton);
     searchLocationGroup->addButton(m_everywhereButton);
 
     searchLocationGroup->addButton(m_fromHereButton);
     searchLocationGroup->addButton(m_everywhereButton);
 

-    // Create "Filename" and "Content" button
-    m_fileNameButton = new QPushButton(this);
-    m_fileNameButton->setText(i18nc("action:button", "Filename"));
-    initButton(m_fileNameButton);
+    // Create "Facets" widgets
+    m_facetsToggleButton = new QToolButton(this);
+    m_facetsToggleButton->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
+    initButton(m_facetsToggleButton);
+    connect(m_facetsToggleButton, &QToolButton::clicked, this, &DolphinSearchBox::slotFacetsButtonToggled);

 
 

-    m_contentButton = new QPushButton();
-    m_contentButton->setText(i18nc("action:button", "Content"));
-    initButton(m_contentButton);;
-
-    QButtonGroup* searchWhatGroup = new QButtonGroup(this);
-    searchWhatGroup->addButton(m_fileNameButton);
-    searchWhatGroup->addButton(m_contentButton);
+    m_facetsWidget = new DolphinFacetsWidget(this);
+    m_facetsWidget->installEventFilter(this);
+    m_facetsWidget->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Maximum);
+    connect(m_facetsWidget, &DolphinFacetsWidget::facetChanged, this, &DolphinSearchBox::slotFacetChanged);

 
     // Apply layout for the options
     QHBoxLayout* optionsLayout = new QHBoxLayout();
     optionsLayout->setMargin(0);
 
     // Apply layout for the options
     QHBoxLayout* optionsLayout = new QHBoxLayout();
     optionsLayout->setMargin(0);

-    optionsLayout->addWidget(m_fromHereButton);
-    optionsLayout->addWidget(m_everywhereButton);
-    optionsLayout->addWidget(new KSeparator(Qt::Vertical));

     optionsLayout->addWidget(m_fileNameButton);
     optionsLayout->addWidget(m_contentButton);
     optionsLayout->addWidget(m_fileNameButton);
     optionsLayout->addWidget(m_contentButton);

+    optionsLayout->addWidget(m_separator);
+    optionsLayout->addWidget(m_fromHereButton);
+    optionsLayout->addWidget(m_everywhereButton);

     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->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+    m_optionsScrollArea->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+    m_optionsScrollArea->setMaximumHeight(optionsContainer->sizeHint().height());
+    m_optionsScrollArea->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
+    m_optionsScrollArea->setWidget(optionsContainer);
+    m_optionsScrollArea->setWidgetResizable(true);

 
     m_topLayout = new QVBoxLayout(this);
 
     m_topLayout = new QVBoxLayout(this);

+    m_topLayout->setMargin(0);

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

-    m_topLayout->addLayout(optionsLayout);
+    m_topLayout->addWidget(m_optionsScrollArea);
+    m_topLayout->addWidget(m_facetsWidget);

 
 

-    searchLabel->setBuddy(m_searchInput);

     loadSettings();
 
     // The searching should be started automatically after the user did not change
     loadSettings();
 
     // The searching should be started automatically after the user did not change


@@ -287,81 +423,93 @@ 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()));
+    connect(m_startSearchTimer, &QTimer::timeout, this, &DolphinSearchBox::emitSearchRequest);
+
+    updateFacetsToggleButton();

 }
 
 }
 

-bool DolphinSearchBox::isSearchPathIndexed() const
+KUrl DolphinSearchBox::balooUrlForSearching() const

 {
 {

-#ifdef HAVE_NEPOMUK
-    const QString path = m_searchPath.path();
-
-    const KConfig strigiConfig("nepomukstrigirc");
-    const QStringList indexedFolders = strigiConfig.group("General").readPathEntry("folders", QStringList());
-
-    // Check whether the current search path is part of an indexed folder
-    bool isIndexed = false;
-    foreach (const QString& indexedFolder, indexedFolders) {
-        if (path.startsWith(indexedFolder)) {
-            isIndexed = true;
-            break;
-        }
+#ifdef HAVE_BALOO
+    const QString text = m_searchInput->text();
+
+    Baloo::Query query;
+    query.addType("File");
+    query.addType(m_facetsWidget->facetType());
+
+    Baloo::Term term(Baloo::Term::And);
+
+    Baloo::Term ratingTerm = m_facetsWidget->ratingTerm();
+    if (ratingTerm.isValid()) {
+        term.addSubTerm(ratingTerm);

     }
 
     }
 

-    if (isIndexed) {
-        // The current search path is part of an indexed folder. Check whether no
-        // excluded folder is part of the search path.
-        const QStringList excludedFolders = strigiConfig.group("General").readPathEntry("exclude folders", QStringList());
-        foreach (const QString& excludedFolder, excludedFolders) {
-            if (path.startsWith(excludedFolder)) {
-                isIndexed = false;
-                break;
-            }
-        }
+    if (m_contentButton->isChecked()) {
+        query.setSearchString(text);
+    } else if (!text.isEmpty()) {
+        term.addSubTerm(Baloo::Term(QLatin1String("filename"), text));

     }
 
     }
 

-    return isIndexed;
+    if (m_fromHereButton->isChecked()) {
+        query.addCustomOption("includeFolder", m_searchPath.toLocalFile());
+    }
+
+    query.setTerm(term);
+
+    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 false;
+    return KUrl();

 #endif
 }
 
 #endif
 }
 

-KUrl DolphinSearchBox::nepomukUrlForSearching() const
+void DolphinSearchBox::fromBalooSearchUrl(const KUrl& url)

 {
 {

-#ifdef HAVE_NEPOMUK
-    Nepomuk::Query::AndTerm andTerm;
+#ifdef HAVE_BALOO
+    const Baloo::Query query = Baloo::Query::fromSearchUrl(url);
+    const Baloo::Term term = query.term();

 
 

-    // Add input from search filter
-    const QString text = m_searchInput->text();
-    if (!text.isEmpty()) {
-        if (m_fileNameButton->isChecked()) {
-            QString regex = QRegExp::escape(text);
-            regex.replace("\\*", QLatin1String(".*"));
-            regex.replace("\\?", QLatin1String("."));
-            regex.replace("\\", "\\\\");
-            andTerm.addSubTerm(Nepomuk::Query::ComparisonTerm(
-                                    Nepomuk::Vocabulary::NFO::fileName(),
-                                    Nepomuk::Query::LiteralTerm(regex),
-                                    Nepomuk::Query::ComparisonTerm::Regexp));
-        } else {
-            const Nepomuk::Query::Query customQuery = Nepomuk::Query::QueryParser::parseQuery(text, Nepomuk::Query::QueryParser::DetectFilenamePattern);
-            if (customQuery.isValid()) {
-                andTerm.addSubTerm(customQuery.term());
-            }
-        }
+    // 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());
+    } else {
+        setSearchPath(QDir::homePath());

     }
 
     }
 

-    Nepomuk::Query::FileQuery fileQuery;
-    fileQuery.setFileMode(Nepomuk::Query::FileQuery::QueryFiles);
-    fileQuery.setTerm(andTerm);
-    if(m_fromHereButton->isChecked())
-        fileQuery.addIncludeFolder(m_searchPath, false);
+    if (!query.searchString().isEmpty()) {
+        setText(query.searchString());
+    }

 
 

-    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));
-#else
-    return KUrl();
+    QStringList types = query.types();
+    types.removeOne("File"); // We are only interested in facet widget types
+    if (!types.isEmpty()) {
+        m_facetsWidget->setFacetType(types.first());
+    }
+
+    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_startSearchTimer->stop();
+    blockSignals(false);

 #endif
 }
 
 #endif
 }
 

-#include "dolphinsearchbox.moc"
+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->setText(facetsIsVisible ? i18nc("action:button", "Fewer Options") : i18nc("action:button", "More Options"));
+}
+