mirror of
https://invent.kde.org/system/dolphin
synced 2024-09-19 00:11:21 +00:00
Disable the Facet Panel if Nepomuk is disabled (at least for 4.6, hopefully in 4.7 we can also provide Facets that don't require a running Nepomuk)
svn path=/trunk/KDE/kdebase/apps/; revision=1195658
This commit is contained in:
parent
1629b2ee29
commit
bc0bdf1f37
|
@ -22,6 +22,7 @@
|
||||||
#include <nepomuk/filequery.h>
|
#include <nepomuk/filequery.h>
|
||||||
#include <nepomuk/facetwidget.h>
|
#include <nepomuk/facetwidget.h>
|
||||||
#include <nepomuk/facet.h>
|
#include <nepomuk/facet.h>
|
||||||
|
#include <nepomuk/resourcemanager.h>
|
||||||
#include <Nepomuk/Utils/SimpleFacet>
|
#include <Nepomuk/Utils/SimpleFacet>
|
||||||
#include <Nepomuk/Utils/ProxyFacet>
|
#include <Nepomuk/Utils/ProxyFacet>
|
||||||
#include <Nepomuk/Utils/DynamicResourceFacet>
|
#include <Nepomuk/Utils/DynamicResourceFacet>
|
||||||
|
@ -44,6 +45,7 @@
|
||||||
FilterPanel::FilterPanel(QWidget* parent) :
|
FilterPanel::FilterPanel(QWidget* parent) :
|
||||||
Panel(parent),
|
Panel(parent),
|
||||||
m_initialized(false),
|
m_initialized(false),
|
||||||
|
m_nepomukEnabled(false),
|
||||||
m_lastSetUrlStatJob(0),
|
m_lastSetUrlStatJob(0),
|
||||||
m_removeFolderRestrictionButton(0),
|
m_removeFolderRestrictionButton(0),
|
||||||
m_facetWidget(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());
|
setQuery(Nepomuk::Query::Query());
|
||||||
|
|
||||||
delete m_lastSetUrlStatJob;
|
delete m_lastSetUrlStatJob;
|
||||||
|
@ -129,6 +131,9 @@ void FilterPanel::showEvent(QShowEvent* event)
|
||||||
connect(m_facetWidget, SIGNAL(queryTermChanged(Nepomuk::Query::Term)),
|
connect(m_facetWidget, SIGNAL(queryTermChanged(Nepomuk::Query::Term)),
|
||||||
this, SLOT(slotQueryTermChanged(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;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -63,6 +63,7 @@ private:
|
||||||
|
|
||||||
private:
|
private:
|
||||||
bool m_initialized;
|
bool m_initialized;
|
||||||
|
bool m_nepomukEnabled;
|
||||||
KJob* m_lastSetUrlStatJob;
|
KJob* m_lastSetUrlStatJob;
|
||||||
|
|
||||||
QPushButton* m_removeFolderRestrictionButton;
|
QPushButton* m_removeFolderRestrictionButton;
|
||||||
|
|
Loading…
Reference in a new issue