Merge remote-tracking branch 'fork/work/zakharafoniam/useful-groups'

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

diff --git a/src/settings/viewmodes/viewsettingstab.cpp b/src/settings/viewmodes/viewsettingstab.cpp
index 1e109aab05337e81a44945f00a4f5e96c43b66be..fc9e94131889ca0fbb9b49530309b84b949ec837 100644 (file)
--- a/src/settings/viewmodes/viewsettingstab.cpp
+++ b/src/settings/viewmodes/viewsettingstab.cpp
@@ -15,32 +15,27 @@
 #include "views/zoomlevelinfo.h"
 
 #include <KLocalizedString>
 #include "views/zoomlevelinfo.h"
 
 #include <KLocalizedString>

-#include <KFormat>

 
 #include <QApplication>
 
 #include <QApplication>

+#include <QButtonGroup>

 #include <QCheckBox>
 #include <QComboBox>
 #include <QCheckBox>
 #include <QComboBox>

-#include <QHelpEvent>

 #include <QFormLayout>
 #include <QFormLayout>

-#include <QSpinBox>
+#include <QHelpEvent>

 #include <QRadioButton>
 #include <QRadioButton>

-#include <QButtonGroup>
-#include <QLabel>
-
-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)
+#include <QSpinBox>
+
+ViewSettingsTab::ViewSettingsTab(Mode mode, QWidget *parent)
+    : SettingsPageBase(parent)
+    , m_mode(mode)
+    , m_defaultSizeSlider(nullptr)
+    , m_previewSizeSlider(nullptr)
+    , m_fontRequester(nullptr)
+    , m_widthBox(nullptr)
+    , m_maxLinesBox(nullptr)
+    , m_expandableFolders(nullptr)

 {
 {

-    QFormLayout* topLayout = new QFormLayout(this);
+    QFormLayout *topLayout = new QFormLayout(this);

 
     // Create "Icon Size" section
     const int minRange = ZoomLevelInfo::minimumLevel();
 
     // Create "Icon Size" section
     const int minRange = ZoomLevelInfo::minimumLevel();


@@ -50,22 +45,18 @@ ViewSettingsTab::ViewSettingsTab(Mode mode, QWidget* parent) :
     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);
 
     m_previewSizeSlider = new QSlider(Qt::Horizontal);
     m_previewSizeSlider->setPageStep(1);
     m_previewSizeSlider->setTickPosition(QSlider::TicksBelow);
     m_previewSizeSlider->setRange(minRange, maxRange);
     topLayout->addRow(i18nc("@label:listbox", "Default icon size:"), m_defaultSizeSlider);
 
     m_previewSizeSlider = new QSlider(Qt::Horizontal);
     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);
 
     topLayout->addRow(i18nc("@label:listbox", "Preview icon size:"), m_previewSizeSlider);
 

-

     topLayout->addItem(new QSpacerItem(0, Dolphin::VERTICAL_SPACER_HEIGHT, QSizePolicy::Fixed, QSizePolicy::Fixed));
 
     topLayout->addItem(new QSpacerItem(0, Dolphin::VERTICAL_SPACER_HEIGHT, QSizePolicy::Fixed, QSizePolicy::Fixed));
 

-

     // Create "Label" section
     m_fontRequester = new DolphinFontRequester(this);
     topLayout->addRow(i18nc("@label:listbox", "Label font:"), m_fontRequester);
     // Create "Label" section
     m_fontRequester = new DolphinFontRequester(this);
     topLayout->addRow(i18nc("@label:listbox", "Label font:"), m_fontRequester);


@@ -102,48 +93,19 @@ ViewSettingsTab::ViewSettingsTab(Mode mode, QWidget* parent) :
         m_expandableFolders = new QCheckBox(i18nc("@option:check", "Expandable"));
         topLayout->addRow(i18nc("@label:checkbox", "Folders:"), m_expandableFolders);
 
         m_expandableFolders = new QCheckBox(i18nc("@option:check", "Expandable"));
         topLayout->addRow(i18nc("@label:checkbox", "Folders:"), m_expandableFolders);
 

-#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
-
-        QDateTime thirtyMinutesAgo = QDateTime::currentDateTime().addSecs(-30 * 60);
-        QLocale local;
-        KFormat formatter(local);
+        // 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"));

 
 

-        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);
+        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);

         break;
     }
 
         break;
     }
 


