* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA *
* **************************************************************************/
+#include "global.h"
#include "dolphinsearchbox.h"
#include "dolphin_searchsettings.h"
#include "dolphinfacetswidget.h"
+#include "dolphinquery.h"
#include "panels/places/placesitemmodel.h"
#include <KLocalizedString>
#include <QFontDatabase>
#include <QHBoxLayout>
#include <QIcon>
+#include <QKeyEvent>
#include <QLabel>
#include <QLineEdit>
#include <QScrollArea>
+#include <QShowEvent>
#include <QTimer>
#include <QToolButton>
#include <QUrlQuery>
m_separator(nullptr),
m_fromHereButton(nullptr),
m_everywhereButton(nullptr),
- m_facetsToggleButton(nullptr),
m_facetsWidget(nullptr),
m_searchPath(),
m_startSearchTimer(nullptr)
}
query.addQueryItem(QStringLiteral("url"), searchPath().url());
+ query.addQueryItem(QStringLiteral("title"), queryTitle(m_searchInput->text()));
url.setQuery(query);
}
void DolphinSearchBox::fromSearchUrl(const QUrl& url)
{
if (url.scheme() == QLatin1String("baloosearch")) {
- fromBalooSearchUrl(url);
+ const DolphinQuery query = DolphinQuery::fromBalooSearchUrl(url);
+ updateFromQuery(query);
} else if (url.scheme() == QLatin1String("filenamesearch")) {
const QUrlQuery query(url);
setText(query.queryItemValue(QStringLiteral("search")));
setSearchPath(url);
}
- setFacetsVisible(SearchSettings::showFacetsWidget());
+ updateFacetsVisible();
}
void DolphinSearchBox::selectAll()
m_searchInput->setFocus();
m_startedSearching = false;
}
- updateFacetsToggleButton();
}
void DolphinSearchBox::hideEvent(QHideEvent* event)
{
- Q_UNUSED(event);
+ Q_UNUSED(event)
m_startedSearching = false;
m_startSearchTimer->stop();
}
m_searchInput->clear();
}
}
+ else if (event->key() == Qt::Key_Down) {
+ emit focusViewRequest();
+ }
}
bool DolphinSearchBox::eventFilter(QObject* obj, QEvent* event)
void DolphinSearchBox::slotReturnPressed()
{
emitSearchRequest();
- emit returnPressed();
-}
-
-void DolphinSearchBox::slotFacetsButtonToggled()
-{
- setFacetsVisible(m_facetsToggleButton->isChecked());
+ emit focusViewRequest();
}
void DolphinSearchBox::slotFacetChanged()
m_fileNameButton->setChecked(true);
}
- setFacetsVisible(SearchSettings::showFacetsWidget());
+ updateFacetsVisible();
}
void DolphinSearchBox::saveSettings()
{
SearchSettings::setLocation(m_fromHereButton->isChecked() ? QStringLiteral("FromHere") : QStringLiteral("Everywhere"));
SearchSettings::setWhat(m_fileNameButton->isChecked() ? QStringLiteral("FileName") : QStringLiteral("Content"));
- if (isIndexingEnabled()) {
- SearchSettings::setShowFacetsWidget(m_facetsToggleButton->isChecked());
- }
SearchSettings::self()->save();
}
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);
-
+ // Create "Facets" widget
m_facetsWidget = new DolphinFacetsWidget(this);
m_facetsWidget->installEventFilter(this);
m_facetsWidget->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Maximum);
+ m_facetsWidget->layout()->setSpacing(Dolphin::LAYOUT_SPACING_SMALL);
connect(m_facetsWidget, &DolphinFacetsWidget::facetChanged, this, &DolphinSearchBox::slotFacetChanged);
// Apply layout for the options
QHBoxLayout* optionsLayout = new QHBoxLayout();
optionsLayout->setContentsMargins(0, 0, 0, 0);
+ optionsLayout->setSpacing(Dolphin::LAYOUT_SPACING_SMALL);
optionsLayout->addWidget(m_fileNameButton);
optionsLayout->addWidget(m_contentButton);
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);
m_topLayout = new QVBoxLayout(this);
m_topLayout->setContentsMargins(0, 0, 0, 0);
+ m_topLayout->setSpacing(Dolphin::LAYOUT_SPACING_SMALL);
m_topLayout->addLayout(searchInputLayout);
m_topLayout->addWidget(m_optionsScrollArea);
m_topLayout->addWidget(m_facetsWidget);
connect(m_startSearchTimer, &QTimer::timeout, this, &DolphinSearchBox::emitSearchRequest);
}
+QString DolphinSearchBox::queryTitle(const QString& text) const
+{
+ return i18nc("@title UDS_DISPLAY_NAME for a KIO directory listing. %1 is the query the user entered.",
+ "Query Results from '%1'", text);
+}
+
QUrl DolphinSearchBox::balooUrlForSearching() const
{
#ifdef HAVE_BALOO
Baloo::Query query;
query.addType(m_facetsWidget->facetType());
- QStringList queryStrings;
- QString ratingQuery = m_facetsWidget->ratingTerm();
- if (!ratingQuery.isEmpty()) {
- queryStrings << ratingQuery;
- }
+ QStringList queryStrings = m_facetsWidget->searchTerms();
if (m_contentButton->isChecked()) {
queryStrings << text;
query.setSearchString(queryStrings.join(QLatin1Char(' ')));
- 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));
+ return query.toSearchUrl(queryTitle(text));
#else
return QUrl();
#endif
}
-void DolphinSearchBox::fromBalooSearchUrl(const QUrl& url)
+void DolphinSearchBox::updateFromQuery(const DolphinQuery& query)
{
-#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);
setSearchPath(QUrl::fromLocalFile(QDir::homePath()));
}
- m_facetsWidget->resetOptions();
+ setText(query.text());
- setText(query.searchString());
-
- QStringList types = query.types();
- if (!types.isEmpty()) {
- m_facetsWidget->setFacetType(types.first());
+ if (query.hasContentSearch()) {
+ m_contentButton->setChecked(true);
+ } else if (query.hasFileName()) {
+ m_fileNameButton->setChecked(true);
}
- 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_facetsWidget->resetSearchTerms();
+ m_facetsWidget->setFacetType(query.type());
+ const QStringList searchTerms = query.searchTerms();
+ for (const QString& searchTerm : searchTerms) {
+ m_facetsWidget->setSearchTerm(searchTerm);
}
m_startSearchTimer->stop();
blockSignals(false);
-#else
- Q_UNUSED(url);
-#endif
}
-void DolphinSearchBox::setFacetsVisible(bool visible)
+void DolphinSearchBox::updateFacetsVisible()
{
const bool indexingEnabled = isIndexingEnabled();
m_facetsWidget->setEnabled(indexingEnabled);
- m_facetsWidget->setVisible(indexingEnabled && visible);
- updateFacetsToggleButton();
-}
-
-void DolphinSearchBox::updateFacetsToggleButton()
-{
- const bool facetsEnabled = m_facetsWidget->isEnabled();
- const bool facetsVisible = m_facetsWidget->isVisible();
-
- m_facetsToggleButton->setEnabled(facetsEnabled);
- m_facetsToggleButton->setChecked(facetsVisible);
-
- m_facetsToggleButton->setIcon(QIcon::fromTheme(
- facetsVisible ? QStringLiteral("arrow-up-double") :
- QStringLiteral("arrow-down-double")));
-
- m_facetsToggleButton->setText(
- facetsVisible ? i18nc("@action:button", "Fewer Options") :
- i18nc("@action:button", "More Options"));
-
- if (facetsEnabled) {
- m_facetsToggleButton->setToolTip(QString());
- } else {
-#ifdef HAVE_BALOO
- const Baloo::IndexerConfig searchInfo;
- if (!searchInfo.fileIndexingEnabled()) {
- m_facetsToggleButton->setToolTip(i18nc("@info:tooltip", "Advanced search options are not available because the file indexing service is disabled."));
- } else {
- m_facetsToggleButton->setToolTip(i18nc("@info:tooltip", "Advanced search options are not available because this location is not indexed."));
- }
-#else
- m_facetsToggleButton->setToolTip(i18nc("@info:tooltip", "Advanced search options are not available because this version of Dolphin does not support the Baloo file indexer."));
-#endif
- }
+ m_facetsWidget->setVisible(indexingEnabled);
}
bool DolphinSearchBox::isIndexingEnabled() const
{
#ifdef HAVE_BALOO
const Baloo::IndexerConfig searchInfo;
- return searchInfo.fileIndexingEnabled() && searchInfo.shouldBeIndexed(searchPath().toLocalFile());
+ return searchInfo.fileIndexingEnabled() && !searchPath().isEmpty() && searchInfo.shouldBeIndexed(searchPath().toLocalFile());
#else
return false;
#endif
projects / dolphin.git / blobdiff