Differential D12571 Diff 37112 src/settings/general/behaviorsettingspage.cpp

Changeset View

Standalone View

View Options

src/settings/general/behaviorsettingspage.cpp

Show All 15 Lines
16 * along with this program; if not, write to the * 16​ * along with this program; if not, write to the *
17 * Free Software Foundation, Inc., * 17​ * Free Software Foundation, Inc., *
18 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * 18​ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA *
19 ***************************************************************************/ 19​ ***************************************************************************/
20 20​
21#include "behaviorsettingspage.h" 21​#include "behaviorsettingspage.h"
22 22​
23#include "views/viewproperties.h" 23​#include "views/viewproperties.h"
24​#include "global.h"
elvisangelaccioUnsubmitted
Done

Please put it before viewproperties.h (again, to preserver sorting of includes)

elvisangelaccio: Please put it before viewproperties.h (again, to preserver sorting of includes)
24 25​
25#include <KLocalizedString> 26​#include <KLocalizedString>
26 27​
28​#include <QButtonGroup>
27#include <QCheckBox> 29​#include <QCheckBox>
28#include <QGroupBox> 30​#include <QFormLayout>
29#include <QRadioButton> 31​#include <QRadioButton>
30#include <QVBoxLayout> 32​#include <QSpacerItem>
elvisangelaccioUnsubmitted
Done

Please keep the sorting of includes

elvisangelaccio: Please keep the sorting of includes
31 33​
32BehaviorSettingsPage::BehaviorSettingsPage(const QUrl& url, QWidget* parent) : 34​BehaviorSettingsPage::BehaviorSettingsPage(const QUrl& url, QWidget* parent) :
33 SettingsPageBase(parent), 35​ SettingsPageBase(parent),
34 m_url(url), 36​ m_url(url),
35 m_localViewProps(nullptr), 37​ m_localViewProps(nullptr),
36 m_globalViewProps(nullptr), 38​ m_globalViewProps(nullptr),
37 m_showToolTips(nullptr), 39​ m_showToolTips(nullptr),
38 m_showSelectionToggle(nullptr), 40​ m_showSelectionToggle(nullptr),
39 m_naturalSorting(nullptr), 41​ m_naturalSorting(nullptr),
40 m_caseSensitiveSorting(nullptr), 42​ m_caseSensitiveSorting(nullptr),
41 m_caseInsensitiveSorting(nullptr), 43​ m_caseInsensitiveSorting(nullptr),
42 m_renameInline(nullptr), 44​ m_renameInline(nullptr),
43 m_useTabForSplitViewSwitch(nullptr) 45​ m_useTabForSplitViewSwitch(nullptr)
44{ 46​{
45 QVBoxLayout* topLayout = new QVBoxLayout(this); 47​ QFormLayout* topLayout = new QFormLayout(this);
48​
46 49​
47 // View properties 50​ // View properties
48 QGroupBox* viewPropsBox = new QGroupBox(i18nc("@title:group", "View"), this); 51​ m_localViewProps = new QRadioButton(i18nc("@option:radio", "Remember properties for each folder"));
49 viewPropsBox->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Maximum); 52​ m_globalViewProps = new QRadioButton(i18nc("@option:radio", "Use common properties for all folders"));
53​
54​ QButtonGroup* viewGroup = new QButtonGroup(this);
55​ viewGroup->addButton(m_localViewProps);
56​ viewGroup->addButton(m_globalViewProps);
57​ topLayout->addRow(i18nc("@title:group", "View: "), m_localViewProps);
58​ topLayout->addRow(QString(), m_globalViewProps);
59​
50 60​
51 m_localViewProps = new QRadioButton(i18nc("@option:radio", "Remember properties for each folder"), viewPropsBox); 61​ topLayout->addItem(new QSpacerItem(0, Dolphin::VERTICAL_SPACER_HEIGHT, QSizePolicy::Fixed, QSizePolicy::Fixed));
52 m_globalViewProps = new QRadioButton(i18nc("@option:radio", "Use common properties for all folders"), viewPropsBox); ​
53 62​
54 QVBoxLayout* viewPropsLayout = new QVBoxLayout(viewPropsBox); ​
55 viewPropsLayout->addWidget(m_localViewProps); ​
56 viewPropsLayout->addWidget(m_globalViewProps); ​
57 63​
58 // Sorting properties 64​ // Sorting properties
59 QGroupBox* sortingPropsBox = new QGroupBox(i18nc("@title:group", "Sorting Mode"), this); 65​ m_naturalSorting = new QRadioButton(i18nc("option:radio", "Natural"));
60 sortingPropsBox->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Maximum); 66​ m_caseInsensitiveSorting = new QRadioButton(i18nc("option:radio", "Alphabetical, case insensitive"));
67​ m_caseSensitiveSorting = new QRadioButton(i18nc("option:radio", "Alphabetical, case sensitive"));
68​
69​ QButtonGroup* sortingModeGroup = new QButtonGroup(this);
70​ sortingModeGroup->addButton(m_naturalSorting);
71​ sortingModeGroup->addButton(m_caseInsensitiveSorting);
72​ sortingModeGroup->addButton(m_caseSensitiveSorting);
73​ topLayout->addRow(i18nc("@title:group", "Sorting mode: "), m_naturalSorting);
74​ topLayout->addRow(QString(), m_caseInsensitiveSorting);
75​ topLayout->addRow(QString(), m_caseSensitiveSorting);
76​
77​
78​ topLayout->addItem(new QSpacerItem(0, Dolphin::VERTICAL_SPACER_HEIGHT, QSizePolicy::Fixed, QSizePolicy::Fixed));
elvisangelaccioUnsubmitted
Done

