From: Peter Penz <peter.penz19@gmail.com>
Date: Tue, 3 Feb 2009 06:24:39 +0000 (+0000)
Subject: * no general settings are read -> invoking loadSettings has no effect in restoreDefau... 
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/58373c05fe21c282f7828ff1381eb838131a2e8f

* no general settings are read -> invoking loadSettings has no effect in restoreDefaults()
* use constants for the defaults, as hardcoding the defaults in 2 methods might be error-prone when changing the defaults in future

CCMAIL: predator106@gmail.com

svn path=/trunk/KDE/kdebase/apps/; revision=920531
---

diff --git a/src/settings/previewssettingspage.cpp b/src/settings/previewssettingspage.cpp
index 76a6e3c4d..e0e07b64f 100644
--- a/src/settings/previewssettingspage.cpp
+++ b/src/settings/previewssettingspage.cpp
@@ -37,6 +37,10 @@
 #include <khbox.h>
 #include <kvbox.h>
 
+// default settings
+const bool USE_THUMBNAILS = true;
+const int MAX_PREVIEW_SIZE = 5; // 5 MB
+
 PreviewsSettingsPage::PreviewsSettingsPage(QWidget* parent) :
     SettingsPageBase(parent),
     m_maxPreviewSize(0),
@@ -105,12 +109,8 @@ void PreviewsSettingsPage::applySettings()
 
 void PreviewsSettingsPage::restoreDefaults()
 {
-    GeneralSettings* settings = DolphinSettings::instance().generalSettings();
-    settings->useDefaults(true);
-    loadSettings();
-    settings->useDefaults(false);
-    m_maxPreviewSize->setValue(5);
-    m_useFileThumbnails->setChecked(true);
+    m_maxPreviewSize->setValue(MAX_PREVIEW_SIZE);
+    m_useFileThumbnails->setChecked(USE_THUMBNAILS);
 }
 
 void PreviewsSettingsPage::loadSettings()
@@ -122,7 +122,7 @@ void PreviewsSettingsPage::loadSettings()
     // TODO: The default value of 5 MB must match with the default value inside
     // kdelibs/kio/kio/previewjob.cpp. Maybe a static getter method in PreviewJob
     // should be added for getting the default size?
-    const int maxByteSize = globalConfig.readEntry("MaximumSize", 5 * 1024 * 1024 /* 5 MB */);
+    const int maxByteSize = globalConfig.readEntry("MaximumSize", MAX_PREVIEW_SIZE * 1024 * 1024);
     int maxMByteSize = maxByteSize / (1024 * 1024);
     if (maxMByteSize < min) {
         maxMByteSize = min;
@@ -131,7 +131,7 @@ void PreviewsSettingsPage::loadSettings()
     }
     m_maxPreviewSize->setValue(maxMByteSize);
 
-    const bool useFileThumbnails = globalConfig.readEntry("UseFileThumbnails", true);
+    const bool useFileThumbnails = globalConfig.readEntry("UseFileThumbnails", USE_THUMBNAILS);
     m_useFileThumbnails->setChecked(useFileThumbnails);
 }