Add new settings for permissions column format

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

diff --git a/src/settings/viewmodes/viewsettingstab.cpp b/src/settings/viewmodes/viewsettingstab.cpp
index ae751f9aaf4652b6e34520538ed1bf3d90b7b18e..1d4c5f5d59f6eddd1caff0782fd7d2d47a78b78a 100644 (file)
--- a/src/settings/viewmodes/viewsettingstab.cpp
+++ b/src/settings/viewmodes/viewsettingstab.cpp
@@ -1,142 +1,175 @@
-/***************************************************************************
- *   Copyright (C) 2008-2011 by Peter Penz <peter.penz19@gmail.com>        *
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
- ***************************************************************************/
+/*
+ * SPDX-FileCopyrightText: 2008-2011 Peter Penz <peter.penz19@gmail.com>
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */

 
 #include "viewsettingstab.h"
 
 
 #include "viewsettingstab.h"
 

-#include "dolphinfontrequester.h"

 #include "dolphin_compactmodesettings.h"
 #include "dolphin_detailsmodesettings.h"
 #include "dolphin_iconsmodesettings.h"
 #include "dolphin_compactmodesettings.h"
 #include "dolphin_detailsmodesettings.h"
 #include "dolphin_iconsmodesettings.h"

+#include "dolphinfontrequester.h"
+#include "global.h"
+#include "settings/viewmodes/viewmodesettings.h"
+#include "views/zoomlevelinfo.h"

 
 

-#include <KComboBox>
+#include <KFormat>

 #include <KLocalizedString>
 
 #include <KLocalizedString>
 

+#include <QApplication>
+#include <QButtonGroup>

 #include <QCheckBox>
 #include <QCheckBox>

-#include <QGroupBox>
-#include <QLabel>
-#include <QSlider>
-#include <QVBoxLayout>
+#include <QComboBox>
+#include <QFormLayout>

 #include <QHelpEvent>
 #include <QHelpEvent>

