1 files changed, 10 insertions, 32 deletions

diff --git a/src/settings/viewmodes/viewsettingstab.cpp b/src/settings/viewmodes/viewsettingstab.cpp
index 3593f23dd..1a00c5d84 100644
--- a/src/settings/viewmodes/viewsettingstab.cpp
+++ b/src/settings/viewmodes/viewsettingstab.cpp
@@ -16,17 +16,14 @@
 
 #include <KLocalizedString>
 
-#include <KColorScheme>
 #include <QApplication>
 #include <QButtonGroup>
 #include <QCheckBox>
 #include <QComboBox>
 #include <QFormLayout>
 #include <QHelpEvent>
-#include <QLabel>
 #include <QRadioButton>
 #include <QSpinBox>
-#include <qfont.h>
 
 ViewSettingsTab::ViewSettingsTab(Mode mode, QWidget *parent)
     : SettingsPageBase(parent)
@@ -37,6 +34,7 @@ ViewSettingsTab::ViewSettingsTab(Mode mode, QWidget *parent)
     , m_widthBox(nullptr)
     , m_maxLinesBox(nullptr)
     , m_expandableFolders(nullptr)
+    , m_pixelatedScaling(nullptr)
 {
     QFormLayout *topLayout = new QFormLayout(this);
     topLayout->setFormAlignment(Qt::AlignHCenter);
@@ -65,17 +63,6 @@ ViewSettingsTab::ViewSettingsTab(Mode mode, QWidget *parent)
     m_fontRequester = new DolphinFontRequester(this);
     topLayout->addRow(i18nc("@label:listbox", "Label font:"), m_fontRequester);
 
-    // Reserved font style warning
-    m_fontWarningLabel = new QLabel(this);
-    m_fontWarningLabel->setWordWrap(true);
-    m_fontWarningLabel->setVisible(false);
-    m_fontWarningLabel->setText(i18nc("@info", "Some font styles are reserved by Dolphin and may be overridden."));
-    topLayout->addRow(QString(), m_fontWarningLabel);
-    KColorScheme scheme(QPalette::Normal);
-    QPalette palette = m_fontWarningLabel->palette();
-    palette.setColor(QPalette::WindowText, scheme.foreground(KColorScheme::InactiveText).color());
-    m_fontWarningLabel->setPalette(palette);
-
     switch (m_mode) {
     case IconsMode: {
         m_widthBox = new QComboBox();
@@ -93,6 +80,9 @@ ViewSettingsTab::ViewSettingsTab(Mode mode, QWidget *parent)
         m_maxLinesBox->addItem(i18nc("@item:inlistbox Maximum lines", "4"));
         m_maxLinesBox->addItem(i18nc("@item:inlistbox Maximum lines", "5"));
         topLayout->addRow(i18nc("@label:listbox", "Maximum lines:"), m_maxLinesBox);
+
+        m_pixelatedScaling = new QCheckBox(i18nc("@option:check", "Use pixelated thumbnail scaling"));
+        topLayout->addRow(QString(), m_pixelatedScaling);
         break;
     }
     case CompactMode: {
@@ -129,12 +119,12 @@ ViewSettingsTab::ViewSettingsTab(Mode mode, QWidget *parent)
     connect(m_defaultSizeSlider, &QSlider::valueChanged, this, &ViewSettingsTab::changed);
     connect(m_previewSizeSlider, &QSlider::valueChanged, this, &ViewSettingsTab::changed);
     connect(m_fontRequester, &DolphinFontRequester::changed, this, &ViewSettingsTab::changed);
-    connect(m_fontRequester, &DolphinFontRequester::changed, this, &ViewSettingsTab::checkFontStyle);
 
     switch (m_mode) {
     case IconsMode:
         connect(m_widthBox, &QComboBox::currentIndexChanged, this, &ViewSettingsTab::changed);
         connect(m_maxLinesBox, &QComboBox::currentIndexChanged, this, &ViewSettingsTab::changed);
+        connect(m_pixelatedScaling, &QCheckBox::toggled, this, &ViewSettingsTab::changed);
         break;
     case CompactMode:
         connect(m_widthBox, &QComboBox::currentIndexChanged, this, &ViewSettingsTab::changed);
@@ -148,23 +138,8 @@ ViewSettingsTab::ViewSettingsTab(Mode mode, QWidget *parent)
     }
 }
 
-ViewSettingsTab::~ViewSettingsTab() = default;
-
-void ViewSettingsTab::checkFontStyle()
+ViewSettingsTab::~ViewSettingsTab()
 {
-    const QFont font = m_fontRequester->currentFont();
-    const bool wantsReservedStyle = font.italic() || font.underline() || font.strikeOut();
-
-    // Disabled warning for System Font
-    if (m_fontRequester->mode() != DolphinFontRequester::CustomFont) {
-        m_fontWarningLabel->setVisible(false);
-        return;
-    }
-
-    if (wantsReservedStyle) {
-        m_fontWarningLabel->setVisible(true);
-        return;
-    }
 }
 
 void ViewSettingsTab::applySettings()
@@ -173,6 +148,7 @@ void ViewSettingsTab::applySettings()
     case IconsMode:
         IconsModeSettings::setTextWidthIndex(m_widthBox->currentIndex());
         IconsModeSettings::setMaximumTextLines(m_maxLinesBox->currentIndex());
+        IconsModeSettings::setUsePixelatedScaling(m_pixelatedScaling->isChecked());
         IconsModeSettings::self()->save();
         break;
     case CompactMode:
@@ -218,6 +194,7 @@ void ViewSettingsTab::applySettings()
 
     settings.setUseSystemFont(useSystemFont);
     settings.setViewFont(font);
+
     settings.save();
 }
 
@@ -235,6 +212,7 @@ void ViewSettingsTab::loadSettings()
     case IconsMode:
         m_widthBox->setCurrentIndex(IconsModeSettings::textWidthIndex());
         m_maxLinesBox->setCurrentIndex(IconsModeSettings::maximumTextLines());
+        m_pixelatedScaling->setChecked(IconsModeSettings::usePixelatedScaling());
         break;
     case CompactMode:
         m_widthBox->setCurrentIndex(CompactModeSettings::maximumTextWidthIndex());
@@ -285,4 +263,4 @@ void ViewSettingsTab::showToolTip(QSlider *slider, int value)
     QApplication::sendEvent(slider, &toolTipEvent);
 }
 
-#include "moc_viewsettingstab.cpp"
\ No newline at end of file
+#include "moc_viewsettingstab.cpp"