#include "dolphinfacetswidget.h"
#include <QIcon>
-#include <KLineEdit>
-#include <KLocale>
+#include <QLineEdit>
+#include <KLocalizedString>
#include <KSeparator>
-#include <KGlobalSettings>
#include <QButtonGroup>
#include <QDir>
#include <QEvent>
-#include <QFormLayout>
#include <QHBoxLayout>
#include <QKeyEvent>
#include <QLabel>
#include <QTimer>
#include <QToolButton>
#include <QVBoxLayout>
+#include <QUrlQuery>
+#include <config-baloo.h>
#ifdef HAVE_BALOO
- #include <Baloo/NaturalFileQueryParser>
- #include <Baloo/QueryBuilder>
#include <Baloo/Query>
- #include <Baloo/Term>
#include <Baloo/IndexerConfig>
#endif
#include <QFontDatabase>
return m_searchInput->text();
}
-void DolphinSearchBox::setSearchPath(const KUrl& url)
+void DolphinSearchBox::setSearchPath(const QUrl& url)
{
m_searchPath = url;
if (url.isLocalFile()) {
location = QLatin1String("/");
} else {
- location = url.protocol() + QLatin1String(" - ") + url.host();
+ location = url.scheme() + QLatin1String(" - ") + url.host();
}
}
m_facetsWidget->setEnabled(hasFacetsSupport);
}
-KUrl DolphinSearchBox::searchPath() const
+QUrl DolphinSearchBox::searchPath() const
{
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;
if (useBalooSearch) {
url = balooUrlForSearching();
} else {
- url.setProtocol("filenamesearch");
- url.addQueryItem("search", m_searchInput->text());
+ url.setScheme("filenamesearch");
+
+ QUrlQuery query;
+ query.addQueryItem("search", m_searchInput->text());
if (m_contentButton->isChecked()) {
- url.addQueryItem("checkContent", "yes");
+ query.addQueryItem("checkContent", "yes");
}
QString encodedUrl;
} else {
encodedUrl = m_searchPath.url();
}
- url.addQueryItem("url", encodedUrl);
+ query.addQueryItem("url", encodedUrl);
+
+ url.setQuery(query);
}
return url;
}
-void DolphinSearchBox::fromSearchUrl(const KUrl& url)
+void DolphinSearchBox::fromSearchUrl(const QUrl& url)
{
- if (url.protocol() == "baloosearch") {
+ if (url.scheme() == "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 if (url.scheme() == "filenamesearch") {
+ const QUrlQuery query(url);
+ setText(query.queryItemValue("search"));
+ setSearchPath(QUrl::fromUserInput(query.queryItemValue("url"), QString(), QUrl::AssumeLocalFile));
+ m_contentButton->setChecked(query.queryItemValue("checkContent") == "yes");
} else {
setText(QString());
setSearchPath(url);
}
}
-void DolphinSearchBox::slotSearchTextChanged()
+void DolphinSearchBox::slotSearchTextChanged(const QString& text)
{
- const QString text = m_searchInput->text();
if (text.isEmpty()) {
m_startSearchTimer->stop();
void DolphinSearchBox::slotReturnPressed()
{
emitSearchRequest();
- emit returnPressed(m_searchInput->text());
-}
-
-void DolphinSearchBox::updateSearchInputParsing()
-{
-#ifdef HAVE_BALOO
- m_searchInput->setParsingEnabled(m_contentButton->isChecked());
-#endif
+ emit returnPressed();
}
void DolphinSearchBox::slotFacetsButtonToggled()
}
m_facetsWidget->setVisible(SearchSettings::showFacetsWidget());
- updateSearchInputParsing();
}
void DolphinSearchBox::saveSettings()
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 = new QLineEdit(this);
m_searchInput->installEventFilter(this);
- m_searchInput->setClearButtonShown(true);
+ m_searchInput->setClearButtonEnabled(true);
m_searchInput->setFont(QFontDatabase::systemFont(QFontDatabase::GeneralFont));
- connect(m_searchInput, &KLineEdit::returnPressed,
+ connect(m_searchInput, &QLineEdit::returnPressed,
this, &DolphinSearchBox::slotReturnPressed);
- connect(m_searchInput, &KLineEdit::textChanged,
+ connect(m_searchInput, &QLineEdit::textChanged,
this, &DolphinSearchBox::slotSearchTextChanged);
-#endif
setFocusProxy(m_searchInput);
// Apply layout for the search input
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);
updateFacetsToggleButton();
}
-KUrl DolphinSearchBox::balooUrlForSearching() const
+QUrl DolphinSearchBox::balooUrlForSearching() const
{
#ifdef HAVE_BALOO
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);
+ QStringList queryStrings;
+ QString ratingQuery = m_facetsWidget->ratingTerm();
+ if (!ratingQuery.isEmpty()) {
+ queryStrings << ratingQuery;
+ }
- query.setTerm(term);
+ if (m_contentButton->isChecked()) {
+ queryStrings << text;
+ } else if (!text.isEmpty()) {
+ queryStrings << QString::fromLatin1("filename:\"%1\"").arg(text);
}
if (m_fromHereButton->isChecked()) {
query.setIncludeFolder(m_searchPath.toLocalFile());
}
+ query.setSearchString(queryStrings.join(" "));
+
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
}
-void DolphinSearchBox::fromBalooSearchUrl(const KUrl& url)
+void DolphinSearchBox::fromBalooSearchUrl(const QUrl& 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.
const QString customDir = query.includeFolder();
if (!customDir.isEmpty()) {
- setSearchPath(customDir);
+ setSearchPath(QUrl::fromLocalFile(customDir));
} else {
- setSearchPath(QDir::homePath());
+ setSearchPath(QUrl::fromLocalFile(QDir::homePath()));
}
- if (!query.searchString().isEmpty()) {
- setText(query.searchString());
- }
+ setText(query.searchString());
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());
+ const QStringList subTerms = query.searchString().split(' ', QString::SkipEmptyParts);
+ foreach (const QString& subTerm, subTerms) {
+ if (subTerm.startsWith("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
}
projects / dolphin.git / blobdiff