X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/e0ac8b61fb907ac19f9bebf01cb5be17d4c88ba8..d48b733:/src/settings/general/behaviorsettingspage.cpp diff --git a/src/settings/general/behaviorsettingspage.cpp b/src/settings/general/behaviorsettingspage.cpp index 57ff60146..86a4ad3bb 100644 --- a/src/settings/general/behaviorsettingspage.cpp +++ b/src/settings/general/behaviorsettingspage.cpp @@ -22,40 +22,52 @@ #include "dolphin_generalsettings.h" -#include -#include -#include +#include #include #include -#include -#include #include #include #include -BehaviorSettingsPage::BehaviorSettingsPage(const KUrl& url, QWidget* parent) : +BehaviorSettingsPage::BehaviorSettingsPage(const QUrl& url, QWidget* parent) : SettingsPageBase(parent), m_url(url), - m_viewProps(0), + m_localViewProps(0), + m_globalViewProps(0), m_showToolTips(0), m_showSelectionToggle(0), - m_naturalSorting(0) + m_naturalSorting(0), + m_caseSensitiveSorting(0), + m_caseInsensitiveSorting(0), + m_renameInline(0) { 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_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_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); - QHBoxLayout* viewPropsLayout = new QHBoxLayout(this); - viewPropsLayout->addWidget(viewPropsLabel, 0, Qt::AlignRight); - viewPropsLayout->addWidget(m_viewProps); + 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_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* 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); @@ -63,23 +75,26 @@ 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->addSpacing(KDialog::spacingHint()); - topLayout->addLayout(viewPropsLayout); - topLayout->addSpacing(KDialog::spacingHint()); + topLayout->addWidget(viewPropsBox); + topLayout->addWidget(sortingPropsBox); topLayout->addWidget(m_showToolTips); topLayout->addWidget(m_showSelectionToggle); - topLayout->addWidget(m_naturalSorting); + topLayout->addWidget(m_renameInline); 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); } BehaviorSettingsPage::~BehaviorSettingsPage() @@ -91,15 +106,15 @@ void BehaviorSettingsPage::applySettings() 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->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 @@ -107,13 +122,6 @@ void BehaviorSettingsPage::applySettings() 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() @@ -126,12 +134,43 @@ 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()); + + 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(); + } +}