From aec3d3cb1d34ff4091390fa198e9e9071ac22685 Mon Sep 17 00:00:00 2001 From: Paddle Date: Mon, 31 Jul 2023 08:49:08 +0200 Subject: [PATCH] Change DlgEditor to DlgSettingsEditor --- src/Gui/CMakeLists.txt | 8 ++++---- src/Gui/DlgEditor.ui | 4 ++-- src/Gui/DlgEditorImp.cpp | 6 +++--- src/Gui/DlgEditorImp.h | 10 +++++----- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/Gui/CMakeLists.txt b/src/Gui/CMakeLists.txt index 036a3c0846..76a2b441d8 100644 --- a/src/Gui/CMakeLists.txt +++ b/src/Gui/CMakeLists.txt @@ -297,7 +297,7 @@ SET(Gui_UIC_SRCS DlgCreateNewPreferencePack.ui DlgCustomizeSpNavSettings.ui DlgDisplayProperties.ui - DlgEditor.ui + DlgSettingsEditor.ui DlgInputDialog.ui DlgKeyboard.ui DlgMacroExecute.ui @@ -556,7 +556,7 @@ SOURCE_GROUP("Dialog\\Customize" FILES ${Dialog_Customize_SRCS}) # The settings dialog sources SET(Dialog_Settings_CPP_SRCS - DlgEditorImp.cpp + DlgSettingsEditor.cpp DlgOnlineHelpImp.cpp DlgPreferencesImp.cpp DlgSettingsReportView.cpp @@ -576,7 +576,7 @@ SET(Dialog_Settings_CPP_SRCS DlgSettingsPythonConsole.cpp ) SET(Dialog_Settings_HPP_SRCS - DlgEditorImp.h + DlgSettingsEditor.h DlgSettingsGeneral.h DlgOnlineHelpImp.h DlgPreferencesImp.h @@ -598,7 +598,7 @@ SET(Dialog_Settings_HPP_SRCS SET(Dialog_Settings_SRCS ${Dialog_Settings_CPP_SRCS} ${Dialog_Settings_HPP_SRCS} - DlgEditor.ui + DlgSettingsEditor.ui DlgOnlineHelp.ui DlgPreferences.ui DlgSettingsReportView.ui diff --git a/src/Gui/DlgEditor.ui b/src/Gui/DlgEditor.ui index ac5ea06568..5cecc7f9a8 100644 --- a/src/Gui/DlgEditor.ui +++ b/src/Gui/DlgEditor.ui @@ -1,7 +1,7 @@ - Gui::Dialog::DlgEditorSettings - + Gui::Dialog::DlgSettingsEditor + 0 diff --git a/src/Gui/DlgEditorImp.cpp b/src/Gui/DlgEditorImp.cpp index 7b66a50625..9a465d245a 100644 --- a/src/Gui/DlgEditorImp.cpp +++ b/src/Gui/DlgEditorImp.cpp @@ -26,8 +26,8 @@ # include #endif -#include "DlgEditorImp.h" -#include "ui_DlgEditor.h" +#include "DlgSettingsEditor.h" +#include "ui_DlgSettingsEditor.h" #include "PythonEditor.h" #include "Tools.h" #include @@ -83,7 +83,7 @@ QFont getMonospaceFont() */ DlgSettingsEditorImp::DlgSettingsEditorImp( QWidget* parent ) : PreferencePage( parent ) - , ui(new Ui_DlgEditorSettings) + , ui(new Ui_DlgSettingsEditor) { ui->setupUi(this); ui->EnableFolding->hide(); // Switch off until we have an editor with folding diff --git a/src/Gui/DlgEditorImp.h b/src/Gui/DlgEditorImp.h index 40feddc0e2..d9bd9e1588 100644 --- a/src/Gui/DlgEditorImp.h +++ b/src/Gui/DlgEditorImp.h @@ -21,8 +21,8 @@ ***************************************************************************/ -#ifndef GUI_DIALOG_DLGEDITORSETTINGSIMP_H -#define GUI_DIALOG_DLGEDITORSETTINGSIMP_H +#ifndef GUI_DIALOG_DLGSETTINGSEDITOR_H +#define GUI_DIALOG_DLGSETTINGSEDITOR_H #include "PropertyPage.h" #include @@ -33,7 +33,7 @@ namespace Gui { class PythonSyntaxHighlighter; namespace Dialog { -class Ui_DlgEditorSettings; +class Ui_DlgSettingsEditor; /** This class implements a preferences page for the editor settings. * Here you can change different color settings and font for editors. @@ -64,7 +64,7 @@ protected: void setEditorTabWidth(int); private: - std::unique_ptr ui; + std::unique_ptr ui; DlgSettingsEditorP* d; Gui::PythonSyntaxHighlighter* pythonSyntax; @@ -75,4 +75,4 @@ private: } // namespace Dialog } // namespace Gui -#endif // GUI_DIALOG_DLGEDITORSETTINGSIMP_H +#endif // GUI_DIALOG_DLGSETTINGSEDITOR_H