assure that no expensive operations are done when the Information Panel has been...

[dolphin.git] / src / dolphinsettings.cpp

diff --git a/src/dolphinsettings.cpp b/src/dolphinsettings.cpp
index 7e3388524878ceb175deae3698954bd856bceafb..5b91001eff8af499b675cc901076298800b12b17 100644 (file)
--- a/src/dolphinsettings.cpp
+++ b/src/dolphinsettings.cpp
@@ -20,54 +20,26 @@
 
 #include "dolphinsettings.h"
 
 
 #include "dolphinsettings.h"
 

-#include <assert.h>
-#include <qdir.h>
-
-#include <kbookmark.h>
-#include <kbookmarkmanager.h>
+#include <kfileplacesmodel.h>

 #include <kcomponentdata.h>
 #include <kcomponentdata.h>

-#include <kicontheme.h>

 #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"
-
-#include <Q3IconView>
-
-DolphinSettings& DolphinSettings::instance()
-{
-    static DolphinSettings* instance = 0;
-    if (instance == 0) {
-        instance = new DolphinSettings();
-    }
-    return *instance;
-}

 
 

-KBookmark DolphinSettings::bookmark(int index) const
+class DolphinSettingsSingleton

 {
 {

-    int i = 0;
-    KBookmarkGroup root = bookmarkManager()->root();
-    KBookmark bookmark = root.first();
-    while (!bookmark.isNull()) {
-        if (i == index) {
-            return bookmark;
-        }
-        ++i;
-        bookmark = root.next(bookmark);
-    }
+public:
+    DolphinSettings instance;
+};
+K_GLOBAL_STATIC(DolphinSettingsSingleton, s_settings)

 
 

-    return KBookmark();
-}
-
-KBookmarkManager* DolphinSettings::bookmarkManager() const
+DolphinSettings& DolphinSettings::instance()

 {
 {

-    QString basePath = KGlobal::mainComponent().componentName();
-    basePath.append("/bookmarks.xml");
-    const QString file = KStandardDirs::locateLocal("data", basePath);
-
-    return KBookmarkManager::managerForFile(file, "dolphin", false);
+    return s_settings->instance;

 }
 
 void DolphinSettings::save()
 }
 
 void DolphinSettings::save()


@@ -75,13 +47,7 @@ void DolphinSettings::save()
     m_generalSettings->writeConfig();
     m_iconsModeSettings->writeConfig();
     m_detailsModeSettings->writeConfig();
     m_generalSettings->writeConfig();
     m_iconsModeSettings->writeConfig();
     m_detailsModeSettings->writeConfig();

-
-    QString basePath = KGlobal::mainComponent().componentName();
-    basePath.append("/bookmarks.xml");
-    const QString file = KStandardDirs::locateLocal( "data", basePath);
-
-    KBookmarkManager* manager = KBookmarkManager::managerForFile(file, "dolphin", false);
-    manager->save(false);
+    m_columnModeSettings->writeConfig();

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


@@ -89,6 +55,8 @@ 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();
+    m_placesModel = new KFilePlacesModel();

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


@@ -101,4 +69,10 @@ DolphinSettings::~DolphinSettings()
 
     delete m_detailsModeSettings;
     m_detailsModeSettings = 0;
 
     delete m_detailsModeSettings;
     m_detailsModeSettings = 0;

+
+    delete m_columnModeSettings;
+    m_columnModeSettings = 0;
+
+    delete m_placesModel;
+    m_placesModel = 0;

 }
 }