Improve padding in the Places View

[dolphin.git] / src / settings / general / behaviorsettingspage.cpp

diff --git a/src/settings/general/behaviorsettingspage.cpp b/src/settings/general/behaviorsettingspage.cpp
index 4ed98e5d7319f4bcdbfd4c9305d6937d24b14b4b..5ca0566a9b1abce66c0e940ad314e75edfe4e04b 100644 (file)
--- a/src/settings/general/behaviorsettingspage.cpp
+++ b/src/settings/general/behaviorsettingspage.cpp
@@ -1,108 +1,111 @@
-/***************************************************************************
- *   Copyright (C) 2006 by Peter Penz (peter.penz@gmx.at) and              *
- *   and Patrice Tremblay                                                  *
- *                                                                         *
- *   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: 2006 Peter Penz (peter.penz@gmx.at) and Patrice Tremblay
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */

 
 #include "behaviorsettingspage.h"
 
 
 #include "behaviorsettingspage.h"
 

-#include "dolphin_generalsettings.h"
+#include "global.h"
+#include "views/viewproperties.h"

 
 

-#include <KDialog>
-#include <KLocale>
+#include <KLocalizedString>

 
 

+#include <QButtonGroup>

 #include <QCheckBox>
 #include <QCheckBox>

-#include <QGroupBox>
-#include <QHBoxLayout>
-#include <QLabel>
+#include <QFormLayout>

 #include <QRadioButton>
 #include <QRadioButton>

-#include <QVBoxLayout>
+#include <QSpacerItem>

 
 

-#include <views/viewproperties.h>
-
-const bool CONFIRM_TRASH = false;
-const bool CONFIRM_DELETE = true;
-
-BehaviorSettingsPage::BehaviorSettingsPage(const KUrl& url, QWidget* parent) :
+BehaviorSettingsPage::BehaviorSettingsPage(const QUrl& url, QWidget* parent) :

     SettingsPageBase(parent),
     m_url(url),
     SettingsPageBase(parent),
     m_url(url),

-    m_localProps(0),
-    m_globalProps(0),
-    m_confirmMoveToTrash(0),
-    m_confirmDelete(0),
-    m_showToolTips(0),
-    m_showSelectionToggle(0),
-    m_naturalSorting(0)
+    m_localViewProps(nullptr),
+    m_globalViewProps(nullptr),
+    m_showToolTips(nullptr),
+    m_showSelectionToggle(nullptr),
+    m_naturalSorting(nullptr),
+    m_caseSensitiveSorting(nullptr),
+    m_caseInsensitiveSorting(nullptr),
+    m_renameInline(nullptr),
+    m_useTabForSplitViewSwitch(nullptr)

 {
 {

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

 
 

-    // 'View Properties' box
-    QGroupBox* propsBox = new QGroupBox(i18nc("@title:group", "View Properties"), this);
-    propsBox->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Maximum);

 
 

-    m_localProps = new QRadioButton(i18nc("@option:radio", "Remember view properties for each folder"), propsBox);
+    // View properties
+    m_globalViewProps = new QRadioButton(i18nc("@option:radio", "Use common display style for all folders"));
+    m_localViewProps = new QRadioButton(i18nc("@option:radio", "Remember display style for each folder"));
+    m_localViewProps->setToolTip(i18nc("@info", "Dolphin will create a hidden .directory file in each folder you change view properties for."));

 
 

-    m_globalProps = new QRadioButton(i18nc("@option:radio", "Use common view properties for all folders"), propsBox);
+    QButtonGroup* viewGroup = new QButtonGroup(this);
+    viewGroup->addButton(m_globalViewProps);
+    viewGroup->addButton(m_localViewProps);
+    topLayout->addRow(i18nc("@title:group", "View: "), m_globalViewProps);
+    topLayout->addRow(QString(), m_localViewProps);

 
 

-    QVBoxLayout* propsBoxLayout = new QVBoxLayout(propsBox);
-    propsBoxLayout->addWidget(m_localProps);
-    propsBoxLayout->addWidget(m_globalProps);

 
 

-    // 'Ask Confirmation For' box
-    QGroupBox* confirmBox = new QGroupBox(i18nc("@title:group", "Ask For Confirmation When"), this);
-    confirmBox->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Maximum);
-    m_confirmMoveToTrash = new QCheckBox(i18nc("@option:check Ask for Confirmation When",
-                                               "Moving files or folders to trash"), confirmBox);
-    m_confirmDelete = new QCheckBox(i18nc("@option:check Ask for Confirmation When",
-                                          "Deleting files or folders"), confirmBox);
-    m_confirmClosingMultipleTabs = new QCheckBox(i18nc("@option:check Ask for Confirmation When",
-                                                       "Closing windows with multiple tabs"), confirmBox);
+    topLayout->addItem(new QSpacerItem(0, Dolphin::VERTICAL_SPACER_HEIGHT, QSizePolicy::Fixed, QSizePolicy::Fixed));

 
 

