GIT_SILENT Sync po/docbooks with svn

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

diff --git a/src/settings/viewmodes/viewsettingstab.cpp b/src/settings/viewmodes/viewsettingstab.cpp
index 1e109aab05337e81a44945f00a4f5e96c43b66be..cc6818a301f2d8815b0f6df42f8d032afbbf7350 100644 (file)
--- a/src/settings/viewmodes/viewsettingstab.cpp
+++ b/src/settings/viewmodes/viewsettingstab.cpp
@@ -18,14 +18,13 @@
 #include <KFormat>
 
 #include <QApplication>
+#include <QButtonGroup>
 #include <QCheckBox>
 #include <QComboBox>
-#include <QHelpEvent>
 #include <QFormLayout>
-#include <QSpinBox>
+#include <QHelpEvent>
 #include <QRadioButton>
-#include <QButtonGroup>
-#include <QLabel>
+#include <QSpinBox>
 
 ViewSettingsTab::ViewSettingsTab(Mode mode, QWidget* parent) :
     QWidget(parent),
@@ -215,10 +214,7 @@ void ViewSettingsTab::applySettings()
     settings.setPreviewSize(previewSize);
 
     settings.setUseSystemFont(useSystemFont);
-    settings.setFontFamily(font.family());
-    settings.setFontSize(font.pointSizeF());
-    settings.setItalicFont(font.italic());
-    settings.setFontWeight(font.weight());
+    settings.setViewFont(font);
 
     settings.save();
 }
@@ -272,10 +268,7 @@ void ViewSettingsTab::loadSettings()
                              ? DolphinFontRequester::SystemFont
                              : DolphinFontRequester::CustomFont);
 
-    QFont font(settings.fontFamily(), qRound(settings.fontSize()));
-    font.setItalic(settings.italicFont());
-    font.setWeight(settings.fontWeight());
-    font.setPointSizeF(settings.fontSize());
+    QFont font(settings.viewFont());
     m_fontRequester->setCustomFont(font);
 }