X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/81c32c18a5ea52c026ab8566b299601e48efa0b5..e5abe2c67bed7f1ca448cc94eb3abcfbe7d0da92:/src/settings/viewmodes/viewmodesettings.cpp

diff --git a/src/settings/viewmodes/viewmodesettings.cpp b/src/settings/viewmodes/viewmodesettings.cpp
index 8c11bde5b..504ec12e7 100644
--- a/src/settings/viewmodes/viewmodesettings.cpp
+++ b/src/settings/viewmodes/viewmodesettings.cpp
@@ -1,6 +1,6 @@
 /*
  * SPDX-FileCopyrightText: 2011 Peter Penz <peter.penz19@gmail.com>
- * SPDX-FileCopyrightText: 2021 Felix Ernst <fe.a.ernst@gmail.com>
+ * SPDX-FileCopyrightText: 2021 Felix Ernst <felixernst@kde.org>
  *
  * SPDX-License-Identifier: GPL-2.0-or-later
  */
@@ -11,34 +11,91 @@
 #include "dolphin_detailsmodesettings.h"
 #include "dolphin_iconsmodesettings.h"
 
+#include "dolphin_generalsettings.h"
+
+ViewModeSettings::ViewModeSettings()
+{
+    auto removeEntries = [](KConfigGroup &group) {
+        group.deleteEntry("FontFamily");
+        group.deleteEntry("FontWeight");
+        group.deleteEntry("ItalicFont");
+    };
+
+    KSharedConfig::Ptr config = KSharedConfig::openConfig();
+    // Migrate old config entries
+    if (GeneralSettings::version() < 202) {
+        for (const char *groupName : {"CompactMode", "DetailsMode", "IconsMode"}) {
+            KConfigGroup group = config->group(groupName);
+            const QString family = group.readEntry("FontFamily", QString{});
+            if (family.isEmpty()) {
+                removeEntries(group);
+                continue;
+            }
+
+            QFont font;
+            font.setFamily(family);
+            const int weight = group.readEntry<int>("FontWeight", QFont::Normal);
+            font.setWeight(static_cast<QFont::Weight>(weight));
+            font.setItalic(group.readEntry("ItalicFont", false));
+            removeEntries(group);
+
+            // Write the new config entry
+            group.writeEntry("ViewFont", font);
+        }
+
+        config->sync();
+    }
+}
+
 ViewModeSettings::ViewModeSettings(DolphinView::Mode mode)
+    : ViewModeSettings()
 {
     switch (mode) {
-    case DolphinView::IconsView:    m_viewModeSettingsVariant = IconsModeSettings::self();   return;
-    case DolphinView::CompactView:  m_viewModeSettingsVariant = CompactModeSettings::self(); return;
-    case DolphinView::DetailsView:  m_viewModeSettingsVariant = DetailsModeSettings::self(); return;
+    case DolphinView::IconsView:
+        m_viewModeSettingsVariant = IconsModeSettings::self();
+        return;
+    case DolphinView::CompactView:
+        m_viewModeSettingsVariant = CompactModeSettings::self();
+        return;
+    case DolphinView::DetailsView:
+        m_viewModeSettingsVariant = DetailsModeSettings::self();
+        return;
     default:
         Q_UNREACHABLE();
     }
 }
 
 ViewModeSettings::ViewModeSettings(ViewSettingsTab::Mode mode)
+    : ViewModeSettings()
 {
     switch (mode) {
-    case ViewSettingsTab::IconsMode:    m_viewModeSettingsVariant = IconsModeSettings::self();   return;
-    case ViewSettingsTab::CompactMode:  m_viewModeSettingsVariant = CompactModeSettings::self(); return;
-    case ViewSettingsTab::DetailsMode:  m_viewModeSettingsVariant = DetailsModeSettings::self(); return;
+    case ViewSettingsTab::IconsMode:
+        m_viewModeSettingsVariant = IconsModeSettings::self();
+        return;
+    case ViewSettingsTab::CompactMode:
+        m_viewModeSettingsVariant = CompactModeSettings::self();
+        return;
+    case ViewSettingsTab::DetailsMode:
+        m_viewModeSettingsVariant = DetailsModeSettings::self();
+        return;
     default:
         Q_UNREACHABLE();
     }
 }
 
 ViewModeSettings::ViewModeSettings(KStandardItemListView::ItemLayout itemLayout)
