Modal estimated printing time dialog

Fixed conflicts after merge with master
2020-07-27 14:53:17 +02:00
parent 8e679d8b75 18594261d2
commit 48ae8dc9a2
22 changed files with 1301 additions and 264 deletions
--- a/src/libslic3r/Technologies.hpp
+++ b/src/libslic3r/Technologies.hpp
@@ -63,6 +63,6 @@
 #define ENABLE_GCODE_VIEWER_SHADERS_EDITOR (0 && ENABLE_GCODE_VIEWER)
 #define ENABLE_GCODE_VIEWER_AS_STATE (1 && ENABLE_GCODE_VIEWER)
 #define ENABLE_GCODE_VIEWER_USE_OLD_TIME_ESTIMATOR (1 && ENABLE_GCODE_VIEWER)
-
+#define ENABLE_GCODE_VIEWER_MODAL_TIME_ESTIMATE_DIALOG (1 && ENABLE_GCODE_VIEWER)

 #endif // _prusaslicer_technologies_h_