mirror of
https://invent.kde.org/system/dolphin
synced 2024-11-05 18:47:12 +00:00
Also allow to show/hide the Filter Panel if Nepomuk is disabled
svn path=/trunk/KDE/kdebase/apps/; revision=1195360
This commit is contained in:
parent
85302c93da
commit
b1c5243645
1 changed files with 0 additions and 4 deletions
|
@ -30,7 +30,6 @@
|
|||
#include "mainwindowadaptor.h"
|
||||
#ifdef HAVE_NEPOMUK
|
||||
#include "panels/filter/filterpanel.h"
|
||||
#include <nepomuk/resourcemanager.h>
|
||||
#endif
|
||||
#include "panels/folders/folderspanel.h"
|
||||
#include "panels/places/placespanel.h"
|
||||
|
@ -1629,11 +1628,9 @@ void DolphinMainWindow::setupDockWidgets()
|
|||
|
||||
// setup "Filter"
|
||||
#ifdef HAVE_NEPOMUK
|
||||
const bool nepomukActivated = (Nepomuk::ResourceManager::instance()->init() == 0);
|
||||
QDockWidget* filterDock = new QDockWidget(i18nc("@title:window", "Filter"));
|
||||
filterDock->setObjectName("filterDock");
|
||||
filterDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);
|
||||
filterDock->setEnabled(nepomukActivated);
|
||||
Panel* filterPanel = new FilterPanel(filterDock);
|
||||
connect(filterPanel, SIGNAL(urlActivated(KUrl)), this, SLOT(handleUrl(KUrl)));
|
||||
filterDock->setWidget(filterPanel);
|
||||
|
@ -1641,7 +1638,6 @@ void DolphinMainWindow::setupDockWidgets()
|
|||
QAction* filterAction = filterDock->toggleViewAction();
|
||||
filterAction->setShortcut(Qt::Key_F12);
|
||||
filterAction->setIcon(KIcon("view-filter"));
|
||||
filterAction->setEnabled(nepomukActivated);
|
||||
addDockWidget(Qt::RightDockWidgetArea, filterDock);
|
||||
connect(this, SIGNAL(urlChanged(KUrl)),
|
||||
filterPanel, SLOT(setUrl(KUrl)));
|
||||
|
|
Loading…
Reference in a new issue