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 df850e530c3ca360987373fc9df16b289c1b99ad..fc9e94131889ca0fbb9b49530309b84b949ec837 100644 (file)
--- a/src/settings/viewmodes/viewsettingstab.cpp
+++ b/src/settings/viewmodes/viewsettingstab.cpp
@@ -26,7 +26,7 @@
 #include <QSpinBox>
 
 ViewSettingsTab::ViewSettingsTab(Mode mode, QWidget *parent)
 #include <QSpinBox>
 
 ViewSettingsTab::ViewSettingsTab(Mode mode, QWidget *parent)

-    : QWidget(parent)
+    : SettingsPageBase(parent)

     , m_mode(mode)
     , m_defaultSizeSlider(nullptr)
     , m_previewSizeSlider(nullptr)
     , m_mode(mode)
     , m_defaultSizeSlider(nullptr)
     , m_previewSizeSlider(nullptr)


@@ -154,15 +154,20 @@ void ViewSettingsTab::applySettings()
         // 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);
         // 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 defaultSidePadding = detailsModeSettings->sidePadding();
+            const uint defaultLeftPadding = detailsModeSettings->leftPadding();
+            const uint defaultRightPadding = detailsModeSettings->rightPadding();

             detailsModeSettings->useDefaults(usedDefaults);
             detailsModeSettings->useDefaults(usedDefaults);

-            if (detailsModeSettings->sidePadding() < defaultSidePadding) {
-                detailsModeSettings->setSidePadding(defaultSidePadding);
+            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.
             }
         } 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->setLeftPadding(0);
+            detailsModeSettings->setRightPadding(0);

         }
         detailsModeSettings->setHighlightEntireRow(m_entireRow->isChecked());
         detailsModeSettings->setExpandableFolders(m_expandableFolders->isChecked());
         }
         detailsModeSettings->setHighlightEntireRow(m_entireRow->isChecked());
         detailsModeSettings->setExpandableFolders(m_expandableFolders->isChecked());


@@ -186,7 +191,7 @@ void ViewSettingsTab::applySettings()
     settings.save();
 }
 
     settings.save();
 }
 

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

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


@@ -249,3 +254,5 @@ 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);
 }

+
+#include "moc_viewsettingstab.cpp"