#include "behaviorsettingspage.h"
-#include "dolphin_generalsettings.h"
-
-#include <KComboBox>
-#include <KDialog>
-#include <KLocale>
+#include <KLocalizedString>
#include <QCheckBox>
#include <QGroupBox>
-#include <QHBoxLayout>
-#include <QLabel>
#include <QRadioButton>
#include <QVBoxLayout>
#include <views/viewproperties.h>
-BehaviorSettingsPage::BehaviorSettingsPage(const KUrl& url, QWidget* parent) :
+BehaviorSettingsPage::BehaviorSettingsPage(const QUrl& url, QWidget* parent) :
SettingsPageBase(parent),
m_url(url),
- m_viewProps(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);
// View properties
- QLabel* viewPropsLabel = new QLabel(i18nc("@label", "View properties:"), this);
+ QGroupBox* viewPropsBox = new QGroupBox(i18nc("@title:group", "View"), this);
+ viewPropsBox->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Maximum);
+
+ m_localViewProps = new QRadioButton(i18nc("@option:radio", "Remember properties for each folder"), viewPropsBox);
+ m_globalViewProps = new QRadioButton(i18nc("@option:radio", "Use common properties for all folders"), viewPropsBox);
+
+ QVBoxLayout* viewPropsLayout = new QVBoxLayout(viewPropsBox);
+ viewPropsLayout->addWidget(m_localViewProps);
+ viewPropsLayout->addWidget(m_globalViewProps);
+
+ // Sorting properties
+ QGroupBox* sortingPropsBox = new QGroupBox(i18nc("@title:group", "Sorting Mode"), this);
+ sortingPropsBox->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Maximum);
- m_viewProps = new KComboBox(this);
- const bool useGlobalProps = true;
- m_viewProps->addItem(i18nc("@option:radio", "Remember view properties for each folder"), !useGlobalProps);
- m_viewProps->addItem(i18nc("@option:radio", "Use common view properties for all folders"), useGlobalProps);
+ m_naturalSorting = new QRadioButton(i18nc("option:radio", "Natural sorting"), sortingPropsBox);
+ m_caseInsensitiveSorting = new QRadioButton(i18nc("option:radio", "Alphabetical sorting, case insensitive"), sortingPropsBox);
+ m_caseSensitiveSorting = new QRadioButton(i18nc("option:radio", "Alphabetical sorting, case sensitive"), sortingPropsBox);
- QHBoxLayout* viewPropsLayout = new QHBoxLayout(this);
- viewPropsLayout->addWidget(viewPropsLabel, 0, Qt::AlignRight);
- viewPropsLayout->addWidget(m_viewProps);
+ QVBoxLayout* sortingPropsLayout = new QVBoxLayout(sortingPropsBox);
+ sortingPropsLayout->addWidget(m_naturalSorting);
+ sortingPropsLayout->addWidget(m_caseInsensitiveSorting);
+ sortingPropsLayout->addWidget(m_caseSensitiveSorting);
// 'Show tooltips'
m_showToolTips = new QCheckBox(i18nc("@option:check", "Show tooltips"), this);
// 'Show selection marker'
m_showSelectionToggle = new QCheckBox(i18nc("@option:check", "Show selection marker"), this);
- // 'Natural sorting of items'
- m_naturalSorting = new QCheckBox(i18nc("option:check", "Natural sorting of items"), this);
+ // 'Inline renaming of items'
+ m_renameInline = new QCheckBox(i18nc("option:check", "Rename inline"), this);
- topLayout->addSpacing(KDialog::spacingHint());
- topLayout->addLayout(viewPropsLayout);
- topLayout->addSpacing(KDialog::spacingHint());
+ // 'Use tab for switching between right and left split'
+ m_useTabForSplitViewSwitch = new QCheckBox(i18nc("option:check", "Use tab for switching between right and left split view"), this);
+
+ topLayout->addWidget(viewPropsBox);
+ topLayout->addWidget(sortingPropsBox);
topLayout->addWidget(m_showToolTips);
topLayout->addWidget(m_showSelectionToggle);
- topLayout->addWidget(m_naturalSorting);
+ topLayout->addWidget(m_renameInline);
+ topLayout->addWidget(m_useTabForSplitViewSwitch);
topLayout->addStretch();
loadSettings();
- connect(m_viewProps, SIGNAL(currentIndexChanged(int)), 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);
+ connect(m_showToolTips, &QCheckBox::toggled, this, &BehaviorSettingsPage::changed);
+ 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);
}
BehaviorSettingsPage::~BehaviorSettingsPage()
GeneralSettings* settings = GeneralSettings::self();
ViewProperties props(m_url); // read current view properties
- const int index = m_viewProps->currentIndex();
- const bool useGlobalProps = m_viewProps->itemData(index).toBool();
- settings->setGlobalViewProps(useGlobalProps);
-
+ const bool useGlobalViewProps = m_globalViewProps->isChecked();
+ settings->setGlobalViewProps(useGlobalViewProps);
settings->setShowToolTips(m_showToolTips->isChecked());
settings->setShowSelectionToggle(m_showSelectionToggle->isChecked());
- settings->writeConfig();
+ setSortingChoiceValue(settings);
+ settings->setRenameInline(m_renameInline->isChecked());
+ settings->setUseTabForSwitchingSplitView(m_useTabForSplitViewSwitch->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
ViewProperties globalProps(m_url);
globalProps.setDirProperties(props);
}
-
- 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::loadSettings()
{
- const int index = (m_viewProps->itemData(0).toBool() == GeneralSettings::globalViewProps()) ? 0 : 1;
- m_viewProps->setCurrentIndex(index);
+ const bool useGlobalViewProps = GeneralSettings::globalViewProps();
+ m_localViewProps->setChecked(!useGlobalViewProps);
+ m_globalViewProps->setChecked(useGlobalViewProps);
m_showToolTips->setChecked(GeneralSettings::showToolTips());
m_showSelectionToggle->setChecked(GeneralSettings::showSelectionToggle());
- m_naturalSorting->setChecked(KGlobalSettings::naturalSorting());
+ m_renameInline->setChecked(GeneralSettings::renameInline());
+ m_useTabForSplitViewSwitch->setChecked(GeneralSettings::useTabForSwitchingSplitView());
+
+ loadSortingChoiceSettings();
+}
+
+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);
+ }
}
-#include "behaviorsettingspage.moc"
+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();
+ }
+}
projects / dolphin.git / blobdiff