Move all the preference pages to PreferencePages subfolder.

src/Gui/Action.cpp

@@ -48,7 +48,7 @@
 #include "BitmapFactory.h"
 #include "Command.h"
 #include "DlgUndoRedo.h"
-#include "DlgSettingsWorkbenchesImp.h"
+#include "PreferencePages/DlgSettingsWorkbenchesImp.h"
 #include "Document.h"
 #include "EditorView.h"
 #include "FileDialog.h"

src/Gui/Application.cpp

@@ -65,7 +65,7 @@
 #include "CommandActionPy.h"
 #include "CommandPy.h"
 #include "Control.h"
-#include "DlgSettingsCacheDirectory.h"
+#include "PreferencePages/DlgSettingsCacheDirectory.h"
 #include "DocumentPy.h"
 #include "DocumentRecovery.h"
 #include "EditorView.h"

src/Gui/CMakeLists.txt

@@ -297,7 +297,6 @@ SET(Gui_UIC_SRCS
     DlgCreateNewPreferencePack.ui
     DlgCustomizeSpNavSettings.ui
     DlgDisplayProperties.ui
-    DlgSettingsEditor.ui
     DlgInputDialog.ui
     DlgKeyboard.ui
     DlgMacroExecute.ui
@@ -312,22 +311,23 @@ SET(Gui_UIC_SRCS
     DlgProjectInformation.ui
     DlgProjectUtility.ui
     DlgPropertyLink.ui
-    DlgSettingsReportView.ui
     DlgRevertToBackupConfig.ui
-    DlgSettingsGeneral.ui
+    PreferencePages/DlgSettings3DView.ui
-    DlgSettings3DView.ui
+    PreferencePages/DlgSettingsCacheDirectory.ui
-    DlgSettingsCacheDirectory.ui
-    DlgSettingsNavigation.ui
-    DlgSettingsSelection.ui
-    DlgSettingsViewColor.ui
-    DlgSettingsTheme.ui
     DlgSettingsColorGradient.ui
-    DlgSettingsDocument.ui
+    PreferencePages/DlgSettingsDocument.ui
+    PreferencePages/DlgSettingsEditor.ui
+    PreferencePages/DlgSettingsGeneral.ui
     DlgSettingsImage.ui
-    DlgSettingsWorkbenches.ui
+    PreferencePages/DlgSettingsMacro.ui
-    DlgSettingsMacro.ui
+    PreferencePages/DlgSettingsNavigation.ui
-    DlgSettingsNotificationArea.ui
+    PreferencePages/DlgSettingsNotificationArea.ui
-    DlgSettingsPythonConsole.ui
+    PreferencePages/DlgSettingsPythonConsole.ui
+    PreferencePages/DlgSettingsReportView.ui
+    PreferencePages/DlgSettingsSelection.ui
+    DlgSettingsTheme.ui
+    PreferencePages/DlgSettingsViewColor.ui
+    PreferencePages/DlgSettingsWorkbenches.ui
     DlgCheckableMessageBox.ui
     DlgToolbars.ui
     DlgTreeWidget.ui
@@ -556,66 +556,66 @@ SOURCE_GROUP("Dialog\\Customize" FILES ${Dialog_Customize_SRCS})
 
 # The settings dialog sources
 SET(Dialog_Settings_CPP_SRCS
-    DlgSettingsEditor.cpp
     DlgOnlineHelpImp.cpp
     DlgPreferencesImp.cpp
-    DlgSettingsReportView.cpp
+    PreferencePages/DlgSettings3DViewImp.cpp
-    DlgSettingsGeneral.cpp
+    PreferencePages/DlgSettingsCacheDirectory.cpp
-    DlgSettings3DViewImp.cpp
-    DlgSettingsCacheDirectory.cpp
-    DlgSettingsNavigation.cpp
-    DlgSettingsSelection.cpp
-    DlgSettingsViewColor.cpp
-    DlgSettingsTheme.cpp
     DlgSettingsColorGradientImp.cpp
-    DlgSettingsDocumentImp.cpp
+    PreferencePages/DlgSettingsDocumentImp.cpp
+    PreferencePages/DlgSettingsEditor.cpp
+    PreferencePages/DlgSettingsGeneral.cpp
     DlgSettingsImageImp.cpp
-    DlgSettingsWorkbenchesImp.cpp
+    PreferencePages/DlgSettingsMacroImp.cpp
-    DlgSettingsMacroImp.cpp
+    PreferencePages/DlgSettingsNavigation.cpp
-    DlgSettingsNotificationArea.cpp
+    PreferencePages/DlgSettingsNotificationArea.cpp
-    DlgSettingsPythonConsole.cpp
+    PreferencePages/DlgSettingsPythonConsole.cpp
+    PreferencePages/DlgSettingsReportView.cpp
+    PreferencePages/DlgSettingsSelection.cpp
+    DlgSettingsTheme.cpp
+    PreferencePages/DlgSettingsViewColor.cpp
+    PreferencePages/DlgSettingsWorkbenchesImp.cpp
 )
 SET(Dialog_Settings_HPP_SRCS
-    DlgSettingsEditor.h
-    DlgSettingsGeneral.h
     DlgOnlineHelpImp.h
     DlgPreferencesImp.h
-    DlgSettingsReportView.h
+    PreferencePages/DlgSettings3DViewImp.h
-    DlgSettings3DViewImp.h
+    PreferencePages/DlgSettingsCacheDirectory.h
-    DlgSettingsCacheDirectory.h
-    DlgSettingsNavigation.h
-    DlgSettingsSelection.h
-    DlgSettingsViewColor.h
-    DlgSettingsTheme.h
     DlgSettingsColorGradientImp.h
-    DlgSettingsDocumentImp.h
+    PreferencePages/DlgSettingsDocumentImp.h
+    PreferencePages/DlgSettingsEditor.h
+    PreferencePages/DlgSettingsGeneral.h
     DlgSettingsImageImp.h
-    DlgSettingsWorkbenchesImp.h
+    PreferencePages/DlgSettingsMacroImp.h
-    DlgSettingsMacroImp.h
+    PreferencePages/DlgSettingsNavigation.h
-    DlgSettingsNotificationArea.h
+    PreferencePages/DlgSettingsNotificationArea.h
-    DlgSettingsPythonConsole.h
+    PreferencePages/DlgSettingsPythonConsole.h
+    PreferencePages/DlgSettingsReportView.h
+    PreferencePages/DlgSettingsSelection.h
+    DlgSettingsTheme.h
+    PreferencePages/DlgSettingsViewColor.h
+    PreferencePages/DlgSettingsWorkbenchesImp.h
 )
 SET(Dialog_Settings_SRCS
     ${Dialog_Settings_CPP_SRCS}
     ${Dialog_Settings_HPP_SRCS}
-    DlgSettingsEditor.ui
     DlgOnlineHelp.ui
     DlgPreferences.ui
-    DlgSettingsReportView.ui
+    PreferencePages/DlgSettings3DView.ui
-    DlgSettingsGeneral.ui
+    PreferencePages/DlgSettingsCacheDirectory.ui
-    DlgSettings3DView.ui
-    DlgSettingsCacheDirectory.ui
-    DlgSettingsNavigation.ui
-    DlgSettingsSelection.ui
-    DlgSettingsViewColor.ui
-    DlgSettingsTheme.ui
     DlgSettingsColorGradient.ui
-    DlgSettingsDocument.ui
+    PreferencePages/DlgSettingsDocument.ui
+    PreferencePages/DlgSettingsEditor.ui
+    PreferencePages/DlgSettingsGeneral.ui
     DlgSettingsImage.ui
-    DlgSettingsWorkbenches.ui
+    PreferencePages/DlgSettingsMacro.ui
-    DlgSettingsMacro.ui
+    PreferencePages/DlgSettingsNavigation.ui
-    DlgSettingsNotificationArea.ui
+    PreferencePages/DlgSettingsNotificationArea.ui
-    DlgSettingsPythonConsole.ui
+    PreferencePages/DlgSettingsPythonConsole.ui
+    PreferencePages/DlgSettingsReportView.ui
+    PreferencePages/DlgSettingsSelection.ui
+    DlgSettingsTheme.ui
+    PreferencePages/DlgSettingsViewColor.ui
+    PreferencePages/DlgSettingsWorkbenches.ui
 )
 SOURCE_GROUP("Dialog\\Settings" FILES ${Dialog_Settings_SRCS})
 

src/Gui/PreferencePages/DlgSettings3DViewImp.cpp

@@ -30,10 +30,10 @@
 #include <App/Application.h>
 #include <Base/Parameter.h>
 #include <Base/Tools.h>
+#include <Gui/View3DInventorViewer.h>
 
 #include "DlgSettings3DViewImp.h"
 #include "ui_DlgSettings3DView.h"
-#include "View3DInventorViewer.h"
 
 
 using namespace Gui::Dialog;

src/Gui/PreferencePages/DlgSettings3DViewImp.h

@@ -24,7 +24,7 @@
 #ifndef GUI_DIALOG_DLGSETTINGS3DVIEWIMP_H
 #define GUI_DIALOG_DLGSETTINGS3DVIEWIMP_H
 
-#include "PropertyPage.h"
+#include <Gui/PropertyPage.h>
 #include <memory>
 
 class QDoubleSpinBox;

src/Gui/PreferencePages/DlgSettingsCacheDirectory.cpp

@@ -37,11 +37,11 @@
 
 #include <App/Application.h>
 #include <App/Document.h>
+#include <Gui/DocumentRecovery.h>
+#include <Gui/MainWindow.h>
 
 #include "DlgSettingsCacheDirectory.h"
 #include "ui_DlgSettingsCacheDirectory.h"
-#include "DocumentRecovery.h"
-#include "MainWindow.h"
 
 
 using namespace Gui::Dialog;

src/Gui/PreferencePages/DlgSettingsCacheDirectory.h

@@ -24,7 +24,7 @@
 #ifndef GUI_DIALOG_DLGSETTINGSCACHEDIRECTORY_H
 #define GUI_DIALOG_DLGSETTINGSCACHEDIRECTORY_H
 
-#include "PropertyPage.h"
+#include <Gui/PropertyPage.h>
 #include <memory>
 
 namespace Gui {

src/Gui/PreferencePages/DlgSettingsDocumentImp.cpp

@@ -23,11 +23,11 @@
 #include "PreCompiled.h"
 
 #include <zlib.h>
+#include <App/License.h>
+#include <Gui/AutoSaver.h>
 
 #include "DlgSettingsDocumentImp.h"
 #include "ui_DlgSettingsDocument.h"
-#include "AutoSaver.h"
-#include <App/License.h>
 
 
 using namespace Gui::Dialog;

src/Gui/PreferencePages/DlgSettingsDocumentImp.h

@@ -24,7 +24,7 @@
 #ifndef GUI_DIALOG_DLGSETTINGSDOCUMENT_IMP_H
 #define GUI_DIALOG_DLGSETTINGSDOCUMENT_IMP_H
 
-#include "PropertyPage.h"
+#include <Gui/PropertyPage.h>
 #include <memory>
 
 namespace Gui {

src/Gui/PreferencePages/DlgSettingsEditor.cpp

@@ -26,11 +26,12 @@
 # include <QFontDatabase>
 #endif
 
+#include <App/Color.h>
+#include <Gui/PythonEditor.h>
+#include <Gui/Tools.h>
+
 #include "DlgSettingsEditor.h"
 #include "ui_DlgSettingsEditor.h"
-#include "PythonEditor.h"
-#include "Tools.h"
-#include <App/Color.h>
 
 
 using namespace Gui;
@@ -72,16 +73,16 @@ QFont getMonospaceFont()
 }
 }
 
-/* TRANSLATOR Gui::Dialog::DlgSettingsEditorImp */
+/* TRANSLATOR Gui::Dialog::DlgSettingsEditor */
 
 /**
- *  Constructs a DlgSettingsEditorImp which is a child of 'parent', with the
+ *  Constructs a DlgSettingsEditor which is a child of 'parent', with the
  *  name 'name' and widget flags set to 'f'
  *
  *  The dialog will by default be modeless, unless you set 'modal' to
  *  true to construct a modal dialog.
  */
-DlgSettingsEditorImp::DlgSettingsEditorImp( QWidget* parent )
+DlgSettingsEditor::DlgSettingsEditor( QWidget* parent )
   : PreferencePage( parent )
   , ui(new Ui_DlgSettingsEditor)
 {
@@ -171,29 +172,29 @@ DlgSettingsEditorImp::DlgSettingsEditorImp( QWidget* parent )
 }
 
 /** Destroys the object and frees any allocated resources */
-DlgSettingsEditorImp::~DlgSettingsEditorImp()
+DlgSettingsEditor::~DlgSettingsEditor()
 {
     // no need to delete child widgets, Qt does it all for us
     delete pythonSyntax;
     delete d;
 }
 
-void DlgSettingsEditorImp::setupConnections()
+void DlgSettingsEditor::setupConnections()
 {
     connect(ui->displayItems, &QTreeWidget::currentItemChanged,
-            this, &DlgSettingsEditorImp::onDisplayItemsCurrentItemChanged);
+            this, &DlgSettingsEditor::onDisplayItemsCurrentItemChanged);
     connect(ui->colorButton, &ColorButton::changed,
-            this, &DlgSettingsEditorImp::onColorButtonChanged);
+            this, &DlgSettingsEditor::onColorButtonChanged);
 #if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
     connect(ui->fontFamily, qOverload<const QString&>(&QComboBox::activated),
-            this, &DlgSettingsEditorImp::onFontFamilyActivated);
+            this, &DlgSettingsEditor::onFontFamilyActivated);
     connect(ui->fontSize, qOverload<const QString&>(&PrefSpinBox::valueChanged),
-            this, &DlgSettingsEditorImp::onFontSizeValueChanged);
+            this, &DlgSettingsEditor::onFontSizeValueChanged);
 #else
     connect(ui->fontFamily, &QComboBox::textActivated,
-            this, &DlgSettingsEditorImp::onFontFamilyActivated);
+            this, &DlgSettingsEditor::onFontFamilyActivated);
     connect(ui->fontSize, &PrefSpinBox::textChanged,
-            this, &DlgSettingsEditorImp::onFontSizeValueChanged);
+            this, &DlgSettingsEditor::onFontSizeValueChanged);
 #endif
 }
 
