summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Penz <peter.penz19@gmail.com>2011-02-02 18:33:56 (GMT)
committerPeter Penz <peter.penz19@gmail.com>2011-02-02 18:33:56 (GMT)
commitd54313ecd8a4e9ec1bbe11b8264ea20114f02714 (patch)
tree59b70aff899d1e5a238eda8f984cbf5b9e9e027c
parente687304d6a8e411d6245db08a2ca25e27eb54395 (diff)
Fix visibility- and enabled-issues for the filter-panel
The filter-panel should be disabled if the current folder is not indexed at all. Also when triggering a "Find" the filter-panel should stay invisible per default when the current folder is not indexed. BUG: 264969 FIXED-IN: 4.6.1
-rw-r--r--dolphin/src/CMakeLists.txt1
-rw-r--r--dolphin/src/dolphinmainwindow.cpp8
-rw-r--r--dolphin/src/panels/filter/filterpanel.cpp27
-rw-r--r--dolphin/src/panels/filter/filterpanel.h4
-rw-r--r--dolphin/src/search/dolphinsearchbox.cpp39
-rw-r--r--dolphin/src/search/dolphinsearchbox.h6
-rw-r--r--dolphin/src/search/dolphinsearchinformation.cpp99
-rw-r--r--dolphin/src/search/dolphinsearchinformation.h57
8 files changed, 189 insertions, 52 deletions
diff --git a/dolphin/src/CMakeLists.txt b/dolphin/src/CMakeLists.txt
index 4d442bb..885c8b0 100644
--- a/dolphin/src/CMakeLists.txt
+++ b/dolphin/src/CMakeLists.txt
@@ -113,6 +113,7 @@ set(dolphin_SRCS
panels/folders/folderspanel.cpp
panels/folders/paneltreeview.cpp
search/dolphinsearchbox.cpp
+ search/dolphinsearchinformation.cpp
settings/general/behaviorsettingspage.cpp
settings/general/contextmenusettingspage.cpp
settings/general/generalsettingspage.cpp
diff --git a/dolphin/src/dolphinmainwindow.cpp b/dolphin/src/dolphinmainwindow.cpp
index 8dcf822..fcc41f0 100644
--- a/dolphin/src/dolphinmainwindow.cpp
+++ b/dolphin/src/dolphinmainwindow.cpp
@@ -35,6 +35,7 @@
#include "panels/folders/folderspanel.h"
#include "panels/places/placespanel.h"
#include "panels/information/informationpanel.h"
+#include "search/dolphinsearchinformation.h"
#include "settings/dolphinsettings.h"
#include "settings/dolphinsettingsdialog.h"
#include "statusbar/dolphinstatusbar.h"
@@ -1220,13 +1221,14 @@ void DolphinMainWindow::slotWriteStateChanged(bool isFolderWritable)
void DolphinMainWindow::slotSearchModeChanged(bool enabled)
{
#ifdef HAVE_NEPOMUK
- if (Nepomuk::ResourceManager::instance()->init() != 0) {
- // Currently the Filter Panel only works with Nepomuk enabled
+ const KUrl url = m_activeViewContainer->url();
+ const DolphinSearchInformation& searchInfo = DolphinSearchInformation::instance();
+ if (!searchInfo.isIndexingEnabled() || !searchInfo.isPathIndexed(url)) {
return;
}
QDockWidget* filterDock = findChild<QDockWidget*>("filterDock");
- if ((filterDock == 0) || !filterDock->isEnabled()) {
+ if (filterDock == 0) {
return;
}
diff --git a/dolphin/src/panels/filter/filterpanel.cpp b/dolphin/src/panels/filter/filterpanel.cpp
index 72b2c0c..c54aaee 100644
--- a/dolphin/src/panels/filter/filterpanel.cpp
+++ b/dolphin/src/panels/filter/filterpanel.cpp
@@ -36,6 +36,8 @@
#include <Nepomuk/Vocabulary/NMM>
#include <Nepomuk/Vocabulary/NIE>
+#include <search/dolphinsearchinformation.h>
+
#include <kfileitem.h>
#include <kio/jobclasses.h>
#include <kio/job.h>
@@ -48,12 +50,12 @@
FilterPanel::FilterPanel(QWidget* parent) :
Panel(parent),
m_initialized(false),
- m_nepomukEnabled(false),
m_lastSetUrlStatJob(0),
m_startedFromDir(),
m_facetWidget(0),
m_unfacetedRestQuery()
{
+ setEnabled(false);
}
FilterPanel::~FilterPanel()
@@ -69,7 +71,7 @@ bool FilterPanel::urlChanged()
m_startedFromDir = url();
}
- if (isVisible() && m_nepomukEnabled) {
+ if (isVisible() && DolphinSearchInformation::instance().isIndexingEnabled()) {
setQuery(Nepomuk::Query::Query());
delete m_lastSetUrlStatJob;
@@ -139,15 +141,25 @@ void FilterPanel::showEvent(QShowEvent* event)
connect(m_facetWidget, SIGNAL(queryTermChanged(Nepomuk::Query::Term)),
this, SLOT(slotQueryTermChanged(Nepomuk::Query::Term)));
- m_nepomukEnabled = (Nepomuk::ResourceManager::instance()->init() == 0);
- m_facetWidget->setEnabled(m_nepomukEnabled);
-
m_initialized = true;
}
+
+ const DolphinSearchInformation& searchInfo = DolphinSearchInformation::instance();
+ setEnabled(searchInfo.isIndexingEnabled() &&
+ searchInfo.isPathIndexed(m_startedFromDir));
Panel::showEvent(event);
}
+void FilterPanel::hideEvent(QHideEvent* event)
+{
+ if (!event->spontaneous()) {
+ setEnabled(false);
+ }
+
+ Panel::hideEvent(event);
+}
+
void FilterPanel::slotSetUrlStatFinished(KJob* job)
{
m_lastSetUrlStatJob = 0;
@@ -205,7 +217,10 @@ void FilterPanel::setQuery(const Nepomuk::Query::Query& query)
m_unfacetedRestQuery = m_facetWidget->extractFacetsFromQuery(query);
m_facetWidget->setClientQuery(query);
- setEnabled(true);
+
+ const DolphinSearchInformation& searchInfo = DolphinSearchInformation::instance();
+ setEnabled(searchInfo.isIndexingEnabled() &&
+ searchInfo.isPathIndexed(m_startedFromDir));
m_facetWidget->blockSignals(block);
} else {
diff --git a/dolphin/src/panels/filter/filterpanel.h b/dolphin/src/panels/filter/filterpanel.h
index 346b5a1..17d6833 100644
--- a/dolphin/src/panels/filter/filterpanel.h
+++ b/dolphin/src/panels/filter/filterpanel.h
@@ -51,6 +51,9 @@ protected:
/** @see QWidget::showEvent() */
virtual void showEvent(QShowEvent* event);
+
+ /** @see QWidget::hideEvent() */
+ virtual void hideEvent(QHideEvent* event);
private slots:
void slotSetUrlStatFinished(KJob*);
@@ -61,7 +64,6 @@ private:
private:
bool m_initialized;
- bool m_nepomukEnabled;
KJob* m_lastSetUrlStatJob;
KUrl m_startedFromDir;
diff --git a/dolphin/src/search/dolphinsearchbox.cpp b/dolphin/src/search/dolphinsearchbox.cpp
index 505f80e..587b930 100644
--- a/dolphin/src/search/dolphinsearchbox.cpp
+++ b/dolphin/src/search/dolphinsearchbox.cpp
@@ -20,6 +20,7 @@
#include "dolphinsearchbox.h"
#include "dolphin_searchsettings.h"
+#include "dolphinsearchinformation.h"
#include <kicon.h>
#include <klineedit.h>
@@ -111,7 +112,8 @@ KUrl DolphinSearchBox::searchPath() const
KUrl DolphinSearchBox::urlForSearching() const
{
KUrl url;
- if (m_nepomukActivated && isSearchPathIndexed()) {
+ const DolphinSearchInformation& searchInfo = DolphinSearchInformation::instance();
+ if (searchInfo.isIndexingEnabled() && searchInfo.isPathIndexed(url)) {
url = nepomukUrlForSearching();
} else {
url.setProtocol("filenamesearch");
@@ -328,41 +330,6 @@ void DolphinSearchBox::init()
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
diff --git a/dolphin/src/search/dolphinsearchbox.h b/dolphin/src/search/dolphinsearchbox.h
index 5fc707e..c3ac15b 100644
--- a/dolphin/src/search/dolphinsearchbox.h
+++ b/dolphin/src/search/dolphinsearchbox.h
@@ -108,12 +108,6 @@ private:
void init();
/**
- * @return True, if the complete directory tree specified by m_searchPath
- * is indexed by Strigi.
- */
- bool isSearchPathIndexed() const;
-
- /**
* @return URL that represents the Nepomuk query for starting the search.
*/
KUrl nepomukUrlForSearching() const;
diff --git a/dolphin/src/search/dolphinsearchinformation.cpp b/dolphin/src/search/dolphinsearchinformation.cpp
new file mode 100644
index 0000000..2cba5a1
--- /dev/null
+++ b/dolphin/src/search/dolphinsearchinformation.cpp
@@ -0,0 +1,99 @@
+/***************************************************************************
+ * Copyright (C) 2011 by Peter Penz <peter.penz19@gmail.com> *
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. *
+ * *
+ * This program is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
+ * GNU General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU General Public License *
+ * along with this program; if not, write to the *
+ * Free Software Foundation, Inc., *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA *
+ ***************************************************************************/
+
+#include "dolphinsearchinformation.h"
+
+#include <config-nepomuk.h>
+#ifdef HAVE_NEPOMUK
+ #include <KConfig>
+ #include <KConfigGroup>
+ #include <Nepomuk/ResourceManager>
+#endif
+
+#include <KGlobal>
+#include <KUrl>
+
+struct DolphinSearchInformationSingleton
+{
+ DolphinSearchInformation instance;
+};
+K_GLOBAL_STATIC(DolphinSearchInformationSingleton, s_dolphinSearchInformation)
+
+
+DolphinSearchInformation& DolphinSearchInformation::instance()
+{
+ return s_dolphinSearchInformation->instance;
+}
+
+DolphinSearchInformation::~DolphinSearchInformation()
+{
+}
+
+bool DolphinSearchInformation::isIndexingEnabled() const
+{
+ return m_indexingEnabled;
+}
+
+bool DolphinSearchInformation::isPathIndexed(const KUrl& url) const
+{
+#ifdef HAVE_NEPOMUK
+ const QString path = url.path();
+
+ const KConfig strigiConfig("nepomukstrigirc");
+ const QStringList indexedFolders = strigiConfig.group("General").readPathEntry("folders", QStringList());
+
+ // Check whether the 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 path is part of an indexed folder. Check whether no
+ // excluded folder is part of the 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
+ Q_UNUSED(path);
+ return false;
+#endif
+}
+
+DolphinSearchInformation::DolphinSearchInformation() :
+ m_indexingEnabled(false)
+{
+#ifdef HAVE_NEPOMUK
+ if (Nepomuk::ResourceManager::instance()->init() == 0) {
+ KConfig config("nepomukserverrc");
+ m_indexingEnabled = config.group("Service-nepomukstrigiservice").readEntry("autostart", false);
+ }
+#endif
+}
+
diff --git a/dolphin/src/search/dolphinsearchinformation.h b/dolphin/src/search/dolphinsearchinformation.h
new file mode 100644
index 0000000..6fb1947
--- /dev/null
+++ b/dolphin/src/search/dolphinsearchinformation.h
@@ -0,0 +1,57 @@
+/***************************************************************************
+ * Copyright (C) 2011 by Peter Penz <peter.penz19@gmail.com> *
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. *
+ * *
+ * This program is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
+ * GNU General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU General Public License *
+ * along with this program; if not, write to the *
+ * Free Software Foundation, Inc., *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA *
+ ***************************************************************************/
+
+#ifndef DOLPHINSEARCHINFORMATION_H
+#define DOLPHINSEARCHINFORMATION_H
+
+class KUrl;
+
+/**
+ * @brief Allows to access search-engine related information.
+ */
+class DolphinSearchInformation
+{
+public:
+ static DolphinSearchInformation& instance();
+ virtual ~DolphinSearchInformation();
+
+ /**
+ * @return True if the Nepomuk indexer is enabled. If Nepomuk is
+ * disabled, always false is returned.
+ */
+ bool isIndexingEnabled() const;
+
+ /**
+ * @return True if the complete directory tree specified by path
+ * is indexed by the Nepomuk indexer. If Nepomuk is disabled,
+ * always false is returned.
+ */
+ bool isPathIndexed(const KUrl& url) const;
+
+protected:
+ DolphinSearchInformation();
+
+private:
+ bool m_indexingEnabled;
+
+ friend class DolphinSearchInformationSingleton;
+};
+
+#endif
+