Load KFileItemAction plugins with json metadata

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

diff --git a/src/search/dolphinsearchbox.cpp b/src/search/dolphinsearchbox.cpp
index 46ca01a4cef85d9a246917531b6851431ab6275d..26ddd27f8ee535fb8de6a8a594a97027826fee00 100644 (file)
--- a/src/search/dolphinsearchbox.cpp
+++ b/src/search/dolphinsearchbox.cpp
@@ -22,15 +22,14 @@
 #include "dolphin_searchsettings.h"
 #include "dolphinfacetswidget.h"
 
 #include "dolphin_searchsettings.h"
 #include "dolphinfacetswidget.h"
 

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

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

-#include <QFormLayout>

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


@@ -38,13 +37,14 @@
 #include <QTimer>
 #include <QToolButton>
 #include <QVBoxLayout>
 #include <QTimer>
 #include <QToolButton>
 #include <QVBoxLayout>

+#include <QUrlQuery>

 
 #include <config-baloo.h>
 #ifdef HAVE_BALOO
 
 #include <config-baloo.h>
 #ifdef HAVE_BALOO

-    #include <baloo/query.h>
-    #include <baloo/term.h>
-    #include <baloo/indexerconfig.h>
+    #include <Baloo/Query>
+    #include <Baloo/IndexerConfig>

 #endif
 #endif

+#include <QFontDatabase>

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


@@ -81,7 +81,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;
 


@@ -91,9 +91,9 @@ 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();

         }
     }
 
         }
     }
 


@@ -113,14 +113,14 @@ void DolphinSearchBox::setSearchPath(const KUrl& url)
     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;
+    QUrl url;

     bool useBalooSearch = false;
 #ifdef HAVE_BALOO
     const Baloo::IndexerConfig searchInfo;
     bool useBalooSearch = false;
 #ifdef HAVE_BALOO
     const Baloo::IndexerConfig searchInfo;


@@ -129,10 +129,12 @@ KUrl DolphinSearchBox::urlForSearching() const
     if (useBalooSearch) {
         url = balooUrlForSearching();
     } else {
     if (useBalooSearch) {
         url = balooUrlForSearching();
     } 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;


@@ -144,21 +146,23 @@ 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 KUrl& url)
+void DolphinSearchBox::fromSearchUrl(const QUrl& url)

 {
 {

-    if (url.protocol() == "baloosearch") {
+    if (url.scheme() == QLatin1String("baloosearch")) {

         fromBalooSearchUrl(url);
         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 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);
     } else {
         setText(QString());
         setSearchPath(url);


@@ -253,6 +257,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 {


@@ -261,10 +266,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()


@@ -287,7 +292,7 @@ void DolphinSearchBox::initButton(QToolButton* button)
     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()


@@ -309,10 +314,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()


@@ -320,23 +325,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 = new QLineEdit(this);

     m_searchInput->installEventFilter(this);
     m_searchInput->installEventFilter(this);

-    m_searchInput->setClearButtonShown(true);
-    m_searchInput->setFont(KGlobalSettings::generalFont());
+    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();


@@ -377,12 +382,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->installEventFilter(this);
     m_facetsWidget->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Maximum);
 
     m_facetsWidget = new DolphinFacetsWidget(this);
     m_facetsWidget->installEventFilter(this);
     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();


@@ -422,78 +427,72 @@ 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();
 }
 

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

 {
 #ifdef HAVE_BALOO
     const QString text = m_searchInput->text();
 
     Baloo::Query query;
 {
 #ifdef HAVE_BALOO
     const QString text = m_searchInput->text();
 
     Baloo::Query query;

-    query.addType("File");

     query.addType(m_facetsWidget->facetType());
 
     query.addType(m_facetsWidget->facetType());
 

-    Baloo::Term term(Baloo::Term::And);
-
-    Baloo::Term ratingTerm = m_facetsWidget->ratingTerm();
-    if (ratingTerm.isValid()) {
-        term.addSubTerm(ratingTerm);
+    QStringList queryStrings;
+    QString ratingQuery = m_facetsWidget->ratingTerm();
+    if (!ratingQuery.isEmpty()) {
+        queryStrings << ratingQuery;

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

-        query.setSearchString(text);
+        queryStrings << text;

     } else if (!text.isEmpty()) {
     } else if (!text.isEmpty()) {

-        term.addSubTerm(Baloo::Term(QLatin1String("filename"), text));
+        queryStrings << QStringLiteral("filename:\"%1\"").arg(text);

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

-        query.addCustomOption("includeFolder", m_searchPath.toLocalFile());
+        query.setIncludeFolder(m_searchPath.toLocalFile());

     }
 
     }
 

-    query.setTerm(term);
+    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
 
     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();
+    return QUrl();

 #endif
 }
 
 #endif
 }
 

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

 {
 #ifdef HAVE_BALOO
     const Baloo::Query query = Baloo::Query::fromSearchUrl(url);
 {
 #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);
 
 
     // Block all signals to avoid unnecessary "searchRequest" signals
     // while we adjust the search text and the facet widget.
     blockSignals(true);
 

-    const QVariantHash customOptions = query.customOptions();
-    if (customOptions.contains("includeFolder")) {
-        setSearchPath(customOptions.value("includeFolder").toString());
+    const QString customDir = query.includeFolder();
+    if (!customDir.isEmpty()) {
+        setSearchPath(QUrl::fromLocalFile(customDir));

     } else {
     } else {

-        setSearchPath(QDir::homePath());
+        setSearchPath(QUrl::fromLocalFile(QDir::homePath()));

     }
 
     }
 

-    if (!query.searchString().isEmpty()) {
-        setText(query.searchString());
-    }
+    setText(query.searchString());

 
     QStringList types = query.types();
 
     QStringList types = query.types();

-    types.removeOne("File"); // We are only interested in facet widget types

     if (!types.isEmpty()) {
         m_facetsWidget->setFacetType(types.first());
     }
 
     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());
+    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);
         }
         } else if (m_facetsWidget->isRatingTerm(subTerm)) {
             m_facetsWidget->setRatingTerm(subTerm);
         }


@@ -501,6 +500,8 @@ void DolphinSearchBox::fromBalooSearchUrl(const KUrl& url)
 
     m_startSearchTimer->stop();
     blockSignals(false);
 
     m_startSearchTimer->stop();
     blockSignals(false);

+#else
+    Q_UNUSED(url);

 #endif
 }
 
 #endif
 }
 


@@ -508,8 +509,7 @@ void DolphinSearchBox::updateFacetsToggleButton()
 {
     const bool facetsIsVisible = SearchSettings::showFacetsWidget();
     m_facetsToggleButton->setChecked(facetsIsVisible ? true : false);
 {
     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"