#include "dolphinsearchbox.h"
#include "dolphin_searchsettings.h"
-#include "dolphinsearchinformation.h"
-
-#include <KIcon>
-#include <KLineEdit>
-#include <KLocale>
-#include <kseparator.h>
+#include "dolphinfacetswidget.h"
+#include "panels/places/placesitemmodel.h"
+
+#include <KLocalizedString>
+#include <KNS3/KMoreToolsMenuFactory>
+#include <KSeparator>
+#include <config-baloo.h>
+#ifdef HAVE_BALOO
+#include <Baloo/Query>
+#include <Baloo/IndexerConfig>
+#endif
#include <QButtonGroup>
#include <QDir>
-#include <QEvent>
-#include <QFormLayout>
+#include <QFontDatabase>
#include <QHBoxLayout>
-#include <QKeyEvent>
+#include <QIcon>
#include <QLabel>
-#include <QPushButton>
+#include <QLineEdit>
#include <QScrollArea>
#include <QTimer>
#include <QToolButton>
-#include <QVBoxLayout>
-
-#include <config-nepomuk.h>
-#ifdef HAVE_NEPOMUK
- #include <Nepomuk/Query/AndTerm>
- #include <Nepomuk/Query/FileQuery>
- #include <Nepomuk/Query/LiteralTerm>
- #include <Nepomuk/Query/Query>
- #include <Nepomuk/Query/QueryParser>
- #include <Nepomuk/Query/ResourceTypeTerm>
- #include <Nepomuk/Query/ComparisonTerm>
- #include <Nepomuk/ResourceManager>
- #include <Nepomuk/Vocabulary/NFO>
-#endif
+#include <QUrlQuery>
DolphinSearchBox::DolphinSearchBox(QWidget* parent) :
QWidget(parent),
m_startedSearching(false),
- m_nepomukActivated(false),
- m_topLayout(0),
- m_searchInput(0),
- m_fileNameButton(0),
- m_contentButton(0),
- m_separator(0),
- m_fromHereButton(0),
- m_everywhereButton(0),
+ m_active(true),
+ m_topLayout(nullptr),
+ m_searchLabel(nullptr),
+ m_searchInput(nullptr),
+ m_saveSearchAction(nullptr),
+ m_optionsScrollArea(nullptr),
+ m_fileNameButton(nullptr),
+ m_contentButton(nullptr),
+ m_separator(nullptr),
+ m_fromHereButton(nullptr),
+ m_everywhereButton(nullptr),
+ m_facetsToggleButton(nullptr),
+ m_facetsWidget(nullptr),
m_searchPath(),
- m_startSearchTimer(0)
+ m_startSearchTimer(nullptr)
{
}
saveSettings();
}
+void DolphinSearchBox::setText(const QString& text)
+{
+ m_searchInput->setText(text);
+}
+
QString DolphinSearchBox::text() const
{
return m_searchInput->text();
}
-void DolphinSearchBox::setSearchPath(const KUrl& url)
+void DolphinSearchBox::setSearchPath(const QUrl& url)
{
m_searchPath = url;
QFontMetrics metrics(m_fromHereButton->font());
- const int maxWidth = metrics.averageCharWidth() * 15;
+ const int maxWidth = metrics.height() * 8;
QString location = url.fileName();
if (location.isEmpty()) {
if (url.isLocalFile()) {
- location = QLatin1String("/");
+ location = QStringLiteral("/");
} else {
- location = url.protocol() + QLatin1String(" - ") + url.host();
+ location = url.scheme() + QLatin1String(" - ") + url.host();
}
}
m_separator->setVisible(showSearchFromButtons);
m_fromHereButton->setVisible(showSearchFromButtons);
m_everywhereButton->setVisible(showSearchFromButtons);
+
+ bool hasFacetsSupport = false;
+#ifdef HAVE_BALOO
+ const Baloo::IndexerConfig searchInfo;
+ hasFacetsSupport = searchInfo.fileIndexingEnabled() && searchInfo.shouldBeIndexed(m_searchPath.toLocalFile());
+#endif
+ 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;
- const DolphinSearchInformation& searchInfo = DolphinSearchInformation::instance();
- if (searchInfo.isIndexingEnabled() && searchInfo.isPathIndexed(url)) {
- url = nepomukUrlForSearching();
+ QUrl url;
+ 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());
+ 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() == QLatin1String("baloosearch")) {
+ fromBalooSearchUrl(url);
+ } 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::selectAll()
{
m_searchInput->selectAll();
}
+void DolphinSearchBox::setActive(bool active)
+{
+ if (active != m_active) {
+ m_active = active;
+
+ if (active) {
+ emit activated();
+ }
+ }
+}
+
+bool DolphinSearchBox::isActive() const
+{
+ return m_active;
+}
+
bool DolphinSearchBox::event(QEvent* event)
{
if (event->type() == QEvent::Polish) {
void DolphinSearchBox::showEvent(QShowEvent* event)
{
if (!event->spontaneous()) {
-#ifdef HAVE_NEPOMUK
- m_nepomukActivated = (Nepomuk::ResourceManager::instance()->init() == 0);
-#endif
-
- m_searchInput->clear();
m_searchInput->setFocus();
m_startedSearching = false;
}
}
+void DolphinSearchBox::hideEvent(QHideEvent* event)
+{
+ Q_UNUSED(event);
+ m_startedSearching = false;
+ m_startSearchTimer->stop();
+}
+
void DolphinSearchBox::keyReleaseEvent(QKeyEvent* event)
{
QWidget::keyReleaseEvent(event);
}
}
-void DolphinSearchBox::emitSearchSignal()
+bool DolphinSearchBox::eventFilter(QObject* obj, QEvent* event)
+{
+ switch (event->type()) {
+ case QEvent::FocusIn:
+ // #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.
+ // We also don't want to schedule the activation process if we are already active,
+ // otherwise we can enter in a loop of FocusIn/FocusOut events with the searchbox of another tab.
+ if (!isActive()) {
+ QTimer::singleShot(0, this, [this] {
+ setActive(true);
+ setFocus();
+ });
+ }
+ break;
+
+ default:
+ break;
+ }
+
+ return QObject::eventFilter(obj, event);
+}
+
+void DolphinSearchBox::emitSearchRequest()
{
m_startSearchTimer->stop();
m_startedSearching = true;
- emit search(m_searchInput->text());
+ m_saveSearchAction->setEnabled(true);
+ emit searchRequest();
+}
+
+void DolphinSearchBox::emitCloseRequest()
+{
+ m_startSearchTimer->stop();
+ m_startedSearching = false;
+ m_saveSearchAction->setEnabled(false);
+ emit closeRequest();
}
void DolphinSearchBox::slotConfigurationChanged()
{
+ saveSettings();
if (m_startedSearching) {
- emitSearchSignal();
+ emitSearchRequest();
}
}
void DolphinSearchBox::slotSearchTextChanged(const QString& text)
{
+
if (text.isEmpty()) {
m_startSearchTimer->stop();
} else {
emit searchTextChanged(text);
}
-void DolphinSearchBox::slotReturnPressed(const QString& text)
+void DolphinSearchBox::slotReturnPressed()
{
- emitSearchSignal();
- emit returnPressed(text);
+ emitSearchRequest();
+ emit returnPressed();
}
-void DolphinSearchBox::initButton(QPushButton* button)
+void DolphinSearchBox::slotFacetsButtonToggled()
{
+ const bool facetsIsVisible = !m_facetsWidget->isVisible();
+ m_facetsWidget->setVisible(facetsIsVisible);
+ updateFacetsToggleButton();
+}
+
+void DolphinSearchBox::slotFacetChanged()
+{
+ m_startedSearching = true;
+ m_startSearchTimer->stop();
+ emit searchRequest();
+}
+
+void DolphinSearchBox::slotSearchSaved()
+{
+ const QUrl searchURL = urlForSearching();
+ if (searchURL.isValid()) {
+ PlacesItemModel model;
+ const QString label = i18n("Search for %1 in %2", text(), searchPath().fileName());
+ model.createPlacesItem(label,
+ searchURL,
+ QStringLiteral("folder-saved-search-symbolic"));
+ }
+}
+
+void DolphinSearchBox::initButton(QToolButton* button)
+{
+ button->installEventFilter(this);
button->setAutoExclusive(true);
- button->setFlat(true);
+ button->setAutoRaise(true);
button->setCheckable(true);
- connect(button, SIGNAL(toggled(bool)), this, SLOT(slotConfigurationChanged()));
+ connect(button, &QToolButton::clicked, this, &DolphinSearchBox::slotConfigurationChanged);
}
void DolphinSearchBox::loadSettings()
} else {
m_fileNameButton->setChecked(true);
}
+
+ m_facetsWidget->setVisible(SearchSettings::showFacetsWidget());
}
void DolphinSearchBox::saveSettings()
{
- SearchSettings::setLocation(m_fromHereButton->isChecked() ? "FromHere" : "Everywhere");
- SearchSettings::setWhat(m_fileNameButton->isChecked() ? "FileName" : "Content");
- SearchSettings::self()->writeConfig();
+ 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();
}
void DolphinSearchBox::init()
// 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"));
- connect(closeButton, SIGNAL(clicked()), SIGNAL(closeRequest()));
+ connect(closeButton, &QToolButton::clicked, this, &DolphinSearchBox::emitCloseRequest);
// Create search label
- QLabel* searchLabel = new QLabel(i18nc("@label:textbox", "Find:"), this);
+ m_searchLabel = new QLabel(this);
// Create search box
- m_searchInput = new KLineEdit(this);
- m_searchInput->setClearButtonShown(true);
- m_searchInput->setFont(KGlobalSettings::generalFont());
+ m_searchInput = new QLineEdit(this);
+ m_searchInput->installEventFilter(this);
+ 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);
- connect(m_searchInput, SIGNAL(returnPressed(QString)),
- this, SLOT(slotReturnPressed(QString)));
- connect(m_searchInput, SIGNAL(textChanged(QString)),
- this, SLOT(slotSearchTextChanged(QString)));
+
+ // Add "Save search" button inside search box
+ m_saveSearchAction = new QAction(this);
+ m_saveSearchAction->setIcon (QIcon::fromTheme(QStringLiteral("document-save-symbolic")));
+ m_saveSearchAction->setText(i18nc("action:button", "Save this search to quickly access it again in the future"));
+ m_saveSearchAction->setEnabled(false);
+ m_searchInput->addAction(m_saveSearchAction, QLineEdit::TrailingPosition);
+ connect(m_saveSearchAction, &QAction::triggered, this, &DolphinSearchBox::slotSearchSaved);
// Apply layout for the search input
QHBoxLayout* searchInputLayout = new QHBoxLayout();
searchInputLayout->setMargin(0);
searchInputLayout->addWidget(closeButton);
- searchInputLayout->addWidget(searchLabel);
+ searchInputLayout->addWidget(m_searchLabel);
searchInputLayout->addWidget(m_searchInput);
// Create "Filename" and "Content" button
- m_fileNameButton = new QPushButton(this);
+ m_fileNameButton = new QToolButton(this);
m_fileNameButton->setText(i18nc("action:button", "Filename"));
initButton(m_fileNameButton);
- m_contentButton = new QPushButton();
+ m_contentButton = new QToolButton();
m_contentButton->setText(i18nc("action:button", "Content"));
- initButton(m_contentButton);;
+ initButton(m_contentButton);
QButtonGroup* searchWhatGroup = new QButtonGroup(this);
searchWhatGroup->addButton(m_fileNameButton);
m_separator = new KSeparator(Qt::Vertical, this);
// Create "From Here" and "Everywhere"button
- m_fromHereButton = new QPushButton(this);
+ m_fromHereButton = new QToolButton(this);
m_fromHereButton->setText(i18nc("action:button", "From Here"));
initButton(m_fromHereButton);
- m_everywhereButton = new QPushButton(this);
+ m_everywhereButton = new QToolButton(this);
m_everywhereButton->setText(i18nc("action:button", "Everywhere"));
initButton(m_everywhereButton);
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);
+ initButton(m_facetsToggleButton);
+ connect(m_facetsToggleButton, &QToolButton::clicked, this, &DolphinSearchBox::slotFacetsButtonToggled);
+
+ m_facetsWidget = new DolphinFacetsWidget(this);
+ m_facetsWidget->installEventFilter(this);
+ m_facetsWidget->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Maximum);
+ connect(m_facetsWidget, &DolphinFacetsWidget::facetChanged, this, &DolphinSearchBox::slotFacetChanged);
+
// Apply layout for the options
QHBoxLayout* optionsLayout = new QHBoxLayout();
optionsLayout->setMargin(0);
optionsLayout->addWidget(m_separator);
optionsLayout->addWidget(m_fromHereButton);
optionsLayout->addWidget(m_everywhereButton);
+ 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.
QWidget* optionsContainer = new QWidget(this);
optionsContainer->setLayout(optionsLayout);
- QScrollArea* optionsScrollArea = new QScrollArea(this);
- optionsScrollArea->setFrameShape(QFrame::NoFrame);
- optionsScrollArea->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
- optionsScrollArea->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
- optionsScrollArea->setMaximumHeight(optionsContainer->sizeHint().height());
- optionsScrollArea->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
- optionsScrollArea->setWidget(optionsContainer);
- optionsScrollArea->setWidgetResizable(true);
+
+ m_optionsScrollArea = new QScrollArea(this);
+ m_optionsScrollArea->setFrameShape(QFrame::NoFrame);
+ m_optionsScrollArea->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+ m_optionsScrollArea->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+ m_optionsScrollArea->setMaximumHeight(optionsContainer->sizeHint().height());
+ m_optionsScrollArea->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
+ m_optionsScrollArea->setWidget(optionsContainer);
+ m_optionsScrollArea->setWidgetResizable(true);
m_topLayout = new QVBoxLayout(this);
+ m_topLayout->setMargin(0);
m_topLayout->addLayout(searchInputLayout);
- m_topLayout->addWidget(optionsScrollArea);
+ m_topLayout->addWidget(m_optionsScrollArea);
+ m_topLayout->addWidget(m_facetsWidget);
- searchLabel->setBuddy(m_searchInput);
loadSettings();
// The searching should be started automatically after the user did not change
m_startSearchTimer = new QTimer(this);
m_startSearchTimer->setSingleShot(true);
m_startSearchTimer->setInterval(1000);
- connect(m_startSearchTimer, SIGNAL(timeout()), this, SLOT(emitSearchSignal()));
+ connect(m_startSearchTimer, &QTimer::timeout, this, &DolphinSearchBox::emitSearchRequest);
+
+ updateFacetsToggleButton();
}
-KUrl DolphinSearchBox::nepomukUrlForSearching() const
+QUrl DolphinSearchBox::balooUrlForSearching() const
{
-#ifdef HAVE_NEPOMUK
- Nepomuk::Query::AndTerm andTerm;
-
- // Add input from search filter
+#ifdef HAVE_BALOO
const QString text = m_searchInput->text();
- if (!text.isEmpty()) {
- if (m_fileNameButton->isChecked()) {
- QString regex = QRegExp::escape(text);
- regex.replace("\\*", QLatin1String(".*"));
- regex.replace("\\?", QLatin1String("."));
- regex.replace("\\", "\\\\");
- andTerm.addSubTerm(Nepomuk::Query::ComparisonTerm(
- Nepomuk::Vocabulary::NFO::fileName(),
- Nepomuk::Query::LiteralTerm(regex),
- Nepomuk::Query::ComparisonTerm::Regexp));
- } else {
- const Nepomuk::Query::Query customQuery = Nepomuk::Query::QueryParser::parseQuery(text, Nepomuk::Query::QueryParser::DetectFilenamePattern);
- if (customQuery.isValid()) {
- andTerm.addSubTerm(customQuery.term());
- }
- }
+
+ Baloo::Query query;
+ query.addType(m_facetsWidget->facetType());
+
+ QStringList queryStrings;
+ QString ratingQuery = m_facetsWidget->ratingTerm();
+ if (!ratingQuery.isEmpty()) {
+ queryStrings << ratingQuery;
+ }
+
+ if (m_contentButton->isChecked()) {
+ queryStrings << text;
+ } else if (!text.isEmpty()) {
+ queryStrings << QStringLiteral("filename:\"%1\"").arg(text);
}
- Nepomuk::Query::FileQuery fileQuery;
- fileQuery.setFileMode(Nepomuk::Query::FileQuery::QueryFilesAndFolders);
- fileQuery.setTerm(andTerm);
if (m_fromHereButton->isChecked()) {
- const bool recursive = true;
- fileQuery.addIncludeFolder(m_searchPath, recursive);
+ 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
+ return QUrl();
+#endif
+}
+
+void DolphinSearchBox::fromBalooSearchUrl(const QUrl& url)
+{
+#ifdef HAVE_BALOO
+ const Baloo::Query query = Baloo::Query::fromSearchUrl(url);
+
+ // Block all signals to avoid unnecessary "searchRequest" signals
+ // while we adjust the search text and the facet widget.
+ blockSignals(true);
+
+ const QString customDir = query.includeFolder();
+ if (!customDir.isEmpty()) {
+ setSearchPath(QUrl::fromLocalFile(customDir));
+ } else {
+ setSearchPath(QUrl::fromLocalFile(QDir::homePath()));
+ }
+
+ setText(query.searchString());
+
+ QStringList types = query.types();
+ if (!types.isEmpty()) {
+ m_facetsWidget->setFacetType(types.first());
}
- 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));
+ 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
- return KUrl();
+ Q_UNUSED(url);
#endif
}
-#include "dolphinsearchbox.moc"
+void DolphinSearchBox::updateFacetsToggleButton()
+{
+ const bool facetsIsVisible = SearchSettings::showFacetsWidget();
+ m_facetsToggleButton->setChecked(facetsIsVisible ? true : false);
+ 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