+    : ViewModeSettings()
 {
     switch (itemLayout) {
-    case KStandardItemListView::IconsLayout:    m_viewModeSettingsVariant = IconsModeSettings::self();   return;
-    case KStandardItemListView::CompactLayout:  m_viewModeSettingsVariant = CompactModeSettings::self(); return;
-    case KStandardItemListView::DetailsLayout:  m_viewModeSettingsVariant = DetailsModeSettings::self(); return;
+    case KStandardItemListView::IconsLayout:
+        m_viewModeSettingsVariant = IconsModeSettings::self();
+        return;
+    case KStandardItemListView::CompactLayout:
+        m_viewModeSettingsVariant = CompactModeSettings::self();
+        return;
+    case KStandardItemListView::DetailsLayout:
+        m_viewModeSettingsVariant = DetailsModeSettings::self();
+        return;
     default:
         Q_UNREACHABLE();
     }
@@ -46,119 +103,99 @@ ViewModeSettings::ViewModeSettings(KStandardItemListView::ItemLayout itemLayout)
 
 void ViewModeSettings::setIconSize(int iconSize)
 {
-    std::visit([iconSize](auto &&v) {
-        v->setIconSize(iconSize);
-    }, m_viewModeSettingsVariant);
+    std::visit(
+        [iconSize](auto &&v) {
+            v->setIconSize(iconSize);
+        },
+        m_viewModeSettingsVariant);
 }
 
 int ViewModeSettings::iconSize() const
 {
-    return std::visit([](auto &&v) {
-        return v->iconSize();
-    }, m_viewModeSettingsVariant);
+    return std::visit(
+        [](auto &&v) {
+            return v->iconSize();
+        },
+        m_viewModeSettingsVariant);
 }
 
 void ViewModeSettings::setPreviewSize(int previewSize)
 {
-    std::visit([previewSize](auto &&v) {
-        v->setPreviewSize(previewSize);
-    }, m_viewModeSettingsVariant);
+    std::visit(
+        [previewSize](auto &&v) {
+            v->setPreviewSize(previewSize);
+        },
+        m_viewModeSettingsVariant);
 }
 
 int ViewModeSettings::previewSize() const
 {
-    return std::visit([](auto &&v) {
-        return v->previewSize();
-    }, m_viewModeSettingsVariant);
+    return std::visit(
+        [](auto &&v) {
+            return v->previewSize();
+        },
+        m_viewModeSettingsVariant);
 }
 
 void ViewModeSettings::setUseSystemFont(bool useSystemFont)
 {
-    std::visit([useSystemFont](auto &&v) {
-        v->setUseSystemFont(useSystemFont);
-    }, m_viewModeSettingsVariant);
+    std::visit(
+        [useSystemFont](auto &&v) {
+            v->setUseSystemFont(useSystemFont);
+        },
+        m_viewModeSettingsVariant);
 }
 
 bool ViewModeSettings::useSystemFont() const
 {
-    return std::visit([](auto &&v) {
-        return v->useSystemFont();
-    }, m_viewModeSettingsVariant);
-}
-
-void ViewModeSettings::setFontFamily(const QString &fontFamily)
-{
-    std::visit([&fontFamily](auto &&v) {
-        v->setFontFamily(fontFamily);
-    }, m_viewModeSettingsVariant);
-}
-
-QString ViewModeSettings::fontFamily() const
-{
-    return std::visit([](auto &&v) {
-        return v->fontFamily();
-    }, m_viewModeSettingsVariant);
-}
-
-void ViewModeSettings::setFontSize(qreal fontSize)
-{
-    std::visit([fontSize](auto &&v) {
-        v->setFontSize(fontSize);
-    }, m_viewModeSettingsVariant);
-}
-
-qreal ViewModeSettings::fontSize() const
-{
-    return std::visit([](auto &&v) {
-        return v->fontSize();
-    }, m_viewModeSettingsVariant);
-}
-
-void ViewModeSettings::setItalicFont(bool italic)
-{
-    std::visit([italic](auto &&v) {
-        v->setItalicFont(italic);
-    }, m_viewModeSettingsVariant);
-}
-
-bool ViewModeSettings::italicFont() const
-{
-    return std::visit([](auto &&v) {
-        return v->italicFont();
-    }, m_viewModeSettingsVariant);
+    return std::visit(
+        [](auto &&v) {
+            return v->useSystemFont();
+        },
+        m_viewModeSettingsVariant);
 }
 
-void ViewModeSettings::setFontWeight(int fontWeight)
+void ViewModeSettings::setViewFont(const QFont &font)
 {
-    std::visit([fontWeight](auto &&v) {
-        v->setFontWeight(fontWeight);
-    }, m_viewModeSettingsVariant);
+    std::visit(
+        [&font](auto &&v) {
+            v->setViewFont(font);
+        },
+        m_viewModeSettingsVariant);
 }
 
-int ViewModeSettings::fontWeight() const
+QFont ViewModeSettings::viewFont() const
 {
-    return std::visit([](auto &&v) {
-        return v->fontWeight();
-    }, m_viewModeSettingsVariant);
+    return std::visit(
+        [](auto &&v) {
+            return v->viewFont();
+        },
+        m_viewModeSettingsVariant);
 }
 
 void ViewModeSettings::useDefaults(bool useDefaults)
 {
-    std::visit([useDefaults](auto &&v) {
-        v->useDefaults(useDefaults);
-    }, m_viewModeSettingsVariant);
+    std::visit(
+        [useDefaults](auto &&v) {
+            v->useDefaults(useDefaults);
+        },
+        m_viewModeSettingsVariant);
 }
 
 void ViewModeSettings::readConfig()
 {
-    std::visit([](auto &&v) {
-        v->load();
-    }, m_viewModeSettingsVariant);
+    std::visit(
+        [](auto &&v) {
+            v->load();
+        },
+        m_viewModeSettingsVariant);
 }
 
 void ViewModeSettings::save()
 {
-    std::visit([](auto &&v) {
-        return v->save();
-    }, m_viewModeSettingsVariant);
+    std::visit(
+        [](auto &&v) {
+            return v->save();
+        },
+        m_viewModeSettingsVariant);
 }