diff --git a/src/search/dolphinsearchbox.h b/src/search/dolphinsearchbox.h --- a/src/search/dolphinsearchbox.h +++ b/src/search/dolphinsearchbox.h @@ -160,6 +160,8 @@ void updateFacetsToggleButton(); + bool isIndexingEnabled() const; + private: bool m_startedSearching; bool m_active; diff --git a/src/search/dolphinsearchbox.cpp b/src/search/dolphinsearchbox.cpp --- a/src/search/dolphinsearchbox.cpp +++ b/src/search/dolphinsearchbox.cpp @@ -107,12 +107,10 @@ m_fromHereButton->setText(i18nc("action:button", "From Here (%1)", elidedLocation)); m_fromHereButton->setToolTip(i18nc("action:button", "Limit search to '%1' and its subfolders", cleanedUrl.toString(QUrl::PreferLocalFile))); - bool hasFacetsSupport = false; -#ifdef HAVE_BALOO - const Baloo::IndexerConfig searchInfo; - hasFacetsSupport = searchInfo.fileIndexingEnabled() && searchInfo.shouldBeIndexed(m_searchPath.toLocalFile()); -#endif - m_facetsWidget->setEnabled(hasFacetsSupport); + const bool indexingEnabled = isIndexingEnabled(); + m_facetsWidget->setEnabled(indexingEnabled); + m_facetsWidget->setVisible(indexingEnabled && SearchSettings::showFacetsWidget()); + updateFacetsToggleButton(); } QUrl DolphinSearchBox::searchPath() const @@ -123,12 +121,8 @@ QUrl DolphinSearchBox::urlForSearching() const { QUrl url; - bool useBalooSearch = false; -#ifdef HAVE_BALOO - const Baloo::IndexerConfig searchInfo; - useBalooSearch = searchInfo.fileIndexingEnabled() && searchInfo.shouldBeIndexed(m_searchPath.toLocalFile()); -#endif - if (useBalooSearch) { + + if (isIndexingEnabled()) { url = balooUrlForSearching(); } else { url.setScheme(QStringLiteral("filenamesearch")); @@ -291,8 +285,7 @@ void DolphinSearchBox::slotFacetsButtonToggled() { - const bool facetsIsVisible = !m_facetsWidget->isVisible(); - m_facetsWidget->setVisible(facetsIsVisible); + m_facetsWidget->setVisible(m_facetsToggleButton->isChecked()); updateFacetsToggleButton(); } @@ -338,14 +331,19 @@ m_fileNameButton->setChecked(true); } - m_facetsWidget->setVisible(SearchSettings::showFacetsWidget()); + const bool indexingEnabled = isIndexingEnabled(); + m_facetsWidget->setEnabled(indexingEnabled); + m_facetsWidget->setVisible(indexingEnabled && SearchSettings::showFacetsWidget()); + updateFacetsToggleButton(); } void DolphinSearchBox::saveSettings() { SearchSettings::setLocation(m_fromHereButton->isChecked() ? QStringLiteral("FromHere") : QStringLiteral("Everywhere")); SearchSettings::setWhat(m_fileNameButton->isChecked() ? QStringLiteral("FileName") : QStringLiteral("Content")); - SearchSettings::setShowFacetsWidget(m_facetsToggleButton->isChecked()); + if (isIndexingEnabled()) { + SearchSettings::setShowFacetsWidget(m_facetsToggleButton->isChecked()); + } SearchSettings::self()->save(); } @@ -481,8 +479,6 @@ m_startSearchTimer->setSingleShot(true); m_startSearchTimer->setInterval(1000); connect(m_startSearchTimer, &QTimer::timeout, this, &DolphinSearchBox::emitSearchRequest); - - updateFacetsToggleButton(); } QUrl DolphinSearchBox::balooUrlForSearching() const @@ -560,9 +556,42 @@ 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")); + 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("@tooltip", "Advanced search options are not available beacause the file indexing service is disabled.")); + } else { + m_facetsToggleButton->setToolTip(i18nc("@tooltip", "Advanced search options are not available beacause this location is not indexed.")); + } +#else + m_facetsToggleButton->setToolTip(i18nc("tooltip", "Advanced search options are not available beacause this version of Dolphin does not support the Baloo file indexer.")); +#endif + } } +bool DolphinSearchBox::isIndexingEnabled() const +{ +#ifdef HAVE_BALOO + const Baloo::IndexerConfig searchInfo; + return searchInfo.fileIndexingEnabled() && searchInfo.shouldBeIndexed(m_searchPath.toLocalFile()); +#else + return false; +#endif +}