#include "dolphinsearchbox.h"
#include "dolphin_searchsettings.h"
+#include "dolphinsearchinformation.h"
-#include <kicon.h>
-#include <klineedit.h>
-#include <klocale.h>
+#include <KIcon>
+#include <KLineEdit>
+#include <KLocale>
#include <kseparator.h>
#include <QButtonGroup>
#include <QKeyEvent>
#include <QLabel>
#include <QPushButton>
+#include <QScrollArea>
#include <QTimer>
#include <QToolButton>
#include <QVBoxLayout>
#include <config-nepomuk.h>
#ifdef HAVE_NEPOMUK
- #include <nepomuk/andterm.h>
- #include <nepomuk/filequery.h>
- #include <nepomuk/literalterm.h>
- #include <nepomuk/query.h>
- #include <nepomuk/queryparser.h>
- #include <nepomuk/resourcemanager.h>
- #include <nepomuk/resourcetypeterm.h>
- #include <nepomuk/comparisonterm.h>
- #include "nfo.h"
+ #include <Nepomuk/Query/AndTerm>
+ #include <Nepomuk/Query/FileQuery>
+ #include <Nepomuk/Query/LiteralTerm>
+ #include <Nepomuk/Query/Query>
+ #include <Nepomuk/Query/QueryParser>
+ #include <Nepomuk/Query/ResourceTypeTerm>
+ #include <Nepomuk/Query/ComparisonTerm>
+ #include <Nepomuk/ResourceManager>
+ #include <Nepomuk/Vocabulary/NFO>
#endif
DolphinSearchBox::DolphinSearchBox(QWidget* parent) :
m_nepomukActivated(false),
m_topLayout(0),
m_searchInput(0),
- m_fromHereButton(0),
- m_everywhereButton(0),
m_fileNameButton(0),
m_contentButton(0),
- m_filterButton(0),
+ m_separator(0),
+ m_fromHereButton(0),
+ m_everywhereButton(0),
m_searchPath(),
m_startSearchTimer(0)
{
void DolphinSearchBox::setSearchPath(const KUrl& url)
{
m_searchPath = url;
- m_filterButton->setVisible(isSearchPathIndexed());
+
+ QFontMetrics metrics(m_fromHereButton->font());
+ const int maxWidth = metrics.averageCharWidth() * 15;
+
+ QString location = url.fileName();
+ if (location.isEmpty()) {
+ if (url.isLocalFile()) {
+ location = QLatin1String("/");
+ } else {
+ location = url.protocol() + 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);
}
KUrl DolphinSearchBox::searchPath() const
KUrl DolphinSearchBox::urlForSearching() const
{
KUrl url;
- if (isSearchPathIndexed()) {
+ const DolphinSearchInformation& searchInfo = DolphinSearchInformation::instance();
+ if (searchInfo.isIndexingEnabled() && searchInfo.isPathIndexed(url)) {
url = nepomukUrlForSearching();
} else {
- url = m_searchPath;
url.setProtocol("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::selectAll()
+{
+ m_searchInput->selectAll();
+}
+
bool DolphinSearchBox::event(QEvent* event)
{
if (event->type() == QEvent::Polish) {
init();
- } else if (event->type() == QEvent::KeyPress) {
- if (static_cast<QKeyEvent* >(event)->key() == Qt::Key_Escape) {
- m_searchInput->clear();
- }
}
return QWidget::event(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 {
m_searchInput = new KLineEdit(this);
m_searchInput->setClearButtonShown(true);
m_searchInput->setFont(KGlobalSettings::generalFont());
+ setFocusProxy(m_searchInput);
connect(m_searchInput, SIGNAL(returnPressed(QString)),
this, SLOT(slotReturnPressed(QString)));
connect(m_searchInput, SIGNAL(textChanged(QString)),
searchInputLayout->addWidget(searchLabel);
searchInputLayout->addWidget(m_searchInput);
- // Create "From Here" and "Everywhere"button
- m_fromHereButton = new QPushButton();
- m_fromHereButton->setText(i18nc("action:button", "From Here"));
- initButton(m_fromHereButton);
-
- m_everywhereButton = new QPushButton(this);
- m_everywhereButton->setText(i18nc("action:button", "Everywhere"));
- initButton(m_everywhereButton);
-
- QButtonGroup* searchLocationGroup = new QButtonGroup(this);
- 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"));
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_separator = new KSeparator(Qt::Vertical, this);
+
+ // Create "From Here" and "Everywhere"button
+ m_fromHereButton = new QPushButton(this);
+ m_fromHereButton->setText(i18nc("action:button", "From Here"));
+ initButton(m_fromHereButton);
+
+ m_everywhereButton = new QPushButton(this);
+ m_everywhereButton->setText(i18nc("action:button", "Everywhere"));
+ initButton(m_everywhereButton);
+
+ QButtonGroup* searchLocationGroup = new QButtonGroup(this);
+ searchLocationGroup->addButton(m_fromHereButton);
+ searchLocationGroup->addButton(m_everywhereButton);
// 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);
+
+ // 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);
+ QScrollArea* optionsScrollArea = new QScrollArea(this);
+ optionsScrollArea->setFrameShape(QFrame::NoFrame);
+ optionsScrollArea->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+ optionsScrollArea->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+ optionsScrollArea->setMaximumHeight(optionsContainer->sizeHint().height());
+ optionsScrollArea->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
+ optionsScrollArea->setWidget(optionsContainer);
+ optionsScrollArea->setWidgetResizable(true);
m_topLayout = new QVBoxLayout(this);
m_topLayout->addLayout(searchInputLayout);
- m_topLayout->addLayout(optionsLayout);
+ m_topLayout->addWidget(optionsScrollArea);
searchLabel->setBuddy(m_searchInput);
loadSettings();
connect(m_startSearchTimer, SIGNAL(timeout()), this, SLOT(emitSearchSignal()));
}
-bool DolphinSearchBox::isSearchPathIndexed() 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;
- }
- }
-
- 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 (path.startsWith(excludedFolder)) {
- isIndexed = false;
- break;
- }
- }
- }
-
- return isIndexed;
-#else
- return false;
-#endif
-}
-
KUrl DolphinSearchBox::nepomukUrlForSearching() const
{
#ifdef HAVE_NEPOMUK
}
Nepomuk::Query::FileQuery fileQuery;
- fileQuery.setFileMode(Nepomuk::Query::FileQuery::QueryFiles);
+ fileQuery.setFileMode(Nepomuk::Query::FileQuery::QueryFilesAndFolders);
fileQuery.setTerm(andTerm);
+ if (m_fromHereButton->isChecked()) {
+ const bool recursive = true;
+ fileQuery.addIncludeFolder(m_searchPath, recursive);
+ }
return fileQuery.toSearchUrl(i18nc("@title UDS_DISPLAY_NAME for a KIO directory listing. %1 is the query the user entered.",
"Query Results from '%1'",
projects / dolphin.git / blobdiff