-#include <QApplication>
-
-#include <views/zoomlevelinfo.h>
-
-ViewSettingsTab::ViewSettingsTab(Mode mode, QWidget* parent) :
-    QWidget(parent),
-    m_mode(mode),
-    m_defaultSizeSlider(0),
-    m_previewSizeSlider(0),
-    m_fontRequester(0),
-    m_widthBox(0),
-    m_maxLinesBox(0),
-    m_expandableFolders(0)
+#include <QRadioButton>
+#include <QSpinBox>
+
+ViewSettingsTab::ViewSettingsTab(Mode mode, QWidget *parent)
+    : QWidget(parent)
+    , m_mode(mode)
+    , m_defaultSizeSlider(nullptr)
+    , m_previewSizeSlider(nullptr)
+    , m_fontRequester(nullptr)
+    , m_widthBox(nullptr)
+    , m_maxLinesBox(nullptr)
+    , m_expandableFolders(nullptr)
+    , m_recursiveDirectorySizeLimit(nullptr)
+    , m_useRelatetiveDates(nullptr)
+    , m_useShortDates(nullptr)
+    , m_useSymbolicPermissions(nullptr)
+    , m_useNumericPermissions(nullptr)
+    , m_useCombinedPermissions(nullptr)

 {
 {

-    QVBoxLayout* topLayout = new QVBoxLayout(this);
-
-    // Create "Icon Size" group
-    QGroupBox* iconSizeGroup = new QGroupBox(this);
-    iconSizeGroup->setTitle(i18nc("@title:group", "Icon Size"));
+    QFormLayout *topLayout = new QFormLayout(this);

 
 

+    // Create "Icon Size" section

     const int minRange = ZoomLevelInfo::minimumLevel();
     const int maxRange = ZoomLevelInfo::maximumLevel();
 
     const int minRange = ZoomLevelInfo::minimumLevel();
     const int maxRange = ZoomLevelInfo::maximumLevel();
 

-    QLabel* defaultLabel = new QLabel(i18nc("@label:listbox", "Default:"), this);
-    m_defaultSizeSlider = new QSlider(Qt::Horizontal, this);
+    m_defaultSizeSlider = new QSlider(Qt::Horizontal);

     m_defaultSizeSlider->setPageStep(1);
     m_defaultSizeSlider->setTickPosition(QSlider::TicksBelow);
     m_defaultSizeSlider->setRange(minRange, maxRange);
     m_defaultSizeSlider->setPageStep(1);
     m_defaultSizeSlider->setTickPosition(QSlider::TicksBelow);
     m_defaultSizeSlider->setRange(minRange, maxRange);

-    connect(m_defaultSizeSlider, &QSlider::valueChanged,
-            this, &ViewSettingsTab::slotDefaultSliderMoved);
+    connect(m_defaultSizeSlider, &QSlider::valueChanged, this, &ViewSettingsTab::slotDefaultSliderMoved);
+    topLayout->addRow(i18nc("@label:listbox", "Default icon size:"), m_defaultSizeSlider);

 
 

-    QLabel* previewLabel = new QLabel(i18nc("@label:listbox", "Preview:"), this);
-    m_previewSizeSlider = new QSlider(Qt::Horizontal, this);
+    m_previewSizeSlider = new QSlider(Qt::Horizontal);

     m_previewSizeSlider->setPageStep(1);
     m_previewSizeSlider->setTickPosition(QSlider::TicksBelow);
     m_previewSizeSlider->setRange(minRange, maxRange);
     m_previewSizeSlider->setPageStep(1);
     m_previewSizeSlider->setTickPosition(QSlider::TicksBelow);
     m_previewSizeSlider->setRange(minRange, maxRange);

-    connect(m_previewSizeSlider, &QSlider::valueChanged,
-            this, &ViewSettingsTab::slotPreviewSliderMoved);
+    connect(m_previewSizeSlider, &QSlider::valueChanged, this, &ViewSettingsTab::slotPreviewSliderMoved);
+    topLayout->addRow(i18nc("@label:listbox", "Preview icon size:"), m_previewSizeSlider);

 
 

-    QGridLayout* layout = new QGridLayout(iconSizeGroup);
-    layout->addWidget(defaultLabel, 0, 0, Qt::AlignRight);
-    layout->addWidget(m_defaultSizeSlider, 0, 1);
-    layout->addWidget(previewLabel, 1, 0, Qt::AlignRight);
-    layout->addWidget(m_previewSizeSlider, 1, 1);
+    topLayout->addItem(new QSpacerItem(0, Dolphin::VERTICAL_SPACER_HEIGHT, QSizePolicy::Fixed, QSizePolicy::Fixed));

 
 

-    // Create "Text" group
-    QGroupBox* textGroup = new QGroupBox(i18nc("@title:group", "Text"), this);
-
-    QLabel* fontLabel = new QLabel(i18nc("@label:listbox", "Font:"), textGroup);
-    m_fontRequester = new DolphinFontRequester(textGroup);
-
-    QGridLayout* textGroupLayout = new QGridLayout(textGroup);
-    textGroupLayout->addWidget(fontLabel, 0, 0, Qt::AlignRight);
-    textGroupLayout->addWidget(m_fontRequester, 0, 1);
+    // Create "Label" section
+    m_fontRequester = new DolphinFontRequester(this);
+    topLayout->addRow(i18nc("@label:listbox", "Label font:"), m_fontRequester);

 
     switch (m_mode) {
     case IconsMode: {
 
     switch (m_mode) {
     case IconsMode: {

-        QLabel* widthLabel = new QLabel(i18nc("@label:listbox", "Width:"), textGroup);
-        m_widthBox = new KComboBox(textGroup);
-        m_widthBox->addItem(i18nc("@item:inlistbox Text width", "Small"));
-        m_widthBox->addItem(i18nc("@item:inlistbox Text width", "Medium"));
-        m_widthBox->addItem(i18nc("@item:inlistbox Text width", "Large"));
-        m_widthBox->addItem(i18nc("@item:inlistbox Text width", "Huge"));
-
-        QLabel* maxLinesLabel = new QLabel(i18nc("@label:listbox", "Maximum lines:"), textGroup);
-        m_maxLinesBox = new KComboBox(textGroup);
+        m_widthBox = new QComboBox();
+        m_widthBox->addItem(i18nc("@item:inlistbox Label width", "Small"));
+        m_widthBox->addItem(i18nc("@item:inlistbox Label width", "Medium"));
+        m_widthBox->addItem(i18nc("@item:inlistbox Label width", "Large"));
+        m_widthBox->addItem(i18nc("@item:inlistbox Label width", "Huge"));
+        topLayout->addRow(i18nc("@label:listbox", "Label width:"), m_widthBox);
+
+        m_maxLinesBox = new QComboBox();

         m_maxLinesBox->addItem(i18nc("@item:inlistbox Maximum lines", "Unlimited"));
         m_maxLinesBox->addItem(i18nc("@item:inlistbox Maximum lines", "1"));
         m_maxLinesBox->addItem(i18nc("@item:inlistbox Maximum lines", "2"));
         m_maxLinesBox->addItem(i18nc("@item:inlistbox Maximum lines", "3"));
         m_maxLinesBox->addItem(i18nc("@item:inlistbox Maximum lines", "4"));
         m_maxLinesBox->addItem(i18nc("@item:inlistbox Maximum lines", "5"));
         m_maxLinesBox->addItem(i18nc("@item:inlistbox Maximum lines", "Unlimited"));
         m_maxLinesBox->addItem(i18nc("@item:inlistbox Maximum lines", "1"));
         m_maxLinesBox->addItem(i18nc("@item:inlistbox Maximum lines", "2"));
         m_maxLinesBox->addItem(i18nc("@item:inlistbox Maximum lines", "3"));
         m_maxLinesBox->addItem(i18nc("@item:inlistbox Maximum lines", "4"));
         m_maxLinesBox->addItem(i18nc("@item:inlistbox Maximum lines", "5"));

-
-        textGroupLayout->addWidget(widthLabel, 2, 0, Qt::AlignRight);
-        textGroupLayout->addWidget(m_widthBox, 2, 1);
-        textGroupLayout->addWidget(maxLinesLabel, 3, 0, Qt::AlignRight);
-        textGroupLayout->addWidget(m_maxLinesBox, 3, 1);
+        topLayout->addRow(i18nc("@label:listbox", "Maximum lines:"), m_maxLinesBox);

         break;
     }
     case CompactMode: {
         break;
     }
     case CompactMode: {

-        QLabel* maxWidthLabel = new QLabel(i18nc("@label:listbox", "Maximum width:"), textGroup);
-        m_widthBox = new KComboBox(textGroup);
+        m_widthBox = new QComboBox();

         m_widthBox->addItem(i18nc("@item:inlistbox Maximum width", "Unlimited"));
         m_widthBox->addItem(i18nc("@item:inlistbox Maximum width", "Small"));
         m_widthBox->addItem(i18nc("@item:inlistbox Maximum width", "Medium"));
         m_widthBox->addItem(i18nc("@item:inlistbox Maximum width", "Large"));
         m_widthBox->addItem(i18nc("@item:inlistbox Maximum width", "Unlimited"));
         m_widthBox->addItem(i18nc("@item:inlistbox Maximum width", "Small"));
         m_widthBox->addItem(i18nc("@item:inlistbox Maximum width", "Medium"));
         m_widthBox->addItem(i18nc("@item:inlistbox Maximum width", "Large"));

-
-        textGroupLayout->addWidget(maxWidthLabel, 2, 0, Qt::AlignRight);
-        textGroupLayout->addWidget(m_widthBox, 2, 1);
+        topLayout->addRow(i18nc("@label:listbox", "Maximum width:"), m_widthBox);

         break;
     }
     case DetailsMode:
         break;
     }
     case DetailsMode:

-        m_expandableFolders = new QCheckBox(i18nc("@option:check", "Expandable folders"), this);
-        break;
-    default:
-        break;
-    }
+        m_expandableFolders = new QCheckBox(i18nc("@option:check", "Expandable"));
+        topLayout->addRow(i18nc("@label:checkbox", "Folders:"), m_expandableFolders);
+
+        // Item activation area
+        m_entireRow = new QRadioButton(i18nc("@option:radio how files/folders are opened", "By clicking anywhere on the row"));
+        m_iconAndNameOnly = new QRadioButton(i18nc("@option:radio how files/folders are opened", "By clicking on icon or name"));
+
+        auto itemActivationAreaGroup = new QButtonGroup(this);
+        itemActivationAreaGroup->addButton(m_entireRow);
+        itemActivationAreaGroup->addButton(m_iconAndNameOnly);
+
+        // clang-format off
+        // i18n: Users can choose here if items are opened by clicking on their name/icon or by clicking in the row.
+        topLayout->addRow(i18nc("@title:group", "Open files and folders:"), m_entireRow);
+        // clang-format on
+        topLayout->addRow(QString(), m_iconAndNameOnly);
+
+#ifndef Q_OS_WIN
+        // Sorting properties
+        m_numberOfItems = new QRadioButton(i18nc("option:radio", "Number of items"));
+        m_sizeOfContents = new QRadioButton(i18nc("option:radio", "Size of contents, up to "));
+
+        QButtonGroup *sortingModeGroup = new QButtonGroup(this);
+        sortingModeGroup->addButton(m_numberOfItems);
+        sortingModeGroup->addButton(m_sizeOfContents);
+
+        m_recursiveDirectorySizeLimit = new QSpinBox();
+        connect(m_recursiveDirectorySizeLimit, &QSpinBox::valueChanged, this, [this](int value) {
+            m_recursiveDirectorySizeLimit->setSuffix(i18np(" level deep", " levels deep", value));
+        });
+        m_recursiveDirectorySizeLimit->setRange(1, 20);
+        m_recursiveDirectorySizeLimit->setSingleStep(1);
+
+        QHBoxLayout *contentsSizeLayout = new QHBoxLayout();
+        contentsSizeLayout->addWidget(m_sizeOfContents);
+        contentsSizeLayout->addWidget(m_recursiveDirectorySizeLimit);
+
+        topLayout->addRow(i18nc("@title:group", "Folder size displays:"), m_numberOfItems);
+        topLayout->addRow(QString(), contentsSizeLayout);
+#endif

 
 

-    topLayout->addWidget(iconSizeGroup);
-    topLayout->addWidget(textGroup);
-    if (m_expandableFolders) {
-        topLayout->addWidget(m_expandableFolders);
+        QDateTime thirtyMinutesAgo = QDateTime::currentDateTime().addSecs(-30 * 60);
+        QLocale local;
+        KFormat formatter(local);
+
+        m_useRelatetiveDates = new QRadioButton(
+            i18nc("option:radio as in relative date", "Relative (e.g. '%1')", formatter.formatRelativeDateTime(thirtyMinutesAgo, QLocale::ShortFormat)));
+        m_useShortDates =
+            new QRadioButton(i18nc("option:radio as in absolute date", "Absolute (e.g. '%1')", local.toString(thirtyMinutesAgo, QLocale::ShortFormat)));
+
+        QButtonGroup *dateFormatGroup = new QButtonGroup(this);
+        dateFormatGroup->addButton(m_useRelatetiveDates);
+        dateFormatGroup->addButton(m_useShortDates);
+
+        topLayout->addRow(i18nc("@title:group", "Date style:"), m_useRelatetiveDates);
+        topLayout->addRow(QString(), m_useShortDates);
+
+        m_useSymbolicPermissions = new QRadioButton(i18nc("option:radio as symbolic style ", "Symbolic (e.g. 'drwxr-xr-x')"));
+
+        m_useNumericPermissions = new QRadioButton(i18nc("option:radio as numeric style", "Numeric (Octal) (e.g. '755')"));
+
+        m_useCombinedPermissions = new QRadioButton(i18nc("option:radio as combined style", "Combined (e.g. 'drwxr-xr-x (755)')"));
+
+        topLayout->addRow(i18nc("@title:group", "Permissions style:"), m_useSymbolicPermissions);
+        topLayout->addRow(QString(), m_useNumericPermissions);
+        topLayout->addRow(QString(), m_useCombinedPermissions);
+
+        QButtonGroup *permissionsFormatGroup = new QButtonGroup(this);
+        permissionsFormatGroup->addButton(m_useSymbolicPermissions);
+        permissionsFormatGroup->addButton(m_useNumericPermissions);
+        permissionsFormatGroup->addButton(m_useCombinedPermissions);
+        break;

     }
     }

-    topLayout->addStretch(1);

 
     loadSettings();
 
 
     loadSettings();
 


@@ -146,14 +179,27 @@ ViewSettingsTab::ViewSettingsTab(Mode mode, QWidget* parent) :
 
     switch (m_mode) {
     case IconsMode:
 
     switch (m_mode) {
     case IconsMode:

-        connect(m_widthBox, static_cast<void(KComboBox::*)(int)>(&KComboBox::currentIndexChanged), this, &ViewSettingsTab::changed);
-        connect(m_maxLinesBox, static_cast<void(KComboBox::*)(int)>(&KComboBox::currentIndexChanged), this, &ViewSettingsTab::changed);
+        connect(m_widthBox, &QComboBox::currentIndexChanged, this, &ViewSettingsTab::changed);
+        connect(m_maxLinesBox, &QComboBox::currentIndexChanged, this, &ViewSettingsTab::changed);

         break;
     case CompactMode:
         break;
     case CompactMode:

-        connect(m_widthBox, static_cast<void(KComboBox::*)(int)>(&KComboBox::currentIndexChanged), this, &ViewSettingsTab::changed);
+        connect(m_widthBox, &QComboBox::currentIndexChanged, this, &ViewSettingsTab::changed);

         break;
     case DetailsMode:
         break;
     case DetailsMode:

+        connect(m_entireRow, &QCheckBox::toggled, this, &ViewSettingsTab::changed);

         connect(m_expandableFolders, &QCheckBox::toggled, this, &ViewSettingsTab::changed);
         connect(m_expandableFolders, &QCheckBox::toggled, this, &ViewSettingsTab::changed);

+#ifndef Q_OS_WIN
+        connect(m_recursiveDirectorySizeLimit, &QSpinBox::valueChanged, this, &ViewSettingsTab::changed);
+        connect(m_numberOfItems, &QRadioButton::toggled, this, &ViewSettingsTab::changed);
+        connect(m_sizeOfContents, &QRadioButton::toggled, this, [=]() {
+            m_recursiveDirectorySizeLimit->setEnabled(m_sizeOfContents->isChecked());
+        });
+#endif
+        connect(m_useRelatetiveDates, &QRadioButton::toggled, this, &ViewSettingsTab::changed);
+        connect(m_useShortDates, &QRadioButton::toggled, this, &ViewSettingsTab::changed);
+        connect(m_useSymbolicPermissions, &QRadioButton::toggled, this, &ViewSettingsTab::changed);
+        connect(m_useNumericPermissions, &QRadioButton::toggled, this, &ViewSettingsTab::changed);
+        connect(m_useCombinedPermissions, &QRadioButton::toggled, this, &ViewSettingsTab::changed);

         break;
     default:
         break;
         break;
     default:
         break;


@@ -178,13 +224,42 @@ void ViewSettingsTab::applySettings()
         CompactModeSettings::setMaximumTextWidthIndex(m_widthBox->currentIndex());
         break;
     case DetailsMode:
         CompactModeSettings::setMaximumTextWidthIndex(m_widthBox->currentIndex());
         break;
     case DetailsMode:

+        // We need side-padding when the full row is a click target to still be able to not click items.
+        // So here the default padding is enabled when the full row highlight is enabled.
+        if (m_entireRow->isChecked() && !DetailsModeSettings::highlightEntireRow()) {
+            auto detailsModeSettings = DetailsModeSettings::self();
+            const bool usedDefaults = detailsModeSettings->useDefaults(true);
+            const uint defaultSidePadding = detailsModeSettings->sidePadding();
+            detailsModeSettings->useDefaults(usedDefaults);
+            if (DetailsModeSettings::sidePadding() < defaultSidePadding) {
+                DetailsModeSettings::setSidePadding(defaultSidePadding);
+            }
+        } else if (!m_entireRow->isChecked() && DetailsModeSettings::highlightEntireRow()) {
+            // The full row click target is disabled so now most of the view area can be used to interact
+            // with the view background. Having an extra side padding has no usability benefit in this case.
+            DetailsModeSettings::setSidePadding(0);
+        }
+        DetailsModeSettings::setHighlightEntireRow(m_entireRow->isChecked());

         DetailsModeSettings::setExpandableFolders(m_expandableFolders->isChecked());
         DetailsModeSettings::setExpandableFolders(m_expandableFolders->isChecked());

+#ifndef Q_OS_WIN
+        DetailsModeSettings::setDirectorySizeCount(m_numberOfItems->isChecked());
+        DetailsModeSettings::setRecursiveDirectorySizeLimit(m_recursiveDirectorySizeLimit->value());
+#endif
+        DetailsModeSettings::setUseShortRelativeDates(m_useRelatetiveDates->isChecked());
+
+        if (m_useSymbolicPermissions->isChecked()) {
+            DetailsModeSettings::setUsePermissionsFormat(DetailsModeSettings::EnumUsePermissionsFormat::SymbolicFormat);
+        } else if (m_useNumericPermissions->isChecked()) {
+            DetailsModeSettings::setUsePermissionsFormat(DetailsModeSettings::EnumUsePermissionsFormat::NumericFormat);
+        } else if (m_useCombinedPermissions->isChecked()) {
+            DetailsModeSettings::setUsePermissionsFormat(DetailsModeSettings::EnumUsePermissionsFormat::CombinedFormat);
+        }

         break;
     default:
         break;
     }
 
         break;
     default:
         break;
     }
 

-    ViewModeSettings settings(viewMode());
+    ViewModeSettings settings(m_mode);

 
     const int iconSize = ZoomLevelInfo::iconSizeForZoomLevel(m_defaultSizeSlider->value());
     const int previewSize = ZoomLevelInfo::iconSizeForZoomLevel(m_previewSizeSlider->value());
 
     const int iconSize = ZoomLevelInfo::iconSizeForZoomLevel(m_defaultSizeSlider->value());
     const int previewSize = ZoomLevelInfo::iconSizeForZoomLevel(m_previewSizeSlider->value());


@@ -192,27 +267,17 @@ void ViewSettingsTab::applySettings()
     settings.setPreviewSize(previewSize);
 
     settings.setUseSystemFont(useSystemFont);
     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();
 }
 
 void ViewSettingsTab::restoreDefaultSettings()
 {
 
     settings.save();
 }
 
 void ViewSettingsTab::restoreDefaultSettings()
 {

-    KConfigSkeleton* settings = 0;
-    switch (m_mode) {
-    case IconsMode:   settings = IconsModeSettings::self(); break;
-    case CompactMode: settings = CompactModeSettings::self(); break;
-    case DetailsMode: settings = DetailsModeSettings::self(); break;
-    default: Q_ASSERT(false); break;
-    }
-
-    settings->useDefaults(true);
+    ViewModeSettings settings(m_mode);
+    settings.useDefaults(true);

     loadSettings();
     loadSettings();

-    settings->useDefaults(false);
+    settings.useDefaults(false);

 }
 
 void ViewSettingsTab::loadSettings()
 }
 
 void ViewSettingsTab::loadSettings()


