Merge branch 'master' into frameworks

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

diff --git a/src/search/dolphinsearchbox.cpp b/src/search/dolphinsearchbox.cpp
index 1792b201761f683b8559a4b815805645d953ac1f..ae93030acf7c8a322ee8447e725e7da4bd32c5e6 100644 (file)
--- a/src/search/dolphinsearchbox.cpp
+++ b/src/search/dolphinsearchbox.cpp
@@ -21,12 +21,12 @@
 
 #include "dolphin_searchsettings.h"
 #include "dolphinfacetswidget.h"
 
 #include "dolphin_searchsettings.h"
 #include "dolphinfacetswidget.h"

-#include "dolphinsearchinformation.h"

 
 #include <KIcon>
 #include <KLineEdit>
 #include <KLocale>
 #include <KSeparator>
 
 #include <KIcon>
 #include <KLineEdit>
 #include <KLocale>
 #include <KSeparator>

+#include <KGlobalSettings>

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


@@ -40,24 +40,17 @@
 #include <QToolButton>
 #include <QVBoxLayout>
 
 #include <QToolButton>
 #include <QVBoxLayout>
 

-#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/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_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)
 {
 }


@@ -109,13 +101,16 @@ void DolphinSearchBox::setSearchPath(const KUrl& url)
     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);
 }
 


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

-    const DolphinSearchInformation& searchInfo = DolphinSearchInformation::instance();
-    if (searchInfo.isIndexingEnabled() && searchInfo.isPathIndexed(m_searchPath)) {
-        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());


@@ -152,23 +151,40 @@ 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::selectAll()
 {
     m_searchInput->selectAll();
 }
 

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

 {
 {

-    if (m_readOnly != readOnly || m_readOnlyQuery != query) {
-        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)


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

+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();
 void DolphinSearchBox::emitSearchRequest()
 {
     m_startSearchTimer->stop();


@@ -253,10 +284,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()


@@ -291,20 +323,21 @@ 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()), this, SLOT(emitCloseRequest()));
+    connect(closeButton, &QToolButton::clicked, this, &DolphinSearchBox::emitCloseRequest);

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

+    m_searchInput->installEventFilter(this);

     m_searchInput->setClearButtonShown(true);
     m_searchInput->setFont(KGlobalSettings::generalFont());
     setFocusProxy(m_searchInput);
     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(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();
 
     // Apply layout for the search input
     QHBoxLayout* searchInputLayout = new QHBoxLayout();


@@ -345,11 +378,12 @@ void DolphinSearchBox::init()
     m_facetsToggleButton = new QToolButton(this);
     m_facetsToggleButton->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
     initButton(m_facetsToggleButton);
     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();


@@ -389,83 +423,86 @@ 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
+KUrl 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("File");
+    query.addType(m_facetsWidget->facetType());
+
+    Baloo::Term term(Baloo::Term::And);
+
+    Baloo::Term ratingTerm = m_facetsWidget->ratingTerm();
+    if (ratingTerm.isValid()) {
+        term.addSubTerm(ratingTerm);

     }
 
     }
 

-    // 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()) {
+        query.setSearchString(text);
+    } else if (!text.isEmpty()) {
+        term.addSubTerm(Baloo::Term(QLatin1String("filename"), text));

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

-        const bool recursive = true;
-        fileQuery.addIncludeFolder(m_searchPath, recursive);
+        query.addCustomOption("includeFolder", 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.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
     return KUrl();
 #endif
 }
 
 #else
     return KUrl();
 #endif
 }
 

-void DolphinSearchBox::applyReadOnlyState()
+void DolphinSearchBox::fromBalooSearchUrl(const KUrl& 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);
+    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);
+
+    const QVariantMap customOptions = query.customOptions();
+    if (customOptions.contains("includeFolder")) {
+        setSearchPath(customOptions.value("includeFolder").toString());

     } else {
     } else {

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

     }
 
     }
 

-    m_searchInput->setVisible(!m_readOnly);
-    m_optionsScrollArea->setVisible(!m_readOnly);
+    if (!query.searchString().isEmpty()) {
+        setText(query.searchString());
+    }

 
 

-    if (m_readOnly) {
-        m_facetsWidget->hide();
-    } else {
-        m_facetsWidget->setVisible(SearchSettings::showFacetsWidget());
+    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

 }
 
 void DolphinSearchBox::updateFacetsToggleButton()
 }
 
 void DolphinSearchBox::updateFacetsToggleButton()


@@ -473,7 +510,6 @@ 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"));
     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", "Less Options") : i18nc("action:button", "More Options"));
+    m_facetsToggleButton->setText(facetsIsVisible ? i18nc("action:button", "Fewer Options") : i18nc("action:button", "More Options"));

 }
 
 }
 

-#include "dolphinsearchbox.moc"