@@ -162,16 +124,8 @@ ViewSettingsTab::ViewSettingsTab(Mode mode, QWidget* parent) :
         connect(m_widthBox, &QComboBox::currentIndexChanged, this, &ViewSettingsTab::changed);
         break;
     case DetailsMode:
         connect(m_widthBox, &QComboBox::currentIndexChanged, this, &ViewSettingsTab::changed);
         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);

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


@@ -184,26 +138,40 @@ ViewSettingsTab::~ViewSettingsTab()
 
 void ViewSettingsTab::applySettings()
 {
 
 void ViewSettingsTab::applySettings()
 {

-    const QFont font = m_fontRequester->currentFont();
-    const bool useSystemFont = (m_fontRequester->mode() == DolphinFontRequester::SystemFont);
-

     switch (m_mode) {
     case IconsMode:
         IconsModeSettings::setTextWidthIndex(m_widthBox->currentIndex());
         IconsModeSettings::setMaximumTextLines(m_maxLinesBox->currentIndex());
     switch (m_mode) {
     case IconsMode:
         IconsModeSettings::setTextWidthIndex(m_widthBox->currentIndex());
         IconsModeSettings::setMaximumTextLines(m_maxLinesBox->currentIndex());

+        IconsModeSettings::self()->save();

         break;
     case CompactMode:
         CompactModeSettings::setMaximumTextWidthIndex(m_widthBox->currentIndex());
         break;
     case CompactMode:
         CompactModeSettings::setMaximumTextWidthIndex(m_widthBox->currentIndex());

+        CompactModeSettings::self()->save();

         break;
     case DetailsMode:
         break;
     case DetailsMode:

-        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());
-        break;
-    default:
+        auto detailsModeSettings = DetailsModeSettings::self();
+        // 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()) {
+            const bool usedDefaults = detailsModeSettings->useDefaults(true);
+            const uint defaultLeftPadding = detailsModeSettings->leftPadding();
+            const uint defaultRightPadding = detailsModeSettings->rightPadding();
+            detailsModeSettings->useDefaults(usedDefaults);
+            if (detailsModeSettings->leftPadding() < defaultLeftPadding) {
+                detailsModeSettings->setLeftPadding(defaultLeftPadding);
+            }
+            if (detailsModeSettings->rightPadding() < defaultRightPadding) {
+                detailsModeSettings->setRightPadding(defaultRightPadding);
+            }
+        } 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->setLeftPadding(0);
+            detailsModeSettings->setRightPadding(0);
+        }
+        detailsModeSettings->setHighlightEntireRow(m_entireRow->isChecked());
+        detailsModeSettings->setExpandableFolders(m_expandableFolders->isChecked());
+        detailsModeSettings->save();

         break;
     }
 
         break;
     }
 


@@ -214,16 +182,16 @@ void ViewSettingsTab::applySettings()
     settings.setIconSize(iconSize);
     settings.setPreviewSize(previewSize);
 
     settings.setIconSize(iconSize);
     settings.setPreviewSize(previewSize);
 

+    const QFont font = m_fontRequester->currentFont();
+    const bool useSystemFont = (m_fontRequester->mode() == DolphinFontRequester::SystemFont);
+

     settings.setUseSystemFont(useSystemFont);
     settings.setUseSystemFont(useSystemFont);

-    settings.setFontFamily(font.family());
-    settings.setFontSize(font.pointSizeF());
-    settings.setItalicFont(font.italic());
-    settings.setFontWeight(font.weight());
+    settings.setViewFont(font);

 
     settings.save();
 }
 
 
     settings.save();
 }
 

-void ViewSettingsTab::restoreDefaultSettings()
+void ViewSettingsTab::restoreDefaults()

 {
     ViewModeSettings settings(m_mode);
     settings.useDefaults(true);
 {
     ViewModeSettings settings(m_mode);
     settings.useDefaults(true);


@@ -242,19 +210,9 @@ 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());

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


@@ -268,14 +226,9 @@ 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);
 }
 


@@ -289,7 +242,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));


@@ -302,3 +255,4 @@ void ViewSettingsTab::showToolTip(QSlider* slider, int value)
     QApplication::sendEvent(slider, &toolTipEvent);
 }
 
     QApplication::sendEvent(slider, &toolTipEvent);
 }
 

+#include "moc_viewsettingstab.cpp"