Move ui jobs into separate folder

11 files changed, 19 insertions, 18 deletions

diff --git a/src/slic3r/CMakeLists.txt b/src/slic3r/CMakeLists.txt
index c448fe3ba..1e9f3b862 100644
--- a/src/slic3r/CMakeLists.txt
+++ b/src/slic3r/CMakeLists.txt
@@ -142,17 +142,17 @@ set(SLIC3R_GUI_SOURCES
     GUI/UpdateDialogs.hpp
     GUI/FirmwareDialog.cpp
     GUI/FirmwareDialog.hpp
-    GUI/ProgressIndicator.hpp
-    GUI/ProgressStatusBar.hpp
-    GUI/ProgressStatusBar.cpp
     GUI/PrintHostDialogs.cpp
     GUI/PrintHostDialogs.hpp
-    GUI/Job.hpp
-    GUI/Job.cpp
-    GUI/ArrangeJob.hpp
-    GUI/ArrangeJob.cpp
-    GUI/RotoptimizeJob.hpp
-    GUI/RotoptimizeJob.cpp
+    GUI/Jobs/Job.hpp
+    GUI/Jobs/Job.cpp
+    GUI/Jobs/ArrangeJob.hpp
+    GUI/Jobs/ArrangeJob.cpp
+    GUI/Jobs/RotoptimizeJob.hpp
+    GUI/Jobs/RotoptimizeJob.cpp
+    GUI/Jobs/ProgressIndicator.hpp
+    GUI/ProgressStatusBar.hpp
+    GUI/ProgressStatusBar.cpp
     GUI/Mouse3DController.cpp
     GUI/Mouse3DController.hpp
     GUI/DoubleSlider.cpp
diff --git a/src/slic3r/GUI/ArrangeJob.cpp b/src/slic3r/GUI/Jobs/ArrangeJob.cpp
index e43631f7e..00b9fb654 100644
--- a/src/slic3r/GUI/ArrangeJob.cpp
+++ b/src/slic3r/GUI/Jobs/ArrangeJob.cpp
@@ -2,9 +2,9 @@
 
 #include "libslic3r/MTUtils.hpp"
 
-#include "Plater.hpp"
-#include "GLCanvas3D.hpp"
-#include "GUI.hpp"
+#include "slic3r/GUI/Plater.hpp"
+#include "slic3r/GUI/GLCanvas3D.hpp"
+#include "slic3r/GUI/GUI.hpp"
 
 namespace Slic3r { namespace GUI {
 
diff --git a/src/slic3r/GUI/ArrangeJob.hpp b/src/slic3r/GUI/Jobs/ArrangeJob.hpp
index bd097af6b..bd097af6b 100644
--- a/src/slic3r/GUI/ArrangeJob.hpp
+++ b/src/slic3r/GUI/Jobs/ArrangeJob.hpp
diff --git a/src/slic3r/GUI/Job.cpp b/src/slic3r/GUI/Jobs/Job.cpp
index cc2cb75f1..cc2cb75f1 100644
--- a/src/slic3r/GUI/Job.cpp
+++ b/src/slic3r/GUI/Jobs/Job.cpp
diff --git a/src/slic3r/GUI/Job.hpp b/src/slic3r/GUI/Jobs/Job.hpp
index b1a652b5e..130ca2ed9 100644
--- a/src/slic3r/GUI/Job.hpp
+++ b/src/slic3r/GUI/Jobs/Job.hpp
@@ -5,7 +5,8 @@
 
 #include <slic3r/Utils/Thread.hpp>
 #include <slic3r/GUI/I18N.hpp>
-#include <slic3r/GUI/ProgressIndicator.hpp>
+
+#include "ProgressIndicator.hpp"
 
 #include <wx/event.h>
 
diff --git a/src/slic3r/GUI/ProgressIndicator.hpp b/src/slic3r/GUI/Jobs/ProgressIndicator.hpp
index 674a81ba2..674a81ba2 100644
--- a/src/slic3r/GUI/ProgressIndicator.hpp
+++ b/src/slic3r/GUI/Jobs/ProgressIndicator.hpp
diff --git a/src/slic3r/GUI/RotoptimizeJob.cpp b/src/slic3r/GUI/Jobs/RotoptimizeJob.cpp
index 10f95201b..4cc34e71c 100644
--- a/src/slic3r/GUI/RotoptimizeJob.cpp
+++ b/src/slic3r/GUI/Jobs/RotoptimizeJob.cpp
@@ -4,7 +4,7 @@
 #include "libslic3r/SLA/Rotfinder.hpp"
 #include "libslic3r/MinAreaBoundingBox.hpp"
 
-#include "Plater.hpp"
+#include "slic3r/GUI/Plater.hpp"
 
 namespace Slic3r { namespace GUI {
 
diff --git a/src/slic3r/GUI/RotoptimizeJob.hpp b/src/slic3r/GUI/Jobs/RotoptimizeJob.hpp
index 983c43c68..983c43c68 100644
--- a/src/slic3r/GUI/RotoptimizeJob.hpp
+++ b/src/slic3r/GUI/Jobs/RotoptimizeJob.hpp
diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp
index 2500ee6b8..7f323c554 100644
--- a/src/slic3r/GUI/Plater.cpp
+++ b/src/slic3r/GUI/Plater.cpp
@@ -61,8 +61,8 @@
 #include "Camera.hpp"
 #include "Mouse3DController.hpp"
 #include "Tab.hpp"
-#include "ArrangeJob.hpp"
-#include "RotoptimizeJob.hpp"
+#include "Jobs/ArrangeJob.hpp"
+#include "Jobs/RotoptimizeJob.hpp"
 #include "PresetBundle.hpp"
 #include "BackgroundSlicingProcess.hpp"
 #include "ProgressStatusBar.hpp"
diff --git a/src/slic3r/GUI/Plater.hpp b/src/slic3r/GUI/Plater.hpp
index 121689148..e71eb3db4 100644
--- a/src/slic3r/GUI/Plater.hpp
+++ b/src/slic3r/GUI/Plater.hpp
@@ -12,7 +12,7 @@
 #include "Selection.hpp"
 
 #include "libslic3r/BoundingBox.hpp"
-#include "Job.hpp"
+#include "Jobs/Job.hpp"
 #include "wxExtensions.hpp"
 
 class wxButton;
diff --git a/src/slic3r/GUI/ProgressStatusBar.hpp b/src/slic3r/GUI/ProgressStatusBar.hpp
index faeb7a34e..15b10deeb 100644
--- a/src/slic3r/GUI/ProgressStatusBar.hpp
+++ b/src/slic3r/GUI/ProgressStatusBar.hpp
@@ -6,7 +6,7 @@
 #include <functional>
 #include <string>
 
-#include "ProgressIndicator.hpp"
+#include "Jobs/ProgressIndicator.hpp"
 
 class wxTimer;
 class wxGauge;