@@ -226,13 +291,30 @@ void ViewSettingsTab::loadSettings()
         m_widthBox->setCurrentIndex(CompactModeSettings::maximumTextWidthIndex());
         break;
     case DetailsMode:
         m_widthBox->setCurrentIndex(CompactModeSettings::maximumTextWidthIndex());
         break;
     case DetailsMode:

+        m_entireRow->setChecked(DetailsModeSettings::highlightEntireRow());
+        m_iconAndNameOnly->setChecked(!m_entireRow->isChecked());

         m_expandableFolders->setChecked(DetailsModeSettings::expandableFolders());
         m_expandableFolders->setChecked(DetailsModeSettings::expandableFolders());

+#ifndef Q_OS_WIN
+        if (DetailsModeSettings::directorySizeCount()) {
+            m_numberOfItems->setChecked(true);
+            m_recursiveDirectorySizeLimit->setEnabled(false);
+        } else {
+            m_sizeOfContents->setChecked(true);
+            m_recursiveDirectorySizeLimit->setEnabled(true);
+        }
+        m_recursiveDirectorySizeLimit->setValue(DetailsModeSettings::recursiveDirectorySizeLimit());
+#endif
+        m_useRelatetiveDates->setChecked(DetailsModeSettings::useShortRelativeDates());
+        m_useShortDates->setChecked(!DetailsModeSettings::useShortRelativeDates());
+        m_useSymbolicPermissions->setChecked(DetailsModeSettings::usePermissionsFormat() == DetailsModeSettings::EnumUsePermissionsFormat::SymbolicFormat);
+        m_useNumericPermissions->setChecked(DetailsModeSettings::usePermissionsFormat() == DetailsModeSettings::EnumUsePermissionsFormat::NumericFormat);
+        m_useCombinedPermissions->setChecked(DetailsModeSettings::usePermissionsFormat() == DetailsModeSettings::EnumUsePermissionsFormat::CombinedFormat);

         break;
     default:
         break;
     }
 
         break;
     default:
         break;
     }
 

