Don't try to apply the services-settings, if they have not even been shown. This...

[dolphin.git] / src / dolphinmainwindow.cpp

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index 54e6d8b6c39394bff578547e006c4d7dea2146b9..6a94b1eeda4221158d9b6e8e763218251e9e1291 100644 (file)
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -28,7 +28,9 @@
 #include "dolphinnewfilemenu.h"
 #include "dolphinviewcontainer.h"
 #include "mainwindowadaptor.h"
-#include "panels/filter/filterpanel.h"
+#ifdef HAVE_NEPOMUK
+    #include "panels/filter/filterpanel.h"
+#endif
 #include "panels/folders/folderspanel.h"
 #include "panels/places/placespanel.h"
 #include "panels/information/informationpanel.h"
@@ -53,7 +55,6 @@
 #include <kconfig.h>
 #include <kdesktopfile.h>
 #include <kdeversion.h>
-#include <kdualaction.h>
 #include <kfiledialog.h>
 #include <kfileplacesmodel.h>
 #include <kglobal.h>
@@ -283,6 +284,19 @@ void DolphinMainWindow::refreshViews()
     }
 
     setActiveViewContainer(activeViewContainer);
+
+    const GeneralSettings* generalSettings = DolphinSettings::instance().generalSettings();
+    if (generalSettings->modifiedStartupSettings()) {
+        // The startup settings have been changed by the user (see bug #254947).
+        // 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))
+                            || (!splitView && (activeTab.secondaryView != 0));
+        if (toggle) {
+            toggleSplitView();
+        }
+    }
 }
 
 void DolphinMainWindow::pasteIntoFolder()
@@ -825,9 +839,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()
@@ -854,14 +868,14 @@ void DolphinMainWindow::replaceLocation()
 void DolphinMainWindow::goBack()
 {
     clearStatusBar();
-    
+
     KUrlNavigator* urlNavigator = m_activeViewContainer->urlNavigator();
     urlNavigator->goBack();
-    
+
     if (urlNavigator->locationState().isEmpty()) {
         // An empty location state indicates a redirection URL,
         // which must be skipped too
-        urlNavigator->goBack();       
+        urlNavigator->goBack();
     }
 }
 
@@ -1178,7 +1192,7 @@ void DolphinMainWindow::slotHandleUrlStatFinished(KJob* job)
     m_lastHandleUrlStatJob = 0;
     const KIO::UDSEntry entry = static_cast<KIO::StatJob*>(job)->statResult();
     const KUrl url = static_cast<KIO::StatJob*>(job)->url();
-    if ( entry.isDir() ) {
+    if (entry.isDir()) {
         activeViewContainer()->setUrl(url);
     } else {
         new KRun(url, this);
@@ -1203,7 +1217,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;
     }
 
@@ -1501,11 +1515,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"));
@@ -1520,7 +1534,7 @@ void DolphinMainWindow::setupActions()
     connect(openTerminal, SIGNAL(triggered()), this, SLOT(openTerminal()));
 
     // setup 'Settings' menu
-    m_showMenuBar = KStandardAction::showHideMenubar(this, SLOT(toggleShowMenuBar()), actionCollection());
+    m_showMenuBar = KStandardAction::showMenubar(this, SLOT(toggleShowMenuBar()), actionCollection());
     KStandardAction::preferences(this, SLOT(editSettings()), actionCollection());
 
     // not in menu actions
@@ -1626,7 +1640,7 @@ void DolphinMainWindow::setupDockWidgets()
     filterAction->setIcon(KIcon("view-filter"));
     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();