#include <QLineEdit>
#include <KLocalizedString>
#include <KSeparator>
+#include <KNS3/KMoreToolsMenuFactory>
#include <QButtonGroup>
#include <QDir>
#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>
QString location = url.fileName();
if (location.isEmpty()) {
if (url.isLocalFile()) {
- location = QLatin1String("/");
+ location = QStringLiteral("/");
} else {
location = url.scheme() + QLatin1String(" - ") + url.host();
}
if (useBalooSearch) {
url = balooUrlForSearching();
} else {
- url.setScheme("filenamesearch");
- url.addQueryItem("search", m_searchInput->text());
+ url.setScheme(QStringLiteral("filenamesearch"));
+
+ QUrlQuery query;
+ query.addQueryItem(QStringLiteral("search"), m_searchInput->text());
if (m_contentButton->isChecked()) {
- url.addQueryItem("checkContent", "yes");
+ query.addQueryItem(QStringLiteral("checkContent"), QStringLiteral("yes"));
}
QString encodedUrl;
} else {
encodedUrl = m_searchPath.url();
}
- url.addQueryItem("url", encodedUrl);
+ query.addQueryItem(QStringLiteral("url"), encodedUrl);
+
+ url.setQuery(query);
}
return url;
void DolphinSearchBox::fromSearchUrl(const QUrl& url)
{
- if (url.scheme() == "baloosearch") {
+ if (url.scheme() == QLatin1String("baloosearch")) {
fromBalooSearchUrl(url);
- } else if (url.scheme() == "filenamesearch") {
- setText(url.queryItemValue("search"));
- setSearchPath(url.queryItemValue("url"));
- m_contentButton->setChecked(url.queryItemValue("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);
}
}
+void DolphinSearchBox::hideEvent(QHideEvent* event)
+{
+ Q_UNUSED(event);
+ m_startedSearching = false;
+ m_startSearchTimer->stop();
+}
+
void DolphinSearchBox::keyReleaseEvent(QKeyEvent* event)
{
QWidget::keyReleaseEvent(event);
{
switch (event->type()) {
case QEvent::FocusIn:
- setActive(true);
- setFocus();
+ // #379135: we get the FocusIn event when we close a tab but we don't want to emit
+ // the activated() signal before the removeTab() call in DolphinTabWidget::closeTab() returns.
+ // To avoid this issue, we delay the activation of the search box.
+ QTimer::singleShot(0, this, [this] {
+ setActive(true);
+ setFocus();
+ });
break;
default:
}
}
-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()
{
- 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::self()->save();
}
// Create close button
QToolButton* closeButton = new QToolButton(this);
closeButton->setAutoRaise(true);
- closeButton->setIcon(QIcon::fromTheme("dialog-close"));
+ closeButton->setIcon(QIcon::fromTheme(QStringLiteral("dialog-close")));
closeButton->setToolTip(i18nc("@info:tooltip", "Quit searching"));
connect(closeButton, &QToolButton::clicked, this, &DolphinSearchBox::emitCloseRequest);
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 QLineEdit(this);
m_searchInput->installEventFilter(this);
m_searchInput->setClearButtonEnabled(true);
this, &DolphinSearchBox::slotReturnPressed);
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);
searchLocationGroup->addButton(m_fromHereButton);
searchLocationGroup->addButton(m_everywhereButton);
+ auto moreSearchToolsButton = new QToolButton(this);
+ moreSearchToolsButton->setAutoRaise(true);
+ moreSearchToolsButton->setPopupMode(QToolButton::InstantPopup);
+ moreSearchToolsButton->setIcon(QIcon::fromTheme("arrow-down-double"));
+ moreSearchToolsButton->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
+ moreSearchToolsButton->setText(i18n("More Search Tools"));
+ moreSearchToolsButton->setMenu(new QMenu(this));
+ connect(moreSearchToolsButton->menu(), &QMenu::aboutToShow, moreSearchToolsButton->menu(), [this, moreSearchToolsButton]()
+ {
+ m_menuFactory.reset(new KMoreToolsMenuFactory("dolphin/search-tools"));
+ moreSearchToolsButton->menu()->clear();
+ m_menuFactory->fillMenuFromGroupingNames(moreSearchToolsButton->menu(), { "files-find" }, this->m_searchPath);
+ } );
+
// Create "Facets" widgets
m_facetsToggleButton = new QToolButton(this);
m_facetsToggleButton->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
optionsLayout->addWidget(m_separator);
optionsLayout->addWidget(m_fromHereButton);
optionsLayout->addWidget(m_everywhereButton);
- optionsLayout->addStretch(1);
+ optionsLayout->addWidget(new KSeparator(Qt::Vertical, this));
optionsLayout->addWidget(m_facetsToggleButton);
+ optionsLayout->addWidget(moreSearchToolsButton);
+ optionsLayout->addStretch(1);
// Put the options into a QScrollArea. This prevents increasing the view width
// in case that not enough width for the options is available.
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 << QStringLiteral("filename:\"%1\"").arg(text);
}
if (m_fromHereButton->isChecked()) {
query.setIncludeFolder(m_searchPath.toLocalFile());
}
+ 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
{
#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(QLatin1String("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
}
{
const bool facetsIsVisible = SearchSettings::showFacetsWidget();
m_facetsToggleButton->setChecked(facetsIsVisible ? true : false);
- m_facetsToggleButton->setIcon(QIcon::fromTheme(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"));
}
projects / dolphin.git / blobdiff