Change DlgEditor to DlgSettingsEditor

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

src/Gui/DlgEditor.ui

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>Gui::Dialog::DlgEditorSettings</class>
- <widget class="QWidget" name="Gui::Dialog::DlgEditorSettings">
+ <class>Gui::Dialog::DlgSettingsEditor</class>
+ <widget class="QWidget" name="Gui::Dialog::DlgSettingsEditor">
   <property name="geometry">
    <rect>
     <x>0</x>

src/Gui/DlgEditorImp.cpp

@@ -26,8 +26,8 @@
 # include <QFontDatabase>
 #endif
 
-#include "DlgEditorImp.h"
-#include "ui_DlgEditor.h"
+#include "DlgSettingsEditor.h"
+#include "ui_DlgSettingsEditor.h"
 #include "PythonEditor.h"
 #include "Tools.h"
 #include <App/Color.h>
@@ -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

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 <memory>
@@ -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_DlgEditorSettings> ui;
+    std::unique_ptr<Ui_DlgSettingsEditor> 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