Fix resetting "View Modes" preferences to defaults

[dolphin.git] / src / settings / viewmodes / viewsettingstab.cpp

diff --git a/src/settings/viewmodes/viewsettingstab.cpp b/src/settings/viewmodes/viewsettingstab.cpp
index 6f442099fc16e9a4632f5b971d47097d7d45ba71..ae751f9aaf4652b6e34520538ed1bf3d90b7b18e 100644 (file)
--- a/src/settings/viewmodes/viewsettingstab.cpp
+++ b/src/settings/viewmodes/viewsettingstab.cpp
@@ -25,7 +25,7 @@
 #include "dolphin_iconsmodesettings.h"
 
 #include <KComboBox>
 #include "dolphin_iconsmodesettings.h"
 
 #include <KComboBox>

-#include <KLocale>
+#include <KLocalizedString>

 
 #include <QCheckBox>
 #include <QGroupBox>
 
 #include <QCheckBox>
 #include <QGroupBox>


@@ -133,7 +133,9 @@ ViewSettingsTab::ViewSettingsTab(Mode mode, QWidget* parent) :
 
     topLayout->addWidget(iconSizeGroup);
     topLayout->addWidget(textGroup);
 
     topLayout->addWidget(iconSizeGroup);
     topLayout->addWidget(textGroup);

-    topLayout->addWidget(m_expandableFolders);
+    if (m_expandableFolders) {
+        topLayout->addWidget(m_expandableFolders);
+    }

     topLayout->addStretch(1);
 
     loadSettings();
     topLayout->addStretch(1);
 
     loadSettings();


@@ -195,7 +197,7 @@ void ViewSettingsTab::applySettings()
     settings.setItalicFont(font.italic());
     settings.setFontWeight(font.weight());
 
     settings.setItalicFont(font.italic());
     settings.setFontWeight(font.weight());
 

-    settings.writeConfig();
+    settings.save();

 }
 
 void ViewSettingsTab::restoreDefaultSettings()
 }
 
 void ViewSettingsTab::restoreDefaultSettings()


@@ -230,8 +232,7 @@ void ViewSettingsTab::loadSettings()
         break;
     }
 
         break;
     }
 

-    ViewModeSettings settings(viewMode());
-    settings.readConfig();
+    const ViewModeSettings settings(viewMode());

 
     const QSize iconSize(settings.iconSize(), settings.iconSize());
     m_defaultSizeSlider->setValue(ZoomLevelInfo::zoomLevelForIconSize(iconSize));
 
     const QSize iconSize(settings.iconSize(), settings.iconSize());
     m_defaultSizeSlider->setValue(ZoomLevelInfo::zoomLevelForIconSize(iconSize));