split view on startup if it is defined by the settings

svn path=/trunk/KDE/kdebase/apps/; revision=678063

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index c4eb07890ee0d08a8b842b96b768edc9bc80c13a..7d7a9f89b53c71105b6e42e9336b394db8471ba3 100644 (file)
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -996,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
@@ -1010,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]));

diff --git a/src/dolphinmainwindow.h b/src/dolphinmainwindow.h
index 17a7dce6a505594e2e0eb9e4aeb54df5feef6ac9..5bbba5f218dddae85a503620381a34fedc6dfa55 100644 (file)
--- a/src/dolphinmainwindow.h
+++ b/src/dolphinmainwindow.h
@@ -419,7 +419,6 @@ private slots:
 private:
     DolphinMainWindow(int id);
     void init();
-    void loadSettings();
 
     /**
      * Activates the given view, which means that