Gui: Reorganize the dialog files into a top Dialogs folder.

src/Gui/Action.cpp

@@ -46,7 +46,7 @@
 #include "Action.h"
 #include "BitmapFactory.h"
 #include "Command.h"
-#include "DlgUndoRedo.h"
+#include "Dialogs/DlgUndoRedo.h"
 #include "PreferencePages/DlgSettingsWorkbenchesImp.h"
 #include "Document.h"
 #include "EditorView.h"

src/Gui/ApplicationPy.cpp

@@ -48,7 +48,7 @@
 #include "ApplicationPy.h"
 #include "BitmapFactory.h"
 #include "Command.h"
-#include "DlgPreferencesImp.h"
+#include "Dialogs/DlgPreferencesImp.h"
 #include "Document.h"
 #include "DocumentObserverPython.h"
 #include "DownloadManager.h"

src/Gui/CMakeLists.txt

@@ -48,6 +48,7 @@ include_directories(
     ${CMAKE_BINARY_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}/Quarter
+    ${CMAKE_CURRENT_SOURCE_DIR}/PreferencePages
     ${CMAKE_CURRENT_BINARY_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}/..
     ${CMAKE_CURRENT_BINARY_DIR}/..
@@ -354,37 +355,37 @@ set_property(SOURCE GraphvizView.cpp APPEND PROPERTY OBJECT_DEPENDS ${CMAKE_CURR
 set_property(SOURCE GraphvizView.h APPEND PROPERTY OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/moc_GraphvizView.cpp)
 
 SET(Gui_UIC_SRCS
-    AboutApplication.ui
+    Dialogs/AboutApplication.ui
     Clipping.ui
     DemoMode.ui
-    DlgActions.ui
-    DlgActivateWindow.ui
-    DlgUnitsCalculator.ui
-    DlgAuthorization.ui
-    DlgChooseIcon.ui
-    DlgCreateNewPreferencePack.ui
-    DlgInputDialog.ui
-    DlgKeyboard.ui
-    DlgMacroExecute.ui
-    DlgRunExternal.ui
-    DlgMacroRecord.ui
-    DlgMaterialProperties.ui
-    DlgOnlineHelp.ui
-    DlgParameter.ui
-    DlgParameterFind.ui
-    DlgPreferencePackManagement.ui
-    DlgPreferences.ui
-    DlgProjectInformation.ui
-    DlgProjectUtility.ui
-    DlgPropertyLink.ui
-    DlgRevertToBackupConfig.ui
+    Dialogs/DlgActions.ui
+    Dialogs/DlgActivateWindow.ui
+    Dialogs/DlgUnitsCalculator.ui
+    Dialogs/DlgAuthorization.ui
+    Dialogs/DlgChooseIcon.ui
+    Dialogs/DlgCreateNewPreferencePack.ui
+    Dialogs/DlgInputDialog.ui
+    Dialogs/DlgKeyboard.ui
+    Dialogs/DlgMacroExecute.ui
+    Dialogs/DlgRunExternal.ui
+    Dialogs/DlgMacroRecord.ui
+    Dialogs/DlgMaterialProperties.ui
+    Dialogs/DlgOnlineHelp.ui
+    Dialogs/DlgParameter.ui
+    Dialogs/DlgParameterFind.ui
+    Dialogs/DlgPreferencePackManagement.ui
+    Dialogs/DlgPreferences.ui
+    Dialogs/DlgProjectInformation.ui
+    Dialogs/DlgProjectUtility.ui
+    Dialogs/DlgPropertyLink.ui
+    Dialogs/DlgRevertToBackupConfig.ui
     PreferencePages/DlgSettings3DView.ui
     PreferencePages/DlgSettingsCacheDirectory.ui
-    DlgSettingsColorGradient.ui
+    Dialogs/DlgSettingsColorGradient.ui
     PreferencePages/DlgSettingsDocument.ui
     PreferencePages/DlgSettingsEditor.ui
     PreferencePages/DlgSettingsGeneral.ui
-    DlgSettingsImage.ui
+    Dialogs/DlgSettingsImage.ui
     PreferencePages/DlgSettingsLightSources.ui
     PreferencePages/DlgSettingsMacro.ui
     PreferencePages/DlgSettingsNavigation.ui
@@ -395,15 +396,15 @@ SET(Gui_UIC_SRCS
     PreferencePages/DlgSettingsUI.ui
     PreferencePages/DlgSettingsViewColor.ui
     PreferencePages/DlgSettingsWorkbenches.ui
-    DlgCheckableMessageBox.ui
-    DlgToolbars.ui
-    DlgTreeWidget.ui
-    DlgLocationAngle.ui
-    DlgLocationPos.ui
+    Dialogs/DlgCheckableMessageBox.ui
+    Dialogs/DlgToolbars.ui
+    Dialogs/DlgTreeWidget.ui
+    Dialogs/DlgLocationAngle.ui
+    Dialogs/DlgLocationPos.ui
     DocumentRecovery.ui
     DownloadManager.ui
     DownloadItem.ui
-    DlgExpressionInput.ui
+    Dialogs/DlgExpressionInput.ui
     MouseButtons.ui
     SceneInspector.ui
     InputVector.ui
@@ -415,14 +416,14 @@ SET(Gui_UIC_SRCS
     TaskView/TaskImage.ui
     TaskView/TaskSelectLinkProperty.ui
     TaskElementColors.ui
-    DlgObjectSelection.ui
-    DlgAddProperty.ui
-    DlgAddPropertyVarSet.ui
+    Dialogs/DlgObjectSelection.ui
+    Dialogs/DlgAddProperty.ui
+    Dialogs/DlgAddPropertyVarSet.ui
     VectorListEditor.ui
 )
 
 if(FREECAD_USE_3DCONNEXION_LEGACY)
-    list(APPEND Gui_UIC_SRCS DlgCustomizeSpNavSettings.ui)
+    list(APPEND Gui_UIC_SRCS Dialogs/DlgCustomizeSpNavSettings.ui)
 endif(FREECAD_USE_3DCONNEXION_LEGACY)
 
 set (FreeCAD_TR_QRC ${CMAKE_CURRENT_BINARY_DIR}/Language/FreeCAD_translation.qrc)
@@ -475,28 +476,28 @@ SOURCE_GROUP("Command" FILES ${Command_SRCS})
 SET(Dialog_CPP_SRCS
     Clipping.cpp
     DemoMode.cpp
-    DlgAbout.cpp
-    DlgActivateWindowImp.cpp
-    DlgCreateNewPreferencePackImp.cpp
-    DlgUnitsCalculatorImp.cpp
-    DlgInputDialogImp.cpp
-    DlgMacroExecuteImp.cpp
-    DlgRunExternal.cpp
-    DlgEditFileIncludePropertyExternal.cpp
-    DlgMacroRecordImp.cpp
-    DlgMaterialPropertiesImp.cpp
-    DlgParameterImp.cpp
-    DlgParameterFind.cpp
-    DlgPreferencePackManagementImp.cpp
-    DlgProjectInformationImp.cpp
-    DlgProjectUtility.cpp
-    DlgPropertyLink.cpp
-    DlgRevertToBackupConfigImp.cpp
-    DlgExpressionInput.cpp
+    Dialogs/DlgAbout.cpp
+    Dialogs/DlgActivateWindowImp.cpp
+    Dialogs/DlgCreateNewPreferencePackImp.cpp
+    Dialogs/DlgUnitsCalculatorImp.cpp
+    Dialogs/DlgInputDialogImp.cpp
+    Dialogs/DlgMacroExecuteImp.cpp
+    Dialogs/DlgRunExternal.cpp
+    Dialogs/DlgEditFileIncludePropertyExternal.cpp
+    Dialogs/DlgMacroRecordImp.cpp
+    Dialogs/DlgMaterialPropertiesImp.cpp
+    Dialogs/DlgParameterImp.cpp
+    Dialogs/DlgParameterFind.cpp
+    Dialogs/DlgPreferencePackManagementImp.cpp
+    Dialogs/DlgProjectInformationImp.cpp
+    Dialogs/DlgProjectUtility.cpp
+    Dialogs/DlgPropertyLink.cpp
+    Dialogs/DlgRevertToBackupConfigImp.cpp
+    Dialogs/DlgExpressionInput.cpp
     TaskDlgRelocation.cpp
-    DlgCheckableMessageBox.cpp
+    Dialogs/DlgCheckableMessageBox.cpp
     TaskCSysDragger.cpp
-    DlgUndoRedo.cpp
+    Dialogs/DlgUndoRedo.cpp
     InputVector.cpp
     Placement.cpp
     PropertyPage.cpp
@@ -507,37 +508,37 @@ SET(Dialog_CPP_SRCS
     DownloadManager.cpp
     DocumentRecovery.cpp
     TaskElementColors.cpp
-    DlgObjectSelection.cpp
-    DlgAddProperty.cpp
-    DlgAddPropertyVarSet.cpp
+    Dialogs/DlgObjectSelection.cpp
+    Dialogs/DlgAddProperty.cpp
+    Dialogs/DlgAddPropertyVarSet.cpp
     VectorListEditor.cpp
 )
 
 SET(Dialog_HPP_SRCS
     Clipping.h
     DemoMode.h
-    DlgAbout.h
-    DlgActivateWindowImp.h
-    DlgCreateNewPreferencePackImp.h
-    DlgUnitsCalculatorImp.h
-    DlgInputDialogImp.h
-    DlgMacroExecuteImp.h
-    DlgRunExternal.h
-    DlgEditFileIncludePropertyExternal.h
-    DlgMacroRecordImp.h
-    DlgMaterialPropertiesImp.h
-    DlgParameterImp.h
-    DlgParameterFind.h
-    DlgPreferencePackManagementImp.h
-    DlgProjectInformationImp.h
-    DlgProjectUtility.h
-    DlgPropertyLink.h
-    DlgRevertToBackupConfigImp.h
-    DlgCheckableMessageBox.h
-    DlgExpressionInput.h
+    Dialogs/DlgAbout.h
+    Dialogs/DlgActivateWindowImp.h
+    Dialogs/DlgCreateNewPreferencePackImp.h
+    Dialogs/DlgUnitsCalculatorImp.h
+    Dialogs/DlgInputDialogImp.h
+    Dialogs/DlgMacroExecuteImp.h
+    Dialogs/DlgRunExternal.h
+    Dialogs/DlgEditFileIncludePropertyExternal.h
+    Dialogs/DlgMacroRecordImp.h
+    Dialogs/DlgMaterialPropertiesImp.h
+    Dialogs/DlgParameterImp.h
+    Dialogs/DlgParameterFind.h
+    Dialogs/DlgPreferencePackManagementImp.h
+    Dialogs/DlgProjectInformationImp.h
+    Dialogs/DlgProjectUtility.h
+    Dialogs/DlgPropertyLink.h
+    Dialogs/DlgRevertToBackupConfigImp.h
+    Dialogs/DlgCheckableMessageBox.h
+    Dialogs/DlgExpressionInput.h
     TaskDlgRelocation.h
     TaskCSysDragger.h
-    DlgUndoRedo.h
+    Dialogs/DlgUndoRedo.h
     InputVector.h
     Placement.h
     PropertyPage.h
@@ -548,40 +549,40 @@ SET(Dialog_HPP_SRCS
     DownloadManager.h
     DocumentRecovery.h
     TaskElementColors.h
-    DlgObjectSelection.h
-    DlgAddProperty.h
-    DlgAddPropertyVarSet.h
+    Dialogs/DlgObjectSelection.h
+    Dialogs/DlgAddProperty.h
+    Dialogs/DlgAddPropertyVarSet.h
     VectorListEditor.h
 )
 
 SET(Dialog_SRCS
     ${Dialog_CPP_SRCS}
     ${Dialog_HPP_SRCS}
-    AboutApplication.ui
+    Dialogs/AboutApplication.ui
     Clipping.ui
     DemoMode.ui
-    DlgActivateWindow.ui
-    DlgUnitsCalculator.ui
-    DlgAuthorization.ui
-    DlgInputDialog.ui
-    DlgAddProperty.ui
-    DlgLocationAngle.ui
-    DlgLocationPos.ui
-    DlgMacroExecute.ui
-    DlgRunExternal.ui
-    DlgMacroRecord.ui
-    DlgMaterialProperties.ui
-    DlgParameter.ui
-    DlgParameterFind.ui
-    DlgPreferencePackManagement.ui
-    DlgProjectInformation.ui
-    DlgProjectUtility.ui
-    DlgPropertyLink.ui
-    DlgRevertToBackupConfig.ui
-    DlgCheckableMessageBox.ui
-    DlgTreeWidget.ui
-    DlgExpressionInput.ui
-    DlgCreateNewPreferencePack.ui
+    Dialogs/DlgActivateWindow.ui
+    Dialogs/DlgUnitsCalculator.ui
+    Dialogs/DlgAuthorization.ui
+    Dialogs/DlgInputDialog.ui
+    Dialogs/DlgAddProperty.ui
+    Dialogs/DlgLocationAngle.ui
+    Dialogs/DlgLocationPos.ui
+    Dialogs/DlgMacroExecute.ui
+    Dialogs/DlgRunExternal.ui
+    Dialogs/DlgMacroRecord.ui
+    Dialogs/DlgMaterialProperties.ui
+    Dialogs/DlgParameter.ui
+    Dialogs/DlgParameterFind.ui
+    Dialogs/DlgPreferencePackManagement.ui
+    Dialogs/DlgProjectInformation.ui
+    Dialogs/DlgProjectUtility.ui
+    Dialogs/DlgPropertyLink.ui
+    Dialogs/DlgRevertToBackupConfig.ui
+    Dialogs/DlgCheckableMessageBox.ui
+    Dialogs/DlgTreeWidget.ui
+    Dialogs/DlgExpressionInput.ui
+    Dialogs/DlgCreateNewPreferencePack.ui
     DownloadManager.ui
     DownloadItem.ui
     DocumentRecovery.ui
@@ -591,58 +592,58 @@ SET(Dialog_SRCS
     SceneInspector.ui
     TextureMapping.ui
     TaskElementColors.ui
-    DlgObjectSelection.ui
+    Dialogs/DlgObjectSelection.ui
     VectorListEditor.ui
 )
 SOURCE_GROUP("Dialog" FILES ${Dialog_SRCS})
 
 # The customize dialog sources
 SET(Dialog_Customize_CPP_SRCS
-    DlgActionsImp.cpp
-    DlgCustomizeImp.cpp
-    DlgKeyboardImp.cpp
-    DlgToolbarsImp.cpp
-    ListWidgetDragBugFix.cpp
+    Dialogs/DlgActionsImp.cpp
+    Dialogs/DlgCustomizeImp.cpp
+    Dialogs/DlgKeyboardImp.cpp
+    Dialogs/DlgToolbarsImp.cpp
+    PreferencePages/ListWidgetDragBugFix.cpp
 )
 SET(Dialog_Customize_HPP_SRCS
-    DlgActionsImp.h
-    DlgCustomizeImp.h
-    DlgKeyboardImp.h
-    DlgToolbarsImp.h
-    ListWidgetDragBugFix.h
+    Dialogs/DlgActionsImp.h
+    Dialogs/DlgCustomizeImp.h
+    Dialogs/DlgKeyboardImp.h
+    Dialogs/DlgToolbarsImp.h
+    PreferencePages/ListWidgetDragBugFix.h
 )
 
 if(FREECAD_USE_3DCONNEXION_LEGACY)
-    list(APPEND Dialog_Customize_CPP_SRCS DlgCustomizeSpaceball.cpp DlgCustomizeSpNavSettings.cpp)
-    list(APPEND Dialog_Customize_HPP_SRCS DlgCustomizeSpaceball.h DlgCustomizeSpNavSettings.h)
+    list(APPEND Dialog_Customize_CPP_SRCS Dialogs/DlgCustomizeSpaceball.cpp Dialogs/DlgCustomizeSpNavSettings.cpp)
+    list(APPEND Dialog_Customize_HPP_SRCS Dialogs/DlgCustomizeSpaceball.h Dialogs/DlgCustomizeSpNavSettings.h)
 endif(FREECAD_USE_3DCONNEXION_LEGACY)
 
 SET(Dialog_Customize_SRCS
     ${Dialog_Customize_CPP_SRCS}
     ${Dialog_Customize_HPP_SRCS}
-    DlgActions.ui
-    DlgChooseIcon.ui
-    DlgKeyboard.ui
-    DlgToolbars.ui
+    Dialogs/DlgActions.ui
+    Dialogs/DlgChooseIcon.ui
+    Dialogs/DlgKeyboard.ui
+    Dialogs/DlgToolbars.ui
 )
 
 if(FREECAD_USE_3DCONNEXION_LEGACY)
-    list(APPEND Dialog_Customize_SRCS  DlgCustomizeSpNavSettings.ui)
+    list(APPEND Dialog_Customize_SRCS  Dialogs/DlgCustomizeSpNavSettings.ui)
 endif(FREECAD_USE_3DCONNEXION_LEGACY)
 
 SOURCE_GROUP("Dialog\\Customize" FILES ${Dialog_Customize_SRCS})
 
 # The settings dialog sources
 SET(Dialog_Settings_CPP_SRCS
-    DlgOnlineHelpImp.cpp
-    DlgPreferencesImp.cpp
+    Dialogs/DlgOnlineHelpImp.cpp
+    Dialogs/DlgPreferencesImp.cpp
     PreferencePages/DlgSettings3DViewImp.cpp
     PreferencePages/DlgSettingsCacheDirectory.cpp
-    DlgSettingsColorGradientImp.cpp
+    Dialogs/DlgSettingsColorGradientImp.cpp
     PreferencePages/DlgSettingsDocumentImp.cpp
     PreferencePages/DlgSettingsEditor.cpp
     PreferencePages/DlgSettingsGeneral.cpp
-    DlgSettingsImageImp.cpp
+    Dialogs/DlgSettingsImageImp.cpp
     PreferencePages/DlgSettingsLightSources.cpp
     PreferencePages/DlgSettingsMacroImp.cpp
     PreferencePages/DlgSettingsNavigation.cpp
@@ -656,15 +657,15 @@ SET(Dialog_Settings_CPP_SRCS
     PreferencePages/DlgSettingsAdvanced.cpp
 )
 SET(Dialog_Settings_HPP_SRCS
-    DlgOnlineHelpImp.h
-    DlgPreferencesImp.h
+    Dialogs/DlgOnlineHelpImp.h
+    Dialogs/DlgPreferencesImp.h
     PreferencePages/DlgSettings3DViewImp.h
     PreferencePages/DlgSettingsCacheDirectory.h
-    DlgSettingsColorGradientImp.h
+    Dialogs/DlgSettingsColorGradientImp.h
     PreferencePages/DlgSettingsDocumentImp.h
     PreferencePages/DlgSettingsEditor.h
     PreferencePages/DlgSettingsGeneral.h
-    DlgSettingsImageImp.h
+    Dialogs/DlgSettingsImageImp.h
     PreferencePages/DlgSettingsLightSources.h
     PreferencePages/DlgSettingsMacroImp.h
     PreferencePages/DlgSettingsNavigation.h
@@ -680,15 +681,15 @@ SET(Dialog_Settings_HPP_SRCS
 SET(Dialog_Settings_SRCS
     ${Dialog_Settings_CPP_SRCS}
     ${Dialog_Settings_HPP_SRCS}
-    DlgOnlineHelp.ui
-    DlgPreferences.ui
+    Dialogs/DlgOnlineHelp.ui
+    Dialogs/DlgPreferences.ui
     PreferencePages/DlgSettings3DView.ui
     PreferencePages/DlgSettingsCacheDirectory.ui
-    DlgSettingsColorGradient.ui
+    Dialogs/DlgSettingsColorGradient.ui
     PreferencePages/DlgSettingsDocument.ui
     PreferencePages/DlgSettingsEditor.ui
     PreferencePages/DlgSettingsGeneral.ui
-    DlgSettingsImage.ui
+    Dialogs/DlgSettingsImage.ui
     PreferencePages/DlgSettingsLightSources.ui
     PreferencePages/DlgSettingsMacro.ui
     PreferencePages/DlgSettingsNavigation.ui

src/Gui/Command.cpp

@@ -50,7 +50,7 @@
 #include "Application.h"
 #include "BitmapFactory.h"
 #include "Control.h"
-#include "DlgUndoRedo.h"
+#include "Dialogs/DlgUndoRedo.h"
 #include "Document.h"
 #include "frameobject.h"
 #include "Macro.h"

src/Gui/CommandDoc.cpp

@@ -55,9 +55,9 @@
 #include "FileDialog.h"
 #include "MainWindow.h"
 #include "Selection.h"
-#include "DlgObjectSelection.h"
-#include "DlgProjectInformationImp.h"
-#include "DlgProjectUtility.h"
+#include "Dialogs/DlgObjectSelection.h"
+#include "Dialogs/DlgProjectInformationImp.h"
+#include "Dialogs/DlgProjectUtility.h"
 #include "GraphvizView.h"
 #include "ManualAlignment.h"
 #include "MergeDocuments.h"

src/Gui/CommandMacro.cpp

@@ -29,8 +29,8 @@
 #include "Action.h"
 #include "Application.h"
 #include "BitmapFactory.h"
-#include "DlgMacroExecuteImp.h"
-#include "DlgMacroRecordImp.h"
+#include "Dialogs/DlgMacroExecuteImp.h"
+#include "Dialogs/DlgMacroRecordImp.h"
 #include "Macro.h"
 #include "MainWindow.h"
 #include "PythonDebugger.h"

src/Gui/CommandStd.cpp

@@ -42,11 +42,11 @@
 #include "Action.h"
 #include "BitmapFactory.h"
 #include "Command.h"
-#include "DlgAbout.h"
-#include "DlgCustomizeImp.h"
-#include "DlgParameterImp.h"
-#include "DlgPreferencesImp.h"
-#include "DlgUnitsCalculatorImp.h"
+#include "Dialogs/DlgAbout.h"
+#include "Dialogs/DlgCustomizeImp.h"
+#include "Dialogs/DlgParameterImp.h"
+#include "Dialogs/DlgPreferencesImp.h"
+#include "Dialogs/DlgUnitsCalculatorImp.h"
 #include "GuiConsole.h"
 #include "MainWindow.h"
 #include "OnlineDocumentation.h"

src/Gui/CommandView.cpp

@@ -61,7 +61,7 @@
 #include "Control.h"
 #include "Clipping.h"
 #include "DemoMode.h"
-#include "DlgSettingsImageImp.h"
+#include "Dialogs/DlgSettingsImageImp.h"
 #include "Document.h"
 #include "FileDialog.h"
 #include "ImageView.h"

src/Gui/CommandWindow.cpp

@@ -34,7 +34,7 @@
 #include "MainWindow.h"
 #include "View.h"
 #include "Document.h"
-#include "DlgActivateWindowImp.h"
+#include "Dialogs/DlgActivateWindowImp.h"
 #include "DockWindowManager.h"
 #include "ToolBarManager.h"
 

src/Gui/Dialogs/AboutApplication.ui

@@ -33,7 +33,7 @@
           <string/>
          </property>
          <property name="pixmap">
-          <pixmap resource="Icons/resource.qrc">:/icons/freecadsplash.png</pixmap>
+          <pixmap resource="../Icons/resource.qrc">:/icons/freecadsplash.png</pixmap>
          </property>
          <property name="alignment">
           <set>Qt::AlignCenter</set>
@@ -398,7 +398,7 @@ p, li { white-space: pre-wrap; }
   </customwidget>
  </customwidgets>
  <resources>
-  <include location="Icons/resource.qrc"/>
+  <include location="../Icons/resource.qrc"/>
  </resources>
  <connections>
   <connection>

src/Gui/Dialogs/DlgAbout.cpp

@@ -52,7 +52,7 @@
 #include <zlib.h>
 
 #include "BitmapFactory.h"
-#include "DlgAbout.h"
+#include "Dialogs/DlgAbout.h"
 #include "MainWindow.h"
 #include "SplashScreen.h"
 #include "ui_AboutApplication.h"

src/Gui/Dialogs/DlgActionsImp.cpp

@@ -33,7 +33,7 @@
 #include <QMessageBox>
 #endif
 
-#include "DlgActionsImp.h"
+#include "Dialogs/DlgActionsImp.h"
 #include "ui_DlgActions.h"
 #include "Action.h"
 #include "Application.h"

src/Gui/Dialogs/DlgActivateWindowImp.cpp

@@ -26,7 +26,7 @@
 # include <QPushButton>
 #endif
 
-#include "DlgActivateWindowImp.h"
+#include "Dialogs/DlgActivateWindowImp.h"
 #include "ui_DlgActivateWindow.h"
 #include "MainWindow.h"
 #include "MDIView.h"

src/Gui/Dialogs/DlgAddProperty.cpp

@@ -31,7 +31,7 @@
 #include <App/ExpressionParser.h>
 #include <Base/Tools.h>
 
-#include "DlgAddProperty.h"
+#include "Dialogs/DlgAddProperty.h"
 #include "ui_DlgAddProperty.h"
 #include "MainWindow.h"
 #include "ViewProviderDocumentObject.h"

src/Gui/Dialogs/DlgAddPropertyVarSet.cpp

@@ -34,7 +34,7 @@
 #include <App/PropertyUnits.h>
 #include <Base/Tools.h>
 
-#include "DlgAddPropertyVarSet.h"
+#include "Dialogs/DlgAddPropertyVarSet.h"
 #include "ui_DlgAddPropertyVarSet.h"
 #include "MainWindow.h"
 #include "ViewProviderVarSet.h"

src/Gui/Dialogs/DlgCheckableMessageBox.cpp

@@ -35,7 +35,7 @@
 
 #include <App/Application.h>
 
-#include "DlgCheckableMessageBox.h"
+#include "Dialogs/DlgCheckableMessageBox.h"
 #include "ui_DlgCheckableMessageBox.h"
 #include "MainWindow.h"
 

src/Gui/Dialogs/DlgCreateNewPreferencePackImp.cpp

@@ -29,7 +29,7 @@
 # include <QRegularExpressionMatch>
 #endif
 
-#include "DlgCreateNewPreferencePackImp.h"
+#include "Dialogs/DlgCreateNewPreferencePackImp.h"
 #include "ui_DlgCreateNewPreferencePack.h"
 
 #include "FileDialog.h"

src/Gui/Dialogs/DlgCustomizeImp.cpp

@@ -29,7 +29,7 @@
 # include <QSizePolicy>
 #endif
 
-#include "DlgCustomizeImp.h"
+#include "Dialogs/DlgCustomizeImp.h"
 #include "MainWindow.h"
 #include "WidgetFactory.h"
 

src/Gui/Dialogs/DlgCustomizeSpNavSettings.cpp

@@ -22,7 +22,7 @@
 
 #include "PreCompiled.h"
 
-#include "DlgCustomizeSpNavSettings.h"
+#include "Dialogs/DlgCustomizeSpNavSettings.h"
 #include "ui_DlgCustomizeSpNavSettings.h"
 #include "Application.h"
 #include "GuiApplicationNativeEventAware.h"

src/Gui/Dialogs/DlgCustomizeSpNavSettings.ui

@@ -140,7 +140,7 @@
           <string/>
          </property>
          <property name="pixmap">
-          <pixmap resource="Icons/resource.qrc">:/icons/SpNav-PanLR</pixmap>
+          <pixmap resource="../Icons/resource.qrc">:/icons/SpNav-PanLR</pixmap>
          </property>
         </widget>
        </item>
@@ -150,7 +150,7 @@
           <string/>
          </property>
          <property name="pixmap">
-          <pixmap resource="Icons/resource.qrc">:/icons/SpNav-PanUD</pixmap>
+          <pixmap resource="../Icons/resource.qrc">:/icons/SpNav-PanUD</pixmap>
          </property>
         </widget>
        </item>
@@ -160,7 +160,7 @@
           <string/>
          </property>
          <property name="pixmap">
-          <pixmap resource="Icons/resource.qrc">:/icons/SpNav-Zoom</pixmap>
+          <pixmap resource="../Icons/resource.qrc">:/icons/SpNav-Zoom</pixmap>
          </property>
         </widget>
        </item>
@@ -170,7 +170,7 @@
           <string/>
          </property>
          <property name="pixmap">
-          <pixmap resource="Icons/resource.qrc">:/icons/SpNav-Tilt</pixmap>
+          <pixmap resource="../Icons/resource.qrc">:/icons/SpNav-Tilt</pixmap>
          </property>
         </widget>
        </item>
@@ -180,7 +180,7 @@
           <string/>
          </property>
          <property name="pixmap">
-          <pixmap resource="Icons/resource.qrc">:/icons/SpNav-Roll</pixmap>
+          <pixmap resource="../Icons/resource.qrc">:/icons/SpNav-Roll</pixmap>
          </property>
         </widget>
        </item>
@@ -190,7 +190,7 @@
           <string/>
          </property>
          <property name="pixmap">
-          <pixmap resource="Icons/resource.qrc">:/icons/SpNav-Spin</pixmap>
+          <pixmap resource="../Icons/resource.qrc">:/icons/SpNav-Spin</pixmap>
          </property>
         </widget>
        </item>
@@ -528,7 +528,7 @@
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <resources>
-  <include location="Icons/resource.qrc"/>
+  <include location="../Icons/resource.qrc"/>
  </resources>
  <connections/>
 </ui>

src/Gui/Dialogs/DlgCustomizeSpaceball.cpp

@@ -39,7 +39,7 @@
 #include "Base/Console.h"
 
 #include "Command.h"
-#include "DlgCustomizeSpaceball.h"
+#include "Dialogs/DlgCustomizeSpaceball.h"
 #include "Application.h"
 #include "BitmapFactory.h"
 #include "GuiApplicationNativeEventAware.h"

src/Gui/Dialogs/DlgEditFileIncludePropertyExternal.cpp

@@ -22,7 +22,7 @@
 
 #include "PreCompiled.h"
 
-#include "DlgEditFileIncludePropertyExternal.h"
+#include "Dialogs/DlgEditFileIncludePropertyExternal.h"
 #include "Application.h"
 #include "FileDialog.h"
 

src/Gui/Dialogs/DlgEditFileIncludePropertyExternal.h

@@ -24,7 +24,7 @@
 #ifndef GUI_DIALOG_DlgEditFileIncludePropertyExternal_H
 #define GUI_DIALOG_DlgEditFileIncludePropertyExternal_H
 
-#include "DlgRunExternal.h"
+#include "Dialogs/DlgRunExternal.h"
 #include <App/PropertyFile.h>
 
 namespace Gui {

src/Gui/Dialogs/DlgExpressionInput.cpp

@@ -37,7 +37,7 @@
 #include <App/VarSet.h>
 #include <Base/Tools.h>
 
-#include "DlgExpressionInput.h"
+#include "Dialogs/DlgExpressionInput.h"
 #include "ui_DlgExpressionInput.h"
 #include "Application.h"
 #include "Command.h"

src/Gui/Dialogs/DlgInputDialogImp.cpp

@@ -26,7 +26,7 @@
 # include <QPushButton>
 #endif
 
-#include "DlgInputDialogImp.h"
+#include "Dialogs/DlgInputDialogImp.h"
 #include "ui_DlgInputDialog.h"
 #include "SpinBox.h"
 

src/Gui/Dialogs/DlgKeyboardImp.cpp

@@ -34,7 +34,7 @@
 #include <Base/Tools.h>
 #include <Base/Console.h>
 
-#include "DlgKeyboardImp.h"
+#include "Dialogs/DlgKeyboardImp.h"
 #include "ui_DlgKeyboard.h"
 #include "Action.h"
 #include "Application.h"

src/Gui/Dialogs/DlgKeyboardImp.h

@@ -24,7 +24,7 @@
 #ifndef GUI_DIALOG_DLGKEYBOARD_IMP_H
 #define GUI_DIALOG_DLGKEYBOARD_IMP_H
 
-#include <boost/signals2/connection.hpp>
+#include <boost/signals2.hpp>
 #include <memory>
 #include <QPointer>
 #include <QAction>

src/Gui/Dialogs/DlgMacroExecuteImp.cpp

@@ -34,13 +34,13 @@
 #include <App/Document.h>
 #include <Base/Interpreter.h>
 
-#include "DlgMacroExecuteImp.h"
+#include "Dialogs/DlgMacroExecuteImp.h"
 #include "ui_DlgMacroExecute.h"
 #include "Application.h"
 #include "BitmapFactory.h"
 #include "Command.h"
-#include "DlgCustomizeImp.h"
-#include "DlgToolbarsImp.h"
+#include "Dialogs/DlgCustomizeImp.h"
+#include "Dialogs/DlgToolbarsImp.h"
 #include "Document.h"
 #include "EditorView.h"
 #include "Macro.h"

src/Gui/Dialogs/DlgMacroRecordImp.cpp

@@ -28,7 +28,7 @@
 #include <QMessageBox>
 #endif
 
-#include "DlgMacroRecordImp.h"
+#include "Dialogs/DlgMacroRecordImp.h"
 #include "ui_DlgMacroRecord.h"
 #include "Application.h"
 #include "FileDialog.h"

src/Gui/Dialogs/DlgMaterialPropertiesImp.cpp

@@ -24,7 +24,7 @@
 
 #include <App/PropertyStandard.h>
 
-#include "DlgMaterialPropertiesImp.h"
+#include "Dialogs/DlgMaterialPropertiesImp.h"
 #include "ui_DlgMaterialProperties.h"
 #include "ViewProvider.h"
 

src/Gui/Dialogs/DlgObjectSelection.cpp

@@ -30,7 +30,7 @@
 #include <App/Document.h>
 #include <App/DocumentObject.h>
 
-#include "DlgObjectSelection.h"
+#include "Dialogs/DlgObjectSelection.h"
 #include "ui_DlgObjectSelection.h"
 #include "Application.h"
 #include "MainWindow.h"

src/Gui/Dialogs/DlgOnlineHelpImp.cpp

@@ -28,7 +28,7 @@
 
 #include <App/Application.h>
 
-#include "DlgOnlineHelpImp.h"
+#include "Dialogs/DlgOnlineHelpImp.h"
 #include "ui_DlgOnlineHelp.h"
 
 

src/Gui/Dialogs/DlgParameterFind.cpp

@@ -26,9 +26,9 @@
 #include <QPushButton>
 #endif
 
-#include "DlgParameterFind.h"
+#include "Dialogs/DlgParameterFind.h"
 #include "ui_DlgParameterFind.h"
-#include "DlgParameterImp.h"
+#include "Dialogs/DlgParameterImp.h"
 
 
 using namespace Gui::Dialog;

src/Gui/Dialogs/DlgParameterImp.cpp

@@ -36,11 +36,11 @@
 #include <Base/Exception.h>
 #include <Base/Parameter.h>
 
-#include "DlgParameterImp.h"
+#include "Dialogs/DlgParameterImp.h"
 #include "ui_DlgParameter.h"
 #include "BitmapFactory.h"
-#include "DlgParameterFind.h"
-#include "DlgInputDialogImp.h"
+#include "Dialogs/DlgParameterFind.h"
+#include "Dialogs/DlgInputDialogImp.h"
 #include "FileDialog.h"
 #include "SpinBox.h"
 

src/Gui/Dialogs/DlgPreferencePackManagementImp.cpp

@@ -25,7 +25,7 @@
 # include <QMessageBox>
 #endif
 
-#include "DlgPreferencePackManagementImp.h"
+#include "Dialogs/DlgPreferencePackManagementImp.h"
 #include "ui_DlgPreferencePackManagement.h"
 #include "Application.h"
 #include "Command.h"

src/Gui/Dialogs/DlgPreferencesImp.cpp

@@ -47,7 +47,7 @@
 #include <Base/Exception.h>
 #include <Base/Tools.h>
 
-#include "DlgPreferencesImp.h"
+#include "Dialogs/DlgPreferencesImp.h"
 #include "ui_DlgPreferences.h"
 #include "BitmapFactory.h"
 #include "MainWindow.h"

src/Gui/Dialogs/DlgProjectInformationImp.cpp

@@ -32,7 +32,7 @@
 #include <App/License.h>
 #include <Base/UnitsApi.h>
 
-#include "DlgProjectInformationImp.h"
+#include "Dialogs/DlgProjectInformationImp.h"
 #include "ui_DlgProjectInformation.h"
 
 #include "MainWindow.h"

src/Gui/Dialogs/DlgProjectUtility.cpp

@@ -29,7 +29,7 @@
 
 #include <App/Document.h>
 
-#include "DlgProjectUtility.h"
+#include "Dialogs/DlgProjectUtility.h"
 #include "ui_DlgProjectUtility.h"
 #include "Application.h"
 #include "Command.h"

src/Gui/Dialogs/DlgPropertyLink.cpp

@@ -36,7 +36,7 @@
 #include <Base/Interpreter.h>
 #include <Base/Tools.h>
 
-#include "DlgPropertyLink.h"
+#include "Dialogs/DlgPropertyLink.h"
 #include "ui_DlgPropertyLink.h"
 #include "Application.h"
 #include "Document.h"

src/Gui/Dialogs/DlgRevertToBackupConfigImp.cpp

@@ -26,7 +26,7 @@
 # include <QPushButton>
 #endif
 
-#include "DlgRevertToBackupConfigImp.h"
+#include "Dialogs/DlgRevertToBackupConfigImp.h"
 #include "ui_DlgRevertToBackupConfig.h"
 #include "Application.h"
 #include "PreferencePackManager.h"

src/Gui/Dialogs/DlgRunExternal.cpp

@@ -25,7 +25,7 @@
 #include <QFileDialog>
 #endif
 
-#include "DlgRunExternal.h"
+#include "Dialogs/DlgRunExternal.h"
 #include "ui_DlgRunExternal.h"
 #include "FileDialog.h"
 

src/Gui/Dialogs/DlgSettingsColorGradientImp.cpp

@@ -31,7 +31,7 @@
 #include <QMessageBox>
 #endif
 
-#include "DlgSettingsColorGradientImp.h"
+#include "Dialogs/DlgSettingsColorGradientImp.h"
 #include "ui_DlgSettingsColorGradient.h"
 #include "SpinBox.h"
 #include "Tools.h"

src/Gui/Dialogs/DlgSettingsImageImp.cpp

@@ -26,7 +26,7 @@
 #include <QRegularExpressionMatch>
 #endif
 
-#include "DlgSettingsImageImp.h"
+#include "Dialogs/DlgSettingsImageImp.h"
 #include "ui_DlgSettingsImage.h"