From a618383df3840d85dcd7e4ff62dc2ed02f55b0b7 Mon Sep 17 00:00:00 2001 From: Robert Hoffmann Date: Tue, 13 Feb 2018 23:12:44 +0100 Subject: [PATCH] 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 --- src/settings/viewmodes/viewsettingstab.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/settings/viewmodes/viewsettingstab.cpp b/src/settings/viewmodes/viewsettingstab.cpp index a673769ade..ae751f9aaf 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));