Skip to content

Commit 88a9b94

Browse files
committed
#3570 settingsdialog: refactor more pages into separate widgets (part 6)
Signed-off-by: Patrizio Bekerle <patrizio@bekerle.com>
1 parent fc24fe7 commit 88a9b94

17 files changed

Lines changed: 3647 additions & 3128 deletions

src/CMakeLists.txt

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -507,6 +507,18 @@ set(SOURCE_FILES
507507
widgets/settings/webapplicationsettingswidget.cpp
508508
widgets/settings/webapplicationsettingswidget.h
509509
widgets/settings/webapplicationsettingswidget.ui
510+
widgets/settings/mcpserversettingswidget.cpp
511+
widgets/settings/mcpserversettingswidget.h
512+
widgets/settings/mcpserversettingswidget.ui
513+
widgets/settings/notefoldersettingswidget.cpp
514+
widgets/settings/notefoldersettingswidget.h
515+
widgets/settings/notefoldersettingswidget.ui
516+
widgets/settings/panelssettingswidget.cpp
517+
widgets/settings/panelssettingswidget.h
518+
widgets/settings/panelssettingswidget.ui
519+
widgets/settings/scriptingsettingswidget.cpp
520+
widgets/settings/scriptingsettingswidget.h
521+
widgets/settings/scriptingsettingswidget.ui
510522
widgets/todoitemtreewidget.cpp
511523
widgets/todoitemtreewidget.h
512524
widgets/htmlpreviewwidget.h

src/QOwnNotes.pro

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -246,6 +246,10 @@ SOURCES += main.cpp\
246246
widgets/settings/webcompanionsettingswidget.cpp \
247247
widgets/settings/editorsettingswidget.cpp \
248248
widgets/settings/webapplicationsettingswidget.cpp \
249+
widgets/settings/mcpserversettingswidget.cpp \
250+
widgets/settings/notefoldersettingswidget.cpp \
251+
widgets/settings/panelssettingswidget.cpp \
252+
widgets/settings/scriptingsettingswidget.cpp \
249253
dialogs/serverbookmarksimportdialog.cpp \
250254
dialogs/websockettokendialog.cpp \
251255
dialogs/imagedialog.cpp \
@@ -402,6 +406,10 @@ HEADERS += mainwindow.h \
402406
widgets/settings/webcompanionsettingswidget.h \
403407
widgets/settings/editorsettingswidget.h \
404408
widgets/settings/webapplicationsettingswidget.h \
409+
widgets/settings/mcpserversettingswidget.h \
410+
widgets/settings/notefoldersettingswidget.h \
411+
widgets/settings/panelssettingswidget.h \
412+
widgets/settings/scriptingsettingswidget.h \
405413
dialogs/serverbookmarksimportdialog.h \
406414
dialogs/websockettokendialog.h \
407415
dialogs/imagedialog.h \
@@ -478,6 +486,10 @@ FORMS += mainwindow.ui \
478486
widgets/settings/webcompanionsettingswidget.ui \
479487
widgets/settings/editorsettingswidget.ui \
480488
widgets/settings/webapplicationsettingswidget.ui \
489+
widgets/settings/mcpserversettingswidget.ui \
490+
widgets/settings/notefoldersettingswidget.ui \
491+
widgets/settings/panelssettingswidget.ui \
492+
widgets/settings/scriptingsettingswidget.ui \
481493
dialogs/serverbookmarksimportdialog.ui \
482494
dialogs/websockettokendialog.ui \
483495
dialogs/layoutdialog.ui

src/dialogs/settingsdialog.cpp

Lines changed: 47 additions & 1352 deletions
Large diffs are not rendered by default.

src/dialogs/settingsdialog.h

Lines changed: 4 additions & 115 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,12 @@
33

44
#include <entities/cloudconnection.h>
55
#include <entities/notefolder.h>
6-
#include <entities/script.h>
76

87
#include "masterdialog.h"
8+
#include "widgets/settings/mcpserversettingswidget.h"
9+
#include "widgets/settings/notefoldersettingswidget.h"
10+
#include "widgets/settings/panelssettingswidget.h"
11+
#include "widgets/settings/scriptingsettingswidget.h"
912

1013
namespace Ui {
1114
class SettingsDialog;
@@ -20,7 +23,6 @@ class QTreeWidget;
2023
class QLineEdit;
2124
class QStatusBar;
2225
class QButtonGroup;
23-
class Script;
2426
class QCheckBox;
2527
class NoteFolder;
2628
class QSplitter;
@@ -103,55 +105,12 @@ class SettingsDialog : public MasterDialog {
103105

104106
void on_setExternalEditorPathToolButton_clicked();
105107

106-
void on_noteFolderListWidget_currentItemChanged(QListWidgetItem *current,
107-
QListWidgetItem *previous);
108-
109-
void on_noteFolderAddButton_clicked();
110-
111-
void on_noteFolderRemoveButton_clicked();
112-
113-
void on_noteFolderNameLineEdit_editingFinished();
114-
115-
void on_noteFolderRemotePathLineEdit_editingFinished();
116-
117-
void on_noteFolderLocalPathButton_clicked();
118-
119-
void on_noteFolderActiveCheckBox_stateChanged(int arg1);
120-
121-
void on_noteFolderRemotePathButton_clicked();
122-
123-
void on_noteFolderRemotePathTreeWidget_currentItemChanged(QTreeWidgetItem *current,
124-
QTreeWidgetItem *previous);
125-
126-
void on_useOwnCloudPathButton_clicked();
127-
128-
void addLocalScript();
129-
130-
void on_scriptRemoveButton_clicked();
131-
132-
void on_scriptPathButton_clicked();
133-
134-
void on_scriptListWidget_currentItemChanged(QListWidgetItem *current,
135-
QListWidgetItem *previous);
136-
137-
void on_scriptNameLineEdit_editingFinished();
138-
139-
void on_scriptSearchLineEdit_textChanged(const QString &arg1);
140-
141-
void on_scriptValidationButton_clicked();
142-
143-
void on_scriptReloadEngineButton_clicked();
144-
145108
void on_addCustomNoteFileExtensionButton_clicked();
146109

147110
void on_removeCustomNoteFileExtensionButton_clicked();
148111

149112
void on_defaultNoteFileExtensionListWidget_itemChanged(QListWidgetItem *item);
150113

151-
void on_noteFolderShowSubfoldersCheckBox_toggled(bool checked);
152-
153-
void on_noteFolderAllSubfoldersCheckBox_toggled(bool checked);
154-
155114
void on_shortcutSearchLineEdit_textChanged(const QString &arg1);
156115

157116
void on_settingsTreeWidget_currentItemChanged(QTreeWidgetItem *current,
@@ -181,14 +140,6 @@ class SettingsDialog : public MasterDialog {
181140

182141
void on_ownCloudSupportCheckBox_toggled();
183142

184-
void on_noteFolderGitCommitCheckBox_toggled(bool checked);
185-
186-
void searchScriptInRepository(bool checkForUpdates = false);
187-
188-
void checkForScriptUpdates();
189-
190-
void on_scriptListWidget_itemChanged(QListWidgetItem *item);
191-
192143
void on_interfaceStyleComboBox_currentTextChanged(const QString &arg1);
193144

194145
void on_showSystemTrayCheckBox_toggled(bool checked);
@@ -203,42 +154,24 @@ class SettingsDialog : public MasterDialog {
203154

204155
void on_importSettingsButton_clicked();
205156

206-
void on_ignoreNoteSubFoldersResetButton_clicked();
207-
208157
void on_interfaceFontSizeSpinBox_valueChanged(int arg1);
209158

210159
void on_overrideInterfaceFontSizeGroupBox_toggled(bool arg1);
211160

212-
void on_mcpServerEnabledCheckBox_toggled(bool checked);
213-
214-
void on_mcpServerPortResetButton_clicked();
215-
216-
void on_mcpServerShowTokenButton_clicked();
217-
218-
void on_mcpServerCopyTokenButton_clicked();
219-
220-
void on_mcpServerGenerateTokenButton_clicked();
221-
222161
void on_cloudConnectionComboBox_currentIndexChanged(int index);
223162

224163
void on_cloudConnectionAddButton_clicked();
225164

226165
void on_cloudConnectionRemoveButton_clicked();
227166

228-
void on_noteFolderCloudConnectionComboBox_currentIndexChanged(int index);
229-
230167
void storeSelectedCloudConnection();
231168

232169
void on_ownCloudServerAppPasswordPageButton_clicked();
233170

234-
void on_allowDifferentNoteFileNameCheckBox_toggled(bool checked);
235-
236171
void on_languageSearchLineEdit_textChanged(const QString &arg1);
237172

238173
void on_databaseIntegrityCheckButton_clicked();
239174

240-
void on_scriptReloadEngineButton2_clicked();
241-
242175
void on_loginFlowButton_clicked();
243176

244177
void on_loginFlowCancelButton_clicked();
@@ -257,19 +190,15 @@ class SettingsDialog : public MasterDialog {
257190

258191
private:
259192
Ui::SettingsDialog *ui;
260-
QStatusBar *noteFolderRemotePathTreeStatusBar;
261193
bool appIsValid;
262194
QString appVersion;
263195
QString serverVersion;
264196
QString notesPathExistsText;
265197
QString connectionErrorMessage;
266-
NoteFolder _selectedNoteFolder;
267-
Script _selectedScript;
268198
static const int _defaultMarkdownHighlightingInterval = 200;
269199
QSplitter *_mainSplitter;
270200
QButtonGroup *_noteNotificationButtonGroup;
271201
QCheckBox *_noteNotificationNoneCheckBox;
272-
QString _newScriptName;
273202
CloudConnection _selectedCloudConnection;
274203
int _loginFlowPollCount = 0;
275204
QHash<int, bool> _pageInitialized;
@@ -299,25 +228,6 @@ class SettingsDialog : public MasterDialog {
299228

300229
static QString getSelectedListWidgetValue(QListWidget *listWidget);
301230

302-
void setupNoteFolderPage();
303-
304-
static bool scriptMatchesSearchFilter(const Script &script, const QString &searchText);
305-
306-
QTreeWidgetItem *findNoteFolderRemotePathTreeWidgetItem(QTreeWidgetItem *parent,
307-
const QString &text);
308-
309-
void addPathToNoteFolderRemotePathTreeWidget(QTreeWidgetItem *parent, const QString &path);
310-
311-
QString generatePathFromCurrentNoteFolderRemotePathItem(QTreeWidgetItem *item);
312-
313-
void setNoteFolderRemotePathTreeWidgetFrameVisibility(bool visi);
314-
315-
void setupScriptingPage();
316-
317-
void storeScriptListEnabledState();
318-
319-
void validateCurrentScript();
320-
321231
QListWidgetItem *addCustomNoteFileExtension(QString fileExtension);
322232

323233
void loadShortcutSettings();
@@ -345,14 +255,6 @@ class SettingsDialog : public MasterDialog {
345255

346256
bool connectionTestCanBeStarted() const;
347257

348-
void reloadScriptList() const;
349-
350-
void reloadCurrentScriptPage();
351-
352-
void readPanelSettings();
353-
354-
void storePanelSettings();
355-
356258
void loadInterfaceStyleComboBox() const;
357259

358260
void initSearchEngineComboBox() const;
@@ -373,19 +275,6 @@ class SettingsDialog : public MasterDialog {
373275

374276
void applyDarkModeSettings();
375277

376-
void populateSubfolderTree();
377-
378-
void populateSubfolderTreeFromDir(QTreeWidgetItem *parentItem, const QString &path,
379-
const QString &relativePath);
380-
void applySubfolderTreeCheckStates(QTreeWidget *tree, const QStringList &excludedPaths);
381-
void applyCheckStateToItem(QTreeWidgetItem *item, const QStringList &excludedPaths);
382-
383-
void updateSubfolderVisibility();
384-
385-
void collectExcludedSubfolderPaths(QTreeWidgetItem *item, QStringList &excludedPaths);
386-
387-
void saveSubfolderTreeSelection();
388-
389278
bool initializePage(int index);
390279
};
391280

0 commit comments

Comments
 (0)