#include "dolphinsearchbox.h"
#include "dolphin_searchsettings.h"
+#include "dolphinfacetswidget.h"
#include "dolphinsearchinformation.h"
#include <KIcon>
#include <QHBoxLayout>
#include <QKeyEvent>
#include <QLabel>
-#include <QPushButton>
#include <QScrollArea>
#include <QTimer>
#include <QToolButton>
#include <config-nepomuk.h>
#ifdef HAVE_NEPOMUK
- #include <Nepomuk/Query/FileQuery>
- #include <Nepomuk/Query/LiteralTerm>
- #include <Nepomuk/Query/OrTerm>
- #include <Nepomuk/Query/Query>
- #include <Nepomuk/Query/QueryParser>
- #include <Nepomuk/Query/ResourceTypeTerm>
- #include <Nepomuk/Query/ComparisonTerm>
- #include <Nepomuk/ResourceManager>
- #include <Nepomuk/Vocabulary/NFO>
+ #include <Nepomuk2/Query/AndTerm>
+ #include <Nepomuk2/Query/FileQuery>
+ #include <Nepomuk2/Query/LiteralTerm>
+ #include <Nepomuk2/Query/OrTerm>
+ #include <Nepomuk2/Query/Query>
+ #include <Nepomuk2/Query/QueryParser>
+ #include <Nepomuk2/Query/ResourceTypeTerm>
+ #include <Nepomuk2/Query/ComparisonTerm>
+ #include <Nepomuk2/ResourceManager>
+ #include <Nepomuk2/Vocabulary/NFO>
#endif
DolphinSearchBox::DolphinSearchBox(QWidget* parent) :
m_separator(0),
m_fromHereButton(0),
m_everywhereButton(0),
+ m_facetsToggleButton(0),
+ m_facetsWidget(0),
m_searchPath(),
m_readOnlyQuery(),
m_startSearchTimer(0)
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()) {
m_separator->setVisible(showSearchFromButtons);
m_fromHereButton->setVisible(showSearchFromButtons);
m_everywhereButton->setVisible(showSearchFromButtons);
+
+ const DolphinSearchInformation& searchInfo = DolphinSearchInformation::instance();
+ const bool hasFacetsSupport = searchInfo.isIndexingEnabled() && searchInfo.isPathIndexed(m_searchPath);
+ m_facetsWidget->setEnabled(hasFacetsSupport);
}
KUrl DolphinSearchBox::searchPath() const
}
}
-void DolphinSearchBox::emitSearchSignal()
+void DolphinSearchBox::emitSearchRequest()
{
m_startSearchTimer->stop();
m_startedSearching = true;
- emit search(m_searchInput->text());
-}
-
-void DolphinSearchBox::slotSearchLocationChanged()
-{
- emit searchLocationChanged(m_fromHereButton->isChecked() ? SearchFromHere : SearchEverywhere);
+ emit searchRequest();
}
-void DolphinSearchBox::slotSearchContextChanged()
+void DolphinSearchBox::emitCloseRequest()
{
- emit searchContextChanged(m_fileNameButton->isChecked() ? SearchFileName : SearchContent);
+ m_startSearchTimer->stop();
+ m_startedSearching = false;
+ emit closeRequest();
}
void DolphinSearchBox::slotConfigurationChanged()
{
saveSettings();
if (m_startedSearching) {
- emitSearchSignal();
+ emitSearchRequest();
}
}
void DolphinSearchBox::slotSearchTextChanged(const QString& text)
{
- m_startSearchTimer->start();
+ if (text.isEmpty()) {
+ m_startSearchTimer->stop();
+ } else {
+ m_startSearchTimer->start();
+ }
emit searchTextChanged(text);
}
void DolphinSearchBox::slotReturnPressed(const QString& text)
{
- emitSearchSignal();
+ emitSearchRequest();
emit returnPressed(text);
}
-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->setAutoExclusive(true);
- button->setFlat(true);
+ button->setAutoRaise(true);
button->setCheckable(true);
connect(button, SIGNAL(clicked(bool)), this, SLOT(slotConfigurationChanged()));
}
} 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::setShowFacetsWidget(m_facetsToggleButton->isChecked());
SearchSettings::self()->writeConfig();
}
closeButton->setAutoRaise(true);
closeButton->setIcon(KIcon("dialog-close"));
closeButton->setToolTip(i18nc("@info:tooltip", "Quit searching"));
- connect(closeButton, SIGNAL(clicked()), SIGNAL(closeRequest()));
+ connect(closeButton, SIGNAL(clicked()), this, SLOT(emitCloseRequest()));
// Create search label
m_searchLabel = new QLabel(this);
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);
searchWhatGroup->addButton(m_contentButton);
- connect(m_fileNameButton, SIGNAL(clicked()), this, SLOT(slotSearchContextChanged()));
- connect(m_contentButton, SIGNAL(clicked()), this, SLOT(slotSearchContextChanged()));
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);
QButtonGroup* searchLocationGroup = new QButtonGroup(this);
searchLocationGroup->addButton(m_fromHereButton);
searchLocationGroup->addButton(m_everywhereButton);
- connect(m_fromHereButton, SIGNAL(clicked()), this, SLOT(slotSearchLocationChanged()));
- connect(m_everywhereButton, SIGNAL(clicked()), this, SLOT(slotSearchLocationChanged()));
+
+ // Create "Facets" widgets
+ m_facetsToggleButton = new QToolButton(this);
+ m_facetsToggleButton->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
+ initButton(m_facetsToggleButton);
+ connect(m_facetsToggleButton, SIGNAL(clicked()), this, SLOT(slotFacetsButtonToggled()));
+
+ m_facetsWidget = new DolphinFacetsWidget(this);
+ m_facetsWidget->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Maximum);
+ connect(m_facetsWidget, SIGNAL(facetChanged()), this, SLOT(slotFacetChanged()));
// Apply layout for the options
QHBoxLayout* optionsLayout = new QHBoxLayout();
optionsLayout->addWidget(m_fromHereButton);
optionsLayout->addWidget(m_everywhereButton);
optionsLayout->addStretch(1);
+ 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.
m_topLayout->setMargin(0);
m_topLayout->addLayout(searchInputLayout);
m_topLayout->addWidget(m_optionsScrollArea);
+ m_topLayout->addWidget(m_facetsWidget);
loadSettings();
m_startSearchTimer = new QTimer(this);
m_startSearchTimer->setSingleShot(true);
m_startSearchTimer->setInterval(1000);
- connect(m_startSearchTimer, SIGNAL(timeout()), this, SLOT(emitSearchSignal()));
+ connect(m_startSearchTimer, SIGNAL(timeout()), this, SLOT(emitSearchRequest()));
+ updateFacetsToggleButton();
applyReadOnlyState();
}
KUrl DolphinSearchBox::nepomukUrlForSearching() const
{
#ifdef HAVE_NEPOMUK
- Nepomuk::Query::OrTerm orTerm;
-
+ // Create the term for the text from the input-field
+ // dependent on whether a searching for content or
+ // filename is done
const QString text = m_searchInput->text();
-
- // Search the text in the filename in any case
- QString regex = QRegExp::escape(text);
- regex.replace("\\*", QLatin1String(".*"));
- regex.replace("\\?", QLatin1String("."));
- regex.replace("\\", "\\\\");
- orTerm.addSubTerm(Nepomuk::Query::ComparisonTerm(
- Nepomuk::Vocabulary::NFO::fileName(),
- Nepomuk::Query::LiteralTerm(regex),
- Nepomuk::Query::ComparisonTerm::Regexp));
-
+ Nepomuk2::Query::Term searchLabelTerm;
if (m_contentButton->isChecked()) {
- // Search the text also in the content of the files
- const Nepomuk::Query::Query customQuery = Nepomuk::Query::QueryParser::parseQuery(text, Nepomuk::Query::QueryParser::DetectFilenamePattern);
- if (customQuery.isValid()) {
- orTerm.addSubTerm(customQuery.term());
- }
+ // Let Nepomuk parse the query
+ searchLabelTerm = Nepomuk2::Query::QueryParser::parseQuery(text, Nepomuk2::Query::QueryParser::DetectFilenamePattern).term();
+ } else {
+ // Search the text in the filename only
+ QString regex = QRegExp::escape(text);
+ regex.replace("\\*", QLatin1String(".*"));
+ regex.replace("\\?", QLatin1String("."));
+ regex.replace("\\", "\\\\");
+ searchLabelTerm = Nepomuk2::Query::ComparisonTerm(
+ Nepomuk2::Vocabulary::NFO::fileName(),
+ Nepomuk2::Query::LiteralTerm(regex),
+ Nepomuk2::Query::ComparisonTerm::Regexp);
+ }
+
+ // Get the term from the facets and merge it with the
+ // created term from the input-field.
+ Nepomuk2::Query::Term facetsTerm = m_facetsWidget->facetsTerm();
+
+ Nepomuk2::Query::FileQuery fileQuery;
+ fileQuery.setFileMode(Nepomuk2::Query::FileQuery::QueryFilesAndFolders);
+ if (facetsTerm.isValid()) {
+ Nepomuk2::Query::AndTerm andTerm;
+ andTerm.addSubTerm(searchLabelTerm);
+ andTerm.addSubTerm(facetsTerm);
+ fileQuery.setTerm(andTerm);
+ } else {
+ fileQuery.setTerm(searchLabelTerm);
}
- Nepomuk::Query::FileQuery fileQuery;
- fileQuery.setFileMode(Nepomuk::Query::FileQuery::QueryFilesAndFolders);
- fileQuery.setTerm(orTerm);
if (m_fromHereButton->isChecked()) {
const bool recursive = true;
fileQuery.addIncludeFolder(m_searchPath, recursive);
void DolphinSearchBox::applyReadOnlyState()
{
+#ifdef HAVE_NEPOMUK
if (m_readOnly) {
- m_searchLabel->setText(Nepomuk::Query::Query::titleFromQueryUrl(m_readOnlyQuery));
+ m_searchLabel->setText(Nepomuk2::Query::Query::titleFromQueryUrl(m_readOnlyQuery));
} else {
+#else
+ {
+#endif
m_searchLabel->setText(i18nc("@label:textbox", "Find:"));
}
m_searchInput->setVisible(!m_readOnly);
m_optionsScrollArea->setVisible(!m_readOnly);
+
+ if (m_readOnly) {
+ m_facetsWidget->hide();
+ } else {
+ m_facetsWidget->setVisible(SearchSettings::showFacetsWidget());
+ }
+}
+
+void DolphinSearchBox::updateFacetsToggleButton()
+{
+ const bool facetsIsVisible = SearchSettings::showFacetsWidget();
+ m_facetsToggleButton->setChecked(facetsIsVisible ? true : false);
+ m_facetsToggleButton->setIcon(KIcon(facetsIsVisible ? "arrow-up-double" : "arrow-down-double"));
+ m_facetsToggleButton->setText(facetsIsVisible ? i18nc("action:button", "Less Options") : i18nc("action:button", "More Options"));
}
#include "dolphinsearchbox.moc"
projects / dolphin.git / blobdiff