-    const ViewModeSettings settings(viewMode());
+    const ViewModeSettings settings(m_mode);

 
     const QSize iconSize(settings.iconSize(), settings.iconSize());
     m_defaultSizeSlider->setValue(ZoomLevelInfo::zoomLevelForIconSize(iconSize));
 
     const QSize iconSize(settings.iconSize(), settings.iconSize());
     m_defaultSizeSlider->setValue(ZoomLevelInfo::zoomLevelForIconSize(iconSize));


@@ -240,34 +322,12 @@ void ViewSettingsTab::loadSettings()
     const QSize previewSize(settings.previewSize(), settings.previewSize());
     m_previewSizeSlider->setValue(ZoomLevelInfo::zoomLevelForIconSize(previewSize));
 
     const QSize previewSize(settings.previewSize(), settings.previewSize());
     m_previewSizeSlider->setValue(ZoomLevelInfo::zoomLevelForIconSize(previewSize));
 

-    m_fontRequester->setMode(settings.useSystemFont()
-                             ? DolphinFontRequester::SystemFont
-                             : DolphinFontRequester::CustomFont);
+    m_fontRequester->setMode(settings.useSystemFont() ? 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);
 }
 
     m_fontRequester->setCustomFont(font);
 }
 

-ViewModeSettings::ViewMode ViewSettingsTab::viewMode() const
-{
-    ViewModeSettings::ViewMode mode;
-
-    switch (m_mode) {
-    case ViewSettingsTab::IconsMode:   mode = ViewModeSettings::IconsMode; break;
-    case ViewSettingsTab::CompactMode: mode = ViewModeSettings::CompactMode; break;
-    case ViewSettingsTab::DetailsMode: mode = ViewModeSettings::DetailsMode; break;
-    default:                           mode = ViewModeSettings::IconsMode;
-                                       Q_ASSERT(false);
-                                       break;
-    }
-
-    return mode;
-}
-
-

 void ViewSettingsTab::slotDefaultSliderMoved(int value)
 {
     showToolTip(m_defaultSizeSlider, value);
 void ViewSettingsTab::slotDefaultSliderMoved(int value)
 {
     showToolTip(m_defaultSizeSlider, value);


@@ -278,7 +338,7 @@ void ViewSettingsTab::slotPreviewSliderMoved(int value)
     showToolTip(m_previewSizeSlider, value);
 }
 
     showToolTip(m_previewSizeSlider, value);
 }
 

-void ViewSettingsTab::showToolTip(QSlider* slider, int value)
+void ViewSettingsTab::showToolTip(QSlider *slider, int value)

 {
     const int size = ZoomLevelInfo::iconSizeForZoomLevel(value);
     slider->setToolTip(i18ncp("@info:tooltip", "Size: 1 pixel", "Size: %1 pixels", size));
 {
     const int size = ZoomLevelInfo::iconSizeForZoomLevel(value);
     slider->setToolTip(i18ncp("@info:tooltip", "Size: 1 pixel", "Size: %1 pixels", size));


@@ -290,4 +350,3 @@ void ViewSettingsTab::showToolTip(QSlider* slider, int value)
     QHelpEvent toolTipEvent(QEvent::ToolTip, QPoint(0, 0), slider->mapToGlobal(global));
     QApplication::sendEvent(slider, &toolTipEvent);
 }
     QHelpEvent toolTipEvent(QEvent::ToolTip, QPoint(0, 0), slider->mapToGlobal(global));
     QApplication::sendEvent(slider, &toolTipEvent);
 }

-