From: Robert Hoffmann <externer.dl.hoffmann@muenchen.de>
Date: Tue, 13 Feb 2018 22:12:44 +0000 (+0100)
Subject: Fix resetting "View Modes" preferences to defaults
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/a618383df3840d85dcd7e4ff62dc2ed02f55b0b7?hp=-c

Fix resetting "View Modes" preferences to defaults

Summary:
Removed call to settings.readConfig() in ViewSettingsTab::loadSettings(),
because it overwrites default settings with user settings even if called
from ViewSettingsTab::restoreDefaultSettings().

Test Plan:
Settings -> Configure Dolphin -> View Modes:
Choose "Custom Font", "Choose...": other font settings than preselected;
alter "Icon Size" slider positions;
click OK; OK;
note modified text font next to icons, icon sizes

Settings -> Configure Dolphin -> View Modes:
Click "Defaults"
check "Font" is reset to "System Font";
check "Icon Size" slider positions are reset to default positions;
click OK
check text font next to icons, icon sizes are reset to defaults

Subscribers: ltoscano, ngraham, elvisangelaccio, michaelh, #dolphin

Tags: #dolphin

Differential Revision: https://phabricator.kde.org/D10190
---

a618383df3840d85dcd7e4ff62dc2ed02f55b0b7
diff --git a/src/settings/viewmodes/viewsettingstab.cpp b/src/settings/viewmodes/viewsettingstab.cpp
index a673769ad..ae751f9aa 100644
--- a/src/settings/viewmodes/viewsettingstab.cpp
+++ b/src/settings/viewmodes/viewsettingstab.cpp
@@ -232,8 +232,7 @@ void ViewSettingsTab::loadSettings()
         break;
     }
 
-    ViewModeSettings settings(viewMode());
-    settings.readConfig();
+    const ViewModeSettings settings(viewMode());
 
     const QSize iconSize(settings.iconSize(), settings.iconSize());
     m_defaultSizeSlider->setValue(ZoomLevelInfo::zoomLevelForIconSize(iconSize));