Sat, 23 Jul 2022 01:38:43 +0300
Merge commit
7 | 1 | #include <QSettings> |
202
b05af0bab735
Replaced the tab widget with an MDI area
Teemu Piippo <teemu@hecknology.net>
parents:
48
diff
changeset
|
2 | #include <QMdiArea> |
264
76a025db4948
Convert all includes to be relative to project root directory. Files that cannot be found in this manner use angle brackets.
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
259
diff
changeset
|
3 | #include <ui_settingseditor.h> |
76a025db4948
Convert all includes to be relative to project root directory. Files that cannot be found in this manner use angle brackets.
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
259
diff
changeset
|
4 | #include "src/settings.h" |
76a025db4948
Convert all includes to be relative to project root directory. Files that cannot be found in this manner use angle brackets.
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
259
diff
changeset
|
5 | #include "src/gl/common.h" |
76a025db4948
Convert all includes to be relative to project root directory. Files that cannot be found in this manner use angle brackets.
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
259
diff
changeset
|
6 | #include "src/settingseditor/keyboardshortcutseditor.h" |
76a025db4948
Convert all includes to be relative to project root directory. Files that cannot be found in this manner use angle brackets.
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
259
diff
changeset
|
7 | #include "src/settingseditor/settingseditor.h" |
7 | 8 | |
16 | 9 | SettingsEditor::SettingsEditor( |
10 | const uiutilities::KeySequenceMap& defaultKeyboardShortcuts, | |
11 | QWidget* parent | |
12 | ) : | |
285
99af8bf63d10
Don't create more than one settings editor
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
282
diff
changeset
|
13 | QMdiSubWindow{parent}, |
7 | 14 | ui{*new Ui_SettingsEditor}, |
218
63125c36de73
Replace config collector with a simpler system
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
202
diff
changeset
|
15 | libraries{this}, |
63125c36de73
Replace config collector with a simpler system
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
202
diff
changeset
|
16 | librariesEditor{this}, |
16 | 17 | defaultKeyboardShortcuts{defaultKeyboardShortcuts} |
7 | 18 | { |
285
99af8bf63d10
Don't create more than one settings editor
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
282
diff
changeset
|
19 | QWidget* widget = new QWidget{this}; |
99af8bf63d10
Don't create more than one settings editor
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
282
diff
changeset
|
20 | this->ui.setupUi(widget); |
99af8bf63d10
Don't create more than one settings editor
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
282
diff
changeset
|
21 | this->setWidget(widget); |
202
b05af0bab735
Replaced the tab widget with an MDI area
Teemu Piippo <teemu@hecknology.net>
parents:
48
diff
changeset
|
22 | this->ui.keyboardShortcutsView->setModel(new KeyboardShortcutsEditor{parent, this}); |
b05af0bab735
Replaced the tab widget with an MDI area
Teemu Piippo <teemu@hecknology.net>
parents:
48
diff
changeset
|
23 | this->ui.viewModeButtonGroup->setId(this->ui.viewModeTabs, int{QMdiArea::TabbedView}); |
b05af0bab735
Replaced the tab widget with an MDI area
Teemu Piippo <teemu@hecknology.net>
parents:
48
diff
changeset
|
24 | this->ui.viewModeButtonGroup->setId(this->ui.viewModeSubWindows, int{QMdiArea::SubWindowView}); |
335 | 25 | this->ui.toolButtonStyle->addItem(tr("Icons only"), Qt::ToolButtonIconOnly); |
26 | this->ui.toolButtonStyle->addItem(tr("Text only"), Qt::ToolButtonTextOnly); | |
27 | this->ui.toolButtonStyle->addItem(tr("Text beside icon"), Qt::ToolButtonTextBesideIcon); | |
28 | this->ui.toolButtonStyle->addItem(tr("Text under icon"), Qt::ToolButtonTextUnderIcon); | |
29 | this->ui.toolButtonStyle->addItem(tr("Style default"), Qt::ToolButtonFollowStyle); | |
282
f2dc3bbecbfa
Make settings editor a sub window instead of a dialog
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
264
diff
changeset
|
30 | this->loadSettings(); |
f2dc3bbecbfa
Make settings editor a sub window instead of a dialog
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
264
diff
changeset
|
31 | this->setWindowTitle(tr("Settings")); |
285
99af8bf63d10
Don't create more than one settings editor
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
282
diff
changeset
|
32 | this->setWindowIcon(QIcon{":/icons/settings-outline.png"}); |
259
c27612f0eac0
- Made it build under Qt6
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
256
diff
changeset
|
33 | this->librariesEditor.setModel(&libraries); |
7 | 34 | QVBoxLayout* layout = new QVBoxLayout{this}; |
35 | layout->addWidget(&librariesEditor); | |
36 | this->ui.tabLdrawLibraries->setLayout(layout); | |
282
f2dc3bbecbfa
Make settings editor a sub window instead of a dialog
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
264
diff
changeset
|
37 | connect(this->ui.buttonBox, &QDialogButtonBox::clicked, |
f2dc3bbecbfa
Make settings editor a sub window instead of a dialog
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
264
diff
changeset
|
38 | [&](QAbstractButton* button) { |
f2dc3bbecbfa
Make settings editor a sub window instead of a dialog
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
264
diff
changeset
|
39 | const auto role = this->ui.buttonBox->buttonRole(button); |
f2dc3bbecbfa
Make settings editor a sub window instead of a dialog
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
264
diff
changeset
|
40 | if (role == QDialogButtonBox::ApplyRole) { |
f2dc3bbecbfa
Make settings editor a sub window instead of a dialog
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
264
diff
changeset
|
41 | this->saveSettings(); |
f2dc3bbecbfa
Make settings editor a sub window instead of a dialog
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
264
diff
changeset
|
42 | } |
f2dc3bbecbfa
Make settings editor a sub window instead of a dialog
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
264
diff
changeset
|
43 | }); |
7 | 44 | } |
45 | ||
46 | SettingsEditor::~SettingsEditor() | |
47 | { | |
48 | delete &this->ui; | |
49 | } | |
50 | ||
282
f2dc3bbecbfa
Make settings editor a sub window instead of a dialog
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
264
diff
changeset
|
51 | void SettingsEditor::saveSettings() |
7 | 52 | { |
256
c6f5de03dc0f
Move color button into widgets lib
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
237
diff
changeset
|
53 | setSetting<Setting::MainColor>(this->ui.mainColorButton->color()); |
c6f5de03dc0f
Move color button into widgets lib
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
237
diff
changeset
|
54 | setSetting<Setting::BackgroundColor>(this->ui.backgroundColorButton->color()); |
c6f5de03dc0f
Move color button into widgets lib
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
237
diff
changeset
|
55 | setSetting<Setting::SelectedColor>(this->ui.selectedColorButton->color()); |
218
63125c36de73
Replace config collector with a simpler system
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
202
diff
changeset
|
56 | setSetting<Setting::LineThickness>(static_cast<GLfloat>(this->ui.lineThickness->value())); |
63125c36de73
Replace config collector with a simpler system
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
202
diff
changeset
|
57 | setSetting<Setting::LineAntiAliasing>(this->ui.lineAntiAliasing->isChecked()); |
237
10a6298f636f
Add an option to log opengl messages
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
218
diff
changeset
|
58 | setSetting<Setting::LogOpenGLDebugMessages>(this->ui.logOpenGLDebugMessages->isChecked()); |
202
b05af0bab735
Replaced the tab widget with an MDI area
Teemu Piippo <teemu@hecknology.net>
parents:
48
diff
changeset
|
59 | const int viewMode = this->ui.viewModeButtonGroup->checkedId(); |
b05af0bab735
Replaced the tab widget with an MDI area
Teemu Piippo <teemu@hecknology.net>
parents:
48
diff
changeset
|
60 | if (viewMode != -1) { |
218
63125c36de73
Replace config collector with a simpler system
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
202
diff
changeset
|
61 | setSetting<Setting::ViewMode>(static_cast<QMdiArea::ViewMode>(viewMode)); |
202
b05af0bab735
Replaced the tab widget with an MDI area
Teemu Piippo <teemu@hecknology.net>
parents:
48
diff
changeset
|
62 | } |
335 | 63 | const QVariant toolButtonStyle = this->ui.toolButtonStyle->currentData(); |
64 | if (toolButtonStyle.isValid()) { | |
65 | setSetting<Setting::ToolButtonStyle>( | |
66 | static_cast<Qt::ToolButtonStyle>(toolButtonStyle.toInt())); | |
67 | } | |
218
63125c36de73
Replace config collector with a simpler system
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
202
diff
changeset
|
68 | this->librariesEditor.saveSettings(); |
282
f2dc3bbecbfa
Make settings editor a sub window instead of a dialog
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
264
diff
changeset
|
69 | Q_EMIT this->settingsChanged(); |
7 | 70 | } |
71 | ||
282
f2dc3bbecbfa
Make settings editor a sub window instead of a dialog
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
264
diff
changeset
|
72 | void SettingsEditor::loadSettings() |
7 | 73 | { |
259
c27612f0eac0
- Made it build under Qt6
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
256
diff
changeset
|
74 | this->libraries.restoreFromSettings(); |
256
c6f5de03dc0f
Move color button into widgets lib
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
237
diff
changeset
|
75 | this->ui.mainColorButton->setColor(setting<Setting::MainColor>()); |
c6f5de03dc0f
Move color button into widgets lib
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
237
diff
changeset
|
76 | this->ui.backgroundColorButton->setColor(setting<Setting::BackgroundColor>()); |
c6f5de03dc0f
Move color button into widgets lib
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
237
diff
changeset
|
77 | this->ui.selectedColorButton->setColor(setting<Setting::SelectedColor>()); |
218
63125c36de73
Replace config collector with a simpler system
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
202
diff
changeset
|
78 | this->ui.lineThickness->setValue(double_cast(setting<Setting::LineThickness>())); |
63125c36de73
Replace config collector with a simpler system
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
202
diff
changeset
|
79 | this->ui.lineAntiAliasing->setChecked(setting<Setting::LineAntiAliasing>()); |
237
10a6298f636f
Add an option to log opengl messages
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
218
diff
changeset
|
80 | this->ui.logOpenGLDebugMessages->setChecked(setting<Setting::LogOpenGLDebugMessages>()); |
218
63125c36de73
Replace config collector with a simpler system
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
202
diff
changeset
|
81 | auto* const viewModeButton = this->ui.viewModeButtonGroup->button(setting<Setting::ViewMode>()); |
202
b05af0bab735
Replaced the tab widget with an MDI area
Teemu Piippo <teemu@hecknology.net>
parents:
48
diff
changeset
|
82 | if (viewModeButton != nullptr) { |
b05af0bab735
Replaced the tab widget with an MDI area
Teemu Piippo <teemu@hecknology.net>
parents:
48
diff
changeset
|
83 | viewModeButton->setChecked(true); |
b05af0bab735
Replaced the tab widget with an MDI area
Teemu Piippo <teemu@hecknology.net>
parents:
48
diff
changeset
|
84 | } |
335 | 85 | int toolButtonStyleIndex = this->ui.toolButtonStyle->findData( |
86 | setting<Setting::ToolButtonStyle>()); | |
87 | if (toolButtonStyleIndex != -1) { | |
88 | this->ui.toolButtonStyle->setCurrentIndex(toolButtonStyleIndex); | |
89 | } | |
7 | 90 | } |