-    QVBoxLayout* confirmBoxLayout = new QVBoxLayout(confirmBox);
-    confirmBoxLayout->addWidget(m_confirmMoveToTrash);
-    confirmBoxLayout->addWidget(m_confirmDelete);
-    confirmBoxLayout->addWidget(m_confirmClosingMultipleTabs);

 
 

-    // 'Show tooltips'
-    m_showToolTips = new QCheckBox(i18nc("@option:check", "Show tooltips"), this);
+    // Sorting properties
+    m_naturalSorting = new QRadioButton(i18nc("option:radio", "Natural"));
+    m_caseInsensitiveSorting = new QRadioButton(i18nc("option:radio", "Alphabetical, case insensitive"));
+    m_caseSensitiveSorting = new QRadioButton(i18nc("option:radio", "Alphabetical, case sensitive"));

 
 

-    // 'Show selection marker'
-    m_showSelectionToggle = new QCheckBox(i18nc("@option:check", "Show selection marker"), this);
+    QButtonGroup* sortingModeGroup = new QButtonGroup(this);
+    sortingModeGroup->addButton(m_naturalSorting);
+    sortingModeGroup->addButton(m_caseInsensitiveSorting);
+    sortingModeGroup->addButton(m_caseSensitiveSorting);
+    topLayout->addRow(i18nc("@title:group", "Sorting mode: "), m_naturalSorting);
+    topLayout->addRow(QString(), m_caseInsensitiveSorting);
+    topLayout->addRow(QString(), m_caseSensitiveSorting);

 
 

-    // 'Natural sorting of items'
-    m_naturalSorting = new QCheckBox(i18nc("option:check", "Natural sorting of items"), this);

 
 

-    topLayout->addWidget(propsBox);
-    topLayout->addWidget(confirmBox);
-    topLayout->addWidget(m_showToolTips);
-    topLayout->addWidget(m_showSelectionToggle);
-    topLayout->addWidget(m_naturalSorting);
-    topLayout->addStretch();
+    topLayout->addItem(new QSpacerItem(0, Dolphin::VERTICAL_SPACER_HEIGHT, QSizePolicy::Fixed, QSizePolicy::Fixed));
+
+
+#ifdef HAVE_BALOO
+    // 'Show tooltips'
+    m_showToolTips = new QCheckBox(i18nc("@option:check", "Show tooltips"));
+    topLayout->addRow(i18nc("@title:group", "Miscellaneous: "), m_showToolTips);
+#endif
+
+    // 'Show selection marker'
+    m_showSelectionToggle = new QCheckBox(i18nc("@option:check", "Show selection marker"));
+#ifdef HAVE_BALOO
+    topLayout->addRow(QString(), m_showSelectionToggle);
+#else
+    topLayout->addRow(i18nc("@title:group", "Miscellaneous: "), m_showSelectionToggle);
+#endif
+
+    // 'Inline renaming of items'
+    m_renameInline = new QCheckBox(i18nc("option:check", "Rename inline"));
+    topLayout->addRow(QString(), m_renameInline);
+
+    // 'Switch between panes of split views with tab key'
+    m_useTabForSplitViewSwitch = new QCheckBox(i18nc("option:check", "Switch between split views panes with tab key"));
+    topLayout->addRow(QString(), m_useTabForSplitViewSwitch);
+
+    // 'Close active pane when turning off split view'
+    m_closeActiveSplitView = new QCheckBox(i18nc("option:check", "Turning off split view closes active pane"));
+    topLayout->addRow(QString(), m_closeActiveSplitView);
+    m_closeActiveSplitView->setToolTip(i18n("When deactivated, turning off split view will close the inactive pane"));

 
     loadSettings();
 
 
     loadSettings();
 

