* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA *
* **************************************************************************/
+#include "global.h"
#include "dolphinsearchbox.h"
#include "dolphin_searchsettings.h"
m_separator(nullptr),
m_fromHereButton(nullptr),
m_everywhereButton(nullptr),
- m_facetsToggleButton(nullptr),
m_facetsWidget(nullptr),
m_searchPath(),
m_startSearchTimer(nullptr)
return;
}
+ const QUrl cleanedUrl = url.adjusted(QUrl::RemoveUserInfo | QUrl::StripTrailingSlash);
+
+ if (cleanedUrl.path() == QDir::homePath()) {
+ m_fromHereButton->setChecked(false);
+ m_everywhereButton->setChecked(true);
+ if (!m_searchPath.isEmpty()) {
+ return;
+ }
+ } else {
+ m_everywhereButton->setChecked(false);
+ m_fromHereButton->setChecked(true);
+ }
+
m_searchPath = url;
QFontMetrics metrics(m_fromHereButton->font());
const int maxWidth = metrics.height() * 8;
- const QUrl cleanedUrl = url.adjusted(QUrl::RemoveUserInfo | QUrl::StripTrailingSlash);
QString location = cleanedUrl.fileName();
if (location.isEmpty()) {
location = cleanedUrl.toString(QUrl::PreferLocalFile);
}
- if (m_fromHereButton->isChecked() && cleanedUrl.path() == QDir::homePath()) {
- m_fromHereButton->setChecked(false);
- m_everywhereButton->setChecked(true);
- } else {
- m_fromHereButton->setChecked(true);
- m_everywhereButton->setChecked(false);
- }
-
const QString elidedLocation = metrics.elidedText(location, Qt::ElideMiddle, maxWidth);
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)));
-
- setFacetsVisible(SearchSettings::showFacetsWidget());
}
QUrl DolphinSearchBox::searchPath() const
{
- return m_searchPath;
+ return m_everywhereButton->isChecked() ? QUrl::fromLocalFile(QDir::homePath()) : m_searchPath;
}
QUrl DolphinSearchBox::urlForSearching() const
query.addQueryItem(QStringLiteral("checkContent"), QStringLiteral("yes"));
}
- QString encodedUrl;
- if (m_everywhereButton->isChecked()) {
- encodedUrl = QDir::homePath();
- } else {
- encodedUrl = m_searchPath.url();
- }
- query.addQueryItem(QStringLiteral("url"), encodedUrl);
+ query.addQueryItem(QStringLiteral("url"), searchPath().url());
url.setQuery(query);
}
} else if (url.scheme() == QLatin1String("filenamesearch")) {
const QUrlQuery query(url);
setText(query.queryItemValue(QStringLiteral("search")));
+ if (m_searchPath.scheme() != url.scheme()) {
+ m_searchPath = QUrl();
+ }
setSearchPath(QUrl::fromUserInput(query.queryItemValue(QStringLiteral("url")), QString(), QUrl::AssumeLocalFile));
m_contentButton->setChecked(query.queryItemValue(QStringLiteral("checkContent")) == QLatin1String("yes"));
} else {
setText(QString());
+ m_searchPath = QUrl();
setSearchPath(url);
}
+
+ updateFacetsVisible();
}
void DolphinSearchBox::selectAll()
m_searchInput->setFocus();
m_startedSearching = false;
}
- updateFacetsToggleButton();
}
void DolphinSearchBox::hideEvent(QHideEvent* event)
emit returnPressed();
}
-void DolphinSearchBox::slotFacetsButtonToggled()
-{
- setFacetsVisible(m_facetsToggleButton->isChecked());
-}
-
void DolphinSearchBox::slotFacetChanged()
{
m_startedSearching = true;
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);
setSearchPath(QUrl::fromLocalFile(QDir::homePath()));
}
+ m_facetsWidget->resetOptions();
+
setText(query.searchString());
QStringList types = query.types();
#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(m_searchPath.toLocalFile());
+ return searchInfo.fileIndexingEnabled() && searchInfo.shouldBeIndexed(searchPath().toLocalFile());
#else
return false;
#endif
projects / dolphin.git / blobdiff