Add clang-format and format code as in Frameworks

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

diff --git a/src/settings/viewmodes/viewsettingstab.cpp b/src/settings/viewmodes/viewsettingstab.cpp
index cf8cd2810a9974caaa0a919ff3810dc663bd3342..bc465c02f763758ec9811676c6597085e2f93163 100644 (file)
--- a/src/settings/viewmodes/viewsettingstab.cpp
+++ b/src/settings/viewmodes/viewsettingstab.cpp
@@ -11,32 +11,35 @@
 #include "dolphin_iconsmodesettings.h"
 #include "dolphinfontrequester.h"
 #include "global.h"
 #include "dolphin_iconsmodesettings.h"
 #include "dolphinfontrequester.h"
 #include "global.h"

+#include "settings/viewmodes/viewmodesettings.h"

 #include "views/zoomlevelinfo.h"
 
 #include "views/zoomlevelinfo.h"
 

+#include <KFormat>

 #include <KLocalizedString>
 
 #include <QApplication>
 #include <KLocalizedString>
 
 #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)
+#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)

 {
 {

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


@@ -46,22 +49,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);


@@ -98,17 +97,31 @@ 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);
 

+        // 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 "));
 
 #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);
+        QButtonGroup *sortingModeGroup = new QButtonGroup(this);

         sortingModeGroup->addButton(m_numberOfItems);
         sortingModeGroup->addButton(m_sizeOfContents);
 
         m_recursiveDirectorySizeLimit = new QSpinBox();
         sortingModeGroup->addButton(m_numberOfItems);
         sortingModeGroup->addButton(m_sizeOfContents);
 
         m_recursiveDirectorySizeLimit = new QSpinBox();

-        connect(m_recursiveDirectorySizeLimit, QOverload<int>::of(&QSpinBox::valueChanged), this, [this](int value) {
+        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->setSuffix(i18np(" level deep", " levels deep", value));
         });
         m_recursiveDirectorySizeLimit->setRange(1, 20);


@@ -121,6 +134,23 @@ ViewSettingsTab::ViewSettingsTab(Mode mode, QWidget* parent) :
         topLayout->addRow(i18nc("@title:group", "Folder size displays:"), m_numberOfItems);
         topLayout->addRow(QString(), contentsSizeLayout);
 #endif
         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);
+
+        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);
+

         break;
     }
 
         break;
     }
 


@@ -132,21 +162,24 @@ ViewSettingsTab::ViewSettingsTab(Mode mode, QWidget* parent) :
 
     switch (m_mode) {
     case IconsMode:
 
     switch (m_mode) {
     case IconsMode:

-        connect(m_widthBox, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &ViewSettingsTab::changed);
-        connect(m_maxLinesBox, QOverload<int>::of(&QComboBox::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, QOverload<int>::of(&QComboBox::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);
 #ifndef Q_OS_WIN
         connect(m_expandableFolders, &QCheckBox::toggled, this, &ViewSettingsTab::changed);
 #ifndef Q_OS_WIN

-        connect(m_recursiveDirectorySizeLimit, QOverload<int>::of(&QSpinBox::valueChanged), this, &ViewSettingsTab::changed);
+        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_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;


@@ -171,17 +204,34 @@ 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());
 #ifndef Q_OS_WIN
         DetailsModeSettings::setDirectorySizeCount(m_numberOfItems->isChecked());
         DetailsModeSettings::setRecursiveDirectorySizeLimit(m_recursiveDirectorySizeLimit->value());
 #endif
         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:
         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());


@@ -189,27 +239,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 = nullptr;
-    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()


@@ -223,23 +263,27 @@ 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
+#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;
     }
 

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


@@ -247,34 +291,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);


@@ -285,7 +307,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));


@@ -297,4 +319,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);
 }

-