X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/3957884bf2e44619a4ed35ba0ffead519988885b..848abc5922167a467bb73107ee6b72e9af3c8317:/src/settings/general/behaviorsettingspage.cpp diff --git a/src/settings/general/behaviorsettingspage.cpp b/src/settings/general/behaviorsettingspage.cpp index 8a5b070ce..fb3f77eba 100644 --- a/src/settings/general/behaviorsettingspage.cpp +++ b/src/settings/general/behaviorsettingspage.cpp @@ -20,67 +20,53 @@ #include "behaviorsettingspage.h" -#include "dolphin_generalsettings.h" -#include - -#include -#include +#include #include #include -#include -#include #include #include #include -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), - m_localProps(0), - m_globalProps(0), - m_confirmMoveToTrash(0), - m_confirmDelete(0), - m_renameInline(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' box - QGroupBox* propsBox = new QGroupBox(i18nc("@title:group", "View Properties"), this); - propsBox->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Maximum); + // View properties + QGroupBox* viewPropsBox = new QGroupBox(i18nc("@title:group", "View"), this); + viewPropsBox->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Maximum); - m_localProps = new QRadioButton(i18nc("@option:radio", "Remember view properties for each folder"), propsBox); + 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); - m_globalProps = new QRadioButton(i18nc("@option:radio", "Use common view properties for all folders"), propsBox); + QVBoxLayout* viewPropsLayout = new QVBoxLayout(viewPropsBox); + viewPropsLayout->addWidget(m_localViewProps); + viewPropsLayout->addWidget(m_globalViewProps); - QVBoxLayout* propsBoxLayout = new QVBoxLayout(propsBox); - propsBoxLayout->addWidget(m_localProps); - propsBoxLayout->addWidget(m_globalProps); + // Sorting properties + QGroupBox* sortingPropsBox = new QGroupBox(i18nc("@title:group", "Sorting Mode"), this); + sortingPropsBox->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Maximum); - // '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); + 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); - QVBoxLayout* confirmBoxLayout = new QVBoxLayout(confirmBox); - confirmBoxLayout->addWidget(m_confirmMoveToTrash); - confirmBoxLayout->addWidget(m_confirmDelete); - confirmBoxLayout->addWidget(m_confirmClosingMultipleTabs); - - // 'Rename inline' - m_renameInline = new QCheckBox(i18nc("@option:check", "Rename inline"), this); + 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); @@ -88,28 +74,31 @@ BehaviorSettingsPage::BehaviorSettingsPage(const KUrl& url, QWidget* parent) : // '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->addWidget(propsBox); - topLayout->addWidget(confirmBox); - topLayout->addWidget(m_renameInline); + // '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_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_renameInline, 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); + 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() @@ -118,14 +107,19 @@ BehaviorSettingsPage::~BehaviorSettingsPage() void BehaviorSettingsPage::applySettings() { + GeneralSettings* settings = GeneralSettings::self(); 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); + settings->setShowToolTips(m_showToolTips->isChecked()); + settings->setShowSelectionToggle(m_showSelectionToggle->isChecked()); + 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 @@ -133,56 +127,56 @@ void BehaviorSettingsPage::applySettings() 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->setRenameInline(m_renameInline->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() { - GeneralSettings* settings = DolphinSettings::instance().generalSettings(); + GeneralSettings* settings = GeneralSettings::self(); settings->useDefaults(true); loadSettings(); settings->useDefaults(false); - m_confirmMoveToTrash->setChecked(CONFIRM_TRASH); - m_confirmDelete->setChecked(CONFIRM_DELETE); } void BehaviorSettingsPage::loadSettings() { - GeneralSettings* settings = DolphinSettings::instance().generalSettings(); - if (settings->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_showToolTips->setChecked(GeneralSettings::showToolTips()); + m_showSelectionToggle->setChecked(GeneralSettings::showSelectionToggle()); + m_renameInline->setChecked(GeneralSettings::renameInline()); + m_useTabForSplitViewSwitch->setChecked(GeneralSettings::useTabForSwitchingSplitView()); - m_confirmClosingMultipleTabs->setChecked(settings->confirmClosingMultipleTabs()); - m_renameInline->setChecked(settings->renameInline()); - m_showToolTips->setChecked(settings->showToolTips()); - m_showSelectionToggle->setChecked(settings->showSelectionToggle()); - m_naturalSorting->setChecked(KGlobalSettings::naturalSorting()); + 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(); + } +}