Fix the "I can't/don't want to" finish the drag event (what is called

[dolphin.git] / src / dolphinmainwindow.cpp

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index 0accdfcaaecc9c6fe012813a5e848e7ee58a2644..7d7a9f89b53c71105b6e42e9336b394db8471ba3 100644 (file)
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -21,7 +21,7 @@
 
 #include "dolphinmainwindow.h"
 
-#include "config-nepomuk.h"
+#include <config-nepomuk.h>
 
 #include "dolphinapplication.h"
 #include "dolphinnewmenu.h"
@@ -769,9 +769,7 @@ void DolphinMainWindow::toggleSplitView()
         const DolphinView* view = m_viewContainer[PrimaryView]->view();
         m_viewContainer[SecondaryView] = new DolphinViewContainer(this,
                                                                  0,
-                                                                 view->rootUrl(),
-                                                                 view->mode(),
-                                                                 view->showHiddenFiles());
+                                                                 view->rootUrl());
         connectViewSignals(SecondaryView);
         m_splitter->addWidget(m_viewContainer[SecondaryView]);
         m_splitter->setSizes(QList<int>() << newWidth << newWidth);
@@ -975,10 +973,8 @@ void DolphinMainWindow::init()
     setCaption(homeUrl.fileName());
     ViewProperties props(homeUrl);
     m_viewContainer[PrimaryView] = new DolphinViewContainer(this,
-                                                           m_splitter,
-                                                           homeUrl,
-                                                           props.viewMode(),
-                                                           props.showHiddenFiles());
+                                                            m_splitter,
+                                                            homeUrl);
 
     m_activeViewContainer = m_viewContainer[PrimaryView];
     connectViewSignals(PrimaryView);
@@ -1000,7 +996,12 @@ void DolphinMainWindow::init()
     updatePasteAction();
     updateGoActions();
 
-    loadSettings();
+    const bool split = generalSettings->splitView();
+    if (split) {
+        toggleSplitView();
+    }
+    updateSplitAction(split);
+    updateViewActions();
 
     if (firstRun) {
         // assure a proper default size if Dolphin runs the first time
@@ -1014,13 +1015,6 @@ void DolphinMainWindow::init()
     emit urlChanged(homeUrl);
 }
 
-void DolphinMainWindow::loadSettings()
-{
-    GeneralSettings* settings = DolphinSettings::instance().generalSettings();
-    updateSplitAction(settings->splitView());
-    updateViewActions();
-}
-
 void DolphinMainWindow::setActiveViewContainer(DolphinViewContainer* view)
 {
     Q_ASSERT((view == m_viewContainer[PrimaryView]) || (view == m_viewContainer[SecondaryView]));