-    connect(m_localProps, SIGNAL(toggled(bool)), this, SIGNAL(changed()));
-    connect(m_globalProps, SIGNAL(toggled(bool)), this, SIGNAL(changed()));
-    connect(m_confirmMoveToTrash, SIGNAL(toggled(bool)), this, SIGNAL(changed()));
-    connect(m_confirmDelete, SIGNAL(toggled(bool)), this, SIGNAL(changed()));
-    connect(m_confirmClosingMultipleTabs, SIGNAL(toggled(bool)), this, SIGNAL(changed()));
-    connect(m_showToolTips, SIGNAL(toggled(bool)), this, SIGNAL(changed()));
-    connect(m_showSelectionToggle, SIGNAL(toggled(bool)), this, SIGNAL(changed()));
-    connect(m_naturalSorting, SIGNAL(toggled(bool)), this, SIGNAL(changed()));
+    connect(m_localViewProps, &QRadioButton::toggled, this, &BehaviorSettingsPage::changed);
+    connect(m_globalViewProps, &QRadioButton::toggled, this, &BehaviorSettingsPage::changed);
+#ifdef HAVE_BALOO
+    connect(m_showToolTips, &QCheckBox::toggled, this, &BehaviorSettingsPage::changed);
+#endif
+    connect(m_showSelectionToggle, &QCheckBox::toggled, this, &BehaviorSettingsPage::changed);
+    connect(m_naturalSorting, &QRadioButton::toggled, this, &BehaviorSettingsPage::changed);
+    connect(m_caseInsensitiveSorting, &QRadioButton::toggled, this, &BehaviorSettingsPage::changed);
+    connect(m_caseSensitiveSorting, &QRadioButton::toggled, this, &BehaviorSettingsPage::changed);
+    connect(m_renameInline, &QCheckBox::toggled, this, &BehaviorSettingsPage::changed);
+    connect(m_useTabForSplitViewSwitch, &QCheckBox::toggled, this, &BehaviorSettingsPage::changed);
+    connect(m_closeActiveSplitView, &QCheckBox::toggled, this, &BehaviorSettingsPage::changed);

 }
 
 BehaviorSettingsPage::~BehaviorSettingsPage()
 }
 
 BehaviorSettingsPage::~BehaviorSettingsPage()


@@ -111,14 +114,22 @@ BehaviorSettingsPage::~BehaviorSettingsPage()
 
 void BehaviorSettingsPage::applySettings()
 {
 
 void BehaviorSettingsPage::applySettings()
 {

+    GeneralSettings* settings = GeneralSettings::self();

     ViewProperties props(m_url);  // read current view properties
 
     ViewProperties props(m_url);  // read current view properties
 

-    const bool useGlobalProps = m_globalProps->isChecked();
-
-    GeneralSettings* settings = GeneralSettings::self();
-    settings->setGlobalViewProps(useGlobalProps);
+    const bool useGlobalViewProps = m_globalViewProps->isChecked();
+    settings->setGlobalViewProps(useGlobalViewProps);
+#ifdef HAVE_BALOO
+    settings->setShowToolTips(m_showToolTips->isChecked());
+#endif
+    settings->setShowSelectionToggle(m_showSelectionToggle->isChecked());
+    setSortingChoiceValue(settings);
+    settings->setRenameInline(m_renameInline->isChecked());
+    settings->setUseTabForSwitchingSplitView(m_useTabForSplitViewSwitch->isChecked());
+    settings->setCloseActiveSplitView(m_closeActiveSplitView->isChecked());
+    settings->save();

 
 

-    if (useGlobalProps) {
+    if (useGlobalViewProps) {

         // Remember the global view properties by applying the current view properties.
         // It is important that GeneralSettings::globalViewProps() is set before
         // the class ViewProperties is used, as ViewProperties uses this setting
         // Remember the global view properties by applying the current view properties.
         // It is important that GeneralSettings::globalViewProps() is set before
         // the class ViewProperties is used, as ViewProperties uses this setting


@@ -126,24 +137,6 @@ void BehaviorSettingsPage::applySettings()
         ViewProperties globalProps(m_url);
         globalProps.setDirProperties(props);
     }
         ViewProperties globalProps(m_url);
         globalProps.setDirProperties(props);
     }

-
-    KSharedConfig::Ptr kioConfig = KSharedConfig::openConfig("kiorc", KConfig::NoGlobals);
-    KConfigGroup confirmationGroup(kioConfig, "Confirmations");
-    confirmationGroup.writeEntry("ConfirmTrash", m_confirmMoveToTrash->isChecked());
-    confirmationGroup.writeEntry("ConfirmDelete", m_confirmDelete->isChecked());
-    confirmationGroup.sync();
-
-    settings->setConfirmClosingMultipleTabs(m_confirmClosingMultipleTabs->isChecked());
-    settings->setShowToolTips(m_showToolTips->isChecked());
-    settings->setShowSelectionToggle(m_showSelectionToggle->isChecked());
-    settings->writeConfig();
-
-    const bool naturalSorting = m_naturalSorting->isChecked();
-    if (KGlobalSettings::naturalSorting() != naturalSorting) {
-        KConfigGroup group(KGlobal::config(), "KDE");
-        group.writeEntry("NaturalSorting", naturalSorting, KConfig::Persistent | KConfig::Global);
-        KGlobalSettings::emitChange(KGlobalSettings::NaturalSortingChanged);
-    }

 }
 
 void BehaviorSettingsPage::restoreDefaults()
 }
 
 void BehaviorSettingsPage::restoreDefaults()