Please add a global variable instead of hardcoding 18 in different places.

/OT
Does this 18 come from some HIG? If yes, it would be a good idea to put it in some global config that can be shared across all KDE apps.
So that if one day we realize 18 is not good anymore and we want to use 19, we will have just one thing to update.

elvisangelaccio: Please add a global variable instead of hardcoding 18 in different places. /OT Does this 18…
fabianrUnsubmitted
Not Done

Yes, 18 comes from the HIG. That's the "default px representation" for plasmas and kirigamis gridUnit.

fabianr: Yes, 18 comes from the HIG. That's the "default px representation" for plasmas and kirigamis…
ngrahamAuthorUnsubmitted
Not Done

@elvisangelaccio

I've added this to a Dolphin-wide global for now, but it seems like it might make more sense to put it in an even more global location. Maybe in KXMLGui? Or somewhere else? I can submit a patch for it if you think that makes sense.

ngraham: @elvisangelaccio I've added this to a Dolphin-wide global for now, but it seems like it might…
61 79​
62 m_naturalSorting = new QRadioButton(i18nc("option:radio", "Natural sorting"), sortingPropsBox); ​
63 m_caseInsensitiveSorting = new QRadioButton(i18nc("option:radio", "Alphabetical sorting, case insensitive"), sortingPropsBox); ​
64 m_caseSensitiveSorting = new QRadioButton(i18nc("option:radio", "Alphabetical sorting, case sensitive"), sortingPropsBox); ​
65 ​
66 QVBoxLayout* sortingPropsLayout = new QVBoxLayout(sortingPropsBox); ​
67 sortingPropsLayout->addWidget(m_naturalSorting); ​
68 sortingPropsLayout->addWidget(m_caseInsensitiveSorting); ​
69 sortingPropsLayout->addWidget(m_caseSensitiveSorting); ​
70 80​
71 // 'Show tooltips' 81​ // 'Show tooltips'
72 m_showToolTips = new QCheckBox(i18nc("@option:check", "Show tooltips"), this); 82​ m_showToolTips = new QCheckBox(i18nc("@option:check", "Show tooltips"));
83​ topLayout->addRow(i18nc("@title:group", "Miscellaneous: "), m_showToolTips);
73 84​
74 // 'Show selection marker' 85​ // 'Show selection marker'
75 m_showSelectionToggle = new QCheckBox(i18nc("@option:check", "Show selection marker"), this); 86​ m_showSelectionToggle = new QCheckBox(i18nc("@option:check", "Show selection marker"));
87​ topLayout->addRow(QString(), m_showSelectionToggle);
76 88​
77 // 'Inline renaming of items' 89​ // 'Inline renaming of items'
78 m_renameInline = new QCheckBox(i18nc("option:check", "Rename inline"), this); 90​ m_renameInline = new QCheckBox(i18nc("option:check", "Rename inline"));
79 91​ topLayout->addRow(QString(), m_renameInline);
80 // 'Use tab for switching between right and left split' ​
81 m_useTabForSplitViewSwitch = new QCheckBox(i18nc("option:check", "Use tab for switching between right and left split view"), this); ​
82 92​
83 topLayout->addWidget(viewPropsBox); 93​ // 'Switch between split views with tab key'
84 topLayout->addWidget(sortingPropsBox); 94​ m_useTabForSplitViewSwitch = new QCheckBox(i18nc("option:check", "Switch between split views with tab key"));
85 topLayout->addWidget(m_showToolTips); 95​ topLayout->addRow(QString(), m_useTabForSplitViewSwitch);
86 topLayout->addWidget(m_showSelectionToggle); ​
87 topLayout->addWidget(m_renameInline); ​
88 topLayout->addWidget(m_useTabForSplitViewSwitch); ​
89 topLayout->addStretch(); ​
90 96​
91 loadSettings(); 97​ loadSettings();
92 98​
93 connect(m_localViewProps, &QRadioButton::toggled, this, &BehaviorSettingsPage::changed); 99​ connect(m_localViewProps, &QRadioButton::toggled, this, &BehaviorSettingsPage::changed);
94 connect(m_globalViewProps, &QRadioButton::toggled, this, &BehaviorSettingsPage::changed); 100​ connect(m_globalViewProps, &QRadioButton::toggled, this, &BehaviorSettingsPage::changed);
95 connect(m_showToolTips, &QCheckBox::toggled, this, &BehaviorSettingsPage::changed); 101​ connect(m_showToolTips, &QCheckBox::toggled, this, &BehaviorSettingsPage::changed);
96 connect(m_showSelectionToggle, &QCheckBox::toggled, this, &BehaviorSettingsPage::changed); 102​ connect(m_showSelectionToggle, &QCheckBox::toggled, this, &BehaviorSettingsPage::changed);
97 connect(m_naturalSorting, &QRadioButton::toggled, this, &BehaviorSettingsPage::changed); 103​ connect(m_naturalSorting, &QRadioButton::toggled, this, &BehaviorSettingsPage::changed);
▲ Show 20 Lines • Show All 85 Lines • Show Last 20 Lines