@@ -201,7 +202,7 @@ void DlgSettingsEditorImp::setupConnections()
  *   settings ColorMap and assigns it to the color button
  *  @see Gui::ColorButton
  */
-void DlgSettingsEditorImp::onDisplayItemsCurrentItemChanged(QTreeWidgetItem *item)
+void DlgSettingsEditor::onDisplayItemsCurrentItemChanged(QTreeWidgetItem *item)
 {
     int index = ui->displayItems->indexOfTopLevelItem(item);
     unsigned int col = d->colormap[index].second;
@@ -209,7 +210,7 @@ void DlgSettingsEditorImp::onDisplayItemsCurrentItemChanged(QTreeWidgetItem *ite
 }
 
 /** Updates the color map if a color was changed */
-void DlgSettingsEditorImp::onColorButtonChanged()
+void DlgSettingsEditor::onColorButtonChanged()
 {
     QColor col = ui->colorButton->color();
     unsigned int lcol = App::Color::asPackedRGB<QColor>(col);
@@ -219,7 +220,7 @@ void DlgSettingsEditorImp::onColorButtonChanged()
     pythonSyntax->setColor( d->colormap[index].first, col );
 }
 
-void DlgSettingsEditorImp::setEditorTabWidth(int tabWidth)
+void DlgSettingsEditor::setEditorTabWidth(int tabWidth)
 {
     QFontMetrics metric(font());
     int fontSize = QtTools::horizontalAdvance(metric, QLatin1Char('0'));
@@ -230,7 +231,7 @@ void DlgSettingsEditorImp::setEditorTabWidth(int tabWidth)
 #endif
 }
 
-void DlgSettingsEditorImp::saveSettings()
+void DlgSettingsEditor::saveSettings()
 {
     ui->EnableLineNumber->onSave();
     ui->EnableBlockCursor->onSave();
@@ -253,7 +254,7 @@ void DlgSettingsEditorImp::saveSettings()
     setEditorTabWidth(ui->tabSize->value());
 }
 
-void DlgSettingsEditorImp::loadSettings()
+void DlgSettingsEditor::loadSettings()
 {
     ui->EnableLineNumber->onRestore();
     ui->EnableBlockCursor->onRestore();
@@ -325,7 +326,7 @@ void DlgSettingsEditorImp::loadSettings()
 /**
  * Sets the strings of the subwidgets using the current language.
  */
-void DlgSettingsEditorImp::changeEvent(QEvent *e)
+void DlgSettingsEditor::changeEvent(QEvent *e)
 {
     if (e->type() == QEvent::LanguageChange) {
         int index = 0;
@@ -337,16 +338,16 @@ void DlgSettingsEditorImp::changeEvent(QEvent *e)
     }
 }
 
-void DlgSettingsEditorImp::onFontFamilyActivated(const QString& fontFamily)
+void DlgSettingsEditor::onFontFamilyActivated(const QString& fontFamily)
 {
     int fontSize = ui->fontSize->value();
     QFont ft(fontFamily, fontSize);
     ui->textEdit1->setFont(ft);
 }
 
-void DlgSettingsEditorImp::onFontSizeValueChanged(const QString&)
+void DlgSettingsEditor::onFontSizeValueChanged(const QString&)
 {
     onFontFamilyActivated(ui->fontFamily->currentText());
 }
 
-#include "moc_DlgEditorImp.cpp"
+#include "moc_DlgSettingsEditor.cpp"

src/Gui/PreferencePages/DlgSettingsEditor.h

@@ -24,7 +24,7 @@
 #ifndef GUI_DIALOG_DLGSETTINGSEDITOR_H
 #define GUI_DIALOG_DLGSETTINGSEDITOR_H
 
-#include "PropertyPage.h"
+#include <Gui/PropertyPage.h>
 #include <memory>
 
 class QTreeWidgetItem;
@@ -40,13 +40,13 @@ class Ui_DlgSettingsEditor;
  *  @author Werner Mayer
  */
 struct DlgSettingsEditorP;
-class DlgSettingsEditorImp : public PreferencePage
+class DlgSettingsEditor : public PreferencePage
 {
     Q_OBJECT
 
 public:
-    explicit DlgSettingsEditorImp( QWidget* parent = nullptr );
+    explicit DlgSettingsEditor( QWidget* parent = nullptr );
-    ~DlgSettingsEditorImp() override;
+    ~DlgSettingsEditor() override;
 
 public:
     void saveSettings() override;
@@ -68,8 +68,8 @@ private:
     DlgSettingsEditorP* d;
     Gui::PythonSyntaxHighlighter* pythonSyntax;
 
-    DlgSettingsEditorImp( const DlgSettingsEditorImp & );
+    DlgSettingsEditor( const DlgSettingsEditor & );
-    DlgSettingsEditorImp& operator=( const DlgSettingsEditorImp & );
+    DlgSettingsEditor& operator=( const DlgSettingsEditor & );
 };
 
 } // namespace Dialog

src/Gui/PreferencePages/DlgSettingsGeneral.cpp

@@ -38,17 +38,18 @@
 #include <Base/Parameter.h>
 #include <Base/UnitsApi.h>
 
+#include <Gui/Action.h>
+#include <Gui/Application.h>
+#include <Gui/DlgCreateNewPreferencePackImp.h>
+#include <Gui/DlgPreferencesImp.h>
+#include <Gui/DlgPreferencePackManagementImp.h>
+#include <Gui/DlgRevertToBackupConfigImp.h>
+#include <Gui/MainWindow.h>
+#include <Gui/PreferencePackManager.h>
+#include <Gui/Language/Translator.h>
+
 #include "DlgSettingsGeneral.h"
 #include "ui_DlgSettingsGeneral.h"
-#include "Action.h"
-#include "Application.h"
-#include "DlgCreateNewPreferencePackImp.h"
-#include "DlgPreferencesImp.h"
-#include "DlgPreferencePackManagementImp.h"
-#include "DlgRevertToBackupConfigImp.h"
-#include "MainWindow.h"
-#include "PreferencePackManager.h"
-#include "Language/Translator.h"
 
 using namespace Gui::Dialog;
 namespace fs = boost::filesystem;
@@ -75,7 +76,7 @@ DlgSettingsGeneral::DlgSettingsGeneral( QWidget* parent )
 
     connect(ui->ImportConfig, &QPushButton::clicked, this, &DlgSettingsGeneral::onImportConfigClicked);
     connect(ui->SaveNewPreferencePack, &QPushButton::clicked, this, &DlgSettingsGeneral::saveAsNewPreferencePack);
-    connect(ui->themesCombobox, qOverload<int>(&QComboBox::activated), this, &DlgGeneralImp::onThemeChanged);
+    connect(ui->themesCombobox, qOverload<int>(&QComboBox::activated), this, &DlgSettingsGeneral::onThemeChanged);
 
     ui->ManagePreferencePacks->setToolTip(tr("Manage preference packs"));
     connect(ui->ManagePreferencePacks, &QPushButton::clicked, this, &DlgSettingsGeneral::onManagePreferencePacksClicked);
@@ -352,7 +353,7 @@ void DlgSettingsGeneral::loadSettings()
     loadThemes();
 }
 
