Move DlgSettingsTheme

src/Gui/CMakeLists.txt

@@ -325,7 +325,7 @@ SET(Gui_UIC_SRCS
     PreferencePages/DlgSettingsPythonConsole.ui
     PreferencePages/DlgSettingsReportView.ui
     PreferencePages/DlgSettingsSelection.ui
-    DlgSettingsTheme.ui
+    PreferencePages/DlgSettingsTheme.ui
     PreferencePages/DlgSettingsViewColor.ui
     PreferencePages/DlgSettingsWorkbenches.ui
     DlgCheckableMessageBox.ui
@@ -571,7 +571,7 @@ SET(Dialog_Settings_CPP_SRCS
     PreferencePages/DlgSettingsPythonConsole.cpp
     PreferencePages/DlgSettingsReportView.cpp
     PreferencePages/DlgSettingsSelection.cpp
-    DlgSettingsTheme.cpp
+    PreferencePages/DlgSettingsTheme.cpp
     PreferencePages/DlgSettingsViewColor.cpp
     PreferencePages/DlgSettingsWorkbenchesImp.cpp
 )
@@ -591,7 +591,7 @@ SET(Dialog_Settings_HPP_SRCS
     PreferencePages/DlgSettingsPythonConsole.h
     PreferencePages/DlgSettingsReportView.h
     PreferencePages/DlgSettingsSelection.h
-    DlgSettingsTheme.h
+    PreferencePages/DlgSettingsTheme.h
     PreferencePages/DlgSettingsViewColor.h
     PreferencePages/DlgSettingsWorkbenchesImp.h
 )
@@ -613,7 +613,7 @@ SET(Dialog_Settings_SRCS
     PreferencePages/DlgSettingsPythonConsole.ui
     PreferencePages/DlgSettingsReportView.ui
     PreferencePages/DlgSettingsSelection.ui
-    DlgSettingsTheme.ui
+    PreferencePages/DlgSettingsTheme.ui
     PreferencePages/DlgSettingsViewColor.ui
     PreferencePages/DlgSettingsWorkbenches.ui
 )

src/Gui/PreferencePages/DlgSettingsTheme.cpp

@@ -25,10 +25,10 @@
 # include <QPushButton>
 #endif
 
+#include <Gui/Application.h>
+
 #include "DlgSettingsTheme.h"
 #include "ui_DlgSettingsTheme.h"
-#include "Application.h"
-#include "PreferencePackManager.h"
 
 
 using namespace Gui::Dialog;

src/Gui/PreferencePages/DlgSettingsTheme.h

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

src/Gui/resource.cpp

@@ -41,7 +41,7 @@
 #include "PreferencePages/DlgSettingsPythonConsole.h"
 #include "PreferencePages/DlgSettingsReportView.h"
 #include "PreferencePages/DlgSettingsSelection.h"
-#include "DlgSettingsTheme.h"
+#include "PreferencePages/DlgSettingsTheme.h"
 #include "PreferencePages/DlgSettingsViewColor.h"
 #include "PreferencePages/DlgSettingsWorkbenchesImp.h"