Don't overload the word "Properties" to mean multiple things

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

diff --git a/src/settings/general/behaviorsettingspage.cpp b/src/settings/general/behaviorsettingspage.cpp
index add9acad58e6a41e2b17e11a85680a0ee39dcce1..30883c5dade1bb3c52fbf03f52ef8b5afc8af9ac 100644 (file)
--- a/src/settings/general/behaviorsettingspage.cpp
+++ b/src/settings/general/behaviorsettingspage.cpp
@@ -48,14 +48,15 @@ BehaviorSettingsPage::BehaviorSettingsPage(const QUrl& url, QWidget* parent) :
 
 
     // View properties
-    m_localViewProps = new QRadioButton(i18nc("@option:radio", "Remember properties for each folder"));
-    m_globalViewProps = new QRadioButton(i18nc("@option:radio", "Use common properties for all folders"));
+    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."));
 
     QButtonGroup* viewGroup = new QButtonGroup(this);
-    viewGroup->addButton(m_localViewProps);
     viewGroup->addButton(m_globalViewProps);
-    topLayout->addRow(i18nc("@title:group", "View: "), m_localViewProps);
-    topLayout->addRow(QString(), m_globalViewProps);
+    viewGroup->addButton(m_localViewProps);
+    topLayout->addRow(i18nc("@title:group", "View: "), m_globalViewProps);
+    topLayout->addRow(QString(), m_localViewProps);
 
 
     topLayout->addItem(new QSpacerItem(0, Dolphin::VERTICAL_SPACER_HEIGHT, QSizePolicy::Fixed, QSizePolicy::Fixed));
@@ -96,10 +97,15 @@ BehaviorSettingsPage::BehaviorSettingsPage(const QUrl& url, QWidget* parent) :
     m_renameInline = new QCheckBox(i18nc("option:check", "Rename inline"));
     topLayout->addRow(QString(), m_renameInline);
 
-    // 'Switch between split views with tab key'
-    m_useTabForSplitViewSwitch = new QCheckBox(i18nc("option:check", "Switch between split views with tab key"));
+    // '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();
 
     connect(m_localViewProps, &QRadioButton::toggled, this, &BehaviorSettingsPage::changed);
@@ -113,6 +119,7 @@ BehaviorSettingsPage::BehaviorSettingsPage(const QUrl& url, QWidget* parent) :
     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()
@@ -133,6 +140,7 @@ void BehaviorSettingsPage::applySettings()
     setSortingChoiceValue(settings);
     settings->setRenameInline(m_renameInline->isChecked());
     settings->setUseTabForSwitchingSplitView(m_useTabForSplitViewSwitch->isChecked());
+    settings->setCloseActiveSplitView(m_closeActiveSplitView->isChecked());
     settings->save();
 
     if (useGlobalViewProps) {
@@ -165,6 +173,7 @@ void BehaviorSettingsPage::loadSettings()
     m_showSelectionToggle->setChecked(GeneralSettings::showSelectionToggle());
     m_renameInline->setChecked(GeneralSettings::renameInline());
     m_useTabForSplitViewSwitch->setChecked(GeneralSettings::useTabForSwitchingSplitView());
+    m_closeActiveSplitView->setChecked(GeneralSettings::closeActiveSplitView());
 
     loadSortingChoiceSettings();
 }