X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/49eb864b03b6370e403c6f048ab18d1478eab045..119f7a3f:/src/search/dolphinsearchbox.cpp diff --git a/src/search/dolphinsearchbox.cpp b/src/search/dolphinsearchbox.cpp index c2f2a0390..fe298312f 100644 --- a/src/search/dolphinsearchbox.cpp +++ b/src/search/dolphinsearchbox.cpp @@ -20,54 +20,50 @@ #include "dolphinsearchbox.h" #include "dolphin_searchsettings.h" +#include "dolphinfacetswidget.h" -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include -#include #include #include #include -#include +#include +#include #include #include -#include -#ifdef HAVE_NEPOMUK - #define DISABLE_NEPOMUK_LEGACY - #include - #include - #include - #include - #include - #include - #include - #include "nfo.h" - - #include "filters/datesearchfilterwidget.h" - #include "filters/ratingsearchfilterwidget.h" - #include "filters/tagsearchfilterwidget.h" +#ifdef HAVE_BALOO + #include + #include + #include + #include + #include #endif +#include DolphinSearchBox::DolphinSearchBox(QWidget* parent) : QWidget(parent), m_startedSearching(false), - m_nepomukActivated(false), + m_active(true), m_topLayout(0), + m_searchLabel(0), m_searchInput(0), - m_fromHereButton(0), - m_everywhereButton(0), + m_optionsScrollArea(0), m_fileNameButton(0), m_contentButton(0), - m_filterButton(0), - m_filterWidgetsLayout(0), - m_filterWidgets(), - m_searchPath() + m_separator(0), + m_fromHereButton(0), + m_everywhereButton(0), + m_facetsToggleButton(0), + m_facetsWidget(0), + m_searchPath(), + m_startSearchTimer(0) { } @@ -76,56 +72,124 @@ DolphinSearchBox::~DolphinSearchBox() 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; - m_filterButton->setVisible(isSearchPathIndexed()); + + QFontMetrics metrics(m_fromHereButton->font()); + const int maxWidth = metrics.height() * 8; + + QString location = url.fileName(); + if (location.isEmpty()) { + if (url.isLocalFile()) { + location = QLatin1String("/"); + } else { + location = url.scheme() + QLatin1String(" - ") + url.host(); + } + } + + const QString elidedLocation = metrics.elidedText(location, Qt::ElideMiddle, maxWidth); + m_fromHereButton->setText(i18nc("action:button", "From Here (%1)", elidedLocation)); + + const bool showSearchFromButtons = url.isLocalFile(); + 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; - if (isSearchPathIndexed() && !m_fileNameButton->isChecked()) { - // TODO: Currently Nepomuk is not used for searching filenames. Nepomuk - // is capable to provide this, but further investigations are necessary to - // also support regular expressions. - 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 = m_searchPath; - url.setProtocol("filenamesearch"); + url.setScheme("filenamesearch"); url.addQueryItem("search", m_searchInput->text()); if (m_contentButton->isChecked()) { url.addQueryItem("checkContent", "yes"); } + + QString encodedUrl; if (m_everywhereButton->isChecked()) { // It is very unlikely, that the majority of Dolphins target users // mean "the whole harddisk" instead of "my home folder" when // selecting the "Everywhere" button. - url.setPath(QDir::homePath()); + encodedUrl = QDir::homePath(); + } else { + encodedUrl = m_searchPath.url(); } + url.addQueryItem("url", encodedUrl); } return url; } +void DolphinSearchBox::fromSearchUrl(const QUrl& url) +{ + if (url.scheme() == "baloosearch") { + fromBalooSearchUrl(url); + } else if (url.scheme() == "filenamesearch") { + setText(url.queryItemValue("search")); + setSearchPath(url.queryItemValue("url")); + m_contentButton->setChecked(url.queryItemValue("checkContent") == "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) { init(); - } else if (event->type() == QEvent::KeyPress) { - if (static_cast(event)->key() == Qt::Key_Escape) { - m_searchInput->clear(); - } } return QWidget::event(event); } @@ -133,11 +197,6 @@ bool DolphinSearchBox::event(QEvent* event) 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; } @@ -146,7 +205,7 @@ void DolphinSearchBox::showEvent(QShowEvent* event) void DolphinSearchBox::keyReleaseEvent(QKeyEvent* event) { QWidget::keyReleaseEvent(event); - if ((event->key() == Qt::Key_Escape)) { + if (event->key() == Qt::Key_Escape) { if (m_searchInput->text().isEmpty()) { emit closeRequest(); } else { @@ -155,53 +214,89 @@ void DolphinSearchBox::keyReleaseEvent(QKeyEvent* event) } } -void DolphinSearchBox::emitSearchSignal() +bool DolphinSearchBox::eventFilter(QObject* obj, QEvent* event) +{ + switch (event->type()) { + case QEvent::FocusIn: + 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()); + emit searchRequest(); +} + +void DolphinSearchBox::emitCloseRequest() +{ + m_startSearchTimer->stop(); + m_startedSearching = false; + emit closeRequest(); } void DolphinSearchBox::slotConfigurationChanged() { + saveSettings(); if (m_startedSearching) { - emitSearchSignal(); + emitSearchRequest(); } } -void DolphinSearchBox::setFilterWidgetsVisible(bool visible) +void DolphinSearchBox::slotSearchTextChanged() { -#ifdef HAVE_NEPOMUK - if (visible) { - if (m_filterWidgetsLayout == 0) { - m_filterWidgetsLayout = new QFormLayout(this); - m_filterWidgetsLayout->setSpacing(0); - - m_filterWidgets.append(new DateSearchFilterWidget(this)); - m_filterWidgets.append(new RatingSearchFilterWidget(this)); - m_filterWidgets.append(new TagSearchFilterWidget(this)); - - foreach (AbstractSearchFilterWidget* filterWidget, m_filterWidgets) { - const QString labelText = filterWidget->filterLabel() + QLatin1Char(':'); - QLabel* label = new QLabel(labelText, this); - m_filterWidgetsLayout->addRow(label, filterWidget); - connect(filterWidget, SIGNAL(filterChanged()), this, SLOT(emitSearchSignal())); - } - } - m_topLayout->addLayout(m_filterWidgetsLayout); + const QString text = m_searchInput->text(); + + if (text.isEmpty()) { + m_startSearchTimer->stop(); } else { - m_topLayout->removeItem(m_filterWidgetsLayout); + m_startSearchTimer->start(); } -#else - Q_UNUSED(visible); + emit searchTextChanged(text); +} + +void DolphinSearchBox::slotReturnPressed() +{ + emitSearchRequest(); + emit returnPressed(m_searchInput->text()); +} + +void DolphinSearchBox::updateSearchInputParsing() +{ +#ifdef HAVE_BALOO + m_searchInput->setParsingEnabled(m_contentButton->isChecked()); #endif } -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::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() @@ -217,13 +312,17 @@ void DolphinSearchBox::loadSettings() } else { m_fileNameButton->setChecked(true); } + + m_facetsWidget->setVisible(SearchSettings::showFacetsWidget()); + updateSearchInputParsing(); } void DolphinSearchBox::saveSettings() { SearchSettings::setLocation(m_fromHereButton->isChecked() ? "FromHere" : "Everywhere"); SearchSettings::setWhat(m_fileNameButton->isChecked() ? "FileName" : "Content"); - SearchSettings::self()->writeConfig(); + SearchSettings::setShowFacetsWidget(m_facetsToggleButton->isChecked()); + SearchSettings::self()->save(); } void DolphinSearchBox::init() @@ -231,35 +330,63 @@ void DolphinSearchBox::init() // Create close button QToolButton* closeButton = new QToolButton(this); closeButton->setAutoRaise(true); - closeButton->setIcon(KIcon("dialog-close")); + closeButton->setIcon(QIcon::fromTheme("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()); - connect(m_searchInput, SIGNAL(returnPressed()), - this, SLOT(emitSearchSignal())); - connect(m_searchInput, SIGNAL(textChanged(QString)), - this, SIGNAL(searchTextChanged(QString))); +#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); + m_searchInput->setFont(QFontDatabase::systemFont(QFontDatabase::GeneralFont)); + connect(m_searchInput, &QLineEdit::returnPressed, + this, &DolphinSearchBox::slotReturnPressed); + connect(m_searchInput, &QLineEdit::textChanged, + this, &DolphinSearchBox::slotSearchTextChanged); +#endif + setFocusProxy(m_searchInput); // 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 QToolButton(this); + m_fileNameButton->setText(i18nc("action:button", "Filename")); + initButton(m_fileNameButton); + + m_contentButton = new QToolButton(); + m_contentButton->setText(i18nc("action:button", "Content")); + initButton(m_contentButton); + + QButtonGroup* searchWhatGroup = new QButtonGroup(this); + searchWhatGroup->addButton(m_fileNameButton); + searchWhatGroup->addButton(m_contentButton); + connect(searchWhatGroup, static_cast(&QButtonGroup::buttonClicked), + this, &DolphinSearchBox::updateSearchInputParsing); + + m_separator = new KSeparator(Qt::Vertical, this); + // Create "From Here" and "Everywhere"button - m_fromHereButton = new QPushButton(); + 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); @@ -267,114 +394,145 @@ void DolphinSearchBox::init() searchLocationGroup->addButton(m_fromHereButton); searchLocationGroup->addButton(m_everywhereButton); - // Create "Filename" and "Content" button - m_fileNameButton = new QPushButton(this); - m_fileNameButton->setText(i18nc("action:button", "Filename")); - initButton(m_fileNameButton); + // 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_contentButton = new QPushButton(); - m_contentButton->setText(i18nc("action:button", "Content")); - initButton(m_contentButton);; - - QButtonGroup* searchWhatGroup = new QButtonGroup(this); - searchWhatGroup->addButton(m_fileNameButton); - searchWhatGroup->addButton(m_contentButton); - - // Create "Filter" button - m_filterButton = new QToolButton(this); - m_filterButton->setIcon(KIcon("view-filter")); - m_filterButton->setAutoRaise(true); - m_filterButton->setCheckable(true); - m_filterButton->hide(); - connect(m_filterButton, SIGNAL(toggled(bool)), this, SLOT(setFilterWidgetsVisible(bool))); + 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_fromHereButton); - optionsLayout->addWidget(m_everywhereButton); - optionsLayout->addWidget(new KSeparator(Qt::Vertical)); optionsLayout->addWidget(m_fileNameButton); optionsLayout->addWidget(m_contentButton); + optionsLayout->addWidget(m_separator); + optionsLayout->addWidget(m_fromHereButton); + optionsLayout->addWidget(m_everywhereButton); optionsLayout->addStretch(1); - optionsLayout->addWidget(m_filterButton); + optionsLayout->addWidget(m_facetsToggleButton); + + // 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); + + 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->addLayout(optionsLayout); + 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 + // the text within one second + m_startSearchTimer = new QTimer(this); + m_startSearchTimer->setSingleShot(true); + m_startSearchTimer->setInterval(1000); + connect(m_startSearchTimer, &QTimer::timeout, this, &DolphinSearchBox::emitSearchRequest); + + updateFacetsToggleButton(); } -bool DolphinSearchBox::isSearchPathIndexed() const +QUrl DolphinSearchBox::balooUrlForSearching() const { -#ifdef HAVE_NEPOMUK - const QString path = m_searchPath.path(); - - const KConfig strigiConfig("nepomukstrigirc"); - const QStringList indexedFolders = strigiConfig.group("General").readPathEntry("folders", QStringList()); - - // Check whether the current search path is part of an indexed folder - bool isIndexed = false; - foreach (const QString& indexedFolder, indexedFolders) { - if (path.startsWith(indexedFolder)) { - isIndexed = true; - break; - } +#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)); } - if (isIndexed) { - // The current search path is part of an indexed folder. Check whether no - // excluded folder is part of the search path. - const QStringList excludedFolders = strigiConfig.group("General").readPathEntry("exclude folders", QStringList()); - foreach (const QString& excludedFolder, excludedFolders) { - if (excludedFolder.startsWith(path)) { - isIndexed = false; - break; - } - } + // 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); + + query.setTerm(term); } - return isIndexed; + if (m_fromHereButton->isChecked()) { + query.setIncludeFolder(m_searchPath.toLocalFile()); + } + + 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 false; + return QUrl(); #endif } -KUrl DolphinSearchBox::nepomukUrlForSearching() const +void DolphinSearchBox::fromBalooSearchUrl(const QUrl& url) { -#ifdef HAVE_NEPOMUK - Nepomuk::Query::AndTerm andTerm; - - // Add filter terms - foreach (const AbstractSearchFilterWidget* filterWidget, m_filterWidgets) { - const Nepomuk::Query::Term term = filterWidget->queryTerm(); - if (term.isValid()) { - andTerm.addSubTerm(term); - } +#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); + + const QString customDir = query.includeFolder(); + if (!customDir.isEmpty()) { + setSearchPath(customDir); + } else { + setSearchPath(QDir::homePath()); } - // Add input from search filter - const QString text = m_searchInput->text(); - if (!text.isEmpty()) { - const Nepomuk::Query::Query customQuery = Nepomuk::Query::QueryParser::parseQuery(text); - if (customQuery.isValid()) { - andTerm.addSubTerm(customQuery.term()); - } + if (!query.searchString().isEmpty()) { + setText(query.searchString()); } - Nepomuk::Query::FileQuery fileQuery; - fileQuery.setFileMode(Nepomuk::Query::FileQuery::QueryFiles); - fileQuery.setTerm(andTerm); + 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 (fileQuery.isValid()) { - 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)); + if (property == QLatin1String("filename")) { + setText(subTerm.value().toString()); + } else if (m_facetsWidget->isRatingTerm(subTerm)) { + m_facetsWidget->setRatingTerm(subTerm); + } } + + m_startSearchTimer->stop(); + blockSignals(false); #endif - return KUrl(); } -#include "dolphinsearchbox.moc" +void DolphinSearchBox::updateFacetsToggleButton() +{ + 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->setText(facetsIsVisible ? i18nc("action:button", "Fewer Options") : i18nc("action:button", "More Options")); +} +