Change default Dolphin toolbar layout

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

diff --git a/src/settings/general/behaviorsettingspage.cpp b/src/settings/general/behaviorsettingspage.cpp
index 6d1e8bb104c110445e06f1fb3e835f9f85cf93a2..df7ea21135f62b55e6d224ab3d0ad9bd5f610d36 100644 (file)
--- a/src/settings/general/behaviorsettingspage.cpp
+++ b/src/settings/general/behaviorsettingspage.cpp
@@ -20,87 +20,106 @@
 
 #include "behaviorsettingspage.h"
 
 
 #include "behaviorsettingspage.h"
 

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

 
 #include <KLocalizedString>
 
 
 #include <KLocalizedString>
 

+#include <QButtonGroup>

 #include <QCheckBox>
 #include <QCheckBox>

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

 #include <QRadioButton>
 #include <QRadioButton>

-#include <QVBoxLayout>
-
-#include <views/viewproperties.h>
+#include <QSpacerItem>

 
 BehaviorSettingsPage::BehaviorSettingsPage(const QUrl& url, QWidget* parent) :
     SettingsPageBase(parent),
     m_url(url),
 
 BehaviorSettingsPage::BehaviorSettingsPage(const QUrl& url, QWidget* parent) :
     SettingsPageBase(parent),
     m_url(url),

-    m_localViewProps(0),
-    m_globalViewProps(0),
-    m_showToolTips(0),
-    m_showSelectionToggle(0),
-    m_naturalSorting(0),
-    m_caseSensitiveSorting(0),
-    m_caseInsensitiveSorting(0),
-    m_renameInline(0),
-    m_useTabForSplitViewSwitch(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
 
     // View properties

-    QGroupBox* viewPropsBox = new QGroupBox(i18nc("@title:group", "View"), this);
-    viewPropsBox->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Maximum);
+    m_globalViewProps = new QRadioButton(i18nc("@option:radio", "Use common properties for all folders"));
+    m_localViewProps = new QRadioButton(i18nc("@option:radio", "Remember properties 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_globalViewProps);
+    viewGroup->addButton(m_localViewProps);
+    topLayout->addRow(i18nc("@title:group", "View: "), m_globalViewProps);
+    topLayout->addRow(QString(), m_localViewProps);

 
 

-    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);
+    topLayout->addItem(new QSpacerItem(0, Dolphin::VERTICAL_SPACER_HEIGHT, QSizePolicy::Fixed, QSizePolicy::Fixed));
+

 
     // Sorting properties
 
     // 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"));
+    m_caseInsensitiveSorting = new QRadioButton(i18nc("option:radio", "Alphabetical, case insensitive"));
+    m_caseSensitiveSorting = new QRadioButton(i18nc("option:radio", "Alphabetical, case sensitive"));
+
+    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);
+

 
 

-    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);
+    topLayout->addItem(new QSpacerItem(0, Dolphin::VERTICAL_SPACER_HEIGHT, QSizePolicy::Fixed, QSizePolicy::Fixed));

 
 

-    QVBoxLayout* sortingPropsLayout = new QVBoxLayout(sortingPropsBox);
-    sortingPropsLayout->addWidget(m_naturalSorting);
-    sortingPropsLayout->addWidget(m_caseInsensitiveSorting);
-    sortingPropsLayout->addWidget(m_caseSensitiveSorting);

 
 

+#ifdef HAVE_BALOO

     // 'Show tooltips'
     // 'Show tooltips'

-    m_showToolTips = new QCheckBox(i18nc("@option:check", "Show tooltips"), this);
+    m_showToolTips = new QCheckBox(i18nc("@option:check", "Show tooltips"));
+    topLayout->addRow(i18nc("@title:group", "Miscellaneous: "), m_showToolTips);
+#endif

 
     // 'Show selection marker'
 
     // 'Show selection marker'

-    m_showSelectionToggle = new QCheckBox(i18nc("@option:check", "Show selection marker"), this);
+    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'
 
     // 'Inline renaming of items'

-    m_renameInline = new QCheckBox(i18nc("option:check", "Rename inline"), this);
+    m_renameInline = new QCheckBox(i18nc("option:check", "Rename inline"));
+    topLayout->addRow(QString(), 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);
+    // '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);

 
 

-    topLayout->addWidget(viewPropsBox);
-    topLayout->addWidget(sortingPropsBox);
-    topLayout->addWidget(m_showToolTips);
-    topLayout->addWidget(m_showSelectionToggle);
-    topLayout->addWidget(m_renameInline);
-    topLayout->addWidget(m_useTabForSplitViewSwitch);
-    topLayout->addStretch();
+    // '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);
     connect(m_globalViewProps, &QRadioButton::toggled, this, &BehaviorSettingsPage::changed);
 
     loadSettings();
 
     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);
     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_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()


@@ -114,11 +133,14 @@ void BehaviorSettingsPage::applySettings()
 
     const bool useGlobalViewProps = m_globalViewProps->isChecked();
     settings->setGlobalViewProps(useGlobalViewProps);
 
     const bool useGlobalViewProps = m_globalViewProps->isChecked();
     settings->setGlobalViewProps(useGlobalViewProps);

+#ifdef HAVE_BALOO

     settings->setShowToolTips(m_showToolTips->isChecked());
     settings->setShowToolTips(m_showToolTips->isChecked());

+#endif

     settings->setShowSelectionToggle(m_showSelectionToggle->isChecked());
     setSortingChoiceValue(settings);
     settings->setRenameInline(m_renameInline->isChecked());
     settings->setUseTabForSwitchingSplitView(m_useTabForSplitViewSwitch->isChecked());
     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 (useGlobalViewProps) {
     settings->save();
 
     if (useGlobalViewProps) {


@@ -145,10 +167,13 @@ void BehaviorSettingsPage::loadSettings()
     m_localViewProps->setChecked(!useGlobalViewProps);
     m_globalViewProps->setChecked(useGlobalViewProps);
 
     m_localViewProps->setChecked(!useGlobalViewProps);
     m_globalViewProps->setChecked(useGlobalViewProps);
 

+#ifdef HAVE_BALOO

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

+#endif

     m_showSelectionToggle->setChecked(GeneralSettings::showSelectionToggle());
     m_renameInline->setChecked(GeneralSettings::renameInline());
     m_useTabForSplitViewSwitch->setChecked(GeneralSettings::useTabForSwitchingSplitView());
     m_showSelectionToggle->setChecked(GeneralSettings::showSelectionToggle());
     m_renameInline->setChecked(GeneralSettings::renameInline());
     m_useTabForSplitViewSwitch->setChecked(GeneralSettings::useTabForSwitchingSplitView());

+    m_closeActiveSplitView->setChecked(GeneralSettings::closeActiveSplitView());

 
     loadSortingChoiceSettings();
 }
 
     loadSortingChoiceSettings();
 }