-void DlgGeneralImp::saveThemes()
+void DlgSettingsGeneral::saveThemes()
 {
     // First we save the name of the theme
     ParameterGrp::handle hGrp = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/MainWindow");
@@ -378,7 +379,7 @@ void DlgGeneralImp::saveThemes()
     Application::Instance->setStyleSheet(sheet, tiledBackground);
 }
 
-void DlgGeneralImp::loadThemes()
+void DlgSettingsGeneral::loadThemes()
 {
     ui->themesCombobox->clear();
 
@@ -574,7 +575,7 @@ void DlgSettingsGeneral::onUnitSystemIndexChanged(int index)
     }
 }
 
-void DlgGeneralImp::onThemeChanged(int index) {
+void DlgSettingsGeneral::onThemeChanged(int index) {
     Q_UNUSED(index);
     themeChanged = true;
 }

src/Gui/PreferencePages/DlgSettingsGeneral.h

@@ -26,7 +26,7 @@
 #ifndef GUI_DIALOG_DLGSETTINGSGENERAL_H
 #define GUI_DIALOG_DLGSETTINGSGENERAL_H
 
-#include "PropertyPage.h"
+#include <Gui/PropertyPage.h>
 #include <memory>
 #include <string>
 

src/Gui/PreferencePages/DlgSettingsMacroImp.cpp

@@ -22,11 +22,12 @@
 
 #include "PreCompiled.h"
 
+#include <Gui/Action.h>
+#include <Gui/Application.h>
+#include <Gui/MainWindow.h>
+
 #include "DlgSettingsMacroImp.h"
 #include "ui_DlgSettingsMacro.h"
-#include "Action.h"
-#include "Application.h"
-#include "MainWindow.h"
 
 using namespace Gui::Dialog;
 

src/Gui/PreferencePages/DlgSettingsMacroImp.h

@@ -24,7 +24,7 @@
 #ifndef GUI_DIALOG_DLGSETTINGSMACROIMP_H
 #define GUI_DIALOG_DLGSETTINGSMACROIMP_H
 
-#include "PropertyPage.h"
+#include <Gui/PropertyPage.h>
 #include <memory>
 
 namespace Gui {

src/Gui/PreferencePages/DlgSettingsNavigation.cpp

@@ -32,16 +32,16 @@
 #include <App/Application.h>
 #include <Base/Parameter.h>
 #include <Base/Tools.h>
+#include <Gui/MainWindow.h>
+#include <Gui/View3DSettings.h>
+#include <Gui/NavigationStyle.h>
+#include <Gui/View3DInventor.h>
+#include <Gui/View3DInventorViewer.h>
 
 #include "DlgSettingsNavigation.h"
 #include "ui_DlgSettingsNavigation.h"
-#include "MainWindow.h"
-#include "View3DSettings.h"
-#include "NavigationStyle.h"
-#include "View3DInventor.h"
-#include "View3DInventorViewer.h"
-#include "ui_MouseButtons.h"
 
+#include "../ui_MouseButtons.h"
 
 using namespace Gui::Dialog;
 
@@ -376,4 +376,3 @@ void CameraDialog::onCurrentViewClicked()
 }
 
 #include "moc_DlgSettingsNavigation.cpp"
-

src/Gui/PreferencePages/DlgSettingsNotificationArea.h

@@ -24,7 +24,7 @@
 #ifndef GUI_DIALOG_DLGSETTINGSNOTIFICATIONAREA_H
 #define GUI_DIALOG_DLGSETTINGSNOTIFICATIONAREA_H
 
-#include "PropertyPage.h"
+#include <Gui/PropertyPage.h>
 #include <memory>
 
 namespace Gui {

src/Gui/PreferencePages/DlgSettingsPythonConsole.h

@@ -24,7 +24,7 @@
 #ifndef GUI_DIALOG_DLGSETTINGSPYTHONCONSOLE_H
 #define GUI_DIALOG_DLGSETTINGSPYTHONCONSOLE_H
 
-#include "PropertyPage.h"
+#include <Gui/PropertyPage.h>
 #include <memory>
 
 namespace Gui {

src/Gui/PreferencePages/DlgSettingsReportView.h

@@ -24,7 +24,7 @@
 #ifndef GUI_DIALOG_DLG_SETTINGS_REPORT_VIEW
 #define GUI_DIALOG_DLG_SETTINGS_REPORT_VIEW
 
-#include "PropertyPage.h"
+#include <Gui/PropertyPage.h>
 #include <memory>
 
 namespace Gui {

src/Gui/PreferencePages/DlgSettingsSelection.cpp

@@ -82,4 +82,3 @@ void DlgSettingsSelection::changeEvent(QEvent *e)
 }
 
 #include "moc_DlgSettingsSelection.cpp"
-

src/Gui/PreferencePages/DlgSettingsSelection.h

@@ -24,7 +24,7 @@
 #ifndef GUI_DIALOG_DLGSETTINGSSELECTION_H
 #define GUI_DIALOG_DLGSETTINGSSELECTION_H
 
-#include "PropertyPage.h"
+#include <Gui/PropertyPage.h>
 #include <memory>
 
 class QDoubleSpinBox;

src/Gui/PreferencePages/DlgSettingsViewColor.cpp

@@ -165,4 +165,3 @@ void DlgSettingsViewColor::setGradientColorVisibility(bool val)
 }
 
 #include "moc_DlgSettingsViewColor.cpp"
-

src/Gui/PreferencePages/DlgSettingsViewColor.h

@@ -24,7 +24,7 @@
 #ifndef GUI_DIALOG_DLGSETTINGSVIEWCOLOR_H
 #define GUI_DIALOG_DLGSETTINGSVIEWCOLOR_H
 
-#include "PropertyPage.h"
+#include <Gui/PropertyPage.h>
 #include <memory>
 
 namespace Gui {

src/Gui/PreferencePages/DlgSettingsWorkbenchesImp.cpp

@@ -30,12 +30,13 @@
 #include <sstream>
 #endif
 
+#include <Gui/Application.h>
+#include <Gui/UserSettings.h>
+#include <Gui/Workbench.h>
+#include <Gui/WorkbenchManager.h>
+
 #include "DlgSettingsWorkbenchesImp.h"
 #include "ui_DlgSettingsWorkbenches.h"
-#include "Application.h"
-#include "UserSettings.h"
-#include "Workbench.h"
-#include "WorkbenchManager.h"
 
 
 using namespace Gui::Dialog;

src/Gui/PreferencePages/DlgSettingsWorkbenchesImp.h

@@ -26,7 +26,7 @@
 #ifndef GUI_DIALOG_DLGSETTINGSWORKBENCHES_IMP_H
 #define GUI_DIALOG_DLGSETTINGSWORKBENCHES_IMP_H
 
-#include "PropertyPage.h"
+#include <Gui/PropertyPage.h>
 #include <memory>
 
 namespace Gui::Dialog {

src/Gui/resource.cpp

@@ -30,26 +30,27 @@
 // INCLUDE YOUR PREFERENCE PAGES HERE
 //
 #include "DlgPreferencesImp.h"
-#include "DlgSettings3DViewImp.h"
+#include "PreferencePages/DlgSettings3DViewImp.h"
-#include "DlgSettingsNavigation.h"
+#include "PreferencePages/DlgSettingsCacheDirectory.h"
-#include "DlgSettingsSelection.h"
+#include "PreferencePages/DlgSettingsDocumentImp.h"
-#include "DlgSettingsViewColor.h"
+#include "PreferencePages/DlgSettingsEditor.h"
+#include "PreferencePages/DlgSettingsGeneral.h"
+#include "PreferencePages/DlgSettingsMacroImp.h"
+#include "PreferencePages/DlgSettingsNavigation.h"
+#include "PreferencePages/DlgSettingsNotificationArea.h"
+#include "PreferencePages/DlgSettingsPythonConsole.h"
+#include "PreferencePages/DlgSettingsReportView.h"
+#include "PreferencePages/DlgSettingsSelection.h"
 #include "DlgSettingsTheme.h"
-#include "DlgSettingsGeneral.h"
+#include "PreferencePages/DlgSettingsViewColor.h"
-#include "DlgEditorImp.h"
+#include "PreferencePages/DlgSettingsWorkbenchesImp.h"
-#include "DlgSettingsNotificationArea.h"
+
-#include "DlgSettingsPythonConsole.h"
-#include "DlgSettingsMacroImp.h"
-#include "DlgSettingsDocumentImp.h"
-#include "DlgSettingsReportView.h"
-#include "DlgSettingsWorkbenchesImp.h"
 
 #include "DlgToolbarsImp.h"
 #include "DlgActionsImp.h"
 #include "DlgKeyboardImp.h"
 #include "DlgCustomizeSpaceball.h"
 #include "DlgCustomizeSpNavSettings.h"
-#include "DlgSettingsCacheDirectory.h"
 #include "InputField.h"
 #include "QuantitySpinBox.h"
 #include "PrefWidgets.h"
@@ -78,7 +79,7 @@ WidgetFactorySupplier::WidgetFactorySupplier()
     new PrefPageProducer<DlgSettingsWorkbenchesImp>   ( QT_TRANSLATE_NOOP("QObject","Workbenches") );
     new PrefPageProducer<DlgSettingsMacroImp>         ( QT_TRANSLATE_NOOP("QObject", "Python"));
     new PrefPageProducer<DlgSettingsPythonConsole>    ( QT_TRANSLATE_NOOP("QObject", "Python"));
-    new PrefPageProducer<DlgSettingsEditorImp>        ( QT_TRANSLATE_NOOP("QObject", "Python"));
+    new PrefPageProducer<DlgSettingsEditor>           ( QT_TRANSLATE_NOOP("QObject", "Python"));
 
     // ADD YOUR CUSTOMIZE PAGES HERE
     //