Disable the Facet Panel if Nepomuk is disabled (at least for 4.6, hopefully in 4...

svn path=/trunk/KDE/kdebase/apps/; revision=1195658

diff --git a/src/panels/filter/filterpanel.cpp b/src/panels/filter/filterpanel.cpp
index c1a0755e254b55dbfc6984bac709cf5b52d728f1..b6c683dd08c45a0d2ccb52d3085b6eac7be362b4 100644 (file)
--- a/src/panels/filter/filterpanel.cpp
+++ b/src/panels/filter/filterpanel.cpp
@@ -22,6 +22,7 @@
 #include <nepomuk/filequery.h>
 #include <nepomuk/facetwidget.h>
 #include <nepomuk/facet.h>
 #include <nepomuk/filequery.h>
 #include <nepomuk/facetwidget.h>
 #include <nepomuk/facet.h>

+#include <nepomuk/resourcemanager.h>

 #include <Nepomuk/Utils/SimpleFacet>
 #include <Nepomuk/Utils/ProxyFacet>
 #include <Nepomuk/Utils/DynamicResourceFacet>
 #include <Nepomuk/Utils/SimpleFacet>
 #include <Nepomuk/Utils/ProxyFacet>
 #include <Nepomuk/Utils/DynamicResourceFacet>


@@ -44,6 +45,7 @@
 FilterPanel::FilterPanel(QWidget* parent) :
     Panel(parent),
     m_initialized(false),
 FilterPanel::FilterPanel(QWidget* parent) :
     Panel(parent),
     m_initialized(false),

+    m_nepomukEnabled(false),

     m_lastSetUrlStatJob(0),
     m_removeFolderRestrictionButton(0),
     m_facetWidget(0),
     m_lastSetUrlStatJob(0),
     m_removeFolderRestrictionButton(0),
     m_facetWidget(0),


@@ -57,7 +59,7 @@ FilterPanel::~FilterPanel()
 
 bool FilterPanel::urlChanged()
 {
 
 bool FilterPanel::urlChanged()
 {

-    if (isVisible()) {
+    if (isVisible() && m_nepomukEnabled) {

         setQuery(Nepomuk::Query::Query());
 
         delete m_lastSetUrlStatJob;
         setQuery(Nepomuk::Query::Query());
 
         delete m_lastSetUrlStatJob;


@@ -129,6 +131,9 @@ void FilterPanel::showEvent(QShowEvent* event)
         connect(m_facetWidget, SIGNAL(queryTermChanged(Nepomuk::Query::Term)),
                 this, SLOT(slotQueryTermChanged(Nepomuk::Query::Term)));
 
         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;
     }
 
         m_initialized = true;
     }
 

diff --git a/src/panels/filter/filterpanel.h b/src/panels/filter/filterpanel.h
index 14fcee84772850dd1bfefeb63eea00d63ae7a05b..aaf51046cd290ec7b4450aef409f5509ac13680f 100644 (file)
--- a/src/panels/filter/filterpanel.h
+++ b/src/panels/filter/filterpanel.h
@@ -63,6 +63,7 @@ private:
 
 private:
     bool m_initialized;
 
 private:
     bool m_initialized;

+    bool m_nepomukEnabled;

     KJob* m_lastSetUrlStatJob;
 
     QPushButton* m_removeFolderRestrictionButton;
     KJob* m_lastSetUrlStatJob;
 
     QPushButton* m_removeFolderRestrictionButton;