Remember the root-URL when saving the state of a view. This allows to restore a colum...

[dolphin.git] / src / dolphinmainwindow.cpp

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index d1358036bcad33e14fea8279063927e008cb6d2b..8bba990c78f70ec899af98a700fec1fb409e834a 100644 (file)
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -30,6 +30,7 @@
 #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"
@@ -289,7 +290,7 @@ void DolphinMainWindow::refreshViews()
     const GeneralSettings* generalSettings = DolphinSettings::instance().generalSettings();
     if (generalSettings->modifiedStartupSettings()) {
         // The startup settings have been changed by the user (see bug #254947).
-        //  Synchronizethe split-view setting with the active view:
+        // Synchronize the split-view setting with the active view:
         const bool splitView = generalSettings->splitView();
         const ViewTab& activeTab = m_viewTab[m_tabIndex];
         const bool toggle =    ( splitView && (activeTab.secondaryView == 0))
@@ -840,9 +841,9 @@ void DolphinMainWindow::disableStopAction()
     actionCollection()->action("stop")->setEnabled(false);
 }
 
-void DolphinMainWindow::toggleFilterBarVisibility(bool show)
+void DolphinMainWindow::showFilterBar()
 {
-    m_activeViewContainer->showFilterBar(show);
+    m_activeViewContainer->setFilterBarVisible(true);
 }
 
 void DolphinMainWindow::toggleEditLocation()
@@ -1218,7 +1219,7 @@ void DolphinMainWindow::slotWriteStateChanged(bool isFolderWritable)
 void DolphinMainWindow::slotSearchModeChanged(bool enabled)
 {
     QDockWidget* filterDock = findChild<QDockWidget*>("filterDock");
-    if (filterDock == 0) {
+    if ((filterDock == 0) || !filterDock->isEnabled()) {
         return;
     }
 
@@ -1516,11 +1517,11 @@ void DolphinMainWindow::setupActions()
     KStandardAction::home(this, SLOT(goHome()), actionCollection());
 
     // setup 'Tools' menu
-    KToggleAction* showFilterBar = actionCollection()->add<KToggleAction>("show_filter_bar");
+    KAction* showFilterBar = actionCollection()->addAction("show_filter_bar");
     showFilterBar->setText(i18nc("@action:inmenu Tools", "Show Filter Bar"));
     showFilterBar->setIcon(KIcon("view-filter"));
     showFilterBar->setShortcut(Qt::CTRL | Qt::Key_I);
-    connect(showFilterBar, SIGNAL(triggered(bool)), this, SLOT(toggleFilterBarVisibility(bool)));
+    connect(showFilterBar, SIGNAL(triggered()), this, SLOT(showFilterBar()));
 
     KAction* compareFiles = actionCollection()->addAction("compare_files");
     compareFiles->setText(i18nc("@action:inmenu Tools", "Compare Files"));
@@ -1629,9 +1630,11 @@ 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);
@@ -1639,9 +1642,10 @@ 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)));
+            filterPanel, SLOT(setUrl(KUrl)));
 #endif
 
     const bool firstRun = DolphinSettings::instance().generalSettings()->firstRun();