Gui: Reorganize the navigation files into a top Navigation folder.

src/Gui/CMakeLists.txt

@@ -262,7 +262,7 @@ generate_from_xml(LinkViewPy)
 generate_from_xml(ViewProviderLinkPy)
 generate_from_xml(AxisOriginPy)
 generate_from_xml(CommandPy)
-generate_from_xml(NavigationStylePy)
+generate_from_xml(Navigation/NavigationStylePy)
 
 generate_from_py(FreeCADGuiInit GuiInitScript.h)
 
@@ -895,18 +895,6 @@ SET(View3D_CPP_SRCS
     GLPainter.cpp
     Multisample.cpp
     MouseSelection.cpp
-    NavigationStyle.cpp
-    NavigationStylePyImp.cpp
-    InventorNavigationStyle.cpp
-    CADNavigationStyle.cpp
-    RevitNavigationStyle.cpp
-    BlenderNavigationStyle.cpp
-    MayaGestureNavigationStyle.cpp
-    OpenCascadeNavigationStyle.cpp
-    OpenSCADNavigationStyle.cpp
-    TinkerCADNavigationStyle.cpp
-    TouchpadNavigationStyle.cpp
-    GestureNavigationStyle.cpp
     SplitView3DInventor.cpp
     View.cpp
     View3DInventor.cpp
@@ -918,8 +906,6 @@ SET(View3D_CPP_SRCS
     View3DPy.cpp
     View3DViewerPy.cpp
     NaviCube.cpp
-    NavigationAnimator.cpp
-    NavigationAnimation.cpp
 )
 SET(View3D_SRCS
     ${View3D_CPP_SRCS}
@@ -929,9 +915,6 @@ SET(View3D_SRCS
     GLPainter.h
     Multisample.h
     MouseSelection.h
-    NavigationStyle.h
-    NavigationStylePy.xml
-    GestureNavigationStyle.h
     SplitView3DInventor.h
     View.h
     View3DInventor.h
@@ -943,11 +926,35 @@ SET(View3D_SRCS
     CoinRiftWidget.h
     View3DViewerPy.h
     NaviCube.h
-    NavigationAnimator.h
-    NavigationAnimation.h
 )
 SOURCE_GROUP("View3D" FILES ${View3D_SRCS})
 
+SET(Navigation_CPP_SRCS
+    Navigation/NavigationStyle.cpp
+    Navigation/NavigationStylePyImp.cpp
+    Navigation/InventorNavigationStyle.cpp
+    Navigation/CADNavigationStyle.cpp
+    Navigation/RevitNavigationStyle.cpp
+    Navigation/BlenderNavigationStyle.cpp
+    Navigation/MayaGestureNavigationStyle.cpp
+    Navigation/OpenCascadeNavigationStyle.cpp
+    Navigation/OpenSCADNavigationStyle.cpp
+    Navigation/TinkerCADNavigationStyle.cpp
+    Navigation/TouchpadNavigationStyle.cpp
+    Navigation/GestureNavigationStyle.cpp
+    Navigation/NavigationAnimator.cpp
+    Navigation/NavigationAnimation.cpp
+)
+SET(Navigation_SRCS
+    ${Navigation_CPP_SRCS}
+    Navigation/NavigationStyle.h
+    Navigation/NavigationStylePy.xml
+    Navigation/GestureNavigationStyle.h
+    Navigation/NavigationAnimator.h
+    Navigation/NavigationAnimation.h
+)
+SOURCE_GROUP("Navigation" FILES ${Navigation_SRCS})
+
 #quarter sources
 FILE(GLOB_RECURSE Quarter_CPP_SRC RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} Quarter/*.cpp)
 FILE(GLOB_RECURSE Quarter_H_SRC RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} Quarter/*.h)
@@ -1360,6 +1367,7 @@ SET(FreeCADGui_SRCS
     ${Resource_SRCS}
     ${Quarter_SRCS}
     ${View3D_SRCS}
+    ${Navigation_SRCS}
     ${Viewprovider_SRCS}
     ${Widget_SRCS}
     ${Params_SRCS}

src/Gui/CommandDoc.cpp

@@ -61,7 +61,7 @@
 #include "GraphvizView.h"
 #include "ManualAlignment.h"
 #include "MergeDocuments.h"
-#include "NavigationStyle.h"
+#include "Navigation/NavigationStyle.h"
 #include "Placement.h"
 #include "Transform.h"
 #include "View3DInventor.h"

src/Gui/CommandView.cpp

@@ -68,7 +68,7 @@
 #include "Inventor/SoAxisCrossKit.h"
 #include "Macro.h"
 #include "MainWindow.h"
-#include "NavigationStyle.h"
+#include "Navigation/NavigationStyle.h"
 #include "OverlayParams.h"
 #include "OverlayManager.h"
 #include "SceneInspector.h"

src/Gui/Navigation/BlenderNavigationStyle.cpp

@@ -27,7 +27,7 @@
 # include <QApplication>
 #endif
 
-#include "NavigationStyle.h"
+#include "Navigation/NavigationStyle.h"
 #include "View3DInventorViewer.h"
 
 

src/Gui/Navigation/CADNavigationStyle.cpp

@@ -26,7 +26,7 @@
 # include <QApplication>
 #endif
 
-#include "NavigationStyle.h"
+#include "Navigation/NavigationStyle.h"
 #include "View3DInventorViewer.h"
 
 

src/Gui/Navigation/GestureNavigationStyle.h

@@ -23,7 +23,7 @@
 #ifndef GESTURENAVIGATIONSTYLE2_H
 #define GESTURENAVIGATIONSTYLE2_H
 
-#include "NavigationStyle.h"
+#include "Navigation/NavigationStyle.h"
 
 #include <queue>
 #include <memory>

src/Gui/Navigation/InventorNavigationStyle.cpp

@@ -28,7 +28,7 @@
 #endif
 
 #include "Inventor/SoMouseWheelEvent.h"
-#include "NavigationStyle.h"
+#include "Navigation/NavigationStyle.h"
 #include "View3DInventorViewer.h"
 
 

src/Gui/Navigation/MayaGestureNavigationStyle.cpp

@@ -63,7 +63,7 @@
 
 #include <Base/Console.h>
 
-#include "NavigationStyle.h"
+#include "Navigation/NavigationStyle.h"
 #include "SoTouchEvents.h"
 #include "View3DInventorViewer.h"
 

src/Gui/Navigation/NavigationAnimation.h

@@ -24,7 +24,7 @@
 #ifndef GUI_NAVIGATIONANIMATION_H
 #define GUI_NAVIGATIONANIMATION_H
 
-#include "NavigationStyle.h"
+#include "Navigation/NavigationStyle.h"
 #include <Inventor/SbRotation.h>
 #include <Inventor/SbVec3f.h>
 #include <QVariantAnimation>

src/Gui/Navigation/NavigationAnimator.h

@@ -24,7 +24,7 @@
 #ifndef GUI_NAVIGATIONANIMATOR_H
 #define GUI_NAVIGATIONANIMATOR_H
 
-#include "NavigationStyle.h"
+#include "Navigation/NavigationStyle.h"
 #include <QObject>
 #include <memory>
 

src/Gui/Navigation/NavigationStyle.cpp

@@ -42,14 +42,14 @@
 #include <Base/Interpreter.h>
 #include <App/Application.h>
 
-#include "NavigationStyle.h"
-#include "NavigationStylePy.h"
+#include "Navigation/NavigationStyle.h"
+#include "Navigation/NavigationStylePy.h"
 #include "Application.h"
 #include "Inventor/SoMouseWheelEvent.h"
 #include "MenuManager.h"
 #include "MouseSelection.h"
-#include "NavigationAnimator.h"
-#include "NavigationAnimation.h"
+#include "Navigation/NavigationAnimator.h"
+#include "Navigation/NavigationAnimation.h"
 #include "View3DInventorViewer.h"
 
 using namespace Gui;

src/Gui/Navigation/NavigationStylePy.xml

@@ -5,7 +5,7 @@
     Name="NavigationStylePy"
     Twin="NavigationStyle"
     TwinPointer="NavigationStyle"
-    Include="Gui/NavigationStyle.h"
+    Include="Gui/Navigation/NavigationStyle.h"
     Namespace="Gui"
     FatherInclude="Base/BaseClassPy.h"
     FatherNamespace="Base">

src/Gui/Navigation/NavigationStylePyImp.cpp

@@ -22,8 +22,8 @@
 #include "PreCompiled.h"
 
 // inclusion of the generated files (generated out of NavigationStylePy.xml)
-#include "NavigationStylePy.h"
-#include "NavigationStylePy.cpp"
+#include "Navigation/NavigationStylePy.h"
+#include "Navigation/NavigationStylePy.cpp"
 
 
 using namespace Gui;

src/Gui/Navigation/OpenCascadeNavigationStyle.cpp

@@ -26,7 +26,7 @@
 # include <QApplication>
 #endif
 
-#include "NavigationStyle.h"
+#include "Navigation/NavigationStyle.h"
 #include "View3DInventorViewer.h"
 
 

src/Gui/Navigation/OpenSCADNavigationStyle.cpp

@@ -26,7 +26,7 @@
 # include <QApplication>
 #endif
 
-#include "NavigationStyle.h"
+#include "Navigation/NavigationStyle.h"
 #include "View3DInventorViewer.h"
 
 

src/Gui/Navigation/RevitNavigationStyle.cpp

@@ -26,7 +26,7 @@
 # include <QApplication>
 #endif
 
-#include "NavigationStyle.h"
+#include "Navigation/NavigationStyle.h"
 #include "View3DInventorViewer.h"
 
 

src/Gui/Navigation/TinkerCADNavigationStyle.cpp

@@ -26,7 +26,7 @@
 # include <QApplication>
 #endif
 
-#include "NavigationStyle.h"
+#include "Navigation/NavigationStyle.h"
 #include "View3DInventorViewer.h"
 
 

src/Gui/Navigation/TouchpadNavigationStyle.cpp

@@ -25,7 +25,7 @@
 # include <QApplication>
 #endif
 
-#include "NavigationStyle.h"
+#include "Navigation/NavigationStyle.h"
 #include "View3DInventorViewer.h"
 
 

src/Gui/PreferencePages/DlgSettingsNavigation.cpp

@@ -34,7 +34,7 @@
 #include <Base/Tools.h>
 #include <Gui/MainWindow.h>
 #include <Gui/View3DSettings.h>
-#include <Gui/NavigationStyle.h>
+#include <Gui/Navigation/NavigationStyle.h>
 #include <Gui/View3DInventor.h>
 #include <Gui/View3DInventorViewer.h>
 

src/Gui/SoFCDB.cpp

@@ -50,8 +50,8 @@
 #include "SoFCDB.h"
 #include "Camera.h"
 #include "Flag.h"
-#include "GestureNavigationStyle.h"
-#include "NavigationStyle.h"
+#include "Navigation/GestureNavigationStyle.h"
+#include "Navigation/NavigationStyle.h"
 #include "SelectionObject.h"
 #include "SoDevicePixelRatioElement.h"
 #include "SoFCColorBar.h"

src/Gui/SplitView3DInventor.cpp

@@ -36,7 +36,7 @@
 #include "Application.h"
 #include "Camera.h"
 #include "Document.h"
-#include "NavigationStyle.h"
+#include "Navigation/NavigationStyle.h"
 #include "SoFCSelectionAction.h"
 #include "View3DInventorViewer.h"
 #include "View3DPy.h"

src/Gui/View3DInventor.cpp

@@ -67,7 +67,7 @@
 #include "FileDialog.h"
 #include "MainWindow.h"
 #include "NaviCube.h"
-#include "NavigationStyle.h"
+#include "Navigation/NavigationStyle.h"
 #include "SoFCDB.h"
 #include "SoFCSelectionAction.h"
 #include "SoFCVectorizeSVGAction.h"

src/Gui/View3DInventorViewer.cpp

@@ -107,7 +107,7 @@
 #include "MainWindow.h"
 #include "Multisample.h"
 #include "NaviCube.h"
-#include "NavigationStyle.h"
+#include "Navigation/NavigationStyle.h"
 #include "Selection.h"
 #include "SoDevicePixelRatioElement.h"
 #include "SoFCDB.h"
@@ -126,8 +126,8 @@
 #include "ViewProvider.h"
 #include "ViewProviderDocumentObject.h"
 #include "ViewProviderLink.h"
-#include "NavigationAnimator.h"
-#include "NavigationAnimation.h"
+#include "Navigation/NavigationAnimator.h"
+#include "Navigation/NavigationAnimation.h"
 #include "Utilities.h"
 
 #include <Inventor/So3DAnnotation.h>

src/Gui/View3DPy.cpp

@@ -56,7 +56,7 @@
 #include "Camera.h"
 #include "Document.h"
 #include "Inventor/SoMouseWheelEvent.h"
-#include "NavigationStyle.h"
+#include "Navigation/NavigationStyle.h"
 #include "PythonWrapper.h"
 #include "SoFCDB.h"
 #include "SoFCOffscreenRenderer.h"

src/Gui/View3DSettings.cpp

@@ -33,7 +33,7 @@
 #include <App/Color.h>
 
 #include "NaviCube.h"
-#include "NavigationStyle.h"
+#include "Navigation/NavigationStyle.h"
 #include "SoFCSelectionAction.h"
 #include "View3DSettings.h"
 #include "View3DInventorViewer.h"

src/Gui/View3DViewerPy.cpp

@@ -32,7 +32,7 @@
 #include <Base/MatrixPy.h>
 
 #include "PythonWrapper.h"
-#include "NavigationStyle.h"
+#include "Navigation/NavigationStyle.h"
 #include "View3DViewerPy.h"
 #include "View3DInventorViewer.h"
 

src/Mod/Mesh/Gui/Command.cpp

@@ -51,7 +51,7 @@
 #include <Gui/FileDialog.h>
 #include <Gui/MainWindow.h>
 #include <Gui/MouseSelection.h>
-#include <Gui/NavigationStyle.h>
+#include <Gui/Navigation/NavigationStyle.h>
 #include <Gui/Selection/Selection.h>
 #include <Gui/View3DInventor.h>
 #include <Gui/View3DInventorViewer.h>

src/Mod/Mesh/Gui/MeshSelection.cpp

@@ -40,7 +40,7 @@
 #include <Gui/Application.h>
 #include <Gui/Document.h>
 #include <Gui/MouseSelection.h>
-#include <Gui/NavigationStyle.h>
+#include <Gui/Navigation/NavigationStyle.h>
 #include <Gui/Utilities.h>
 #include <Gui/View3DInventor.h>
 #include <Gui/View3DInventorViewer.h>

src/Mod/Sandbox/Gui/Overlay.cpp

@@ -310,7 +310,7 @@ void paintSelection()
 }
 
 // ---------------------------------------
-#include <Gui/NavigationStyle.h>
+#include <Gui/Navigation/NavigationStyle.h>
 
 DrawingPlane::DrawingPlane()
 {

src/Mod/Start/Gui/GeneralSettingsWidget.cpp

@@ -39,7 +39,7 @@
 #include <Base/Parameter.h>
 #include <Base/UnitsApi.h>
 #include <Gui/Language/Translator.h>
-#include <Gui/NavigationStyle.h>
+#include <Gui/Navigation/NavigationStyle.h>
 
 using namespace StartGui;
 

src/Mod/TechDraw/Gui/QGVPage.cpp

@@ -40,7 +40,7 @@
 #include <Base/Parameter.h>
 #include <Gui/BitmapFactory.h>
 #include <Gui/Document.h>
-#include <Gui/NavigationStyle.h>
+#include <Gui/Navigation/NavigationStyle.h>
 #include <Gui/Selection/Selection.h>
 #include <Gui/View3DInventor.h>
 #include <Gui/View3DInventorViewer.h>