@@ -152,27 +145,51 @@ void BehaviorSettingsPage::restoreDefaults()
     settings->useDefaults(true);
     loadSettings();
     settings->useDefaults(false);
     settings->useDefaults(true);
     loadSettings();
     settings->useDefaults(false);

-    m_confirmMoveToTrash->setChecked(CONFIRM_TRASH);
-    m_confirmDelete->setChecked(CONFIRM_DELETE);

 }
 
 void BehaviorSettingsPage::loadSettings()
 {
 }
 
 void BehaviorSettingsPage::loadSettings()
 {

-    if (GeneralSettings::globalViewProps()) {
-        m_globalProps->setChecked(true);
-    } else {
-        m_localProps->setChecked(true);
-    }
+    const bool useGlobalViewProps = GeneralSettings::globalViewProps();
+    m_localViewProps->setChecked(!useGlobalViewProps);
+    m_globalViewProps->setChecked(useGlobalViewProps);

 
 

-    KSharedConfig::Ptr kioConfig = KSharedConfig::openConfig("kiorc", KConfig::IncludeGlobals);
-    const KConfigGroup confirmationGroup(kioConfig, "Confirmations");
-    m_confirmMoveToTrash->setChecked(confirmationGroup.readEntry("ConfirmTrash", CONFIRM_TRASH));
-    m_confirmDelete->setChecked(confirmationGroup.readEntry("ConfirmDelete", CONFIRM_DELETE));
-
-    m_confirmClosingMultipleTabs->setChecked(GeneralSettings::confirmClosingMultipleTabs());
+#ifdef HAVE_BALOO

     m_showToolTips->setChecked(GeneralSettings::showToolTips());
     m_showToolTips->setChecked(GeneralSettings::showToolTips());

+#endif

     m_showSelectionToggle->setChecked(GeneralSettings::showSelectionToggle());
     m_showSelectionToggle->setChecked(GeneralSettings::showSelectionToggle());

-    m_naturalSorting->setChecked(KGlobalSettings::naturalSorting());
+    m_renameInline->setChecked(GeneralSettings::renameInline());
+    m_useTabForSplitViewSwitch->setChecked(GeneralSettings::useTabForSwitchingSplitView());
+    m_closeActiveSplitView->setChecked(GeneralSettings::closeActiveSplitView());
+
+    loadSortingChoiceSettings();

 }
 
 }
 

-#include "behaviorsettingspage.moc"
+void BehaviorSettingsPage::setSortingChoiceValue(GeneralSettings *settings)
+{
+    using Choice = GeneralSettings::EnumSortingChoice;
+    if (m_naturalSorting->isChecked()) {
+        settings->setSortingChoice(Choice::NaturalSorting);
+    } else if (m_caseInsensitiveSorting->isChecked()) {
+        settings->setSortingChoice(Choice::CaseInsensitiveSorting);
+    } else if (m_caseSensitiveSorting->isChecked()) {
+        settings->setSortingChoice(Choice::CaseSensitiveSorting);
+    }
+}
+
+void BehaviorSettingsPage::loadSortingChoiceSettings()
+{
+    using Choice = GeneralSettings::EnumSortingChoice;
+    switch (GeneralSettings::sortingChoice()) {
+    case Choice::NaturalSorting:
+        m_naturalSorting->setChecked(true);
+        break;
+    case Choice::CaseInsensitiveSorting:
+        m_caseInsensitiveSorting->setChecked(true);
+        break;
+    case Choice::CaseSensitiveSorting:
+        m_caseSensitiveSorting->setChecked(true);
+        break;
+    default:
+        Q_UNREACHABLE();
+    }
+}