integrate column view into settings

[dolphin.git] / src / dolphinsettings.cpp

diff --git a/src/dolphinsettings.cpp b/src/dolphinsettings.cpp
index 3d187d40d3d64c0da0837cd830fbbc5539bee8f0..0db0ad2048e6af9f5faa9f56b178e81156ab22ea 100644 (file)
--- a/src/dolphinsettings.cpp
+++ b/src/dolphinsettings.cpp
@@ -26,9 +26,10 @@
 #include <klocale.h>
 #include <kstandarddirs.h>
 
 #include <klocale.h>
 #include <kstandarddirs.h>
 

+#include "dolphin_columnmodesettings.h"
+#include "dolphin_detailsmodesettings.h"

 #include "dolphin_generalsettings.h"
 #include "dolphin_iconsmodesettings.h"
 #include "dolphin_generalsettings.h"
 #include "dolphin_iconsmodesettings.h"

-#include "dolphin_detailsmodesettings.h"

 
 DolphinSettings& DolphinSettings::instance()
 {
 
 DolphinSettings& DolphinSettings::instance()
 {


@@ -41,7 +42,7 @@ DolphinSettings& DolphinSettings::instance()
 
 KBookmark DolphinSettings::bookmark(int index) const
 {
 
 KBookmark DolphinSettings::bookmark(int index) const
 {

-    return bookmarkManager()->findByAddress( QString('/')+QString::number(index) );
+    return bookmarkManager()->findByAddress(QString('/') + QString::number(index));

 }
 
 KBookmarkManager* DolphinSettings::bookmarkManager() const
 }
 
 KBookmarkManager* DolphinSettings::bookmarkManager() const


@@ -58,6 +59,7 @@ void DolphinSettings::save()
     m_generalSettings->writeConfig();
     m_iconsModeSettings->writeConfig();
     m_detailsModeSettings->writeConfig();
     m_generalSettings->writeConfig();
     m_iconsModeSettings->writeConfig();
     m_detailsModeSettings->writeConfig();

+    m_columnModeSettings->writeConfig();

 
     QString basePath = KGlobal::mainComponent().componentName();
     basePath.append("/bookmarks.xml");
 
     QString basePath = KGlobal::mainComponent().componentName();
     basePath.append("/bookmarks.xml");


@@ -72,6 +74,7 @@ DolphinSettings::DolphinSettings()
     m_generalSettings = new GeneralSettings();
     m_iconsModeSettings = new IconsModeSettings();
     m_detailsModeSettings = new DetailsModeSettings();
     m_generalSettings = new GeneralSettings();
     m_iconsModeSettings = new IconsModeSettings();
     m_detailsModeSettings = new DetailsModeSettings();

+    m_columnModeSettings = new ColumnModeSettings();

 }
 
 DolphinSettings::~DolphinSettings()
 }
 
 DolphinSettings::~DolphinSettings()


@@ -84,4 +87,7 @@ DolphinSettings::~DolphinSettings()
 
     delete m_detailsModeSettings;
     m_detailsModeSettings = 0;
 
     delete m_detailsModeSettings;
     m_detailsModeSettings = 0;

+
+    delete m_columnModeSettings;
+    m_columnModeSettings = 0;

 }
 }