Ported KIcon to QIcon

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

diff --git a/src/search/dolphinsearchbox.cpp b/src/search/dolphinsearchbox.cpp
index ae93030acf7c8a322ee8447e725e7da4bd32c5e6..0fb1e41d7c1c129f215dc454cbac247a5bb60918 100644 (file)
--- a/src/search/dolphinsearchbox.cpp
+++ b/src/search/dolphinsearchbox.cpp
@@ -22,7 +22,7 @@
 #include "dolphin_searchsettings.h"
 #include "dolphinfacetswidget.h"
 
-#include <KIcon>
+#include <QIcon>
 #include <KLineEdit>
 #include <KLocale>
 #include <KSeparator>
@@ -40,8 +40,9 @@
 #include <QToolButton>
 #include <QVBoxLayout>
 
-#include <config-baloo.h>
 #ifdef HAVE_BALOO
+    #include <Baloo/NaturalFileQueryParser>
+    #include <Baloo/QueryBuilder>
     #include <Baloo/Query>
     #include <Baloo/Term>
     #include <Baloo/IndexerConfig>
@@ -252,8 +253,10 @@ void DolphinSearchBox::slotConfigurationChanged()
     }
 }
 
-void DolphinSearchBox::slotSearchTextChanged(const QString& text)
+void DolphinSearchBox::slotSearchTextChanged()
 {
+    const QString text = m_searchInput->text();
+
     if (text.isEmpty()) {
         m_startSearchTimer->stop();
     } else {
@@ -262,10 +265,17 @@ void DolphinSearchBox::slotSearchTextChanged(const QString& text)
     emit searchTextChanged(text);
 }
 
-void DolphinSearchBox::slotReturnPressed(const QString& text)
+void DolphinSearchBox::slotReturnPressed()
 {
     emitSearchRequest();
-    emit returnPressed(text);
+    emit returnPressed(m_searchInput->text());
+}
+
+void DolphinSearchBox::updateSearchInputParsing()
+{
+#ifdef HAVE_BALOO
+    m_searchInput->setParsingEnabled(m_contentButton->isChecked());
+#endif
 }
 
 void DolphinSearchBox::slotFacetsButtonToggled()
@@ -306,6 +316,7 @@ void DolphinSearchBox::loadSettings()
     }
 
     m_facetsWidget->setVisible(SearchSettings::showFacetsWidget());
+    updateSearchInputParsing();
 }
 
 void DolphinSearchBox::saveSettings()
@@ -321,7 +332,7 @@ void DolphinSearchBox::init()
     // Create close button
     QToolButton* closeButton = new QToolButton(this);
     closeButton->setAutoRaise(true);
-    closeButton->setIcon(KIcon("dialog-close"));
+    closeButton->setIcon(QIcon::fromTheme("dialog-close"));
     closeButton->setToolTip(i18nc("@info:tooltip", "Quit searching"));
     connect(closeButton, &QToolButton::clicked, this, &DolphinSearchBox::emitCloseRequest);
 
@@ -329,15 +340,24 @@ void DolphinSearchBox::init()
     m_searchLabel = new QLabel(this);
 
     // Create search box
+#ifdef HAVE_BALOO
+    m_queryParser.reset(new Baloo::NaturalFileQueryParser);
+    m_searchInput = new Baloo::QueryBuilder(m_queryParser.data(), this);
+    connect(m_searchInput, &Baloo::QueryBuilder::editingFinished,
+            this, &DolphinSearchBox::slotReturnPressed);
+    connect(m_searchInput, &Baloo::QueryBuilder::textChanged,
+            this, &DolphinSearchBox::slotSearchTextChanged);
+#else
     m_searchInput = new KLineEdit(this);
     m_searchInput->installEventFilter(this);
     m_searchInput->setClearButtonShown(true);
     m_searchInput->setFont(KGlobalSettings::generalFont());
-    setFocusProxy(m_searchInput);
-    connect(m_searchInput, static_cast<void(KLineEdit::*)(const QString&)>(&KLineEdit::returnPressed),
+    connect(m_searchInput, &KLineEdit::returnPressed,
             this, &DolphinSearchBox::slotReturnPressed);
     connect(m_searchInput, &KLineEdit::textChanged,
             this, &DolphinSearchBox::slotSearchTextChanged);
+#endif
+    setFocusProxy(m_searchInput);
 
     // Apply layout for the search input
     QHBoxLayout* searchInputLayout = new QHBoxLayout();
@@ -358,6 +378,8 @@ void DolphinSearchBox::init()
     QButtonGroup* searchWhatGroup = new QButtonGroup(this);
     searchWhatGroup->addButton(m_fileNameButton);
     searchWhatGroup->addButton(m_contentButton);
+    connect(searchWhatGroup, static_cast<void (QButtonGroup::*)(int)>(&QButtonGroup::buttonClicked),
+            this, &DolphinSearchBox::updateSearchInputParsing);
 
     m_separator = new KSeparator(Qt::Vertical, this);
 
@@ -434,28 +456,31 @@ KUrl DolphinSearchBox::balooUrlForSearching() const
     const QString text = m_searchInput->text();
 
     Baloo::Query query;
+
+    if (m_contentButton->isChecked()) {
+        query = m_queryParser->parse(text, Baloo::NaturalQueryParser::DetectFilenamePattern);
+    } else {
+        query.setTerm(Baloo::Term(QLatin1String("filename"), text));
+    }
+
+    // Configure the query so that it returns files and takes the rating into account
     query.addType("File");
     query.addType(m_facetsWidget->facetType());
 
     Baloo::Term term(Baloo::Term::And);
-
     Baloo::Term ratingTerm = m_facetsWidget->ratingTerm();
+
     if (ratingTerm.isValid()) {
+        term.addSubTerm(query.term());
         term.addSubTerm(ratingTerm);
-    }
 
-    if (m_contentButton->isChecked()) {
-        query.setSearchString(text);
-    } else if (!text.isEmpty()) {
-        term.addSubTerm(Baloo::Term(QLatin1String("filename"), text));
+        query.setTerm(term);
     }
 
     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
@@ -509,7 +534,7 @@ 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 ? "arrow-up-double" : "arrow-down-double"));
     m_facetsToggleButton->setText(facetsIsVisible ? i18nc("action:button", "Fewer Options") : i18nc("action:button", "More Options"));
 }