From 4f0a47b7f4ea2df51c0642bb6be723f576ea1b73 Mon Sep 17 00:00:00 2001
From: Ocraftyone <Ocraftyone@users.noreply.github.com>
Date: Wed, 20 Dec 2023 00:29:06 -0500
Subject: [PATCH 01/39] add UndoValueUIManager from PS

from prusa3d/PrusaSlicer@32ff20d

Co-authored-by: YuSanka <yusanka@gmail.com>
---
 src/slic3r/GUI/Field.cpp         |   2 +-
 src/slic3r/GUI/Field.hpp         | 176 ++++++++++++++++++++-----------
 src/slic3r/GUI/OG_CustomCtrl.cpp |   4 +-
 src/slic3r/GUI/OptionsGroup.cpp  |   5 +-
 src/slic3r/GUI/OptionsGroup.hpp  |  17 ++-
 src/slic3r/GUI/Tab.cpp           |  45 +++++---
 src/slic3r/GUI/Tab.hpp           |   1 +
 7 files changed, 162 insertions(+), 88 deletions(-)

diff --git a/src/slic3r/GUI/Field.cpp b/src/slic3r/GUI/Field.cpp
index 7939bb9acde..c9b8d5368ab 100644
--- a/src/slic3r/GUI/Field.cpp
+++ b/src/slic3r/GUI/Field.cpp
@@ -206,7 +206,7 @@ wxString Field::get_tooltip_text(const wxString &default_string)
 	wxString tooltip_text("");
 #ifdef NDEBUG
 	wxString tooltip = _(m_opt.tooltip);
-    edit_tooltip(tooltip);
+    ::edit_tooltip(tooltip);
 
     std::string opt_id = m_opt_id;
     auto hash_pos = opt_id.find("#");
diff --git a/src/slic3r/GUI/Field.hpp b/src/slic3r/GUI/Field.hpp
index a951c021321..58b5dd5e2da 100644
--- a/src/slic3r/GUI/Field.hpp
+++ b/src/slic3r/GUI/Field.hpp
@@ -41,7 +41,120 @@ wxString double_to_string(double const value, const int max_precision = 4);
 wxString get_thumbnail_string(const Vec2d& value);
 wxString get_thumbnails_string(const std::vector<Vec2d>& values);
 
-class Field {
+class UndoValueUIManager
+{
+    struct UndoValueUI {
+        // Bitmap and Tooltip text for m_Undo_btn. The wxButton will be updated only if the new wxBitmap pointer differs from the currently rendered one.
+        const ScalableBitmap* undo_bitmap{ nullptr };
+        const wxString* undo_tooltip{ nullptr };
+        // Bitmap and Tooltip text for m_Undo_to_sys_btn. The wxButton will be updated only if the new wxBitmap pointer differs from the currently rendered one.
+        const ScalableBitmap* undo_to_sys_bitmap{ nullptr };
+        const wxString* undo_to_sys_tooltip{ nullptr };
+        // Color for Label. The wxColour will be updated only if the new wxColour pointer differs from the currently rendered one.
+        const wxColour* label_color{ nullptr };
+        // State of the blinker icon
+        bool					blink{ false };
+
+        bool 	set_undo_bitmap(const ScalableBitmap* bmp) {
+            if (undo_bitmap != bmp) {
+                undo_bitmap = bmp;
+                return true;
+            }
+            return false;
+        }
+
+        bool 	set_undo_to_sys_bitmap(const ScalableBitmap* bmp) {
+            if (undo_to_sys_bitmap != bmp) {
+                undo_to_sys_bitmap = bmp;
+                return true;
+            }
+            return false;
+        }
+
+        bool	set_label_colour(const wxColour* clr) {
+            if (label_color != clr) {
+                label_color = clr;
+            }
+            return false;
+        }
+
+        bool 	set_undo_tooltip(const wxString* tip) {
+            if (undo_tooltip != tip) {
+                undo_tooltip = tip;
+                return true;
+            }
+            return false;
+        }
+
+        bool 	set_undo_to_sys_tooltip(const wxString* tip) {
+            if (undo_to_sys_tooltip != tip) {
+                undo_to_sys_tooltip = tip;
+                return true;
+            }
+            return false;
+        }
+    };
+
+    UndoValueUI m_undo_ui;
+
+    struct EditValueUI {
+        // Bitmap and Tooltip text for m_Edit_btn. The wxButton will be updated only if the new wxBitmap pointer differs from the currently rendered one.
+        const ScalableBitmap*	bitmap{ nullptr };
+        wxString				tooltip { wxEmptyString };
+
+        bool 	set_bitmap(const ScalableBitmap* bmp) {
+            if (bitmap != bmp) {
+                bitmap = bmp;
+                return true;
+            }
+            return false;
+        }
+
+        bool 	set_tooltip(const wxString& tip) {
+            if (tooltip != tip) {
+                tooltip = tip;
+                return true;
+            }
+            return false;
+        }
+    };
+
+    EditValueUI m_edit_ui;
+
+public:
+    UndoValueUIManager() {}
+    ~UndoValueUIManager() {}
+
+    bool 	set_undo_bitmap(const ScalableBitmap* bmp)			{ return m_undo_ui.set_undo_bitmap(bmp); }
+    bool 	set_undo_to_sys_bitmap(const ScalableBitmap* bmp)	{ return m_undo_ui.set_undo_to_sys_bitmap(bmp); }
+    bool	set_label_colour(const wxColour* clr)				{ return m_undo_ui.set_label_colour(clr); }
+    bool 	set_undo_tooltip(const wxString* tip)				{ return m_undo_ui.set_undo_tooltip(tip); }
+    bool 	set_undo_to_sys_tooltip(const wxString* tip)		{ return m_undo_ui.set_undo_to_sys_tooltip(tip); }
+
+    bool 	set_edit_bitmap(const ScalableBitmap* bmp)			{ return m_edit_ui.set_bitmap(bmp); }
+    bool 	set_edit_tooltip(const wxString& tip)				{ return m_edit_ui.set_tooltip(tip); }
+
+    // ui items used for revert line value
+    bool					has_undo_ui()			const { return m_undo_ui.undo_bitmap != nullptr; }
+    const ScalableBitmap*	undo_bitmap()			const { return m_undo_ui.undo_bitmap; }
+    const wxString*			undo_tooltip()			const { return m_undo_ui.undo_tooltip; }
+    const ScalableBitmap*	undo_to_sys_bitmap()	const { return m_undo_ui.undo_to_sys_bitmap; }
+    const wxString*			undo_to_sys_tooltip()	const { return m_undo_ui.undo_to_sys_tooltip; }
+    const wxColour*			label_color()			const { return m_undo_ui.label_color; }
+
+    // Extentions
+
+    // Search blinker
+    const bool				blink()					const { return m_undo_ui.blink; }
+    bool*					get_blink_ptr()				  { return &m_undo_ui.blink; }
+
+    // Edit field button
+    bool					has_edit_ui()			const { return !m_edit_ui.tooltip.IsEmpty(); }
+    const wxBitmapBundle*	edit_bitmap()			const { return &m_edit_ui.bitmap->bmp(); }
+    const wxString*			edit_tooltip()			const { return &m_edit_ui.tooltip; }
+};
+
+class Field : public UndoValueUIManager {
 protected:
     // factory function to defer and enforce creation of derived type. 
 	virtual void	PostInitialize();
@@ -139,49 +252,6 @@ class Field {
 		return std::move(p); //!p;
     }
 
-    bool 	set_undo_bitmap(const ScalableBitmap *bmp) {
-    	if (m_undo_bitmap != bmp) {
-    		m_undo_bitmap = bmp;
-    		return true;
-    	}
-    	return false;
-    }
-
-    bool 	set_undo_to_sys_bitmap(const ScalableBitmap *bmp) {
-    	if (m_undo_to_sys_bitmap != bmp) {
-    		m_undo_to_sys_bitmap = bmp;
-    		return true;
-    	}
-    	return false;
-    }
-
-	bool	set_label_colour(const wxColour *clr) {
-		if (m_label_color != clr) {
-			m_label_color = clr;
-		}
-		return false;
-	}
-
-	bool 	set_undo_tooltip(const wxString *tip) {
-		if (m_undo_tooltip != tip) {
-			m_undo_tooltip = tip;
-			return true;
-		}
-		return false;
-	}
-
-	bool 	set_undo_to_sys_tooltip(const wxString *tip) {
-		if (m_undo_to_sys_tooltip != tip) {
-			m_undo_to_sys_tooltip = tip;
-			return true;
-		}
-		return false;
-	}
-
-	bool*	get_blink_ptr() {
-		return &m_blink;
-    }
-
     virtual void msw_rescale();
     virtual void sys_color_changed();
 
@@ -193,27 +263,9 @@ class Field {
 	static int def_width_wider()	;
 	static int def_width_thinner()	;
 
-	const ScalableBitmap*	undo_bitmap()			{ return m_undo_bitmap; }
-	const wxString*			undo_tooltip()			{ return m_undo_tooltip; }
-	const ScalableBitmap*	undo_to_sys_bitmap()	{ return m_undo_to_sys_bitmap; }
-	const wxString*			undo_to_sys_tooltip()	{ return m_undo_to_sys_tooltip; }
-	const wxColour*			label_color()			{ return m_label_color; }
-	const bool				blink()					{ return m_blink; }
 	const bool				combine_side_text()		{ return m_combine_side_text; } // BBS: new param style
 
 protected:
-	// Bitmap and Tooltip text for m_Undo_btn. The wxButton will be updated only if the new wxBitmap pointer differs from the currently rendered one.
-	const ScalableBitmap*   m_undo_bitmap = nullptr;
-	const wxString*         m_undo_tooltip = nullptr;
-	// Bitmap and Tooltip text for m_Undo_to_sys_btn. The wxButton will be updated only if the new wxBitmap pointer differs from the currently rendered one.
-    const ScalableBitmap*   m_undo_to_sys_bitmap = nullptr;
-	const wxString*		    m_undo_to_sys_tooltip = nullptr;
-
-	bool					m_blink{ false };
-
-	// Color for Label. The wxColour will be updated only if the new wxColour pointer differs from the currently rendered one.
-	const wxColour*		m_label_color = nullptr;
-
 	// current value
 	boost::any			m_value;
     // last maeningful value
diff --git a/src/slic3r/GUI/OG_CustomCtrl.cpp b/src/slic3r/GUI/OG_CustomCtrl.cpp
index 26349192d12..68ffe0de896 100644
--- a/src/slic3r/GUI/OG_CustomCtrl.cpp
+++ b/src/slic3r/GUI/OG_CustomCtrl.cpp
@@ -195,7 +195,7 @@ wxPoint OG_CustomCtrl::get_pos(const Line& line, Field* field_in/* = nullptr*/)
 
             if (line.widget) {
 #ifndef DISABLE_BLINKING
-                h_pos += blinking_button_width;
+                h_pos += (line.has_undo_ui() ? 3 : 1) * blinking_button_width;
 #endif
 
                 for (auto child : line.widget_sizer->GetChildren())
@@ -761,7 +761,7 @@ void OG_CustomCtrl::CtrlLine::render(wxDC& dc, wxCoord h_pos, wxCoord v_pos)
     wxColour blink_color = StateColor::darkModeColorFor("#009688");
     bool is_url_string = false;
     if (ctrl->opt_group->label_width != 0 && !label.IsEmpty()) {
-        const wxColour* text_clr = field ? field->label_color() : og_line.full_Label_color;
+        const wxColour* text_clr = field ? field->label_color() : og_line.label_color();
         for (const Option& opt : option_set) {
             Field* field = ctrl->opt_group->get_field(opt.opt_id);
             if (field && field->blink()) {
diff --git a/src/slic3r/GUI/OptionsGroup.cpp b/src/slic3r/GUI/OptionsGroup.cpp
index 92dca600031..a0e3fa00a9d 100644
--- a/src/slic3r/GUI/OptionsGroup.cpp
+++ b/src/slic3r/GUI/OptionsGroup.cpp
@@ -210,7 +210,7 @@ void OptionsGroup::append_line(const Line& line)
         m_options_mode.push_back(option_set[0].opt.mode);
 }
 
-//BBS: get line for opt_key
+/*//BBS: get line for opt_key
 Line* OptionsGroup::get_line(const std::string& opt_key)
 {
     for (auto& l : m_lines)
@@ -222,7 +222,7 @@ Line* OptionsGroup::get_line(const std::string& opt_key)
     }
 
     return nullptr;
-}
+}*/
 
 void OptionsGroup::append_separator()
 {
@@ -678,6 +678,7 @@ void ConfigOptionsGroup::back_to_config_value(const DynamicPrintConfig& config,
                  opt_key == "thumbnails" || opt_key == "bed_custom_texture" || opt_key == "bed_custom_model") {
         value = get_config_value(config, opt_key);
         this->change_opt_value(opt_key, value);
+        OptionsGroup::on_change_OG(opt_key, value);
         return;
         } else {
         auto opt_id = m_opt_map.find(opt_key)->first;
diff --git a/src/slic3r/GUI/OptionsGroup.hpp b/src/slic3r/GUI/OptionsGroup.hpp
index a758f1652a6..5b54edb92fd 100644
--- a/src/slic3r/GUI/OptionsGroup.hpp
+++ b/src/slic3r/GUI/OptionsGroup.hpp
@@ -48,7 +48,8 @@ struct Option {
 using t_option = std::unique_ptr<Option>;	//!
 
 /// Represents option lines
-class Line {
+class Line : public UndoValueUIManager
+{
 	bool		m_is_separator{ false };
 public:
     wxString	label;
@@ -58,8 +59,6 @@ class Line {
     bool        toggle_visible{true}; // BBS: hide some line
 
     size_t		full_width {0}; 
-	wxColour*	full_Label_color {nullptr};
-	bool		blink	{false};
     widget_t	widget {nullptr};
     std::function<wxWindow*(wxWindow*)>	near_label_widget{ nullptr };
 	wxWindow*	near_label_widget_win {nullptr};
@@ -83,10 +82,10 @@ class Line {
 	Line() : m_is_separator(true) {}
 
 	bool is_separator() const { return m_is_separator; }
+	bool has_only_option(const std::string& opt_key) const { return m_options.size() == 1 && m_options[0].opt_id == opt_key; }
 
     const std::vector<widget_t>&	get_extra_widgets() const {return m_extra_widgets;}
     const std::vector<Option>&		get_options() const { return m_options; }
-	bool*							get_blink_ptr() { return &blink; }
 
 private:
 	std::vector<Option>		m_options;//! {std::vector<Option>()};
@@ -139,7 +138,7 @@ class OptionsGroup {
 	// create controls for the option group
 	void		activate_line(Line& line);
 	//BBS: get line for opt_key
-	Line* get_line(const std::string& opt_key);
+//	Line* get_line(const std::string& opt_key);
 
 	// create all controls for the option group from the m_lines
 	bool		activate(std::function<void()> throw_if_canceled = [](){}, int horiz_alignment = wxALIGN_LEFT);
@@ -155,6 +154,14 @@ class OptionsGroup {
 							if (m_fields.find(id) == m_fields.end()) return nullptr;
 							return m_fields.at(id).get();
     }
+
+    inline Line*	get_line(const t_config_option_key& id) {
+		for (Line& line : m_lines)
+			if (line.has_only_option(id))
+				return &line;
+		return nullptr;
+    }
+
 	bool			set_value(const t_config_option_key& id, const boost::any& value, bool change_event = false) {
 							if (m_fields.find(id) == m_fields.end()) return false;
 							m_fields.at(id)->set_value(value, change_event);
diff --git a/src/slic3r/GUI/Tab.cpp b/src/slic3r/GUI/Tab.cpp
index 8ede9c756af..4ac4837eabb 100644
--- a/src/slic3r/GUI/Tab.cpp
+++ b/src/slic3r/GUI/Tab.cpp
@@ -717,8 +717,8 @@ void Tab::update_label_colours()
         }
         if (opt.first == "printable_area"            ||
             opt.first == "compatible_prints"    || opt.first == "compatible_printers"           ) {
-            if (m_colored_Label_colors.find(opt.first) != m_colored_Label_colors.end())
-                m_colored_Label_colors.at(opt.first) = *color;
+            if (Line* line = get_line(opt.first))
+                line->set_label_colour(color);
             continue;
         }
 
@@ -757,13 +757,13 @@ void Tab::decorate()
     for (const auto& opt : m_options_list)
     {
         Field*      field = nullptr;
-        wxColour*   colored_label_clr = nullptr;
+        bool        option_without_field = false;
 
         if (opt.first == "printable_area" ||
             opt.first == "compatible_prints" || opt.first == "compatible_printers")
-            colored_label_clr = (m_colored_Label_colors.find(opt.first) == m_colored_Label_colors.end()) ? nullptr : &m_colored_Label_colors.at(opt.first);
+            option_without_field = true;
 
-        if (!colored_label_clr) {
+        if (!option_without_field) {
             field = get_field(opt.first);
             if (!field)
                 continue;
@@ -798,8 +798,14 @@ void Tab::decorate()
             tt = &m_tt_white_bullet;
         }
 
-        if (colored_label_clr) {
-            *colored_label_clr = *color;
+        if (option_without_field) {
+            if (Line* line = get_line(opt.first)) {
+                line->set_undo_bitmap(icon);
+                line->set_undo_to_sys_bitmap(sys_icon);
+                line->set_undo_tooltip(tt);
+                line->set_undo_to_sys_tooltip(sys_tt);
+                line->set_label_colour(color);
+            }
             continue;
         }
 
@@ -1079,7 +1085,7 @@ void Tab::on_roll_back_value(const bool to_sys /*= true*/)
 
     m_postpone_update_ui = false;
 
-    // When all values are rolled, then we hane to update whole tab in respect to the reverted values
+    // When all values are rolled, then we have to update whole tab in respect to the reverted values
     update();
 
     // BBS: restore all pages in preset, update_dirty also update combobox
@@ -1261,6 +1267,11 @@ Field* Tab::get_field(const t_config_option_key& opt_key, int opt_index/* = -1*/
     return m_active_page ? m_active_page->get_field(opt_key, opt_index) : nullptr;
 }
 
+Line* Tab::get_line(const t_config_option_key& opt_key)
+{
+    return m_active_page ? m_active_page->get_line(opt_key) : nullptr;
+}
+
 std::pair<OG_CustomCtrl*, bool*> Tab::get_custom_ctrl_with_blinking_ptr(const t_config_option_key& opt_key, int opt_index/* = -1*/)
 {
     if (!m_active_page)
@@ -5279,8 +5290,12 @@ void Tab::create_line_with_widget(ConfigOptionsGroup* optgroup, const std::strin
     line.widget = widget;
     line.label_path = path;
 
-    m_colored_Label_colors[opt_key] = m_default_text_clr;
-    line.full_Label_color = &m_colored_Label_colors[opt_key];
+    // set default undo ui
+    line.set_undo_bitmap(&m_bmp_white_bullet);
+    line.set_undo_to_sys_bitmap(&m_bmp_white_bullet);
+    line.set_undo_tooltip(&m_tt_white_bullet);
+    line.set_undo_to_sys_tooltip(&m_tt_white_bullet);
+    line.set_label_colour(&m_default_text_clr);
 
     optgroup->append_line(line);
 }
@@ -5638,12 +5653,10 @@ Field *Page::get_field(const t_config_option_key &opt_key, int opt_index /*= -1*
 
 Line *Page::get_line(const t_config_option_key &opt_key)
 {
-    Line *line = nullptr;
-    for (auto opt : m_optgroups) {
-        line = opt->get_line(opt_key);
-        if (line != nullptr) return line;
-    }
-    return line;
+    for (auto opt : m_optgroups)
+        if (Line* line = opt->get_line(opt_key))
+            return line;
+    return nullptr;
 }
 
 bool Page::set_value(const t_config_option_key &opt_key, const boost::any &value)
diff --git a/src/slic3r/GUI/Tab.hpp b/src/slic3r/GUI/Tab.hpp
index d0e2c68db0d..3f38fed3195 100644
--- a/src/slic3r/GUI/Tab.hpp
+++ b/src/slic3r/GUI/Tab.hpp
@@ -369,6 +369,7 @@ class Tab: public wxPanel
     virtual void    msw_rescale();
     virtual void	sys_color_changed();
 	Field*			get_field(const t_config_option_key& opt_key, int opt_index = -1) const;
+	Line*			get_line(const t_config_option_key& opt_key);
 	std::pair<OG_CustomCtrl*, bool*> get_custom_ctrl_with_blinking_ptr(const t_config_option_key& opt_key, int opt_index = -1);
 
     Field*          get_field(const t_config_option_key &opt_key, Page** selected_page, int opt_index = -1);

From accdbb9661ede7ab8b535d6cc79cc2a49a5987d8 Mon Sep 17 00:00:00 2001
From: Ocraftyone <Ocraftyone@users.noreply.github.com>
Date: Sat, 23 Dec 2023 06:04:43 -0500
Subject: [PATCH 02/39] Implement Preparation for Edit Custom Gcode

Original Commit: prusa3d/PrusaSlicer@7db83d5

Co-authored-by: YuSanka <yusanka@gmail.com>
---
 src/slic3r/GUI/Field.cpp         |  5 ++
 src/slic3r/GUI/Field.hpp         |  5 ++
 src/slic3r/GUI/OG_CustomCtrl.cpp | 87 +++++++++++++++++++++++---------
 src/slic3r/GUI/OG_CustomCtrl.hpp |  4 +-
 src/slic3r/GUI/OptionsGroup.cpp  |  8 +++
 src/slic3r/GUI/OptionsGroup.hpp  |  2 +
 src/slic3r/GUI/Tab.cpp           | 28 +++++++++-
 src/slic3r/GUI/Tab.hpp           |  3 ++
 8 files changed, 117 insertions(+), 25 deletions(-)

diff --git a/src/slic3r/GUI/Field.cpp b/src/slic3r/GUI/Field.cpp
index c9b8d5368ab..13a9fa12836 100644
--- a/src/slic3r/GUI/Field.cpp
+++ b/src/slic3r/GUI/Field.cpp
@@ -196,6 +196,11 @@ void Field::on_back_to_sys_value()
 		m_back_to_sys_value(m_opt_id);
 }
 
+void Field::on_edit_value()
+{
+    if (m_fn_edit_value)
+        m_fn_edit_value(m_opt_id);
+}
 
 /// Fires the enable or disable function, based on the input.
 
diff --git a/src/slic3r/GUI/Field.hpp b/src/slic3r/GUI/Field.hpp
index 58b5dd5e2da..b5f5ceb9561 100644
--- a/src/slic3r/GUI/Field.hpp
+++ b/src/slic3r/GUI/Field.hpp
@@ -183,6 +183,8 @@ class Field : public UndoValueUIManager {
 	void			on_back_to_initial_value();
     /// Call the attached m_back_to_sys_value method. 
 	void			on_back_to_sys_value();
+    /// Call the attached m_fn_edit_value method.
+	void			on_edit_value();
 
 public:
     /// parent wx item, opportunity to refactor (probably not necessary - data duplication)
@@ -198,6 +200,9 @@ class Field : public UndoValueUIManager {
 	t_back_to_init	m_back_to_initial_value{ nullptr };
 	t_back_to_init	m_back_to_sys_value{ nullptr };
 
+	/// Callback function to edit field value
+	t_back_to_init	m_fn_edit_value{ nullptr };
+
 	// This is used to avoid recursive invocation of the field change/update by wxWidgets.
     bool			m_disable_change_event {false};
     bool			m_is_modified_value {false};
diff --git a/src/slic3r/GUI/OG_CustomCtrl.cpp b/src/slic3r/GUI/OG_CustomCtrl.cpp
index 68ffe0de896..2d796924aa6 100644
--- a/src/slic3r/GUI/OG_CustomCtrl.cpp
+++ b/src/slic3r/GUI/OG_CustomCtrl.cpp
@@ -373,22 +373,31 @@ void OG_CustomCtrl::OnMotion(wxMouseEvent& event)
             break;
         }
 
-        for (size_t opt_idx = 0; opt_idx < line.rects_undo_icon.size(); opt_idx++)
+        size_t undo_icons_cnt = line.rects_undo_icon.size();
+        assert(line.rects_undo_icon.size() == line.rects_undo_to_sys_icon.size());
+        const std::vector<Option>& option_set = line.og_line.get_options();
+        for (size_t opt_idx = 0; opt_idx < undo_icons_cnt; opt_idx++) {
+            const std::string& opt_key = option_set[opt_idx].opt_id;
             if (is_point_in_rect(pos, line.rects_undo_icon[opt_idx])) {
-                const std::vector<Option>& option_set = line.og_line.get_options();
-                Field* field = opt_group->get_field(option_set[opt_idx].opt_id);
-                if (field)
+                if (line.og_line.has_undo_ui())
+                    tooltip = *line.og_line.undo_tooltip();
+                else if (Field* field = opt_group->get_field(opt_key))
                     tooltip = *field->undo_tooltip();
                 break;
             }
-        for (size_t opt_idx = 0; opt_idx < line.rects_undo_to_sys_icon.size(); opt_idx++)
             if (is_point_in_rect(pos, line.rects_undo_to_sys_icon[opt_idx])) {
-                const std::vector<Option>& option_set = line.og_line.get_options();
-                Field* field = opt_group->get_field(option_set[opt_idx].opt_id);
-                if (field)
+                if (line.og_line.has_undo_ui())
+                    tooltip = *line.og_line.undo_to_sys_tooltip();
+                else if (Field* field = opt_group->get_field(opt_key))
                     tooltip = *field->undo_to_sys_tooltip();
                 break;
             }
+            if (opt_idx < line.rects_edit_icon.size() && is_point_in_rect(pos, line.rects_edit_icon[opt_idx])) {
+                if (Field* field = opt_group->get_field(opt_key); field && field->has_edit_ui())
+                    tooltip = *field->edit_tooltip();
+                break;
+            }
+        }
         if (!tooltip.IsEmpty())
             break;
     }
@@ -424,24 +433,40 @@ void OG_CustomCtrl::OnLeftDown(wxMouseEvent& event)
         if (!line.is_visible) continue;
         if (line.launch_browser())
             return;
-        for (size_t opt_idx = 0; opt_idx < line.rects_undo_icon.size(); opt_idx++)
+        size_t undo_icons_cnt = line.rects_undo_icon.size();
+        assert(line.rects_undo_icon.size() == line.rects_undo_to_sys_icon.size());
+
+        const std::vector<Option>& option_set = line.og_line.get_options();
+        for (size_t opt_idx = 0; opt_idx < undo_icons_cnt; opt_idx++) {
+            const std::string& opt_key = option_set[opt_idx].opt_id;
             if (is_point_in_rect(pos, line.rects_undo_icon[opt_idx])) {
-                const std::vector<Option>& option_set = line.og_line.get_options();
-                Field* field = opt_group->get_field(option_set[opt_idx].opt_id);
-                if (field)
+                if (line.og_line.has_undo_ui()) {
+                    if (ConfigOptionsGroup* conf_OG = dynamic_cast<ConfigOptionsGroup*>(line.ctrl->opt_group))
+                        conf_OG->back_to_initial_value(opt_key);
+                }
+                else if (Field* field = opt_group->get_field(opt_key))
                     field->on_back_to_initial_value();
                 event.Skip();
                 return;
             }
-        for (size_t opt_idx = 0; opt_idx < line.rects_undo_to_sys_icon.size(); opt_idx++)
             if (is_point_in_rect(pos, line.rects_undo_to_sys_icon[opt_idx])) {
-                const std::vector<Option>& option_set = line.og_line.get_options();
-                Field* field = opt_group->get_field(option_set[opt_idx].opt_id);
-                if (field)
+                if (line.og_line.has_undo_ui()) {
+                    if (ConfigOptionsGroup* conf_OG = dynamic_cast<ConfigOptionsGroup*>(line.ctrl->opt_group))
+                        conf_OG->back_to_sys_value(opt_key);
+                }
+                else if (Field* field = opt_group->get_field(opt_key))
                     field->on_back_to_sys_value();
                 event.Skip();
                 return;
             }
+
+            if (opt_idx < line.rects_edit_icon.size() && is_point_in_rect(pos, line.rects_edit_icon[opt_idx])) {
+                if (Field* field = opt_group->get_field(opt_key))
+                    field->on_edit_value();
+                event.Skip();
+                return;
+            }
+        }
     }
 
     SetFocusIgnoringChildren();
@@ -745,10 +770,14 @@ void OG_CustomCtrl::CtrlLine::render(wxDC& dc, wxCoord h_pos, wxCoord v_pos)
     bool suppress_hyperlinks = false;
     if (draw_just_act_buttons) {
         //BBS: GUI refactor
-        if (field && field->undo_bitmap())
-        //if (field)
-            // BBS: new layout
-            draw_act_bmps(dc, wxPoint(h_pos, v_pos), field->undo_to_sys_bitmap()->get_bitmap(), field->undo_bitmap()->get_bitmap(), field->blink());
+        if (field && field->undo_bitmap()) {
+            // if (field)
+            //  BBS: new layout
+            const wxPoint pos = draw_act_bmps(dc, wxPoint(h_pos, v_pos), field->undo_to_sys_bitmap()->get_bitmap(),
+                                              field->undo_bitmap()->get_bitmap(), field->blink());
+            if (field->has_edit_ui())
+                draw_edit_bmp(dc, pos, field->edit_bitmap());
+        }
         return;
     }
 
@@ -802,7 +831,7 @@ void OG_CustomCtrl::CtrlLine::render(wxDC& dc, wxCoord h_pos, wxCoord v_pos)
 
     auto draw_buttons = [&h_pos, &dc, &v_pos, this](Field* field, size_t bmp_rect_id = 0) {
         if (field && field->undo_to_sys_bitmap()) {
-            h_pos = draw_act_bmps(dc, wxPoint(h_pos, v_pos), field->undo_to_sys_bitmap()->get_bitmap(), field->undo_bitmap()->get_bitmap(), field->blink(), bmp_rect_id);
+            h_pos = draw_act_bmps(dc, wxPoint(h_pos, v_pos), field->undo_to_sys_bitmap()->get_bitmap(), field->undo_bitmap()->get_bitmap(), field->blink(), bmp_rect_id).x;
         }
 #ifndef DISABLE_BLINKING
         else if (field && !field->undo_to_sys_bitmap() && field->blink()) 
@@ -945,7 +974,7 @@ wxPoint OG_CustomCtrl::CtrlLine::draw_blinking_bmp(wxDC& dc, wxPoint pos, bool i
     return wxPoint(h_pos, v_pos);
 }
 
-wxCoord OG_CustomCtrl::CtrlLine::draw_act_bmps(wxDC& dc, wxPoint pos, const wxBitmapBundle& bmp_undo_to_sys, const wxBitmapBundle& bmp_undo, bool is_blinking, size_t rect_id)
+wxPoint OG_CustomCtrl::CtrlLine::draw_act_bmps(wxDC& dc, wxPoint pos, const wxBitmapBundle& bmp_undo_to_sys, const wxBitmapBundle& bmp_undo, bool is_blinking, size_t rect_id)
 {
 #ifndef DISABLE_BLINKING
     pos = draw_blinking_bmp(dc, pos, is_blinking);
@@ -979,7 +1008,19 @@ wxCoord OG_CustomCtrl::CtrlLine::draw_act_bmps(wxDC& dc, wxPoint pos, const wxBi
 
     h_pos += bmp_dim2 + ctrl->m_h_gap;
 
-    return h_pos;
+    return wxPoint(h_pos, v_pos);
+}
+
+wxCoord OG_CustomCtrl::CtrlLine::draw_edit_bmp(wxDC &dc, wxPoint pos, const wxBitmapBundle *bmp_edit)
+{
+    const wxCoord h_pos = pos.x + ctrl->m_h_gap;
+    const wxCoord v_pos = pos.y;
+    const int bmp_w = get_bitmap_size(bmp_edit, ctrl).GetWidth();
+    rects_edit_icon.emplace_back(wxRect(h_pos, v_pos, bmp_w, bmp_w));
+
+    dc.DrawBitmap(bmp_edit->GetBitmapFor(ctrl), h_pos, v_pos);
+
+    return h_pos + bmp_w + ctrl->m_h_gap;
 }
 
 bool OG_CustomCtrl::CtrlLine::launch_browser() const
diff --git a/src/slic3r/GUI/OG_CustomCtrl.hpp b/src/slic3r/GUI/OG_CustomCtrl.hpp
index 8e51c3a3704..e68f24e73c7 100644
--- a/src/slic3r/GUI/OG_CustomCtrl.hpp
+++ b/src/slic3r/GUI/OG_CustomCtrl.hpp
@@ -64,12 +64,14 @@ class OG_CustomCtrl :public wxPanel
         void    render(wxDC& dc, wxCoord h_pos, wxCoord v_pos);
         wxCoord draw_text      (wxDC& dc, wxPoint pos, const wxString& text, const wxColour* color, int width, bool is_url = false, bool is_main = false);
         wxPoint draw_blinking_bmp(wxDC& dc, wxPoint pos, bool is_blinking);
-        wxCoord draw_act_bmps(wxDC& dc, wxPoint pos, const wxBitmapBundle& bmp_undo_to_sys, const wxBitmapBundle& bmp_undo, bool is_blinking, size_t rect_id = 0);
+        wxPoint draw_act_bmps(wxDC& dc, wxPoint pos, const wxBitmapBundle& bmp_undo_to_sys, const wxBitmapBundle& bmp_undo, bool is_blinking, size_t rect_id = 0);
+        wxCoord draw_edit_bmp(wxDC& dc, wxPoint pos, const wxBitmapBundle* bmp_edit);
         bool    launch_browser() const;
         bool    is_separator() const { return og_line.is_separator(); }
 
         std::vector<wxRect> rects_undo_icon;
         std::vector<wxRect> rects_undo_to_sys_icon;
+        std::vector<wxRect> rects_edit_icon;
         wxRect              rect_label;
     };
 
diff --git a/src/slic3r/GUI/OptionsGroup.cpp b/src/slic3r/GUI/OptionsGroup.cpp
index a0e3fa00a9d..78b14a58fd2 100644
--- a/src/slic3r/GUI/OptionsGroup.cpp
+++ b/src/slic3r/GUI/OptionsGroup.cpp
@@ -102,6 +102,14 @@ const t_field& OptionsGroup::build_field(const t_config_option_key& id, const Co
 	};
     field->m_parent = parent();
 
+    if (edit_custom_gcode && opt.is_code) {
+        field->m_fn_edit_value = [this](std::string opt_id) {
+            if (!m_disabled)
+                this->edit_custom_gcode(opt_id);
+        };
+        field->set_edit_tooltip(_L("Edit CustomG-code"));
+    }
+
 	field->m_back_to_initial_value = [this](std::string opt_id) {
 		if (!m_disabled)
 			this->back_to_initial_value(opt_id);
diff --git a/src/slic3r/GUI/OptionsGroup.hpp b/src/slic3r/GUI/OptionsGroup.hpp
index 5b54edb92fd..eea187fa5fc 100644
--- a/src/slic3r/GUI/OptionsGroup.hpp
+++ b/src/slic3r/GUI/OptionsGroup.hpp
@@ -121,6 +121,8 @@ class OptionsGroup {
 
     std::function<void(wxWindow* win)> rescale_extra_column_item { nullptr };
     std::function<void(wxWindow* win)> rescale_near_label_widget { nullptr };
+
+    std::function<void(const t_config_option_key& opt_key)> edit_custom_gcode { nullptr };
     
     wxFont			sidetext_font {wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT) };
     wxFont			label_font {wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT) };
diff --git a/src/slic3r/GUI/Tab.cpp b/src/slic3r/GUI/Tab.cpp
index 4ac4837eabb..da88c229067 100644
--- a/src/slic3r/GUI/Tab.cpp
+++ b/src/slic3r/GUI/Tab.cpp
@@ -252,6 +252,8 @@ void Tab::create_preset_tab()
     // Bitmaps to be shown on the "Undo user changes" button next to each input field.
     add_scaled_bitmap(this, m_bmp_value_revert, "undo");
     add_scaled_bitmap(this, m_bmp_white_bullet, "dot");
+    // Bitmap to be shown on the "edit" button before to each editable input field.
+    add_scaled_bitmap(this, m_bmp_edit_value, "edit");
 
     set_tooltips_text();
 
@@ -817,6 +819,10 @@ void Tab::decorate()
         field->set_undo_tooltip(tt);
         field->set_undo_to_sys_tooltip(sys_tt);
         field->set_label_colour(color);
+
+        if (field->has_edit_ui())
+            field->set_edit_bitmap(&m_bmp_edit_value);
+
     }
 
     if (m_active_page)
@@ -2860,6 +2866,11 @@ static void validate_custom_gcode_cb(Tab* tab, ConfigOptionsGroupShp opt_group,
     tab->on_value_change(opt_key, value);
 }
 
+void Tab::edit_custom_gcode(const t_config_option_key& opt_key)
+{
+    MessageDialog(this, format_wxstr("Edit gcode for %1%", opt_key), this->title()).ShowModal();
+}
+
 void TabFilament::add_filament_overrides_page()
 {
     //BBS
@@ -3134,11 +3145,14 @@ void TabFilament::build()
         const int gcode_field_height = 15; // 150
         const int notes_field_height = 25; // 250
 
+        auto edit_custom_gcode_fn = [this](const t_config_option_key& opt_key) { edit_custom_gcode(opt_key); };
+
     page = add_options_page(L("Advanced"), "advanced");
         optgroup = page->new_optgroup(L("Filament start G-code"), L"param_gcode", 0);
         optgroup->m_on_change = [this, &optgroup_title = optgroup->title](const t_config_option_key& opt_key, const boost::any& value) {
             validate_custom_gcode_cb(this, optgroup_title, opt_key, value);
         };
+        optgroup->edit_custom_gcode = edit_custom_gcode_fn;
         option = optgroup->get_option("filament_start_gcode");
         option.opt.full_width = true;
         option.opt.is_code = true;
@@ -3149,6 +3163,7 @@ void TabFilament::build()
         optgroup->m_on_change = [this, &optgroup_title = optgroup->title](const t_config_option_key& opt_key, const boost::any& value) {
             validate_custom_gcode_cb(this, optgroup_title, opt_key, value);
         };
+        optgroup->edit_custom_gcode = edit_custom_gcode_fn;
         option = optgroup->get_option("filament_end_gcode");
         option.opt.full_width = true;
         option.opt.is_code = true;
@@ -3450,6 +3465,8 @@ void TabPrinter::build_fff()
         optgroup->append_single_option_line("support_chamber_temp_control", "chamber-temperature");
         optgroup->append_single_option_line("support_air_filtration", "air-filtration");
 
+        auto edit_custom_gcode_fn = [this](const t_config_option_key& opt_key) { edit_custom_gcode(opt_key); };
+
     const int gcode_field_height = 15; // 150
     const int notes_field_height = 25; // 250
     page = add_options_page(L("Machine gcode"), "cog");
@@ -3457,6 +3474,7 @@ void TabPrinter::build_fff()
         optgroup->m_on_change = [this, &optgroup_title = optgroup->title](const t_config_option_key& opt_key, const boost::any& value) {
             validate_custom_gcode_cb(this, optgroup_title, opt_key, value);
         };
+        optgroup->edit_custom_gcode = edit_custom_gcode_fn;
         option = optgroup->get_option("machine_start_gcode");
         option.opt.full_width = true;
         option.opt.is_code = true;
@@ -3467,6 +3485,7 @@ void TabPrinter::build_fff()
         optgroup->m_on_change = [this, &optgroup_title = optgroup->title](const t_config_option_key& opt_key, const boost::any& value) {
             validate_custom_gcode_cb(this, optgroup_title, opt_key, value);
         };
+        optgroup->edit_custom_gcode = edit_custom_gcode_fn;
         option = optgroup->get_option("machine_end_gcode");
         option.opt.full_width = true;
         option.opt.is_code = true;
@@ -3477,6 +3496,7 @@ void TabPrinter::build_fff()
         optgroup->m_on_change = [this, optgroup](const t_config_option_key &opt_key, const boost::any &value) {
             validate_custom_gcode_cb(this, optgroup, opt_key, value);
         };
+        optgroup->edit_custom_gcode = edit_custom_gcode_fn;
         option                = optgroup->get_option("printing_by_object_gcode");
         option.opt.full_width = true;
         option.opt.is_code    = true;
@@ -3488,6 +3508,7 @@ void TabPrinter::build_fff()
         optgroup->m_on_change = [this, &optgroup_title = optgroup->title](const t_config_option_key& opt_key, const boost::any& value) {
             validate_custom_gcode_cb(this, optgroup_title, opt_key, value);
         };
+        optgroup->edit_custom_gcode = edit_custom_gcode_fn;
         option = optgroup->get_option("before_layer_change_gcode");
         option.opt.full_width = true;
         option.opt.is_code = true;
@@ -3498,6 +3519,7 @@ void TabPrinter::build_fff()
         optgroup->m_on_change = [this, &optgroup_title = optgroup->title](const t_config_option_key& opt_key, const boost::any& value) {
             validate_custom_gcode_cb(this, optgroup_title, opt_key, value);
         };
+        optgroup->edit_custom_gcode = edit_custom_gcode_fn;
         option = optgroup->get_option("layer_change_gcode");
         option.opt.full_width = true;
         option.opt.is_code = true;
@@ -3508,6 +3530,7 @@ void TabPrinter::build_fff()
         optgroup->m_on_change = [this, &optgroup_title = optgroup->title](const t_config_option_key& opt_key, const boost::any& value) {
             validate_custom_gcode_cb(this, optgroup_title, opt_key, value);
         };
+        optgroup->edit_custom_gcode = edit_custom_gcode_fn;
         option = optgroup->get_option("time_lapse_gcode");
         option.opt.full_width = true;
         option.opt.is_code = true;
@@ -3518,6 +3541,7 @@ void TabPrinter::build_fff()
         optgroup->m_on_change = [this, &optgroup_title = optgroup->title](const t_config_option_key& opt_key, const boost::any& value) {
             validate_custom_gcode_cb(this, optgroup_title, opt_key, value);
         };
+        optgroup->edit_custom_gcode = edit_custom_gcode_fn;
         option = optgroup->get_option("change_filament_gcode");
         option.opt.full_width = true;
         option.opt.is_code = true;
@@ -3528,7 +3552,7 @@ void TabPrinter::build_fff()
         optgroup->m_on_change = [this, &optgroup_title = optgroup->title](const t_config_option_key &opt_key, const boost::any &value) {
             validate_custom_gcode_cb(this, optgroup_title, opt_key, value);
         };
-
+        optgroup->edit_custom_gcode = edit_custom_gcode_fn;
         option = optgroup->get_option("change_extrusion_role_gcode");
         option.opt.full_width = true;
         option.opt.is_code = true;
@@ -3539,6 +3563,7 @@ void TabPrinter::build_fff()
         optgroup->m_on_change = [this, &optgroup_title = optgroup->title](const t_config_option_key& opt_key, const boost::any& value) {
             validate_custom_gcode_cb(this, optgroup_title, opt_key, value);
         };
+        optgroup->edit_custom_gcode = edit_custom_gcode_fn;
         option = optgroup->get_option("machine_pause_gcode");
         option.opt.is_code = true;
         option.opt.height = gcode_field_height;//150;
@@ -3548,6 +3573,7 @@ void TabPrinter::build_fff()
         optgroup->m_on_change = [this, &optgroup_title = optgroup->title](const t_config_option_key& opt_key, const boost::any& value) {
             validate_custom_gcode_cb(this, optgroup_title, opt_key, value);
         };
+        optgroup->edit_custom_gcode = edit_custom_gcode_fn;
         option = optgroup->get_option("template_custom_gcode");
         option.opt.is_code = true;
         option.opt.height = gcode_field_height;//150;
diff --git a/src/slic3r/GUI/Tab.hpp b/src/slic3r/GUI/Tab.hpp
index 3f38fed3195..2cd052a972a 100644
--- a/src/slic3r/GUI/Tab.hpp
+++ b/src/slic3r/GUI/Tab.hpp
@@ -196,6 +196,8 @@ class Tab: public wxPanel
 	ScalableBitmap 		   *m_bmp_non_system;
 	// Bitmaps to be shown on the "Undo user changes" button next to each input field.
 	ScalableBitmap 			m_bmp_value_revert;
+    // Bitmaps to be shown on the "Undo user changes" button next to each input field.
+    ScalableBitmap 			m_bmp_edit_value;
 
     std::vector<ScalableButton*>	m_scaled_buttons = {};
     std::vector<ScalableBitmap*>	m_scaled_bitmaps = {};
@@ -402,6 +404,7 @@ class Tab: public wxPanel
 	void restore_last_select_item();
 
 	static bool validate_custom_gcode(const wxString& title, const std::string& gcode);
+    void        edit_custom_gcode(const t_config_option_key &opt_key);
 	bool        validate_custom_gcodes();
     bool        validate_custom_gcodes_was_shown{ false };
     void        set_just_edit(bool just_edit);

From dd802764b9919a893763ce531c2cac521138b79c Mon Sep 17 00:00:00 2001
From: Ocraftyone <Ocraftyone@users.noreply.github.com>
Date: Sun, 24 Dec 2023 05:20:27 -0500
Subject: [PATCH 03/39] Add first impl of EditGCodeDialog

Only current issue is that the grabber for the resizeable window is currently white (ongoing issue for Orca)

Original Commit: prusa3d/PrusaSlicer@a8307bf

Co-authored-by: YuSanka <yusanka@gmail.com>
---
 src/slic3r/CMakeLists.txt          |   2 +
 src/slic3r/GUI/EditGCodeDialog.cpp | 251 +++++++++++++++++++++++++++++
 src/slic3r/GUI/EditGCodeDialog.hpp |  51 ++++++
 src/slic3r/GUI/Tab.cpp             |   8 +-
 src/slic3r/GUI/Tab.hpp             |   4 +-
 5 files changed, 314 insertions(+), 2 deletions(-)
 create mode 100644 src/slic3r/GUI/EditGCodeDialog.cpp
 create mode 100644 src/slic3r/GUI/EditGCodeDialog.hpp

diff --git a/src/slic3r/CMakeLists.txt b/src/slic3r/CMakeLists.txt
index 7d8e060ea7d..fc58e97178d 100644
--- a/src/slic3r/CMakeLists.txt
+++ b/src/slic3r/CMakeLists.txt
@@ -212,6 +212,8 @@ set(SLIC3R_GUI_SOURCES
     GUI/PresetComboBoxes.cpp
     GUI/BitmapComboBox.hpp
     GUI/BitmapComboBox.cpp
+    GUI/EditGCodeDialog.hpp
+    GUI/EditGCodeDialog.cpp
     GUI/SavePresetDialog.hpp
     GUI/SavePresetDialog.cpp
     GUI/GUI_Colors.hpp
diff --git a/src/slic3r/GUI/EditGCodeDialog.cpp b/src/slic3r/GUI/EditGCodeDialog.cpp
new file mode 100644
index 00000000000..4af46d89e98
--- /dev/null
+++ b/src/slic3r/GUI/EditGCodeDialog.cpp
@@ -0,0 +1,251 @@
+#include "EditGCodeDialog.hpp"
+
+#include <vector>
+#include <string>
+
+#include <wx/sizer.h>
+#include <wx/stattext.h>
+#include <wx/textctrl.h>
+#include <wx/button.h>
+#include <wx/listbox.h>
+#include <wx/statbox.h>
+#include <wx/wupdlock.h>
+
+#include "GUI.hpp"
+#include "GUI_App.hpp"
+#include "MainFrame.hpp"
+#include "format.hpp"
+#include "Tab.hpp"
+#include "wxExtensions.hpp"
+#include "BitmapCache.hpp"
+#include "MsgDialog.hpp"
+
+#define BTN_GAP  FromDIP(20)
+#define BTN_SIZE wxSize(FromDIP(58), FromDIP(24))
+
+namespace Slic3r {
+namespace GUI {
+
+static wxArrayString get_patterns_list()
+{
+    wxArrayString patterns;
+    for (const wxString& item : {          
+          ";comment"//format_wxstr(";%1%",_L("comment"))
+        , "M862.3 P \"[printer_model]\" ; printer model check"
+        , "M862.1 P[nozzle_diameter]; nozzle diameter check"
+        , "M115 U3.12.2; tell printer latest fw version"
+        , "G90; use absolute coordinates"
+        , "M83; extruder relative mode"
+        , "M104 S[first_layer_temperature]; set extruder temp"
+        , "M140 S[first_layer_bed_temperature]; set bed temp"
+        , "M190 S[first_layer_bed_temperature]; wait for bed temp"
+        , "M109 S[first_layer_temperature]; wait for extruder temp"
+        , "G28 W; home all without mesh bed level"
+        , "G80; mesh bed leveling"
+        , "M403 E0 F {\n"
+          " + ((filament_type[0] == \"FLEX\") ? 1 : ((filament_type[0] == \"PVA\") ? 2 : 0))\n"
+          "}"
+        , "{if not OPTION}"
+        , "G1"
+        , "T[initial_tool]; select extruder"
+        , "G92 E0"
+        , "{endif}"
+    })
+        patterns.Add(item);
+    return patterns;
+}
+
+//------------------------------------------
+//          EditGCodeDialog
+//------------------------------------------
+
+EditGCodeDialog::EditGCodeDialog(wxWindow* parent, const std::string& key, const std::string& value) :
+    DPIDialog(parent, wxID_ANY, format_wxstr(_L("Edit Custom G-code (%1%)"), key), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER)
+{
+    SetFont(wxGetApp().normal_font());
+    SetBackgroundColour(*wxWHITE);
+    wxGetApp().UpdateDarkUI(this);
+
+    int border = 10;
+    int em = em_unit();
+
+    wxStaticText* label_top = new wxStaticText(this, wxID_ANY, _L("Edit your custom G-code using patterns"));
+    label_top->SetFont(wxGetApp().bold_font());
+
+    auto* grid_sizer = new wxFlexGridSizer(1, 3, 5, 15);
+    grid_sizer->SetFlexibleDirection(wxBOTH);
+
+    m_patterns_list = new wxListBox(this, wxID_ANY, wxDefaultPosition, wxSize(em * 15, em * 30), get_patterns_list(), wxLB_SINGLE | wxLB_NEEDED_SB | wxLB_SORT
+#ifdef _WIN32
+        | wxBORDER_SIMPLE
+#endif
+    );
+    m_patterns_list->SetFont(wxGetApp().code_font());
+    wxGetApp().UpdateDarkUI(m_patterns_list);
+
+    m_add_btn = new ScalableButton(this, wxID_ANY, "add_copies");
+    m_add_btn->SetToolTip(_L("Add selected pettern to the G-code"));
+
+    m_gcode_editor = new wxTextCtrl(this, wxID_ANY, value, wxDefaultPosition, wxSize(em * 45, em * 30), wxTE_MULTILINE
+#ifdef _WIN32
+    | wxBORDER_SIMPLE
+#endif
+    );
+    m_gcode_editor->SetFont(wxGetApp().code_font());
+    wxGetApp().UpdateDarkUI(m_gcode_editor);
+
+    grid_sizer->Add(m_patterns_list,    1, wxEXPAND);
+    grid_sizer->Add(m_add_btn,          0, wxALIGN_CENTER_VERTICAL);
+    grid_sizer->Add(m_gcode_editor,     2, wxEXPAND);
+
+    grid_sizer->AddGrowableRow(0, 1);
+    grid_sizer->AddGrowableCol(0, 1);
+    grid_sizer->AddGrowableCol(2, 1);
+
+    auto btn_sizer = create_btn_sizer(wxOK | wxCANCEL);
+    for(auto btn : m_button_list)
+        wxGetApp().UpdateDarkUI(btn.second);
+
+    wxBoxSizer* topSizer = new wxBoxSizer(wxVERTICAL);
+
+    topSizer->Add(label_top           , 0, wxEXPAND | wxLEFT | wxTOP | wxRIGHT, border);
+    topSizer->Add(grid_sizer          , 1, wxEXPAND | wxLEFT | wxTOP | wxRIGHT, border);
+    topSizer->Add(btn_sizer                , 0, wxEXPAND | wxALL, border);
+
+    SetSizer(topSizer);
+    topSizer->SetSizeHints(this);
+
+    this->Fit();
+    this->Layout();
+
+    this->CenterOnScreen();
+
+    wxGetApp().UpdateDlgDarkUI(this);
+
+    m_patterns_list->Bind(wxEVT_LISTBOX_DCLICK, [this](wxCommandEvent& evt) {
+        wxString val = m_patterns_list->GetString(m_patterns_list->GetSelection());
+        assert(!val.IsEmpty());
+        auto insert_to = m_gcode_editor->GetInsertionPoint();
+        m_gcode_editor->WriteText(val);
+    });
+}
+
+void EditGCodeDialog::on_dpi_changed(const wxRect&suggested_rect)
+{
+    const int& em = em_unit();
+
+    //m_optgroup->msw_rescale();
+
+//    msw_buttons_rescale(this, em, { wxID_OK, wxID_CANCEL });
+
+    for (auto button_item : m_button_list)
+    {
+        if (button_item.first == wxRESET)
+        {
+            button_item.second->SetMinSize(wxSize(FromDIP(75), FromDIP(24)));
+            button_item.second->SetCornerRadius(FromDIP(12));
+        }
+        if (button_item.first == wxOK) {
+            button_item.second->SetMinSize(BTN_SIZE);
+            button_item.second->SetCornerRadius(FromDIP(12));
+        }
+        if (button_item.first == wxCANCEL) {
+            button_item.second->SetMinSize(BTN_SIZE);
+            button_item.second->SetCornerRadius(FromDIP(12));
+        }
+    }
+
+    const wxSize& size = wxSize(45 * em, 35 * em);
+    SetMinSize(size);
+
+    Fit();
+    Refresh();
+}
+
+void EditGCodeDialog::on_sys_color_changed()
+{
+    m_add_btn->sys_color_changed();
+}
+
+void EditGCodeDialog::OnOK(wxEvent& event)
+{
+    event.Skip();
+}
+
+//Orca
+wxBoxSizer* EditGCodeDialog::create_btn_sizer(long flags)
+{
+    auto btn_sizer = new wxBoxSizer(wxHORIZONTAL);
+    btn_sizer->AddStretchSpacer();
+
+    StateColor ok_btn_bg(
+        std::pair<wxColour, int>(wxColour(0, 137, 123), StateColor::Pressed),
+        std::pair<wxColour, int>(wxColour(38, 166, 154), StateColor::Hovered),
+        std::pair<wxColour, int>(wxColour(0, 150, 136), StateColor::Normal)
+    );
+
+    StateColor ok_btn_bd(
+        std::pair<wxColour, int>(wxColour(0, 150, 136), StateColor::Normal)
+    );
+
+    StateColor ok_btn_text(
+        std::pair<wxColour, int>(wxColour(255, 255, 254), StateColor::Normal)
+    );
+
+    StateColor cancel_btn_bg(
+        std::pair<wxColour, int>(wxColour(206, 206, 206), StateColor::Pressed),
+        std::pair<wxColour, int>(wxColour(238, 238, 238), StateColor::Hovered),
+        std::pair<wxColour, int>(wxColour(255, 255, 255), StateColor::Normal)
+    );
+
+    StateColor cancel_btn_bd_(
+        std::pair<wxColour, int>(wxColour(38, 46, 48), StateColor::Normal)
+    );
+
+    StateColor cancel_btn_text(
+        std::pair<wxColour, int>(wxColour(38, 46, 48), StateColor::Normal)
+    );
+
+
+    StateColor calc_btn_bg(
+        std::pair<wxColour, int>(wxColour(0, 137, 123), StateColor::Pressed),
+        std::pair<wxColour, int>(wxColour(38, 166, 154), StateColor::Hovered),
+        std::pair<wxColour, int>(wxColour(0, 150, 136), StateColor::Normal)
+    );
+
+    StateColor calc_btn_bd(
+        std::pair<wxColour, int>(wxColour(0, 150, 136), StateColor::Normal)
+    );
+
+    StateColor calc_btn_text(
+        std::pair<wxColour, int>(wxColour(255, 255, 254), StateColor::Normal)
+    );
+
+    if (flags & wxOK) {
+        Button* ok_btn = new Button(this, _L("OK"));
+        ok_btn->SetMinSize(BTN_SIZE);
+        ok_btn->SetCornerRadius(FromDIP(12));
+        ok_btn->SetBackgroundColor(ok_btn_bg);
+        ok_btn->SetBorderColor(ok_btn_bd);
+        ok_btn->SetTextColor(ok_btn_text);
+        ok_btn->SetFocus();
+        ok_btn->SetId(wxID_OK);
+        btn_sizer->Add(ok_btn, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL, BTN_GAP);
+        m_button_list[wxOK] = ok_btn;
+    }
+    if (flags & wxCANCEL) {
+        Button* cancel_btn = new Button(this, _L("Cancel"));
+        cancel_btn->SetMinSize(BTN_SIZE);
+        cancel_btn->SetCornerRadius(FromDIP(12));
+        cancel_btn->SetBackgroundColor(cancel_btn_bg);
+        cancel_btn->SetBorderColor(cancel_btn_bd_);
+        cancel_btn->SetTextColor(cancel_btn_text);
+        cancel_btn->SetId(wxID_CANCEL);
+        btn_sizer->Add(cancel_btn, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL, BTN_GAP / 2);
+        m_button_list[wxCANCEL] = cancel_btn;
+    }
+
+    return btn_sizer;
+}
+
+}}    // namespace Slic3r::GUI
diff --git a/src/slic3r/GUI/EditGCodeDialog.hpp b/src/slic3r/GUI/EditGCodeDialog.hpp
new file mode 100644
index 00000000000..4464301a3b0
--- /dev/null
+++ b/src/slic3r/GUI/EditGCodeDialog.hpp
@@ -0,0 +1,51 @@
+#ifndef slic3r_EditGCodeDialog_hpp_
+#define slic3r_EditGCodeDialog_hpp_
+
+#include <vector>
+
+#include <wx/gdicmn.h>
+#include <slic3r/GUI/Widgets/Button.hpp>
+
+#include "GUI_Utils.hpp"
+
+class wxListBox;
+class wxTextCtrl;
+//class wxStaticText;
+class ScalableButton;
+//class wxBoxSizer;
+
+namespace Slic3r {
+
+namespace GUI {
+
+class PresetComboBox;
+
+//------------------------------------------
+//          EditGCodeDialog
+//------------------------------------------
+
+class EditGCodeDialog : public DPIDialog
+{
+    wxListBox*          m_patterns_list {nullptr};
+    ScalableButton*     m_add_btn       {nullptr};
+    wxTextCtrl*         m_gcode_editor  {nullptr};
+
+    void OnOK(wxEvent& event);
+
+public:
+    EditGCodeDialog(wxWindow* parent, const std::string& key, const std::string& value);
+    ~EditGCodeDialog() {}
+
+protected:
+    std::unordered_map<int, Button *> m_button_list;
+
+    void on_dpi_changed(const wxRect& suggested_rect) override;
+    void on_sys_color_changed() override;
+    wxBoxSizer* EditGCodeDialog::create_btn_sizer(long flags);
+};
+
+
+} // namespace GUI
+} // namespace Slic3r
+
+#endif
diff --git a/src/slic3r/GUI/Tab.cpp b/src/slic3r/GUI/Tab.cpp
index da88c229067..be2aee36ee3 100644
--- a/src/slic3r/GUI/Tab.cpp
+++ b/src/slic3r/GUI/Tab.cpp
@@ -37,6 +37,7 @@
 #include "format.hpp"
 #include "UnsavedChangesDialog.hpp"
 #include "SavePresetDialog.hpp"
+#include "EditGCodeDialog.hpp"
 #include "MsgDialog.hpp"
 #include "Notebook.hpp"
 
@@ -2868,7 +2869,12 @@ static void validate_custom_gcode_cb(Tab* tab, ConfigOptionsGroupShp opt_group,
 
 void Tab::edit_custom_gcode(const t_config_option_key& opt_key)
 {
-    MessageDialog(this, format_wxstr("Edit gcode for %1%", opt_key), this->title()).ShowModal();
+    EditGCodeDialog(this, opt_key, m_config->opt_string(opt_key)).ShowModal();
+}
+
+void TabFilament::edit_custom_gcode(const t_config_option_key& opt_key)
+{
+    EditGCodeDialog(this, opt_key, m_config->opt_string(opt_key, unsigned(m_presets_choice->GetSelection()))).ShowModal();
 }
 
 void TabFilament::add_filament_overrides_page()
diff --git a/src/slic3r/GUI/Tab.hpp b/src/slic3r/GUI/Tab.hpp
index 2cd052a972a..64f88f35b60 100644
--- a/src/slic3r/GUI/Tab.hpp
+++ b/src/slic3r/GUI/Tab.hpp
@@ -404,11 +404,12 @@ class Tab: public wxPanel
 	void restore_last_select_item();
 
 	static bool validate_custom_gcode(const wxString& title, const std::string& gcode);
-    void        edit_custom_gcode(const t_config_option_key &opt_key);
 	bool        validate_custom_gcodes();
     bool        validate_custom_gcodes_was_shown{ false };
     void        set_just_edit(bool just_edit);
 
+    virtual void edit_custom_gcode(const t_config_option_key &opt_key);
+
 protected:
 	void			create_line_with_widget(ConfigOptionsGroup* optgroup, const std::string& opt_key, const std::string& path, widget_t widget);
 	wxSizer*		compatible_widget_create(wxWindow* parent, PresetDependencies &deps);
@@ -561,6 +562,7 @@ class TabFilament : public Tab
 	void		update() override;
 	void		clear_pages() override;
 	bool 		supports_printer_technology(const PrinterTechnology tech) const override { return tech == ptFFF; }
+    void        edit_custom_gcode(const t_config_option_key& opt_key) override;
 };
 
 class TabPrinter : public Tab

From bdac496130662c8cd6b82a27b865f4caf7fcbfda Mon Sep 17 00:00:00 2001
From: Ocraftyone <Ocraftyone@users.noreply.github.com>
Date: Mon, 25 Dec 2023 03:26:36 -0500
Subject: [PATCH 04/39] Implement ParamsViewCtrl + GUI_App : Fixed update of
 the dark mode, when DataViewCtrl doesn't have header -Orca: currently doesn't
 seem to display dataview labels properly. TBD if it continues to be an issue.

Original Commit: prusa3d/PrusaSlicer@c577b7f

Co-authored-by: YuSanka <yusanka@gmail.com>
---
 src/slic3r/GUI/EditGCodeDialog.cpp | 487 +++++++++++++++++++++++++----
 src/slic3r/GUI/EditGCodeDialog.hpp | 211 ++++++++++++-
 src/slic3r/GUI/GUI_App.cpp         |  19 +-
 src/slic3r/GUI/Tab.cpp             |  33 +-
 src/slic3r/GUI/Tab.hpp             |   8 +-
 5 files changed, 684 insertions(+), 74 deletions(-)

diff --git a/src/slic3r/GUI/EditGCodeDialog.cpp b/src/slic3r/GUI/EditGCodeDialog.cpp
index 4af46d89e98..3f56c672d52 100644
--- a/src/slic3r/GUI/EditGCodeDialog.cpp
+++ b/src/slic3r/GUI/EditGCodeDialog.cpp
@@ -7,8 +7,6 @@
 #include <wx/stattext.h>
 #include <wx/textctrl.h>
 #include <wx/button.h>
-#include <wx/listbox.h>
-#include <wx/statbox.h>
 #include <wx/wupdlock.h>
 
 #include "GUI.hpp"
@@ -18,7 +16,11 @@
 #include "Tab.hpp"
 #include "wxExtensions.hpp"
 #include "BitmapCache.hpp"
+#include "ExtraRenderers.hpp"
 #include "MsgDialog.hpp"
+#include "Plater.hpp"
+
+#include "libslic3r/Preset.hpp"
 
 #define BTN_GAP  FromDIP(20)
 #define BTN_SIZE wxSize(FromDIP(58), FromDIP(24))
@@ -29,27 +31,14 @@ namespace GUI {
 static wxArrayString get_patterns_list()
 {
     wxArrayString patterns;
-    for (const wxString& item : {          
-          ";comment"//format_wxstr(";%1%",_L("comment"))
-        , "M862.3 P \"[printer_model]\" ; printer model check"
-        , "M862.1 P[nozzle_diameter]; nozzle diameter check"
-        , "M115 U3.12.2; tell printer latest fw version"
-        , "G90; use absolute coordinates"
-        , "M83; extruder relative mode"
-        , "M104 S[first_layer_temperature]; set extruder temp"
-        , "M140 S[first_layer_bed_temperature]; set bed temp"
-        , "M190 S[first_layer_bed_temperature]; wait for bed temp"
-        , "M109 S[first_layer_temperature]; wait for extruder temp"
-        , "G28 W; home all without mesh bed level"
-        , "G80; mesh bed leveling"
-        , "M403 E0 F {\n"
-          " + ((filament_type[0] == \"FLEX\") ? 1 : ((filament_type[0] == \"PVA\") ? 2 : 0))\n"
-          "}"
-        , "{if not OPTION}"
-        , "G1"
-        , "T[initial_tool]; select extruder"
-        , "G92 E0"
-        , "{endif}"
+    for (const wxString& item : {
+          "printer_model"
+        , "nozzle_diameter"
+        , "first_layer_temperature"
+        , "first_layer_bed_temperature"
+        , "first_layer_bed_temperature"
+        , "first_layer_temperature"
+        , "initial_tool"
     })
         patterns.Add(item);
     return patterns;
@@ -65,26 +54,22 @@ EditGCodeDialog::EditGCodeDialog(wxWindow* parent, const std::string& key, const
     SetFont(wxGetApp().normal_font());
     SetBackgroundColour(*wxWHITE);
     wxGetApp().UpdateDarkUI(this);
+    wxGetApp().UpdateDlgDarkUI(this);
 
     int border = 10;
     int em = em_unit();
 
-    wxStaticText* label_top = new wxStaticText(this, wxID_ANY, _L("Edit your custom G-code using patterns"));
-    label_top->SetFont(wxGetApp().bold_font());
+    wxStaticText* label_top = new wxStaticText(this, wxID_ANY, _L("Built-in placeholders (Double click item to add to G-code)") + ":");
 
     auto* grid_sizer = new wxFlexGridSizer(1, 3, 5, 15);
     grid_sizer->SetFlexibleDirection(wxBOTH);
 
-    m_patterns_list = new wxListBox(this, wxID_ANY, wxDefaultPosition, wxSize(em * 15, em * 30), get_patterns_list(), wxLB_SINGLE | wxLB_NEEDED_SB | wxLB_SORT
-#ifdef _WIN32
-        | wxBORDER_SIMPLE
-#endif
-    );
-    m_patterns_list->SetFont(wxGetApp().code_font());
-    wxGetApp().UpdateDarkUI(m_patterns_list);
+    m_params_list = new ParamsViewCtrl(this, wxSize(em * 20, em * 30));
+    m_params_list->SetFont(wxGetApp().code_font());
+    wxGetApp().UpdateDarkUI(m_params_list);
 
     m_add_btn = new ScalableButton(this, wxID_ANY, "add_copies");
-    m_add_btn->SetToolTip(_L("Add selected pettern to the G-code"));
+    m_add_btn->SetToolTip(_L("Add selected placeholder to G-code"));
 
     m_gcode_editor = new wxTextCtrl(this, wxID_ANY, value, wxDefaultPosition, wxSize(em * 45, em * 30), wxTE_MULTILINE
 #ifdef _WIN32
@@ -94,7 +79,7 @@ EditGCodeDialog::EditGCodeDialog(wxWindow* parent, const std::string& key, const
     m_gcode_editor->SetFont(wxGetApp().code_font());
     wxGetApp().UpdateDarkUI(m_gcode_editor);
 
-    grid_sizer->Add(m_patterns_list,    1, wxEXPAND);
+    grid_sizer->Add(m_params_list,    1, wxEXPAND);
     grid_sizer->Add(m_add_btn,          0, wxALIGN_CENTER_VERTICAL);
     grid_sizer->Add(m_gcode_editor,     2, wxEXPAND);
 
@@ -102,6 +87,10 @@ EditGCodeDialog::EditGCodeDialog(wxWindow* parent, const std::string& key, const
     grid_sizer->AddGrowableCol(0, 1);
     grid_sizer->AddGrowableCol(2, 1);
 
+    m_param_label = new wxStaticText(this, wxID_ANY, _L("Select placeholder"));
+    m_param_label->SetFont(wxGetApp().bold_font());
+
+    //Orca: use custom buttons
     auto btn_sizer = create_btn_sizer(wxOK | wxCANCEL);
     for(auto btn : m_button_list)
         wxGetApp().UpdateDarkUI(btn.second);
@@ -110,6 +99,7 @@ EditGCodeDialog::EditGCodeDialog(wxWindow* parent, const std::string& key, const
 
     topSizer->Add(label_top           , 0, wxEXPAND | wxLEFT | wxTOP | wxRIGHT, border);
     topSizer->Add(grid_sizer          , 1, wxEXPAND | wxLEFT | wxTOP | wxRIGHT, border);
+    topSizer->Add(m_param_label       , 0, wxEXPAND | wxLEFT | wxTOP | wxRIGHT, border);
     topSizer->Add(btn_sizer                , 0, wxEXPAND | wxALL, border);
 
     SetSizer(topSizer);
@@ -120,13 +110,106 @@ EditGCodeDialog::EditGCodeDialog(wxWindow* parent, const std::string& key, const
 
     this->CenterOnScreen();
 
-    wxGetApp().UpdateDlgDarkUI(this);
+    init_params_list();
+    bind_list_and_button();
+}
+
+std::string EditGCodeDialog::get_edited_gcode() const
+{
+    return into_u8(m_gcode_editor->GetValue());
+}
+
+void EditGCodeDialog::init_params_list()
+{
+    auto list = get_patterns_list();
+
+    m_params_list->AppendGroup(GroupParamsType::SlicingState);
+    for (const auto& sub_gr : { SubSlicingState::ReadOnly, SubSlicingState::ReadWrite }) {
+        int i = 0;
+        for (const wxString& name : list) {
+            const auto param_type = static_cast<ParamType>(1 + std::modulus<int>()(i, 3));
+            m_params_list->AppendParam(GroupParamsType::SlicingState, param_type, into_u8(name), sub_gr);
+            ++i;
+        }
+    }
+
+    auto get_set_from_vec = [](const std::vector<std::string>& vec) {
+        return std::set<std::string>(vec.begin(), vec.end());
+    };
+
+    const bool is_fff = wxGetApp().plater()->printer_technology() == ptFFF;
+    const std::set<std::string> print_options    = get_set_from_vec(is_fff ? Preset::print_options()    : Preset::sla_print_options());
+    const std::set<std::string> material_options = get_set_from_vec(is_fff ? Preset::filament_options() : Preset::sla_material_options());
+    const std::set<std::string> printer_options  = get_set_from_vec(is_fff ? Preset::printer_options()  : Preset::sla_printer_options());
+
+    const auto& full_config = wxGetApp().preset_bundle->full_config();
+
+    const auto& def = full_config.def()->get("")->label;
 
-    m_patterns_list->Bind(wxEVT_LISTBOX_DCLICK, [this](wxCommandEvent& evt) {
-        wxString val = m_patterns_list->GetString(m_patterns_list->GetSelection());
-        assert(!val.IsEmpty());
-        auto insert_to = m_gcode_editor->GetInsertionPoint();
-        m_gcode_editor->WriteText(val);
+    m_params_list->AppendGroup(GroupParamsType::PrintSettings);
+    for (const auto& opt : print_options)
+        if (const ConfigOption *optptr = full_config.optptr(opt))
+            m_params_list->AppendParam(GroupParamsType::PrintSettings,    optptr->is_scalar() ? ParamType::Scalar : ParamType::Vector, opt);
+
+    m_params_list->AppendGroup(GroupParamsType::MaterialSettings);
+    for (const auto& opt : material_options)
+        if (const ConfigOption *optptr = full_config.optptr(opt))
+            m_params_list->AppendParam(GroupParamsType::MaterialSettings, optptr->is_scalar() ? ParamType::Scalar : ParamType::FilamentVector, opt);
+
+    m_params_list->AppendGroup(GroupParamsType::PrinterSettings);
+    for (const auto& opt : printer_options)
+        if (const ConfigOption *optptr = full_config.optptr(opt))
+            m_params_list->AppendParam(GroupParamsType::PrinterSettings,  optptr->is_scalar() ? ParamType::Scalar : ParamType::Vector, opt);
+}
+
+void EditGCodeDialog::add_selected_value_to_gcode()
+{
+    const wxString val = m_params_list->GetSelectedValue();
+    if (!val.IsEmpty())
+        m_gcode_editor->WriteText(val + "\n");
+}
+
+void EditGCodeDialog::bind_list_and_button()
+{
+    m_params_list->Bind(wxEVT_DATAVIEW_SELECTION_CHANGED, [this](wxDataViewEvent& evt) {
+        wxString label;
+
+        const std::string opt_key = m_params_list->GetSelectedParamKey();
+        if (!opt_key.empty()) {
+            const auto& full_config = wxGetApp().preset_bundle->full_config();
+            if (const ConfigDef* def = full_config.def();
+                def && def->has(opt_key)) {
+                const ConfigOptionDef* cod    = def->get(opt_key);
+                const ConfigOption*    optptr = full_config.optptr(opt_key);
+                const ConfigOptionType type   = optptr->type();
+
+                wxString type_str = type == coNone                                          ? "none" :
+                                    type == coFloat || type == coFloats                     ? "float" :
+                                    type == coInt || type == coInts                         ? "integer" :
+                                    type == coString || type == coStrings                   ? "string" :
+                                    type == coPercent || type == coPercents                 ? "percent" :
+                                    type == coFloatOrPercent || type == coFloatsOrPercents  ? "float ar percent" :
+                                    type == coPoint || type == coPoints || type == coPoint3 ? "point" :
+                                    type == coBool || type == coBools                       ? "bool" :
+                                    type == coEnum                                          ? "enum" : "undef";
+
+                label = ( cod->full_label.empty() &&  cod->label.empty() ) ? format_wxstr("Undef Label\n(%1%)", type_str) :
+                        (!cod->full_label.empty() && !cod->label.empty() ) ?
+                        format_wxstr("%1% > %2%\n(%3%)", _(cod->full_label), _(cod->label), type_str) :
+                        format_wxstr("%1%\n(%2%)", cod->label.empty() ? _(cod->full_label) : _(cod->label), type_str);
+            }
+        }
+
+        m_param_label->SetLabel(label);
+        Layout();
+    });
+
+    m_params_list->Bind(wxEVT_DATAVIEW_ITEM_ACTIVATED, [this](wxDataViewEvent& ) {
+        add_selected_value_to_gcode();
+    });
+
+    m_add_btn->Bind(wxEVT_BUTTON, [this](wxCommandEvent&) {
+        add_selected_value_to_gcode();
     });
 }
 
@@ -134,17 +217,9 @@ void EditGCodeDialog::on_dpi_changed(const wxRect&suggested_rect)
 {
     const int& em = em_unit();
 
-    //m_optgroup->msw_rescale();
-
-//    msw_buttons_rescale(this, em, { wxID_OK, wxID_CANCEL });
-
+    //Orca: use custom buttons
     for (auto button_item : m_button_list)
     {
-        if (button_item.first == wxRESET)
-        {
-            button_item.second->SetMinSize(wxSize(FromDIP(75), FromDIP(24)));
-            button_item.second->SetCornerRadius(FromDIP(12));
-        }
         if (button_item.first == wxOK) {
             button_item.second->SetMinSize(BTN_SIZE);
             button_item.second->SetCornerRadius(FromDIP(12));
@@ -167,11 +242,6 @@ void EditGCodeDialog::on_sys_color_changed()
     m_add_btn->sys_color_changed();
 }
 
-void EditGCodeDialog::OnOK(wxEvent& event)
-{
-    event.Skip();
-}
-
 //Orca
 wxBoxSizer* EditGCodeDialog::create_btn_sizer(long flags)
 {
@@ -248,4 +318,313 @@ wxBoxSizer* EditGCodeDialog::create_btn_sizer(long flags)
     return btn_sizer;
 }
 
+const std::map<GroupParamsType, std::pair <wxString, std::string>> GroupParamsInfo {
+//      Type                                Name                    BitmapName
+    { GroupParamsType::SlicingState,    {L("Slicing State"),    "re_slice"  },  },
+    { GroupParamsType::PrintSettings,   {L("Print settings"),   "cog"       },  },
+    { GroupParamsType::MaterialSettings,{L("Material Settings"),"spool"     },  },
+    { GroupParamsType::PrinterSettings, {L("Printer Settings"), "printer"   },  },
+};
+
+const std::map<SubSlicingState, std::pair <wxString, std::string>> SubSlicingStateInfo {
+//      Type                             Name                 BitmapName
+    { SubSlicingState::ReadOnly,    {L("Read Only"),    "lock_closed"   },  },
+    { SubSlicingState::ReadWrite,   {L("Read Write"),   "lock_open"     },  },
+};
+
+const std::map<ParamType, std::string> ParamsInfo {
+//      Type                      BitmapName
+    { ParamType::Scalar,        "scalar_param"          },
+    { ParamType::Vector,        "vector_param"          },
+    { ParamType::FilamentVector,"vector_filament_param" },
+};
+
+static void make_bold(wxString& str)
+{
+#if defined(SUPPORTS_MARKUP) && !defined(__APPLE__)
+    str = format_wxstr("<b>%1%</b>", str);
+#endif
+}
+
+// ----------------------------------------------------------------------------
+//                  ParamsModelNode: a node inside ParamsModel
+// ----------------------------------------------------------------------------
+
+ParamsNode::ParamsNode(GroupParamsType type)
+    : m_group_type (type)
+{
+    const auto& [name, icon_n] = GroupParamsInfo.at(type);
+    text = _(name);
+    make_bold(text);
+    icon_name = icon_n;
+}
+
+ParamsNode::ParamsNode(ParamsNode *parent, SubSlicingState sub_type)
+    : m_parent(parent)
+    , m_group_type(parent->m_group_type)
+{
+    const auto& [name, icon_n] = SubSlicingStateInfo.at(sub_type);
+    text = _(name);
+    icon_name = icon_n;
+}
+
+ParamsNode::ParamsNode( ParamsNode*         parent,
+                        ParamType           param_type,
+                        const std::string&  param_key,
+                        SubSlicingState     subgroup_type)
+    : m_parent(parent)
+    , m_group_type(parent->m_group_type)
+    , m_sub_type(subgroup_type)
+    , m_param_type(param_type)
+    , m_container(false)
+    , param_key(param_key)
+{
+    text = from_u8(param_key);
+    if (param_type == ParamType::Vector)
+        text += "[]";
+    else if (param_type == ParamType::FilamentVector)
+        text += "[current_extruder]";
+
+    icon_name = ParamsInfo.at(param_type);
+}
+
+
+// ----------------------------------------------------------------------------
+//                  ParamsModel
+// ----------------------------------------------------------------------------
+
+ParamsModel::ParamsModel()
+{
+}
+
+
+wxDataViewItem ParamsModel::AppendGroup(GroupParamsType type)
+{
+    m_group_nodes[type] = std::make_unique<ParamsNode>(type);
+
+    wxDataViewItem parent(nullptr);
+    wxDataViewItem child((void*)m_group_nodes[type].get());
+
+    ItemAdded(parent, child);
+    m_ctrl->Expand(parent);
+    return child;
+}
+
+wxDataViewItem ParamsModel::AppendSubGroup(GroupParamsType type, SubSlicingState sub_type)
+{
+    m_sub_slicing_state_nodes[sub_type] = std::make_unique<ParamsNode>(m_group_nodes[type].get(), sub_type);
+
+    const wxDataViewItem  group_item    ((void*)m_group_nodes[type].get());
+    const wxDataViewItem  sub_group_item((void*)m_sub_slicing_state_nodes[sub_type].get());
+
+    ItemAdded(group_item, sub_group_item);
+
+    m_ctrl->Expand(group_item);
+    return sub_group_item;
+}
+
+wxDataViewItem ParamsModel::AppendParam(GroupParamsType     type,
+                                        ParamType           param_type,
+                                        const std::string&  param_key,
+                                        SubSlicingState     subgroup_type)
+{
+    ParamsNode* parent_node{ nullptr };
+    if (subgroup_type == SubSlicingState::Undef)
+        parent_node = m_group_nodes[type].get();
+    else {
+        if (m_sub_slicing_state_nodes.find(subgroup_type) == m_sub_slicing_state_nodes.end())
+            AppendSubGroup(type, subgroup_type);
+        parent_node = m_sub_slicing_state_nodes[subgroup_type].get();
+    }
+
+    parent_node->Append(std::make_unique<ParamsNode>(m_group_nodes[type].get(), param_type, param_key, subgroup_type));
+
+    const wxDataViewItem  parent_item((void*)parent_node);
+    const wxDataViewItem  child_item((void*)parent_node->GetChildren().back().get());
+
+    ItemAdded(parent_item, child_item);
+    return child_item;
+}
+
+wxString ParamsModel::GetParamName(wxDataViewItem item)
+{
+    if (item.IsOk()) {
+        ParamsNode* node = static_cast<ParamsNode*>(item.GetID());
+        if (node->IsParamNode())
+            return node->text;
+    }
+    return wxEmptyString;
+}
+
+std::string ParamsModel::GetParamKey(wxDataViewItem item)
+{
+    if (item.IsOk()) {
+        ParamsNode* node = static_cast<ParamsNode*>(item.GetID());
+        return node->param_key;
+    }
+    return std::string();
+}
+
+void ParamsModel::Rescale()
+{
+
+}
+
+void ParamsModel::Clear()
+{
+
+}
+
+void ParamsModel::GetValue(wxVariant& variant, const wxDataViewItem& item, unsigned int col) const
+{
+    assert(item.IsOk());
+
+    ParamsNode* node = static_cast<ParamsNode*>(item.GetID());
+    if (col == 0)
+#ifdef __linux__
+        variant << wxDataViewIconText(node->text, get_bmp_bundle(node->icon_name)->GetIconFor(m_ctrl->GetParent()));
+#else
+        variant << DataViewBitmapText(node->text, get_bmp_bundle(node->icon_name)->GetBitmapFor(m_ctrl->GetParent()));
+#endif //__linux__
+    else
+        wxLogError("DiffModel::GetValue: wrong column %d", col);
+}
+
+bool ParamsModel::SetValue(const wxVariant& variant, const wxDataViewItem& item, unsigned int col)
+{
+    assert(item.IsOk());
+
+    ParamsNode* node = static_cast<ParamsNode*>(item.GetID());
+    if (col == 0) {
+#ifdef __linux__
+        wxDataViewIconText data;
+        data << variant;
+        node->m_icon = data.GetIcon();
+#else
+        DataViewBitmapText data;
+        data << variant;
+        node->icon = data.GetBitmap();
+#endif
+        node->text = data.GetText();
+        return true;
+    }
+
+    wxLogError("DiffModel::SetValue: wrong column");
+    return false;
+}
+
+wxDataViewItem ParamsModel::GetParent(const wxDataViewItem&item) const
+{
+    // the invisible root node has no parent
+    if (!item.IsOk())
+        return wxDataViewItem(nullptr);
+
+    ParamsNode* node = static_cast<ParamsNode*>(item.GetID());
+
+    if (node->IsGroupNode())
+        return wxDataViewItem(nullptr);
+
+    return wxDataViewItem((void*)node->GetParent());
+}
+
+bool ParamsModel::IsContainer(const wxDataViewItem& item) const
+{
+    // the invisble root node can have children
+    if (!item.IsOk())
+        return true;
+
+    ParamsNode* node = static_cast<ParamsNode*>(item.GetID());
+    return node->IsContainer();
+}
+unsigned int ParamsModel::GetChildren(const wxDataViewItem& parent, wxDataViewItemArray& array) const
+{
+    ParamsNode* parent_node = (ParamsNode*)parent.GetID();
+
+    if (parent_node == nullptr) {
+        for (const auto& [type, group] : m_group_nodes)
+            array.Add(wxDataViewItem((void*)group.get()));
+    }
+    else if (parent_node->IsGroupNode() && parent_node->GetChildren().empty()) {
+        for (const auto& [type, sub_group] : m_sub_slicing_state_nodes)
+            array.Add(wxDataViewItem((void*)sub_group.get()));
+    }
+    else  {
+        const ParamsNodePtrArray& children = parent_node->GetChildren();
+        for (const std::unique_ptr<ParamsNode>& child : children)
+            array.Add(wxDataViewItem((void*)child.get()));
+    }
+
+    return array.Count();
+}
+
+
+// ----------------------------------------------------------------------------
+//                  ParamsViewCtrl
+// ----------------------------------------------------------------------------
+
+ParamsViewCtrl::ParamsViewCtrl(wxWindow *parent, wxSize size)
+    : wxDataViewCtrl(parent, wxID_ANY, wxDefaultPosition, size, wxDV_SINGLE | wxDV_NO_HEADER// | wxDV_ROW_LINES
+#ifdef _WIN32
+        | wxBORDER_SIMPLE
+#endif
+    ),
+    m_em_unit(em_unit(parent))
+{
+    wxGetApp().UpdateDVCDarkUI(this);
+
+    model = new ParamsModel();
+    this->AssociateModel(model);
+    model->SetAssociatedControl(this);
+
+#ifdef __linux__
+    wxDataViewIconTextRenderer* rd = new wxDataViewIconTextRenderer();
+#ifdef SUPPORTS_MARKUP
+    rd->EnableMarkup(true);
+#endif
+    wxDataViewColumn* column = new wxDataViewColumn("", rd, 0, width * m_em_unit, wxALIGN_TOP, wxDATAVIEW_COL_RESIZABLE | wxDATAVIEW_CELL_INERT);
+#else
+    wxDataViewColumn* column = new wxDataViewColumn("", new BitmapTextRenderer(true, wxDATAVIEW_CELL_INERT), 0, 20 * m_em_unit, wxALIGN_TOP, wxDATAVIEW_COL_RESIZABLE);
+#endif //__linux__
+    this->AppendColumn(column);
+    this->SetExpanderColumn(column);
+}
+
+wxDataViewItem ParamsViewCtrl::AppendGroup(GroupParamsType type)
+{
+    return model->AppendGroup(type);
+}
+
+wxDataViewItem ParamsViewCtrl::AppendParam( GroupParamsType     group_type,
+                                            ParamType           param_type,
+                                            const std::string&  param_key,
+                                            SubSlicingState     subgroup_type /*= SubSlicingState::Undef*/)
+{
+    return model->AppendParam(group_type, param_type, param_key, subgroup_type);
+}
+
+wxString ParamsViewCtrl::GetValue(wxDataViewItem item)
+{
+    return model->GetParamName(item);
+}
+
+wxString ParamsViewCtrl::GetSelectedValue()
+{
+    return model->GetParamName(this->GetSelection());
+}
+
+std::string ParamsViewCtrl::GetSelectedParamKey()
+{
+    return model->GetParamKey(this->GetSelection());
+}
+
+void ParamsViewCtrl::Clear()
+{
+    model->Clear();
+}
+
+void ParamsViewCtrl::Rescale(int em/* = 0*/)
+{
+    model->Rescale();
+    Refresh();
+}
 }}    // namespace Slic3r::GUI
diff --git a/src/slic3r/GUI/EditGCodeDialog.hpp b/src/slic3r/GUI/EditGCodeDialog.hpp
index 4464301a3b0..83ef423c804 100644
--- a/src/slic3r/GUI/EditGCodeDialog.hpp
+++ b/src/slic3r/GUI/EditGCodeDialog.hpp
@@ -7,18 +7,18 @@
 #include <slic3r/GUI/Widgets/Button.hpp>
 
 #include "GUI_Utils.hpp"
+#include "wxExtensions.hpp"
+#include "libslic3r/Preset.hpp"
 
 class wxListBox;
 class wxTextCtrl;
-//class wxStaticText;
 class ScalableButton;
-//class wxBoxSizer;
 
 namespace Slic3r {
 
 namespace GUI {
 
-class PresetComboBox;
+class ParamsViewCtrl;
 
 //------------------------------------------
 //          EditGCodeDialog
@@ -26,16 +26,21 @@ class PresetComboBox;
 
 class EditGCodeDialog : public DPIDialog
 {
-    wxListBox*          m_patterns_list {nullptr};
+    ParamsViewCtrl*     m_params_list   {nullptr};
     ScalableButton*     m_add_btn       {nullptr};
     wxTextCtrl*         m_gcode_editor  {nullptr};
-
-    void OnOK(wxEvent& event);
+    wxStaticText*       m_param_label   {nullptr};
 
 public:
-    EditGCodeDialog(wxWindow* parent, const std::string& key, const std::string& value);
+    EditGCodeDialog(wxWindow*parent, const std::string&key, const std::string&value);
     ~EditGCodeDialog() {}
 
+    std::string get_edited_gcode() const;
+
+    void init_params_list();
+    void add_selected_value_to_gcode();
+    void bind_list_and_button();
+
 protected:
     std::unordered_map<int, Button *> m_button_list;
 
@@ -45,6 +50,198 @@ class EditGCodeDialog : public DPIDialog
 };
 
 
+
+
+// ----------------------------------------------------------------------------
+//                  ParamsModelNode: a node inside ParamsModel
+// ----------------------------------------------------------------------------
+
+class ParamsNode;
+using ParamsNodePtrArray = std::vector<std::unique_ptr<ParamsNode>>;
+
+// Discard and Cancel buttons are always but next buttons are optional
+enum class GroupParamsType {
+    SlicingState,
+    PrintSettings,
+    MaterialSettings,
+    PrinterSettings,
+};
+using GroupParamsNodePtrMap = std::map<GroupParamsType, std::unique_ptr<ParamsNode>>;
+
+enum class SubSlicingState {
+    Undef,
+    ReadOnly,
+    ReadWrite,
+};
+using SubSlicingStateNodePtrMap = std::map<SubSlicingState, std::unique_ptr<ParamsNode>>;
+
+enum class ParamType {
+    Undef,
+    Scalar,
+    Vector,
+    FilamentVector,
+};
+
+// On all of 3 different platforms Bitmap+Text icon column looks different 
+// because of Markup text is missed or not implemented.
+// As a temporary workaround, we will use:
+// MSW - DataViewBitmapText (our custom renderer wxBitmap + wxString, supported Markup text)
+// OSX - -//-, but Markup text is not implemented right now
+// GTK - wxDataViewIconText (wxWidgets for GTK renderer wxIcon + wxString, supported Markup text)
+class ParamsNode
+{
+    ParamsNode*         m_parent{ nullptr };
+    ParamsNodePtrArray  m_children;
+
+    GroupParamsType     m_group_type{ GroupParamsType::SlicingState };
+    SubSlicingState     m_sub_type  { SubSlicingState::Undef };
+    ParamType           m_param_type{ ParamType::Undef };
+
+    // TODO/FIXME:
+    // the GTK version of wxDVC (in particular wxDataViewCtrlInternal::ItemAdded)
+    // needs to know in advance if a node is or _will be_ a container.
+    // Thus implementing:
+    //   bool IsContainer() const
+    //    { return m_children.size()>0; }
+    // doesn't work with wxGTK when DiffModel::AddToClassical is called
+    // AND the classical node was removed (a new node temporary without children
+    // would be added to the control)
+    bool                m_container{ true };
+
+public:
+
+#ifdef __linux__
+    wxIcon      icon;
+#else
+    wxBitmap    icon;
+#endif //__linux__
+    std::string icon_name;
+    std::string param_key;
+    wxString    text;
+
+    // Group params(root) node
+    ParamsNode(GroupParamsType type);
+
+    // sub SlicingState node
+    ParamsNode(ParamsNode* parent, SubSlicingState sub_type);
+
+    // parametre node
+    ParamsNode( ParamsNode*         parent, 
+                ParamType           param_type,
+                const std::string&  param_key,
+                SubSlicingState     subgroup_type);
+
+    bool             IsContainer()      const { return m_container; }
+    bool             IsGroupNode()      const { return m_parent == nullptr; }
+    bool             IsSubGroupNode()   const { return m_sub_type != SubSlicingState::Undef; }
+    bool             IsParamNode()      const { return m_param_type != ParamType::Undef; }
+
+    ParamsNode* GetParent() { return m_parent; }
+    ParamsNodePtrArray& GetChildren() { return m_children; }
+
+    void Append(std::unique_ptr<ParamsNode> child) { m_children.emplace_back(std::move(child)); }
+};
+
+
+// ----------------------------------------------------------------------------
+//                  ParamsModel
+// ----------------------------------------------------------------------------
+
+class ParamsModel : public wxDataViewModel
+{
+    GroupParamsNodePtrMap       m_group_nodes;
+    SubSlicingStateNodePtrMap   m_sub_slicing_state_nodes;
+
+    wxDataViewCtrl*             m_ctrl{ nullptr };
+
+public:
+
+    ParamsModel();
+    ~ParamsModel() override = default;
+
+    void            SetAssociatedControl(wxDataViewCtrl* ctrl) { m_ctrl = ctrl; }
+
+    wxDataViewItem  AppendGroup(GroupParamsType     type);
+
+    wxDataViewItem  AppendSubGroup( GroupParamsType type,
+                                    SubSlicingState sub_type);
+
+    wxDataViewItem  AppendParam(GroupParamsType     type,
+                                ParamType           param_type,
+                                const std::string&  param_key,
+                                SubSlicingState     subgroup_type = SubSlicingState::Undef);
+
+    wxString        GetParamName(wxDataViewItem item);
+    std::string     GetParamKey(wxDataViewItem item);
+
+    void            Rescale();
+
+    void            Clear();
+
+    wxDataViewItem  GetParent(const wxDataViewItem& item) const override;
+    unsigned int    GetChildren(const wxDataViewItem& parent, wxDataViewItemArray& array) const override;
+
+    void GetValue(wxVariant& variant, const wxDataViewItem& item, unsigned int col) const override;
+    bool SetValue(const wxVariant& variant, const wxDataViewItem& item, unsigned int col) override;
+
+    bool IsContainer(const wxDataViewItem& item) const override;
+    // Is the container just a header or an item with all columns
+    // In our case it is an item with all columns
+    bool HasContainerColumns(const wxDataViewItem& WXUNUSED(item)) const override { return true; }
+};
+
+
+// ----------------------------------------------------------------------------
+//                  ParamsViewCtrl
+// ----------------------------------------------------------------------------
+
+class ParamsViewCtrl : public wxDataViewCtrl
+{
+    int                     m_em_unit;
+
+    //struct ItemData
+    //{
+    //    std::string     opt_key;
+    //    wxString        opt_name;
+    //    wxString        old_val;
+    //    wxString        mod_val;
+    //    wxString        new_val;
+    //    Preset::Type    type;
+    //    bool            is_long{ false };
+    //};
+
+    //// tree items related to the options
+    //std::map<wxDataViewItem, ItemData> m_items_map;
+
+public:
+    ParamsViewCtrl(wxWindow* parent, wxSize size);
+    ~ParamsViewCtrl() override {
+        if (model) {
+            Clear();
+            model->DecRef();
+        }
+    }
+
+    ParamsModel* model{ nullptr };
+
+    wxDataViewItem AppendGroup( GroupParamsType type);
+
+    wxDataViewItem AppendParam( GroupParamsType     group_type,
+                                ParamType           param_type,
+                                const std::string&  param_key,
+                                SubSlicingState     group_subgroup_type = SubSlicingState::Undef);
+
+    wxString        GetValue(wxDataViewItem item);
+    wxString        GetSelectedValue();
+    std::string     GetSelectedParamKey();
+
+    void    Clear();
+    void    Rescale(int em = 0);
+
+    void    set_em_unit(int em) { m_em_unit = em; }
+};
+
+
 } // namespace GUI
 } // namespace Slic3r
 
diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp
index 0d4c1bcda7c..bdfaa95170c 100644
--- a/src/slic3r/GUI/GUI_App.cpp
+++ b/src/slic3r/GUI/GUI_App.cpp
@@ -3181,14 +3181,17 @@ void GUI_App::UpdateDVCDarkUI(wxDataViewCtrl* dvc, bool highlited/* = false*/)
     UpdateDarkUI(dvc, highlited ? dark_mode() : false);
 #ifdef _MSW_DARK_MODE
     //dvc->RefreshHeaderDarkMode(&m_normal_font);
-    HWND hwnd = (HWND)dvc->GenericGetHeader()->GetHandle();
-    hwnd = GetWindow(hwnd, GW_CHILD);
-    if (hwnd != NULL)
-        NppDarkMode::SetDarkListViewHeader(hwnd);
-    wxItemAttr attr;
-    attr.SetTextColour(NppDarkMode::GetTextColor());
-    attr.SetFont(m_normal_font);
-    dvc->SetHeaderAttr(attr);
+    HWND hwnd;
+    if (!dvc->HasFlag(wxDV_NO_HEADER)) {
+        hwnd = (HWND) dvc->GenericGetHeader()->GetHandle();
+        hwnd = GetWindow(hwnd, GW_CHILD);
+        if (hwnd != NULL)
+            NppDarkMode::SetDarkListViewHeader(hwnd);
+        wxItemAttr attr;
+        attr.SetTextColour(NppDarkMode::GetTextColor());
+        attr.SetFont(m_normal_font);
+        dvc->SetHeaderAttr(attr);
+    }
 #endif //_MSW_DARK_MODE
     if (dvc->HasFlag(wxDV_ROW_LINES))
         dvc->SetAlternateRowColour(m_color_highlight_default);
diff --git a/src/slic3r/GUI/Tab.cpp b/src/slic3r/GUI/Tab.cpp
index be2aee36ee3..2b6ca330c7b 100644
--- a/src/slic3r/GUI/Tab.cpp
+++ b/src/slic3r/GUI/Tab.cpp
@@ -2869,12 +2869,39 @@ static void validate_custom_gcode_cb(Tab* tab, ConfigOptionsGroupShp opt_group,
 
 void Tab::edit_custom_gcode(const t_config_option_key& opt_key)
 {
-    EditGCodeDialog(this, opt_key, m_config->opt_string(opt_key)).ShowModal();
+    EditGCodeDialog dlg = EditGCodeDialog(this, opt_key, get_custom_gcode(opt_key));
+    if (dlg.ShowModal() == wxID_OK) {
+        set_custom_gcode(opt_key, dlg.get_edited_gcode());
+        update_dirty();
+        update();
+    }
 }
 
-void TabFilament::edit_custom_gcode(const t_config_option_key& opt_key)
+const std::string& Tab::get_custom_gcode(const t_config_option_key& opt_key)
 {
-    EditGCodeDialog(this, opt_key, m_config->opt_string(opt_key, unsigned(m_presets_choice->GetSelection()))).ShowModal();
+    return m_config->opt_string(opt_key);
+}
+
+void Tab::set_custom_gcode(const t_config_option_key& opt_key, const std::string& value)
+{
+    DynamicPrintConfig new_conf = *m_config;
+    new_conf.set_key_value(opt_key, new ConfigOptionString(value));
+    load_config(new_conf);
+}
+
+const std::string& TabFilament::get_custom_gcode(const t_config_option_key& opt_key)
+{
+    return m_config->opt_string(opt_key, unsigned(0));
+}
+
+void TabFilament::set_custom_gcode(const t_config_option_key& opt_key, const std::string& value)
+{
+    std::vector<std::string> gcodes = static_cast<const ConfigOptionStrings*>(m_config->option(opt_key))->values;
+    gcodes[0] = value;
+
+    DynamicPrintConfig new_conf = *m_config;
+    new_conf.set_key_value(opt_key, new ConfigOptionStrings(gcodes));
+    load_config(new_conf);
 }
 
 void TabFilament::add_filament_overrides_page()
diff --git a/src/slic3r/GUI/Tab.hpp b/src/slic3r/GUI/Tab.hpp
index 64f88f35b60..ca1604f216e 100644
--- a/src/slic3r/GUI/Tab.hpp
+++ b/src/slic3r/GUI/Tab.hpp
@@ -408,7 +408,9 @@ class Tab: public wxPanel
     bool        validate_custom_gcodes_was_shown{ false };
     void        set_just_edit(bool just_edit);
 
-    virtual void edit_custom_gcode(const t_config_option_key &opt_key);
+    void						edit_custom_gcode(const t_config_option_key& opt_key);
+    virtual const std::string&	get_custom_gcode(const t_config_option_key& opt_key);
+    virtual void				set_custom_gcode(const t_config_option_key& opt_key, const std::string& value);
 
 protected:
 	void			create_line_with_widget(ConfigOptionsGroup* optgroup, const std::string& opt_key, const std::string& path, widget_t widget);
@@ -562,7 +564,9 @@ class TabFilament : public Tab
 	void		update() override;
 	void		clear_pages() override;
 	bool 		supports_printer_technology(const PrinterTechnology tech) const override { return tech == ptFFF; }
-    void        edit_custom_gcode(const t_config_option_key& opt_key) override;
+
+    const std::string&	get_custom_gcode(const t_config_option_key& opt_key) override;
+    void				set_custom_gcode(const t_config_option_key& opt_key, const std::string& value) override;
 };
 
 class TabPrinter : public Tab

From 05e159037f1188cce856663d041cdca059cb69ef Mon Sep 17 00:00:00 2001
From: Ocraftyone <Ocraftyone@users.noreply.github.com>
Date: Mon, 25 Dec 2023 03:35:15 -0500
Subject: [PATCH 05/39] Improved ParamsViewCtrl

Original Commit: prusa3d/PrusaSlicer@59af551

Co-authored-by: YuSanka <yusanka@gmail.com>
---
 src/slic3r/GUI/EditGCodeDialog.cpp | 292 ++++++++++++++++++-----------
 src/slic3r/GUI/EditGCodeDialog.hpp |  80 +++-----
 2 files changed, 209 insertions(+), 163 deletions(-)

diff --git a/src/slic3r/GUI/EditGCodeDialog.cpp b/src/slic3r/GUI/EditGCodeDialog.cpp
index 3f56c672d52..2706e55a584 100644
--- a/src/slic3r/GUI/EditGCodeDialog.cpp
+++ b/src/slic3r/GUI/EditGCodeDialog.cpp
@@ -28,20 +28,25 @@
 namespace Slic3r {
 namespace GUI {
 
-static wxArrayString get_patterns_list()
-{
-    wxArrayString patterns;
-    for (const wxString& item : {
-          "printer_model"
-        , "nozzle_diameter"
-        , "first_layer_temperature"
-        , "first_layer_bed_temperature"
-        , "first_layer_bed_temperature"
-        , "first_layer_temperature"
-        , "initial_tool"
-    })
-        patterns.Add(item);
-    return patterns;
+static std::vector<std::string> get_specific_params(const std::string& custom_gcode)
+{
+    if (custom_gcode == "start_filament_gcode" || custom_gcode == "end_filament_gcode")
+        return{ "max_layer_z",
+                "layer_num",
+                "layer_z",
+                "filament_extruder_id" };
+    if (custom_gcode == "end_gcode" || custom_gcode == "before_layer_gcode" || custom_gcode == "layer_gcode")
+        return{ "max_layer_z",
+                "layer_num",
+                "layer_z" };
+    if (custom_gcode == "toolchange_gcode")
+        return{ "next_extruder",
+               "previous_extruder",
+               "toolchange_z",
+               "max_layer_z",
+               "layer_num",
+               "layer_z" };
+    return {};
 }
 
 //------------------------------------------
@@ -79,9 +84,9 @@ EditGCodeDialog::EditGCodeDialog(wxWindow* parent, const std::string& key, const
     m_gcode_editor->SetFont(wxGetApp().code_font());
     wxGetApp().UpdateDarkUI(m_gcode_editor);
 
-    grid_sizer->Add(m_params_list,    1, wxEXPAND);
-    grid_sizer->Add(m_add_btn,          0, wxALIGN_CENTER_VERTICAL);
-    grid_sizer->Add(m_gcode_editor,     2, wxEXPAND);
+    grid_sizer->Add(m_params_list,  1, wxEXPAND);
+    grid_sizer->Add(m_add_btn,      0, wxALIGN_CENTER_VERTICAL);
+    grid_sizer->Add(m_gcode_editor, 2, wxEXPAND);
 
     grid_sizer->AddGrowableRow(0, 1);
     grid_sizer->AddGrowableCol(0, 1);
@@ -110,7 +115,7 @@ EditGCodeDialog::EditGCodeDialog(wxWindow* parent, const std::string& key, const
 
     this->CenterOnScreen();
 
-    init_params_list();
+    init_params_list(key);
     bind_list_and_button();
 }
 
@@ -119,24 +124,71 @@ std::string EditGCodeDialog::get_edited_gcode() const
     return into_u8(m_gcode_editor->GetValue());
 }
 
-void EditGCodeDialog::init_params_list()
+void EditGCodeDialog::init_params_list(const std::string& custom_gcode_name)
 {
-    auto list = get_patterns_list();
+    wxDataViewItem group        = m_params_list->AppendGroup(_L("Slicing State"), "re_slice");
+    {
+        wxDataViewItem read_only    = m_params_list->AppendSubGroup(group, _L("Read Only"),  "lock_closed");
+        m_params_list->AppendParam(read_only, ParamType::Scalar, "zhop");
+    }
+    {
+        wxDataViewItem read_write   = m_params_list->AppendSubGroup(group, _L("Read Write"), "lock_open");
+        for (const auto& opt_name : { "position", "e_position"})
+            m_params_list->AppendParam(read_write, ParamType::Vector, opt_name);
+        for (const auto& opt_name : { "e_retracted", "e_restart_extra"})
+            m_params_list->AppendParam(read_write, ParamType::FilamentVector, opt_name);
+    }
 
-    m_params_list->AppendGroup(GroupParamsType::SlicingState);
-    for (const auto& sub_gr : { SubSlicingState::ReadOnly, SubSlicingState::ReadWrite }) {
-        int i = 0;
-        for (const wxString& name : list) {
-            const auto param_type = static_cast<ParamType>(1 + std::modulus<int>()(i, 3));
-            m_params_list->AppendParam(GroupParamsType::SlicingState, param_type, into_u8(name), sub_gr);
-            ++i;
-        }
+    group = m_params_list->AppendGroup(_L("Universal"), "equal");
+    {
+        wxDataViewItem time_stamp = m_params_list->AppendSubGroup(group, _L("Time Stamp"), "time");
+        for (const auto& opt_name : {   "day",
+                                        "hour",
+                                        "minute",
+                                        "month",
+                                        "second",
+                                        "year",
+                                        "timestamp" })
+            m_params_list->AppendParam(time_stamp, ParamType::Scalar, opt_name);
+
+        for (const auto& opt_name : {   "current_extruder",
+                                        "current_object_idx",
+                                        "filament_preset",
+                                        "first_layer_print_convex_hull",
+                                        "first_layer_print_max",
+                                        "first_layer_print_min",
+                                        "first_layer_print_size",
+                                        "has_single_extruder_multi_material_priming",
+                                        "has_wipe_tower",
+                                        "initial_extruder",
+                                        "initial_tool",
+                                        "input_filename",
+                                        "input_filename_base",
+                                        "is_extruder_used",
+                                        "num_instances",
+                                        "num_objects",
+                                        "physical_printer_preset",
+                                        "print_bed_max",
+                                        "print_bed_min",
+                                        "print_bed_size",
+                                        "print_preset",
+                                        "printer_preset",
+                                        "scale",
+                                        "total_layer_count",
+                                        "total_toolchanges" })
+            m_params_list->AppendParam(group, ParamType::Scalar, opt_name);
+    }
+
+    std::vector<std::string> specific_params = get_specific_params(custom_gcode_name);
+    if (!specific_params.empty()) {
+        group = m_params_list->AppendGroup(format_wxstr(_L("Specific for %1%"), custom_gcode_name), "not_equal");
+        for (const auto& opt_name : specific_params)
+            m_params_list->AppendParam(group, ParamType::Scalar, opt_name);
     }
 
     auto get_set_from_vec = [](const std::vector<std::string>& vec) {
         return std::set<std::string>(vec.begin(), vec.end());
     };
-
     const bool is_fff = wxGetApp().plater()->printer_technology() == ptFFF;
     const std::set<std::string> print_options    = get_set_from_vec(is_fff ? Preset::print_options()    : Preset::sla_print_options());
     const std::set<std::string> material_options = get_set_from_vec(is_fff ? Preset::filament_options() : Preset::sla_material_options());
@@ -146,20 +198,25 @@ void EditGCodeDialog::init_params_list()
 
     const auto& def = full_config.def()->get("")->label;
 
-    m_params_list->AppendGroup(GroupParamsType::PrintSettings);
-    for (const auto& opt : print_options)
-        if (const ConfigOption *optptr = full_config.optptr(opt))
-            m_params_list->AppendParam(GroupParamsType::PrintSettings,    optptr->is_scalar() ? ParamType::Scalar : ParamType::Vector, opt);
 
-    m_params_list->AppendGroup(GroupParamsType::MaterialSettings);
-    for (const auto& opt : material_options)
-        if (const ConfigOption *optptr = full_config.optptr(opt))
-            m_params_list->AppendParam(GroupParamsType::MaterialSettings, optptr->is_scalar() ? ParamType::Scalar : ParamType::FilamentVector, opt);
+    group = m_params_list->AppendGroup(_L("Presets"), "cog");
+    {
+        wxDataViewItem print = m_params_list->AppendSubGroup(group, _L("Print settings"), "cog");
+        for (const auto& opt : print_options)
+            if (const ConfigOption *optptr = full_config.optptr(opt))
+                m_params_list->AppendParam(print, optptr->is_scalar() ? ParamType::Scalar : ParamType::Vector, opt);
+
+        wxDataViewItem material = m_params_list->AppendSubGroup(group, _(is_fff ? L("Filament settings") : L("SLA Materials settings")), is_fff ? "spool" : "resin");
+        for (const auto& opt : material_options)
+            if (const ConfigOption *optptr = full_config.optptr(opt))
+                m_params_list->AppendParam(material, optptr->is_scalar() ? ParamType::Scalar : ParamType::FilamentVector, opt);
 
-    m_params_list->AppendGroup(GroupParamsType::PrinterSettings);
-    for (const auto& opt : printer_options)
-        if (const ConfigOption *optptr = full_config.optptr(opt))
-            m_params_list->AppendParam(GroupParamsType::PrinterSettings,  optptr->is_scalar() ? ParamType::Scalar : ParamType::Vector, opt);
+        wxDataViewItem printer = m_params_list->AppendSubGroup(group, _L("Printer settings"), is_fff ? "printer" : "sla_printer");
+        for (const auto& opt : printer_options)
+            if (const ConfigOption *optptr = full_config.optptr(opt))
+                m_params_list->AppendParam(printer, optptr->is_scalar() ? ParamType::Scalar : ParamType::Vector, opt);
+
+    }
 }
 
 void EditGCodeDialog::add_selected_value_to_gcode()
@@ -318,22 +375,9 @@ wxBoxSizer* EditGCodeDialog::create_btn_sizer(long flags)
     return btn_sizer;
 }
 
-const std::map<GroupParamsType, std::pair <wxString, std::string>> GroupParamsInfo {
-//      Type                                Name                    BitmapName
-    { GroupParamsType::SlicingState,    {L("Slicing State"),    "re_slice"  },  },
-    { GroupParamsType::PrintSettings,   {L("Print settings"),   "cog"       },  },
-    { GroupParamsType::MaterialSettings,{L("Material Settings"),"spool"     },  },
-    { GroupParamsType::PrinterSettings, {L("Printer Settings"), "printer"   },  },
-};
-
-const std::map<SubSlicingState, std::pair <wxString, std::string>> SubSlicingStateInfo {
-//      Type                             Name                 BitmapName
-    { SubSlicingState::ReadOnly,    {L("Read Only"),    "lock_closed"   },  },
-    { SubSlicingState::ReadWrite,   {L("Read Write"),   "lock_open"     },  },
-};
 
 const std::map<ParamType, std::string> ParamsInfo {
-//      Type                      BitmapName
+//    Type                      BitmapName
     { ParamType::Scalar,        "scalar_param"          },
     { ParamType::Vector,        "vector_param"          },
     { ParamType::FilamentVector,"vector_filament_param" },
@@ -350,31 +394,27 @@ static void make_bold(wxString& str)
 //                  ParamsModelNode: a node inside ParamsModel
 // ----------------------------------------------------------------------------
 
-ParamsNode::ParamsNode(GroupParamsType type)
-    : m_group_type (type)
+ParamsNode::ParamsNode(const wxString& group_name, const std::string& icon_name)
+: icon_name(icon_name)
+, text(group_name)
 {
-    const auto& [name, icon_n] = GroupParamsInfo.at(type);
-    text = _(name);
     make_bold(text);
-    icon_name = icon_n;
 }
 
-ParamsNode::ParamsNode(ParamsNode *parent, SubSlicingState sub_type)
+ParamsNode::ParamsNode( ParamsNode *        parent,
+                        const wxString&     sub_group_name,
+                        const std::string&  icon_name)
     : m_parent(parent)
-    , m_group_type(parent->m_group_type)
+    , icon_name(icon_name)
+    , text(sub_group_name)
 {
-    const auto& [name, icon_n] = SubSlicingStateInfo.at(sub_type);
-    text = _(name);
-    icon_name = icon_n;
+    make_bold(text);
 }
 
 ParamsNode::ParamsNode( ParamsNode*         parent,
                         ParamType           param_type,
-                        const std::string&  param_key,
-                        SubSlicingState     subgroup_type)
+                        const std::string&  param_key)
     : m_parent(parent)
-    , m_group_type(parent->m_group_type)
-    , m_sub_type(subgroup_type)
     , m_param_type(param_type)
     , m_container(false)
     , param_key(param_key)
@@ -397,52 +437,47 @@ ParamsModel::ParamsModel()
 {
 }
 
-
-wxDataViewItem ParamsModel::AppendGroup(GroupParamsType type)
+wxDataViewItem ParamsModel::AppendGroup(const wxString&    group_name,
+                                        const std::string& icon_name)
 {
-    m_group_nodes[type] = std::make_unique<ParamsNode>(type);
+    m_group_nodes.emplace_back(std::make_unique<ParamsNode>(group_name, icon_name));
 
     wxDataViewItem parent(nullptr);
-    wxDataViewItem child((void*)m_group_nodes[type].get());
+    wxDataViewItem child((void*)m_group_nodes.back().get());
 
     ItemAdded(parent, child);
     m_ctrl->Expand(parent);
     return child;
 }
 
-wxDataViewItem ParamsModel::AppendSubGroup(GroupParamsType type, SubSlicingState sub_type)
+wxDataViewItem ParamsModel::AppendSubGroup(wxDataViewItem       parent,
+                                           const wxString&      sub_group_name,
+                                           const std::string&   icon_name)
 {
-    m_sub_slicing_state_nodes[sub_type] = std::make_unique<ParamsNode>(m_group_nodes[type].get(), sub_type);
+    ParamsNode* parent_node = static_cast<ParamsNode*>(parent.GetID());
+    if (!parent_node)
+        return wxDataViewItem(0);
 
-    const wxDataViewItem  group_item    ((void*)m_group_nodes[type].get());
-    const wxDataViewItem  sub_group_item((void*)m_sub_slicing_state_nodes[sub_type].get());
+    parent_node->Append(std::make_unique<ParamsNode>(parent_node, sub_group_name, icon_name));
+    const wxDataViewItem  sub_group_item((void*)parent_node->GetChildren().back().get());
 
-    ItemAdded(group_item, sub_group_item);
-
-    m_ctrl->Expand(group_item);
+    ItemAdded(parent, sub_group_item);
     return sub_group_item;
 }
 
-wxDataViewItem ParamsModel::AppendParam(GroupParamsType     type,
+wxDataViewItem ParamsModel::AppendParam(wxDataViewItem      parent,
                                         ParamType           param_type,
-                                        const std::string&  param_key,
-                                        SubSlicingState     subgroup_type)
-{
-    ParamsNode* parent_node{ nullptr };
-    if (subgroup_type == SubSlicingState::Undef)
-        parent_node = m_group_nodes[type].get();
-    else {
-        if (m_sub_slicing_state_nodes.find(subgroup_type) == m_sub_slicing_state_nodes.end())
-            AppendSubGroup(type, subgroup_type);
-        parent_node = m_sub_slicing_state_nodes[subgroup_type].get();
-    }
+                                        const std::string&  param_key)
+{
+    ParamsNode* parent_node = static_cast<ParamsNode*>(parent.GetID());
+    if (!parent_node)
+        return wxDataViewItem(0);
 
-    parent_node->Append(std::make_unique<ParamsNode>(m_group_nodes[type].get(), param_type, param_key, subgroup_type));
+    parent_node->Append(std::make_unique<ParamsNode>(parent_node, param_type, param_key));
 
-    const wxDataViewItem  parent_item((void*)parent_node);
     const wxDataViewItem  child_item((void*)parent_node->GetChildren().back().get());
 
-    ItemAdded(parent_item, child_item);
+    ItemAdded(parent, child_item);
     return child_item;
 }
 
@@ -465,14 +500,51 @@ std::string ParamsModel::GetParamKey(wxDataViewItem item)
     return std::string();
 }
 
-void ParamsModel::Rescale()
+wxDataViewItem ParamsModel::Delete(const wxDataViewItem& item)
 {
+    auto ret_item = wxDataViewItem(nullptr);
+    ParamsNode* node = static_cast<ParamsNode*>(item.GetID());
+    if (!node)      // happens if item.IsOk()==false
+        return ret_item;
+
+    // first remove the node from the parent's array of children;
+    // NOTE: m_group_nodes is only a vector of _pointers_
+    //       thus removing the node from it doesn't result in freeing it
+    ParamsNodePtrArray& children = node->GetChildren();
+    // Delete all children
+    while (!children.empty())
+        Delete(wxDataViewItem(children.back().get()));
+
+    auto node_parent = node->GetParent();
+
+    ParamsNodePtrArray& parents_children = node_parent ? node_parent->GetChildren() : m_group_nodes;
+    auto it = find_if(parents_children.begin(), parents_children.end(),
+                                                   [node](std::unique_ptr<ParamsNode>& child) { return child.get() == node; });
+    assert(it != parents_children.end());
+    it = parents_children.erase(it);
+
+    if (it != parents_children.end())
+        ret_item = wxDataViewItem(it->get());
+
+    wxDataViewItem parent(node_parent);
+    // set m_container to FALSE if parent has no child
+    if (node_parent) {
+#ifndef __WXGTK__
+        if (node_parent->GetChildren().empty())
+            node_parent->SetContainer(false);
+#endif //__WXGTK__
+        ret_item = parent;
+    }
 
+    // notify control
+    ItemDeleted(parent, item);
+    return ret_item;
 }
 
 void ParamsModel::Clear()
 {
-
+    while (!m_group_nodes.empty())
+        Delete(wxDataViewItem(m_group_nodes.back().get()));
 }
 
 void ParamsModel::GetValue(wxVariant& variant, const wxDataViewItem& item, unsigned int col) const
@@ -541,13 +613,9 @@ unsigned int ParamsModel::GetChildren(const wxDataViewItem& parent, wxDataViewIt
     ParamsNode* parent_node = (ParamsNode*)parent.GetID();
 
     if (parent_node == nullptr) {
-        for (const auto& [type, group] : m_group_nodes)
+        for (const auto& group : m_group_nodes)
             array.Add(wxDataViewItem((void*)group.get()));
     }
-    else if (parent_node->IsGroupNode() && parent_node->GetChildren().empty()) {
-        for (const auto& [type, sub_group] : m_sub_slicing_state_nodes)
-            array.Add(wxDataViewItem((void*)sub_group.get()));
-    }
     else  {
         const ParamsNodePtrArray& children = parent_node->GetChildren();
         for (const std::unique_ptr<ParamsNode>& child : children)
@@ -589,17 +657,23 @@ ParamsViewCtrl::ParamsViewCtrl(wxWindow *parent, wxSize size)
     this->SetExpanderColumn(column);
 }
 
-wxDataViewItem ParamsViewCtrl::AppendGroup(GroupParamsType type)
+wxDataViewItem ParamsViewCtrl::AppendGroup(const wxString& group_name, const std::string& icon_name)
+{
+    return model->AppendGroup(group_name, icon_name);
+}
+
+wxDataViewItem ParamsViewCtrl::AppendSubGroup(  wxDataViewItem      parent,
+                                                const wxString&     sub_group_name,
+                                                const std::string&  icon_name)
 {
-    return model->AppendGroup(type);
+    return model->AppendSubGroup(parent, sub_group_name, icon_name);
 }
 
-wxDataViewItem ParamsViewCtrl::AppendParam( GroupParamsType     group_type,
+wxDataViewItem ParamsViewCtrl::AppendParam( wxDataViewItem      parent,
                                             ParamType           param_type,
-                                            const std::string&  param_key,
-                                            SubSlicingState     subgroup_type /*= SubSlicingState::Undef*/)
+                                            const std::string&  param_key)
 {
-    return model->AppendParam(group_type, param_type, param_key, subgroup_type);
+    return model->AppendParam(parent, param_type, param_key);
 }
 
 wxString ParamsViewCtrl::GetValue(wxDataViewItem item)
@@ -624,7 +698,7 @@ void ParamsViewCtrl::Clear()
 
 void ParamsViewCtrl::Rescale(int em/* = 0*/)
 {
-    model->Rescale();
+//    model->Rescale();
     Refresh();
 }
 }}    // namespace Slic3r::GUI
diff --git a/src/slic3r/GUI/EditGCodeDialog.hpp b/src/slic3r/GUI/EditGCodeDialog.hpp
index 83ef423c804..f8f604c48eb 100644
--- a/src/slic3r/GUI/EditGCodeDialog.hpp
+++ b/src/slic3r/GUI/EditGCodeDialog.hpp
@@ -37,7 +37,7 @@ class EditGCodeDialog : public DPIDialog
 
     std::string get_edited_gcode() const;
 
-    void init_params_list();
+    void init_params_list(const std::string& custom_gcode_name);
     void add_selected_value_to_gcode();
     void bind_list_and_button();
 
@@ -59,22 +59,6 @@ class EditGCodeDialog : public DPIDialog
 class ParamsNode;
 using ParamsNodePtrArray = std::vector<std::unique_ptr<ParamsNode>>;
 
-// Discard and Cancel buttons are always but next buttons are optional
-enum class GroupParamsType {
-    SlicingState,
-    PrintSettings,
-    MaterialSettings,
-    PrinterSettings,
-};
-using GroupParamsNodePtrMap = std::map<GroupParamsType, std::unique_ptr<ParamsNode>>;
-
-enum class SubSlicingState {
-    Undef,
-    ReadOnly,
-    ReadWrite,
-};
-using SubSlicingStateNodePtrMap = std::map<SubSlicingState, std::unique_ptr<ParamsNode>>;
-
 enum class ParamType {
     Undef,
     Scalar,
@@ -93,8 +77,6 @@ class ParamsNode
     ParamsNode*         m_parent{ nullptr };
     ParamsNodePtrArray  m_children;
 
-    GroupParamsType     m_group_type{ GroupParamsType::SlicingState };
-    SubSlicingState     m_sub_type  { SubSlicingState::Undef };
     ParamType           m_param_type{ ParamType::Undef };
 
     // TODO/FIXME:
@@ -120,21 +102,22 @@ class ParamsNode
     wxString    text;
 
     // Group params(root) node
-    ParamsNode(GroupParamsType type);
+    ParamsNode(const wxString& group_name, const std::string& icon_name);
 
     // sub SlicingState node
-    ParamsNode(ParamsNode* parent, SubSlicingState sub_type);
+    ParamsNode(ParamsNode*          parent,
+               const wxString&      sub_group_name,
+               const std::string&   icon_name);
 
     // parametre node
     ParamsNode( ParamsNode*         parent, 
                 ParamType           param_type,
-                const std::string&  param_key,
-                SubSlicingState     subgroup_type);
+                const std::string&  param_key);
 
     bool             IsContainer()      const { return m_container; }
     bool             IsGroupNode()      const { return m_parent == nullptr; }
-    bool             IsSubGroupNode()   const { return m_sub_type != SubSlicingState::Undef; }
     bool             IsParamNode()      const { return m_param_type != ParamType::Undef; }
+    void             SetContainer(bool is_container) { m_container = is_container; }
 
     ParamsNode* GetParent() { return m_parent; }
     ParamsNodePtrArray& GetChildren() { return m_children; }
@@ -149,10 +132,8 @@ class ParamsNode
 
 class ParamsModel : public wxDataViewModel
 {
-    GroupParamsNodePtrMap       m_group_nodes;
-    SubSlicingStateNodePtrMap   m_sub_slicing_state_nodes;
-
-    wxDataViewCtrl*             m_ctrl{ nullptr };
+    ParamsNodePtrArray  m_group_nodes;
+    wxDataViewCtrl*     m_ctrl{ nullptr };
 
 public:
 
@@ -161,21 +142,22 @@ class ParamsModel : public wxDataViewModel
 
     void            SetAssociatedControl(wxDataViewCtrl* ctrl) { m_ctrl = ctrl; }
 
-    wxDataViewItem  AppendGroup(GroupParamsType     type);
+    wxDataViewItem AppendGroup(const wxString&    group_name,
+                               const std::string& icon_name);
 
-    wxDataViewItem  AppendSubGroup( GroupParamsType type,
-                                    SubSlicingState sub_type);
+    wxDataViewItem AppendSubGroup(wxDataViewItem    parent,
+                                  const wxString&   sub_group_name,
+                                  const std::string&icon_name);
 
-    wxDataViewItem  AppendParam(GroupParamsType     type,
+    wxDataViewItem AppendParam( wxDataViewItem      parent,
                                 ParamType           param_type,
-                                const std::string&  param_key,
-                                SubSlicingState     subgroup_type = SubSlicingState::Undef);
+                                const std::string&  param_key);
+
+    wxDataViewItem Delete(const wxDataViewItem& item);
 
     wxString        GetParamName(wxDataViewItem item);
     std::string     GetParamKey(wxDataViewItem item);
 
-    void            Rescale();
-
     void            Clear();
 
     wxDataViewItem  GetParent(const wxDataViewItem& item) const override;
@@ -199,20 +181,6 @@ class ParamsViewCtrl : public wxDataViewCtrl
 {
     int                     m_em_unit;
 
-    //struct ItemData
-    //{
-    //    std::string     opt_key;
-    //    wxString        opt_name;
-    //    wxString        old_val;
-    //    wxString        mod_val;
-    //    wxString        new_val;
-    //    Preset::Type    type;
-    //    bool            is_long{ false };
-    //};
-
-    //// tree items related to the options
-    //std::map<wxDataViewItem, ItemData> m_items_map;
-
 public:
     ParamsViewCtrl(wxWindow* parent, wxSize size);
     ~ParamsViewCtrl() override {
@@ -224,12 +192,16 @@ class ParamsViewCtrl : public wxDataViewCtrl
 
     ParamsModel* model{ nullptr };
 
-    wxDataViewItem AppendGroup( GroupParamsType type);
+    wxDataViewItem AppendGroup(const wxString&    group_name,
+                               const std::string& icon_name);
+
+    wxDataViewItem AppendSubGroup(wxDataViewItem    parent,
+                                  const wxString&   sub_group_name,
+                                  const std::string&icon_name);
 
-    wxDataViewItem AppendParam( GroupParamsType     group_type,
+    wxDataViewItem AppendParam( wxDataViewItem      parent,
                                 ParamType           param_type,
-                                const std::string&  param_key,
-                                SubSlicingState     group_subgroup_type = SubSlicingState::Undef);
+                                const std::string&  param_key);
 
     wxString        GetValue(wxDataViewItem item);
     wxString        GetSelectedValue();

From 6d19d6207a1d937334993d77d85176bc2330d848 Mon Sep 17 00:00:00 2001
From: Ocraftyone <Ocraftyone@users.noreply.github.com>
Date: Mon, 25 Dec 2023 04:40:25 -0500
Subject: [PATCH 06/39] Partial Automation of getting Gcode placeholders

Included pre-generated files specific to Orca rather than PS provided files

Original Commit: prusa3d/PrusaSlicer@55d5921

Co-authored-by: YuSanka <yusanka@gmail.com>
---
 .../custom_gcodes/before_layer_change_gcode   |   4 +
 resources/custom_gcodes/filament_end_gcode    |   5 +
 resources/custom_gcodes/layer_change_gcode    |   3 +
 resources/custom_gcodes/machine_end_gcode     |   5 +
 resources/custom_gcodes/rw_slicing_state      |   4 +
 resources/custom_gcodes/universal             |  55 +++
 src/OrcaSlicer.cpp                            |   1 +
 src/libslic3r/GCode.cpp                       |   5 +
 src/libslic3r/GCode.hpp                       |   9 +
 src/libslic3r/Print.cpp                       |  40 +++
 src/libslic3r/Utils.hpp                       |   5 +
 src/libslic3r/utils.cpp                       |  12 +
 src/slic3r/GUI/EditGCodeDialog.cpp            | 320 ++++++++++++------
 src/slic3r/GUI/EditGCodeDialog.hpp            |   7 +
 14 files changed, 364 insertions(+), 111 deletions(-)
 create mode 100644 resources/custom_gcodes/before_layer_change_gcode
 create mode 100644 resources/custom_gcodes/filament_end_gcode
 create mode 100644 resources/custom_gcodes/layer_change_gcode
 create mode 100644 resources/custom_gcodes/machine_end_gcode
 create mode 100644 resources/custom_gcodes/rw_slicing_state
 create mode 100644 resources/custom_gcodes/universal

diff --git a/resources/custom_gcodes/before_layer_change_gcode b/resources/custom_gcodes/before_layer_change_gcode
new file mode 100644
index 00000000000..a30f81cd871
--- /dev/null
+++ b/resources/custom_gcodes/before_layer_change_gcode
@@ -0,0 +1,4 @@
+# OrcaSlicer 1.9.0-dev
+layer_num = 2
+layer_z = 1
+max_layer_z = 1
diff --git a/resources/custom_gcodes/filament_end_gcode b/resources/custom_gcodes/filament_end_gcode
new file mode 100644
index 00000000000..129c16f9ac8
--- /dev/null
+++ b/resources/custom_gcodes/filament_end_gcode
@@ -0,0 +1,5 @@
+# OrcaSlicer 1.9.0-dev
+filament_extruder_id = 2
+layer_num = 2
+layer_z = 1
+max_layer_z = 1
diff --git a/resources/custom_gcodes/layer_change_gcode b/resources/custom_gcodes/layer_change_gcode
new file mode 100644
index 00000000000..ef3bc9782f1
--- /dev/null
+++ b/resources/custom_gcodes/layer_change_gcode
@@ -0,0 +1,3 @@
+# OrcaSlicer 1.9.0-dev
+layer_num = 2
+layer_z = 1
diff --git a/resources/custom_gcodes/machine_end_gcode b/resources/custom_gcodes/machine_end_gcode
new file mode 100644
index 00000000000..129c16f9ac8
--- /dev/null
+++ b/resources/custom_gcodes/machine_end_gcode
@@ -0,0 +1,5 @@
+# OrcaSlicer 1.9.0-dev
+filament_extruder_id = 2
+layer_num = 2
+layer_z = 1
+max_layer_z = 1
diff --git a/resources/custom_gcodes/rw_slicing_state b/resources/custom_gcodes/rw_slicing_state
new file mode 100644
index 00000000000..e4b9b36a601
--- /dev/null
+++ b/resources/custom_gcodes/rw_slicing_state
@@ -0,0 +1,4 @@
+# OrcaSlicer 1.9.0-dev
+e_restart_extra = 16385
+e_retracted = 16385
+position = 16385
diff --git a/resources/custom_gcodes/universal b/resources/custom_gcodes/universal
new file mode 100644
index 00000000000..01396063a15
--- /dev/null
+++ b/resources/custom_gcodes/universal
@@ -0,0 +1,55 @@
+# OrcaSlicer 1.9.0-dev
+bbl_bed_temperature_gcode = 8
+bed_temperature = 16386
+bed_temperature_initial_layer = 16386
+bed_temperature_initial_layer_single = 2
+bed_temperature_initial_layer_vector = 3
+chamber_temperature = 16386
+current_extruder = 2
+current_object_idx = 2
+day = 2
+during_print_exhaust_fan_speed_num = 16386
+extruded_volume = 16385
+extruded_volume_total = 1
+extruded_weight = 16385
+extruded_weight_total = 1
+filament_preset = 16387
+first_layer_bed_temperature = 16386
+first_layer_center_no_wipe_tower = 16385
+first_layer_height = 1
+first_layer_print_convex_hull = 16390
+first_layer_print_max = 16385
+first_layer_print_min = 16385
+first_layer_print_size = 16385
+first_layer_temperature = 16386
+has_wipe_tower = 8
+hour = 2
+in_head_wrap_detect_zone = 8
+initial_extruder = 2
+initial_no_support_extruder = 2
+initial_no_support_tool = 2
+initial_tool = 2
+input_filename = 3
+input_filename_base = 3
+is_extruder_used = 16392
+max_print_height = 2
+minute = 2
+month = 2
+num_instances = 2
+num_objects = 2
+outer_wall_volumetric_speed = 1
+overall_chamber_temperature = 2
+plate_name = 3
+print_bed_max = 16385
+print_bed_min = 16385
+print_bed_size = 16385
+print_preset = 3
+printer_preset = 3
+scale = 16387
+second = 2
+timestamp = 3
+total_layer_count = 2
+total_toolchanges = 2
+year = 2
+z_offset = 1
+zhop = 1
diff --git a/src/OrcaSlicer.cpp b/src/OrcaSlicer.cpp
index 81ad60d4180..f4781da7c12 100644
--- a/src/OrcaSlicer.cpp
+++ b/src/OrcaSlicer.cpp
@@ -5329,6 +5329,7 @@ bool CLI::setup(int argc, char **argv)
     set_var_dir((path_resources / "images").string());
     set_local_dir((path_resources / "i18n").string());
     set_sys_shapes_dir((path_resources / "shapes").string());
+    set_custom_gcodes_dir((path_resources / "custom_gcodes").string());
 
     // Parse all command line options into a DynamicConfig.
     // If any option is unsupported, print usage and abort immediately.
diff --git a/src/libslic3r/GCode.cpp b/src/libslic3r/GCode.cpp
index 8c0e8bb4f59..04c9e7ce71e 100644
--- a/src/libslic3r/GCode.cpp
+++ b/src/libslic3r/GCode.cpp
@@ -2915,6 +2915,11 @@ void GCode::process_layers(
 
 std::string GCode::placeholder_parser_process(const std::string &name, const std::string &templ, unsigned int current_extruder_id, const DynamicConfig *config_override)
 {
+#if GET_CUSTOM_GCODE_PLACEHOLDERS
+    if (config_override &&
+        g_code_placeholders_map.find(name) == g_code_placeholders_map.end())
+        g_code_placeholders_map[name] = *config_override;
+#endif
 PlaceholderParserIntegration &ppi = m_placeholder_parser_integration;
     try {
         ppi.update_from_gcodewriter(m_writer);
diff --git a/src/libslic3r/GCode.hpp b/src/libslic3r/GCode.hpp
index 481a005d552..f12c4bb5704 100644
--- a/src/libslic3r/GCode.hpp
+++ b/src/libslic3r/GCode.hpp
@@ -157,6 +157,8 @@ struct LayerResult {
 };
 
 class GCode {
+#define GET_CUSTOM_GCODE_PLACEHOLDERS 1
+
 public:
     GCode() :
     	m_origin(Vec2d::Zero()),
@@ -185,6 +187,13 @@ class GCode {
         {}
     ~GCode() = default;
 
+#if GET_CUSTOM_GCODE_PLACEHOLDERS
+    std::map<std::string, DynamicConfig> g_code_placeholders_map;
+    const std::map<std::string, DynamicConfig>& get_g_code_placeholders_map() { return g_code_placeholders_map; }
+    const DynamicConfig& get_placeholder_parser_config() const { return m_placeholder_parser_integration.parser.config(); }
+    const DynamicConfig& get_placeholder_output_config() const { return m_placeholder_parser_integration.output_config; }
+#endif
+
     // throws std::runtime_exception on error,
     // throws CanceledException through print->throw_if_canceled().
     void            do_export(Print* print, const char* path, GCodeProcessorResult* result = nullptr, ThumbnailsGeneratorCallback thumbnail_cb = nullptr);
diff --git a/src/libslic3r/Print.cpp b/src/libslic3r/Print.cpp
index 25c46194800..3243c336da8 100644
--- a/src/libslic3r/Print.cpp
+++ b/src/libslic3r/Print.cpp
@@ -2038,6 +2038,46 @@ std::string Print::export_gcode(const std::string& path_template, GCodeProcessor
     const Vec3d origin = this->get_plate_origin();
     gcode.set_gcode_offset(origin(0), origin(1));
     gcode.do_export(this, path.c_str(), result, thumbnail_cb);
+
+#if GET_CUSTOM_GCODE_PLACEHOLDERS
+
+    const std::string dir = custom_gcodes_dir() +
+#ifdef _WIN32
+                            "\\";
+#else
+                            "/";
+#endif
+
+    auto save_placeholders = [dir](const std::string& file_name, const DynamicConfig& config) {
+        try {
+            boost::nowide::ofstream c;
+            c.open(dir + file_name, std::ios::out | std::ios::trunc);
+            c << "# " << header_slic3r_generated() << std::endl;
+            auto keys = config.keys();
+            for (const std::string& opt_key : keys) {
+                const std::string type = std::to_string(int(config.optptr(opt_key)->type()));
+                c << opt_key << " = " << type << std::endl;
+            }
+            c.close();
+        }
+        catch (const std::ofstream::failure& err) {
+            throw RuntimeError(format("The %1% cannot be loaded:\n\tReason: %2%", file_name, err.what()));
+        }
+    };
+
+    // save specific placeholders
+    const auto& gcode_placeholders = gcode.get_g_code_placeholders_map();
+    for (const auto& [gcode_name, config] : gcode_placeholders)
+        save_placeholders(gcode_name, config);
+
+    // save universal placeholders
+    save_placeholders("universal", gcode.get_placeholder_parser_config());
+
+    // save placeholders for "rw_slicing_state" slicing state
+    save_placeholders("rw_slicing_state", gcode.get_placeholder_output_config());
+
+#endif
+
     //BBS
     result->conflict_result = m_conflict_result;
     return path.c_str();
diff --git a/src/libslic3r/Utils.hpp b/src/libslic3r/Utils.hpp
index 2a261476c4f..3f9ecb0f688 100644
--- a/src/libslic3r/Utils.hpp
+++ b/src/libslic3r/Utils.hpp
@@ -144,6 +144,11 @@ const std::string& sys_shapes_dir();
 // Return a full path to the custom shapes gallery directory.
 std::string custom_shapes_dir();
 
+// Set a path with shapes gallery files.
+void set_custom_gcodes_dir(const std::string &path);
+// Return a full path to the system shapes gallery directory.
+const std::string& custom_gcodes_dir();
+
 // Set a path with preset files.
 void set_data_dir(const std::string &path);
 // Return a full path to the GUI resource files.
diff --git a/src/libslic3r/utils.cpp b/src/libslic3r/utils.cpp
index 88f78f22d47..a3edb6bf262 100644
--- a/src/libslic3r/utils.cpp
+++ b/src/libslic3r/utils.cpp
@@ -265,6 +265,18 @@ const std::string& sys_shapes_dir()
 	return g_sys_shapes_dir;
 }
 
+static std::string g_custom_gcodes_dir;
+
+void set_custom_gcodes_dir(const std::string &dir)
+{
+    g_custom_gcodes_dir = dir;
+}
+
+const std::string& custom_gcodes_dir()
+{
+    return g_custom_gcodes_dir;
+}
+
 // Translate function callback, to call wxWidgets translate function to convert non-localized UTF8 string to a localized one.
 Slic3r::I18N::translate_fn_type Slic3r::I18N::translate_fn = nullptr;
 static std::string g_data_dir;
diff --git a/src/slic3r/GUI/EditGCodeDialog.cpp b/src/slic3r/GUI/EditGCodeDialog.cpp
index 2706e55a584..fb0a4f1d734 100644
--- a/src/slic3r/GUI/EditGCodeDialog.cpp
+++ b/src/slic3r/GUI/EditGCodeDialog.cpp
@@ -20,7 +20,9 @@
 #include "MsgDialog.hpp"
 #include "Plater.hpp"
 
+#include "libslic3r/PlaceholderParser.hpp"
 #include "libslic3r/Preset.hpp"
+#include "libslic3r/Print.hpp"
 
 #define BTN_GAP  FromDIP(20)
 #define BTN_SIZE wxSize(FromDIP(58), FromDIP(24))
@@ -28,25 +30,97 @@
 namespace Slic3r {
 namespace GUI {
 
-static std::vector<std::string> get_specific_params(const std::string& custom_gcode)
-{
-    if (custom_gcode == "start_filament_gcode" || custom_gcode == "end_filament_gcode")
-        return{ "max_layer_z",
-                "layer_num",
-                "layer_z",
-                "filament_extruder_id" };
-    if (custom_gcode == "end_gcode" || custom_gcode == "before_layer_gcode" || custom_gcode == "layer_gcode")
-        return{ "max_layer_z",
-                "layer_num",
-                "layer_z" };
-    if (custom_gcode == "toolchange_gcode")
-        return{ "next_extruder",
-               "previous_extruder",
-               "toolchange_z",
-               "max_layer_z",
-               "layer_num",
-               "layer_z" };
-    return {};
+ConfigOption* get_new_option(const ConfigOptionType type)
+{
+    switch (type) {
+    case coFloat:
+        return new ConfigOptionFloat(0.);
+    case coFloats:
+        return new ConfigOptionFloats({ 0. });
+    case coInt:
+        return new ConfigOptionInt(0);
+    case coInts:
+        return new ConfigOptionInts({ 0 });
+    case coString:
+        return new ConfigOptionString("");
+    case coStrings:
+        return new ConfigOptionStrings({ ""});
+    case coPercent:
+        return new ConfigOptionPercent(0);
+    case coPercents:
+        return new ConfigOptionPercents({ 0});
+    case coFloatOrPercent:
+        return new ConfigOptionFloatOrPercent();
+    case coFloatsOrPercents:
+        return new ConfigOptionFloatsOrPercents();
+    case coPoint:
+        return new ConfigOptionPoint(Vec2d(100, 100));
+    case coPoints:
+        return new ConfigOptionPoints({ Vec2d(100,100) });
+    case coPoint3:
+        return new ConfigOptionPoint3();
+    case coBool:
+        return new ConfigOptionBool(true);
+    case coBools:
+        return new ConfigOptionBools({ true });
+    case coEnum:
+        return new ConfigOptionEnum<InfillPattern>();
+    default:
+        return nullptr;
+    }
+}
+
+namespace fs = boost::filesystem;
+namespace pt = boost::property_tree;
+static std::vector<std::string> get_params_from_file(const std::string& file_name, DynamicConfig& out_config)
+{
+    const fs::path file_path = fs::path(custom_gcodes_dir() +
+#ifdef _WIN32
+                                        "\\"
+#else
+                                        "/"
+#endif
+                                        + file_name);
+
+    if (!fs::exists(file_path))
+        return {};
+
+    const std::string file = file_path.string();
+
+    // Load the preset file, apply preset values on top of defaults.
+    try {
+        DynamicConfig config;
+
+        try {
+            pt::ptree tree;
+            boost::nowide::ifstream ifs(file);
+            pt::read_ini(ifs, tree);
+            for (const pt::ptree::value_type& v : tree) {
+                try {
+                    t_config_option_key opt_key = v.first;
+                    const std::string type_str = v.second.get_value<std::string>();
+                    const ConfigOptionType type = ConfigOptionType(std::atoi(type_str.c_str()));
+                    if (ConfigOption* opt = get_new_option(type))
+                        config.set_key_value(opt_key, std::move(opt));
+                }
+                catch (UnknownOptionException& err) {
+                    throw RuntimeError(format("Some option from %1% cannot be loaded:\n\tReason: %2%", file, err.what()));
+                }
+            }
+        }
+        catch (const ConfigurationError& e) {
+            throw ConfigurationError(format("Failed loading configuration file \"%1%\": \n\t%2%", file, e.what()));
+        }
+
+        out_config += config;
+        return config.keys();
+    }
+    catch (const std::ifstream::failure& err) {
+        throw RuntimeError(format("The %1% cannot be loaded:\n\tReason: %2%", file, err.what()));
+    }
+    catch (const std::runtime_error& err) {
+        throw RuntimeError(format("Failed loading the custom_gcode_placeholders file: \"%1%\"\n\tReason: %2%", file , err.what()));
+    }
 }
 
 //------------------------------------------
@@ -126,97 +200,106 @@ std::string EditGCodeDialog::get_edited_gcode() const
 
 void EditGCodeDialog::init_params_list(const std::string& custom_gcode_name)
 {
-    wxDataViewItem group        = m_params_list->AppendGroup(_L("Slicing State"), "re_slice");
+    const std::vector<std::string> universal_params = get_params_from_file("universal", m_universal_config);
+
+    auto get_type = [](const std::string& opt_key, const DynamicConfig& config) {
+        return config.optptr(opt_key)->is_scalar() ? ParamType::Scalar : ParamType::Vector;
+    };
+
+    // Add slicing states placeholders
+
+    std::vector<std::string> read_only_opts = { "zhop" };
+    wxDataViewItem group = m_params_list->AppendGroup(_L("Slicing State"), "re_slice");
     {
-        wxDataViewItem read_only    = m_params_list->AppendSubGroup(group, _L("Read Only"),  "lock_closed");
-        m_params_list->AppendParam(read_only, ParamType::Scalar, "zhop");
+        wxDataViewItem read_only = m_params_list->AppendSubGroup(group, _L("Read Only"),  "lock_closed");
+        for (const auto& opt_key : read_only_opts)
+            m_params_list->AppendParam(read_only, get_type(opt_key, m_universal_config), opt_key);
     }
-    {
-        wxDataViewItem read_write   = m_params_list->AppendSubGroup(group, _L("Read Write"), "lock_open");
-        for (const auto& opt_name : { "position", "e_position"})
-            m_params_list->AppendParam(read_write, ParamType::Vector, opt_name);
-        for (const auto& opt_name : { "e_retracted", "e_restart_extra"})
-            m_params_list->AppendParam(read_write, ParamType::FilamentVector, opt_name);
+
+    const std::vector<std::string> read_write_params = get_params_from_file("rw_slicing_state", m_read_write_config);
+    if (!read_write_params.empty()) {
+        wxDataViewItem read_write = m_params_list->AppendSubGroup(group, _L("Read Write"), "lock_open");
+        for (const auto& opt_key : read_write_params)
+            m_params_list->AppendParam(read_write, get_type(opt_key, m_read_write_config), opt_key);
     }
 
-    group = m_params_list->AppendGroup(_L("Universal"), "equal");
-    {
-        wxDataViewItem time_stamp = m_params_list->AppendSubGroup(group, _L("Time Stamp"), "time");
-        for (const auto& opt_name : {   "day",
-                                        "hour",
-                                        "minute",
-                                        "month",
-                                        "second",
-                                        "year",
-                                        "timestamp" })
-            m_params_list->AppendParam(time_stamp, ParamType::Scalar, opt_name);
-
-        for (const auto& opt_name : {   "current_extruder",
-                                        "current_object_idx",
-                                        "filament_preset",
-                                        "first_layer_print_convex_hull",
-                                        "first_layer_print_max",
-                                        "first_layer_print_min",
-                                        "first_layer_print_size",
-                                        "has_single_extruder_multi_material_priming",
-                                        "has_wipe_tower",
-                                        "initial_extruder",
-                                        "initial_tool",
-                                        "input_filename",
-                                        "input_filename_base",
-                                        "is_extruder_used",
-                                        "num_instances",
-                                        "num_objects",
-                                        "physical_printer_preset",
-                                        "print_bed_max",
-                                        "print_bed_min",
-                                        "print_bed_size",
-                                        "print_preset",
-                                        "printer_preset",
-                                        "scale",
-                                        "total_layer_count",
-                                        "total_toolchanges" })
-            m_params_list->AppendParam(group, ParamType::Scalar, opt_name);
+    // Add universal placeholders
+
+    if (!universal_params.empty()) {
+        group = m_params_list->AppendGroup(_L("Universal"), "equal");
+
+        // Add print statistics subgroup
+
+        m_print_statistics_config = PrintStatistics::placeholders();
+        if (!m_print_statistics_config.empty()) {
+            wxDataViewItem statistics = m_params_list->AppendSubGroup(group, _L("Print Statistics"), "info");
+            const std::vector<std::string> statistics_params = m_print_statistics_config.keys();
+            for (const auto& opt_key : statistics_params)
+                m_params_list->AppendParam(statistics, get_type(opt_key, m_print_statistics_config), opt_key);
+        }
+
+        // Add timestamp subgroup
+
+        PlaceholderParser parser;
+        parser.update_timestamp();
+        const DynamicConfig& ts_config = parser.config();
+        wxDataViewItem time_stamp = ts_config.empty() ? group : m_params_list->AppendSubGroup(group, _L("Timestamps"), "time");
+
+        // Add un-grouped params
+
+        wxDataViewItem other = m_params_list->AppendSubGroup(group, _L("Other"), "add_gcode");
+        for (const auto& opt_key : universal_params) {
+            if (m_print_statistics_config.has(opt_key) || std::find(read_only_opts.begin(), read_only_opts.end(), opt_key) != read_only_opts.end())
+                continue;
+            m_params_list->AppendParam( ts_config.has(opt_key) ? time_stamp : other, get_type(opt_key, m_universal_config), opt_key);
+        }
     }
 
-    std::vector<std::string> specific_params = get_specific_params(custom_gcode_name);
+    // Add specific placeholders
+
+    const std::vector<std::string> specific_params = get_params_from_file(custom_gcode_name, m_specific_config);
     if (!specific_params.empty()) {
         group = m_params_list->AppendGroup(format_wxstr(_L("Specific for %1%"), custom_gcode_name), "not_equal");
-        for (const auto& opt_name : specific_params)
-            m_params_list->AppendParam(group, ParamType::Scalar, opt_name);
+        for (const auto& opt_key : specific_params)
+            m_params_list->AppendParam(group, get_type(opt_key, m_specific_config), opt_key);
+
+        m_params_list->Expand(group);
     }
 
-    auto get_set_from_vec = [](const std::vector<std::string>& vec) {
+    // Add placeholders from presets
+
+    add_presets_placeholders();
+}
+
+void EditGCodeDialog::add_presets_placeholders()
+{
+    auto get_set_from_vec = [](const std::vector<std::string>&vec) {
         return std::set<std::string>(vec.begin(), vec.end());
     };
-    const bool is_fff = wxGetApp().plater()->printer_technology() == ptFFF;
+
+    const bool                  is_fff           = wxGetApp().plater()->printer_technology() == ptFFF;
     const std::set<std::string> print_options    = get_set_from_vec(is_fff ? Preset::print_options()    : Preset::sla_print_options());
     const std::set<std::string> material_options = get_set_from_vec(is_fff ? Preset::filament_options() : Preset::sla_material_options());
     const std::set<std::string> printer_options  = get_set_from_vec(is_fff ? Preset::printer_options()  : Preset::sla_printer_options());
 
-    const auto& full_config = wxGetApp().preset_bundle->full_config();
+    const auto&full_config = wxGetApp().preset_bundle->full_config();
 
-    const auto& def = full_config.def()->get("")->label;
-
-
-    group = m_params_list->AppendGroup(_L("Presets"), "cog");
-    {
-        wxDataViewItem print = m_params_list->AppendSubGroup(group, _L("Print settings"), "cog");
-        for (const auto& opt : print_options)
-            if (const ConfigOption *optptr = full_config.optptr(opt))
-                m_params_list->AppendParam(print, optptr->is_scalar() ? ParamType::Scalar : ParamType::Vector, opt);
+    wxDataViewItem group = m_params_list->AppendGroup(_L("Presets"), "cog");
 
-        wxDataViewItem material = m_params_list->AppendSubGroup(group, _(is_fff ? L("Filament settings") : L("SLA Materials settings")), is_fff ? "spool" : "resin");
-        for (const auto& opt : material_options)
-            if (const ConfigOption *optptr = full_config.optptr(opt))
-                m_params_list->AppendParam(material, optptr->is_scalar() ? ParamType::Scalar : ParamType::FilamentVector, opt);
+    wxDataViewItem print = m_params_list->AppendSubGroup(group, _L("Print settings"), "cog");
+    for (const auto&opt : print_options)
+        if (const ConfigOption *optptr = full_config.optptr(opt))
+            m_params_list->AppendParam(print, optptr->is_scalar() ? ParamType::Scalar : ParamType::Vector, opt);
 
-        wxDataViewItem printer = m_params_list->AppendSubGroup(group, _L("Printer settings"), is_fff ? "printer" : "sla_printer");
-        for (const auto& opt : printer_options)
-            if (const ConfigOption *optptr = full_config.optptr(opt))
-                m_params_list->AppendParam(printer, optptr->is_scalar() ? ParamType::Scalar : ParamType::Vector, opt);
+    wxDataViewItem material = m_params_list->AppendSubGroup(group, _(is_fff ? L("Filament settings") : L("SLA Materials settings")), is_fff ? "spool" : "resin");
+    for (const auto&opt : material_options)
+        if (const ConfigOption *optptr = full_config.optptr(opt))
+            m_params_list->AppendParam(material, optptr->is_scalar() ? ParamType::Scalar : ParamType::FilamentVector, opt);
 
-    }
+    wxDataViewItem printer = m_params_list->AppendSubGroup(group, _L("Printer settings"), is_fff ? "printer" : "sla_printer");
+    for (const auto&opt : printer_options)
+        if (const ConfigOption *optptr = full_config.optptr(opt))
+            m_params_list->AppendParam(printer, optptr->is_scalar() ? ParamType::Scalar : ParamType::Vector, opt);
 }
 
 void EditGCodeDialog::add_selected_value_to_gcode()
@@ -233,28 +316,43 @@ void EditGCodeDialog::bind_list_and_button()
 
         const std::string opt_key = m_params_list->GetSelectedParamKey();
         if (!opt_key.empty()) {
+            const ConfigOptionDef*    cod     { nullptr };
+            const ConfigOption*       optptr  { nullptr };
+
             const auto& full_config = wxGetApp().preset_bundle->full_config();
-            if (const ConfigDef* def = full_config.def();
-                def && def->has(opt_key)) {
-                const ConfigOptionDef* cod    = def->get(opt_key);
-                const ConfigOption*    optptr = full_config.optptr(opt_key);
-                const ConfigOptionType type   = optptr->type();
-
-                wxString type_str = type == coNone                                          ? "none" :
-                                    type == coFloat || type == coFloats                     ? "float" :
-                                    type == coInt || type == coInts                         ? "integer" :
-                                    type == coString || type == coStrings                   ? "string" :
-                                    type == coPercent || type == coPercents                 ? "percent" :
-                                    type == coFloatOrPercent || type == coFloatsOrPercents  ? "float ar percent" :
-                                    type == coPoint || type == coPoints || type == coPoint3 ? "point" :
-                                    type == coBool || type == coBools                       ? "bool" :
-                                    type == coEnum                                          ? "enum" : "undef";
-
-                label = ( cod->full_label.empty() &&  cod->label.empty() ) ? format_wxstr("Undef Label\n(%1%)", type_str) :
+            if (const ConfigDef* def = full_config.def(); def && def->has(opt_key)) {
+                cod = def->get(opt_key);
+                optptr = full_config.optptr(opt_key);
+            }
+            else {
+                for (const DynamicConfig* config: { &m_read_write_config, &m_universal_config, &m_specific_config, &m_print_statistics_config }) {
+                    optptr = config->optptr(opt_key);
+                    if (optptr)
+                        break;
+                }
+            }
+
+            if (optptr) {
+                const ConfigOptionType scalar_type = optptr->is_scalar() ? optptr->type() : static_cast<ConfigOptionType>(optptr->type() - coVectorType);
+                wxString type_str = scalar_type == coNone           ? "none" :
+                                                     scalar_type == coFloat          ? "float" :
+                                                     scalar_type == coInt            ? "integer" :
+                                                     scalar_type == coString         ? "string" :
+                                                     scalar_type == coPercent        ? "percent" :
+                                                     scalar_type == coFloatOrPercent ? "float or percent" :
+                                                     scalar_type == coPoint          ? "point" :
+                                                     scalar_type == coBool           ? "bool" :
+                                                     scalar_type == coEnum           ? "enum" : "undef";
+                if (!optptr->is_scalar())
+                    type_str += "[]";
+
+                label = (!cod || (cod->full_label.empty() && cod->label.empty()) ) ? format_wxstr("%1%\n(%2%)", opt_key, type_str) :
                         (!cod->full_label.empty() && !cod->label.empty() ) ?
                         format_wxstr("%1% > %2%\n(%3%)", _(cod->full_label), _(cod->label), type_str) :
                         format_wxstr("%1%\n(%2%)", cod->label.empty() ? _(cod->full_label) : _(cod->label), type_str);
             }
+            else
+                label = "Undef optptr";
         }
 
         m_param_label->SetLabel(label);
@@ -552,7 +650,7 @@ void ParamsModel::GetValue(wxVariant& variant, const wxDataViewItem& item, unsig
     assert(item.IsOk());
 
     ParamsNode* node = static_cast<ParamsNode*>(item.GetID());
-    if (col == 0)
+    if (col == (unsigned int)0)
 #ifdef __linux__
         variant << wxDataViewIconText(node->text, get_bmp_bundle(node->icon_name)->GetIconFor(m_ctrl->GetParent()));
 #else
@@ -567,11 +665,11 @@ bool ParamsModel::SetValue(const wxVariant& variant, const wxDataViewItem& item,
     assert(item.IsOk());
 
     ParamsNode* node = static_cast<ParamsNode*>(item.GetID());
-    if (col == 0) {
+    if (col == (unsigned int)0) {
 #ifdef __linux__
         wxDataViewIconText data;
         data << variant;
-        node->m_icon = data.GetIcon();
+        node->icon = data.GetIcon();
 #else
         DataViewBitmapText data;
         data << variant;
@@ -649,7 +747,7 @@ ParamsViewCtrl::ParamsViewCtrl(wxWindow *parent, wxSize size)
 #ifdef SUPPORTS_MARKUP
     rd->EnableMarkup(true);
 #endif
-    wxDataViewColumn* column = new wxDataViewColumn("", rd, 0, width * m_em_unit, wxALIGN_TOP, wxDATAVIEW_COL_RESIZABLE | wxDATAVIEW_CELL_INERT);
+    wxDataViewColumn* column = new wxDataViewColumn("", rd, 0, 20 * m_em_unit, wxALIGN_TOP, wxDATAVIEW_COL_RESIZABLE | wxDATAVIEW_CELL_INERT);
 #else
     wxDataViewColumn* column = new wxDataViewColumn("", new BitmapTextRenderer(true, wxDATAVIEW_CELL_INERT), 0, 20 * m_em_unit, wxALIGN_TOP, wxDATAVIEW_COL_RESIZABLE);
 #endif //__linux__
diff --git a/src/slic3r/GUI/EditGCodeDialog.hpp b/src/slic3r/GUI/EditGCodeDialog.hpp
index f8f604c48eb..8753801c053 100644
--- a/src/slic3r/GUI/EditGCodeDialog.hpp
+++ b/src/slic3r/GUI/EditGCodeDialog.hpp
@@ -31,6 +31,11 @@ class EditGCodeDialog : public DPIDialog
     wxTextCtrl*         m_gcode_editor  {nullptr};
     wxStaticText*       m_param_label   {nullptr};
 
+    DynamicConfig       m_read_write_config;
+    DynamicConfig       m_universal_config;
+    DynamicConfig       m_specific_config;
+    DynamicConfig       m_print_statistics_config;
+
 public:
     EditGCodeDialog(wxWindow*parent, const std::string&key, const std::string&value);
     ~EditGCodeDialog() {}
@@ -38,6 +43,8 @@ class EditGCodeDialog : public DPIDialog
     std::string get_edited_gcode() const;
 
     void init_params_list(const std::string& custom_gcode_name);
+    void add_presets_placeholders();
+
     void add_selected_value_to_gcode();
     void bind_list_and_button();
 

From 58cd50cc2388a0bf4222b23e30200f85bd7bb1bb Mon Sep 17 00:00:00 2001
From: Ocraftyone <Ocraftyone@users.noreply.github.com>
Date: Tue, 26 Dec 2023 05:49:05 -0500
Subject: [PATCH 07/39] Implemented new grouping for the params

Original Commit: prusa3d/PrusaSlicer@b2bd7f5

Co-authored-by: YuSanka <yusanka@gmail.com>
---
 src/libslic3r/GCode.hpp            |   2 +-
 src/slic3r/GUI/EditGCodeDialog.cpp | 143 ++++++++++++++++++++++++-----
 src/slic3r/GUI/EditGCodeDialog.hpp |   4 +-
 3 files changed, 122 insertions(+), 27 deletions(-)

diff --git a/src/libslic3r/GCode.hpp b/src/libslic3r/GCode.hpp
index f12c4bb5704..06495f86d71 100644
--- a/src/libslic3r/GCode.hpp
+++ b/src/libslic3r/GCode.hpp
@@ -156,8 +156,8 @@ struct LayerResult {
     static LayerResult make_nop_layer_result() { return {"", std::numeric_limits<coord_t>::max(), false, false, true}; }
 };
 
-class GCode {
 #define GET_CUSTOM_GCODE_PLACEHOLDERS 1
+class GCode {
 
 public:
     GCode() :
diff --git a/src/slic3r/GUI/EditGCodeDialog.cpp b/src/slic3r/GUI/EditGCodeDialog.cpp
index fb0a4f1d734..8d780aa2373 100644
--- a/src/slic3r/GUI/EditGCodeDialog.cpp
+++ b/src/slic3r/GUI/EditGCodeDialog.cpp
@@ -143,14 +143,14 @@ EditGCodeDialog::EditGCodeDialog(wxWindow* parent, const std::string& key, const
     auto* grid_sizer = new wxFlexGridSizer(1, 3, 5, 15);
     grid_sizer->SetFlexibleDirection(wxBOTH);
 
-    m_params_list = new ParamsViewCtrl(this, wxSize(em * 20, em * 30));
+    m_params_list = new ParamsViewCtrl(this, wxSize(em * 30, em * 70));
     m_params_list->SetFont(wxGetApp().code_font());
     wxGetApp().UpdateDarkUI(m_params_list);
 
     m_add_btn = new ScalableButton(this, wxID_ANY, "add_copies");
     m_add_btn->SetToolTip(_L("Add selected placeholder to G-code"));
 
-    m_gcode_editor = new wxTextCtrl(this, wxID_ANY, value, wxDefaultPosition, wxSize(em * 45, em * 30), wxTE_MULTILINE
+    m_gcode_editor = new wxTextCtrl(this, wxID_ANY, value, wxDefaultPosition, wxSize(em * 75, em * 70), wxTE_MULTILINE
 #ifdef _WIN32
     | wxBORDER_SIMPLE
 #endif
@@ -200,7 +200,11 @@ std::string EditGCodeDialog::get_edited_gcode() const
 
 void EditGCodeDialog::init_params_list(const std::string& custom_gcode_name)
 {
-    const std::vector<std::string> universal_params = get_params_from_file("universal", m_universal_config);
+    const std::vector<std::string> read_write_params = get_params_from_file("rw_slicing_state", m_read_write_config);
+    const std::vector<std::string> universal_params  = get_params_from_file("universal", m_universal_config);
+    const std::vector<std::string> specific_params   = get_params_from_file(custom_gcode_name, m_specific_config);
+
+    m_print_statistics_config = PrintStatistics::placeholders();
 
     auto get_type = [](const std::string& opt_key, const DynamicConfig& config) {
         return config.optptr(opt_key)->is_scalar() ? ParamType::Scalar : ParamType::Vector;
@@ -208,34 +212,102 @@ void EditGCodeDialog::init_params_list(const std::string& custom_gcode_name)
 
     // Add slicing states placeholders
 
-    std::vector<std::string> read_only_opts = { "zhop" };
-    wxDataViewItem group = m_params_list->AppendGroup(_L("Slicing State"), "re_slice");
-    {
-        wxDataViewItem read_only = m_params_list->AppendSubGroup(group, _L("Read Only"),  "lock_closed");
-        for (const auto& opt_key : read_only_opts)
+    std::set<std::string> read_only_slicing_state_opts = { "zhop" };
+
+    wxDataViewItem slicing_state = m_params_list->AppendGroup(_L("[Global] Slicing State"), "re_slice");
+    if (!universal_params.empty()) {
+        wxDataViewItem read_only = m_params_list->AppendSubGroup(slicing_state, _L("Read Only"),  "lock_closed");
+        for (const auto& opt_key : read_only_slicing_state_opts)
             m_params_list->AppendParam(read_only, get_type(opt_key, m_universal_config), opt_key);
     }
 
-    const std::vector<std::string> read_write_params = get_params_from_file("rw_slicing_state", m_read_write_config);
     if (!read_write_params.empty()) {
-        wxDataViewItem read_write = m_params_list->AppendSubGroup(group, _L("Read Write"), "lock_open");
+        wxDataViewItem read_write = m_params_list->AppendSubGroup(slicing_state, _L("Read Write"), "lock_open");
         for (const auto& opt_key : read_write_params)
             m_params_list->AppendParam(read_write, get_type(opt_key, m_read_write_config), opt_key);
     }
 
+    //TODO: Orca: add other params which are related to slicing state that are specific to Orca
+
+    // add other universal params, which are related to slicing state
+    const std::set<std::string> other_slicing_state_opts    = { "initial_extruder"
+//                                                              , "initial_filament_type"
+                                                              , "initial_tool"
+                                                              , "current_extruder"
+                                                              , "is_extruder_used"
+                                                              , "current_object_idx"
+//                                                              , "has_single_extruder_multi_material_priming"
+                                                              , "has_wipe_tower" };
+
+    slicing_state = m_params_list->AppendGroup(_L("Slicing State"), "re_slice");
+    for (const auto& opt_key : other_slicing_state_opts) {
+        if (m_print_statistics_config.has(opt_key))
+            m_params_list->AppendParam(slicing_state, get_type(opt_key, m_print_statistics_config), opt_key);
+        else if(!universal_params.empty())
+            m_params_list->AppendParam(slicing_state, get_type(opt_key, m_universal_config), opt_key);
+    }
+
+    const std::set<std::string> other_print_statistics_opts = { "extruded_volume_total"
+                                                              , "extruded_weight"
+                                                              , "extruded_weight_total"
+                                                              , "total_layer_count"     };
+
+    const std::set<std::string> other_presets_opts          = { "filament_preset"
+//                                                              , "physical_printer_preset"
+                                                              , "printer_preset"
+                                                              , "print_preset"
+                                                              /*, "num_extruders"*/     };
+
+    const std::set<std::string> objects_info_opts           = { "num_instances"
+                                                              , "num_objects"
+                                                              , "scale"
+                                                              , "input_filename"
+                                                              , "input_filename_base"     };
+                                                       
+    const std::set<std::string> dimensions_opts             = { "first_layer_print_convex_hull"
+                                                              , "first_layer_print_max"
+                                                              , "first_layer_print_min"
+                                                              , "first_layer_print_size"
+                                                              , "print_bed_max"
+                                                              , "print_bed_min"
+                                                              , "print_bed_size"     };
+
     // Add universal placeholders
 
     if (!universal_params.empty()) {
-        group = m_params_list->AppendGroup(_L("Universal"), "equal");
+//        wxDataViewItem group = m_params_list->AppendGroup(_L("Universal"), "equal");
 
         // Add print statistics subgroup
 
-        m_print_statistics_config = PrintStatistics::placeholders();
         if (!m_print_statistics_config.empty()) {
-            wxDataViewItem statistics = m_params_list->AppendSubGroup(group, _L("Print Statistics"), "info");
+//            wxDataViewItem statistics = m_params_list->AppendSubGroup(group, _L("Print Statistics"), "info");
+            wxDataViewItem statistics = m_params_list->AppendGroup(_L("Print Statistics"), "info");
             const std::vector<std::string> statistics_params = m_print_statistics_config.keys();
             for (const auto& opt_key : statistics_params)
-                m_params_list->AppendParam(statistics, get_type(opt_key, m_print_statistics_config), opt_key);
+                if (std::find(other_slicing_state_opts.begin(), other_slicing_state_opts.end(), opt_key) == other_slicing_state_opts.end())
+                    m_params_list->AppendParam(statistics, get_type(opt_key, m_print_statistics_config), opt_key);
+                // add other universal params, which are related to print statistics
+            if (!universal_params.empty())
+                for (const auto& opt_key : other_print_statistics_opts)
+                    m_params_list->AppendParam(statistics, get_type(opt_key, m_universal_config), opt_key);
+        }
+
+        // Add objects info subgroup
+
+        if (!universal_params.empty()) {
+//            wxDataViewItem objects_info = m_params_list->AppendSubGroup(group, _L("Objects Info"), "advanced_plus");
+            wxDataViewItem objects_info = m_params_list->AppendGroup(_L("Objects Info"), "advanced_plus");
+            for (const auto& opt_key : objects_info_opts)
+                m_params_list->AppendParam(objects_info, get_type(opt_key, m_universal_config), opt_key);
+        }
+
+        // Add objects info subgroup
+
+        if (!universal_params.empty()) {
+//            wxDataViewItem dimensions = m_params_list->AppendSubGroup(group, _L("Dimensions"), "measure");
+            wxDataViewItem dimensions = m_params_list->AppendGroup(_L("Dimensions"), "measure");
+            for (const auto& opt_key : dimensions_opts)
+                m_params_list->AppendParam(dimensions, get_type(opt_key, m_universal_config), opt_key);
         }
 
         // Add timestamp subgroup
@@ -243,23 +315,30 @@ void EditGCodeDialog::init_params_list(const std::string& custom_gcode_name)
         PlaceholderParser parser;
         parser.update_timestamp();
         const DynamicConfig& ts_config = parser.config();
-        wxDataViewItem time_stamp = ts_config.empty() ? group : m_params_list->AppendSubGroup(group, _L("Timestamps"), "time");
+//        wxDataViewItem time_stamp = ts_config.empty() ? group : m_params_list->AppendSubGroup(group, _L("Timestamps"), "time");
+        wxDataViewItem time_stamp = m_params_list->AppendGroup(_L("Timestamps"), "time");
 
         // Add un-grouped params
 
-        wxDataViewItem other = m_params_list->AppendSubGroup(group, _L("Other"), "add_gcode");
-        for (const auto& opt_key : universal_params) {
-            if (m_print_statistics_config.has(opt_key) || std::find(read_only_opts.begin(), read_only_opts.end(), opt_key) != read_only_opts.end())
-                continue;
-            m_params_list->AppendParam( ts_config.has(opt_key) ? time_stamp : other, get_type(opt_key, m_universal_config), opt_key);
-        }
+//        wxDataViewItem other = m_params_list->AppendSubGroup(group, _L("Other"), "add_gcode");
+        wxDataViewItem other = m_params_list->AppendGroup(_L("Other"), "add_gcode");
+        for (const auto& opt_key : universal_params)
+            if (std::find(read_only_slicing_state_opts.begin(), read_only_slicing_state_opts.end(), opt_key)== read_only_slicing_state_opts.end() &&
+                std::find(other_slicing_state_opts.begin(),     other_slicing_state_opts.end(), opt_key)    == other_slicing_state_opts.end() &&
+                std::find(other_print_statistics_opts.begin(),  other_print_statistics_opts.end(), opt_key) == other_print_statistics_opts.end() &&
+                std::find(other_presets_opts.begin(),           other_presets_opts.end(), opt_key)          == other_presets_opts.end() &&
+                std::find(objects_info_opts.begin(),            objects_info_opts.end(), opt_key)           == objects_info_opts.end() &&
+                std::find(dimensions_opts.begin(),              dimensions_opts.end(), opt_key)             == dimensions_opts.end() &&
+                !m_print_statistics_config.has(opt_key)) {
+                m_params_list->AppendParam(ts_config.has(opt_key) ? time_stamp : other, get_type(opt_key, m_universal_config), opt_key);
+            }
+        m_params_list->CheckAndDeleteIfEmpty(other);
     }
 
     // Add specific placeholders
 
-    const std::vector<std::string> specific_params = get_params_from_file(custom_gcode_name, m_specific_config);
     if (!specific_params.empty()) {
-        group = m_params_list->AppendGroup(format_wxstr(_L("Specific for %1%"), custom_gcode_name), "not_equal");
+        wxDataViewItem group = m_params_list->AppendGroup(format_wxstr(_L("Specific for %1%"), custom_gcode_name), /*"not_equal"*/"add_gcode");
         for (const auto& opt_key : specific_params)
             m_params_list->AppendParam(group, get_type(opt_key, m_specific_config), opt_key);
 
@@ -268,10 +347,14 @@ void EditGCodeDialog::init_params_list(const std::string& custom_gcode_name)
 
     // Add placeholders from presets
 
-    add_presets_placeholders();
+    wxDataViewItem presets = add_presets_placeholders();
+    // add other params which are related to presets
+    if (!universal_params.empty())
+        for (const auto& opt_key : other_presets_opts)
+            m_params_list->AppendParam(presets, get_type(opt_key, m_universal_config), opt_key);
 }
 
-void EditGCodeDialog::add_presets_placeholders()
+wxDataViewItem EditGCodeDialog::add_presets_placeholders()
 {
     auto get_set_from_vec = [](const std::vector<std::string>&vec) {
         return std::set<std::string>(vec.begin(), vec.end());
@@ -300,6 +383,8 @@ void EditGCodeDialog::add_presets_placeholders()
     for (const auto&opt : printer_options)
         if (const ConfigOption *optptr = full_config.optptr(opt))
             m_params_list->AppendParam(printer, optptr->is_scalar() ? ParamType::Scalar : ParamType::Vector, opt);
+
+    return group;
 }
 
 void EditGCodeDialog::add_selected_value_to_gcode()
@@ -789,6 +874,14 @@ std::string ParamsViewCtrl::GetSelectedParamKey()
     return model->GetParamKey(this->GetSelection());
 }
 
+void ParamsViewCtrl::CheckAndDeleteIfEmpty(wxDataViewItem item)
+{
+    wxDataViewItemArray children;
+    model->GetChildren(item, children);
+    if (children.IsEmpty())
+        model->Delete(item);
+}
+
 void ParamsViewCtrl::Clear()
 {
     model->Clear();
diff --git a/src/slic3r/GUI/EditGCodeDialog.hpp b/src/slic3r/GUI/EditGCodeDialog.hpp
index 8753801c053..dcc1c6e5e42 100644
--- a/src/slic3r/GUI/EditGCodeDialog.hpp
+++ b/src/slic3r/GUI/EditGCodeDialog.hpp
@@ -43,7 +43,7 @@ class EditGCodeDialog : public DPIDialog
     std::string get_edited_gcode() const;
 
     void init_params_list(const std::string& custom_gcode_name);
-    void add_presets_placeholders();
+    wxDataViewItem add_presets_placeholders();
 
     void add_selected_value_to_gcode();
     void bind_list_and_button();
@@ -214,6 +214,8 @@ class ParamsViewCtrl : public wxDataViewCtrl
     wxString        GetSelectedValue();
     std::string     GetSelectedParamKey();
 
+    void    CheckAndDeleteIfEmpty(wxDataViewItem item);
+
     void    Clear();
     void    Rescale(int em = 0);
 

From 6539dc4efa65d0612f5d8166efbaad489139908e Mon Sep 17 00:00:00 2001
From: Ocraftyone <Ocraftyone@users.noreply.github.com>
Date: Tue, 26 Dec 2023 06:00:37 -0500
Subject: [PATCH 08/39] Add parameter description

Original Commit: prusa3d/PrusaSlicer@d652f15

Co-authored-by: YuSanka <yusanka@gmail.com>
---
 src/slic3r/GUI/EditGCodeDialog.cpp | 9 +++++++++
 src/slic3r/GUI/EditGCodeDialog.hpp | 1 +
 2 files changed, 10 insertions(+)

diff --git a/src/slic3r/GUI/EditGCodeDialog.cpp b/src/slic3r/GUI/EditGCodeDialog.cpp
index 8d780aa2373..dc5046e532f 100644
--- a/src/slic3r/GUI/EditGCodeDialog.cpp
+++ b/src/slic3r/GUI/EditGCodeDialog.cpp
@@ -169,6 +169,8 @@ EditGCodeDialog::EditGCodeDialog(wxWindow* parent, const std::string& key, const
     m_param_label = new wxStaticText(this, wxID_ANY, _L("Select placeholder"));
     m_param_label->SetFont(wxGetApp().bold_font());
 
+    m_param_description = new wxStaticText(this, wxID_ANY, wxEmptyString);
+
     //Orca: use custom buttons
     auto btn_sizer = create_btn_sizer(wxOK | wxCANCEL);
     for(auto btn : m_button_list)
@@ -179,6 +181,7 @@ EditGCodeDialog::EditGCodeDialog(wxWindow* parent, const std::string& key, const
     topSizer->Add(label_top           , 0, wxEXPAND | wxLEFT | wxTOP | wxRIGHT, border);
     topSizer->Add(grid_sizer          , 1, wxEXPAND | wxLEFT | wxTOP | wxRIGHT, border);
     topSizer->Add(m_param_label       , 0, wxEXPAND | wxLEFT | wxTOP | wxRIGHT, border);
+    topSizer->Add(m_param_description , 0, wxEXPAND | wxLEFT | wxTOP | wxRIGHT, border);
     topSizer->Add(btn_sizer                , 0, wxEXPAND | wxALL, border);
 
     SetSizer(topSizer);
@@ -398,6 +401,7 @@ void EditGCodeDialog::bind_list_and_button()
 {
     m_params_list->Bind(wxEVT_DATAVIEW_SELECTION_CHANGED, [this](wxDataViewEvent& evt) {
         wxString label;
+        wxString description;
 
         const std::string opt_key = m_params_list->GetSelectedParamKey();
         if (!opt_key.empty()) {
@@ -435,12 +439,17 @@ void EditGCodeDialog::bind_list_and_button()
                         (!cod->full_label.empty() && !cod->label.empty() ) ?
                         format_wxstr("%1% > %2%\n(%3%)", _(cod->full_label), _(cod->label), type_str) :
                         format_wxstr("%1%\n(%2%)", cod->label.empty() ? _(cod->full_label) : _(cod->label), type_str);
+
+                if (cod)
+                    description = _(cod->tooltip);
             }
             else
                 label = "Undef optptr";
         }
 
         m_param_label->SetLabel(label);
+        m_param_description->SetLabel(description);
+
         Layout();
     });
 
diff --git a/src/slic3r/GUI/EditGCodeDialog.hpp b/src/slic3r/GUI/EditGCodeDialog.hpp
index dcc1c6e5e42..0f87bcb9312 100644
--- a/src/slic3r/GUI/EditGCodeDialog.hpp
+++ b/src/slic3r/GUI/EditGCodeDialog.hpp
@@ -30,6 +30,7 @@ class EditGCodeDialog : public DPIDialog
     ScalableButton*     m_add_btn       {nullptr};
     wxTextCtrl*         m_gcode_editor  {nullptr};
     wxStaticText*       m_param_label   {nullptr};
+    wxStaticText*       m_param_description {nullptr};
 
     DynamicConfig       m_read_write_config;
     DynamicConfig       m_universal_config;

From 0e590083fa05f0da04f076d9c7b7d81390c2b901 Mon Sep 17 00:00:00 2001
From: Ocraftyone <Ocraftyone@users.noreply.github.com>
Date: Tue, 26 Dec 2023 07:43:49 -0500
Subject: [PATCH 09/39] Edit Custom G-Codes Improvements

Orca: Added option to use CMake config option ORCA_CHECK_GCODE_PLACEHOLDERS to check custom gcode placeholders rather than using debug

Original Commit: prusa3d/PrusaSlicer@b8bb7f2

Co-authored-by: YuSanka <yusanka@gmail.com>
---
 .../custom_gcodes/before_layer_change_gcode   |   4 -
 resources/custom_gcodes/filament_end_gcode    |   5 -
 resources/custom_gcodes/layer_change_gcode    |   3 -
 resources/custom_gcodes/machine_end_gcode     |   5 -
 resources/custom_gcodes/rw_slicing_state      |   4 -
 resources/custom_gcodes/universal             |  55 ---
 src/libslic3r/CMakeLists.txt                  |   4 +
 src/libslic3r/Config.hpp                      |   3 +
 src/libslic3r/GCode.cpp                       |  31 +-
 src/libslic3r/GCode.hpp                       |   8 -
 src/libslic3r/Print.cpp                       |  39 ---
 src/libslic3r/PrintConfig.cpp                 | 316 ++++++++++++++++++
 src/libslic3r/PrintConfig.hpp                 |  62 ++++
 src/libslic3r/libslic3r_version.h.in          |   1 +
 src/slic3r/GUI/EditGCodeDialog.cpp            | 288 ++++------------
 src/slic3r/GUI/EditGCodeDialog.hpp            |  13 +-
 16 files changed, 491 insertions(+), 350 deletions(-)
 delete mode 100644 resources/custom_gcodes/before_layer_change_gcode
 delete mode 100644 resources/custom_gcodes/filament_end_gcode
 delete mode 100644 resources/custom_gcodes/layer_change_gcode
 delete mode 100644 resources/custom_gcodes/machine_end_gcode
 delete mode 100644 resources/custom_gcodes/rw_slicing_state
 delete mode 100644 resources/custom_gcodes/universal

diff --git a/resources/custom_gcodes/before_layer_change_gcode b/resources/custom_gcodes/before_layer_change_gcode
deleted file mode 100644
index a30f81cd871..00000000000
--- a/resources/custom_gcodes/before_layer_change_gcode
+++ /dev/null
@@ -1,4 +0,0 @@
-# OrcaSlicer 1.9.0-dev
-layer_num = 2
-layer_z = 1
-max_layer_z = 1
diff --git a/resources/custom_gcodes/filament_end_gcode b/resources/custom_gcodes/filament_end_gcode
deleted file mode 100644
index 129c16f9ac8..00000000000
--- a/resources/custom_gcodes/filament_end_gcode
+++ /dev/null
@@ -1,5 +0,0 @@
-# OrcaSlicer 1.9.0-dev
-filament_extruder_id = 2
-layer_num = 2
-layer_z = 1
-max_layer_z = 1
diff --git a/resources/custom_gcodes/layer_change_gcode b/resources/custom_gcodes/layer_change_gcode
deleted file mode 100644
index ef3bc9782f1..00000000000
--- a/resources/custom_gcodes/layer_change_gcode
+++ /dev/null
@@ -1,3 +0,0 @@
-# OrcaSlicer 1.9.0-dev
-layer_num = 2
-layer_z = 1
diff --git a/resources/custom_gcodes/machine_end_gcode b/resources/custom_gcodes/machine_end_gcode
deleted file mode 100644
index 129c16f9ac8..00000000000
--- a/resources/custom_gcodes/machine_end_gcode
+++ /dev/null
@@ -1,5 +0,0 @@
-# OrcaSlicer 1.9.0-dev
-filament_extruder_id = 2
-layer_num = 2
-layer_z = 1
-max_layer_z = 1
diff --git a/resources/custom_gcodes/rw_slicing_state b/resources/custom_gcodes/rw_slicing_state
deleted file mode 100644
index e4b9b36a601..00000000000
--- a/resources/custom_gcodes/rw_slicing_state
+++ /dev/null
@@ -1,4 +0,0 @@
-# OrcaSlicer 1.9.0-dev
-e_restart_extra = 16385
-e_retracted = 16385
-position = 16385
diff --git a/resources/custom_gcodes/universal b/resources/custom_gcodes/universal
deleted file mode 100644
index 01396063a15..00000000000
--- a/resources/custom_gcodes/universal
+++ /dev/null
@@ -1,55 +0,0 @@
-# OrcaSlicer 1.9.0-dev
-bbl_bed_temperature_gcode = 8
-bed_temperature = 16386
-bed_temperature_initial_layer = 16386
-bed_temperature_initial_layer_single = 2
-bed_temperature_initial_layer_vector = 3
-chamber_temperature = 16386
-current_extruder = 2
-current_object_idx = 2
-day = 2
-during_print_exhaust_fan_speed_num = 16386
-extruded_volume = 16385
-extruded_volume_total = 1
-extruded_weight = 16385
-extruded_weight_total = 1
-filament_preset = 16387
-first_layer_bed_temperature = 16386
-first_layer_center_no_wipe_tower = 16385
-first_layer_height = 1
-first_layer_print_convex_hull = 16390
-first_layer_print_max = 16385
-first_layer_print_min = 16385
-first_layer_print_size = 16385
-first_layer_temperature = 16386
-has_wipe_tower = 8
-hour = 2
-in_head_wrap_detect_zone = 8
-initial_extruder = 2
-initial_no_support_extruder = 2
-initial_no_support_tool = 2
-initial_tool = 2
-input_filename = 3
-input_filename_base = 3
-is_extruder_used = 16392
-max_print_height = 2
-minute = 2
-month = 2
-num_instances = 2
-num_objects = 2
-outer_wall_volumetric_speed = 1
-overall_chamber_temperature = 2
-plate_name = 3
-print_bed_max = 16385
-print_bed_min = 16385
-print_bed_size = 16385
-print_preset = 3
-printer_preset = 3
-scale = 16387
-second = 2
-timestamp = 3
-total_layer_count = 2
-total_toolchanges = 2
-year = 2
-z_offset = 1
-zhop = 1
diff --git a/src/libslic3r/CMakeLists.txt b/src/libslic3r/CMakeLists.txt
index 37cb8ea0df1..f4b58135713 100644
--- a/src/libslic3r/CMakeLists.txt
+++ b/src/libslic3r/CMakeLists.txt
@@ -13,6 +13,10 @@ include(PrecompiledHeader)
 string(TIMESTAMP COMPILE_TIME %Y%m%d-%H%M%S)
 set(SLIC3R_BUILD_TIME ${COMPILE_TIME})
 
+if(NOT DEFINED ORCA_CHECK_GCODE_PLACEHOLDERS)
+    set(ORCA_CHECK_GCODE_PLACEHOLDERS "0")
+endif()
+
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libslic3r_version.h.in ${CMAKE_CURRENT_BINARY_DIR}/libslic3r_version.h @ONLY)
 
 if (MINGW)
diff --git a/src/libslic3r/Config.hpp b/src/libslic3r/Config.hpp
index 959519e60ed..a9973b4682c 100644
--- a/src/libslic3r/Config.hpp
+++ b/src/libslic3r/Config.hpp
@@ -1786,6 +1786,8 @@ class ConfigOptionDef
     // Create a default option to be inserted into a DynamicConfig.
     ConfigOption*						create_default_option() const;
 
+    bool                                is_scalar()     const { return (int(this->type) & int(coVectorType)) == 0; }
+
     template<class Archive> ConfigOption* load_option_from_archive(Archive &archive) const {
     	if (this->nullable) {
 		    switch (this->type) {
@@ -1973,6 +1975,7 @@ class ConfigDef
             out.push_back(kvp.first);
         return out;
     }
+    bool                    empty() { return options.empty(); }
 
     // Iterate through all of the CLI options and write them to a stream.
     std::ostream&           print_cli_help(
diff --git a/src/libslic3r/GCode.cpp b/src/libslic3r/GCode.cpp
index 04c9e7ce71e..718975e26bc 100644
--- a/src/libslic3r/GCode.cpp
+++ b/src/libslic3r/GCode.cpp
@@ -2915,11 +2915,34 @@ void GCode::process_layers(
 
 std::string GCode::placeholder_parser_process(const std::string &name, const std::string &templ, unsigned int current_extruder_id, const DynamicConfig *config_override)
 {
-#if GET_CUSTOM_GCODE_PLACEHOLDERS
-    if (config_override &&
-        g_code_placeholders_map.find(name) == g_code_placeholders_map.end())
-        g_code_placeholders_map[name] = *config_override;
+    // Orca: Modified functionality from PS implementation since debug is rarely used in current workflow.
+    // Allows generation to be toggled via a CMake config option.
+#if !defined(NDEBUG) || defined(ORCA_CHECK_GCODE_PLACEHOLDERS) // CHECK_CUSTOM_GCODE_PLACEHOLDERS
+    if (config_override) {
+        const auto& custom_gcode_placeholders = custom_gcode_specific_placeholders();
+
+        // 1-st check: custom G-code "name" have to be present in s_CustomGcodeSpecificOptions;
+        //if (custom_gcode_placeholders.count(name) > 0) {
+        //    const auto& placeholders = custom_gcode_placeholders.at(name);
+        if (auto it = custom_gcode_placeholders.find(name); it != custom_gcode_placeholders.end()) {
+            const auto& placeholders = it->second;
+
+            for (const std::string& key : config_override->keys()) {
+                // 2-nd check: "key" have to be present in s_CustomGcodeSpecificOptions for "name" custom G-code ;
+                if (std::find(placeholders.begin(), placeholders.end(), key) == placeholders.end())
+                    throw Slic3r::PlaceholderParserError(format("\"%s\" placeholder for \"%s\" custom G-code \n"
+                                                                "needs to be added to s_CustomGcodeSpecificOptions", key.c_str(), name.c_str()));
+                // 3-rd check: "key" have to be present in CustomGcodeSpecificConfigDef for "key" placeholder;
+                if (!custom_gcode_specific_config_def.has(key))
+                    throw Slic3r::PlaceholderParserError(format("Definition of \"%s\" placeholder \n"
+                                                                "needs to be added to CustomGcodeSpecificConfigDef", key.c_str()));
+            }
+        }
+        else
+            throw Slic3r::PlaceholderParserError(format("\"%s\" custom G-code needs to be added to s_CustomGcodeSpecificOptions", name.c_str()));
+    }
 #endif
+
 PlaceholderParserIntegration &ppi = m_placeholder_parser_integration;
     try {
         ppi.update_from_gcodewriter(m_writer);
diff --git a/src/libslic3r/GCode.hpp b/src/libslic3r/GCode.hpp
index 06495f86d71..7136c83a328 100644
--- a/src/libslic3r/GCode.hpp
+++ b/src/libslic3r/GCode.hpp
@@ -156,7 +156,6 @@ struct LayerResult {
     static LayerResult make_nop_layer_result() { return {"", std::numeric_limits<coord_t>::max(), false, false, true}; }
 };
 
-#define GET_CUSTOM_GCODE_PLACEHOLDERS 1
 class GCode {
 
 public:
@@ -187,13 +186,6 @@ class GCode {
         {}
     ~GCode() = default;
 
-#if GET_CUSTOM_GCODE_PLACEHOLDERS
-    std::map<std::string, DynamicConfig> g_code_placeholders_map;
-    const std::map<std::string, DynamicConfig>& get_g_code_placeholders_map() { return g_code_placeholders_map; }
-    const DynamicConfig& get_placeholder_parser_config() const { return m_placeholder_parser_integration.parser.config(); }
-    const DynamicConfig& get_placeholder_output_config() const { return m_placeholder_parser_integration.output_config; }
-#endif
-
     // throws std::runtime_exception on error,
     // throws CanceledException through print->throw_if_canceled().
     void            do_export(Print* print, const char* path, GCodeProcessorResult* result = nullptr, ThumbnailsGeneratorCallback thumbnail_cb = nullptr);
diff --git a/src/libslic3r/Print.cpp b/src/libslic3r/Print.cpp
index 3243c336da8..764391d70fc 100644
--- a/src/libslic3r/Print.cpp
+++ b/src/libslic3r/Print.cpp
@@ -2039,45 +2039,6 @@ std::string Print::export_gcode(const std::string& path_template, GCodeProcessor
     gcode.set_gcode_offset(origin(0), origin(1));
     gcode.do_export(this, path.c_str(), result, thumbnail_cb);
 
-#if GET_CUSTOM_GCODE_PLACEHOLDERS
-
-    const std::string dir = custom_gcodes_dir() +
-#ifdef _WIN32
-                            "\\";
-#else
-                            "/";
-#endif
-
-    auto save_placeholders = [dir](const std::string& file_name, const DynamicConfig& config) {
-        try {
-            boost::nowide::ofstream c;
-            c.open(dir + file_name, std::ios::out | std::ios::trunc);
-            c << "# " << header_slic3r_generated() << std::endl;
-            auto keys = config.keys();
-            for (const std::string& opt_key : keys) {
-                const std::string type = std::to_string(int(config.optptr(opt_key)->type()));
-                c << opt_key << " = " << type << std::endl;
-            }
-            c.close();
-        }
-        catch (const std::ofstream::failure& err) {
-            throw RuntimeError(format("The %1% cannot be loaded:\n\tReason: %2%", file_name, err.what()));
-        }
-    };
-
-    // save specific placeholders
-    const auto& gcode_placeholders = gcode.get_g_code_placeholders_map();
-    for (const auto& [gcode_name, config] : gcode_placeholders)
-        save_placeholders(gcode_name, config);
-
-    // save universal placeholders
-    save_placeholders("universal", gcode.get_placeholder_parser_config());
-
-    // save placeholders for "rw_slicing_state" slicing state
-    save_placeholders("rw_slicing_state", gcode.get_placeholder_output_config());
-
-#endif
-
     //BBS
     result->conflict_result = m_conflict_result;
     return path.c_str();
diff --git a/src/libslic3r/PrintConfig.cpp b/src/libslic3r/PrintConfig.cpp
index f31620f17e0..ff3b0ef7687 100644
--- a/src/libslic3r/PrintConfig.cpp
+++ b/src/libslic3r/PrintConfig.cpp
@@ -6458,6 +6458,322 @@ void DynamicPrintAndCLIConfig::handle_legacy(t_config_option_key &opt_key, std::
     }
 }
 
+// SlicingStatesConfigDefs
+
+ReadOnlySlicingStatesConfigDef::ReadOnlySlicingStatesConfigDef()
+{
+    ConfigOptionDef* def;
+
+    def = this->add("zhop", coFloat);
+    def->label = L("");
+    def->tooltip = L("");
+}
+
+ReadWriteSlicingStatesConfigDef::ReadWriteSlicingStatesConfigDef()
+{
+    ConfigOptionDef* def;
+
+    def = this->add("position", coFloats);
+    def->label = L("Position");
+    def->tooltip = L("");
+
+    def = this->add("e_retracted", coFloats);
+    def->label = L("");
+    def->tooltip = L("");
+
+    def = this->add("e_restart_extra", coFloats);
+    def->label = L("");
+    def->tooltip = L("");
+
+    def = this->add("e_position", coFloats);
+    def->label = L("");
+    def->tooltip = L("");
+}
+
+OtherSlicingStatesConfigDef::OtherSlicingStatesConfigDef()
+{
+    ConfigOptionDef* def;
+
+    def = this->add("current_extruder", coInt);
+    def->label = L("Current extruder");
+    def->tooltip = L("");
+
+    def = this->add("current_object_idx", coInt);
+    def->label = L("Current object index");
+    def->tooltip = L("");
+
+    def = this->add("has_single_extruder_multi_material_priming", coBool);
+    def->label = L("Has single extruder MM priming");
+    def->tooltip = L("");
+
+    def = this->add("has_wipe_tower", coBool);
+    def->label = L("Has wipe tower");
+    def->tooltip = L("");
+
+    def = this->add("initial_extruder", coInt);
+    def->label = L("Initial extruder");
+    def->tooltip = L("");
+
+    def = this->add("initial_filament_type", coStrings);
+    def->label = L("");
+    def->tooltip = L("");
+
+    def = this->add("initial_tool", coInt);
+    def->label = L("Initial tool");
+    def->tooltip = L("");
+
+    def = this->add("is_extruder_used", coBools);
+    def->label = L("");
+    def->tooltip = L("");
+}
+
+PrintStatisticsConfigDef::PrintStatisticsConfigDef()
+{
+    ConfigOptionDef* def;
+
+    def = this->add("extruded_volume", coFloats);
+    def->label = L("");
+    def->tooltip = L("");
+
+    def = this->add("normal_print_time", coString);
+    def->label = L("");
+    def->tooltip = L("");
+
+    def = this->add("num_printing_extruders", coInt);
+    def->label = L("");
+    def->tooltip = L("");
+
+    def = this->add("print_time", coString);
+    def->label = L("");
+    def->tooltip = L("");
+
+    def = this->add("printing_filament_types", coString);
+    def->label = L("");
+    def->tooltip = L("");
+
+    def = this->add("silent_print_time", coString);
+    def->label = L("");
+    def->tooltip = L("");
+
+    def = this->add("total_cost", coFloat);
+    def->label = L("");
+    def->tooltip = L("");
+
+    def = this->add("total_weight", coFloat);
+    def->label = L("");
+    def->tooltip = L("");
+
+    def = this->add("total_wipe_tower_cost", coFloat);
+    def->label = L("");
+    def->tooltip = L("");
+
+    def = this->add("total_wipe_tower_filament", coFloat);
+    def->label = L("");
+    def->tooltip = L("");
+
+    def = this->add("used_filament", coFloat);
+    def->label = L("");
+    def->tooltip = L("");
+
+    def = this->add("total_toolchanges", coInt);
+    def->label = L("Total toolchanges");
+    def->tooltip = L("");
+
+    def = this->add("extruded_volume_total", coFloat);
+    def->label = L("");
+    def->tooltip = L("");
+
+    def = this->add("extruded_weight", coFloats);
+    def->label = L("");
+    def->tooltip = L("");
+
+    def = this->add("extruded_weight_total", coFloat);
+    def->label = L("");
+    def->tooltip = L("");
+
+    def = this->add("total_layer_count", coInt);
+    def->label = L("Total layer count");
+    def->tooltip = L("");
+}
+
+ObjectsInfoConfigDef::ObjectsInfoConfigDef()
+{
+    ConfigOptionDef* def;
+
+    def = this->add("num_objects", coInt);
+    def->label = L("");
+    def->tooltip = L("");
+
+    def = this->add("num_instances", coInt);
+    def->label = L("");
+    def->tooltip = L("");
+
+    def = this->add("scale", coStrings);
+    def->label = L("");
+    def->tooltip = L("");
+
+    def = this->add("input_filename", coString);
+    def->label = L("");
+    def->tooltip = L("");
+
+    def = this->add("input_filename_base", coString);
+    def->label = L("");
+    def->tooltip = L("");
+}
+
+DimensionsConfigDef::DimensionsConfigDef()
+{
+    ConfigOptionDef* def;
+
+    def = this->add("first_layer_print_convex_hull", coPoints);
+    def->label = L("");
+    def->tooltip = L("");
+
+    def = this->add("first_layer_print_min", coFloats);
+    def->label = L("");
+    def->tooltip = L("");
+
+    def = this->add("first_layer_print_max", coFloats);
+    def->label = L("");
+    def->tooltip = L("");
+
+    def = this->add("first_layer_print_size", coFloats);
+    def->label = L("");
+    def->tooltip = L("");
+
+    def = this->add("print_bed_min", coFloats);
+    def->label = L("");
+    def->tooltip = L("");
+
+    def = this->add("print_bed_max", coFloats);
+    def->label = L("");
+    def->tooltip = L("");
+
+    def = this->add("print_bed_size", coFloats);
+    def->label = L("");
+    def->tooltip = L("");
+}
+
+TimestampsConfigDef::TimestampsConfigDef()
+{
+    ConfigOptionDef* def;
+
+    def = this->add("timestamp", coString);
+    def->label = L("");
+    def->tooltip = L("");
+
+    def = this->add("year", coInt);
+    def->label = L("Year");
+    def->tooltip = L("");
+
+    def = this->add("month", coInt);
+    def->label = L("Month");
+    def->tooltip = L("");
+
+    def = this->add("day", coInt);
+    def->label = L("Day");
+    def->tooltip = L("");
+
+    def = this->add("hour", coInt);
+    def->label = L("Hour");
+    def->tooltip = L("");
+
+    def = this->add("minute", coInt);
+    def->label = L("Minute");
+    def->tooltip = L("");
+
+    def = this->add("second", coInt);
+    def->label = L("Second");
+    def->tooltip = L("");
+}
+
+OtherPresetsConfigDef::OtherPresetsConfigDef()
+{
+    ConfigOptionDef* def;
+
+    def = this->add("num_extruders", coInt);
+    def->label = L("");
+    def->tooltip = L("");
+
+    def = this->add("print_preset", coString);
+    def->label = L("");
+    def->tooltip = L("");
+
+    def = this->add("filament_preset", coString);
+    def->label = L("");
+    def->tooltip = L("");
+
+    def = this->add("printer_preset", coString);
+    def->label = L("");
+    def->tooltip = L("");
+
+    def = this->add("physical_printer_preset", coString);
+    def->label = L("");
+    def->tooltip = L("");
+}
+
+
+static std::map<t_custom_gcode_key, t_config_option_keys> s_CustomGcodeSpecificPlaceholders{
+    {"start_filament_gcode",    {"layer_num", "layer_z", "max_layer_z", "filament_extruder_id"}},
+    {"end_filament_gcode",      {"layer_num", "layer_z", "max_layer_z", "filament_extruder_id"}},
+    {"end_gcode",               {"layer_num", "layer_z", "max_layer_z", "filament_extruder_id"}},
+    {"before_layer_gcode",      {"layer_num", "layer_z", "max_layer_z"}},
+    {"layer_gcode",             {"layer_num", "layer_z", "max_layer_z"}},
+    {"toolchange_gcode",        {"layer_num", "layer_z", "max_layer_z", "previous_extruder", "next_extruder", "toolchange_z"}},
+    // some internal g_code ?
+    {"tcr_rotated_gcode",       {"toolchange_gcode", "deretraction_from_wipe_tower_generator"}},
+};
+
+const std::map<t_custom_gcode_key, t_config_option_keys>& custom_gcode_specific_placeholders()
+{
+    return s_CustomGcodeSpecificPlaceholders;
+}
+
+CustomGcodeSpecificConfigDef::CustomGcodeSpecificConfigDef()
+{
+    ConfigOptionDef* def;
+
+    def = this->add("layer_num", coInt);
+    def->label = L("");
+    def->tooltip = L("");
+
+    def = this->add("layer_z", coFloat);
+    def->label = L("");
+    def->tooltip = L("");
+
+    def = this->add("max_layer_z", coFloat);
+    def->label = L("");
+    def->tooltip = L("");
+
+    def = this->add("filament_extruder_id", coInt);
+    def->label = L("");
+    def->tooltip = L("");
+
+    def = this->add("previous_extruder", coInt);
+    def->label = L("");
+    def->tooltip = L("");
+
+    def = this->add("next_extruder", coInt);
+    def->label = L("");
+    def->tooltip = L("");
+
+    def = this->add("toolchange_z", coFloat);
+    def->label = L("");
+    def->tooltip = L("");
+
+    // I'm not sure if next options are really needed
+
+    def = this->add("toolchange_gcode", coString);
+    def->label = L("");
+    def->tooltip = L("");
+
+    def = this->add("deretraction_from_wipe_tower_generator", coString);
+    def->label = L("");
+    def->tooltip = L("");
+}
+
+const CustomGcodeSpecificConfigDef custom_gcode_specific_config_def;
+
 uint64_t ModelConfig::s_last_timestamp = 1;
 
 static Points to_points(const std::vector<Vec2d> &dpts)
diff --git a/src/libslic3r/PrintConfig.hpp b/src/libslic3r/PrintConfig.hpp
index 8738d13247a..f16606ba38e 100644
--- a/src/libslic3r/PrintConfig.hpp
+++ b/src/libslic3r/PrintConfig.hpp
@@ -1432,6 +1432,68 @@ class CLIMiscConfigDef : public ConfigDef
     CLIMiscConfigDef();
 };
 
+typedef std::string t_custom_gcode_key;
+// This map containes list of specific placeholders for each custom G-code, if any exist
+const std::map<t_custom_gcode_key, t_config_option_keys>& custom_gcode_specific_placeholders();
+
+// Next classes define placeholders used by GUI::EditGCodeDialog.
+
+class ReadOnlySlicingStatesConfigDef : public ConfigDef
+{
+public:
+    ReadOnlySlicingStatesConfigDef();
+};
+
+class ReadWriteSlicingStatesConfigDef : public ConfigDef
+{
+public:
+    ReadWriteSlicingStatesConfigDef();
+};
+
+class OtherSlicingStatesConfigDef : public ConfigDef
+{
+public:
+    OtherSlicingStatesConfigDef();
+};
+
+class PrintStatisticsConfigDef : public ConfigDef
+{
+public:
+    PrintStatisticsConfigDef();
+};
+
+class ObjectsInfoConfigDef : public ConfigDef
+{
+public:
+    ObjectsInfoConfigDef();
+};
+
+class DimensionsConfigDef : public ConfigDef
+{
+public:
+    DimensionsConfigDef();
+};
+
+class TimestampsConfigDef : public ConfigDef
+{
+public:
+    TimestampsConfigDef();
+};
+
+class OtherPresetsConfigDef : public ConfigDef
+{
+public:
+    OtherPresetsConfigDef();
+};
+
+// This classes defines all custom G-code specific placeholders.
+class CustomGcodeSpecificConfigDef : public ConfigDef
+{
+public:
+    CustomGcodeSpecificConfigDef();
+};
+extern const CustomGcodeSpecificConfigDef    custom_gcode_specific_config_def;
+
 // This class defines the command line options representing actions.
 extern const CLIActionsConfigDef    cli_actions_config_def;
 
diff --git a/src/libslic3r/libslic3r_version.h.in b/src/libslic3r/libslic3r_version.h.in
index 78809f1f6d8..90383c93af6 100644
--- a/src/libslic3r/libslic3r_version.h.in
+++ b/src/libslic3r/libslic3r_version.h.in
@@ -10,5 +10,6 @@
 //#define SLIC3R_RC_VERSION "@SLIC3R_VERSION@"
 #define BBL_RELEASE_TO_PUBLIC @BBL_RELEASE_TO_PUBLIC@
 #define BBL_INTERNAL_TESTING @BBL_INTERNAL_TESTING@
+#define ORCA_CHECK_GCODE_PLACEHOLDERS @ORCA_CHECK_GCODE_PLACEHOLDERS@
 
 #endif /* __SLIC3R_VERSION_H */
diff --git a/src/slic3r/GUI/EditGCodeDialog.cpp b/src/slic3r/GUI/EditGCodeDialog.cpp
index dc5046e532f..f3b2fe30609 100644
--- a/src/slic3r/GUI/EditGCodeDialog.cpp
+++ b/src/slic3r/GUI/EditGCodeDialog.cpp
@@ -30,99 +30,6 @@
 namespace Slic3r {
 namespace GUI {
 
-ConfigOption* get_new_option(const ConfigOptionType type)
-{
-    switch (type) {
-    case coFloat:
-        return new ConfigOptionFloat(0.);
-    case coFloats:
-        return new ConfigOptionFloats({ 0. });
-    case coInt:
-        return new ConfigOptionInt(0);
-    case coInts:
-        return new ConfigOptionInts({ 0 });
-    case coString:
-        return new ConfigOptionString("");
-    case coStrings:
-        return new ConfigOptionStrings({ ""});
-    case coPercent:
-        return new ConfigOptionPercent(0);
-    case coPercents:
-        return new ConfigOptionPercents({ 0});
-    case coFloatOrPercent:
-        return new ConfigOptionFloatOrPercent();
-    case coFloatsOrPercents:
-        return new ConfigOptionFloatsOrPercents();
-    case coPoint:
-        return new ConfigOptionPoint(Vec2d(100, 100));
-    case coPoints:
-        return new ConfigOptionPoints({ Vec2d(100,100) });
-    case coPoint3:
-        return new ConfigOptionPoint3();
-    case coBool:
-        return new ConfigOptionBool(true);
-    case coBools:
-        return new ConfigOptionBools({ true });
-    case coEnum:
-        return new ConfigOptionEnum<InfillPattern>();
-    default:
-        return nullptr;
-    }
-}
-
-namespace fs = boost::filesystem;
-namespace pt = boost::property_tree;
-static std::vector<std::string> get_params_from_file(const std::string& file_name, DynamicConfig& out_config)
-{
-    const fs::path file_path = fs::path(custom_gcodes_dir() +
-#ifdef _WIN32
-                                        "\\"
-#else
-                                        "/"
-#endif
-                                        + file_name);
-
-    if (!fs::exists(file_path))
-        return {};
-
-    const std::string file = file_path.string();
-
-    // Load the preset file, apply preset values on top of defaults.
-    try {
-        DynamicConfig config;
-
-        try {
-            pt::ptree tree;
-            boost::nowide::ifstream ifs(file);
-            pt::read_ini(ifs, tree);
-            for (const pt::ptree::value_type& v : tree) {
-                try {
-                    t_config_option_key opt_key = v.first;
-                    const std::string type_str = v.second.get_value<std::string>();
-                    const ConfigOptionType type = ConfigOptionType(std::atoi(type_str.c_str()));
-                    if (ConfigOption* opt = get_new_option(type))
-                        config.set_key_value(opt_key, std::move(opt));
-                }
-                catch (UnknownOptionException& err) {
-                    throw RuntimeError(format("Some option from %1% cannot be loaded:\n\tReason: %2%", file, err.what()));
-                }
-            }
-        }
-        catch (const ConfigurationError& e) {
-            throw ConfigurationError(format("Failed loading configuration file \"%1%\": \n\t%2%", file, e.what()));
-        }
-
-        out_config += config;
-        return config.keys();
-    }
-    catch (const std::ifstream::failure& err) {
-        throw RuntimeError(format("The %1% cannot be loaded:\n\tReason: %2%", file, err.what()));
-    }
-    catch (const std::runtime_error& err) {
-        throw RuntimeError(format("Failed loading the custom_gcode_placeholders file: \"%1%\"\n\tReason: %2%", file , err.what()));
-    }
-}
-
 //------------------------------------------
 //          EditGCodeDialog
 //------------------------------------------
@@ -201,150 +108,84 @@ std::string EditGCodeDialog::get_edited_gcode() const
     return into_u8(m_gcode_editor->GetValue());
 }
 
-void EditGCodeDialog::init_params_list(const std::string& custom_gcode_name)
+static ParamType get_type(const std::string& opt_key, const ConfigOptionDef& opt_def)
 {
-    const std::vector<std::string> read_write_params = get_params_from_file("rw_slicing_state", m_read_write_config);
-    const std::vector<std::string> universal_params  = get_params_from_file("universal", m_universal_config);
-    const std::vector<std::string> specific_params   = get_params_from_file(custom_gcode_name, m_specific_config);
-
-    m_print_statistics_config = PrintStatistics::placeholders();
+    return opt_def.is_scalar() ? ParamType::Scalar : ParamType::Vector;
+}
 
-    auto get_type = [](const std::string& opt_key, const DynamicConfig& config) {
-        return config.optptr(opt_key)->is_scalar() ? ParamType::Scalar : ParamType::Vector;
-    };
+void EditGCodeDialog::init_params_list(const std::string& custom_gcode_name)
+{
+    const auto& custom_gcode_placeholders = custom_gcode_specific_placeholders();
+    const auto& specific_params = custom_gcode_placeholders.count(custom_gcode_name) > 0 ?
+                                  custom_gcode_placeholders.at(custom_gcode_name) : t_config_option_keys({});
 
     // Add slicing states placeholders
 
-    std::set<std::string> read_only_slicing_state_opts = { "zhop" };
-
     wxDataViewItem slicing_state = m_params_list->AppendGroup(_L("[Global] Slicing State"), "re_slice");
-    if (!universal_params.empty()) {
-        wxDataViewItem read_only = m_params_list->AppendSubGroup(slicing_state, _L("Read Only"),  "lock_closed");
-        for (const auto& opt_key : read_only_slicing_state_opts)
-            m_params_list->AppendParam(read_only, get_type(opt_key, m_universal_config), opt_key);
+    if (!cgp_ro_slicing_states_config_def.empty()) {
+        wxDataViewItem read_only = m_params_list->AppendSubGroup(slicing_state, _L("Read Only"), "lock_closed");
+        for (const auto& [opt_key, def]: cgp_ro_slicing_states_config_def.options)
+            m_params_list->AppendParam(read_only, get_type(opt_key, def), opt_key);
     }
 
-    if (!read_write_params.empty()) {
+    if (!cgp_rw_slicing_states_config_def.empty()) {
         wxDataViewItem read_write = m_params_list->AppendSubGroup(slicing_state, _L("Read Write"), "lock_open");
-        for (const auto& opt_key : read_write_params)
-            m_params_list->AppendParam(read_write, get_type(opt_key, m_read_write_config), opt_key);
+        for (const auto& [opt_key, def] : cgp_rw_slicing_states_config_def.options)
+            m_params_list->AppendParam(read_write, get_type(opt_key, def), opt_key);
     }
 
-    //TODO: Orca: add other params which are related to slicing state that are specific to Orca
-
     // add other universal params, which are related to slicing state
-    const std::set<std::string> other_slicing_state_opts    = { "initial_extruder"
-//                                                              , "initial_filament_type"
-                                                              , "initial_tool"
-                                                              , "current_extruder"
-                                                              , "is_extruder_used"
-                                                              , "current_object_idx"
-//                                                              , "has_single_extruder_multi_material_priming"
-                                                              , "has_wipe_tower" };
-
-    slicing_state = m_params_list->AppendGroup(_L("Slicing State"), "re_slice");
-    for (const auto& opt_key : other_slicing_state_opts) {
-        if (m_print_statistics_config.has(opt_key))
-            m_params_list->AppendParam(slicing_state, get_type(opt_key, m_print_statistics_config), opt_key);
-        else if(!universal_params.empty())
-            m_params_list->AppendParam(slicing_state, get_type(opt_key, m_universal_config), opt_key);
+    if (!cgp_other_slicing_states_config_def.empty()) {
+        slicing_state = m_params_list->AppendGroup(_L("Slicing State"), "re_slice");
+        for (const auto& [opt_key, def] : cgp_other_slicing_states_config_def.options)
+            m_params_list->AppendParam(slicing_state, get_type(opt_key, def), opt_key);
     }
 
-    const std::set<std::string> other_print_statistics_opts = { "extruded_volume_total"
-                                                              , "extruded_weight"
-                                                              , "extruded_weight_total"
-                                                              , "total_layer_count"     };
-
-    const std::set<std::string> other_presets_opts          = { "filament_preset"
-//                                                              , "physical_printer_preset"
-                                                              , "printer_preset"
-                                                              , "print_preset"
-                                                              /*, "num_extruders"*/     };
-
-    const std::set<std::string> objects_info_opts           = { "num_instances"
-                                                              , "num_objects"
-                                                              , "scale"
-                                                              , "input_filename"
-                                                              , "input_filename_base"     };
-                                                       
-    const std::set<std::string> dimensions_opts             = { "first_layer_print_convex_hull"
-                                                              , "first_layer_print_max"
-                                                              , "first_layer_print_min"
-                                                              , "first_layer_print_size"
-                                                              , "print_bed_max"
-                                                              , "print_bed_min"
-                                                              , "print_bed_size"     };
-
     // Add universal placeholders
 
-    if (!universal_params.empty()) {
-//        wxDataViewItem group = m_params_list->AppendGroup(_L("Universal"), "equal");
-
+    {
         // Add print statistics subgroup
 
-        if (!m_print_statistics_config.empty()) {
-//            wxDataViewItem statistics = m_params_list->AppendSubGroup(group, _L("Print Statistics"), "info");
+        if (!cgp_print_statistics_config_def.empty()) {
             wxDataViewItem statistics = m_params_list->AppendGroup(_L("Print Statistics"), "info");
-            const std::vector<std::string> statistics_params = m_print_statistics_config.keys();
-            for (const auto& opt_key : statistics_params)
-                if (std::find(other_slicing_state_opts.begin(), other_slicing_state_opts.end(), opt_key) == other_slicing_state_opts.end())
-                    m_params_list->AppendParam(statistics, get_type(opt_key, m_print_statistics_config), opt_key);
-                // add other universal params, which are related to print statistics
-            if (!universal_params.empty())
-                for (const auto& opt_key : other_print_statistics_opts)
-                    m_params_list->AppendParam(statistics, get_type(opt_key, m_universal_config), opt_key);
+            for (const auto& [opt_key, def] : cgp_print_statistics_config_def.options)
+                m_params_list->AppendParam(statistics, get_type(opt_key, def), opt_key);
         }
 
         // Add objects info subgroup
 
-        if (!universal_params.empty()) {
-//            wxDataViewItem objects_info = m_params_list->AppendSubGroup(group, _L("Objects Info"), "advanced_plus");
+        if (!cgp_objects_info_config_def.empty()) {
             wxDataViewItem objects_info = m_params_list->AppendGroup(_L("Objects Info"), "advanced_plus");
-            for (const auto& opt_key : objects_info_opts)
-                m_params_list->AppendParam(objects_info, get_type(opt_key, m_universal_config), opt_key);
+            for (const auto& [opt_key, def] : cgp_objects_info_config_def.options)
+                m_params_list->AppendParam(objects_info, get_type(opt_key, def), opt_key);
         }
 
-        // Add objects info subgroup
+        // Add  dimensions subgroup
 
-        if (!universal_params.empty()) {
-//            wxDataViewItem dimensions = m_params_list->AppendSubGroup(group, _L("Dimensions"), "measure");
+        if (!cgp_dimensions_config_def.empty()) {
             wxDataViewItem dimensions = m_params_list->AppendGroup(_L("Dimensions"), "measure");
-            for (const auto& opt_key : dimensions_opts)
-                m_params_list->AppendParam(dimensions, get_type(opt_key, m_universal_config), opt_key);
+            for (const auto& [opt_key, def] : cgp_dimensions_config_def.options)
+                m_params_list->AppendParam(dimensions, get_type(opt_key, def), opt_key);
         }
 
         // Add timestamp subgroup
 
-        PlaceholderParser parser;
-        parser.update_timestamp();
-        const DynamicConfig& ts_config = parser.config();
-//        wxDataViewItem time_stamp = ts_config.empty() ? group : m_params_list->AppendSubGroup(group, _L("Timestamps"), "time");
-        wxDataViewItem time_stamp = m_params_list->AppendGroup(_L("Timestamps"), "time");
-
-        // Add un-grouped params
-
-//        wxDataViewItem other = m_params_list->AppendSubGroup(group, _L("Other"), "add_gcode");
-        wxDataViewItem other = m_params_list->AppendGroup(_L("Other"), "add_gcode");
-        for (const auto& opt_key : universal_params)
-            if (std::find(read_only_slicing_state_opts.begin(), read_only_slicing_state_opts.end(), opt_key)== read_only_slicing_state_opts.end() &&
-                std::find(other_slicing_state_opts.begin(),     other_slicing_state_opts.end(), opt_key)    == other_slicing_state_opts.end() &&
-                std::find(other_print_statistics_opts.begin(),  other_print_statistics_opts.end(), opt_key) == other_print_statistics_opts.end() &&
-                std::find(other_presets_opts.begin(),           other_presets_opts.end(), opt_key)          == other_presets_opts.end() &&
-                std::find(objects_info_opts.begin(),            objects_info_opts.end(), opt_key)           == objects_info_opts.end() &&
-                std::find(dimensions_opts.begin(),              dimensions_opts.end(), opt_key)             == dimensions_opts.end() &&
-                !m_print_statistics_config.has(opt_key)) {
-                m_params_list->AppendParam(ts_config.has(opt_key) ? time_stamp : other, get_type(opt_key, m_universal_config), opt_key);
-            }
-        m_params_list->CheckAndDeleteIfEmpty(other);
+        if (!cgp_timestamps_config_def.empty()) {
+            wxDataViewItem dimensions = m_params_list->AppendGroup(_L("Timestamps"), "time");
+            for (const auto& [opt_key, def] : cgp_timestamps_config_def.options)
+                m_params_list->AppendParam(dimensions, get_type(opt_key, def), opt_key);
+        }
     }
 
     // Add specific placeholders
 
     if (!specific_params.empty()) {
-        wxDataViewItem group = m_params_list->AppendGroup(format_wxstr(_L("Specific for %1%"), custom_gcode_name), /*"not_equal"*/"add_gcode");
+        wxDataViewItem group = m_params_list->AppendGroup(format_wxstr(_L("Specific for %1%"), custom_gcode_name), "add_gcode");
         for (const auto& opt_key : specific_params)
-            m_params_list->AppendParam(group, get_type(opt_key, m_specific_config), opt_key);
-
+            if (custom_gcode_specific_config_def.has(opt_key)) {
+                auto def = custom_gcode_specific_config_def.get(opt_key);
+                m_params_list->AppendParam(group, get_type(opt_key, *def), opt_key);
+            }
         m_params_list->Expand(group);
     }
 
@@ -352,9 +193,9 @@ void EditGCodeDialog::init_params_list(const std::string& custom_gcode_name)
 
     wxDataViewItem presets = add_presets_placeholders();
     // add other params which are related to presets
-    if (!universal_params.empty())
-        for (const auto& opt_key : other_presets_opts)
-            m_params_list->AppendParam(presets, get_type(opt_key, m_universal_config), opt_key);
+    if (!cgp_other_presets_config_def.empty())
+        for (const auto& [opt_key, def] : cgp_other_presets_config_def.options)
+            m_params_list->AppendParam(presets, get_type(opt_key, def), opt_key);
 }
 
 wxDataViewItem EditGCodeDialog::add_presets_placeholders()
@@ -405,24 +246,33 @@ void EditGCodeDialog::bind_list_and_button()
 
         const std::string opt_key = m_params_list->GetSelectedParamKey();
         if (!opt_key.empty()) {
-            const ConfigOptionDef*    cod     { nullptr };
-            const ConfigOption*       optptr  { nullptr };
+            const ConfigOptionDef*    def     { nullptr };
 
             const auto& full_config = wxGetApp().preset_bundle->full_config();
-            if (const ConfigDef* def = full_config.def(); def && def->has(opt_key)) {
-                cod = def->get(opt_key);
-                optptr = full_config.optptr(opt_key);
+            if (const ConfigDef* config_def = full_config.def(); config_def && config_def->has(opt_key)) {
+                def = config_def->get(opt_key);
             }
             else {
-                for (const DynamicConfig* config: { &m_read_write_config, &m_universal_config, &m_specific_config, &m_print_statistics_config }) {
-                    optptr = config->optptr(opt_key);
-                    if (optptr)
+                for (const ConfigDef* config: std::initializer_list<const ConfigDef*> {
+                     &custom_gcode_specific_config_def,
+                     &cgp_ro_slicing_states_config_def,
+                     &cgp_rw_slicing_states_config_def,
+                     &cgp_other_slicing_states_config_def,
+                     &cgp_print_statistics_config_def,
+                     &cgp_objects_info_config_def,
+                     &cgp_dimensions_config_def,
+                     &cgp_timestamps_config_def,
+                     &cgp_other_presets_config_def
+                }) {
+                    if (config->has(opt_key)) {
+                        def = config->get(opt_key);
                         break;
+                    }
                 }
             }
 
-            if (optptr) {
-                const ConfigOptionType scalar_type = optptr->is_scalar() ? optptr->type() : static_cast<ConfigOptionType>(optptr->type() - coVectorType);
+            if (def) {
+                const ConfigOptionType scalar_type = def->is_scalar() ? def->type : static_cast<ConfigOptionType>(def->type - coVectorType);
                 wxString type_str = scalar_type == coNone           ? "none" :
                                                      scalar_type == coFloat          ? "float" :
                                                      scalar_type == coInt            ? "integer" :
@@ -432,16 +282,16 @@ void EditGCodeDialog::bind_list_and_button()
                                                      scalar_type == coPoint          ? "point" :
                                                      scalar_type == coBool           ? "bool" :
                                                      scalar_type == coEnum           ? "enum" : "undef";
-                if (!optptr->is_scalar())
+                if (!def->is_scalar())
                     type_str += "[]";
 
-                label = (!cod || (cod->full_label.empty() && cod->label.empty()) ) ? format_wxstr("%1%\n(%2%)", opt_key, type_str) :
-                        (!cod->full_label.empty() && !cod->label.empty() ) ?
-                        format_wxstr("%1% > %2%\n(%3%)", _(cod->full_label), _(cod->label), type_str) :
-                        format_wxstr("%1%\n(%2%)", cod->label.empty() ? _(cod->full_label) : _(cod->label), type_str);
+                label = (!def || (def->full_label.empty() && def->label.empty()) ) ? format_wxstr("%1%\n(%2%)", opt_key, type_str) :
+                        (!def->full_label.empty() && !def->label.empty() ) ?
+                        format_wxstr("%1% > %2%\n(%3%)", _(def->full_label), _(def->label), type_str) :
+                        format_wxstr("%1%\n(%2%)", def->label.empty() ? _(def->full_label) : _(def->label), type_str);
 
-                if (cod)
-                    description = _(cod->tooltip);
+                if (def)
+                    description = _(def->tooltip);
             }
             else
                 label = "Undef optptr";
diff --git a/src/slic3r/GUI/EditGCodeDialog.hpp b/src/slic3r/GUI/EditGCodeDialog.hpp
index 0f87bcb9312..d6cd18383e4 100644
--- a/src/slic3r/GUI/EditGCodeDialog.hpp
+++ b/src/slic3r/GUI/EditGCodeDialog.hpp
@@ -9,6 +9,7 @@
 #include "GUI_Utils.hpp"
 #include "wxExtensions.hpp"
 #include "libslic3r/Preset.hpp"
+#include "libslic3r/PrintConfig.hpp"
 
 class wxListBox;
 class wxTextCtrl;
@@ -32,10 +33,14 @@ class EditGCodeDialog : public DPIDialog
     wxStaticText*       m_param_label   {nullptr};
     wxStaticText*       m_param_description {nullptr};
 
-    DynamicConfig       m_read_write_config;
-    DynamicConfig       m_universal_config;
-    DynamicConfig       m_specific_config;
-    DynamicConfig       m_print_statistics_config;
+    ReadOnlySlicingStatesConfigDef  cgp_ro_slicing_states_config_def;
+    ReadWriteSlicingStatesConfigDef cgp_rw_slicing_states_config_def;
+    OtherSlicingStatesConfigDef     cgp_other_slicing_states_config_def;
+    PrintStatisticsConfigDef        cgp_print_statistics_config_def;
+    ObjectsInfoConfigDef            cgp_objects_info_config_def;
+    DimensionsConfigDef             cgp_dimensions_config_def;
+    TimestampsConfigDef             cgp_timestamps_config_def;
+    OtherPresetsConfigDef           cgp_other_presets_config_def;
 
 public:
     EditGCodeDialog(wxWindow*parent, const std::string&key, const std::string&value);

From 036b21edb9b0d7abcf48667146be551761418207 Mon Sep 17 00:00:00 2001
From: Ocraftyone <Ocraftyone@users.noreply.github.com>
Date: Tue, 26 Dec 2023 07:56:45 -0500
Subject: [PATCH 10/39] Add wrapping description

Original Commit: prusa3d/PrusaSlicer@83b8988

Co-authored-by: YuSanka <yusanka@gmail.com>
---
 src/slic3r/GUI/EditGCodeDialog.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/slic3r/GUI/EditGCodeDialog.cpp b/src/slic3r/GUI/EditGCodeDialog.cpp
index f3b2fe30609..dd153a294f5 100644
--- a/src/slic3r/GUI/EditGCodeDialog.cpp
+++ b/src/slic3r/GUI/EditGCodeDialog.cpp
@@ -291,7 +291,7 @@ void EditGCodeDialog::bind_list_and_button()
                         format_wxstr("%1%\n(%2%)", def->label.empty() ? _(def->full_label) : _(def->label), type_str);
 
                 if (def)
-                    description = _(def->tooltip);
+                    description = get_wraped_wxString(_(def->tooltip), 120);
             }
             else
                 label = "Undef optptr";

From 8c6100ea2145513342f2d3f7931d5eb9ec4352c1 Mon Sep 17 00:00:00 2001
From: Ocraftyone <Ocraftyone@users.noreply.github.com>
Date: Tue, 26 Dec 2023 08:10:18 -0500
Subject: [PATCH 11/39] Update Labels

Original Commit: prusa3d/PrusaSlicer@7efdbec

Co-authored-by: Lukas Matena <lukasmatena@seznam.cz>
---
 src/libslic3r/PrintConfig.cpp | 212 +++++++++++++++++-----------------
 1 file changed, 106 insertions(+), 106 deletions(-)

diff --git a/src/libslic3r/PrintConfig.cpp b/src/libslic3r/PrintConfig.cpp
index ff3b0ef7687..f747cbc971b 100644
--- a/src/libslic3r/PrintConfig.cpp
+++ b/src/libslic3r/PrintConfig.cpp
@@ -6465,8 +6465,8 @@ ReadOnlySlicingStatesConfigDef::ReadOnlySlicingStatesConfigDef()
     ConfigOptionDef* def;
 
     def = this->add("zhop", coFloat);
-    def->label = L("");
-    def->tooltip = L("");
+    def->label = L("Current z-hop");
+    def->tooltip = L("Contains z-hop present at the beginning of the custom G-code block.");
 }
 
 ReadWriteSlicingStatesConfigDef::ReadWriteSlicingStatesConfigDef()
@@ -6475,19 +6475,21 @@ ReadWriteSlicingStatesConfigDef::ReadWriteSlicingStatesConfigDef()
 
     def = this->add("position", coFloats);
     def->label = L("Position");
-    def->tooltip = L("");
+    def->tooltip = L("Position of the extruder at the beginning of the custom G-code block. If the custom G-code travels somewhere else, "
+                     "it should write to this variable so PrusaSlicer knows where it travels from when it gets control back.");
 
     def = this->add("e_retracted", coFloats);
-    def->label = L("");
-    def->tooltip = L("");
+    def->label = L("Retraction");
+    def->tooltip = L("Retraction state at the beginning of the custom G-code block. If the custom G-code moves the extruder axis, "
+                     "it should write to this variable so PrusaSlicer deretracts correctly when it gets control back.");
 
     def = this->add("e_restart_extra", coFloats);
-    def->label = L("");
-    def->tooltip = L("");
+    def->label = L("Extra deretraction");
+    def->tooltip = L("Currently planned extra extruder priming after deretraction.");
 
     def = this->add("e_position", coFloats);
-    def->label = L("");
-    def->tooltip = L("");
+    def->label = L("Absolute E position");
+    def->tooltip = L("Current position of the extruder axis. Only used with absolute extruder addressing.");
 }
 
 OtherSlicingStatesConfigDef::OtherSlicingStatesConfigDef()
@@ -6496,35 +6498,35 @@ OtherSlicingStatesConfigDef::OtherSlicingStatesConfigDef()
 
     def = this->add("current_extruder", coInt);
     def->label = L("Current extruder");
-    def->tooltip = L("");
+    def->tooltip = L("Zero-based index of currently used extruder.");
 
     def = this->add("current_object_idx", coInt);
     def->label = L("Current object index");
-    def->tooltip = L("");
+    def->tooltip = L("Specific for sequential printing. Zero-based index of currently printed object.");
 
     def = this->add("has_single_extruder_multi_material_priming", coBool);
     def->label = L("Has single extruder MM priming");
-    def->tooltip = L("");
+    def->tooltip = L("Are the extra multi-material priming regions used in this print?");
 
     def = this->add("has_wipe_tower", coBool);
     def->label = L("Has wipe tower");
-    def->tooltip = L("");
+    def->tooltip = L("Whether or not wipe tower is being generated in the print.");
 
     def = this->add("initial_extruder", coInt);
     def->label = L("Initial extruder");
-    def->tooltip = L("");
+    def->tooltip = L("Zero-based index of the first extruder used in the print. Same as initial_tool.");
 
-    def = this->add("initial_filament_type", coStrings);
-    def->label = L("");
-    def->tooltip = L("");
+    def = this->add("initial_filament_type", coString);
+    def->label = L("Initial filament type");
+    def->tooltip = L("String containing filament type of the first used extruder.");
 
     def = this->add("initial_tool", coInt);
     def->label = L("Initial tool");
-    def->tooltip = L("");
+    def->tooltip = L("Zero-based index of the first extruder used in the print. Same as initial_extruder.");
 
     def = this->add("is_extruder_used", coBools);
-    def->label = L("");
-    def->tooltip = L("");
+    def->label = L("Is extruder used?");
+    def->tooltip = L("Vector of bools stating whether a given extruder is used in the print.");
 }
 
 PrintStatisticsConfigDef::PrintStatisticsConfigDef()
@@ -6532,68 +6534,68 @@ PrintStatisticsConfigDef::PrintStatisticsConfigDef()
     ConfigOptionDef* def;
 
     def = this->add("extruded_volume", coFloats);
-    def->label = L("");
-    def->tooltip = L("");
+    def->label = L("Volume per extruder");
+    def->tooltip = L("Total filament volume extruded per extruder during the entire print.");
 
     def = this->add("normal_print_time", coString);
-    def->label = L("");
-    def->tooltip = L("");
+    def->label = L("Print time (normal mode)");
+    def->tooltip = L("Estimated print time when printed in normal mode (i.e. not in silent mode). Same as print_time.");
 
     def = this->add("num_printing_extruders", coInt);
-    def->label = L("");
-    def->tooltip = L("");
+    def->label = L("Number of printing extruders");
+    def->tooltip = L("Number of extruders used during the print.");
 
     def = this->add("print_time", coString);
-    def->label = L("");
-    def->tooltip = L("");
+    def->label = L("Print time (normal mode)");
+    def->tooltip = L("Estimated print time when printed in normal mode (i.e. not in silent mode). Same as normal_print_time.");
 
     def = this->add("printing_filament_types", coString);
-    def->label = L("");
-    def->tooltip = L("");
+    def->label = L("Used filament types");
+    def->tooltip = L("Comma-separated list of all filament types used during the print.");
 
     def = this->add("silent_print_time", coString);
-    def->label = L("");
-    def->tooltip = L("");
+    def->label = L("Print time (silent mode)");
+    def->tooltip = L("Estimated print time when printed in silent mode.");
 
     def = this->add("total_cost", coFloat);
-    def->label = L("");
-    def->tooltip = L("");
+    def->label = L("Total cost");
+    def->tooltip = L("Total cost of all material used in the print. Calculated from filament_cost value in Filament Settings.");
 
     def = this->add("total_weight", coFloat);
-    def->label = L("");
-    def->tooltip = L("");
+    def->label = L("Total weight");
+    def->tooltip = L("Total weight of the print. Calculated from filament_density value in Filament Settings.");
 
     def = this->add("total_wipe_tower_cost", coFloat);
-    def->label = L("");
-    def->tooltip = L("");
+    def->label = L("Total wipe tower cost");
+    def->tooltip = L("Total cost of the material wasted on the wipe tower. Calculated from filament_cost value in Filament Settings.");
 
     def = this->add("total_wipe_tower_filament", coFloat);
-    def->label = L("");
-    def->tooltip = L("");
+    def->label = L("Wipe tower volume");
+    def->tooltip = L("Total filament volume extruded on the wipe tower.");
 
     def = this->add("used_filament", coFloat);
-    def->label = L("");
-    def->tooltip = L("");
+    def->label = L("Used filament");
+    def->tooltip = L("Total length of filament used in the print.");
 
     def = this->add("total_toolchanges", coInt);
     def->label = L("Total toolchanges");
-    def->tooltip = L("");
+    def->tooltip = L("Number of toolchanges during the print.");
 
     def = this->add("extruded_volume_total", coFloat);
-    def->label = L("");
-    def->tooltip = L("");
+    def->label = L("Total volume");
+    def->tooltip = L("Total volume of filament used during the entire print.");
 
     def = this->add("extruded_weight", coFloats);
-    def->label = L("");
-    def->tooltip = L("");
+    def->label = L("Weight per extruder");
+    def->tooltip = L("Weight per extruder extruded during the entire print. Calculated from filament_density value in Filament Settings.");
 
     def = this->add("extruded_weight_total", coFloat);
-    def->label = L("");
-    def->tooltip = L("");
+    def->label = L("Total weight");
+    def->tooltip = L("Total weight of the print. Calculated from filament_density value in Filament Settings.");
 
     def = this->add("total_layer_count", coInt);
     def->label = L("Total layer count");
-    def->tooltip = L("");
+    def->tooltip = L("Number of layers in the entire print.");
 }
 
 ObjectsInfoConfigDef::ObjectsInfoConfigDef()
@@ -6601,90 +6603,87 @@ ObjectsInfoConfigDef::ObjectsInfoConfigDef()
     ConfigOptionDef* def;
 
     def = this->add("num_objects", coInt);
-    def->label = L("");
-    def->tooltip = L("");
+    def->label = L("Number of objects");
+    def->tooltip = L("Total number of objects in the print.");
 
     def = this->add("num_instances", coInt);
-    def->label = L("");
-    def->tooltip = L("");
+    def->label = L("Number of instances");
+    def->tooltip = L("Total number of object instances in the print, summed over all objects.");
 
     def = this->add("scale", coStrings);
-    def->label = L("");
-    def->tooltip = L("");
-
-    def = this->add("input_filename", coString);
-    def->label = L("");
-    def->tooltip = L("");
+    def->label = L("Scale per object");
+    def->tooltip = L("Contains a string with the information about what scaling was applied to the individual objects. "
+                     "Indexing of the objects is zero-based (first object has index 0).\n"
+                     "Example: 'x:100% y:50% z:100'.");
 
     def = this->add("input_filename_base", coString);
-    def->label = L("");
-    def->tooltip = L("");
+    def->label = L("Input filename without extension");
+    def->tooltip = L("Source filename of the first object, without extension.");
 }
 
 DimensionsConfigDef::DimensionsConfigDef()
 {
     ConfigOptionDef* def;
 
+    const std::string point_tooltip   = L("The vector has two elements: x and y coordinate of the point. Values in mm.");
+    const std::string bb_size_tooltip = L("The vector has two elements: x and y dimension of the bounding box. Values in mm.");
+
     def = this->add("first_layer_print_convex_hull", coPoints);
-    def->label = L("");
-    def->tooltip = L("");
+    def->label = L("First layer convex hull");
+    def->tooltip = L("Vector of points of the first layer convex hull. Each element has the following format:"
+                     "'[x, y]' (x and y are floating-point numbers in mm).");
 
     def = this->add("first_layer_print_min", coFloats);
-    def->label = L("");
-    def->tooltip = L("");
+    def->label = L("Bottom-left corner of first layer bounding box");
+    def->tooltip = point_tooltip;
 
     def = this->add("first_layer_print_max", coFloats);
-    def->label = L("");
-    def->tooltip = L("");
+    def->label = L("Top-right corner of first layer bounding box");
+    def->tooltip = point_tooltip;
 
     def = this->add("first_layer_print_size", coFloats);
-    def->label = L("");
-    def->tooltip = L("");
+    def->label = L("Size of the first layer bounding box");
+    def->tooltip = bb_size_tooltip;
 
     def = this->add("print_bed_min", coFloats);
-    def->label = L("");
-    def->tooltip = L("");
+    def->label = L("Bottom-left corner of print bed bounding box");
+    def->tooltip = point_tooltip;
 
     def = this->add("print_bed_max", coFloats);
-    def->label = L("");
-    def->tooltip = L("");
+    def->label = L("Top-right corner of print bed bounding box");
+    def->tooltip = point_tooltip;
 
     def = this->add("print_bed_size", coFloats);
-    def->label = L("");
-    def->tooltip = L("");
+    def->label = L("Size of the print bed bounding box");
+    def->tooltip = bb_size_tooltip;
 }
 
+
 TimestampsConfigDef::TimestampsConfigDef()
 {
     ConfigOptionDef* def;
 
     def = this->add("timestamp", coString);
-    def->label = L("");
-    def->tooltip = L("");
+    def->label = L("Timestamp");
+    def->tooltip = L("String containing current time in yyyyMMdd-hhmmss format.");
 
     def = this->add("year", coInt);
     def->label = L("Year");
-    def->tooltip = L("");
 
     def = this->add("month", coInt);
     def->label = L("Month");
-    def->tooltip = L("");
 
     def = this->add("day", coInt);
     def->label = L("Day");
-    def->tooltip = L("");
 
     def = this->add("hour", coInt);
     def->label = L("Hour");
-    def->tooltip = L("");
 
     def = this->add("minute", coInt);
     def->label = L("Minute");
-    def->tooltip = L("");
 
     def = this->add("second", coInt);
     def->label = L("Second");
-    def->tooltip = L("");
 }
 
 OtherPresetsConfigDef::OtherPresetsConfigDef()
@@ -6692,24 +6691,25 @@ OtherPresetsConfigDef::OtherPresetsConfigDef()
     ConfigOptionDef* def;
 
     def = this->add("num_extruders", coInt);
-    def->label = L("");
-    def->tooltip = L("");
+    def->label = L("Number of extruders");
+    def->tooltip = L("Total number of extruders, regardless of whether they are used in the current print.");
 
     def = this->add("print_preset", coString);
-    def->label = L("");
-    def->tooltip = L("");
+    def->label = L("Print preset name");
+    def->tooltip = L("Name of the print preset used for slicing.");
 
     def = this->add("filament_preset", coString);
-    def->label = L("");
-    def->tooltip = L("");
+    def->label = L("Filament preset name");
+    def->tooltip = L("Names of the filament presets used for slicing. The variable is a vector "
+                     "containing one name for each extruder.");
 
     def = this->add("printer_preset", coString);
-    def->label = L("");
-    def->tooltip = L("");
+    def->label = L("Printer preset name");
+    def->tooltip = L("Name of the printer preset used for slicing.");
 
     def = this->add("physical_printer_preset", coString);
-    def->label = L("");
-    def->tooltip = L("");
+    def->label = L("Physical printer name");
+    def->tooltip = L("Name of the physical printer used for slicing.");
 }
 
 
@@ -6734,32 +6734,32 @@ CustomGcodeSpecificConfigDef::CustomGcodeSpecificConfigDef()
     ConfigOptionDef* def;
 
     def = this->add("layer_num", coInt);
-    def->label = L("");
-    def->tooltip = L("");
+    def->label = L("Layer number");
+    def->tooltip = L("Index of the current layer. One-based (i.e. first layer is number 1).");
 
     def = this->add("layer_z", coFloat);
-    def->label = L("");
-    def->tooltip = L("");
+    def->label = L("Layer z");
+    def->tooltip = L("Height of the current layer above the print bed, measured to the top of the layer.");
 
     def = this->add("max_layer_z", coFloat);
-    def->label = L("");
-    def->tooltip = L("");
+    def->label = L("Maximal layer z");
+    def->tooltip = L("Height of the last layer above the print bed.");
 
     def = this->add("filament_extruder_id", coInt);
     def->label = L("");
     def->tooltip = L("");
 
     def = this->add("previous_extruder", coInt);
-    def->label = L("");
-    def->tooltip = L("");
+    def->label = L("Previous extruder");
+    def->tooltip = L("Index of the extruder that is being unloaded. The index is zero based (first extruder has index 0).");
 
     def = this->add("next_extruder", coInt);
-    def->label = L("");
-    def->tooltip = L("");
+    def->label = L("Next extruder");
+    def->tooltip = L("Index of the extruder that is being loaded. The index is zero based (first extruder has index 0).");
 
     def = this->add("toolchange_z", coFloat);
-    def->label = L("");
-    def->tooltip = L("");
+    def->label = L("Toolchange z");
+    def->tooltip = L("Height above the print bed when the toolchange takes place. Usually the same as layer_z, but can be different.");
 
     // I'm not sure if next options are really needed
 

From 7a1d782ce162c18cec5cd588bec09941c1c377e7 Mon Sep 17 00:00:00 2001
From: Ocraftyone <Ocraftyone@users.noreply.github.com>
Date: Tue, 26 Dec 2023 08:16:09 -0500
Subject: [PATCH 12/39] Add fix for linux

Original Commit: prusa3d/PrusaSlicer@361ef22

Co-authored-by: YuSanka <yusanka@gmail.com>
---
 src/slic3r/GUI/EditGCodeDialog.cpp | 99 +++++++++++++++++++-----------
 src/slic3r/GUI/EditGCodeDialog.hpp |  5 +-
 2 files changed, 67 insertions(+), 37 deletions(-)

diff --git a/src/slic3r/GUI/EditGCodeDialog.cpp b/src/slic3r/GUI/EditGCodeDialog.cpp
index dd153a294f5..90107eb70d8 100644
--- a/src/slic3r/GUI/EditGCodeDialog.cpp
+++ b/src/slic3r/GUI/EditGCodeDialog.cpp
@@ -50,7 +50,7 @@ EditGCodeDialog::EditGCodeDialog(wxWindow* parent, const std::string& key, const
     auto* grid_sizer = new wxFlexGridSizer(1, 3, 5, 15);
     grid_sizer->SetFlexibleDirection(wxBOTH);
 
-    m_params_list = new ParamsViewCtrl(this, wxSize(em * 30, em * 70));
+    m_params_list = new ParamsViewCtrl(this, wxSize(em * 45, em * 70));
     m_params_list->SetFont(wxGetApp().code_font());
     wxGetApp().UpdateDarkUI(m_params_list);
 
@@ -63,6 +63,7 @@ EditGCodeDialog::EditGCodeDialog(wxWindow* parent, const std::string& key, const
 #endif
     );
     m_gcode_editor->SetFont(wxGetApp().code_font());
+    m_gcode_editor->SetInsertionPointEnd();
     wxGetApp().UpdateDarkUI(m_gcode_editor);
 
     grid_sizer->Add(m_params_list,  1, wxEXPAND);
@@ -103,6 +104,13 @@ EditGCodeDialog::EditGCodeDialog(wxWindow* parent, const std::string& key, const
     bind_list_and_button();
 }
 
+EditGCodeDialog::~EditGCodeDialog()
+{
+    // To avoid redundant process of wxEVT_DATAVIEW_SELECTION_CHANGED after dialog distroing (on Linux)
+    // unbind this event from params_list
+    m_params_list->Unbind(wxEVT_DATAVIEW_SELECTION_CHANGED, &EditGCodeDialog::selection_changed, this);
+}
+
 std::string EditGCodeDialog::get_edited_gcode() const
 {
     return into_u8(m_gcode_editor->GetValue());
@@ -234,42 +242,54 @@ wxDataViewItem EditGCodeDialog::add_presets_placeholders()
 void EditGCodeDialog::add_selected_value_to_gcode()
 {
     const wxString val = m_params_list->GetSelectedValue();
-    if (!val.IsEmpty())
-        m_gcode_editor->WriteText(val + "\n");
+    if (val.IsEmpty())
+        return;
+
+    const long pos = m_gcode_editor->GetInsertionPoint();
+    m_gcode_editor->WriteText(m_gcode_editor->GetInsertionPoint() == m_gcode_editor->GetLastPosition() ? "\n" + val : val);
+
+    if (val.Last() == ']') {
+        const long new_pos = m_gcode_editor->GetInsertionPoint();
+        if (val[val.Len() - 2] == '[')
+            m_gcode_editor->SetInsertionPoint(new_pos - 1);          // set cursor into brackets
+        else
+            m_gcode_editor->SetSelection(new_pos - 17, new_pos - 1); // select "current_extruder"
+    }
+
+    m_gcode_editor->SetFocus();
 }
 
-void EditGCodeDialog::bind_list_and_button()
+void EditGCodeDialog::selection_changed(wxDataViewEvent& evt)
 {
-    m_params_list->Bind(wxEVT_DATAVIEW_SELECTION_CHANGED, [this](wxDataViewEvent& evt) {
-        wxString label;
-        wxString description;
+    wxString label;
+    wxString description;
 
-        const std::string opt_key = m_params_list->GetSelectedParamKey();
-        if (!opt_key.empty()) {
-            const ConfigOptionDef*    def     { nullptr };
+    const std::string opt_key = m_params_list->GetSelectedParamKey();
+    if (!opt_key.empty()) {
+        const ConfigOptionDef*    def     { nullptr };
 
-            const auto& full_config = wxGetApp().preset_bundle->full_config();
-            if (const ConfigDef* config_def = full_config.def(); config_def && config_def->has(opt_key)) {
-                def = config_def->get(opt_key);
-            }
-            else {
-                for (const ConfigDef* config: std::initializer_list<const ConfigDef*> {
-                     &custom_gcode_specific_config_def,
-                     &cgp_ro_slicing_states_config_def,
-                     &cgp_rw_slicing_states_config_def,
-                     &cgp_other_slicing_states_config_def,
-                     &cgp_print_statistics_config_def,
-                     &cgp_objects_info_config_def,
-                     &cgp_dimensions_config_def,
-                     &cgp_timestamps_config_def,
-                     &cgp_other_presets_config_def
-                }) {
-                    if (config->has(opt_key)) {
-                        def = config->get(opt_key);
-                        break;
-                    }
+        const auto& full_config = wxGetApp().preset_bundle->full_config();
+        if (const ConfigDef* config_def = full_config.def(); config_def && config_def->has(opt_key)) {
+            def = config_def->get(opt_key);
+        }
+        else {
+            for (const ConfigDef* config: std::initializer_list<const ConfigDef*> {
+                    &custom_gcode_specific_config_def,
+                    &cgp_ro_slicing_states_config_def,
+                    &cgp_rw_slicing_states_config_def,
+                    &cgp_other_slicing_states_config_def,
+                    &cgp_print_statistics_config_def,
+                    &cgp_objects_info_config_def,
+                    &cgp_dimensions_config_def,
+                    &cgp_timestamps_config_def,
+                    &cgp_other_presets_config_def
+            }) {
+                if (config->has(opt_key)) {
+                    def = config->get(opt_key);
+                    break;
                 }
             }
+        }
 
             if (def) {
                 const ConfigOptionType scalar_type = def->is_scalar() ? def->type : static_cast<ConfigOptionType>(def->type - coVectorType);
@@ -287,8 +307,8 @@ void EditGCodeDialog::bind_list_and_button()
 
                 label = (!def || (def->full_label.empty() && def->label.empty()) ) ? format_wxstr("%1%\n(%2%)", opt_key, type_str) :
                         (!def->full_label.empty() && !def->label.empty() ) ?
-                        format_wxstr("%1% > %2%\n(%3%)", _(def->full_label), _(def->label), type_str) :
-                        format_wxstr("%1%\n(%2%)", def->label.empty() ? _(def->full_label) : _(def->label), type_str);
+                                                                                    format_wxstr("%1% > %2%\n(%3%)", _(def->full_label), _(def->label), type_str) :
+                                                                                    format_wxstr("%1%\n(%2%)", def->label.empty() ? _(def->full_label) : _(def->label), type_str);
 
                 if (def)
                     description = get_wraped_wxString(_(def->tooltip), 120);
@@ -296,12 +316,19 @@ void EditGCodeDialog::bind_list_and_button()
             else
                 label = "Undef optptr";
         }
+        else
+            label = "Undef optptr";
+    }
 
-        m_param_label->SetLabel(label);
-        m_param_description->SetLabel(description);
+    m_param_label->SetLabel(label);
+    m_param_description->SetLabel(description);
 
-        Layout();
-    });
+    Layout();
+}
+
+void EditGCodeDialog::bind_list_and_button()
+{
+    m_params_list->Bind(wxEVT_DATAVIEW_SELECTION_CHANGED, &EditGCodeDialog::selection_changed, this);
 
     m_params_list->Bind(wxEVT_DATAVIEW_ITEM_ACTIVATED, [this](wxDataViewEvent& ) {
         add_selected_value_to_gcode();
diff --git a/src/slic3r/GUI/EditGCodeDialog.hpp b/src/slic3r/GUI/EditGCodeDialog.hpp
index d6cd18383e4..84714d3f733 100644
--- a/src/slic3r/GUI/EditGCodeDialog.hpp
+++ b/src/slic3r/GUI/EditGCodeDialog.hpp
@@ -44,7 +44,7 @@ class EditGCodeDialog : public DPIDialog
 
 public:
     EditGCodeDialog(wxWindow*parent, const std::string&key, const std::string&value);
-    ~EditGCodeDialog() {}
+    ~EditGCodeDialog();
 
     std::string get_edited_gcode() const;
 
@@ -59,6 +59,9 @@ class EditGCodeDialog : public DPIDialog
 
     void on_dpi_changed(const wxRect& suggested_rect) override;
     void on_sys_color_changed() override;
+
+    void selection_changed(wxDataViewEvent& evt);
+
     wxBoxSizer* EditGCodeDialog::create_btn_sizer(long flags);
 };
 

From 011d7ade15337dc902a21a3d527d914417dbf67e Mon Sep 17 00:00:00 2001
From: Ocraftyone <Ocraftyone@users.noreply.github.com>
Date: Wed, 27 Dec 2023 00:35:24 -0500
Subject: [PATCH 13/39] Remove extraneous options

---
 src/libslic3r/PrintConfig.cpp | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/src/libslic3r/PrintConfig.cpp b/src/libslic3r/PrintConfig.cpp
index f747cbc971b..b86a255d660 100644
--- a/src/libslic3r/PrintConfig.cpp
+++ b/src/libslic3r/PrintConfig.cpp
@@ -6720,8 +6720,6 @@ static std::map<t_custom_gcode_key, t_config_option_keys> s_CustomGcodeSpecificP
     {"before_layer_gcode",      {"layer_num", "layer_z", "max_layer_z"}},
     {"layer_gcode",             {"layer_num", "layer_z", "max_layer_z"}},
     {"toolchange_gcode",        {"layer_num", "layer_z", "max_layer_z", "previous_extruder", "next_extruder", "toolchange_z"}},
-    // some internal g_code ?
-    {"tcr_rotated_gcode",       {"toolchange_gcode", "deretraction_from_wipe_tower_generator"}},
 };
 
 const std::map<t_custom_gcode_key, t_config_option_keys>& custom_gcode_specific_placeholders()
@@ -6760,16 +6758,6 @@ CustomGcodeSpecificConfigDef::CustomGcodeSpecificConfigDef()
     def = this->add("toolchange_z", coFloat);
     def->label = L("Toolchange z");
     def->tooltip = L("Height above the print bed when the toolchange takes place. Usually the same as layer_z, but can be different.");
-
-    // I'm not sure if next options are really needed
-
-    def = this->add("toolchange_gcode", coString);
-    def->label = L("");
-    def->tooltip = L("");
-
-    def = this->add("deretraction_from_wipe_tower_generator", coString);
-    def->label = L("");
-    def->tooltip = L("");
 }
 
 const CustomGcodeSpecificConfigDef custom_gcode_specific_config_def;

From 2109ac649debd52b246913deee985a360a2d764c Mon Sep 17 00:00:00 2001
From: Ocraftyone <Ocraftyone@users.noreply.github.com>
Date: Wed, 27 Dec 2023 00:48:42 -0500
Subject: [PATCH 14/39] Fix duplicate else statement

---
 src/slic3r/GUI/EditGCodeDialog.cpp | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/slic3r/GUI/EditGCodeDialog.cpp b/src/slic3r/GUI/EditGCodeDialog.cpp
index 90107eb70d8..5e7a0f564a1 100644
--- a/src/slic3r/GUI/EditGCodeDialog.cpp
+++ b/src/slic3r/GUI/EditGCodeDialog.cpp
@@ -315,9 +315,6 @@ void EditGCodeDialog::selection_changed(wxDataViewEvent& evt)
             }
             else
                 label = "Undef optptr";
-        }
-        else
-            label = "Undef optptr";
     }
 
     m_param_label->SetLabel(label);

From 5fc6301520da2df7d06a56e7da6ee04bce189c46 Mon Sep 17 00:00:00 2001
From: Ocraftyone <Ocraftyone@users.noreply.github.com>
Date: Wed, 27 Dec 2023 01:48:27 -0500
Subject: [PATCH 15/39] Update Icons

Add new icons from PS and update to use Orca color scheme

Original Commit: prusa3d/PrusaSlicer@37afe79

Co-authored-by: YuSanka <yusanka@gmail.com>
---
 resources/images/custom-gcode_gcode.svg       |  2 ++
 resources/images/custom-gcode_measure.svg     |  1 +
 resources/images/custom-gcode_object-info.svg |  1 +
 resources/images/custom-gcode_single.svg      |  1 +
 .../images/custom-gcode_slicing-state.svg     |  1 +
 .../custom-gcode_slicing-state_global.svg     |  3 +++
 resources/images/custom-gcode_stats.svg       |  1 +
 .../images/custom-gcode_vector-index.svg      |  1 +
 resources/images/custom-gcode_vector.svg      |  1 +
 src/slic3r/GUI/EditGCodeDialog.cpp            | 22 +++++++++----------
 10 files changed, 23 insertions(+), 11 deletions(-)
 create mode 100644 resources/images/custom-gcode_gcode.svg
 create mode 100644 resources/images/custom-gcode_measure.svg
 create mode 100644 resources/images/custom-gcode_object-info.svg
 create mode 100644 resources/images/custom-gcode_single.svg
 create mode 100644 resources/images/custom-gcode_slicing-state.svg
 create mode 100644 resources/images/custom-gcode_slicing-state_global.svg
 create mode 100644 resources/images/custom-gcode_stats.svg
 create mode 100644 resources/images/custom-gcode_vector-index.svg
 create mode 100644 resources/images/custom-gcode_vector.svg

diff --git a/resources/images/custom-gcode_gcode.svg b/resources/images/custom-gcode_gcode.svg
new file mode 100644
index 00000000000..38bcd21729d
--- /dev/null
+++ b/resources/images/custom-gcode_gcode.svg
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="a" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><g id="b"><path d="m8.02,7.18h3.98v3.08c0,2.6-1.23,3.72-4.05,3.72s-3.95-1.12-3.95-3.68v-4.75c0-2.42,1.09-3.54,3.95-3.54s4.05,1,4.05,3.54h-2.12c0-1.11-.28-1.66-1.92-1.66-1.54,0-1.83.69-1.83,1.77v4.65c0,1.12.29,1.77,1.83,1.77s2.08-.65,2.08-1.82v-1.16h-2.02v-1.92Z" style="fill:#808080;"/></g></svg>
\ No newline at end of file
diff --git a/resources/images/custom-gcode_measure.svg b/resources/images/custom-gcode_measure.svg
new file mode 100644
index 00000000000..3c13dd7cc70
--- /dev/null
+++ b/resources/images/custom-gcode_measure.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="a" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><path d="m13.6,5h-.6v3.5c0,.28-.22.5-.5.5s-.5-.22-.5-.5v-3.5h-2v3.5c0,.28-.22.5-.5.5s-.5-.22-.5-.5v-3.5h-2v3.5c0,.28-.22.5-.5.5s-.5-.22-.5-.5v-3.5h-2v3.5c0,.28-.22.5-.5.5s-.5-.22-.5-.5v-3.5h-.6c-.77,0-1.4.62-1.4,1.4v3.21c0,.77.62,1.4,1.4,1.4h11.21c.77,0,1.4-.62,1.4-1.4v-3.21c0-.77-.62-1.4-1.4-1.4Z" style="fill:#808080;"/></svg>
\ No newline at end of file
diff --git a/resources/images/custom-gcode_object-info.svg b/resources/images/custom-gcode_object-info.svg
new file mode 100644
index 00000000000..2c24bdc8a20
--- /dev/null
+++ b/resources/images/custom-gcode_object-info.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="a" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><path id="b" d="m8.54,4.31c-.53-.19-.81-.69-.73-1.32.08-.62.55-1.01,1.21-1.01.46,0,.82.21,1,.58.1.2.1.22.1.55,0,.43-.07.61-.31.87-.24.26-.46.35-.84.36-.21,0-.33,0-.43-.04Z" style="fill:#009688; isolation:isolate; opacity:1;"/><path id="c" d="m6.82,13.97c-.51-.14-.74-.4-.77-.86-.02-.28-.04-.15.57-3.12.22-1.07.44-2.13.48-2.34.13-.71.07-.77-.77-.81-.21-.01-.38-.03-.39-.04s0-.09.02-.18c.04-.18,0-.16.69-.31.62-.14,1.09-.19,1.63-.2.67,0,.9.07,1.13.36.09.11.09.13.09.41,0,.25-.06.57-.39,2.17-.78,3.74-.79,3.82-.68,3.99.03.04.08.1.12.13.12.08.47.14.8.14h.3s-.02.18-.02.18c-.01.1-.04.19-.05.2-.05.03-.88.2-1.24.26-.45.07-1.31.09-1.51.03h0Z" style="fill:#009688; isolation:isolate; opacity:1;"/><polyline points="14.5 3.5 14.5 1.5 12.5 1.5" style="fill:none; stroke:808080; stroke-linecap:round; stroke-miterlimit:10;"/><polyline points="3.5 1.5 1.5 1.5 1.5 3.5" style="fill:none; stroke:#808080; stroke-linecap:round; stroke-miterlimit:10;"/><polyline points="1.5 12.5 1.5 14.5 3.5 14.5" style="fill:none; stroke:#808080; stroke-linecap:round; stroke-miterlimit:10;"/><polyline points="12.5 14.5 14.5 14.5 14.5 12.5" style="fill:none; stroke:#808080; stroke-linecap:round; stroke-miterlimit:10;"/></svg>
\ No newline at end of file
diff --git a/resources/images/custom-gcode_single.svg b/resources/images/custom-gcode_single.svg
new file mode 100644
index 00000000000..d177860bc92
--- /dev/null
+++ b/resources/images/custom-gcode_single.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="a" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><circle cx="8" cy="8" r="2" style="fill:#808080;"/></svg>
\ No newline at end of file
diff --git a/resources/images/custom-gcode_slicing-state.svg b/resources/images/custom-gcode_slicing-state.svg
new file mode 100644
index 00000000000..4b4bef6ecf7
--- /dev/null
+++ b/resources/images/custom-gcode_slicing-state.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="a" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><g id="b"><path d="m13.77,6.39c-.13-.47-.32-.92-.55-1.33l.43-1.3-1.41-1.41-1.3.43c-.42-.23-.86-.42-1.33-.55l-.61-1.23h-2l-.61,1.23c-.47.13-.92.31-1.33.55l-1.3-.43-1.42,1.41.43,1.3c-.23.41-.41.86-.54,1.33l-1.23.61v2l1.23.61c.13.47.32.92.55,1.33l-.43,1.3,1.41,1.41,1.3-.43c.42.23.86.42,1.33.55l.61,1.23h2l.61-1.23c.47-.13.92-.32,1.33-.55l1.3.43,1.41-1.41-.43-1.3c.23-.42.42-.86.55-1.33l1.23-.61v-2l-1.23-.61Zm-5.77,6.61c-2.76,0-5-2.24-5-5s2.24-5,5-5,5,2.24,5,5-2.24,5-5,5Z" style="fill:#808080;"/></g></svg>
\ No newline at end of file
diff --git a/resources/images/custom-gcode_slicing-state_global.svg b/resources/images/custom-gcode_slicing-state_global.svg
new file mode 100644
index 00000000000..7f4e685a1ba
--- /dev/null
+++ b/resources/images/custom-gcode_slicing-state_global.svg
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="a" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><g id="b">
+  <path d="m13.77,6.39c-.13-.47-.32-.92-.55-1.33l.43-1.3-1.41-1.41-1.3.43c-.42-.23-.86-.42-1.33-.55l-.61-1.23h-2l-.61,1.23c-.47.13-.92.31-1.33.55l-1.3-.43-1.42,1.41.43,1.3c-.23.41-.41.86-.54,1.33l-1.23.61v2l1.23.61c.13.47.32.92.55,1.33l-.43,1.3,1.41,1.41,1.3-.43c.42.23.86.42,1.33.55l.61,1.23h2l.61-1.23c.47-.13.92-.32,1.33-.55l1.3.43,1.41-1.41-.43-1.3c.23-.42.42-.86.55-1.33l1.23-.61v-2l-1.23-.61Zm-5.77,6.61c-2.76,0-5-2.24-5-5s2.24-5,5-5,5,2.24,5,5-2.24,5-5,5Z" style="fill:#808080"/>
+</g><circle cx="8" cy="8" r="2" style="fill:#009688; isolation:isolate; opacity:1;"/></svg>
\ No newline at end of file
diff --git a/resources/images/custom-gcode_stats.svg b/resources/images/custom-gcode_stats.svg
new file mode 100644
index 00000000000..96dfe8decfb
--- /dev/null
+++ b/resources/images/custom-gcode_stats.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="a" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><rect x="1" y="7" width="2" height="6" rx="1" ry="1" style="fill:#009688;"/><rect x="5" y="2" width="2" height="11" rx="1" ry="1" style="fill:#009688;"/><rect x="9" y="3" width="2" height="10" rx="1" ry="1" style="fill:#009688;"/><rect x="13" y="5" width="2" height="8" rx="1" ry="1" style="fill:#009688;"/></svg>
\ No newline at end of file
diff --git a/resources/images/custom-gcode_vector-index.svg b/resources/images/custom-gcode_vector-index.svg
new file mode 100644
index 00000000000..68aef590bb8
--- /dev/null
+++ b/resources/images/custom-gcode_vector-index.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="a" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><path d="m9,8v3.14c0,.47-.45.86-1,.86h0c-.55,0-1-.38-1-.86v-3.14h2Z" style="fill:#009688;"/><circle cx="8" cy="6" r="1" style="fill:#009688;"/><polyline points="4.5 2.5 2.5 2.5 2.5 13.5 4.5 13.5" style="fill:none; stroke:#808080; stroke-linecap:round; stroke-miterlimit:10;"/><polyline points="11.5 13.5 13.5 13.5 13.5 2.5 11.5 2.5" style="fill:none; stroke:#808080; stroke-linecap:round; stroke-miterlimit:10;"/></svg>
\ No newline at end of file
diff --git a/resources/images/custom-gcode_vector.svg b/resources/images/custom-gcode_vector.svg
new file mode 100644
index 00000000000..396f0e7b826
--- /dev/null
+++ b/resources/images/custom-gcode_vector.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="a" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><polyline points="4.5 2.5 2.5 2.5 2.5 13.5 4.5 13.5" style="fill:none; stroke:808080; stroke-linecap:round; stroke-miterlimit:10;"/><polyline points="11.5 13.5 13.5 13.5 13.5 2.5 11.5 2.5" style="fill:none; stroke:808080; stroke-linecap:round; stroke-miterlimit:10;"/><path d="m9,8v3.14c0,.47-.45.86-1,.86h0c-.55,0-1-.38-1-.86v-3.14h2Z" style="fill:#808080;"/><circle cx="8" cy="6" r="1" style="fill:#808080;"/></svg>
\ No newline at end of file
diff --git a/src/slic3r/GUI/EditGCodeDialog.cpp b/src/slic3r/GUI/EditGCodeDialog.cpp
index 5e7a0f564a1..de76150e6c5 100644
--- a/src/slic3r/GUI/EditGCodeDialog.cpp
+++ b/src/slic3r/GUI/EditGCodeDialog.cpp
@@ -129,7 +129,7 @@ void EditGCodeDialog::init_params_list(const std::string& custom_gcode_name)
 
     // Add slicing states placeholders
 
-    wxDataViewItem slicing_state = m_params_list->AppendGroup(_L("[Global] Slicing State"), "re_slice");
+    wxDataViewItem slicing_state = m_params_list->AppendGroup(_L("[Global] Slicing State"), "custom-gcode_slicing-state_global");
     if (!cgp_ro_slicing_states_config_def.empty()) {
         wxDataViewItem read_only = m_params_list->AppendSubGroup(slicing_state, _L("Read Only"), "lock_closed");
         for (const auto& [opt_key, def]: cgp_ro_slicing_states_config_def.options)
@@ -144,7 +144,7 @@ void EditGCodeDialog::init_params_list(const std::string& custom_gcode_name)
 
     // add other universal params, which are related to slicing state
     if (!cgp_other_slicing_states_config_def.empty()) {
-        slicing_state = m_params_list->AppendGroup(_L("Slicing State"), "re_slice");
+        slicing_state = m_params_list->AppendGroup(_L("Slicing State"), "custom-gcode_slicing-state");
         for (const auto& [opt_key, def] : cgp_other_slicing_states_config_def.options)
             m_params_list->AppendParam(slicing_state, get_type(opt_key, def), opt_key);
     }
@@ -155,7 +155,7 @@ void EditGCodeDialog::init_params_list(const std::string& custom_gcode_name)
         // Add print statistics subgroup
 
         if (!cgp_print_statistics_config_def.empty()) {
-            wxDataViewItem statistics = m_params_list->AppendGroup(_L("Print Statistics"), "info");
+            wxDataViewItem statistics = m_params_list->AppendGroup(_L("Print Statistics"), "custom-gcode_stats");
             for (const auto& [opt_key, def] : cgp_print_statistics_config_def.options)
                 m_params_list->AppendParam(statistics, get_type(opt_key, def), opt_key);
         }
@@ -163,7 +163,7 @@ void EditGCodeDialog::init_params_list(const std::string& custom_gcode_name)
         // Add objects info subgroup
 
         if (!cgp_objects_info_config_def.empty()) {
-            wxDataViewItem objects_info = m_params_list->AppendGroup(_L("Objects Info"), "advanced_plus");
+            wxDataViewItem objects_info = m_params_list->AppendGroup(_L("Objects Info"), "custom-gcode_object-info");
             for (const auto& [opt_key, def] : cgp_objects_info_config_def.options)
                 m_params_list->AppendParam(objects_info, get_type(opt_key, def), opt_key);
         }
@@ -171,7 +171,7 @@ void EditGCodeDialog::init_params_list(const std::string& custom_gcode_name)
         // Add  dimensions subgroup
 
         if (!cgp_dimensions_config_def.empty()) {
-            wxDataViewItem dimensions = m_params_list->AppendGroup(_L("Dimensions"), "measure");
+            wxDataViewItem dimensions = m_params_list->AppendGroup(_L("Dimensions"), "custom-gcode_measure");
             for (const auto& [opt_key, def] : cgp_dimensions_config_def.options)
                 m_params_list->AppendParam(dimensions, get_type(opt_key, def), opt_key);
         }
@@ -179,7 +179,7 @@ void EditGCodeDialog::init_params_list(const std::string& custom_gcode_name)
         // Add timestamp subgroup
 
         if (!cgp_timestamps_config_def.empty()) {
-            wxDataViewItem dimensions = m_params_list->AppendGroup(_L("Timestamps"), "time");
+            wxDataViewItem dimensions = m_params_list->AppendGroup(_L("Timestamps"), "print-time");
             for (const auto& [opt_key, def] : cgp_timestamps_config_def.options)
                 m_params_list->AppendParam(dimensions, get_type(opt_key, def), opt_key);
         }
@@ -188,7 +188,7 @@ void EditGCodeDialog::init_params_list(const std::string& custom_gcode_name)
     // Add specific placeholders
 
     if (!specific_params.empty()) {
-        wxDataViewItem group = m_params_list->AppendGroup(format_wxstr(_L("Specific for %1%"), custom_gcode_name), "add_gcode");
+        wxDataViewItem group = m_params_list->AppendGroup(format_wxstr(_L("Specific for %1%"), custom_gcode_name), "custom-gcode_gcode");
         for (const auto& opt_key : specific_params)
             if (custom_gcode_specific_config_def.has(opt_key)) {
                 auto def = custom_gcode_specific_config_def.get(opt_key);
@@ -226,7 +226,7 @@ wxDataViewItem EditGCodeDialog::add_presets_placeholders()
         if (const ConfigOption *optptr = full_config.optptr(opt))
             m_params_list->AppendParam(print, optptr->is_scalar() ? ParamType::Scalar : ParamType::Vector, opt);
 
-    wxDataViewItem material = m_params_list->AppendSubGroup(group, _(is_fff ? L("Filament settings") : L("SLA Materials settings")), is_fff ? "spool" : "resin");
+    wxDataViewItem material = m_params_list->AppendSubGroup(group, _(is_fff ? L("Filament settings") : L("SLA Materials settings")), is_fff ? "filament" : "resin");
     for (const auto&opt : material_options)
         if (const ConfigOption *optptr = full_config.optptr(opt))
             m_params_list->AppendParam(material, optptr->is_scalar() ? ParamType::Scalar : ParamType::FilamentVector, opt);
@@ -444,9 +444,9 @@ wxBoxSizer* EditGCodeDialog::create_btn_sizer(long flags)
 
 const std::map<ParamType, std::string> ParamsInfo {
 //    Type                      BitmapName
-    { ParamType::Scalar,        "scalar_param"          },
-    { ParamType::Vector,        "vector_param"          },
-    { ParamType::FilamentVector,"vector_filament_param" },
+    { ParamType::Scalar,        "custom-gcode_single"          },
+    { ParamType::Vector,        "custom-gcode_vector"          },
+    { ParamType::FilamentVector,"custom-gcode_vector-index" },
 };
 
 static void make_bold(wxString& str)

From d839d673d0dd090213eca997bd6162ae5ab2888c Mon Sep 17 00:00:00 2001
From: Ocraftyone <Ocraftyone@users.noreply.github.com>
Date: Thu, 28 Dec 2023 05:51:07 -0500
Subject: [PATCH 16/39] Remove SlicingState Options that aren't in Orca

Also organized and added missing options to `s_CustomGcodeSpecificPlaceholders`
---
 src/libslic3r/PrintConfig.cpp | 102 ++++++++++++++++++++--------------
 1 file changed, 59 insertions(+), 43 deletions(-)

diff --git a/src/libslic3r/PrintConfig.cpp b/src/libslic3r/PrintConfig.cpp
index b86a255d660..f4d946b960b 100644
--- a/src/libslic3r/PrintConfig.cpp
+++ b/src/libslic3r/PrintConfig.cpp
@@ -6487,9 +6487,10 @@ ReadWriteSlicingStatesConfigDef::ReadWriteSlicingStatesConfigDef()
     def->label = L("Extra deretraction");
     def->tooltip = L("Currently planned extra extruder priming after deretraction.");
 
-    def = this->add("e_position", coFloats);
-    def->label = L("Absolute E position");
-    def->tooltip = L("Current position of the extruder axis. Only used with absolute extruder addressing.");
+    // Options from PS not used in Orca
+//    def = this->add("e_position", coFloats);
+//    def->label = L("Absolute E position");
+//    def->tooltip = L("Current position of the extruder axis. Only used with absolute extruder addressing.");
 }
 
 OtherSlicingStatesConfigDef::OtherSlicingStatesConfigDef()
@@ -6504,10 +6505,6 @@ OtherSlicingStatesConfigDef::OtherSlicingStatesConfigDef()
     def->label = L("Current object index");
     def->tooltip = L("Specific for sequential printing. Zero-based index of currently printed object.");
 
-    def = this->add("has_single_extruder_multi_material_priming", coBool);
-    def->label = L("Has single extruder MM priming");
-    def->tooltip = L("Are the extra multi-material priming regions used in this print?");
-
     def = this->add("has_wipe_tower", coBool);
     def->label = L("Has wipe tower");
     def->tooltip = L("Whether or not wipe tower is being generated in the print.");
@@ -6516,10 +6513,6 @@ OtherSlicingStatesConfigDef::OtherSlicingStatesConfigDef()
     def->label = L("Initial extruder");
     def->tooltip = L("Zero-based index of the first extruder used in the print. Same as initial_tool.");
 
-    def = this->add("initial_filament_type", coString);
-    def->label = L("Initial filament type");
-    def->tooltip = L("String containing filament type of the first used extruder.");
-
     def = this->add("initial_tool", coInt);
     def->label = L("Initial tool");
     def->tooltip = L("Zero-based index of the first extruder used in the print. Same as initial_extruder.");
@@ -6527,6 +6520,15 @@ OtherSlicingStatesConfigDef::OtherSlicingStatesConfigDef()
     def = this->add("is_extruder_used", coBools);
     def->label = L("Is extruder used?");
     def->tooltip = L("Vector of bools stating whether a given extruder is used in the print.");
+
+    // Options from PS not used in Orca
+    //    def = this->add("initial_filament_type", coString);
+    //    def->label = L("Initial filament type");
+    //    def->tooltip = L("String containing filament type of the first used extruder.");
+
+    //    def = this->add("has_single_extruder_multi_material_priming", coBool);
+    //    def->label = L("Has single extruder MM priming");
+    //    def->tooltip = L("Are the extra multi-material priming regions used in this print?");
 }
 
 PrintStatisticsConfigDef::PrintStatisticsConfigDef()
@@ -6537,7 +6539,28 @@ PrintStatisticsConfigDef::PrintStatisticsConfigDef()
     def->label = L("Volume per extruder");
     def->tooltip = L("Total filament volume extruded per extruder during the entire print.");
 
-    def = this->add("normal_print_time", coString);
+    def = this->add("total_toolchanges", coInt);
+    def->label = L("Total toolchanges");
+    def->tooltip = L("Number of toolchanges during the print.");
+
+    def = this->add("extruded_volume_total", coFloat);
+    def->label = L("Total volume");
+    def->tooltip = L("Total volume of filament used during the entire print.");
+
+    def = this->add("extruded_weight", coFloats);
+    def->label = L("Weight per extruder");
+    def->tooltip = L("Weight per extruder extruded during the entire print. Calculated from filament_density value in Filament Settings.");
+
+    def = this->add("extruded_weight_total", coFloat);
+    def->label = L("Total weight");
+    def->tooltip = L("Total weight of the print. Calculated from filament_density value in Filament Settings.");
+
+    def = this->add("total_layer_count", coInt);
+    def->label = L("Total layer count");
+    def->tooltip = L("Number of layers in the entire print.");
+
+    // Options from PS not used in Orca
+    /*    def = this->add("normal_print_time", coString);
     def->label = L("Print time (normal mode)");
     def->tooltip = L("Estimated print time when printed in normal mode (i.e. not in silent mode). Same as print_time.");
 
@@ -6575,27 +6598,7 @@ PrintStatisticsConfigDef::PrintStatisticsConfigDef()
 
     def = this->add("used_filament", coFloat);
     def->label = L("Used filament");
-    def->tooltip = L("Total length of filament used in the print.");
-
-    def = this->add("total_toolchanges", coInt);
-    def->label = L("Total toolchanges");
-    def->tooltip = L("Number of toolchanges during the print.");
-
-    def = this->add("extruded_volume_total", coFloat);
-    def->label = L("Total volume");
-    def->tooltip = L("Total volume of filament used during the entire print.");
-
-    def = this->add("extruded_weight", coFloats);
-    def->label = L("Weight per extruder");
-    def->tooltip = L("Weight per extruder extruded during the entire print. Calculated from filament_density value in Filament Settings.");
-
-    def = this->add("extruded_weight_total", coFloat);
-    def->label = L("Total weight");
-    def->tooltip = L("Total weight of the print. Calculated from filament_density value in Filament Settings.");
-
-    def = this->add("total_layer_count", coInt);
-    def->label = L("Total layer count");
-    def->tooltip = L("Number of layers in the entire print.");
+    def->tooltip = L("Total length of filament used in the print.");*/
 }
 
 ObjectsInfoConfigDef::ObjectsInfoConfigDef()
@@ -6619,6 +6622,10 @@ ObjectsInfoConfigDef::ObjectsInfoConfigDef()
     def = this->add("input_filename_base", coString);
     def->label = L("Input filename without extension");
     def->tooltip = L("Source filename of the first object, without extension.");
+
+    def = this->add("input_filename", coString);
+    def->label = L("Full input filename");
+    def->tooltip = L("Source filename of the first object.");
 }
 
 DimensionsConfigDef::DimensionsConfigDef()
@@ -6690,10 +6697,6 @@ OtherPresetsConfigDef::OtherPresetsConfigDef()
 {
     ConfigOptionDef* def;
 
-    def = this->add("num_extruders", coInt);
-    def->label = L("Number of extruders");
-    def->tooltip = L("Total number of extruders, regardless of whether they are used in the current print.");
-
     def = this->add("print_preset", coString);
     def->label = L("Print preset name");
     def->tooltip = L("Name of the print preset used for slicing.");
@@ -6710,16 +6713,29 @@ OtherPresetsConfigDef::OtherPresetsConfigDef()
     def = this->add("physical_printer_preset", coString);
     def->label = L("Physical printer name");
     def->tooltip = L("Name of the physical printer used for slicing.");
+
+    // Options from PS not used in Orca
+    //    def = this->add("num_extruders", coInt);
+    //    def->label = L("Number of extruders");
+    //    def->tooltip = L("Total number of extruders, regardless of whether they are used in the current print.");
 }
 
 
 static std::map<t_custom_gcode_key, t_config_option_keys> s_CustomGcodeSpecificPlaceholders{
-    {"start_filament_gcode",    {"layer_num", "layer_z", "max_layer_z", "filament_extruder_id"}},
-    {"end_filament_gcode",      {"layer_num", "layer_z", "max_layer_z", "filament_extruder_id"}},
-    {"end_gcode",               {"layer_num", "layer_z", "max_layer_z", "filament_extruder_id"}},
-    {"before_layer_gcode",      {"layer_num", "layer_z", "max_layer_z"}},
-    {"layer_gcode",             {"layer_num", "layer_z", "max_layer_z"}},
-    {"toolchange_gcode",        {"layer_num", "layer_z", "max_layer_z", "previous_extruder", "next_extruder", "toolchange_z"}},
+    // Machine Gcode
+    {"machine_start_gcode",         {}},
+    {"machine_end_gcode",           {"layer_num", "layer_z", "max_layer_z", "filament_extruder_id"}},
+    {"before_layer_change_gcode",   {"layer_num", "layer_z", "max_layer_z"}},
+    {"layer_change_gcode",          {"layer_num", "layer_z", "max_layer_z"}},
+    {"time_lapse_gcode",            {}},
+    {"change_filament_gcode",       {}},
+    {"change_extrusion_role_gcode", {"layer_num", "layer_z", "extrusion_role", "last_extrusion_role"}},
+    {"printing_by_object_gcode",    {}},
+    {"machine_pause_gcode",         {}},
+    {"template_custom_gcode",       {}},
+    //Filament Gcode
+    {"filament_start_gcode",        {}},
+    {"filament_end_gcode",          {}},
 };
 
 const std::map<t_custom_gcode_key, t_config_option_keys>& custom_gcode_specific_placeholders()

From 4e3039b6f9bc2dad1bd2ffa4ebf789432a46f377 Mon Sep 17 00:00:00 2001
From: Ocraftyone <Ocraftyone@users.noreply.github.com>
Date: Sat, 30 Dec 2023 07:37:34 -0500
Subject: [PATCH 17/39] Improve checking placeholders

Dialog now shows all issues within the same dialog

If a custom gcode value is not specified within the config, a testing value is added. This ensures that (most) of the custom gcode is parsed, and thus checked against the definitions.
---
 src/libslic3r/GCode.cpp | 70 +++++++++++++++++++++++++++++++++++------
 src/libslic3r/GCode.hpp |  4 +++
 2 files changed, 64 insertions(+), 10 deletions(-)

diff --git a/src/libslic3r/GCode.cpp b/src/libslic3r/GCode.cpp
index 718975e26bc..1423d636edb 100644
--- a/src/libslic3r/GCode.cpp
+++ b/src/libslic3r/GCode.cpp
@@ -1585,6 +1585,21 @@ void GCode::do_export(Print* print, const char* path, GCodeProcessorResult* resu
 
     check_placeholder_parser_failed();
 
+#if ORCA_CHECK_GCODE_PLACEHOLDERS
+    if (!m_placeholder_error_messages.empty()){
+        std::ostringstream message;
+        message << "Some EditGcodeDialog defs were not specified properly. Do so in PrintConfig under SlicingStatesConfigDef:" << std::endl;
+        for (const auto& error : m_placeholder_error_messages) {
+            message << std::endl << error.first << ": " << std::endl;
+            for (const auto& str : error.second)
+                message << str << ", ";
+            message.seekp(-2, std::ios_base::end);
+            message << std::endl;
+        }
+        throw Slic3r::PlaceholderParserError(message.str());
+    }
+#endif
+
     BOOST_LOG_TRIVIAL(debug) << "Start processing gcode, " << log_memory_info();
     // Post-process the G-code to update time stamps.
 
@@ -2915,8 +2930,9 @@ void GCode::process_layers(
 
 std::string GCode::placeholder_parser_process(const std::string &name, const std::string &templ, unsigned int current_extruder_id, const DynamicConfig *config_override)
 {
-    // Orca: Modified functionality from PS implementation since debug is rarely used in current workflow.
-    // Allows generation to be toggled via a CMake config option.
+    // Orca: Added CMake config option since debug is rarely used in current workflow.
+    // Also changed from throwing error immediately to storing messages till slicing is completed
+    // to raise all errors at the same time.
 #if !defined(NDEBUG) || defined(ORCA_CHECK_GCODE_PLACEHOLDERS) // CHECK_CUSTOM_GCODE_PLACEHOLDERS
     if (config_override) {
         const auto& custom_gcode_placeholders = custom_gcode_specific_placeholders();
@@ -2929,17 +2945,24 @@ std::string GCode::placeholder_parser_process(const std::string &name, const std
 
             for (const std::string& key : config_override->keys()) {
                 // 2-nd check: "key" have to be present in s_CustomGcodeSpecificOptions for "name" custom G-code ;
-                if (std::find(placeholders.begin(), placeholders.end(), key) == placeholders.end())
-                    throw Slic3r::PlaceholderParserError(format("\"%s\" placeholder for \"%s\" custom G-code \n"
-                                                                "needs to be added to s_CustomGcodeSpecificOptions", key.c_str(), name.c_str()));
+                if (std::find(placeholders.begin(), placeholders.end(), key) == placeholders.end()) {
+                    auto& vector = m_placeholder_error_messages[name + " - option not specified for custom gcode type (s_CustomGcodeSpecificOptions)"];
+                    if (std::find(vector.begin(), vector.end(), key) == vector.end())
+                        vector.emplace_back(key);
+                }
                 // 3-rd check: "key" have to be present in CustomGcodeSpecificConfigDef for "key" placeholder;
-                if (!custom_gcode_specific_config_def.has(key))
-                    throw Slic3r::PlaceholderParserError(format("Definition of \"%s\" placeholder \n"
-                                                                "needs to be added to CustomGcodeSpecificConfigDef", key.c_str()));
+                if (!custom_gcode_specific_config_def.has(key)) {
+                    auto& vector = m_placeholder_error_messages[name + " - option has no definition (CustomGcodeSpecificConfigDef)"];
+                    if (std::find(vector.begin(), vector.end(), key) == vector.end())
+                        vector.emplace_back(key);
+                }
             }
         }
-        else
-            throw Slic3r::PlaceholderParserError(format("\"%s\" custom G-code needs to be added to s_CustomGcodeSpecificOptions", name.c_str()));
+        else {
+            auto& vector = m_placeholder_error_messages[name + " - gcode type not found in s_CustomGcodeSpecificOptions"];
+            if (vector.empty())
+                vector.emplace_back("");
+        }
     }
 #endif
 
@@ -4294,6 +4317,33 @@ void GCode::apply_print_config(const PrintConfig &print_config)
     m_writer.apply_print_config(print_config);
     m_config.apply(print_config);
     m_scaled_resolution = scaled<double>(print_config.resolution.value);
+
+#if ORCA_CHECK_GCODE_PLACEHOLDERS
+    // If the gcode value is empty, set a value so that the check code within the parser is run
+    for (auto opt : std::initializer_list<ConfigOptionString*>{
+             &m_config.machine_start_gcode,
+             &m_config.machine_end_gcode,
+             &m_config.before_layer_change_gcode,
+             &m_config.layer_change_gcode,
+             &m_config.time_lapse_gcode,
+             &m_config.change_filament_gcode,
+             &m_config.change_extrusion_role_gcode,
+             &m_config.printing_by_object_gcode,
+             &m_config.machine_pause_gcode,
+             &m_config.template_custom_gcode,
+         }) {
+        if (opt->empty())
+            opt->set(new ConfigOptionString(";VALUE FOR TESTING"));
+    }
+    for (auto opt : std::initializer_list<ConfigOptionStrings*>{
+             &m_config.filament_start_gcode,
+             &m_config.filament_end_gcode
+         }) {
+        if (opt->empty())
+            for (int i = 0; i < opt->size(); ++i)
+                opt->set_at(new ConfigOptionString(";VALUE FOR TESTING"), i, 0);
+    }
+#endif
 }
 
 void GCode::append_full_config(const Print &print, std::string &str)
diff --git a/src/libslic3r/GCode.hpp b/src/libslic3r/GCode.hpp
index 7136c83a328..1912dc4d2c2 100644
--- a/src/libslic3r/GCode.hpp
+++ b/src/libslic3r/GCode.hpp
@@ -518,6 +518,10 @@ class GCode {
     double                              m_last_mm3_per_mm;
 #endif // ENABLE_GCODE_VIEWER_DATA_CHECKING
 
+#if ORCA_CHECK_GCODE_PLACEHOLDERS
+    std::map<std::string, std::vector<std::string>> m_placeholder_error_messages;
+#endif
+
     Point                               m_last_pos;
     bool                                m_last_pos_defined;
 

From 066e2f6062d589ab66764d2bb9fe56572e206d4c Mon Sep 17 00:00:00 2001
From: Ocraftyone <Ocraftyone@users.noreply.github.com>
Date: Sun, 31 Dec 2023 05:16:36 -0500
Subject: [PATCH 18/39] Make Compatible with wx 3.1.5

This should be reverted when wxWidgets 3.2.1 is re-implemented
---
 src/slic3r/GUI/EditGCodeDialog.cpp | 17 +++++++++++++----
 src/slic3r/GUI/EditGCodeDialog.hpp |  2 ++
 src/slic3r/GUI/Field.hpp           |  2 +-
 src/slic3r/GUI/OG_CustomCtrl.cpp   |  8 ++++----
 src/slic3r/GUI/OG_CustomCtrl.hpp   |  2 +-
 5 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/src/slic3r/GUI/EditGCodeDialog.cpp b/src/slic3r/GUI/EditGCodeDialog.cpp
index de76150e6c5..02b2e0ec47c 100644
--- a/src/slic3r/GUI/EditGCodeDialog.cpp
+++ b/src/slic3r/GUI/EditGCodeDialog.cpp
@@ -362,7 +362,7 @@ void EditGCodeDialog::on_dpi_changed(const wxRect&suggested_rect)
 
 void EditGCodeDialog::on_sys_color_changed()
 {
-    m_add_btn->sys_color_changed();
+    m_add_btn->msw_rescale();
 }
 
 //Orca
@@ -620,9 +620,11 @@ void ParamsModel::GetValue(wxVariant& variant, const wxDataViewItem& item, unsig
     ParamsNode* node = static_cast<ParamsNode*>(item.GetID());
     if (col == (unsigned int)0)
 #ifdef __linux__
-        variant << wxDataViewIconText(node->text, get_bmp_bundle(node->icon_name)->GetIconFor(m_ctrl->GetParent()));
+//        variant << wxDataViewIconText(node->text, get_bmp_bundle(node->icon_name)->GetIconFor(m_ctrl->GetParent())); //TODO: update to bundle with wx update
+wxDataViewIconText(node->text, create_scaled_bitmap(node->icon_name, m_ctrl->GetParent()));
 #else
-        variant << DataViewBitmapText(node->text, get_bmp_bundle(node->icon_name)->GetBitmapFor(m_ctrl->GetParent()));
+//        variant << DataViewBitmapText(node->text, get_bmp_bundle(node->icon_name)->GetBitmapFor(m_ctrl->GetParent())); //TODO: update to bundle with wx update
+        variant << DataViewBitmapText(node->text, create_scaled_bitmap(node->icon_name, m_ctrl->GetParent()));
 #endif //__linux__
     else
         wxLogError("DiffModel::GetValue: wrong column %d", col);
@@ -690,7 +692,14 @@ unsigned int ParamsModel::GetChildren(const wxDataViewItem& parent, wxDataViewIt
 
     return array.Count();
 }
-
+unsigned int ParamsModel::GetColumnCount() const { return 1; }
+wxString     ParamsModel::GetColumnType(unsigned int col) const {
+#ifdef __linux__
+    return wxT("wxDataViewIconText");
+#else
+    return wxT("DataViewBitmapText");
+#endif
+}
 
 // ----------------------------------------------------------------------------
 //                  ParamsViewCtrl
diff --git a/src/slic3r/GUI/EditGCodeDialog.hpp b/src/slic3r/GUI/EditGCodeDialog.hpp
index 84714d3f733..bceb6943990 100644
--- a/src/slic3r/GUI/EditGCodeDialog.hpp
+++ b/src/slic3r/GUI/EditGCodeDialog.hpp
@@ -178,6 +178,8 @@ class ParamsModel : public wxDataViewModel
 
     wxDataViewItem  GetParent(const wxDataViewItem& item) const override;
     unsigned int    GetChildren(const wxDataViewItem& parent, wxDataViewItemArray& array) const override;
+    unsigned int    GetColumnCount() const override;
+    wxString        GetColumnType(unsigned int col) const override;
 
     void GetValue(wxVariant& variant, const wxDataViewItem& item, unsigned int col) const override;
     bool SetValue(const wxVariant& variant, const wxDataViewItem& item, unsigned int col) override;
diff --git a/src/slic3r/GUI/Field.hpp b/src/slic3r/GUI/Field.hpp
index b5f5ceb9561..d86a790eb4f 100644
--- a/src/slic3r/GUI/Field.hpp
+++ b/src/slic3r/GUI/Field.hpp
@@ -150,7 +150,7 @@ class UndoValueUIManager
 
     // Edit field button
     bool					has_edit_ui()			const { return !m_edit_ui.tooltip.IsEmpty(); }
-    const wxBitmapBundle*	edit_bitmap()			const { return &m_edit_ui.bitmap->bmp(); }
+    const wxBitmap*	        edit_bitmap()			const { return &m_edit_ui.bitmap->bmp(); }
     const wxString*			edit_tooltip()			const { return &m_edit_ui.tooltip; }
 };
 
diff --git a/src/slic3r/GUI/OG_CustomCtrl.cpp b/src/slic3r/GUI/OG_CustomCtrl.cpp
index b612ae30fdc..dadde84ebcf 100644
--- a/src/slic3r/GUI/OG_CustomCtrl.cpp
+++ b/src/slic3r/GUI/OG_CustomCtrl.cpp
@@ -776,7 +776,7 @@ void OG_CustomCtrl::CtrlLine::render(wxDC& dc, wxCoord h_pos, wxCoord v_pos)
             const wxPoint pos = draw_act_bmps(dc, wxPoint(h_pos, v_pos), field->undo_to_sys_bitmap()->bmp(),
                                               field->undo_bitmap()->bmp(), field->blink());
             if (field->has_edit_ui())
-                draw_edit_bmp(dc, pos, field->edit_bitmap());
+                draw_edit_bmp(dc, pos, *field->edit_bitmap());
         }
         return;
     }
@@ -1011,14 +1011,14 @@ wxPoint OG_CustomCtrl::CtrlLine::draw_act_bmps(wxDC& dc, wxPoint pos, const wxBi
     return wxPoint(h_pos, v_pos);
 }
 
-wxCoord OG_CustomCtrl::CtrlLine::draw_edit_bmp(wxDC &dc, wxPoint pos, const wxBitmapBundle *bmp_edit)
+wxCoord OG_CustomCtrl::CtrlLine::draw_edit_bmp(wxDC &dc, wxPoint pos, const wxBitmap& bmp_edit)
 {
     const wxCoord h_pos = pos.x + ctrl->m_h_gap;
     const wxCoord v_pos = pos.y;
-    const int bmp_w = get_bitmap_size(bmp_edit, ctrl).GetWidth();
+    const int bmp_w = bmp_edit.GetWidth();
     rects_edit_icon.emplace_back(wxRect(h_pos, v_pos, bmp_w, bmp_w));
 
-    dc.DrawBitmap(bmp_edit->GetBitmapFor(ctrl), h_pos, v_pos);
+    dc.DrawBitmap(bmp_edit, h_pos, v_pos);
 
     return h_pos + bmp_w + ctrl->m_h_gap;
 }
diff --git a/src/slic3r/GUI/OG_CustomCtrl.hpp b/src/slic3r/GUI/OG_CustomCtrl.hpp
index b8e31604461..b4fa1dcfd4f 100644
--- a/src/slic3r/GUI/OG_CustomCtrl.hpp
+++ b/src/slic3r/GUI/OG_CustomCtrl.hpp
@@ -65,7 +65,7 @@ class OG_CustomCtrl :public wxPanel
         wxCoord draw_text      (wxDC& dc, wxPoint pos, const wxString& text, const wxColour* color, int width, bool is_url = false, bool is_main = false);
         wxPoint draw_blinking_bmp(wxDC& dc, wxPoint pos, bool is_blinking);
         wxPoint draw_act_bmps(wxDC& dc, wxPoint pos, const wxBitmap& bmp_undo_to_sys, const wxBitmap& bmp_undo, bool is_blinking, size_t rect_id = 0);
-        wxCoord draw_edit_bmp(wxDC& dc, wxPoint pos, const wxBitmapBundle* bmp_edit);
+        wxCoord draw_edit_bmp(wxDC& dc, wxPoint pos, const wxBitmap& bmp_edit);
         bool    launch_browser() const;
         bool    is_separator() const { return og_line.is_separator(); }
 

From 529f14d64b2a179912a70ff299d710dec7739440 Mon Sep 17 00:00:00 2001
From: Ocraftyone <Ocraftyone@users.noreply.github.com>
Date: Sun, 31 Dec 2023 06:02:40 -0500
Subject: [PATCH 19/39] Use proper config when checking for custom gcode

make sure that the local copy of the config is being used when checking if there is custom gcode otherwise it would be possible it doesn't get run during testing
---
 src/libslic3r/GCode.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/libslic3r/GCode.cpp b/src/libslic3r/GCode.cpp
index 66a3a60b03c..450d3989cd2 100644
--- a/src/libslic3r/GCode.cpp
+++ b/src/libslic3r/GCode.cpp
@@ -3558,7 +3558,7 @@ LayerResult GCode::process_layer(
     m_last_height = height;
 
     // Set new layer - this will change Z and force a retraction if retract_when_changing_layer is enabled.
-    if (! print.config().before_layer_change_gcode.value.empty()) {
+    if (! m_config.before_layer_change_gcode.value.empty()) {
         DynamicConfig config;
         config.set_key_value("layer_num",   new ConfigOptionInt(m_layer_index + 1));
         config.set_key_value("layer_z",     new ConfigOptionFloat(print_z));
@@ -3581,7 +3581,7 @@ LayerResult GCode::process_layer(
 
     auto insert_timelapse_gcode = [this, print_z, &print]() -> std::string {
         std::string gcode_res;
-        if (!print.config().time_lapse_gcode.value.empty()) {
+        if (!m_config.time_lapse_gcode.value.empty()) {
             DynamicConfig config;
             config.set_key_value("layer_num", new ConfigOptionInt(m_layer_index));
             config.set_key_value("layer_z", new ConfigOptionFloat(print_z));
@@ -3609,7 +3609,7 @@ LayerResult GCode::process_layer(
             }
         }
     } else {
-        if (!print.config().time_lapse_gcode.value.empty()) {
+        if (!m_config.time_lapse_gcode.value.empty()) {
             DynamicConfig config;
             config.set_key_value("layer_num", new ConfigOptionInt(m_layer_index));
             config.set_key_value("layer_z", new ConfigOptionFloat(print_z));
@@ -3619,7 +3619,7 @@ LayerResult GCode::process_layer(
                      "\n";
         }
     }
-    if (! print.config().layer_change_gcode.value.empty()) {
+    if (! m_config.layer_change_gcode.value.empty()) {
         DynamicConfig config;
         config.set_key_value("layer_num", new ConfigOptionInt(m_layer_index));
         config.set_key_value("layer_z",   new ConfigOptionFloat(print_z));

From 2235371f91bc16ba1b84125b9e828700ce23e644 Mon Sep 17 00:00:00 2001
From: Ocraftyone <Ocraftyone@users.noreply.github.com>
Date: Sun, 31 Dec 2023 22:47:44 -0500
Subject: [PATCH 20/39] Don't show option if defined with type coNone

---
 src/slic3r/GUI/EditGCodeDialog.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/slic3r/GUI/EditGCodeDialog.cpp b/src/slic3r/GUI/EditGCodeDialog.cpp
index 02b2e0ec47c..8d51f4b2bee 100644
--- a/src/slic3r/GUI/EditGCodeDialog.cpp
+++ b/src/slic3r/GUI/EditGCodeDialog.cpp
@@ -190,8 +190,7 @@ void EditGCodeDialog::init_params_list(const std::string& custom_gcode_name)
     if (!specific_params.empty()) {
         wxDataViewItem group = m_params_list->AppendGroup(format_wxstr(_L("Specific for %1%"), custom_gcode_name), "custom-gcode_gcode");
         for (const auto& opt_key : specific_params)
-            if (custom_gcode_specific_config_def.has(opt_key)) {
-                auto def = custom_gcode_specific_config_def.get(opt_key);
+            if (auto def = custom_gcode_specific_config_def.get(opt_key); def && def->type != coNone) {
                 m_params_list->AppendParam(group, get_type(opt_key, *def), opt_key);
             }
         m_params_list->Expand(group);

From 7297997837e83edbd6f7a6461fa8aebd4ee0e5cc Mon Sep 17 00:00:00 2001
From: Ocraftyone <Ocraftyone@users.noreply.github.com>
Date: Mon, 1 Jan 2024 03:29:52 -0500
Subject: [PATCH 21/39] Add defs for custom gcode

---
 src/libslic3r/PrintConfig.cpp | 78 +++++++++++++++++++++++++++--------
 1 file changed, 60 insertions(+), 18 deletions(-)

diff --git a/src/libslic3r/PrintConfig.cpp b/src/libslic3r/PrintConfig.cpp
index ca4def97602..cdf811b2366 100644
--- a/src/libslic3r/PrintConfig.cpp
+++ b/src/libslic3r/PrintConfig.cpp
@@ -6487,6 +6487,13 @@ void DynamicPrintAndCLIConfig::handle_legacy(t_config_option_key &opt_key, std::
 
 // SlicingStatesConfigDefs
 
+// Create a new config definition with a label and tooltip
+// Note: the L() macro is already used for LABEL and TOOLTIP
+#define new_def(OPT_KEY, TYPE, LABEL, TOOLTIP) \
+        def = this->add(OPT_KEY, TYPE); \
+        def->label = L(LABEL); \
+        def->tooltip = L(TOOLTIP);
+
 ReadOnlySlicingStatesConfigDef::ReadOnlySlicingStatesConfigDef()
 {
     ConfigOptionDef* def;
@@ -6754,15 +6761,21 @@ static std::map<t_custom_gcode_key, t_config_option_keys> s_CustomGcodeSpecificP
     {"machine_end_gcode",           {"layer_num", "layer_z", "max_layer_z", "filament_extruder_id"}},
     {"before_layer_change_gcode",   {"layer_num", "layer_z", "max_layer_z"}},
     {"layer_change_gcode",          {"layer_num", "layer_z", "max_layer_z"}},
-    {"time_lapse_gcode",            {}},
-    {"change_filament_gcode",       {}},
+    {"timelapse_gcode",             {"layer_num", "layer_z", "max_layer_z"}},
+    {"change_filament_gcode",       {"layer_num", "layer_z", "max_layer_z", "next_extruder", "previous_extruder", "fan_speed",
+                               "first_flush_volume", "flush_length_1", "flush_length_2", "flush_length_3", "flush_length_4",
+                               "new_filament_e_feedrate", "new_filament_temp", "new_retract_length",
+                               "new_retract_length_toolchange", "old_filament_e_feedrate", "old_filament_temp", "old_retract_length",
+                               "old_retract_length_toolchange", "relative_e_axis", "second_flush_volume", "toolchange_count", "toolchange_z",
+                               "travel_point_1_x", "travel_point_1_y", "travel_point_2_x", "travel_point_2_y", "travel_point_3_x",
+                               "travel_point_3_y", "x_after_toolchange", "y_after_toolchange", "z_after_toolchange"}},
     {"change_extrusion_role_gcode", {"layer_num", "layer_z", "extrusion_role", "last_extrusion_role"}},
     {"printing_by_object_gcode",    {}},
     {"machine_pause_gcode",         {}},
     {"template_custom_gcode",       {}},
     //Filament Gcode
-    {"filament_start_gcode",        {}},
-    {"filament_end_gcode",          {}},
+    {"filament_start_gcode",        {"filament_extruder_id"}},
+    {"filament_end_gcode",          {"layer_num", "layer_z", "max_layer_z", "filament_extruder_id"}},
 };
 
 const std::map<t_custom_gcode_key, t_config_option_keys>& custom_gcode_specific_placeholders()
@@ -6774,6 +6787,7 @@ CustomGcodeSpecificConfigDef::CustomGcodeSpecificConfigDef()
 {
     ConfigOptionDef* def;
 
+// Common Defs
     def = this->add("layer_num", coInt);
     def->label = L("Layer number");
     def->tooltip = L("Index of the current layer. One-based (i.e. first layer is number 1).");
@@ -6787,24 +6801,52 @@ CustomGcodeSpecificConfigDef::CustomGcodeSpecificConfigDef()
     def->tooltip = L("Height of the last layer above the print bed.");
 
     def = this->add("filament_extruder_id", coInt);
-    def->label = L("");
-    def->tooltip = L("");
-
-    def = this->add("previous_extruder", coInt);
-    def->label = L("Previous extruder");
-    def->tooltip = L("Index of the extruder that is being unloaded. The index is zero based (first extruder has index 0).");
-
-    def = this->add("next_extruder", coInt);
-    def->label = L("Next extruder");
-    def->tooltip = L("Index of the extruder that is being loaded. The index is zero based (first extruder has index 0).");
-
-    def = this->add("toolchange_z", coFloat);
-    def->label = L("Toolchange z");
-    def->tooltip = L("Height above the print bed when the toolchange takes place. Usually the same as layer_z, but can be different.");
+    def->label = L("Filament extruder ID");
+    def->tooltip = L("The current extruder ID. The same as current_extruder.");
+
+// change_filament_gcode
+    new_def("previous_extruder", coInt, "Previous extruder", "Index of the extruder that is being unloaded. The index is zero based (first extruder has index 0).");
+    new_def("next_extruder", coInt, "Next extruder", "Index of the extruder that is being loaded. The index is zero based (first extruder has index 0).");
+    new_def("relative_e_axis", coBool, "Relative e-axis", "Indicates if relative positioning is being used");
+    new_def("toolchange_count", coInt, "Toolchange count", "The number of toolchanges throught the print");
+    new_def("fan_speed", coNone, "", ""); //Option is no longer used and is zeroed by placeholder parser for compatability
+    new_def("old_retract_length", coFloat, "Old retract length", "The retraction length of the previous filament");
+    new_def("new_retract_length", coFloat, "New retract length", "The retraction lenght of the new filament");
+    new_def("old_retract_length_toolchange", coFloat, "Old retract length toolchange", "The toolchange retraction length of the previous filament");
+    new_def("new_retract_length_toolchange", coFloat, "New retract length toolchange", "The toolchange retraction length of the new filament");
+    new_def("old_filament_temp", coInt, "Old filament temp", "The old filament temp");
+    new_def("new_filament_temp", coInt, "New filament temp", "The new filament temp");
+    new_def("x_after_toolchange", coFloat, "X after toolchange", "The x pos after toolchange");
+    new_def("y_after_toolchange", coFloat, "Y after toolchange", "The y pos after toolchange");
+    new_def("z_after_toolchange", coFloat, "Z after toolchange", "The z pos after toolchange");
+    new_def("first_flush_volume", coFloat, "First flush volume", "The first flush volume");
+    new_def("second_flush_volume", coFloat, "Second flush volume", "The second flush volume");
+    new_def("old_filament_e_feedrate", coInt, "Old filament e feedrate", "The old filament extruder feedrate");
+    new_def("new_filament_e_feedrate", coInt, "New filament e feedrate", "The new filament extruder feedrate");
+    new_def("travel_point_1_x", coFloat, "Travel point 1 x", "The travel point 1 x");
+    new_def("travel_point_1_y", coFloat, "Travel point 1 y", "The travel point 1 y");
+    new_def("travel_point_2_x", coFloat, "Travel point 2 x", "The travel point 2 x");
+    new_def("travel_point_2_y", coFloat, "Travel point 2 y", "The travel point 2 y");
+    new_def("travel_point_3_x", coFloat, "Travel point 3 x", "The travel point 3 x");
+    new_def("travel_point_3_y", coFloat, "Travel point 3 y", "The travel point 3 y");
+    new_def("flush_length_1", coFloat, "Flush Length 1", "The first flush length");
+    new_def("flush_length_2", coFloat, "Flush Length 2", "The second flush length");
+    new_def("flush_length_3", coFloat, "Flush Length 3", "The third flush length");
+    new_def("flush_length_4", coFloat, "Flush Length 4", "The fourth flush length");
+
+// change_extrusion_role_gcode
+    std::string extrusion_role_types = "Possible Values:\n[\"Perimeter\", \"ExternalPerimeter\", "
+                                                     "\"OverhangPerimeter\", \"InternalInfill\", \"SolidInfill\", \"TopSolidInfill\", \"BottomSurface\", \"BridgeInfill\", \"GapFill\", \"Ironing\", "
+                                                     "\"Skirt\", \"Brim\", \"SupportMaterial\", \"SupportMaterialInterface\", \"SupportTransition\", \"WipeTower\", \"Mixed\"]";
+
+    new_def("extrusion_role", coString, "Extrusion role", "The new extrusion role/type that is going to be used\n" + extrusion_role_types);
+    new_def("last_extrusion_role", coString, "Last extrusion role", "The previously used extrusion role/type\nPossible Values:\n" + extrusion_role_types);
 }
 
 const CustomGcodeSpecificConfigDef custom_gcode_specific_config_def;
 
+#undef new_def
+
 uint64_t ModelConfig::s_last_timestamp = 1;
 
 static Points to_points(const std::vector<Vec2d> &dpts)

From 7f1f94d531035fd279ec7f4f219a93a78971a0de Mon Sep 17 00:00:00 2001
From: Ocraftyone <Ocraftyone@users.noreply.github.com>
Date: Mon, 1 Jan 2024 08:31:48 -0500
Subject: [PATCH 22/39] Subgroup presets by page

---
 src/slic3r/GUI/EditGCodeDialog.cpp | 50 ++++++++++++++++++++----------
 src/slic3r/GUI/Tab.hpp             |  1 +
 2 files changed, 34 insertions(+), 17 deletions(-)

diff --git a/src/slic3r/GUI/EditGCodeDialog.cpp b/src/slic3r/GUI/EditGCodeDialog.cpp
index 8d51f4b2bee..669bb846222 100644
--- a/src/slic3r/GUI/EditGCodeDialog.cpp
+++ b/src/slic3r/GUI/EditGCodeDialog.cpp
@@ -207,33 +207,49 @@ void EditGCodeDialog::init_params_list(const std::string& custom_gcode_name)
 
 wxDataViewItem EditGCodeDialog::add_presets_placeholders()
 {
-    auto get_set_from_vec = [](const std::vector<std::string>&vec) {
-        return std::set<std::string>(vec.begin(), vec.end());
-    };
-
     const bool                  is_fff           = wxGetApp().plater()->printer_technology() == ptFFF;
-    const std::set<std::string> print_options    = get_set_from_vec(is_fff ? Preset::print_options()    : Preset::sla_print_options());
-    const std::set<std::string> material_options = get_set_from_vec(is_fff ? Preset::filament_options() : Preset::sla_material_options());
-    const std::set<std::string> printer_options  = get_set_from_vec(is_fff ? Preset::printer_options()  : Preset::sla_printer_options());
-
     const auto&full_config = wxGetApp().preset_bundle->full_config();
+    const auto& tab_list = wxGetApp().tabs_list;
+
+    Tab* tab_print;
+    Tab* tab_filament;
+    Tab* tab_printer;
+    for (const auto tab : tab_list) {
+        if (tab->m_type == Preset::TYPE_PRINT)
+            tab_print = tab;
+        else if (tab->m_type == Preset::TYPE_FILAMENT)
+            tab_filament = tab;
+        else if (tab->m_type == Preset::TYPE_PRINTER)
+            tab_printer = tab;
+    }
+
+
+    // Orca: create subgroups from the pages of the tabs
+    auto init_from_tab = [this, full_config](wxDataViewItem parent, Tab* tab){
+        for (const auto& page : tab->m_pages) {
+            wxDataViewItem subgroup = m_params_list->AppendSubGroup(parent, page->title(), "empty");
+            std::vector<std::string> opt_keys;
+            for (const auto& optgroup : page->m_optgroups)
+                for (const auto& opt : optgroup->opt_map())
+                    opt_keys.push_back(opt.first);
+
+            std::sort(opt_keys.begin(), opt_keys.end());
+            for (const auto& opt_key : opt_keys)
+                if (const ConfigOption* optptr = full_config.optptr(opt_key))
+                    m_params_list->AppendParam(subgroup, optptr->is_scalar() ? ParamType::Scalar : ParamType::Vector, opt_key);
+        }
+    };
 
     wxDataViewItem group = m_params_list->AppendGroup(_L("Presets"), "cog");
 
     wxDataViewItem print = m_params_list->AppendSubGroup(group, _L("Print settings"), "cog");
-    for (const auto&opt : print_options)
-        if (const ConfigOption *optptr = full_config.optptr(opt))
-            m_params_list->AppendParam(print, optptr->is_scalar() ? ParamType::Scalar : ParamType::Vector, opt);
+    init_from_tab(print, tab_print);
 
     wxDataViewItem material = m_params_list->AppendSubGroup(group, _(is_fff ? L("Filament settings") : L("SLA Materials settings")), is_fff ? "filament" : "resin");
-    for (const auto&opt : material_options)
-        if (const ConfigOption *optptr = full_config.optptr(opt))
-            m_params_list->AppendParam(material, optptr->is_scalar() ? ParamType::Scalar : ParamType::FilamentVector, opt);
+    init_from_tab(material, tab_filament);
 
     wxDataViewItem printer = m_params_list->AppendSubGroup(group, _L("Printer settings"), is_fff ? "printer" : "sla_printer");
-    for (const auto&opt : printer_options)
-        if (const ConfigOption *optptr = full_config.optptr(opt))
-            m_params_list->AppendParam(printer, optptr->is_scalar() ? ParamType::Scalar : ParamType::Vector, opt);
+    init_from_tab(printer, tab_printer);
 
     return group;
 }
diff --git a/src/slic3r/GUI/Tab.hpp b/src/slic3r/GUI/Tab.hpp
index 1e66ddfc69e..c33d76ea573 100644
--- a/src/slic3r/GUI/Tab.hpp
+++ b/src/slic3r/GUI/Tab.hpp
@@ -434,6 +434,7 @@ class Tab: public wxPanel
 
     ConfigManipulation m_config_manipulation;
     ConfigManipulation get_config_manipulation();
+    friend class EditGCodeDialog;
 };
 
 class TabPrint : public Tab

From 23942781ff5084ee7e9f40db4234b41b030a408e Mon Sep 17 00:00:00 2001
From: Ocraftyone <Ocraftyone@users.noreply.github.com>
Date: Mon, 1 Jan 2024 08:56:44 -0500
Subject: [PATCH 23/39] fix spacing in tooltip

---
 src/slic3r/GUI/OptionsGroup.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/slic3r/GUI/OptionsGroup.cpp b/src/slic3r/GUI/OptionsGroup.cpp
index dbbfa55f48a..e94814d59e7 100644
--- a/src/slic3r/GUI/OptionsGroup.cpp
+++ b/src/slic3r/GUI/OptionsGroup.cpp
@@ -107,7 +107,7 @@ const t_field& OptionsGroup::build_field(const t_config_option_key& id, const Co
             if (!m_disabled)
                 this->edit_custom_gcode(opt_id);
         };
-        field->set_edit_tooltip(_L("Edit CustomG-code"));
+        field->set_edit_tooltip(_L("Edit Custom G-code"));
     }
 
 	field->m_back_to_initial_value = [this](std::string opt_id) {

From 42e6b18149ef165819127c71d3c939701fce612f Mon Sep 17 00:00:00 2001
From: Ocraftyone <Ocraftyone@users.noreply.github.com>
Date: Tue, 2 Jan 2024 00:56:30 -0500
Subject: [PATCH 24/39] Check if cmake option is truthy rather than defined

---
 src/libslic3r/GCode.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libslic3r/GCode.cpp b/src/libslic3r/GCode.cpp
index 450d3989cd2..81ee741c35e 100644
--- a/src/libslic3r/GCode.cpp
+++ b/src/libslic3r/GCode.cpp
@@ -2933,7 +2933,7 @@ std::string GCode::placeholder_parser_process(const std::string &name, const std
     // Orca: Added CMake config option since debug is rarely used in current workflow.
     // Also changed from throwing error immediately to storing messages till slicing is completed
     // to raise all errors at the same time.
-#if !defined(NDEBUG) || defined(ORCA_CHECK_GCODE_PLACEHOLDERS) // CHECK_CUSTOM_GCODE_PLACEHOLDERS
+#if !defined(NDEBUG) || ORCA_CHECK_GCODE_PLACEHOLDERS // CHECK_CUSTOM_GCODE_PLACEHOLDERS
     if (config_override) {
         const auto& custom_gcode_placeholders = custom_gcode_specific_placeholders();
 

From ecd20184f9510b05ce8f8e97278499cd202de9d9 Mon Sep 17 00:00:00 2001
From: Ocraftyone <Ocraftyone@users.noreply.github.com>
Date: Fri, 5 Jan 2024 05:24:53 -0500
Subject: [PATCH 25/39] Add the rest of the param defs

Also added temperatures category to handle them
---
 resources/images/custom-gcode_temperature.svg | 14 +++++++++++
 src/libslic3r/PrintConfig.cpp                 | 24 ++++++++++++++++---
 src/libslic3r/PrintConfig.hpp                 |  6 +++++
 src/slic3r/GUI/EditGCodeDialog.cpp            |  9 +++++++
 src/slic3r/GUI/EditGCodeDialog.hpp            |  1 +
 5 files changed, 51 insertions(+), 3 deletions(-)
 create mode 100644 resources/images/custom-gcode_temperature.svg

diff --git a/resources/images/custom-gcode_temperature.svg b/resources/images/custom-gcode_temperature.svg
new file mode 100644
index 00000000000..d14cd1a31cb
--- /dev/null
+++ b/resources/images/custom-gcode_temperature.svg
@@ -0,0 +1,14 @@
+<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_8076_36010)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M4.69269 2.49023C4.69269 1.29516 5.66149 0.326355 6.85657 0.326355C8.05165 0.326355 9.02044 1.29516 9.02044 2.49023V6.92898C9.96736 7.60117 10.5871 8.70725 10.5871 9.95952C10.5871 12.0108 8.92419 13.6737 6.87289 13.6737C4.8216 13.6737 3.15869 12.0108 3.15869 9.95952C3.15869 8.72168 3.76428 7.62665 4.69269 6.95241V2.49023ZM5.69269 7.51465V2.49023C5.69269 1.84744 6.21378 1.32635 6.85657 1.32635C7.49936 1.32635 8.02044 1.84744 8.02044 2.49023V7.49913C8.94588 7.9315 9.58709 8.87063 9.58709 9.95952C9.58709 11.4585 8.3719 12.6737 6.87289 12.6737C5.37388 12.6737 4.15869 11.4585 4.15869 9.95952C4.15869 8.88348 4.78486 7.95369 5.69269 7.51465Z" fill="#009688"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M10.186 2.49249C10.186 2.21635 10.4099 1.99249 10.686 1.99249H11.8258C12.1019 1.99249 12.3258 2.21635 12.3258 2.49249C12.3258 2.76863 12.1019 2.99249 11.8258 2.99249H10.686C10.4099 2.99249 10.186 2.76863 10.186 2.49249Z" fill="#009688"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M10.186 4.83203C10.186 4.55589 10.4099 4.33203 10.686 4.33203H11.8258C12.1019 4.33203 12.3258 4.55589 12.3258 4.83203C12.3258 5.10817 12.1019 5.33203 11.8258 5.33203H10.686C10.4099 5.33203 10.186 5.10817 10.186 4.83203Z" fill="#009688"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M6.87305 2.49249C7.14919 2.49249 7.37305 2.71635 7.37305 2.99249V9.22844C7.37305 9.50458 7.14919 9.72844 6.87305 9.72844C6.5969 9.72844 6.37305 9.50458 6.37305 9.22844L6.37305 2.99249C6.37305 2.71635 6.5969 2.49249 6.87305 2.49249Z" fill="#009688"/>
+<path d="M8.24858 9.90249C8.24858 10.6622 7.63274 11.278 6.87307 11.278C6.1134 11.278 5.49756 10.6622 5.49756 9.90249C5.49756 9.14281 6.1134 8.52698 6.87307 8.52698C7.63274 8.52698 8.24858 9.14281 8.24858 9.90249Z" fill="#009688"/>
+</g>
+<defs>
+<clipPath id="clip0_8076_36010">
+<rect width="14" height="14" fill="white" transform="translate(0 14) rotate(-90)"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/src/libslic3r/PrintConfig.cpp b/src/libslic3r/PrintConfig.cpp
index ed6d80aec5d..fc8354b094f 100644
--- a/src/libslic3r/PrintConfig.cpp
+++ b/src/libslic3r/PrintConfig.cpp
@@ -6577,6 +6577,9 @@ OtherSlicingStatesConfigDef::OtherSlicingStatesConfigDef()
     //    def = this->add("has_single_extruder_multi_material_priming", coBool);
     //    def->label = L("Has single extruder MM priming");
     //    def->tooltip = L("Are the extra multi-material priming regions used in this print?");
+
+    new_def("initial_no_support_extruder", coInt, "Initial no support extruder", "Zero-based index of the first extruder used for printing without support. Same as initial_no_support_tool.");
+    new_def("in_head_wrap_detect_zone", coBool, "In head wrap detect zone", "Indicates if the first layer overlaps with the head wrap zone.");
 }
 
 PrintStatisticsConfigDef::PrintStatisticsConfigDef()
@@ -6671,9 +6674,8 @@ ObjectsInfoConfigDef::ObjectsInfoConfigDef()
     def->label = L("Input filename without extension");
     def->tooltip = L("Source filename of the first object, without extension.");
 
-    def = this->add("input_filename", coString);
-    def->label = L("Full input filename");
-    def->tooltip = L("Source filename of the first object.");
+    new_def("input_filename", coString, "Full input filename", "Source filename of the first object.");
+    new_def("plate_name", coString, "Plate name", "Name of the plate sliced.");
 }
 
 DimensionsConfigDef::DimensionsConfigDef()
@@ -6711,6 +6713,22 @@ DimensionsConfigDef::DimensionsConfigDef()
     def = this->add("print_bed_size", coFloats);
     def->label = L("Size of the print bed bounding box");
     def->tooltip = bb_size_tooltip;
+
+    new_def("first_layer_center_no_wipe_tower", coFloats, "First layer center without wipe tower", point_tooltip);
+    new_def("first_layer_height", coFloat, "First layer height", "Height of the first layer.");
+}
+
+TemperaturesConfigDef::TemperaturesConfigDef()
+{
+    ConfigOptionDef* def;
+
+    new_def("bed_temperature", coInts, "Bed temperature", "Vector of bed temperatures for each extruder/filament.")
+    new_def("bed_temperature_initial_layer", coInts, "Initial layer bed temperature", "Vector of initial layer bed temperatures for each extruder/filament. Provides the same value as first_layer_bed_temperature.")
+    new_def("bed_temperature_initial_layer_single", coInt, "Initial layer bed temperature (initial extruder)", "Initial layer bed temperature for the initial extruder. Same as bed_temperature_initial_layer[initial_extruder]")
+    new_def("chamber_temperature", coInts, "Chamber temperature", "Vector of chamber temperatures for each extruder/filament.")
+    new_def("overall_chamber_temperature", coInt, "Overall chamber temperature", "Overall chamber temperature. This value is the maximum chamber temperature of any extruder/filament used.")
+    new_def("first_layer_bed_temperature", coInts, "First layer bed temperature", "Vector of first layer bed temperatures for each extruder/filament. Provides the same value as bed_temperature_initial_layer.")
+    new_def("first_layer_temperature", coInts, "First layer temperature", "Vector of first layer temperatures for each extruder/filament.")
 }
 
 
diff --git a/src/libslic3r/PrintConfig.hpp b/src/libslic3r/PrintConfig.hpp
index 41d8830ca6e..9a4207766ad 100644
--- a/src/libslic3r/PrintConfig.hpp
+++ b/src/libslic3r/PrintConfig.hpp
@@ -1480,6 +1480,12 @@ class DimensionsConfigDef : public ConfigDef
     DimensionsConfigDef();
 };
 
+class TemperaturesConfigDef : public ConfigDef
+{
+public:
+    TemperaturesConfigDef();
+};
+
 class TimestampsConfigDef : public ConfigDef
 {
 public:
diff --git a/src/slic3r/GUI/EditGCodeDialog.cpp b/src/slic3r/GUI/EditGCodeDialog.cpp
index 669bb846222..b5b6eb1d023 100644
--- a/src/slic3r/GUI/EditGCodeDialog.cpp
+++ b/src/slic3r/GUI/EditGCodeDialog.cpp
@@ -176,6 +176,14 @@ void EditGCodeDialog::init_params_list(const std::string& custom_gcode_name)
                 m_params_list->AppendParam(dimensions, get_type(opt_key, def), opt_key);
         }
 
+        // Add temperature subgroup
+
+        if (!cgp_temperatures_config_def.empty()) {
+            wxDataViewItem temperatures = m_params_list->AppendGroup(_L("Temperatures"), "custom-gcode_temperature");
+            for (const auto& [opt_key, def] : cgp_temperatures_config_def.options)
+                m_params_list->AppendParam(temperatures, get_type(opt_key, def), opt_key);
+        }
+
         // Add timestamp subgroup
 
         if (!cgp_timestamps_config_def.empty()) {
@@ -296,6 +304,7 @@ void EditGCodeDialog::selection_changed(wxDataViewEvent& evt)
                     &cgp_print_statistics_config_def,
                     &cgp_objects_info_config_def,
                     &cgp_dimensions_config_def,
+                    &cgp_temperatures_config_def,
                     &cgp_timestamps_config_def,
                     &cgp_other_presets_config_def
             }) {
diff --git a/src/slic3r/GUI/EditGCodeDialog.hpp b/src/slic3r/GUI/EditGCodeDialog.hpp
index bceb6943990..907a500f53d 100644
--- a/src/slic3r/GUI/EditGCodeDialog.hpp
+++ b/src/slic3r/GUI/EditGCodeDialog.hpp
@@ -39,6 +39,7 @@ class EditGCodeDialog : public DPIDialog
     PrintStatisticsConfigDef        cgp_print_statistics_config_def;
     ObjectsInfoConfigDef            cgp_objects_info_config_def;
     DimensionsConfigDef             cgp_dimensions_config_def;
+    TemperaturesConfigDef           cgp_temperatures_config_def;
     TimestampsConfigDef             cgp_timestamps_config_def;
     OtherPresetsConfigDef           cgp_other_presets_config_def;
 

From 4abca6a0911f9ddfbf993a28fa54c5da5f4408c9 Mon Sep 17 00:00:00 2001
From: Ocraftyone <Ocraftyone@users.noreply.github.com>
Date: Fri, 5 Jan 2024 05:58:44 -0500
Subject: [PATCH 26/39] Override full config defs in non-preset categories

---
 src/slic3r/GUI/EditGCodeDialog.cpp | 59 ++++++++++++++++++++----------
 src/slic3r/GUI/EditGCodeDialog.hpp |  6 +++
 2 files changed, 45 insertions(+), 20 deletions(-)

diff --git a/src/slic3r/GUI/EditGCodeDialog.cpp b/src/slic3r/GUI/EditGCodeDialog.cpp
index b5b6eb1d023..e3ab4e0f42b 100644
--- a/src/slic3r/GUI/EditGCodeDialog.cpp
+++ b/src/slic3r/GUI/EditGCodeDialog.cpp
@@ -291,27 +291,30 @@ void EditGCodeDialog::selection_changed(wxDataViewEvent& evt)
     if (!opt_key.empty()) {
         const ConfigOptionDef*    def     { nullptr };
 
-        const auto& full_config = wxGetApp().preset_bundle->full_config();
-        if (const ConfigDef* config_def = full_config.def(); config_def && config_def->has(opt_key)) {
-            def = config_def->get(opt_key);
+        for (const ConfigDef* config: std::initializer_list<const ConfigDef*> {
+                 &custom_gcode_specific_config_def,
+                 &cgp_ro_slicing_states_config_def,
+                 &cgp_rw_slicing_states_config_def,
+                 &cgp_other_slicing_states_config_def,
+                 &cgp_print_statistics_config_def,
+                 &cgp_objects_info_config_def,
+                 &cgp_dimensions_config_def,
+                 &cgp_temperatures_config_def,
+                 &cgp_timestamps_config_def,
+                 &cgp_other_presets_config_def
+             }) {
+            if (config->has(opt_key)) {
+                def = config->get(opt_key);
+                break;
+            }
         }
-        else {
-            for (const ConfigDef* config: std::initializer_list<const ConfigDef*> {
-                    &custom_gcode_specific_config_def,
-                    &cgp_ro_slicing_states_config_def,
-                    &cgp_rw_slicing_states_config_def,
-                    &cgp_other_slicing_states_config_def,
-                    &cgp_print_statistics_config_def,
-                    &cgp_objects_info_config_def,
-                    &cgp_dimensions_config_def,
-                    &cgp_temperatures_config_def,
-                    &cgp_timestamps_config_def,
-                    &cgp_other_presets_config_def
-            }) {
-                if (config->has(opt_key)) {
-                    def = config->get(opt_key);
-                    break;
-                }
+        // Orca: move below checking for def in custom defined gcode placeholders
+        // This allows custom placeholders to override the default ones for this dialog
+        // Override custom def if selection is within the preset category
+        if (!def || unbold(m_params_list->GetSelectedTopLevelCategory()) == "Presets") {
+            const auto& full_config = wxGetApp().preset_bundle->full_config();
+            if (const ConfigDef* config_def = full_config.def(); config_def && config_def->has(opt_key)) {
+                def = config_def->get(opt_key);
             }
         }
 
@@ -590,6 +593,17 @@ std::string ParamsModel::GetParamKey(wxDataViewItem item)
     return std::string();
 }
 
+std::string ParamsModel::GetTopLevelCategory(wxDataViewItem item)
+{
+    if (item.IsOk()) {
+        ParamsNode* node = static_cast<ParamsNode*>(item.GetID());
+        while (!node->IsGroupNode())
+            node = node->GetParent();
+        return node->text.ToStdString();
+    }
+    return std::string();
+}
+
 wxDataViewItem ParamsModel::Delete(const wxDataViewItem& item)
 {
     auto ret_item = wxDataViewItem(nullptr);
@@ -790,6 +804,11 @@ std::string ParamsViewCtrl::GetSelectedParamKey()
     return model->GetParamKey(this->GetSelection());
 }
 
+std::string ParamsViewCtrl::GetSelectedTopLevelCategory()
+{
+    return model->GetTopLevelCategory(this->GetSelection());
+}
+
 void ParamsViewCtrl::CheckAndDeleteIfEmpty(wxDataViewItem item)
 {
     wxDataViewItemArray children;
diff --git a/src/slic3r/GUI/EditGCodeDialog.hpp b/src/slic3r/GUI/EditGCodeDialog.hpp
index 907a500f53d..afff93afdc2 100644
--- a/src/slic3r/GUI/EditGCodeDialog.hpp
+++ b/src/slic3r/GUI/EditGCodeDialog.hpp
@@ -174,6 +174,7 @@ class ParamsModel : public wxDataViewModel
 
     wxString        GetParamName(wxDataViewItem item);
     std::string     GetParamKey(wxDataViewItem item);
+    std::string     GetTopLevelCategory(wxDataViewItem item);
 
     void            Clear();
 
@@ -225,6 +226,7 @@ class ParamsViewCtrl : public wxDataViewCtrl
     wxString        GetValue(wxDataViewItem item);
     wxString        GetSelectedValue();
     std::string     GetSelectedParamKey();
+    std::string     GetSelectedTopLevelCategory();
 
     void    CheckAndDeleteIfEmpty(wxDataViewItem item);
 
@@ -234,6 +236,10 @@ class ParamsViewCtrl : public wxDataViewCtrl
     void    set_em_unit(int em) { m_em_unit = em; }
 };
 
+static std::string unbold(const std::string& text) {
+    return text.substr(text.find("<b>")+3, text.find("</b>")-3);
+}
+
 
 } // namespace GUI
 } // namespace Slic3r

From 50b7b3d073c52cfaa96910dfcf17f6082ae94171 Mon Sep 17 00:00:00 2001
From: Ocraftyone <Ocraftyone@users.noreply.github.com>
Date: Fri, 5 Jan 2024 06:03:34 -0500
Subject: [PATCH 27/39] Remove unused code

---
 src/slic3r/GUI/EditGCodeDialog.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/slic3r/GUI/EditGCodeDialog.cpp b/src/slic3r/GUI/EditGCodeDialog.cpp
index e3ab4e0f42b..6546786609c 100644
--- a/src/slic3r/GUI/EditGCodeDialog.cpp
+++ b/src/slic3r/GUI/EditGCodeDialog.cpp
@@ -268,7 +268,6 @@ void EditGCodeDialog::add_selected_value_to_gcode()
     if (val.IsEmpty())
         return;
 
-    const long pos = m_gcode_editor->GetInsertionPoint();
     m_gcode_editor->WriteText(m_gcode_editor->GetInsertionPoint() == m_gcode_editor->GetLastPosition() ? "\n" + val : val);
 
     if (val.Last() == ']') {

From 43417b0f635046729560cccfc62082faf0acf52a Mon Sep 17 00:00:00 2001
From: Ocraftyone <Ocraftyone@users.noreply.github.com>
Date: Fri, 5 Jan 2024 06:32:11 -0500
Subject: [PATCH 28/39] fix linux compilation

---
 src/slic3r/GUI/EditGCodeDialog.cpp | 6 +++++-
 src/slic3r/GUI/EditGCodeDialog.hpp | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/slic3r/GUI/EditGCodeDialog.cpp b/src/slic3r/GUI/EditGCodeDialog.cpp
index 6546786609c..ee5ff299f70 100644
--- a/src/slic3r/GUI/EditGCodeDialog.cpp
+++ b/src/slic3r/GUI/EditGCodeDialog.cpp
@@ -658,7 +658,11 @@ void ParamsModel::GetValue(wxVariant& variant, const wxDataViewItem& item, unsig
     if (col == (unsigned int)0)
 #ifdef __linux__
 //        variant << wxDataViewIconText(node->text, get_bmp_bundle(node->icon_name)->GetIconFor(m_ctrl->GetParent())); //TODO: update to bundle with wx update
-wxDataViewIconText(node->text, create_scaled_bitmap(node->icon_name, m_ctrl->GetParent()));
+    {
+        wxIcon icon;
+        icon.CopyFromBitmap(create_scaled_bitmap(node->icon_name, m_ctrl->GetParent()));
+        wxDataViewIconText(node->text, icon);
+    }
 #else
 //        variant << DataViewBitmapText(node->text, get_bmp_bundle(node->icon_name)->GetBitmapFor(m_ctrl->GetParent())); //TODO: update to bundle with wx update
         variant << DataViewBitmapText(node->text, create_scaled_bitmap(node->icon_name, m_ctrl->GetParent()));
diff --git a/src/slic3r/GUI/EditGCodeDialog.hpp b/src/slic3r/GUI/EditGCodeDialog.hpp
index afff93afdc2..9d29282dc82 100644
--- a/src/slic3r/GUI/EditGCodeDialog.hpp
+++ b/src/slic3r/GUI/EditGCodeDialog.hpp
@@ -63,7 +63,7 @@ class EditGCodeDialog : public DPIDialog
 
     void selection_changed(wxDataViewEvent& evt);
 
-    wxBoxSizer* EditGCodeDialog::create_btn_sizer(long flags);
+    wxBoxSizer* create_btn_sizer(long flags);
 };
 
 

From 068b888199f5e93cd34adb265c2b1afb6b0d30d9 Mon Sep 17 00:00:00 2001
From: Ocraftyone <Ocraftyone@users.noreply.github.com>
Date: Mon, 8 Jan 2024 18:00:32 -0500
Subject: [PATCH 29/39] Implement Search for GCode DataView

---
 src/slic3r/GUI/EditGCodeDialog.cpp | 123 ++++++++++++++++++++++++++---
 src/slic3r/GUI/EditGCodeDialog.hpp |  41 +++++++---
 2 files changed, 145 insertions(+), 19 deletions(-)

diff --git a/src/slic3r/GUI/EditGCodeDialog.cpp b/src/slic3r/GUI/EditGCodeDialog.cpp
index ee5ff299f70..def0fcd37f4 100644
--- a/src/slic3r/GUI/EditGCodeDialog.cpp
+++ b/src/slic3r/GUI/EditGCodeDialog.cpp
@@ -50,9 +50,28 @@ EditGCodeDialog::EditGCodeDialog(wxWindow* parent, const std::string& key, const
     auto* grid_sizer = new wxFlexGridSizer(1, 3, 5, 15);
     grid_sizer->SetFlexibleDirection(wxBOTH);
 
+    auto* param_sizer = new wxBoxSizer(wxVERTICAL);
+
+    m_search_bar = new wxSearchCtrl(this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER);
+    m_search_bar->ShowSearchButton(true);
+    m_search_bar->ShowCancelButton(true);
+    m_search_bar->SetDescriptiveText(_L("Search gcode placeholders"));
+    m_search_bar->SetForegroundColour(*wxBLACK);
+    wxGetApp().UpdateDarkUI(m_search_bar);
+
+    m_search_bar->Bind(wxEVT_SET_FOCUS, [this](wxFocusEvent&) {
+//        this->on_search_update();
+    });
+    m_search_bar->Bind(wxEVT_COMMAND_TEXT_UPDATED, [this](wxCommandEvent&) {
+        this->on_search_update();
+    });
+
+    param_sizer->Add(m_search_bar, 0, wxEXPAND | wxALL, border);
+
     m_params_list = new ParamsViewCtrl(this, wxSize(em * 45, em * 70));
     m_params_list->SetFont(wxGetApp().code_font());
     wxGetApp().UpdateDarkUI(m_params_list);
+    param_sizer->Add(m_params_list, 0, wxEXPAND | wxALL, border);
 
     m_add_btn = new ScalableButton(this, wxID_ANY, "add_copies");
     m_add_btn->SetToolTip(_L("Add selected placeholder to G-code"));
@@ -66,7 +85,7 @@ EditGCodeDialog::EditGCodeDialog(wxWindow* parent, const std::string& key, const
     m_gcode_editor->SetInsertionPointEnd();
     wxGetApp().UpdateDarkUI(m_gcode_editor);
 
-    grid_sizer->Add(m_params_list,  1, wxEXPAND);
+    grid_sizer->Add(param_sizer,  1, wxEXPAND);
     grid_sizer->Add(m_add_btn,      0, wxALIGN_CENTER_VERTICAL);
     grid_sizer->Add(m_gcode_editor, 2, wxEXPAND);
 
@@ -116,6 +135,15 @@ std::string EditGCodeDialog::get_edited_gcode() const
     return into_u8(m_gcode_editor->GetValue());
 }
 
+void EditGCodeDialog::on_search_update()
+{
+    wxString   search_text = m_search_bar->GetValue().Lower();
+    if (search_text.empty())
+        m_params_list->model->FinishSearch();
+    else
+        m_params_list->model->RefreshSearch(search_text);
+}
+
 static ParamType get_type(const std::string& opt_key, const ConfigOptionDef& opt_def)
 {
     return opt_def.is_scalar() ? ParamType::Scalar : ParamType::Vector;
@@ -486,30 +514,35 @@ static void make_bold(wxString& str)
 //                  ParamsModelNode: a node inside ParamsModel
 // ----------------------------------------------------------------------------
 
-ParamsNode::ParamsNode(const wxString& group_name, const std::string& icon_name)
+ParamsNode::ParamsNode(const wxString& group_name, const std::string& icon_name, wxDataViewCtrl* ctrl)
 : icon_name(icon_name)
 , text(group_name)
+, m_ctrl(ctrl)
 {
     make_bold(text);
 }
 
 ParamsNode::ParamsNode( ParamsNode *        parent,
                         const wxString&     sub_group_name,
-                        const std::string&  icon_name)
+                        const std::string&  icon_name,
+                        wxDataViewCtrl* ctrl)
     : m_parent(parent)
     , icon_name(icon_name)
     , text(sub_group_name)
+    , m_ctrl(ctrl)
 {
     make_bold(text);
 }
 
 ParamsNode::ParamsNode( ParamsNode*         parent,
                         ParamType           param_type,
-                        const std::string&  param_key)
+                        const std::string&  param_key,
+                        wxDataViewCtrl* ctrl)
     : m_parent(parent)
     , m_param_type(param_type)
     , m_container(false)
     , param_key(param_key)
+    , m_ctrl(ctrl)
 {
     text = from_u8(param_key);
     if (param_type == ParamType::Vector)
@@ -520,6 +553,48 @@ ParamsNode::ParamsNode( ParamsNode*         parent,
     icon_name = ParamsInfo.at(param_type);
 }
 
+void ParamsNode::StartSearch()
+{
+    const wxDataViewItem item(this);
+    m_expanded_before_search = m_ctrl->IsExpanded(item);
+    if (!GetChildren().empty())
+        for (const auto& child : GetChildren())
+            child->StartSearch();
+}
+
+void ParamsNode::RefreshSearch(const wxString& search_text)
+{
+    if (!GetChildren().empty())
+        for (auto& child : GetChildren())
+            child->RefreshSearch(search_text);
+
+    if (GetEnabledChildren().empty())
+        if (IsParamNode() && text.find(search_text) != wxString::npos)
+            Enable();
+        else
+            Disable();
+    else
+        Enable();
+}
+
+void ParamsNode::FinishSearch()
+{
+    Enable();
+    const wxDataViewItem item(this);
+    if (!GetChildren().empty())
+        for (const auto& child : GetChildren())
+            child->FinishSearch();
+    m_expanded_before_search ? m_ctrl->Expand(item) : m_ctrl->Collapse(item);
+}
+
+wxDataViewItemArray ParamsNode::GetEnabledChildren() {
+    wxDataViewItemArray array;
+    for (const std::unique_ptr<ParamsNode>& child : m_children)
+        if (child->IsEnabled())
+            array.Add(wxDataViewItem(child.get()));
+    return array;
+}
+
 
 // ----------------------------------------------------------------------------
 //                  ParamsModel
@@ -532,7 +607,7 @@ ParamsModel::ParamsModel()
 wxDataViewItem ParamsModel::AppendGroup(const wxString&    group_name,
                                         const std::string& icon_name)
 {
-    m_group_nodes.emplace_back(std::make_unique<ParamsNode>(group_name, icon_name));
+    m_group_nodes.emplace_back(std::make_unique<ParamsNode>(group_name, icon_name, m_ctrl));
 
     wxDataViewItem parent(nullptr);
     wxDataViewItem child((void*)m_group_nodes.back().get());
@@ -550,7 +625,7 @@ wxDataViewItem ParamsModel::AppendSubGroup(wxDataViewItem       parent,
     if (!parent_node)
         return wxDataViewItem(0);
 
-    parent_node->Append(std::make_unique<ParamsNode>(parent_node, sub_group_name, icon_name));
+    parent_node->Append(std::make_unique<ParamsNode>(parent_node, sub_group_name, icon_name, m_ctrl));
     const wxDataViewItem  sub_group_item((void*)parent_node->GetChildren().back().get());
 
     ItemAdded(parent, sub_group_item);
@@ -565,7 +640,7 @@ wxDataViewItem ParamsModel::AppendParam(wxDataViewItem      parent,
     if (!parent_node)
         return wxDataViewItem(0);
 
-    parent_node->Append(std::make_unique<ParamsNode>(parent_node, param_type, param_key));
+    parent_node->Append(std::make_unique<ParamsNode>(parent_node, param_type, param_key, m_ctrl));
 
     const wxDataViewItem  child_item((void*)parent_node->GetChildren().back().get());
 
@@ -603,6 +678,34 @@ std::string ParamsModel::GetTopLevelCategory(wxDataViewItem item)
     return std::string();
 }
 
+void ParamsModel::RefreshSearch(const wxString& search_text)
+{
+    if (!m_currently_searching) { // if not currently searching, save expansion state for all items
+        for (const auto& node : m_group_nodes)
+            node->StartSearch();
+        m_currently_searching = true;
+    }
+
+    for (const auto& node : m_group_nodes)
+        node->RefreshSearch(search_text); //Enable/Disable node based on search
+
+    Cleared(); //Reload the model into the control
+
+    for (const auto& node : m_group_nodes) // (re)expand all
+        m_ctrl->ExpandChildren(wxDataViewItem(node.get()));
+}
+
+void ParamsModel::FinishSearch()
+{
+    RefreshSearch("");
+    Cleared();
+    if (m_currently_searching) {
+        for (const auto& node : m_group_nodes)
+            node->FinishSearch();
+        m_currently_searching = false;
+    }
+}
+
 wxDataViewItem ParamsModel::Delete(const wxDataViewItem& item)
 {
     auto ret_item = wxDataViewItem(nullptr);
@@ -723,12 +826,14 @@ unsigned int ParamsModel::GetChildren(const wxDataViewItem& parent, wxDataViewIt
 
     if (parent_node == nullptr) {
         for (const auto& group : m_group_nodes)
-            array.Add(wxDataViewItem((void*)group.get()));
+            if (group->IsEnabled())
+                array.Add(wxDataViewItem((void*)group.get()));
     }
     else  {
         const ParamsNodePtrArray& children = parent_node->GetChildren();
         for (const std::unique_ptr<ParamsNode>& child : children)
-            array.Add(wxDataViewItem((void*)child.get()));
+            if (child->IsEnabled())
+                array.Add(wxDataViewItem((void*)child.get()));
     }
 
     return array.Count();
diff --git a/src/slic3r/GUI/EditGCodeDialog.hpp b/src/slic3r/GUI/EditGCodeDialog.hpp
index 9d29282dc82..43850c8f26d 100644
--- a/src/slic3r/GUI/EditGCodeDialog.hpp
+++ b/src/slic3r/GUI/EditGCodeDialog.hpp
@@ -10,6 +10,7 @@
 #include "wxExtensions.hpp"
 #include "libslic3r/Preset.hpp"
 #include "libslic3r/PrintConfig.hpp"
+#include <wx/srchctrl.h>
 
 class wxListBox;
 class wxTextCtrl;
@@ -27,11 +28,12 @@ class ParamsViewCtrl;
 
 class EditGCodeDialog : public DPIDialog
 {
-    ParamsViewCtrl*     m_params_list   {nullptr};
-    ScalableButton*     m_add_btn       {nullptr};
-    wxTextCtrl*         m_gcode_editor  {nullptr};
-    wxStaticText*       m_param_label   {nullptr};
-    wxStaticText*       m_param_description {nullptr};
+    ParamsViewCtrl*   m_params_list   {nullptr};
+    ScalableButton*   m_add_btn       {nullptr};
+    wxTextCtrl*       m_gcode_editor  {nullptr};
+    wxStaticText*     m_param_label   {nullptr};
+    wxStaticText*     m_param_description {nullptr};
+    wxSearchCtrl*     m_search_bar   {nullptr};
 
     ReadOnlySlicingStatesConfigDef  cgp_ro_slicing_states_config_def;
     ReadWriteSlicingStatesConfigDef cgp_rw_slicing_states_config_def;
@@ -48,6 +50,7 @@ class EditGCodeDialog : public DPIDialog
     ~EditGCodeDialog();
 
     std::string get_edited_gcode() const;
+    void        on_search_update();
 
     void init_params_list(const std::string& custom_gcode_name);
     wxDataViewItem add_presets_placeholders();
@@ -93,6 +96,7 @@ class ParamsNode
 {
     ParamsNode*         m_parent{ nullptr };
     ParamsNodePtrArray  m_children;
+    wxDataViewCtrl*     m_ctrl;
 
     ParamType           m_param_type{ ParamType::Undef };
 
@@ -106,6 +110,8 @@ class ParamsNode
     // AND the classical node was removed (a new node temporary without children
     // would be added to the control)
     bool                m_container{ true };
+    bool                m_expanded_before_search{false};
+    bool                m_enabled{true};
 
 public:
 
@@ -119,25 +125,36 @@ class ParamsNode
     wxString    text;
 
     // Group params(root) node
-    ParamsNode(const wxString& group_name, const std::string& icon_name);
+    ParamsNode(const wxString& group_name, const std::string& icon_name, wxDataViewCtrl* ctrl);
 
     // sub SlicingState node
     ParamsNode(ParamsNode*          parent,
                const wxString&      sub_group_name,
-               const std::string&   icon_name);
+               const std::string&   icon_name,
+               wxDataViewCtrl* ctrl);
 
     // parametre node
     ParamsNode( ParamsNode*         parent, 
                 ParamType           param_type,
-                const std::string&  param_key);
+                const std::string&  param_key,
+                wxDataViewCtrl* ctrl);
 
     bool             IsContainer()      const { return m_container; }
     bool             IsGroupNode()      const { return m_parent == nullptr; }
     bool             IsParamNode()      const { return m_param_type != ParamType::Undef; }
     void             SetContainer(bool is_container) { m_container = is_container; }
 
+    bool IsEnabled() { return m_enabled; }
+    void Enable(bool enable = true) { m_enabled = enable; }
+    void Disable() { Enable(false); }
+
+    void StartSearch();
+    void RefreshSearch(const wxString& search_text);
+    void FinishSearch();
+
     ParamsNode* GetParent() { return m_parent; }
     ParamsNodePtrArray& GetChildren() { return m_children; }
+    wxDataViewItemArray GetEnabledChildren();
 
     void Append(std::unique_ptr<ParamsNode> child) { m_children.emplace_back(std::move(child)); }
 };
@@ -149,8 +166,9 @@ class ParamsNode
 
 class ParamsModel : public wxDataViewModel
 {
-    ParamsNodePtrArray  m_group_nodes;
-    wxDataViewCtrl*     m_ctrl{ nullptr };
+    ParamsNodePtrArray m_group_nodes;
+    wxDataViewCtrl*    m_ctrl{ nullptr };
+    bool               m_currently_searching{false};
 
 public:
 
@@ -176,6 +194,9 @@ class ParamsModel : public wxDataViewModel
     std::string     GetParamKey(wxDataViewItem item);
     std::string     GetTopLevelCategory(wxDataViewItem item);
 
+    void RefreshSearch(const wxString& search_text);
+    void FinishSearch();
+
     void            Clear();
 
     wxDataViewItem  GetParent(const wxDataViewItem& item) const override;

From 8de9d97cd8ef75b687654611e8e4784cdc7c5097 Mon Sep 17 00:00:00 2001
From: Ocraftyone <Ocraftyone@users.noreply.github.com>
Date: Wed, 10 Jan 2024 07:22:36 -0500
Subject: [PATCH 30/39] Add search term highlighting to EditGCodeDialog

Now leaves text stored in ParamsNode un-formatted and uses flags to determine the formatting. The GetFormattedText function now returns the markup text.
---
 src/slic3r/GUI/EditGCodeDialog.cpp | 44 ++++++++++++++++++++++++------
 src/slic3r/GUI/EditGCodeDialog.hpp | 11 ++++----
 2 files changed, 41 insertions(+), 14 deletions(-)

diff --git a/src/slic3r/GUI/EditGCodeDialog.cpp b/src/slic3r/GUI/EditGCodeDialog.cpp
index def0fcd37f4..a0b23f879f5 100644
--- a/src/slic3r/GUI/EditGCodeDialog.cpp
+++ b/src/slic3r/GUI/EditGCodeDialog.cpp
@@ -338,7 +338,7 @@ void EditGCodeDialog::selection_changed(wxDataViewEvent& evt)
         // Orca: move below checking for def in custom defined gcode placeholders
         // This allows custom placeholders to override the default ones for this dialog
         // Override custom def if selection is within the preset category
-        if (!def || unbold(m_params_list->GetSelectedTopLevelCategory()) == "Presets") {
+        if (!def || m_params_list->GetSelectedTopLevelCategory() == "Presets") {
             const auto& full_config = wxGetApp().preset_bundle->full_config();
             if (const ConfigDef* config_def = full_config.def(); config_def && config_def->has(opt_key)) {
                 def = config_def->get(opt_key);
@@ -510,6 +510,13 @@ static void make_bold(wxString& str)
 #endif
 }
 
+static void highlight(wxString& str)
+{
+#if defined(SUPPORTS_MARKUP) && !defined(__APPLE__)
+    str = format_wxstr("<span bgcolor=\"#009688\">%1%</span>", str);
+#endif
+}
+
 // ----------------------------------------------------------------------------
 //                  ParamsModelNode: a node inside ParamsModel
 // ----------------------------------------------------------------------------
@@ -518,8 +525,8 @@ ParamsNode::ParamsNode(const wxString& group_name, const std::string& icon_name,
 : icon_name(icon_name)
 , text(group_name)
 , m_ctrl(ctrl)
+, m_bold(true)
 {
-    make_bold(text);
 }
 
 ParamsNode::ParamsNode( ParamsNode *        parent,
@@ -530,8 +537,8 @@ ParamsNode::ParamsNode( ParamsNode *        parent,
     , icon_name(icon_name)
     , text(sub_group_name)
     , m_ctrl(ctrl)
+    , m_bold(true)
 {
-    make_bold(text);
 }
 
 ParamsNode::ParamsNode( ParamsNode*         parent,
@@ -553,6 +560,22 @@ ParamsNode::ParamsNode( ParamsNode*         parent,
     icon_name = ParamsInfo.at(param_type);
 }
 
+wxString ParamsNode::GetFormattedText()
+{
+    wxString formatted_text(text);
+    if (m_highlight_index) {
+        wxString substr = formatted_text.substr(m_highlight_index->first, m_highlight_index->second);
+        formatted_text  = formatted_text.Remove(m_highlight_index->first, m_highlight_index->second);
+        highlight(substr);
+        formatted_text.insert(m_highlight_index->first, substr);
+    }
+
+    if (m_bold)
+        make_bold(formatted_text);
+
+    return formatted_text;
+}
+
 void ParamsNode::StartSearch()
 {
     const wxDataViewItem item(this);
@@ -569,10 +592,12 @@ void ParamsNode::RefreshSearch(const wxString& search_text)
             child->RefreshSearch(search_text);
 
     if (GetEnabledChildren().empty())
-        if (IsParamNode() && text.find(search_text) != wxString::npos)
+        if (auto pos = text.find(search_text); IsParamNode() && pos != wxString::npos) {
+            m_highlight_index = make_unique<pair<int, int>>(pos, search_text.Len());
             Enable();
-        else
+        } else {
             Disable();
+        }
     else
         Enable();
 }
@@ -580,6 +605,7 @@ void ParamsNode::RefreshSearch(const wxString& search_text)
 void ParamsNode::FinishSearch()
 {
     Enable();
+    m_highlight_index.reset();
     const wxDataViewItem item(this);
     if (!GetChildren().empty())
         for (const auto& child : GetChildren())
@@ -760,15 +786,15 @@ void ParamsModel::GetValue(wxVariant& variant, const wxDataViewItem& item, unsig
     ParamsNode* node = static_cast<ParamsNode*>(item.GetID());
     if (col == (unsigned int)0)
 #ifdef __linux__
-//        variant << wxDataViewIconText(node->text, get_bmp_bundle(node->icon_name)->GetIconFor(m_ctrl->GetParent())); //TODO: update to bundle with wx update
+//        variant << wxDataViewIconText(node->GetFormattedText(), get_bmp_bundle(node->icon_name)->GetIconFor(m_ctrl->GetParent())); //TODO: update to bundle with wx update
     {
         wxIcon icon;
         icon.CopyFromBitmap(create_scaled_bitmap(node->icon_name, m_ctrl->GetParent()));
-        wxDataViewIconText(node->text, icon);
+        wxDataViewIconText(node->GetFormattedText(), icon);
     }
 #else
-//        variant << DataViewBitmapText(node->text, get_bmp_bundle(node->icon_name)->GetBitmapFor(m_ctrl->GetParent())); //TODO: update to bundle with wx update
-        variant << DataViewBitmapText(node->text, create_scaled_bitmap(node->icon_name, m_ctrl->GetParent()));
+//        variant << DataViewBitmapText(node->GetFormattedText(), get_bmp_bundle(node->icon_name)->GetBitmapFor(m_ctrl->GetParent())); //TODO: update to bundle with wx update
+        variant << DataViewBitmapText(node->GetFormattedText(), create_scaled_bitmap(node->icon_name, m_ctrl->GetParent()));
 #endif //__linux__
     else
         wxLogError("DiffModel::GetValue: wrong column %d", col);
diff --git a/src/slic3r/GUI/EditGCodeDialog.hpp b/src/slic3r/GUI/EditGCodeDialog.hpp
index 43850c8f26d..28cd5809f93 100644
--- a/src/slic3r/GUI/EditGCodeDialog.hpp
+++ b/src/slic3r/GUI/EditGCodeDialog.hpp
@@ -113,6 +113,10 @@ class ParamsNode
     bool                m_expanded_before_search{false};
     bool                m_enabled{true};
 
+    bool                 m_bold{false};
+    // first is pos, second is length
+    std::unique_ptr<std::pair<int, int>> m_highlight_index{nullptr};
+
 public:
 
 #ifdef __linux__
@@ -139,6 +143,8 @@ class ParamsNode
                 const std::string&  param_key,
                 wxDataViewCtrl* ctrl);
 
+    wxString GetFormattedText();
+
     bool             IsContainer()      const { return m_container; }
     bool             IsGroupNode()      const { return m_parent == nullptr; }
     bool             IsParamNode()      const { return m_param_type != ParamType::Undef; }
@@ -257,11 +263,6 @@ class ParamsViewCtrl : public wxDataViewCtrl
     void    set_em_unit(int em) { m_em_unit = em; }
 };
 
-static std::string unbold(const std::string& text) {
-    return text.substr(text.find("<b>")+3, text.find("</b>")-3);
-}
-
-
 } // namespace GUI
 } // namespace Slic3r
 

From 3252e1c228405e40784dbc1538545c64f972fb7e Mon Sep 17 00:00:00 2001
From: Ocraftyone <Ocraftyone@users.noreply.github.com>
Date: Wed, 10 Jan 2024 21:33:53 -0500
Subject: [PATCH 31/39] Append extra parameters from preset

If an option is not under a category in the tab but is part of the preset, it is added to the dataview.
---
 src/slic3r/GUI/EditGCodeDialog.cpp | 34 ++++++++++++++++++++----------
 1 file changed, 23 insertions(+), 11 deletions(-)

diff --git a/src/slic3r/GUI/EditGCodeDialog.cpp b/src/slic3r/GUI/EditGCodeDialog.cpp
index a0b23f879f5..989e58e6142 100644
--- a/src/slic3r/GUI/EditGCodeDialog.cpp
+++ b/src/slic3r/GUI/EditGCodeDialog.cpp
@@ -243,9 +243,16 @@ void EditGCodeDialog::init_params_list(const std::string& custom_gcode_name)
 
 wxDataViewItem EditGCodeDialog::add_presets_placeholders()
 {
-    const bool                  is_fff           = wxGetApp().plater()->printer_technology() == ptFFF;
-    const auto&full_config = wxGetApp().preset_bundle->full_config();
-    const auto& tab_list = wxGetApp().tabs_list;
+    auto get_set_from_vec = [](const std::vector<std::string>&vec) {
+        return std::set(vec.begin(), vec.end());
+    };
+
+    const bool  is_fff      = wxGetApp().plater()->printer_technology() == ptFFF;
+    const std::set<std::string> print_options    = get_set_from_vec(is_fff ? Preset::print_options()    : Preset::sla_print_options());
+    const std::set<std::string> material_options = get_set_from_vec(is_fff ? Preset::filament_options() : Preset::sla_material_options());
+    const std::set<std::string> printer_options  = get_set_from_vec(is_fff ? Preset::printer_options()  : Preset::sla_printer_options());
+    const auto& full_config = wxGetApp().preset_bundle->full_config();
+    const auto& tab_list    = wxGetApp().tabs_list;
 
     Tab* tab_print;
     Tab* tab_filament;
@@ -261,31 +268,36 @@ wxDataViewItem EditGCodeDialog::add_presets_placeholders()
 
 
     // Orca: create subgroups from the pages of the tabs
-    auto init_from_tab = [this, full_config](wxDataViewItem parent, Tab* tab){
+    auto init_from_tab = [this, full_config](wxDataViewItem parent, Tab* tab, const set<string>& preset_keys){
+        set extra_keys(preset_keys);
         for (const auto& page : tab->m_pages) {
             wxDataViewItem subgroup = m_params_list->AppendSubGroup(parent, page->title(), "empty");
-            std::vector<std::string> opt_keys;
+            std::set<std::string> opt_keys;
             for (const auto& optgroup : page->m_optgroups)
                 for (const auto& opt : optgroup->opt_map())
-                    opt_keys.push_back(opt.first);
+                    opt_keys.emplace(opt.first);
 
-            std::sort(opt_keys.begin(), opt_keys.end());
             for (const auto& opt_key : opt_keys)
-                if (const ConfigOption* optptr = full_config.optptr(opt_key))
+                if (const ConfigOption* optptr = full_config.optptr(opt_key)) {
+                    extra_keys.erase(opt_key);
                     m_params_list->AppendParam(subgroup, optptr->is_scalar() ? ParamType::Scalar : ParamType::Vector, opt_key);
+                }
         }
+        for (auto opt_key : extra_keys)
+            if (const ConfigOption* optptr = full_config.optptr(opt_key))
+                m_params_list->AppendParam(parent, optptr->is_scalar() ? ParamType::Scalar : ParamType::Vector, opt_key);
     };
 
     wxDataViewItem group = m_params_list->AppendGroup(_L("Presets"), "cog");
 
     wxDataViewItem print = m_params_list->AppendSubGroup(group, _L("Print settings"), "cog");
-    init_from_tab(print, tab_print);
+    init_from_tab(print, tab_print, print_options);
 
     wxDataViewItem material = m_params_list->AppendSubGroup(group, _(is_fff ? L("Filament settings") : L("SLA Materials settings")), is_fff ? "filament" : "resin");
-    init_from_tab(material, tab_filament);
+    init_from_tab(material, tab_filament, material_options);
 
     wxDataViewItem printer = m_params_list->AppendSubGroup(group, _L("Printer settings"), is_fff ? "printer" : "sla_printer");
-    init_from_tab(printer, tab_printer);
+    init_from_tab(printer, tab_printer, printer_options);
 
     return group;
 }

From aef74ab0050783bfaf7d67f531dd6877008e843c Mon Sep 17 00:00:00 2001
From: Ocraftyone <Ocraftyone@users.noreply.github.com>
Date: Thu, 11 Jan 2024 06:03:20 -0500
Subject: [PATCH 32/39] Hardcode Location of Add Button

Hardcoding it prevents the add button from jumping around when switching between parameters with single-line and multi-line descriptions
---
 src/slic3r/GUI/EditGCodeDialog.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/slic3r/GUI/EditGCodeDialog.cpp b/src/slic3r/GUI/EditGCodeDialog.cpp
index 989e58e6142..ab0e68a6452 100644
--- a/src/slic3r/GUI/EditGCodeDialog.cpp
+++ b/src/slic3r/GUI/EditGCodeDialog.cpp
@@ -86,7 +86,7 @@ EditGCodeDialog::EditGCodeDialog(wxWindow* parent, const std::string& key, const
     wxGetApp().UpdateDarkUI(m_gcode_editor);
 
     grid_sizer->Add(param_sizer,  1, wxEXPAND);
-    grid_sizer->Add(m_add_btn,      0, wxALIGN_CENTER_VERTICAL);
+    grid_sizer->Add(m_add_btn,      0, wxTOP, m_params_list->GetSize().y/2);
     grid_sizer->Add(m_gcode_editor, 2, wxEXPAND);
 
     grid_sizer->AddGrowableRow(0, 1);

From 7dd7b301e1a5517cc968d40dbe819eeddba90050 Mon Sep 17 00:00:00 2001
From: Ocraftyone <Ocraftyone@users.noreply.github.com>
Date: Thu, 11 Jan 2024 06:46:04 -0500
Subject: [PATCH 33/39] Remove Resizeable Border

Helps with previous commit
DataView currently doesn't resize vertically
Also, at the moment, the resize grabber is not respecting dark mode and this solves that too.
---
 src/slic3r/GUI/EditGCodeDialog.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/slic3r/GUI/EditGCodeDialog.cpp b/src/slic3r/GUI/EditGCodeDialog.cpp
index ab0e68a6452..77a4ffbadb8 100644
--- a/src/slic3r/GUI/EditGCodeDialog.cpp
+++ b/src/slic3r/GUI/EditGCodeDialog.cpp
@@ -35,7 +35,7 @@ namespace GUI {
 //------------------------------------------
 
 EditGCodeDialog::EditGCodeDialog(wxWindow* parent, const std::string& key, const std::string& value) :
-    DPIDialog(parent, wxID_ANY, format_wxstr(_L("Edit Custom G-code (%1%)"), key), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER)
+    DPIDialog(parent, wxID_ANY, format_wxstr(_L("Edit Custom G-code (%1%)"), key), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE/* | wxRESIZE_BORDER*/)
 {
     SetFont(wxGetApp().normal_font());
     SetBackgroundColour(*wxWHITE);

From 595f707f22b5585f4895db4e83558dfdce2ac713 Mon Sep 17 00:00:00 2001
From: Ocraftyone <Ocraftyone@users.noreply.github.com>
Date: Sun, 21 Jan 2024 00:40:52 +0000
Subject: [PATCH 34/39] Fix linux crashing when opening EditGcodeDialog

---
 src/slic3r/GUI/EditGCodeDialog.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/slic3r/GUI/EditGCodeDialog.cpp b/src/slic3r/GUI/EditGCodeDialog.cpp
index 77a4ffbadb8..54ec6db8bc6 100644
--- a/src/slic3r/GUI/EditGCodeDialog.cpp
+++ b/src/slic3r/GUI/EditGCodeDialog.cpp
@@ -802,7 +802,7 @@ void ParamsModel::GetValue(wxVariant& variant, const wxDataViewItem& item, unsig
     {
         wxIcon icon;
         icon.CopyFromBitmap(create_scaled_bitmap(node->icon_name, m_ctrl->GetParent()));
-        wxDataViewIconText(node->GetFormattedText(), icon);
+        variant << wxDataViewIconText(node->GetFormattedText(), icon);
     }
 #else
 //        variant << DataViewBitmapText(node->GetFormattedText(), get_bmp_bundle(node->icon_name)->GetBitmapFor(m_ctrl->GetParent())); //TODO: update to bundle with wx update

From 7c02b5c9f4eb48768935990ac8e906b7f813ed14 Mon Sep 17 00:00:00 2001
From: Ocraftyone <Ocraftyone@users.noreply.github.com>
Date: Sun, 21 Jan 2024 14:11:06 -0500
Subject: [PATCH 35/39] Revert to BBL get_line function

---
 src/slic3r/GUI/OptionsGroup.cpp | 4 ++--
 src/slic3r/GUI/OptionsGroup.hpp | 9 +--------
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/src/slic3r/GUI/OptionsGroup.cpp b/src/slic3r/GUI/OptionsGroup.cpp
index 65858b0852c..81c1a4b61c6 100644
--- a/src/slic3r/GUI/OptionsGroup.cpp
+++ b/src/slic3r/GUI/OptionsGroup.cpp
@@ -218,7 +218,7 @@ void OptionsGroup::append_line(const Line& line)
         m_options_mode.push_back(option_set[0].opt.mode);
 }
 
-/*//BBS: get line for opt_key
+//BBS: get line for opt_key
 Line* OptionsGroup::get_line(const std::string& opt_key)
 {
     for (auto& l : m_lines)
@@ -230,7 +230,7 @@ Line* OptionsGroup::get_line(const std::string& opt_key)
     }
 
     return nullptr;
-}*/
+}
 
 void OptionsGroup::append_separator()
 {
diff --git a/src/slic3r/GUI/OptionsGroup.hpp b/src/slic3r/GUI/OptionsGroup.hpp
index eea187fa5fc..1ec5fdc1b3a 100644
--- a/src/slic3r/GUI/OptionsGroup.hpp
+++ b/src/slic3r/GUI/OptionsGroup.hpp
@@ -140,7 +140,7 @@ class OptionsGroup {
 	// create controls for the option group
 	void		activate_line(Line& line);
 	//BBS: get line for opt_key
-//	Line* get_line(const std::string& opt_key);
+	Line* get_line(const std::string& opt_key);
 
 	// create all controls for the option group from the m_lines
 	bool		activate(std::function<void()> throw_if_canceled = [](){}, int horiz_alignment = wxALIGN_LEFT);
@@ -157,13 +157,6 @@ class OptionsGroup {
 							return m_fields.at(id).get();
     }
 
-    inline Line*	get_line(const t_config_option_key& id) {
-		for (Line& line : m_lines)
-			if (line.has_only_option(id))
-				return &line;
-		return nullptr;
-    }
-
 	bool			set_value(const t_config_option_key& id, const boost::any& value, bool change_event = false) {
 							if (m_fields.find(id) == m_fields.end()) return false;
 							m_fields.at(id)->set_value(value, change_event);

From 1f00fe92d20667683d33f8564fbdf0e0506add32 Mon Sep 17 00:00:00 2001
From: SoftFever <softfeverever@gmail.com>
Date: Wed, 24 Jan 2024 19:31:18 +0800
Subject: [PATCH 36/39] nightly release (#3792)

* nightly release
---
 .github/workflows/build_orca.yml        | 48 +++++++++++++++++++++++--
 CMakeLists.txt                          |  2 +-
 README.md                               | 33 +++++++++++------
 src/platform/unix/BuildLinuxImage.sh.in |  2 +-
 src/platform/unix/build_appimage.sh.in  |  2 +-
 5 files changed, 72 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/build_orca.yml b/.github/workflows/build_orca.yml
index 1e8962d80ea..d6bd6c25f67 100644
--- a/.github/workflows/build_orca.yml
+++ b/.github/workflows/build_orca.yml
@@ -130,6 +130,17 @@ jobs:
           name: OrcaSlicer_Mac_${{inputs.arch}}_${{ env.ver }}
           path: ${{ github.workspace }}/OrcaSlicer_Mac_${{inputs.arch}}_${{ env.ver }}.dmg
 
+      - name: Deploy Mac release
+        if: github.ref == 'refs/heads/main' && inputs.os == 'macos-12'
+        uses: WebFreak001/deploy-nightly@v3.0.0
+        with:
+          upload_url: https://uploads.github.com/repos/SoftFever/OrcaSlicer/releases/137995723/assets{?name,label} 
+          release_id: 137995723 
+          asset_path: ${{ github.workspace }}/OrcaSlicer_Mac_${{inputs.arch}}_${{ env.ver }}.dmg
+          asset_name: OrcaSlicer_Mac_${{inputs.arch}}_${{ env.ver }}.dmg
+          asset_content_type: application/octet-stream 
+          max_releases: 1 # optional, if there are more releases than this matching the asset_name, the oldest ones are going to be deleted
+
 # Windows
       - name: setup MSVC
         if: inputs.os == 'windows-latest'
@@ -185,6 +196,28 @@ jobs:
           name: PDB
           path: ${{ github.workspace }}/build/src/Release/Debug_PDB_${{ env.ver }}_for_developers_only.7z
 
+      - name: Deploy Windows release portable
+        if: github.ref == 'refs/heads/main' && inputs.os == 'windows-latest'
+        uses: WebFreak001/deploy-nightly@v3.0.0
+        with:
+          upload_url: https://uploads.github.com/repos/SoftFever/OrcaSlicer/releases/137995723/assets{?name,label} 
+          release_id: 137995723 
+          asset_path: ${{ github.workspace }}/build/OrcaSlicer_Windows_${{ env.ver }}_portable.zip
+          asset_name: OrcaSlicer_Windows_${{ env.ver }}_portable.zip
+          asset_content_type: application/x-zip-compressed 
+          max_releases: 1 
+
+      - name: Deploy Windows release installer
+        if: github.ref == 'refs/heads/main' && inputs.os == 'windows-latest'
+        uses: WebFreak001/deploy-nightly@v3.0.0
+        with:
+          upload_url: https://uploads.github.com/repos/SoftFever/OrcaSlicer/releases/137995723/assets{?name,label} 
+          release_id: 137995723 
+          asset_path: ${{ github.workspace }}/build/OrcaSlicer_Windows_Installer_${{ env.ver }}.exe
+          asset_name: OrcaSlicer_Windows_Installer_${{ env.ver }}.exe
+          asset_content_type: application/x-msdownload
+          max_releases: 1 
+
 # Ubuntu
       - name: Install dependencies
         if: inputs.os == 'ubuntu-20.04'
@@ -211,11 +244,22 @@ jobs:
         shell: bash
         run: |
           ./BuildLinux.sh -isr
-          chmod +x ./build/OrcaSlicer_ubu64.AppImage
+          chmod +x ./build/OrcaSlicer_Linux_${{ env.ver }}.AppImage
         
       - name: Upload artifacts Ubuntu
         if: inputs.os == 'ubuntu-20.04'
         uses: actions/upload-artifact@v3
         with:
           name: OrcaSlicer_Linux_${{ env.ver }}
-          path: './build/OrcaSlicer_ubu64.AppImage'
+          path: './build/OrcaSlicer_Linux_${{ env.ver }}.AppImage'
+
+      - name: Deploy Ubuntu release
+        if: github.ref == 'refs/heads/main' && inputs.os == 'ubuntu-20.04'
+        uses: WebFreak001/deploy-nightly@v3.0.0
+        with:
+          upload_url: https://uploads.github.com/repos/SoftFever/OrcaSlicer/releases/137995723/assets{?name,label} 
+          release_id: 137995723 
+          asset_path: ./build/OrcaSlicer_Linux_${{ env.ver }}.AppImage
+          asset_name: OrcaSlicer_Linux_${{ env.ver }}.AppImage
+          asset_content_type: application/octet-stream
+          max_releases: 1 # optional, if there are more releases than this matching the asset_name, the oldest ones are going to be deleted
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4640034c41d..190e9e0bdcb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -772,7 +772,7 @@ set (CPACK_PACKAGE_VENDOR "SoftFever")
 set (CPACK_PACKAGE_VERSION_MAJOR "${ORCA_VERSION_MAJOR}")
 set (CPACK_PACKAGE_VERSION_MINOR "${ORCA_VERSION_MINOR}")
 set (CPACK_PACKAGE_VERSION_PATCH "${ORCA_VERSION_PATCH}")
-set (CPACK_PACKAGE_FILE_NAME "OrcaSlicer_Windows_Installer_${SoftFever_VERSION}")
+set (CPACK_PACKAGE_FILE_NAME "OrcaSlicer_Windows_Installer_V${SoftFever_VERSION}")
 set (CPACK_PACKAGE_DESCRIPTION_SUMMARY "Orca Slicer is an open source slicer for FDM printers")
 set (CPACK_PACKAGE_HOMEPAGE_URL "https://github.com/SoftFever/OrcaSlicer")
 set (CPACK_PACKAGE_INSTALL_DIRECTORY ${CPACK_PACKAGE_NAME})
diff --git a/README.md b/README.md
index 6a11fd1ecb7..f37d5a2d03f 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Build all](https://github.com/SoftFever/OrcaSlicer/actions/workflows/build_all.yml/badge.svg?branch=main)](https://github.com/SoftFever/OrcaSlicer/actions/workflows/build_all.yml)
 # Orca Slicer     
 Orca Slicer is an open source slicer for FDM printers.   
-You can download Orca Slicer here: [github releases page](https://github.com/SoftFever/OrcaSlicer/releases/).  
+
 ![discord-mark-blue](https://github.com/SoftFever/OrcaSlicer/assets/103989404/b97d5ffc-072d-4d0a-bbda-e67ef373876f) Join community: [OrcaSlicer Official Discord Server](https://discord.gg/P4VE9UY9gJ)   
 
 # Main features
@@ -13,22 +13,27 @@ You can download Orca Slicer here: [github releases page](https://github.com/Sof
 - More granular controls
 - More features can be found in [change notes](https://github.com/SoftFever/OrcaSlicer/releases/)  
 
-### Some background
-OrcaSlicer is fork of Bambu Studio  
-It was previously known as BambuStudio-SoftFever  
-Bambu Studio is forked from [PrusaSlicer](https://github.com/prusa3d/PrusaSlicer) by Prusa Research, which is from [Slic3r](https://github.com/Slic3r/Slic3r) by Alessandro Ranellucci and the RepRap community. 
-Orca Slicer incorporates a lot of features from SuperSlicer by @supermerill
-Orca Slicer's logo is designed by community member Justin Levine(@freejstnalxndr)  
+
+# Download
+
+### Stable Release
+📥 **[Download the Latest Stable Release](https://github.com/SoftFever/OrcaSlicer/releases/latest)**  
+Visit our GitHub Releases page for the latest stable version of Orca Slicer, recommended for most users.
+
+### Nightly Builds
+🌙 **[Download the Latest Nightly Build](https://github.com/SoftFever/OrcaSlicer/releases/tag/nightly-builds)**  
+Explore the latest developments in Orca Slicer with our nightly builds. Feedback on these versions is highly appreciated.
+
 
 # How to install
 **Windows**: 
 1.  Download the installer for your preferred version from the [releases page](https://github.com/SoftFever/OrcaSlicer/releases).
     - *For convenience there is also a portable build available.*
     - *If you have troubles to run the build, you might need to install following runtimes:*
-      - [MicrosoftEdgeWebView2RuntimeInstallerX64](https://github.com/SoftFever/BambuStudio-SoftFever/releases/download/v1.0.10-sf2/MicrosoftEdgeWebView2RuntimeInstallerX64.exe)
+      - [MicrosoftEdgeWebView2RuntimeInstallerX64](https://github.com/SoftFever/OrcaSlicer/releases/download/v1.0.10-sf2/MicrosoftEdgeWebView2RuntimeInstallerX64.exe)
           - [Details of this runtime](https://aka.ms/webview2)
           - [Alternative Download Link Hosted by Microsoft](https://go.microsoft.com/fwlink/p/?LinkId=2124703)
-      - [vcredist2019_x64](https://github.com/SoftFever/BambuStudio-SoftFever/releases/download/v1.0.10-sf2/vcredist2019_x64.exe)
+      - [vcredist2019_x64](https://github.com/SoftFever/OrcaSlicer/releases/download/v1.0.10-sf2/vcredist2019_x64.exe)
           -  [Alternative Download Link Hosted by Microsoft](https://aka.ms/vs/17/release/vc_redist.x64.exe)
           -  This file may already be available on your computer if you've installed visual studio.  Check the following location: `%VCINSTALLDIR%Redist\MSVC\v142`
 
@@ -55,7 +60,7 @@ Orca Slicer's logo is designed by community member Justin Levine(@freejstnalxndr
     
 **Linux(Ubuntu)**:
  1. If you run into trouble to execute it, try this command in terminal:  
-    `chmod +x /path_to_appimage/OrcaSlicer_ubu64.AppImage`
+    `chmod +x /path_to_appimage/OrcaSlicer_Linux.AppImage`
     
 # How to compile
 - Windows 64-bit  
@@ -126,6 +131,14 @@ Ko-fi supporters: [Backers list](https://github.com/SoftFever/OrcaSlicer/wiki/Or
 Support me  
 [![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/G2G5IP3CP)
 
+## Some background
+OrcaSlicer is originaly forked from Bambu Studio, it was previously known as BambuStudio-SoftFever.
+
+Bambu Studio is forked from [PrusaSlicer](https://github.com/prusa3d/PrusaSlicer) by Prusa Research, which is from [Slic3r](https://github.com/Slic3r/Slic3r) by Alessandro Ranellucci and the RepRap community. 
+Orca Slicer incorporates a lot of features from SuperSlicer by @supermerill
+Orca Slicer's logo is designed by community member Justin Levine(@freejstnalxndr)  
+
+
 # License
 Orca Slicer is licensed under the GNU Affero General Public License, version 3. Orca Slicer is based on Bambu Studio by BambuLab.
 
diff --git a/src/platform/unix/BuildLinuxImage.sh.in b/src/platform/unix/BuildLinuxImage.sh.in
index cd38112f063..be884619921 100644
--- a/src/platform/unix/BuildLinuxImage.sh.in
+++ b/src/platform/unix/BuildLinuxImage.sh.in
@@ -62,7 +62,7 @@ echo -n "Creating Appimage for distribution..."
     chmod +x ../build_appimage.sh
     ../build_appimage.sh
     popd
-    mv package/"@SLIC3R_APP_KEY@_ubu64.AppImage" "@SLIC3R_APP_KEY@_ubu64.AppImage"
+    mv package/"@SLIC3R_APP_KEY@_Linux_V@SoftFever_VERSION@.AppImage" "@SLIC3R_APP_KEY@_Linux_V@SoftFever_VERSION@.AppImage"
 #} &> $ROOT/Build.log # Capture all command output
 echo "done"
 fi
diff --git a/src/platform/unix/build_appimage.sh.in b/src/platform/unix/build_appimage.sh.in
index 8e67e8617e3..55581fc007d 100644
--- a/src/platform/unix/build_appimage.sh.in
+++ b/src/platform/unix/build_appimage.sh.in
@@ -2,7 +2,7 @@
 APPIMAGETOOLURL="https://github.com/AppImage/AppImageKit/releases/latest/download/appimagetool-x86_64.AppImage"
 
 
-APP_IMAGE="@SLIC3R_APP_KEY@_ubu64.AppImage"
+APP_IMAGE="@SLIC3R_APP_KEY@_Linux_V@SoftFever_VERSION@.AppImage"
 
 wget ${APPIMAGETOOLURL} -O ../appimagetool.AppImage
 chmod +x ../appimagetool.AppImage

From 73481da6da432d8b558f781aa607bc8115d0f5d6 Mon Sep 17 00:00:00 2001
From: Ryan Whipple <ryan_whipple@icloud.com>
Date: Wed, 24 Jan 2024 04:36:17 -0700
Subject: [PATCH 37/39] corrected printable_area (#3527)

* corrected printable_area

* adjusted to keep origin at 0x0
---
 .../Elegoo Neptune 4 Pro (0.2 nozzle).json    |   7 +-
 .../Elegoo Neptune 4 Pro (0.4 nozzle).json    |   7 +-
 .../Elegoo Neptune 4 Pro (0.6 nozzle).json    |  50 +++++--
 .../Elegoo Neptune 4 Pro (0.8 nozzle).json    | 128 ++++++++++++++----
 4 files changed, 142 insertions(+), 50 deletions(-)

diff --git a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Pro (0.2 nozzle).json b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Pro (0.2 nozzle).json
index 331408cc4e6..6b3bd4c8e33 100644
--- a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Pro (0.2 nozzle).json	
+++ b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Pro (0.2 nozzle).json	
@@ -14,14 +14,13 @@
 	"printer_variant": "0.2",
 	"printable_area": [
 		"0x0",
-		"225x0",
-		"225x225",
-		"0x225"
+		"235x0",
+		"235x230",
+		"0x230"
 	],
 	"printable_height": "265",
 	"nozzle_type": "hardened_steel",
 	"auxiliary_fan": "0",
-
 	"max_layer_height": [
 		"0.16"
 	],
diff --git a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Pro (0.4 nozzle).json b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Pro (0.4 nozzle).json
index dac4f610321..c4f6baebdb2 100644
--- a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Pro (0.4 nozzle).json	
+++ b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Pro (0.4 nozzle).json	
@@ -14,14 +14,13 @@
 	"printer_variant": "0.4",
 	"printable_area": [
 		"0x0",
-		"225x0",
-		"225x225",
-		"0x225"
+		"235x0",
+		"235x230",
+		"0x230"
 	],
 	"printable_height": "265",
 	"nozzle_type": "hardened_steel",
 	"auxiliary_fan": "0",
-
 	"max_layer_height": [
 		"0.32"
 	],
diff --git a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Pro (0.6 nozzle).json b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Pro (0.6 nozzle).json
index c60abcf5814..009e72604fc 100644
--- a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Pro (0.6 nozzle).json	
+++ b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Pro (0.6 nozzle).json	
@@ -8,29 +8,53 @@
 	"printer_model": "Elegoo Neptune 4 Pro",
 	"default_print_profile": "0.20mm Standard @Elegoo Neptune4Pro (0.6 nozzle)",
 	"gcode_flavor": "klipper",
-	"nozzle_diameter": ["0.6"],
+	"nozzle_diameter": [
+		"0.6"
+	],
 	"printer_variant": "0.6",
-	"printable_area": ["0x0", "225x0", "225x225", "0x225"],
+	"printable_area": [
+		"0x0",
+		"235x0",
+		"235x230",
+		"0x230"
+	],
 	"printable_height": "265",
 	"nozzle_type": "hardened_steel",
 	"auxiliary_fan": "0",
-
-	"max_layer_height": ["0.4"],
-	"min_layer_height": ["0.08"],
+	"max_layer_height": [
+		"0.4"
+	],
+	"min_layer_height": [
+		"0.08"
+	],
 	"printer_settings_id": "Elegoo",
-	"retraction_minimum_travel": ["1"],
-	"retract_before_wipe": ["85%"],
-	"retraction_length": ["2.5"],
-	"retraction_speed": ["60"],
-	"retract_length_toolchange": ["2"],
-	"deretraction_speed": ["45"],
+	"retraction_minimum_travel": [
+		"1"
+	],
+	"retract_before_wipe": [
+		"85%"
+	],
+	"retraction_length": [
+		"2.5"
+	],
+	"retraction_speed": [
+		"60"
+	],
+	"retract_length_toolchange": [
+		"2"
+	],
+	"deretraction_speed": [
+		"45"
+	],
 	"single_extruder_multi_material": "1",
 	"change_filament_gcode": "M600",
 	"machine_pause_gcode": "PAUSE",
-	"default_filament_profile": ["Elegoo Generic PLA @0.6 nozzle"],
+	"default_filament_profile": [
+		"Elegoo Generic PLA @0.6 nozzle"
+	],
 	"machine_start_gcode": ";ELEGOO NEPTUNE 4 PRO\nM220 S100 ;Set the feed speed to 100%\nM221 S100 ;Set the flow rate to 100%\nM104 S140\nM190 S[bed_temperature_initial_layer_single]\nG90\nG28 ;home\nG1 Z10 F300\nG1 X67.5 Y0 F6000\nG1 Z0 F300\nM109 S[nozzle_temperature_initial_layer]\nG92 E0 ;Reset Extruder\nG1 X67.5 Y0 Z0.4 F300 ;Move to start position\nG1 X167.5 E30 F400 ;Draw the first line\nG1 Z0.6 F120.0 ;Move to side a little\nG1 X162.5 F3000\nG92 E0 ;Reset Extruder",
 	"machine_end_gcode": ";PRINT END\nG91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-8 X5 Y5 Z3 F3000 ;Retract\nG90 ;Absolute positionning\nG1 X10 Y220 F6000;Finish print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\nM84 X Y E ;Disable all steppers but Z",
 	"before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\nG92 E0\n;[layer_z]\n\n",
 	"layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]",
 	"scan_first_layer": "0"
-}
+}
\ No newline at end of file
diff --git a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Pro (0.8 nozzle).json b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Pro (0.8 nozzle).json
index 9e4b916c796..adb4ec4a763 100644
--- a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Pro (0.8 nozzle).json	
+++ b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Pro (0.8 nozzle).json	
@@ -8,43 +8,113 @@
   "printer_model": "Elegoo Neptune 4 Pro",
   "gcode_flavor": "klipper",
   "default_print_profile": "0.20mm Standard @Elegoo Neptune4Pro (0.8 nozzle)",
-  "nozzle_diameter": ["0.8"],
+  "nozzle_diameter": [
+    "0.8"
+  ],
   "printer_variant": "0.8",
-  "printable_area": ["0x0", "225x0", "225x225", "0x225"],
+  "printable_area": [
+    "0x0",
+    "235x0",
+    "235x230",
+    "0x230"
+  ],
   "printable_height": "265",
   "nozzle_type": "hardened_steel",
   "auxiliary_fan": "0",
-  "machine_max_acceleration_e": ["5000", "5000"],
-  "machine_max_acceleration_extruding": ["20000", "20000"],
-  "machine_max_acceleration_retracting": ["5000", "5000"],
-  "machine_max_acceleration_travel": ["20000", "20000"],
-  "machine_max_acceleration_x": ["20000", "20000"],
-  "machine_max_acceleration_y": ["20000", "20000"],
-  "machine_max_acceleration_z": ["500", "200"],
-  "machine_max_speed_e": ["25", "25"],
-  "machine_max_speed_x": ["500", "200"],
-  "machine_max_speed_y": ["500", "200"],
-  "machine_max_speed_z": ["12", "12"],
-  "machine_max_jerk_e": ["2.5", "2.5"],
-  "machine_max_jerk_x": ["12", "12"],
-  "machine_max_jerk_y": ["12", "12"],
-  "machine_max_jerk_z": ["0.2", "0.4"],
-  "max_layer_height": ["0.6"],
-  "min_layer_height": ["0.08"],
+  "machine_max_acceleration_e": [
+    "5000",
+    "5000"
+  ],
+  "machine_max_acceleration_extruding": [
+    "20000",
+    "20000"
+  ],
+  "machine_max_acceleration_retracting": [
+    "5000",
+    "5000"
+  ],
+  "machine_max_acceleration_travel": [
+    "20000",
+    "20000"
+  ],
+  "machine_max_acceleration_x": [
+    "20000",
+    "20000"
+  ],
+  "machine_max_acceleration_y": [
+    "20000",
+    "20000"
+  ],
+  "machine_max_acceleration_z": [
+    "500",
+    "200"
+  ],
+  "machine_max_speed_e": [
+    "25",
+    "25"
+  ],
+  "machine_max_speed_x": [
+    "500",
+    "200"
+  ],
+  "machine_max_speed_y": [
+    "500",
+    "200"
+  ],
+  "machine_max_speed_z": [
+    "12",
+    "12"
+  ],
+  "machine_max_jerk_e": [
+    "2.5",
+    "2.5"
+  ],
+  "machine_max_jerk_x": [
+    "12",
+    "12"
+  ],
+  "machine_max_jerk_y": [
+    "12",
+    "12"
+  ],
+  "machine_max_jerk_z": [
+    "0.2",
+    "0.4"
+  ],
+  "max_layer_height": [
+    "0.6"
+  ],
+  "min_layer_height": [
+    "0.08"
+  ],
   "printer_settings_id": "Elegoo",
-  "retraction_minimum_travel": ["1"],
-  "retract_before_wipe": ["85%"],
-  "retraction_length": ["0.8"],
-  "retraction_speed": ["60"],
-  "retract_length_toolchange": ["2"],
-  "deretraction_speed": ["45"],
+  "retraction_minimum_travel": [
+    "1"
+  ],
+  "retract_before_wipe": [
+    "85%"
+  ],
+  "retraction_length": [
+    "0.8"
+  ],
+  "retraction_speed": [
+    "60"
+  ],
+  "retract_length_toolchange": [
+    "2"
+  ],
+  "deretraction_speed": [
+    "45"
+  ],
   "single_extruder_multi_material": "1",
   "change_filament_gcode": "M600",
   "machine_pause_gcode": "PAUSE",
-  "default_filament_profile": ["Elegoo Generic PLA @0.8 nozzle"],
-	"machine_start_gcode": ";ELEGOO NEPTUNE 4 PRO\nM220 S100 ;Set the feed speed to 100%\nM221 S100 ;Set the flow rate to 100%\nM104 S140\nM190 S[bed_temperature_initial_layer_single]\nG90\nG28 ;home\nG1 Z10 F300\nG1 X67.5 Y0 F6000\nG1 Z0 F300\nM109 S[nozzle_temperature_initial_layer]\nG92 E0 ;Reset Extruder\nG1 X67.5 Y0 Z0.4 F300 ;Move to start position\nG1 X167.5 E30 F400 ;Draw the first line\nG1 Z0.6 F120.0 ;Move to side a little\nG1 X162.5 F3000\nG92 E0 ;Reset Extruder",
-	"machine_end_gcode": ";PRINT END\nG91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-8 X5 Y5 Z3 F3000 ;Retract\nG90 ;Absolute positionning\nG1 X10 Y220 F6000;Finish print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\nM84 X Y E ;Disable all steppers but Z",
+  "default_filament_profile": [
+    "Elegoo Generic PLA @0.8 nozzle"
+  ],
+  "machine_start_gcode": ";ELEGOO NEPTUNE 4 PRO\nM220 S100 ;Set the feed speed to 100%\nM221 S100 ;Set the flow rate to 100%\nM104 S140\nM190 S[bed_temperature_initial_layer_single]\nG90\nG28 ;home\nG1 Z10 F300\nG1 X67.5 Y0 F6000\nG1 Z0 F300\nM109 S[nozzle_temperature_initial_layer]\nG92 E0 ;Reset Extruder\nG1 X67.5 Y0 Z0.4 F300 ;Move to start position\nG1 X167.5 E30 F400 ;Draw the first line\nG1 Z0.6 F120.0 ;Move to side a little\nG1 X162.5 F3000\nG92 E0 ;Reset Extruder",
+  "machine_end_gcode": ";PRINT END\nG91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-8 X5 Y5 Z3 F3000 ;Retract\nG90 ;Absolute positionning\nG1 X10 Y220 F6000;Finish print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\nM84 X Y E ;Disable all steppers but Z",
   "before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\nG92 E0\n;[layer_z]\n\n",
   "layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]",
   "scan_first_layer": "0"
-}
+}
\ No newline at end of file

From c4a66f36ae6a500cedcb7b6fe410df9f8035a445 Mon Sep 17 00:00:00 2001
From: Ocraftyone <Ocraftyone@users.noreply.github.com>
Date: Wed, 24 Jan 2024 06:48:14 -0500
Subject: [PATCH 38/39] Debug Improvments on Windows (#3275)

* fix assert statements

* Add ORCA_INCLUDE_DEBUG_INFO to deps cmake

adds option ORCA_INCLUDE_DEBUG_INFO to deps build script to allow an alternative for RelWithDebInfo that works on windows

* add build type option to windows script

* update .gitignore to include build*
---
 .gitignore                                    |  2 +-
 build_release.bat                             | 44 ++++++++++++++-----
 build_release_vs2022.bat                      | 44 ++++++++++++++-----
 deps/CMakeLists.txt                           | 15 +++++--
 src/libslic3r/GCode/PressureEqualizer.cpp     |  2 +-
 src/libslic3r/Support/TreeSupport.cpp         |  6 +--
 src/libslic3r/Support/TreeSupportCommon.cpp   |  4 +-
 .../GUI/Gizmos/GLGizmoMmuSegmentation.cpp     |  2 -
 8 files changed, 84 insertions(+), 35 deletions(-)

diff --git a/.gitignore b/.gitignore
index d0795a4deb4..6b560a66c2f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,7 @@
 Build
 Build.bat
 /build*/
-deps/build
+deps/build*
 MYMETA.json
 MYMETA.yml
 _build
diff --git a/build_release.bat b/build_release.bat
index 3742a34f65e..1e154ee15d8 100644
--- a/build_release.bat
+++ b/build_release.bat
@@ -1,26 +1,50 @@
 set WP=%CD%
+
+set debug=OFF
+set debuginfo=OFF
+if "%1"=="debug" set debug=ON
+if "%2"=="debug" set debug=ON
+if "%1"=="debuginfo" set debuginfo=ON
+if "%2"=="debuginfo" set debuginfo=ON
+if "%debug%"=="ON" (
+    set build_type=Debug
+    set build_dir=build-dbg
+) else (
+    if "%debuginfo%"=="ON" (
+        set build_type=RelWithDebInfo
+        set build_dir=build-dbginfo
+    ) else (
+        set build_type=Release
+        set build_dir=build
+    )
+)
+echo build type set to %build_type%
+
 cd deps
-mkdir build
-cd build
+mkdir %build_dir%
+cd %build_dir%
 set DEPS=%CD%/OrcaSlicer_dep
 if "%1"=="slicer" (
     GOTO :slicer
 )
 echo "building deps.."
-cmake ../ -G "Visual Studio 16 2019" -DDESTDIR="%CD%/OrcaSlicer_dep" -DCMAKE_BUILD_TYPE=Release
-cmake --build . --config Release --target deps -- -m
+
+echo cmake ../ -G "Visual Studio 16 2019 -A x64 -DDESTDIR="%CD%/OrcaSlicer_dep" -DCMAKE_BUILD_TYPE=%build_type% -DDEP_DEBUG=%debug% -DORCA_INCLUDE_DEBUG_INFO=%debuginfo%
+cmake ../ -G "Visual Studio 16 2019 -A x64 -DDESTDIR="%CD%/OrcaSlicer_dep" -DCMAKE_BUILD_TYPE=%build_type% -DDEP_DEBUG=%debug% -DORCA_INCLUDE_DEBUG_INFO=%debuginfo%
+cmake --build . --config %build_type% --target deps -- -m
 
 if "%1"=="deps" exit /b 0
 
 :slicer
 echo "building Orca Slicer..."
 cd %WP%
-mkdir build 
-cd build
+mkdir %build_dir%
+cd %build_dir%
 
-cmake .. -G "Visual Studio 16 2019" -DBBL_RELEASE_TO_PUBLIC=1 -DCMAKE_PREFIX_PATH="%DEPS%/usr/local" -DCMAKE_INSTALL_PREFIX="./OrcaSlicer" -DCMAKE_BUILD_TYPE=Release -DWIN10SDK_PATH="C:/Program Files (x86)/Windows Kits/10/Include/10.0.19041.0"
-cmake --build . --config Release --target ALL_BUILD -- -m
+echo cmake .. -G "Visual Studio 16 2019 -A x64 -DBBL_RELEASE_TO_PUBLIC=1 -DCMAKE_PREFIX_PATH="%DEPS%/usr/local" -DCMAKE_INSTALL_PREFIX="./OrcaSlicer" -DCMAKE_BUILD_TYPE=%build_type%
+cmake .. -G "Visual Studio 16 2019 -A x64 -DBBL_RELEASE_TO_PUBLIC=1 -DCMAKE_PREFIX_PATH="%DEPS%/usr/local" -DCMAKE_INSTALL_PREFIX="./OrcaSlicer" -DCMAKE_BUILD_TYPE=%build_type% -DWIN10SDK_PATH="C:/Program Files (x86)/Windows Kits/10/Include/10.0.19041.0"
+cmake --build . --config %build_type% --target ALL_BUILD -- -m
 cd ..
 call run_gettext.bat
-cd build
-cmake --build . --target install --config Release
\ No newline at end of file
+cd %build_dir%
+cmake --build . --target install --config %build_type%
diff --git a/build_release_vs2022.bat b/build_release_vs2022.bat
index a2711771217..870bad7bb63 100644
--- a/build_release_vs2022.bat
+++ b/build_release_vs2022.bat
@@ -13,10 +13,30 @@ if "%1"=="pack" (
     exit /b 0
 )
 
+set debug=OFF
+set debuginfo=OFF
+if "%1"=="debug" set debug=ON
+if "%2"=="debug" set debug=ON
+if "%1"=="debuginfo" set debuginfo=ON
+if "%2"=="debuginfo" set debuginfo=ON
+if "%debug%"=="ON" (
+    set build_type=Debug
+    set build_dir=build-dbg
+) else (
+    if "%debuginfo%"=="ON" (
+        set build_type=RelWithDebInfo
+        set build_dir=build-dbginfo
+    ) else (
+        set build_type=Release
+        set build_dir=build
+    )
+)
+echo build type set to %build_type%
+
 setlocal DISABLEDELAYEDEXPANSION 
 cd deps
-mkdir build
-cd build
+mkdir %build_dir%
+cd %build_dir%
 set DEPS=%CD%/OrcaSlicer_dep
 
 if "%1"=="slicer" (
@@ -24,22 +44,22 @@ if "%1"=="slicer" (
 )
 echo "building deps.."
 
-
-cmake ../ -G "Visual Studio 17 2022" -A x64 -DDESTDIR="%CD%/OrcaSlicer_dep" -DCMAKE_BUILD_TYPE=Release
-cmake --build . --config Release --target deps -- -m
+echo cmake ../ -G "Visual Studio 17 2022" -A x64 -DDESTDIR="%CD%/OrcaSlicer_dep" -DCMAKE_BUILD_TYPE=%build_type% -DDEP_DEBUG=%debug% -DORCA_INCLUDE_DEBUG_INFO=%debuginfo%
+cmake ../ -G "Visual Studio 17 2022" -A x64 -DDESTDIR="%CD%/OrcaSlicer_dep" -DCMAKE_BUILD_TYPE=%build_type% -DDEP_DEBUG=%debug% -DORCA_INCLUDE_DEBUG_INFO=%debuginfo%
+cmake --build . --config %build_type% --target deps -- -m
 
 if "%1"=="deps" exit /b 0
 
 :slicer
 echo "building Orca Slicer..."
 cd %WP%
-mkdir build 
-cd build
+mkdir %build_dir%
+cd %build_dir%
 
-echo cmake .. -G "Visual Studio 17 2022" -A x64 -DBBL_RELEASE_TO_PUBLIC=1 -DCMAKE_PREFIX_PATH="%DEPS%/usr/local" -DCMAKE_INSTALL_PREFIX="./OrcaSlicer" -DCMAKE_BUILD_TYPE=Release
-cmake .. -G "Visual Studio 17 2022" -A x64 -DBBL_RELEASE_TO_PUBLIC=1 -DCMAKE_PREFIX_PATH="%DEPS%/usr/local" -DCMAKE_INSTALL_PREFIX="./OrcaSlicer" -DCMAKE_BUILD_TYPE=Release -DWIN10SDK_PATH="C:/Program Files (x86)/Windows Kits/10/Include/10.0.22000.0"
-cmake --build . --config Release --target ALL_BUILD -- -m
+echo cmake .. -G "Visual Studio 17 2022" -A x64 -DBBL_RELEASE_TO_PUBLIC=1 -DCMAKE_PREFIX_PATH="%DEPS%/usr/local" -DCMAKE_INSTALL_PREFIX="./OrcaSlicer" -DCMAKE_BUILD_TYPE=%build_type%
+cmake .. -G "Visual Studio 17 2022" -A x64 -DBBL_RELEASE_TO_PUBLIC=1 -DCMAKE_PREFIX_PATH="%DEPS%/usr/local" -DCMAKE_INSTALL_PREFIX="./OrcaSlicer" -DCMAKE_BUILD_TYPE=%build_type% -DWIN10SDK_PATH="C:/Program Files (x86)/Windows Kits/10/Include/10.0.22000.0"
+cmake --build . --config %build_type% --target ALL_BUILD -- -m
 cd ..
 call run_gettext.bat
-cd build
-cmake --build . --target install --config Release
+cd %build_dir%
+cmake --build . --target install --config %build_type%
diff --git a/deps/CMakeLists.txt b/deps/CMakeLists.txt
index d8210f54460..02a07ffd3be 100644
--- a/deps/CMakeLists.txt
+++ b/deps/CMakeLists.txt
@@ -43,7 +43,12 @@ endif ()
 set(DESTDIR "${CMAKE_CURRENT_BINARY_DIR}/destdir" CACHE PATH "Destination directory")
 set(DEP_DOWNLOAD_DIR ${CMAKE_CURRENT_BINARY_DIR}/../DL_CACHE CACHE PATH "Path for downloaded source packages.")
 
-option(DEP_DEBUG "Build debug variants (only applicable on Windows)" OFF)
+get_property(_is_multi GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
+
+if (_is_multi)
+    option(DEP_DEBUG "Build debug variants (only applicable on Windows)" OFF)
+    option(ORCA_INCLUDE_DEBUG_INFO "Includes debug information in a release build (like RelWithDebInfo) in a way that works with multi-configuration generators and incompatible dependencies. DEP_DEBUG option takes priority over this." OFF)
+endif ()
 
 if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
     option(DEP_WX_GTK3 "Build wxWidgets against GTK3" OFF)
@@ -87,8 +92,6 @@ find_package(Git REQUIRED)
 # The default command line for patching. Only works for newer 
 set(PATCH_CMD ${GIT_EXECUTABLE} apply --verbose --ignore-space-change --whitespace=fix)
 
-get_property(_is_multi GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
-
 if (NOT _is_multi AND NOT CMAKE_BUILD_TYPE)
     set(CMAKE_BUILD_TYPE Release)
     message(STATUS "Forcing CMAKE_BUILD_TYPE to Release as it was not specified.")
@@ -99,7 +102,11 @@ function(orcaslicer_add_cmake_project projectname)
 
     set(_configs_line -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE})
     if (_is_multi OR MSVC)
-        set(_configs_line "")
+        if (ORCA_INCLUDE_DEBUG_INFO AND NOT DEP_DEBUG)
+            set(_configs_line "-DCMAKE_C_FLAGS_RELEASE:STRING=${CMAKE_C_FLAGS_RELWITHDEBINFO} -DCMAKE_CXX_FLAGS_RELEASE:STRING=${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")
+        else ()
+            set(_configs_line "")
+        endif ()
     endif ()
 
     set(_gen "")
diff --git a/src/libslic3r/GCode/PressureEqualizer.cpp b/src/libslic3r/GCode/PressureEqualizer.cpp
index 2c528e28b95..9eee893a1a0 100644
--- a/src/libslic3r/GCode/PressureEqualizer.cpp
+++ b/src/libslic3r/GCode/PressureEqualizer.cpp
@@ -156,7 +156,7 @@ void PressureEqualizer::process_layer(const std::string &gcode)
 long PressureEqualizer::advance_segment_beyond_small_gap(const long idx_orig)
 {
     // this should only be run on the last extruding line before a gap
-    assert(m_gcode_lines[idx_cur_pos].extruding());
+    assert(m_gcode_lines[idx_orig].extruding());
     double distance_traveled = 0.0;
     // start at beginning of gap, advance till extrusion found or gap too big
     for (auto idx_cur_pos = idx_orig + 1; idx_cur_pos < m_gcode_lines.size(); idx_cur_pos++) {
diff --git a/src/libslic3r/Support/TreeSupport.cpp b/src/libslic3r/Support/TreeSupport.cpp
index a228296451a..8f6936ab8a5 100644
--- a/src/libslic3r/Support/TreeSupport.cpp
+++ b/src/libslic3r/Support/TreeSupport.cpp
@@ -142,8 +142,8 @@ static std::vector<std::pair<TreeSupportSettings, std::vector<size_t>>> group_me
         const PrintObjectConfig &object_config = print_object.config();
 #endif // NDEBUG
         // Support must be enabled and set to Tree style.
-        assert(object_config.support_material || object_config.support_material_enforce_layers > 0);
-        assert(object_config.support_material_style == smsTree || object_config.support_material_style == smsOrganic);
+        assert(object_config.enable_support || object_config.enforce_support_layers > 0);
+        assert(object_config.support_type == stTree || object_config.support_style == smsOrganic);
 
         bool found_existing_group = false;
         TreeSupportSettings next_settings{ TreeSupportMeshGroupSettings{ print_object }, print_object.slicing_parameters() };
@@ -3541,7 +3541,7 @@ static void generate_support_areas(Print &print, const BuildVolume &build_volume
                 draw_areas(*print.get_object(processing.second.front()), volumes, config, overhangs, move_bounds, 
                     bottom_contacts, top_contacts, intermediate_layers, layer_storage, throw_on_cancel);
             else {
-                assert(print_object.config().support_material_style == smsOrganic);
+                assert(print_object.config().support_style == smsOrganic);
                 organic_draw_branches(
                     *print.get_object(processing.second.front()), volumes, config, move_bounds, 
                     bottom_contacts, top_contacts, interface_placer, intermediate_layers, layer_storage, 
diff --git a/src/libslic3r/Support/TreeSupportCommon.cpp b/src/libslic3r/Support/TreeSupportCommon.cpp
index 132ece25045..0ef82203815 100644
--- a/src/libslic3r/Support/TreeSupportCommon.cpp
+++ b/src/libslic3r/Support/TreeSupportCommon.cpp
@@ -22,8 +22,8 @@ TreeSupportMeshGroupSettings::TreeSupportMeshGroupSettings(const PrintObject &pr
 //    const std::vector<unsigned int>  printing_extruders = print_object.object_extruders();
 
     // Support must be enabled and set to Tree style.
-    assert(config.support_material || config.support_material_enforce_layers > 0);
-    assert(config.support_material_style == smsTree || config.support_material_style == smsOrganic);
+    assert(config.enable_support || config.enforce_support_layers > 0);
+    assert(config.support_type == stTree || config.support_style == smsOrganic);
 
     // Calculate maximum external perimeter width over all printing regions, taking into account the default layer height.
     coordf_t external_perimeter_width = 0.;
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp b/src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp
index e44b80cc785..11886c142aa 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp
@@ -922,7 +922,6 @@ void GLMmSegmentationGizmo3DScene::render(size_t triangle_indices_idx) const
 {
     assert(triangle_indices_idx < this->triangle_indices_VBO_ids.size());
     assert(this->triangle_patches.size() == this->triangle_indices_VBO_ids.size());
-    assert(this->vertices_VAO_id != 0);
     assert(this->vertices_VBO_id != 0);
     assert(this->triangle_indices_VBO_ids[triangle_indices_idx] != 0);
 
@@ -954,7 +953,6 @@ void GLMmSegmentationGizmo3DScene::render(size_t triangle_indices_idx) const
 
 void GLMmSegmentationGizmo3DScene::finalize_vertices()
 {
-    assert(this->vertices_VAO_id == 0);
     assert(this->vertices_VBO_id == 0);
     if (!this->vertices.empty()) {
         glsafe(::glGenBuffers(1, &this->vertices_VBO_id));

From 48541be681926e6d2ead2da0c6a94fb0505cd840 Mon Sep 17 00:00:00 2001
From: Thomas <bistory@gmail.com>
Date: Wed, 24 Jan 2024 15:19:36 +0100
Subject: [PATCH 39/39] Creality K1 Profiles improvements (and K1C addition)
 (#3728)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Added K1C and fixed some settings (took from config files instead of Creality Print)

* Files renaming

* New PLA-CF, prettify json for K1C, naming uniformisation, ...

* Port Special PLA profiles to K1/K1 Max

* Changed slow down layer time and slow down min speed in order to improve overall speed on details.

* Raised PLA bed temp to 55°C

* Optimisations for ABS, ASA and added Generic PC profile.

* Added PA-CF and fixed PC profiles.

* Added new filaments to default materials
---
 resources/profiles/Creality.json              | 128 +++++++++++++++++
 .../profiles/Creality/Creality K1C_cover.png  | Bin 0 -> 33172 bytes
 .../creality_k1c_buildplate_model.stl         | Bin 0 -> 316484 bytes
 .../creality_k1c_buildplate_texture.png       | Bin 0 -> 8471 bytes
 .../Creality Generic ABS @K1-all.json         |  22 +++
 .../Creality Generic ASA @K1-all.json         |  22 +++
 .../Creality Generic PA-CF @K1-all.json       |  16 +++
 .../filament/Creality Generic PA-CF.json      |  47 +++++++
 .../filament/Creality Generic PC @K1-all.json |  22 +++
 .../filament/Creality Generic PC.json         |  14 ++
 .../Creality Generic PETG @K1-all.json        |  52 +++++++
 .../Creality Generic PLA @K1-all.json         |  43 ++++++
 ...eality Generic PLA High Speed @K1-all.json |  22 +++
 .../Creality Generic PLA Matte @K1-all.json   |  22 +++
 .../Creality Generic PLA Silk @K1-all.json    |  22 +++
 .../Creality Generic PLA-CF @K1-all.json      |  22 +++
 .../filament/Creality Generic PLA-CF.json     |  24 ++++
 .../Creality Generic TPU @K1-all.json         |  37 +++++
 .../filament/Creality HF Generic PLA.json     |  47 ++++---
 .../Creality HF Generic Speed PLA.json        |   3 +
 .../Creality/filament/fdm_filament_pa.json    |  82 +++++++++++
 .../Creality/filament/fdm_filament_pc.json    |  82 +++++++++++
 .../Creality/filament/fdm_filament_pet.json   |   2 +-
 .../machine/Creality K1 (0.4 nozzle).json     |  15 +-
 .../machine/Creality K1 (0.6 nozzle).json     |  13 +-
 .../machine/Creality K1 (0.8 nozzle).json     |  13 +-
 .../machine/Creality K1 Max (0.4 nozzle).json |  15 +-
 .../machine/Creality K1 Max (0.6 nozzle).json |  13 +-
 .../machine/Creality K1 Max (0.8 nozzle).json |  13 +-
 .../Creality/machine/Creality K1 Max.json     |   2 +-
 .../Creality/machine/Creality K1.json         |   2 +-
 .../machine/Creality K1C 0.4 nozzle.json      | 131 ++++++++++++++++++
 .../machine/Creality K1C 0.6 nozzle.json      | 131 ++++++++++++++++++
 .../machine/Creality K1C 0.8 nozzle.json      | 131 ++++++++++++++++++
 .../Creality/machine/Creality K1C.json        |  12 ++
 ...0.12mm Fine @Creality K1 (0.4 nozzle).json | 116 ++++++++++++++++
 .../0.12mm Fine @Creality K1C 0.4 nozzle.json | 116 ++++++++++++++++
 ...2mm Fine @Creality K1Max (0.4 nozzle).json | 116 ++++++++++++++++
 ...6mm Optimal @Creality K1 (0.4 nozzle).json |   2 +-
 ...16mm Optimal @Creality K1C 0.4 nozzle.json | 116 ++++++++++++++++
 ... Optimal @Creality K1Max (0.4 nozzle).json |   2 +-
 ...mm Standard @Creality K1 (0.4 nozzle).json |   2 +-
 ...0mm Standard @Creality K1C 0.4 nozzle.json | 116 ++++++++++++++++
 ...Standard @Creality K1Max (0.4 nozzle).json |   2 +-
 ....24mm Draft @Creality K1 (0.4 nozzle).json |   2 +-
 ...0.24mm Draft @Creality K1C 0.4 nozzle.json | 116 ++++++++++++++++
 ...mm Draft @Creality K1Max (0.4 nozzle).json |   2 +-
 ...24mm Optimal @Creality K1C 0.6 nozzle.json | 115 +++++++++++++++
 ...0mm Standard @Creality K1C 0.6 nozzle.json | 115 +++++++++++++++
 ...32mm Optimal @Creality K1C 0.8 nozzle.json | 115 +++++++++++++++
 ...0.36mm Draft @Creality K1C 0.6 nozzle.json | 115 +++++++++++++++
 ...0mm Standard @Creality K1C 0.8 nozzle.json | 115 +++++++++++++++
 ...0.48mm Draft @Creality K1C 0.8 nozzle.json | 115 +++++++++++++++
 53 files changed, 2554 insertions(+), 66 deletions(-)
 create mode 100644 resources/profiles/Creality/Creality K1C_cover.png
 create mode 100644 resources/profiles/Creality/creality_k1c_buildplate_model.stl
 create mode 100644 resources/profiles/Creality/creality_k1c_buildplate_texture.png
 create mode 100644 resources/profiles/Creality/filament/Creality Generic ABS @K1-all.json
 create mode 100644 resources/profiles/Creality/filament/Creality Generic ASA @K1-all.json
 create mode 100644 resources/profiles/Creality/filament/Creality Generic PA-CF @K1-all.json
 create mode 100644 resources/profiles/Creality/filament/Creality Generic PA-CF.json
 create mode 100644 resources/profiles/Creality/filament/Creality Generic PC @K1-all.json
 create mode 100644 resources/profiles/Creality/filament/Creality Generic PC.json
 create mode 100644 resources/profiles/Creality/filament/Creality Generic PETG @K1-all.json
 create mode 100644 resources/profiles/Creality/filament/Creality Generic PLA @K1-all.json
 create mode 100644 resources/profiles/Creality/filament/Creality Generic PLA High Speed @K1-all.json
 create mode 100644 resources/profiles/Creality/filament/Creality Generic PLA Matte @K1-all.json
 create mode 100644 resources/profiles/Creality/filament/Creality Generic PLA Silk @K1-all.json
 create mode 100644 resources/profiles/Creality/filament/Creality Generic PLA-CF @K1-all.json
 create mode 100644 resources/profiles/Creality/filament/Creality Generic PLA-CF.json
 create mode 100644 resources/profiles/Creality/filament/Creality Generic TPU @K1-all.json
 create mode 100644 resources/profiles/Creality/filament/fdm_filament_pa.json
 create mode 100644 resources/profiles/Creality/filament/fdm_filament_pc.json
 create mode 100644 resources/profiles/Creality/machine/Creality K1C 0.4 nozzle.json
 create mode 100644 resources/profiles/Creality/machine/Creality K1C 0.6 nozzle.json
 create mode 100644 resources/profiles/Creality/machine/Creality K1C 0.8 nozzle.json
 create mode 100644 resources/profiles/Creality/machine/Creality K1C.json
 create mode 100644 resources/profiles/Creality/process/0.12mm Fine @Creality K1 (0.4 nozzle).json
 create mode 100644 resources/profiles/Creality/process/0.12mm Fine @Creality K1C 0.4 nozzle.json
 create mode 100644 resources/profiles/Creality/process/0.12mm Fine @Creality K1Max (0.4 nozzle).json
 create mode 100644 resources/profiles/Creality/process/0.16mm Optimal @Creality K1C 0.4 nozzle.json
 create mode 100644 resources/profiles/Creality/process/0.20mm Standard @Creality K1C 0.4 nozzle.json
 create mode 100644 resources/profiles/Creality/process/0.24mm Draft @Creality K1C 0.4 nozzle.json
 create mode 100644 resources/profiles/Creality/process/0.24mm Optimal @Creality K1C 0.6 nozzle.json
 create mode 100644 resources/profiles/Creality/process/0.30mm Standard @Creality K1C 0.6 nozzle.json
 create mode 100644 resources/profiles/Creality/process/0.32mm Optimal @Creality K1C 0.8 nozzle.json
 create mode 100644 resources/profiles/Creality/process/0.36mm Draft @Creality K1C 0.6 nozzle.json
 create mode 100644 resources/profiles/Creality/process/0.40mm Standard @Creality K1C 0.8 nozzle.json
 create mode 100644 resources/profiles/Creality/process/0.48mm Draft @Creality K1C 0.8 nozzle.json

diff --git a/resources/profiles/Creality.json b/resources/profiles/Creality.json
index 74130b0c275..bcf6656b121 100644
--- a/resources/profiles/Creality.json
+++ b/resources/profiles/Creality.json
@@ -76,6 +76,10 @@
 			"name": "Creality K1",
 			"sub_path": "machine/Creality K1.json"
 		},
+		{
+			"name": "Creality K1C",
+			"sub_path": "machine/Creality K1C.json"
+		},
 		{
 			"name": "Creality K1 Max",
 			"sub_path": "machine/Creality K1 Max.json"
@@ -198,6 +202,18 @@
 			"name": "0.12mm Fine @Creality Ender5Pro (2019)",
 			"sub_path": "process/0.12mm Fine @Creality Ender5Pro (2019).json"
 		},
+		{
+			"name": "0.12mm Fine @Creality K1 (0.4 nozzle)",
+			"sub_path": "process/0.12mm Fine @Creality K1 (0.4 nozzle).json"
+		},
+		{
+			"name": "0.12mm Fine @Creality K1C",
+			"sub_path": "process/0.12mm Fine @Creality K1C 0.4 nozzle.json"
+		},
+		{
+			"name": "0.12mm Fine @Creality K1Max (0.4 nozzle)",
+			"sub_path": "process/0.12mm Fine @Creality K1Max (0.4 nozzle).json"
+		},
 		{
 			"name": "0.12mm Detail @Creality Ender5Pro (2019) 0.5",
 			"sub_path": "process/0.12mm Detail @Creality Ender5Pro (2019) 0.5.json"
@@ -282,6 +298,10 @@
 			"name": "0.16mm Optimal @Creality K1 (0.4 nozzle)",
 			"sub_path": "process/0.16mm Optimal @Creality K1 (0.4 nozzle).json"
 		},
+		{
+			"name": "0.16mm Optimal @Creality K1C",
+			"sub_path": "process/0.16mm Optimal @Creality K1C 0.4 nozzle.json"
+		},
 		{
 			"name": "0.16mm Optimal @Creality K1Max (0.4 nozzle)",
 			"sub_path": "process/0.16mm Optimal @Creality K1Max (0.4 nozzle).json"
@@ -378,6 +398,10 @@
 			"name": "0.20mm Standard @Creality K1 (0.4 nozzle)",
 			"sub_path": "process/0.20mm Standard @Creality K1 (0.4 nozzle).json"
 		},
+		{
+			"name": "0.20mm Standard @Creality K1C",
+			"sub_path": "process/0.20mm Standard @Creality K1C 0.4 nozzle.json"
+		},
 		{
 			"name": "0.20mm Standard @Creality K1Max (0.4 nozzle)",
 			"sub_path": "process/0.20mm Standard @Creality K1Max (0.4 nozzle).json"
@@ -502,6 +526,10 @@
 			"name": "0.24mm Optimal @Creality K1 (0.6 nozzle)",
 			"sub_path": "process/0.24mm Optimal @Creality K1 (0.6 nozzle).json"
 		},
+		{
+			"name": "0.24mm Optimal @Creality K1C",
+			"sub_path": "process/0.24mm Optimal @Creality K1C 0.6 nozzle.json"
+		},
 		{
 			"name": "0.24mm Optimal @Creality K1Max (0.6 nozzle)",
 			"sub_path": "process/0.24mm Optimal @Creality K1Max (0.6 nozzle).json"
@@ -510,6 +538,10 @@
 			"name": "0.24mm Draft @Creality K1 (0.4 nozzle)",
 			"sub_path": "process/0.24mm Draft @Creality K1 (0.4 nozzle).json"
 		},
+		{
+			"name": "0.24mm Draft @Creality K1C",
+			"sub_path": "process/0.24mm Draft @Creality K1C 0.4 nozzle.json"
+		},
 		{
 			"name": "0.24mm Draft @Creality K1Max (0.4 nozzle)",
 			"sub_path": "process/0.24mm Draft @Creality K1Max (0.4 nozzle).json"
@@ -518,6 +550,10 @@
 			"name": "0.30mm Standard @Creality K1 (0.6 nozzle)",
 			"sub_path": "process/0.30mm Standard @Creality K1 (0.6 nozzle).json"
 		},
+		{
+			"name": "0.30mm Standard @Creality K1C",
+			"sub_path": "process/0.30mm Standard @Creality K1C 0.6 nozzle.json"
+		},
 		{
 			"name": "0.30mm Standard @Creality K1Max (0.6 nozzle)",
 			"sub_path": "process/0.30mm Standard @Creality K1Max (0.6 nozzle).json"
@@ -526,6 +562,10 @@
 			"name": "0.32mm Optimal @Creality K1 (0.8 nozzle)",
 			"sub_path": "process/0.32mm Optimal @Creality K1 (0.8 nozzle).json"
 		},
+		{
+			"name": "0.32mm Optimal @Creality K1C",
+			"sub_path": "process/0.32mm Optimal @Creality K1C 0.8 nozzle.json"
+		},
 		{
 			"name": "0.32mm Optimal @Creality K1Max (0.8 nozzle)",
 			"sub_path": "process/0.32mm Optimal @Creality K1Max (0.8 nozzle).json"
@@ -534,6 +574,10 @@
 			"name": "0.36mm Draft @Creality K1 (0.6 nozzle)",
 			"sub_path": "process/0.36mm Draft @Creality K1 (0.6 nozzle).json"
 		},
+		{
+			"name": "0.36mm Draft @Creality K1C",
+			"sub_path": "process/0.36mm Draft @Creality K1C 0.6 nozzle.json"
+		},
 		{
 			"name": "0.36mm Draft @Creality K1Max (0.6 nozzle)",
 			"sub_path": "process/0.36mm Draft @Creality K1Max (0.6 nozzle).json"
@@ -542,6 +586,10 @@
 			"name": "0.40mm Standard @Creality K1 (0.8 nozzle)",
 			"sub_path": "process/0.40mm Standard @Creality K1 (0.8 nozzle).json"
 		},
+		{
+			"name": "0.40mm Standard @Creality K1C",
+			"sub_path": "process/0.40mm Standard @Creality K1C 0.8 nozzle.json"
+		},
 		{
 			"name": "0.40mm Standard @Creality K1Max (0.8 nozzle)",
 			"sub_path": "process/0.40mm Standard @Creality K1Max (0.8 nozzle).json"
@@ -550,6 +598,10 @@
 			"name": "0.48mm Draft @Creality K1 (0.8 nozzle)",
 			"sub_path": "process/0.48mm Draft @Creality K1 (0.8 nozzle).json"
 		},
+		{
+			"name": "0.48mm Draft @Creality K1C",
+			"sub_path": "process/0.48mm Draft @Creality K1C 0.8 nozzle.json"
+		},
 		{
 			"name": "0.48mm Draft @Creality K1Max (0.8 nozzle)",
 			"sub_path": "process/0.48mm Draft @Creality K1Max (0.8 nozzle).json"
@@ -568,6 +620,14 @@
 			"name": "fdm_filament_asa",
 			"sub_path": "filament/fdm_filament_asa.json"
 		},
+		{
+			"name": "fdm_filament_pa",
+			"sub_path": "filament/fdm_filament_pa.json"
+		},
+		{
+			"name": "fdm_filament_pc",
+			"sub_path": "filament/fdm_filament_pc.json"
+		},
 		{
 			"name": "fdm_filament_pet",
 			"sub_path": "filament/fdm_filament_pet.json"
@@ -588,6 +648,14 @@
 			"name": "Creality Generic ASA",
 			"sub_path": "filament/Creality Generic ASA.json"
 		},
+		{
+			"name": "Creality Generic PA-CF",
+			"sub_path": "filament/Creality Generic PA-CF.json"
+		},
+		{
+			"name": "Creality Generic PC",
+			"sub_path": "filament/Creality Generic PC.json"
+		},
 		{
 			"name": "Creality Generic PETG",
 			"sub_path": "filament/Creality Generic PETG.json"
@@ -604,6 +672,10 @@
 			"name": "Creality HF Generic Speed PLA",
 			"sub_path": "filament/Creality HF Generic Speed PLA.json"
 		},
+		{
+			"name": "Creality Generic PLA-CF",
+			"sub_path": "filament/Creality Generic PLA-CF.json"
+		},
 		{
 			"name": "Creality Generic TPU",
 			"sub_path": "filament/Creality Generic TPU.json"
@@ -639,6 +711,50 @@
 		{
 			"name": "Creality Generic TPU @Ender-3V3-all",
 			"sub_path": "filament/Creality Generic TPU @Ender-3V3-all.json"
+		},
+		{
+			"name": "Creality Generic ABS @K1-all",
+			"sub_path": "filament/Creality Generic ABS @K1-all.json"
+		},
+		{
+			"name": "Creality Generic ASA @K1-all",
+			"sub_path": "filament/Creality Generic ASA @K1-all.json"
+		},
+		{
+			"name": "Creality Generic PA-CF @K1-all",
+			"sub_path": "filament/Creality Generic PA-CF @K1-all.json"
+		},
+		{
+			"name": "Creality Generic PC @K1-all",
+			"sub_path": "filament/Creality Generic PC @K1-all.json"
+		},
+		{
+			"name": "Creality Generic PETG @K1-all",
+			"sub_path": "filament/Creality Generic PETG @K1-all.json"
+		},
+		{
+			"name": "Creality Generic PLA @K1-all",
+			"sub_path": "filament/Creality Generic PLA @K1-all.json"
+		},
+		{
+			"name": "Creality Generic PLA High Speed @K1-all",
+			"sub_path": "filament/Creality Generic PLA High Speed @K1-all.json"
+		},
+		{
+			"name": "Creality Generic PLA Matte @K1-all",
+			"sub_path": "filament/Creality Generic PLA Matte @K1-all.json"
+		},
+		{
+			"name": "Creality Generic PLA Silk @K1-all",
+			"sub_path": "filament/Creality Generic PLA Silk @K1-all.json"
+		},
+		{
+			"name": "Creality Generic PLA-CF @K1-all",
+			"sub_path": "filament/Creality Generic PLA-CF @K1-all.json"
+		},
+		{
+			"name": "Creality Generic TPU @K1-all",
+			"sub_path": "filament/Creality Generic TPU @K1-all.json"
 		}
 	],
 	"machine_list": [
@@ -782,6 +898,18 @@
 			"name": "Creality K1 (0.8 nozzle)",
 			"sub_path": "machine/Creality K1 (0.8 nozzle).json"
 		},
+		{
+			"name": "Creality K1C 0.4 nozzle",
+			"sub_path": "machine/Creality K1C 0.4 nozzle.json"
+		},
+		{
+			"name": "Creality K1C 0.6 nozzle",
+			"sub_path": "machine/Creality K1C 0.6 nozzle.json"
+		},
+		{
+			"name": "Creality K1C 0.8 nozzle",
+			"sub_path": "machine/Creality K1C 0.8 nozzle.json"
+		},
 		{
 			"name": "Creality K1 Max (0.4 nozzle)",
 			"sub_path": "machine/Creality K1 Max (0.4 nozzle).json"
diff --git a/resources/profiles/Creality/Creality K1C_cover.png b/resources/profiles/Creality/Creality K1C_cover.png
new file mode 100644
index 0000000000000000000000000000000000000000..a6da5d5c5ad321b0c458fb881b8e1b3a4e295274
GIT binary patch
literal 33172
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
QO8@`>07*qoM6N<$f?_i-8vp<R

literal 0
HcmV?d00001

diff --git a/resources/profiles/Creality/creality_k1c_buildplate_model.stl b/resources/profiles/Creality/creality_k1c_buildplate_model.stl
new file mode 100644
index 0000000000000000000000000000000000000000..ef159f264b7e76eca95e65684903ed483ec633f9
GIT binary patch
literal 316484
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

literal 0
HcmV?d00001

diff --git a/resources/profiles/Creality/creality_k1c_buildplate_texture.png b/resources/profiles/Creality/creality_k1c_buildplate_texture.png
new file mode 100644
index 0000000000000000000000000000000000000000..f9d61c63ca13d324883df3ef134f888d3f62fdc1
GIT binary patch
literal 8471
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
K<7&e@kN*#mDW-t{

literal 0
HcmV?d00001

diff --git a/resources/profiles/Creality/filament/Creality Generic ABS @K1-all.json b/resources/profiles/Creality/filament/Creality Generic ABS @K1-all.json
new file mode 100644
index 00000000000..ccc7f3c526f
--- /dev/null
+++ b/resources/profiles/Creality/filament/Creality Generic ABS @K1-all.json	
@@ -0,0 +1,22 @@
+{
+    "type": "filament",
+    "setting_id": "GFSA04_CREALITY_00",
+    "name": "Creality Generic ABS @K1-all",
+    "from": "system",
+    "instantiation": "true",
+    "inherits": "Creality Generic ABS",
+    "filament_max_volumetric_speed": [
+        "14"
+    ],
+    "slow_down_layer_time": [
+        "5"
+    ],
+    "slow_down_min_speed": [
+        "20"
+    ],
+    "compatible_printers": [
+        "Creality K1C 0.4 nozzle",
+        "Creality K1C 0.6 nozzle",
+        "Creality K1C 0.8 nozzle"
+    ]
+}
\ No newline at end of file
diff --git a/resources/profiles/Creality/filament/Creality Generic ASA @K1-all.json b/resources/profiles/Creality/filament/Creality Generic ASA @K1-all.json
new file mode 100644
index 00000000000..038fd88d960
--- /dev/null
+++ b/resources/profiles/Creality/filament/Creality Generic ASA @K1-all.json	
@@ -0,0 +1,22 @@
+{
+    "type": "filament",
+    "setting_id": "GFSA04_00",
+    "name": "Creality Generic ASA @K1-all",
+    "from": "system",
+    "instantiation": "true",
+    "inherits": "Creality Generic ASA",
+    "filament_max_volumetric_speed": [
+        "12"
+    ],
+    "slow_down_layer_time": [
+        "3"
+    ],
+    "slow_down_min_speed": [
+        "20"
+    ],
+    "compatible_printers": [
+        "Creality K1C 0.4 nozzle",
+        "Creality K1C 0.6 nozzle",
+        "Creality K1C 0.8 nozzle"
+    ]
+}
\ No newline at end of file
diff --git a/resources/profiles/Creality/filament/Creality Generic PA-CF @K1-all.json b/resources/profiles/Creality/filament/Creality Generic PA-CF @K1-all.json
new file mode 100644
index 00000000000..54b1491b63d
--- /dev/null
+++ b/resources/profiles/Creality/filament/Creality Generic PA-CF @K1-all.json	
@@ -0,0 +1,16 @@
+{
+    "type": "filament",
+    "name": "Creality Generic PA-CF @K1-all",
+    "inherits": "Creality Generic PA-CF",
+    "from": "system",
+    "setting_id": "GFSN99_01",
+    "instantiation": "true",
+    "compatible_printers": [
+        "Creality K1C 0.4 nozzle",
+        "Creality K1C 0.6 nozzle",
+        "Creality K1C 0.8 nozzle",
+        "Creality K1 Max (0.4 nozzle)",
+        "Creality K1 Max (0.6 nozzle)",
+        "Creality K1 Max (0.8 nozzle)"
+    ]
+}
\ No newline at end of file
diff --git a/resources/profiles/Creality/filament/Creality Generic PA-CF.json b/resources/profiles/Creality/filament/Creality Generic PA-CF.json
new file mode 100644
index 00000000000..be450a30200
--- /dev/null
+++ b/resources/profiles/Creality/filament/Creality Generic PA-CF.json	
@@ -0,0 +1,47 @@
+{
+    "type": "filament",
+    "filament_id": "GFN98",
+    "setting_id": "GFSN99",
+    "name": "Creality Generic PA-CF",
+    "from": "system",
+    "instantiation": "true",
+    "inherits": "fdm_filament_pa",
+    "filament_type": [
+        "PA-CF"
+    ],
+    "nozzle_temperature_initial_layer": [
+        "290"
+    ],
+    "nozzle_temperature": [
+        "290"
+    ],
+    "filament_max_volumetric_speed": [
+        "8"
+    ],
+    "fan_max_speed": [
+        "30"
+    ],
+    "fan_min_speed": [
+        "10"
+    ],
+    "overhang_fan_threshold": [
+        "0%"
+    ],
+    "overhang_fan_speed": [
+        "40"
+    ],
+    "fan_cooling_layer_time": [
+        "5"
+    ],
+    "full_fan_speed_layer": [
+        "2"
+    ],
+    "enable_pressure_advance": [
+        "1"
+    ],
+    "pressure_advance": [
+        "0.01"
+    ],
+    "compatible_printers": [
+    ]
+}
\ No newline at end of file
diff --git a/resources/profiles/Creality/filament/Creality Generic PC @K1-all.json b/resources/profiles/Creality/filament/Creality Generic PC @K1-all.json
new file mode 100644
index 00000000000..34a99503189
--- /dev/null
+++ b/resources/profiles/Creality/filament/Creality Generic PC @K1-all.json	
@@ -0,0 +1,22 @@
+{
+    "type": "filament",
+    "name": "Creality Generic PC @K1-all",
+    "inherits": "Creality Generic PC",
+    "from": "system",
+    "setting_id": "GFSC99_06",
+    "instantiation": "true",
+    "chamber_temperatures": [
+        "60"
+    ],
+    "compatible_printers": [
+        "Creality K1 (0.4 nozzle)",
+        "Creality K1 (0.6 nozzle)",
+        "Creality K1 (0.8 nozzle)",
+        "Creality K1C 0.4 nozzle",
+        "Creality K1C 0.6 nozzle",
+        "Creality K1C 0.8 nozzle",
+        "Creality K1 Max (0.4 nozzle)",
+        "Creality K1 Max (0.6 nozzle)",
+        "Creality K1 Max (0.8 nozzle)"
+    ]
+}
\ No newline at end of file
diff --git a/resources/profiles/Creality/filament/Creality Generic PC.json b/resources/profiles/Creality/filament/Creality Generic PC.json
new file mode 100644
index 00000000000..800c1c935c6
--- /dev/null
+++ b/resources/profiles/Creality/filament/Creality Generic PC.json	
@@ -0,0 +1,14 @@
+{
+    "type": "filament",
+    "name": "Creality Generic PC",
+    "inherits": "fdm_filament_pc",
+    "from": "system",
+    "filament_id": "GFC99",
+    "instantiation": "false",
+    "filament_max_volumetric_speed": [
+        "16"
+    ],
+    "filament_flow_ratio": [
+        "0.94"
+    ]
+}
\ No newline at end of file
diff --git a/resources/profiles/Creality/filament/Creality Generic PETG @K1-all.json b/resources/profiles/Creality/filament/Creality Generic PETG @K1-all.json
new file mode 100644
index 00000000000..5b4f750c9a7
--- /dev/null
+++ b/resources/profiles/Creality/filament/Creality Generic PETG @K1-all.json	
@@ -0,0 +1,52 @@
+{
+    "type": "filament",
+    "setting_id": "GFSG99_00",
+    "name": "Creality Generic PETG @K1-all",
+    "from": "system",
+    "instantiation": "true",
+    "inherits": "Creality Generic PETG",
+    "filament_max_volumetric_speed": [
+        "9"
+    ],
+    "slow_down_layer_time": [
+        "12"
+    ],
+    "slow_down_min_speed": [
+        "20"
+    ],
+    "cool_plate_temp": [
+        "70"
+    ],
+    "eng_plate_temp": [
+        "70"
+    ],
+    "hot_plate_temp": [
+        "70"
+    ],
+    "textured_plate_temp": [
+        "70"
+    ],
+    "cool_plate_temp_initial_layer": [
+        "70"
+    ],
+    "eng_plate_temp_initial_layer": [
+        "70"
+    ],
+    "hot_plate_temp_initial_layer": [
+        "70"
+    ],
+    "textured_plate_temp_initial_layer": [
+        "70"
+    ],
+    "nozzle_temperature_initial_layer": [
+        "250"
+    ],
+    "nozzle_temperature": [
+        "250"
+    ],
+    "compatible_printers": [
+        "Creality K1C 0.4 nozzle",
+        "Creality K1C 0.6 nozzle",
+        "Creality K1C 0.8 nozzle"
+    ]
+}
\ No newline at end of file
diff --git a/resources/profiles/Creality/filament/Creality Generic PLA @K1-all.json b/resources/profiles/Creality/filament/Creality Generic PLA @K1-all.json
new file mode 100644
index 00000000000..2d6ae3d2622
--- /dev/null
+++ b/resources/profiles/Creality/filament/Creality Generic PLA @K1-all.json	
@@ -0,0 +1,43 @@
+{
+    "type": "filament",
+    "setting_id": "GFSL99_00",
+    "name": "Creality Generic PLA @K1-all",
+    "from": "system",
+    "instantiation": "true",
+    "inherits": "Creality Generic PLA",
+    "filament_max_volumetric_speed": [
+        "18"
+    ],
+    "slow_down_min_speed": [
+        "20"
+    ],
+    "cool_plate_temp": [
+        "55"
+    ],
+    "eng_plate_temp": [
+        "55"
+    ],
+    "hot_plate_temp": [
+        "55"
+    ],
+    "textured_plate_temp": [
+        "55"
+    ],
+    "cool_plate_temp_initial_layer": [
+        "55"
+    ],
+    "eng_plate_temp_initial_layer": [
+        "55"
+    ],
+    "hot_plate_temp_initial_layer": [
+        "55"
+    ],
+    "textured_plate_temp_initial_layer": [
+        "55"
+    ],
+    "compatible_printers": [
+        "Creality K1C 0.4 nozzle",
+        "Creality K1C 0.6 nozzle",
+        "Creality K1C 0.8 nozzle"
+    ]
+}
\ No newline at end of file
diff --git a/resources/profiles/Creality/filament/Creality Generic PLA High Speed @K1-all.json b/resources/profiles/Creality/filament/Creality Generic PLA High Speed @K1-all.json
new file mode 100644
index 00000000000..083b3b30b73
--- /dev/null
+++ b/resources/profiles/Creality/filament/Creality Generic PLA High Speed @K1-all.json	
@@ -0,0 +1,22 @@
+{
+    "type": "filament",
+    "setting_id": "GFSL95_00",
+    "name": "Creality Generic PLA High Speed @K1-all",
+    "from": "system",
+    "instantiation": "true",
+    "inherits": "Creality Generic PLA @K1-all",
+    "filament_max_volumetric_speed": [
+        "23"
+    ],
+    "compatible_printers": [
+		"Creality K1 (0.4 nozzle)",
+		"Creality K1 (0.6 nozzle)",
+		"Creality K1 (0.8 nozzle)",
+        "Creality K1C 0.4 nozzle",
+        "Creality K1C 0.6 nozzle",
+        "Creality K1C 0.8 nozzle",
+		"Creality K1 Max (0.4 nozzle)",
+		"Creality K1 Max (0.6 nozzle)",
+		"Creality K1 Max (0.8 nozzle)"
+    ]
+}
\ No newline at end of file
diff --git a/resources/profiles/Creality/filament/Creality Generic PLA Matte @K1-all.json b/resources/profiles/Creality/filament/Creality Generic PLA Matte @K1-all.json
new file mode 100644
index 00000000000..4dfcea7c892
--- /dev/null
+++ b/resources/profiles/Creality/filament/Creality Generic PLA Matte @K1-all.json	
@@ -0,0 +1,22 @@
+{
+    "type": "filament",
+    "setting_id": "GFSL05_00",
+    "name": "Creality Generic PLA Matte @K1-all",
+    "from": "system",
+    "instantiation": "true",
+    "inherits": "Creality Generic PLA @K1-all",
+    "filament_max_volumetric_speed": [
+        "18"
+    ],
+    "compatible_printers": [
+		"Creality K1 (0.4 nozzle)",
+		"Creality K1 (0.6 nozzle)",
+		"Creality K1 (0.8 nozzle)",
+        "Creality K1C 0.4 nozzle",
+        "Creality K1C 0.6 nozzle",
+        "Creality K1C 0.8 nozzle",
+		"Creality K1 Max (0.4 nozzle)",
+		"Creality K1 Max (0.6 nozzle)",
+		"Creality K1 Max (0.8 nozzle)"
+    ]
+}
\ No newline at end of file
diff --git a/resources/profiles/Creality/filament/Creality Generic PLA Silk @K1-all.json b/resources/profiles/Creality/filament/Creality Generic PLA Silk @K1-all.json
new file mode 100644
index 00000000000..c8170220ac7
--- /dev/null
+++ b/resources/profiles/Creality/filament/Creality Generic PLA Silk @K1-all.json	
@@ -0,0 +1,22 @@
+{
+    "type": "filament",
+    "setting_id": "GFSL96_00",
+    "name": "Creality Generic PLA Silk @K1-all",
+    "from": "system",
+    "instantiation": "true",
+    "inherits": "Creality Generic PLA @K1-all",
+    "filament_max_volumetric_speed": [
+        "7.5"
+    ],
+    "compatible_printers": [
+		"Creality K1 (0.4 nozzle)",
+		"Creality K1 (0.6 nozzle)",
+		"Creality K1 (0.8 nozzle)",
+        "Creality K1C 0.4 nozzle",
+        "Creality K1C 0.6 nozzle",
+        "Creality K1C 0.8 nozzle",
+		"Creality K1 Max (0.4 nozzle)",
+		"Creality K1 Max (0.6 nozzle)",
+		"Creality K1 Max (0.8 nozzle)"
+    ]
+}
\ No newline at end of file
diff --git a/resources/profiles/Creality/filament/Creality Generic PLA-CF @K1-all.json b/resources/profiles/Creality/filament/Creality Generic PLA-CF @K1-all.json
new file mode 100644
index 00000000000..642ca517afe
--- /dev/null
+++ b/resources/profiles/Creality/filament/Creality Generic PLA-CF @K1-all.json	
@@ -0,0 +1,22 @@
+{
+    "type": "filament",
+    "setting_id": "GFSL96_00",
+    "name": "Creality Generic PLA-CF @K1-all",
+    "from": "system",
+    "instantiation": "true",
+    "inherits": "Creality Generic PLA-CF",
+    "additional_cooling_fan_speed": [
+        "0"
+    ],
+    "compatible_printers": [
+        "Creality K1 (0.4 nozzle)",
+        "Creality K1 (0.6 nozzle)",
+        "Creality K1 (0.8 nozzle)",
+        "Creality K1C 0.4 nozzle",
+        "Creality K1C 0.6 nozzle",
+        "Creality K1C 0.8 nozzle",
+        "Creality K1 Max (0.4 nozzle)",
+        "Creality K1 Max (0.6 nozzle)",
+        "Creality K1 Max (0.8 nozzle)"
+    ]
+}
\ No newline at end of file
diff --git a/resources/profiles/Creality/filament/Creality Generic PLA-CF.json b/resources/profiles/Creality/filament/Creality Generic PLA-CF.json
new file mode 100644
index 00000000000..fe884a8412a
--- /dev/null
+++ b/resources/profiles/Creality/filament/Creality Generic PLA-CF.json	
@@ -0,0 +1,24 @@
+{
+    "type": "filament",
+    "filament_id": "GFL98",
+    "name": "Creality Generic PLA-CF",
+    "from": "system",
+    "instantiation": "true",
+    "inherits": "fdm_filament_pla",
+    "filament_flow_ratio": [
+        "0.95"
+    ],
+    "filament_type": [
+        "PLA-CF"
+    ],
+    "filament_max_volumetric_speed": [
+        "12"
+    ],
+    "slow_down_layer_time": [
+        "7"
+    ],
+    "filament_cost": [
+        "30"
+    ],
+    "compatible_printers": []
+}
\ No newline at end of file
diff --git a/resources/profiles/Creality/filament/Creality Generic TPU @K1-all.json b/resources/profiles/Creality/filament/Creality Generic TPU @K1-all.json
new file mode 100644
index 00000000000..b3d572cc848
--- /dev/null
+++ b/resources/profiles/Creality/filament/Creality Generic TPU @K1-all.json	
@@ -0,0 +1,37 @@
+{
+    "type": "filament",
+    "setting_id": "GFU99_CREALITY_00",
+    "name": "Creality Generic TPU @K1-all",
+    "from": "system",
+    "instantiation": "true",
+    "inherits": "Creality Generic TPU",
+    "hot_plate_temp": [
+        "30"
+    ],
+    "hot_plate_temp_initial_layer": [
+        "30"
+    ],
+    "textured_plate_temp": [
+        "30"
+    ],
+    "textured_plate_temp_initial_layer": [
+        "30"
+    ],
+    "nozzle_temperature_initial_layer": [
+        "230"
+    ],
+    "nozzle_temperature": [
+        "230"
+    ],
+    "filament_max_volumetric_speed": [
+        "3.5"
+    ],
+    "slow_down_layer_time": [
+        "5"
+    ],
+    "compatible_printers": [
+        "Creality K1C 0.4 nozzle",
+        "Creality K1C 0.6 nozzle",
+        "Creality K1C 0.8 nozzle"
+    ]
+}
\ No newline at end of file
diff --git a/resources/profiles/Creality/filament/Creality HF Generic PLA.json b/resources/profiles/Creality/filament/Creality HF Generic PLA.json
index 4f5a1b4625e..d9840d5d4d5 100644
--- a/resources/profiles/Creality/filament/Creality HF Generic PLA.json	
+++ b/resources/profiles/Creality/filament/Creality HF Generic PLA.json	
@@ -1,20 +1,29 @@
 {
-	"type": "filament",
-	"filament_id": "GFL99",
-	"setting_id": "GFSA04",
-	"name": "Creality HF Generic PLA",
-	"from": "system",
-	"instantiation": "true",
-	"inherits": "fdm_filament_pla",
-	"filament_flow_ratio": ["0.98"],
-	"filament_max_volumetric_speed": ["18"],
-	"slow_down_layer_time": ["5"],
-	"compatible_printers": [
-		"Creality K1 (0.4 nozzle)",
-		"Creality K1 (0.6 nozzle)",
-		"Creality K1 (0.8 nozzle)",
-		"Creality K1 Max (0.4 nozzle)",
-		"Creality K1 Max (0.6 nozzle)",
-		"Creality K1 Max (0.8 nozzle)"
-	]
-}
+    "type": "filament",
+    "filament_id": "GFL99",
+    "setting_id": "GFSA04",
+    "name": "Creality HF Generic PLA",
+    "from": "system",
+    "instantiation": "true",
+    "inherits": "fdm_filament_pla",
+    "filament_flow_ratio": [
+        "0.98"
+    ],
+    "filament_max_volumetric_speed": [
+        "18"
+    ],
+    "slow_down_layer_time": [
+        "8"
+    ],
+    "slow_down_min_speed": [
+        "20"
+    ],
+    "compatible_printers": [
+        "Creality K1 (0.4 nozzle)",
+        "Creality K1 (0.6 nozzle)",
+        "Creality K1 (0.8 nozzle)",
+        "Creality K1 Max (0.4 nozzle)",
+        "Creality K1 Max (0.6 nozzle)",
+        "Creality K1 Max (0.8 nozzle)"
+    ]
+}
\ No newline at end of file
diff --git a/resources/profiles/Creality/filament/Creality HF Generic Speed PLA.json b/resources/profiles/Creality/filament/Creality HF Generic Speed PLA.json
index 1edf628d0ff..a38f1f494f7 100644
--- a/resources/profiles/Creality/filament/Creality HF Generic Speed PLA.json	
+++ b/resources/profiles/Creality/filament/Creality HF Generic Speed PLA.json	
@@ -9,6 +9,9 @@
 	"filament_flow_ratio": ["0.98"],
 	"filament_max_volumetric_speed": ["23"],
 	"slow_down_layer_time": ["5"],
+    "slow_down_min_speed": [
+        "20"
+    ],
 	"compatible_printers": [
 		"Creality K1 (0.4 nozzle)",
 		"Creality K1 (0.6 nozzle)",
diff --git a/resources/profiles/Creality/filament/fdm_filament_pa.json b/resources/profiles/Creality/filament/fdm_filament_pa.json
new file mode 100644
index 00000000000..1cd78ec77f6
--- /dev/null
+++ b/resources/profiles/Creality/filament/fdm_filament_pa.json
@@ -0,0 +1,82 @@
+{
+    "type": "filament",
+    "name": "fdm_filament_pa",
+    "inherits": "fdm_filament_common",
+    "from": "system",
+    "instantiation": "false",
+    "activate_air_filtration": [
+        "1"
+    ],
+    "cool_plate_temp": [
+        "0"
+    ],
+    "cool_plate_temp_initial_layer": [
+        "0"
+    ],
+    "eng_plate_temp": [
+        "100"
+    ],
+    "eng_plate_temp_initial_layer": [
+        "100"
+    ],
+    "fan_cooling_layer_time": [
+        "4"
+    ],
+    "fan_max_speed": [
+        "60"
+    ],
+    "fan_min_speed": [
+        "0"
+    ],
+    "filament_cost": [
+        "20"
+    ],
+    "filament_density": [
+        "1.04"
+    ],
+    "filament_max_volumetric_speed": [
+        "8"
+    ],
+    "filament_type": [
+        "PA"
+    ],
+    "hot_plate_temp": [
+        "100"
+    ],
+    "hot_plate_temp_initial_layer": [
+        "100"
+    ],
+    "nozzle_temperature": [
+        "290"
+    ],
+    "nozzle_temperature_initial_layer": [
+        "290"
+    ],
+    "nozzle_temperature_range_high": [
+        "300"
+    ],
+    "nozzle_temperature_range_low": [
+        "260"
+    ],
+    "overhang_fan_speed": [
+        "30"
+    ],
+    "required_nozzle_HRC": [
+        "40"
+    ],
+    "slow_down_layer_time": [
+        "2"
+    ],
+    "slow_down_min_speed": [
+        "20"
+    ],
+    "temperature_vitrification": [
+        "108"
+    ],
+    "textured_plate_temp": [
+        "100"
+    ],
+    "textured_plate_temp_initial_layer": [
+        "100"
+    ]
+}
\ No newline at end of file
diff --git a/resources/profiles/Creality/filament/fdm_filament_pc.json b/resources/profiles/Creality/filament/fdm_filament_pc.json
new file mode 100644
index 00000000000..57291142973
--- /dev/null
+++ b/resources/profiles/Creality/filament/fdm_filament_pc.json
@@ -0,0 +1,82 @@
+{
+    "type": "filament",
+    "name": "fdm_filament_pc",
+    "inherits": "fdm_filament_common",
+    "from": "system",
+    "instantiation": "false",
+    "cool_plate_temp": [
+        "0"
+    ],
+    "eng_plate_temp": [
+        "110"
+    ],
+    "hot_plate_temp": [
+        "110"
+    ],
+    "textured_plate_temp": [
+        "110"
+    ],
+    "cool_plate_temp_initial_layer": [
+        "0"
+    ],
+    "eng_plate_temp_initial_layer": [
+        "110"
+    ],
+    "hot_plate_temp_initial_layer": [
+        "110"
+    ],
+    "textured_plate_temp_initial_layer": [
+        "110"
+    ],
+    "fan_cooling_layer_time": [
+        "30"
+    ],
+    "filament_max_volumetric_speed": [
+        "23.2"
+    ],
+    "filament_type": [
+        "PC"
+    ],
+    "filament_density": [
+        "1.04"
+    ],
+    "filament_cost": [
+        "20"
+    ],
+    "nozzle_temperature_initial_layer": [
+        "270"
+    ],
+    "reduce_fan_stop_start_freq": [
+        "1"
+    ],
+    "fan_max_speed": [
+        "60"
+    ],
+    "fan_min_speed": [
+        "10"
+    ],
+    "overhang_fan_threshold": [
+        "25%"
+    ],
+    "overhang_fan_speed": [
+        "60"
+    ],
+    "nozzle_temperature": [
+        "280"
+    ],
+    "temperature_vitrification": [
+        "120"
+    ],
+    "nozzle_temperature_range_low": [
+        "260"
+    ],
+    "nozzle_temperature_range_high": [
+        "290"
+    ],
+    "slow_down_min_speed": [
+        "20"
+    ],
+    "slow_down_layer_time": [
+        "2"
+    ]
+}
\ No newline at end of file
diff --git a/resources/profiles/Creality/filament/fdm_filament_pet.json b/resources/profiles/Creality/filament/fdm_filament_pet.json
index bb2323e9c1e..2cbef62ede6 100644
--- a/resources/profiles/Creality/filament/fdm_filament_pet.json
+++ b/resources/profiles/Creality/filament/fdm_filament_pet.json
@@ -74,7 +74,7 @@
         "220"
     ],
     "nozzle_temperature_range_high": [
-        "260"
+        "270"
     ],
     "filament_start_gcode": [
         "; filament start gcode\n"
diff --git a/resources/profiles/Creality/machine/Creality K1 (0.4 nozzle).json b/resources/profiles/Creality/machine/Creality K1 (0.4 nozzle).json
index 08e8a647a6c..5683fdb6243 100644
--- a/resources/profiles/Creality/machine/Creality K1 (0.4 nozzle).json	
+++ b/resources/profiles/Creality/machine/Creality K1 (0.4 nozzle).json	
@@ -14,6 +14,7 @@
 	"printable_height": "250",
 	"nozzle_type": "brass",
 	"auxiliary_fan": "1",
+	"support_multi_bed_types": "1",
 	"machine_max_acceleration_e": ["5000", "5000"],
 	"machine_max_acceleration_extruding": ["20000", "20000"],
 	"machine_max_acceleration_retracting": ["5000", "5000"],
@@ -22,9 +23,9 @@
 	"machine_max_acceleration_y": ["20000", "20000"],
 	"machine_max_acceleration_z": ["500", "500"],
 	"machine_max_speed_e": ["100", "100"],
-	"machine_max_speed_x": ["1000", "1000"],
-	"machine_max_speed_y": ["1000", "1000"],
-	"machine_max_speed_z": ["30", "30"],
+	"machine_max_speed_x": ["800", "800"],
+	"machine_max_speed_y": ["800", "800"],
+	"machine_max_speed_z": ["20", "20"],
 	"machine_max_jerk_e": ["2.5", "2.5"],
 	"machine_max_jerk_x": ["12", "12"],
 	"machine_max_jerk_y": ["12", "12"],
@@ -34,7 +35,7 @@
 	"printer_settings_id": "Creality",
 	"retraction_minimum_travel": ["2"],
 	"retract_before_wipe": ["70%"],
-	"retraction_length": ["0.5"],
+	"retraction_length": ["0.6"],
 	"retract_length_toolchange": ["1"],
 	"retraction_speed": ["40"],
 	"deretraction_speed": ["40"],
@@ -46,12 +47,12 @@
 	"manual_filament_change": "1",
 	"change_filament_gcode": "PAUSE",
 	"machine_pause_gcode": "PAUSE",
-	"default_filament_profile": ["Creality Generic PLA"],
+	"default_filament_profile": ["Creality HF Generic PLA"],
 	"machine_start_gcode": "M140 S0\nM104 S0 \nSTART_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]",
 	"machine_end_gcode": "END_PRINT",
 	"scan_first_layer": "0",
 	"thumbnails": [
-		"96x96",
-		"300x300"
+		"100x100",
+		"320x320"
 	]
 }
diff --git a/resources/profiles/Creality/machine/Creality K1 (0.6 nozzle).json b/resources/profiles/Creality/machine/Creality K1 (0.6 nozzle).json
index b14a7c12901..c3080ab4dd4 100644
--- a/resources/profiles/Creality/machine/Creality K1 (0.6 nozzle).json	
+++ b/resources/profiles/Creality/machine/Creality K1 (0.6 nozzle).json	
@@ -14,6 +14,7 @@
 	"printable_height": "250",
 	"nozzle_type": "brass",
 	"auxiliary_fan": "1",
+	"support_multi_bed_types": "1",
 	"machine_max_acceleration_e": ["5000", "5000"],
 	"machine_max_acceleration_extruding": ["20000", "20000"],
 	"machine_max_acceleration_retracting": ["5000", "5000"],
@@ -22,9 +23,9 @@
 	"machine_max_acceleration_y": ["20000", "20000"],
 	"machine_max_acceleration_z": ["500", "500"],
 	"machine_max_speed_e": ["100", "100"],
-	"machine_max_speed_x": ["1000", "1000"],
-	"machine_max_speed_y": ["1000", "1000"],
-	"machine_max_speed_z": ["30", "30"],
+	"machine_max_speed_x": ["800", "800"],
+	"machine_max_speed_y": ["800", "800"],
+	"machine_max_speed_z": ["20", "20"],
 	"machine_max_jerk_e": ["2.5", "2.5"],
 	"machine_max_jerk_x": ["12", "12"],
 	"machine_max_jerk_y": ["12", "12"],
@@ -46,12 +47,12 @@
 	"manual_filament_change": "1",
 	"change_filament_gcode": "PAUSE",
 	"machine_pause_gcode": "PAUSE",
-	"default_filament_profile": ["Creality Generic PLA"],
+	"default_filament_profile": ["Creality HF Generic PLA"],
 	"machine_start_gcode": "M140 S0\nM104 S0 \nSTART_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]",
 	"machine_end_gcode": "END_PRINT",
 	"scan_first_layer": "0",
 	"thumbnails": [
-		"96x96",
-		"300x300"
+		"100x100",
+		"320x320"
 	]
 }
diff --git a/resources/profiles/Creality/machine/Creality K1 (0.8 nozzle).json b/resources/profiles/Creality/machine/Creality K1 (0.8 nozzle).json
index 754d89ef21a..61649c930ba 100644
--- a/resources/profiles/Creality/machine/Creality K1 (0.8 nozzle).json	
+++ b/resources/profiles/Creality/machine/Creality K1 (0.8 nozzle).json	
@@ -14,6 +14,7 @@
 	"printable_height": "250",
 	"nozzle_type": "brass",
 	"auxiliary_fan": "1",
+	"support_multi_bed_types": "1",
 	"machine_max_acceleration_e": ["5000", "5000"],
 	"machine_max_acceleration_extruding": ["20000", "20000"],
 	"machine_max_acceleration_retracting": ["5000", "5000"],
@@ -22,9 +23,9 @@
 	"machine_max_acceleration_y": ["20000", "20000"],
 	"machine_max_acceleration_z": ["500", "500"],
 	"machine_max_speed_e": ["100", "100"],
-	"machine_max_speed_x": ["1000", "1000"],
-	"machine_max_speed_y": ["1000", "1000"],
-	"machine_max_speed_z": ["30", "30"],
+	"machine_max_speed_x": ["800", "800"],
+	"machine_max_speed_y": ["800", "800"],
+	"machine_max_speed_z": ["20", "20"],
 	"machine_max_jerk_e": ["2.5", "2.5"],
 	"machine_max_jerk_x": ["12", "12"],
 	"machine_max_jerk_y": ["12", "12"],
@@ -46,12 +47,12 @@
 	"manual_filament_change": "1",
 	"change_filament_gcode": "PAUSE",
 	"machine_pause_gcode": "PAUSE",
-	"default_filament_profile": ["Creality Generic PLA"],
+	"default_filament_profile": ["Creality HF Generic PLA"],
 	"machine_start_gcode": "M140 S0\nM104 S0 \nSTART_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]",
 	"machine_end_gcode": "END_PRINT",
 	"scan_first_layer": "0",
 	"thumbnails": [
-		"96x96",
-		"300x300"
+		"100x100",
+		"320x320"
 	]
 }
diff --git a/resources/profiles/Creality/machine/Creality K1 Max (0.4 nozzle).json b/resources/profiles/Creality/machine/Creality K1 Max (0.4 nozzle).json
index e999f3f96cb..524131fb0b3 100644
--- a/resources/profiles/Creality/machine/Creality K1 Max (0.4 nozzle).json	
+++ b/resources/profiles/Creality/machine/Creality K1 Max (0.4 nozzle).json	
@@ -15,6 +15,7 @@
 	"nozzle_type": "hardened_steel",
 	"auxiliary_fan": "1",
 	"support_air_filtration": "1",
+	"support_multi_bed_types": "1",
 	"machine_max_acceleration_e": ["5000", "5000"],
 	"machine_max_acceleration_extruding": ["20000", "20000"],
 	"machine_max_acceleration_retracting": ["5000", "5000"],
@@ -23,9 +24,9 @@
 	"machine_max_acceleration_y": ["20000", "20000"],
 	"machine_max_acceleration_z": ["500", "500"],
 	"machine_max_speed_e": ["100", "100"],
-	"machine_max_speed_x": ["1000", "1000"],
-	"machine_max_speed_y": ["1000", "1000"],
-	"machine_max_speed_z": ["30", "30"],
+	"machine_max_speed_x": ["800", "800"],
+	"machine_max_speed_y": ["800", "800"],
+	"machine_max_speed_z": ["20", "20"],
 	"machine_max_jerk_e": ["2.5", "2.5"],
 	"machine_max_jerk_x": ["12", "12"],
 	"machine_max_jerk_y": ["12", "12"],
@@ -35,7 +36,7 @@
 	"printer_settings_id": "Creality",
 	"retraction_minimum_travel": ["2"],
 	"retract_before_wipe": ["70%"],
-	"retraction_length": ["0.5"],
+	"retraction_length": ["0.6"],
 	"retract_length_toolchange": ["1"],
 	"retraction_speed": ["40"],
 	"deretraction_speed": ["40"],
@@ -47,12 +48,12 @@
 	"manual_filament_change": "1",
 	"change_filament_gcode": "PAUSE",
 	"machine_pause_gcode": "PAUSE",
-	"default_filament_profile": ["Creality Generic PLA"],
+	"default_filament_profile": ["Creality HF Generic PLA"],
 	"machine_start_gcode": "M140 S0\nM104 S0 \nSTART_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]",
 	"machine_end_gcode": "END_PRINT",
 	"scan_first_layer": "0",
 	"thumbnails": [
-		"96x96",
-		"300x300"
+		"100x100",
+		"320x320"
 	]
 }
diff --git a/resources/profiles/Creality/machine/Creality K1 Max (0.6 nozzle).json b/resources/profiles/Creality/machine/Creality K1 Max (0.6 nozzle).json
index 79aa6f90d40..21abf7ec8f8 100644
--- a/resources/profiles/Creality/machine/Creality K1 Max (0.6 nozzle).json	
+++ b/resources/profiles/Creality/machine/Creality K1 Max (0.6 nozzle).json	
@@ -15,6 +15,7 @@
 	"nozzle_type": "hardened_steel",
 	"auxiliary_fan": "1",
 	"support_air_filtration": "1",
+	"support_multi_bed_types": "1",
 	"machine_max_acceleration_e": ["5000", "5000"],
 	"machine_max_acceleration_extruding": ["20000", "20000"],
 	"machine_max_acceleration_retracting": ["5000", "5000"],
@@ -23,9 +24,9 @@
 	"machine_max_acceleration_y": ["20000", "20000"],
 	"machine_max_acceleration_z": ["500", "500"],
 	"machine_max_speed_e": ["100", "100"],
-	"machine_max_speed_x": ["1000", "1000"],
-	"machine_max_speed_y": ["1000", "1000"],
-	"machine_max_speed_z": ["30", "30"],
+	"machine_max_speed_x": ["800", "800"],
+	"machine_max_speed_y": ["800", "800"],
+	"machine_max_speed_z": ["20", "20"],
 	"machine_max_jerk_e": ["2.5", "2.5"],
 	"machine_max_jerk_x": ["12", "12"],
 	"machine_max_jerk_y": ["12", "12"],
@@ -47,12 +48,12 @@
 	"manual_filament_change": "1",
 	"change_filament_gcode": "PAUSE",
 	"machine_pause_gcode": "PAUSE",
-	"default_filament_profile": ["Creality Generic PLA"],
+	"default_filament_profile": ["Creality HF Generic PLA"],
 	"machine_start_gcode": "M140 S0\nM104 S0 \nSTART_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]",
 	"machine_end_gcode": "END_PRINT",
 	"scan_first_layer": "0",
 	"thumbnails": [
-		"96x96",
-		"300x300"
+		"100x100",
+		"320x320"
 	]
 }
diff --git a/resources/profiles/Creality/machine/Creality K1 Max (0.8 nozzle).json b/resources/profiles/Creality/machine/Creality K1 Max (0.8 nozzle).json
index aa439ff6e11..8a65bf91546 100644
--- a/resources/profiles/Creality/machine/Creality K1 Max (0.8 nozzle).json	
+++ b/resources/profiles/Creality/machine/Creality K1 Max (0.8 nozzle).json	
@@ -15,6 +15,7 @@
 	"nozzle_type": "hardened_steel",
 	"auxiliary_fan": "1",
 	"support_air_filtration": "1",
+	"support_multi_bed_types": "1",
 	"machine_max_acceleration_e": ["5000", "5000"],
 	"machine_max_acceleration_extruding": ["20000", "20000"],
 	"machine_max_acceleration_retracting": ["5000", "5000"],
@@ -23,9 +24,9 @@
 	"machine_max_acceleration_y": ["20000", "20000"],
 	"machine_max_acceleration_z": ["500", "500"],
 	"machine_max_speed_e": ["100", "100"],
-	"machine_max_speed_x": ["1000", "1000"],
-	"machine_max_speed_y": ["1000", "1000"],
-	"machine_max_speed_z": ["30", "30"],
+	"machine_max_speed_x": ["800", "800"],
+	"machine_max_speed_y": ["800", "800"],
+	"machine_max_speed_z": ["20", "20"],
 	"machine_max_jerk_e": ["2.5", "2.5"],
 	"machine_max_jerk_x": ["12", "12"],
 	"machine_max_jerk_y": ["12", "12"],
@@ -47,12 +48,12 @@
 	"manual_filament_change": "1",
 	"change_filament_gcode": "PAUSE",
 	"machine_pause_gcode": "PAUSE",
-	"default_filament_profile": ["Creality Generic PLA"],
+	"default_filament_profile": ["Creality HF Generic PLA"],
 	"machine_start_gcode": "M140 S0\nM104 S0 \nSTART_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]",
 	"machine_end_gcode": "END_PRINT",
 	"scan_first_layer": "0",
 	"thumbnails": [
-		"96x96",
-		"300x300"
+		"100x100",
+		"320x320"
 	]
 }
diff --git a/resources/profiles/Creality/machine/Creality K1 Max.json b/resources/profiles/Creality/machine/Creality K1 Max.json
index e1d1d5fcd77..b74f86b5f41 100644
--- a/resources/profiles/Creality/machine/Creality K1 Max.json	
+++ b/resources/profiles/Creality/machine/Creality K1 Max.json	
@@ -8,5 +8,5 @@
     "bed_model": "creality_k1max_buildplate_model.stl",
     "bed_texture": "creality_k1max_buildplate_texture.png",
     "hotend_model": "",
-    "default_materials": "Creality Generic PLA;Creality HF Generic PLA;Creality HF Generic Speed PLA;Creality Generic PETG;Creality Generic TPU;Creality Generic ABS"
+    "default_materials": "Creality Generic ABS;Creality Generic ASA;Creality Generic PA-CF @K1-all;Creality Generic PC @K1-all;Creality Generic PETG;Creality Generic PLA;Creality HF Generic PLA;Creality HF Generic Speed PLA;Creality Generic PLA High Speed @K1-all;Creality Generic PLA Matte @K1-all;Creality Generic PLA Silk @K1-all;Creality Generic PLA-CF @K1-all;Creality Generic TPU"
 }
diff --git a/resources/profiles/Creality/machine/Creality K1.json b/resources/profiles/Creality/machine/Creality K1.json
index bc76e3bf7cf..dedfc160313 100644
--- a/resources/profiles/Creality/machine/Creality K1.json	
+++ b/resources/profiles/Creality/machine/Creality K1.json	
@@ -8,5 +8,5 @@
     "bed_model": "creality_k1_buildplate_model.stl",
     "bed_texture": "creality_k1_buildplate_texture.png",
     "hotend_model": "",
-    "default_materials": "Creality Generic PLA;Creality HF Generic PLA;Creality HF Generic Speed PLA;Creality Generic PETG;Creality Generic TPU;Creality Generic ABS"
+    "default_materials": "Creality Generic ABS;Creality Generic ASA;Creality Generic PC @K1-all;Creality Generic PLA;Creality HF Generic PLA;Creality HF Generic Speed PLA;Creality Generic PLA High Speed @K1-all;Creality Generic PLA Matte @K1-all;Creality Generic PLA Silk @K1-all;Creality Generic PETG;Creality Generic TPU"
 }
diff --git a/resources/profiles/Creality/machine/Creality K1C 0.4 nozzle.json b/resources/profiles/Creality/machine/Creality K1C 0.4 nozzle.json
new file mode 100644
index 00000000000..ff0a887772b
--- /dev/null
+++ b/resources/profiles/Creality/machine/Creality K1C 0.4 nozzle.json	
@@ -0,0 +1,131 @@
+{
+    "type": "machine",
+    "setting_id": "GM001",
+    "name": "Creality K1C 0.4 nozzle",
+    "from": "system",
+    "instantiation": "true",
+    "inherits": "fdm_creality_common",
+    "printer_model": "Creality K1C",
+    "gcode_flavor": "klipper",
+    "default_print_profile": "0.20mm Standard @Creality K1C (0.4 nozzle)",
+    "nozzle_diameter": [
+        "0.4"
+    ],
+    "printer_variant": "0.4",
+    "printable_area": [
+        "0x0",
+        "220x0",
+        "220x220",
+        "0x220"
+    ],
+    "printable_height": "250",
+    "nozzle_type": "hardened_steel",
+    "auxiliary_fan": "1",
+	"support_air_filtration": "1",
+	"support_multi_bed_types": "1",
+    "machine_max_acceleration_e": [
+        "5000",
+        "5000"
+    ],
+    "machine_max_acceleration_extruding": [
+        "20000",
+        "20000"
+    ],
+    "machine_max_acceleration_retracting": [
+        "5000",
+        "5000"
+    ],
+    "machine_max_acceleration_travel": [
+        "9000",
+        "9000"
+    ],
+    "machine_max_acceleration_x": [
+        "20000",
+        "20000"
+    ],
+    "machine_max_acceleration_y": [
+        "20000",
+        "20000"
+    ],
+    "machine_max_acceleration_z": [
+        "500",
+        "500"
+    ],
+    "machine_max_speed_e": [
+        "100",
+        "100"
+    ],
+    "machine_max_speed_x": [
+        "800",
+        "800"
+    ],
+    "machine_max_speed_y": [
+        "800",
+        "800"
+    ],
+    "machine_max_speed_z": [
+        "20",
+        "20"
+    ],
+    "machine_max_jerk_e": [
+        "2.5",
+        "2.5"
+    ],
+    "machine_max_jerk_x": [
+        "12",
+        "12"
+    ],
+    "machine_max_jerk_y": [
+        "12",
+        "12"
+    ],
+    "machine_max_jerk_z": [
+        "2",
+        "2"
+    ],
+    "max_layer_height": [
+        "0.3"
+    ],
+    "min_layer_height": [
+        "0.08"
+    ],
+    "printer_settings_id": "Creality",
+    "retraction_minimum_travel": [
+        "2"
+    ],
+    "retract_before_wipe": [
+        "70%"
+    ],
+    "retraction_length": [
+        "0.6"
+    ],
+    "retract_length_toolchange": [
+        "1"
+    ],
+    "retraction_speed": [
+        "40"
+    ],
+    "deretraction_speed": [
+        "40"
+    ],
+    "extruder_clearance_height_to_lid": "101",
+    "extruder_clearance_height_to_rod": "45",
+    "extruder_clearance_radius": "45",
+    "z_hop": [
+        "0.2"
+    ],
+    "single_extruder_multi_material": "1",
+    "manual_filament_change": "1",
+    "change_filament_gcode": "PAUSE",
+    "machine_pause_gcode": "PAUSE",
+    "default_filament_profile": [
+        "Creality Generic PLA @K1-all"
+    ],
+    "machine_start_gcode": "M140 S0\nM104 S0 \nSTART_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]",
+    "machine_end_gcode": "END_PRINT",
+    "scan_first_layer": "0",
+    "thumbnails": [
+        "100x100",
+        "320x320"
+    ]
+}
\ No newline at end of file
diff --git a/resources/profiles/Creality/machine/Creality K1C 0.6 nozzle.json b/resources/profiles/Creality/machine/Creality K1C 0.6 nozzle.json
new file mode 100644
index 00000000000..1cb4effc69b
--- /dev/null
+++ b/resources/profiles/Creality/machine/Creality K1C 0.6 nozzle.json	
@@ -0,0 +1,131 @@
+{
+    "type": "machine",
+    "setting_id": "GM001",
+    "name": "Creality K1C 0.6 nozzle",
+    "from": "system",
+    "instantiation": "true",
+    "inherits": "fdm_creality_common",
+    "printer_model": "Creality K1C",
+    "gcode_flavor": "klipper",
+    "default_print_profile": "0.30mm Standard @Creality K1C (0.6 nozzle)",
+    "nozzle_diameter": [
+        "0.6"
+    ],
+    "printer_variant": "0.6",
+    "printable_area": [
+        "0x0",
+        "220x0",
+        "220x220",
+        "0x220"
+    ],
+    "printable_height": "250",
+    "nozzle_type": "hardened_steel",
+    "auxiliary_fan": "1",
+	"support_air_filtration": "1",
+	"support_multi_bed_types": "1",
+    "machine_max_acceleration_e": [
+        "5000",
+        "5000"
+    ],
+    "machine_max_acceleration_extruding": [
+        "20000",
+        "20000"
+    ],
+    "machine_max_acceleration_retracting": [
+        "5000",
+        "5000"
+    ],
+    "machine_max_acceleration_travel": [
+        "9000",
+        "9000"
+    ],
+    "machine_max_acceleration_x": [
+        "20000",
+        "20000"
+    ],
+    "machine_max_acceleration_y": [
+        "20000",
+        "20000"
+    ],
+    "machine_max_acceleration_z": [
+        "500",
+        "500"
+    ],
+    "machine_max_speed_e": [
+        "100",
+        "100"
+    ],
+    "machine_max_speed_x": [
+        "1000",
+        "1000"
+    ],
+    "machine_max_speed_y": [
+        "1000",
+        "1000"
+    ],
+    "machine_max_speed_z": [
+        "30",
+        "30"
+    ],
+    "machine_max_jerk_e": [
+        "2.5",
+        "2.5"
+    ],
+    "machine_max_jerk_x": [
+        "12",
+        "12"
+    ],
+    "machine_max_jerk_y": [
+        "12",
+        "12"
+    ],
+    "machine_max_jerk_z": [
+        "2",
+        "2"
+    ],
+    "max_layer_height": [
+        "0.4"
+    ],
+    "min_layer_height": [
+        "0.08"
+    ],
+    "printer_settings_id": "Creality",
+    "retraction_minimum_travel": [
+        "2"
+    ],
+    "retract_before_wipe": [
+        "70%"
+    ],
+    "retraction_length": [
+        "0.5"
+    ],
+    "retract_length_toolchange": [
+        "1"
+    ],
+    "retraction_speed": [
+        "40"
+    ],
+    "deretraction_speed": [
+        "40"
+    ],
+    "extruder_clearance_height_to_lid": "101",
+    "extruder_clearance_height_to_rod": "45",
+    "extruder_clearance_radius": "45",
+    "z_hop": [
+        "0.2"
+    ],
+    "single_extruder_multi_material": "1",
+    "manual_filament_change": "1",
+    "change_filament_gcode": "PAUSE",
+    "machine_pause_gcode": "PAUSE",
+    "default_filament_profile": [
+        "Creality Generic PLA @K1-all"
+    ],
+    "machine_start_gcode": "M140 S0\nM104 S0 \nSTART_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]",
+    "machine_end_gcode": "END_PRINT",
+    "scan_first_layer": "0",
+    "thumbnails": [
+        "100x100",
+        "320x320"
+    ]
+}
\ No newline at end of file
diff --git a/resources/profiles/Creality/machine/Creality K1C 0.8 nozzle.json b/resources/profiles/Creality/machine/Creality K1C 0.8 nozzle.json
new file mode 100644
index 00000000000..3b41fbd72cf
--- /dev/null
+++ b/resources/profiles/Creality/machine/Creality K1C 0.8 nozzle.json	
@@ -0,0 +1,131 @@
+{
+    "type": "machine",
+    "setting_id": "GM001",
+    "name": "Creality K1C 0.8 nozzle",
+    "from": "system",
+    "instantiation": "true",
+    "inherits": "fdm_creality_common",
+    "printer_model": "Creality K1C",
+    "gcode_flavor": "klipper",
+    "default_print_profile": "0.40mm Standard @Creality K1C (0.8 nozzle)",
+    "nozzle_diameter": [
+        "0.8"
+    ],
+    "printer_variant": "0.8",
+    "printable_area": [
+        "0x0",
+        "220x0",
+        "220x220",
+        "0x220"
+    ],
+    "printable_height": "250",
+    "nozzle_type": "hardened_steel",
+    "auxiliary_fan": "1",
+	"support_air_filtration": "1",
+	"support_multi_bed_types": "1",
+    "machine_max_acceleration_e": [
+        "5000",
+        "5000"
+    ],
+    "machine_max_acceleration_extruding": [
+        "20000",
+        "20000"
+    ],
+    "machine_max_acceleration_retracting": [
+        "5000",
+        "5000"
+    ],
+    "machine_max_acceleration_travel": [
+        "9000",
+        "9000"
+    ],
+    "machine_max_acceleration_x": [
+        "20000",
+        "20000"
+    ],
+    "machine_max_acceleration_y": [
+        "20000",
+        "20000"
+    ],
+    "machine_max_acceleration_z": [
+        "500",
+        "500"
+    ],
+    "machine_max_speed_e": [
+        "100",
+        "100"
+    ],
+    "machine_max_speed_x": [
+        "1000",
+        "1000"
+    ],
+    "machine_max_speed_y": [
+        "1000",
+        "1000"
+    ],
+    "machine_max_speed_z": [
+        "30",
+        "30"
+    ],
+    "machine_max_jerk_e": [
+        "2.5",
+        "2.5"
+    ],
+    "machine_max_jerk_x": [
+        "12",
+        "12"
+    ],
+    "machine_max_jerk_y": [
+        "12",
+        "12"
+    ],
+    "machine_max_jerk_z": [
+        "2",
+        "2"
+    ],
+    "max_layer_height": [
+        "0.5"
+    ],
+    "min_layer_height": [
+        "0.08"
+    ],
+    "printer_settings_id": "Creality",
+    "retraction_minimum_travel": [
+        "2"
+    ],
+    "retract_before_wipe": [
+        "70%"
+    ],
+    "retraction_length": [
+        "0.5"
+    ],
+    "retract_length_toolchange": [
+        "1"
+    ],
+    "retraction_speed": [
+        "40"
+    ],
+    "deretraction_speed": [
+        "40"
+    ],
+    "extruder_clearance_height_to_lid": "101",
+    "extruder_clearance_height_to_rod": "45",
+    "extruder_clearance_radius": "45",
+    "z_hop": [
+        "0.2"
+    ],
+    "single_extruder_multi_material": "1",
+    "manual_filament_change": "1",
+    "change_filament_gcode": "PAUSE",
+    "machine_pause_gcode": "PAUSE",
+    "default_filament_profile": [
+        "Creality Generic PLA @K1-all"
+    ],
+    "machine_start_gcode": "M140 S0\nM104 S0 \nSTART_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]",
+    "machine_end_gcode": "END_PRINT",
+    "scan_first_layer": "0",
+    "thumbnails": [
+        "100x100",
+        "320x320"
+    ]
+}
\ No newline at end of file
diff --git a/resources/profiles/Creality/machine/Creality K1C.json b/resources/profiles/Creality/machine/Creality K1C.json
new file mode 100644
index 00000000000..673856d383e
--- /dev/null
+++ b/resources/profiles/Creality/machine/Creality K1C.json	
@@ -0,0 +1,12 @@
+{
+    "type": "machine_model",
+    "name": "Creality K1C",
+    "model_id": "Creality-K1C",
+    "nozzle_diameter": "0.4;0.6;0.8",
+    "machine_tech": "FFF",
+    "family": "Creality",
+    "bed_model": "creality_k1c_buildplate_model.stl",
+    "bed_texture": "creality_k1c_buildplate_texture.png",
+    "hotend_model": "",
+    "default_materials": "Creality Generic ABS @K1-all;Creality Generic ASA @K1-all;Creality Generic PA-CF @K1-all;Creality Generic PC @K1-all;Creality Generic PETG @K1-all;Creality Generic PLA @K1-all;Creality Generic PLA High Speed @K1-all;Creality Generic PLA Matte @K1-all;Creality Generic PLA Silk @K1-all;Creality Generic PLA-CF @K1-all;Creality Generic TPU @K1-all"
+}
diff --git a/resources/profiles/Creality/process/0.12mm Fine @Creality K1 (0.4 nozzle).json b/resources/profiles/Creality/process/0.12mm Fine @Creality K1 (0.4 nozzle).json
new file mode 100644
index 00000000000..a37823ac305
--- /dev/null
+++ b/resources/profiles/Creality/process/0.12mm Fine @Creality K1 (0.4 nozzle).json	
@@ -0,0 +1,116 @@
+{
+    "type": "process",
+    "setting_id": "GP004",
+    "name": "0.12mm Fine @Creality K1 (0.4 nozzle)",
+    "from": "system",
+    "inherits": "fdm_process_common_klipper",
+    "instantiation": "true",
+    "adaptive_layer_height": "0",
+    "reduce_crossing_wall": "0",
+    "max_travel_detour_distance": "0",
+    "bottom_surface_pattern": "monotonic",
+    "bottom_shell_layers": "3",
+    "bottom_shell_thickness": "0",
+    "bridge_flow": "1",
+    "bridge_speed": "25",
+    "internal_bridge_speed": "70",
+    "brim_width": "5",
+    "brim_object_gap": "0.1",
+    "compatible_printers": [
+        "Creality K1 (0.4 nozzle)"
+    ],
+    "compatible_printers_condition": "",
+    "print_sequence": "by layer",
+    "default_acceleration": "12000",
+    "bridge_no_support": "0",
+    "draft_shield": "disabled",
+    "elefant_foot_compensation": "0.15",
+    "enable_arc_fitting": "1",
+    "outer_wall_line_width": "0.42",
+    "outer_wall_speed": "200",
+    "outer_wall_acceleration": "5000",
+    "inner_wall_acceleration": "5000",
+    "wall_infill_order": "inner wall/outer wall/infill",
+    "line_width": "0.42",
+    "infill_direction": "45",
+    "sparse_infill_density": "15%",
+    "sparse_infill_pattern": "grid",
+    "internal_bridge_support_thickness": "0.8",
+    "initial_layer_acceleration": "500",
+    "initial_layer_line_width": "0.5",
+    "initial_layer_print_height": "0.12",
+    "initial_layer_speed": "60",
+    "gap_infill_speed": "300",
+    "infill_combination": "0",
+    "sparse_infill_line_width": "0.45",
+    "infill_wall_overlap": "15%",
+    "sparse_infill_speed": "500",
+    "interface_shells": "0",
+    "ironing_flow": "10%",
+    "ironing_spacing": "0.15",
+    "ironing_speed": "100",
+    "ironing_type": "no ironing",
+    "layer_height": "0.12",
+    "reduce_infill_retraction": "1",
+    "filename_format": "{input_filename_base}_{filament_type[initial_tool]}_{print_time}.gcode",
+    "detect_overhang_wall": "1",
+    "overhang_1_4_speed": "0",
+    "overhang_2_4_speed": "50",
+    "overhang_3_4_speed": "30",
+    "overhang_4_4_speed": "10",
+    "only_one_wall_top": "1",
+    "inner_wall_line_width": "0.45",
+    "inner_wall_speed": "300",
+    "wall_loops": "3",
+    "print_settings_id": "",
+    "raft_layers": "0",
+    "seam_position": "aligned",
+    "skirt_distance": "2",
+    "skirt_height": "1",
+    "skirt_loops": "0",
+    "minimum_sparse_infill_area": "15",
+    "internal_solid_infill_line_width": "0.42",
+    "internal_solid_infill_speed": "300",
+    "spiral_mode": "0",
+    "initial_layer_infill_speed": "105",
+    "standby_temperature_delta": "-5",
+    "enable_support": "0",
+    "resolution": "0.012",
+    "support_type": "normal(auto)",
+    "support_style": "default",
+    "support_on_build_plate_only": "0",
+    "support_top_z_distance": "0.2",
+    "support_bottom_z_distance": "0.2",
+    "support_filament": "0",
+    "support_line_width": "0.42",
+    "support_interface_loop_pattern": "0",
+    "support_interface_filament": "0",
+    "support_interface_top_layers": "2",
+    "support_interface_bottom_layers": "2",
+    "support_interface_spacing": "0.5",
+    "support_expansion": "0",
+    "support_interface_speed": "80",
+    "support_base_pattern": "default",
+    "support_base_pattern_spacing": "2.5",
+    "support_speed": "150",
+    "support_threshold_angle": "30",
+    "support_object_xy_distance": "0.35",
+    "tree_support_branch_diameter": "2",
+    "tree_support_branch_angle": "45",
+    "tree_support_wall_count": "1",
+    "detect_thin_wall": "0",
+    "top_surface_pattern": "monotonicline",
+    "top_surface_line_width": "0.42",
+    "top_surface_acceleration": "5000",
+    "top_surface_speed": "200",
+    "top_shell_layers": "5",
+    "top_shell_thickness": "0.6",
+    "travel_acceleration": "12000",
+    "travel_speed": "500",
+    "enable_prime_tower": "0",
+    "wipe_tower_no_sparse_layers": "0",
+    "prime_tower_width": "60",
+    "xy_hole_compensation": "0",
+    "xy_contour_compensation": "0",
+    "gcode_label_objects": "0"
+}
\ No newline at end of file
diff --git a/resources/profiles/Creality/process/0.12mm Fine @Creality K1C 0.4 nozzle.json b/resources/profiles/Creality/process/0.12mm Fine @Creality K1C 0.4 nozzle.json
new file mode 100644
index 00000000000..f6c49617399
--- /dev/null
+++ b/resources/profiles/Creality/process/0.12mm Fine @Creality K1C 0.4 nozzle.json	
@@ -0,0 +1,116 @@
+{
+    "type": "process",
+    "setting_id": "GP004",
+    "name": "0.12mm Fine @Creality K1C",
+    "from": "system",
+    "inherits": "fdm_process_common_klipper",
+    "instantiation": "true",
+    "adaptive_layer_height": "0",
+    "reduce_crossing_wall": "0",
+    "max_travel_detour_distance": "0",
+    "bottom_surface_pattern": "monotonic",
+    "bottom_shell_layers": "3",
+    "bottom_shell_thickness": "0",
+    "bridge_flow": "1",
+    "bridge_speed": "25",
+    "internal_bridge_speed": "70",
+    "brim_width": "5",
+    "brim_object_gap": "0.1",
+    "compatible_printers": [
+        "Creality K1C 0.4 nozzle"
+    ],
+    "compatible_printers_condition": "",
+    "print_sequence": "by layer",
+    "default_acceleration": "12000",
+    "bridge_no_support": "0",
+    "draft_shield": "disabled",
+    "elefant_foot_compensation": "0.15",
+    "enable_arc_fitting": "1",
+    "outer_wall_line_width": "0.42",
+    "outer_wall_speed": "200",
+    "outer_wall_acceleration": "5000",
+    "inner_wall_acceleration": "5000",
+    "wall_infill_order": "inner wall/outer wall/infill",
+    "line_width": "0.42",
+    "infill_direction": "45",
+    "sparse_infill_density": "15%",
+    "sparse_infill_pattern": "grid",
+    "internal_bridge_support_thickness": "0.8",
+    "initial_layer_acceleration": "500",
+    "initial_layer_line_width": "0.5",
+    "initial_layer_print_height": "0.12",
+    "initial_layer_speed": "60",
+    "gap_infill_speed": "300",
+    "infill_combination": "0",
+    "sparse_infill_line_width": "0.45",
+    "infill_wall_overlap": "15%",
+    "sparse_infill_speed": "500",
+    "interface_shells": "0",
+    "ironing_flow": "10%",
+    "ironing_spacing": "0.15",
+    "ironing_speed": "100",
+    "ironing_type": "no ironing",
+    "layer_height": "0.12",
+    "reduce_infill_retraction": "1",
+    "filename_format": "{input_filename_base}_{filament_type[initial_tool]}_{print_time}.gcode",
+    "detect_overhang_wall": "1",
+    "overhang_1_4_speed": "0",
+    "overhang_2_4_speed": "50",
+    "overhang_3_4_speed": "30",
+    "overhang_4_4_speed": "10",
+    "only_one_wall_top": "1",
+    "inner_wall_line_width": "0.45",
+    "inner_wall_speed": "300",
+    "wall_loops": "3",
+    "print_settings_id": "",
+    "raft_layers": "0",
+    "seam_position": "aligned",
+    "skirt_distance": "2",
+    "skirt_height": "1",
+    "skirt_loops": "0",
+    "minimum_sparse_infill_area": "15",
+    "internal_solid_infill_line_width": "0.42",
+    "internal_solid_infill_speed": "300",
+    "spiral_mode": "0",
+    "initial_layer_infill_speed": "105",
+    "standby_temperature_delta": "-5",
+    "enable_support": "0",
+    "resolution": "0.012",
+    "support_type": "normal(auto)",
+    "support_style": "default",
+    "support_on_build_plate_only": "0",
+    "support_top_z_distance": "0.2",
+    "support_bottom_z_distance": "0.2",
+    "support_filament": "0",
+    "support_line_width": "0.42",
+    "support_interface_loop_pattern": "0",
+    "support_interface_filament": "0",
+    "support_interface_top_layers": "2",
+    "support_interface_bottom_layers": "2",
+    "support_interface_spacing": "0.5",
+    "support_expansion": "0",
+    "support_interface_speed": "80",
+    "support_base_pattern": "default",
+    "support_base_pattern_spacing": "2.5",
+    "support_speed": "150",
+    "support_threshold_angle": "30",
+    "support_object_xy_distance": "0.35",
+    "tree_support_branch_diameter": "2",
+    "tree_support_branch_angle": "45",
+    "tree_support_wall_count": "1",
+    "detect_thin_wall": "0",
+    "top_surface_pattern": "monotonicline",
+    "top_surface_line_width": "0.42",
+    "top_surface_acceleration": "5000",
+    "top_surface_speed": "200",
+    "top_shell_layers": "5",
+    "top_shell_thickness": "0.6",
+    "travel_acceleration": "12000",
+    "travel_speed": "500",
+    "enable_prime_tower": "0",
+    "wipe_tower_no_sparse_layers": "0",
+    "prime_tower_width": "60",
+    "xy_hole_compensation": "0",
+    "xy_contour_compensation": "0",
+    "gcode_label_objects": "0"
+}
\ No newline at end of file
diff --git a/resources/profiles/Creality/process/0.12mm Fine @Creality K1Max (0.4 nozzle).json b/resources/profiles/Creality/process/0.12mm Fine @Creality K1Max (0.4 nozzle).json
new file mode 100644
index 00000000000..1d6328ddac8
--- /dev/null
+++ b/resources/profiles/Creality/process/0.12mm Fine @Creality K1Max (0.4 nozzle).json	
@@ -0,0 +1,116 @@
+{
+    "type": "process",
+    "setting_id": "GP004",
+    "name": "0.12mm Fine @Creality K1Max (0.4 nozzle)",
+    "from": "system",
+    "inherits": "fdm_process_common_klipper",
+    "instantiation": "true",
+    "adaptive_layer_height": "0",
+    "reduce_crossing_wall": "0",
+    "max_travel_detour_distance": "0",
+    "bottom_surface_pattern": "monotonic",
+    "bottom_shell_layers": "5",
+    "bottom_shell_thickness": "0",
+    "bridge_flow": "1",
+    "bridge_speed": "25",
+    "internal_bridge_speed": "70",
+    "brim_width": "5",
+    "brim_object_gap": "0.1",
+    "compatible_printers_condition": "",
+    "print_sequence": "by layer",
+    "default_acceleration": "12000",
+    "bridge_no_support": "0",
+    "draft_shield": "disabled",
+    "elefant_foot_compensation": "0.15",
+    "enable_arc_fitting": "1",
+    "outer_wall_line_width": "0.42",
+    "outer_wall_speed": "200",
+    "outer_wall_acceleration": "5000",
+    "inner_wall_acceleration": "5000",
+    "wall_infill_order": "inner wall/outer wall/infill",
+    "line_width": "0.42",
+    "infill_direction": "45",
+    "sparse_infill_density": "15%",
+    "sparse_infill_pattern": "grid",
+    "internal_bridge_support_thickness": "0.8",
+    "initial_layer_acceleration": "500",
+    "initial_layer_line_width": "0.5",
+    "initial_layer_print_height": "0.12",
+    "initial_layer_speed": "60",
+    "gap_infill_speed": "250",
+    "infill_combination": "0",
+    "sparse_infill_line_width": "0.45",
+    "infill_wall_overlap": "15%",
+    "sparse_infill_speed": "270",
+    "interface_shells": "0",
+    "ironing_flow": "10%",
+    "ironing_spacing": "0.15",
+    "ironing_speed": "30",
+    "ironing_type": "no ironing",
+    "layer_height": "0.12",
+    "reduce_infill_retraction": "1",
+    "filename_format": "{input_filename_base}_{filament_type[initial_tool]}_{print_time}.gcode",
+    "detect_overhang_wall": "1",
+    "overhang_1_4_speed": "0",
+    "overhang_2_4_speed": "50",
+    "overhang_3_4_speed": "30",
+    "overhang_4_4_speed": "10",
+    "only_one_wall_top": "1",
+    "inner_wall_line_width": "0.45",
+    "inner_wall_speed": "300",
+    "wall_loops": "3",
+    "print_settings_id": "",
+    "raft_layers": "0",
+    "seam_position": "aligned",
+    "skirt_distance": "2",
+    "skirt_height": "1",
+    "skirt_loops": "0",
+    "minimum_sparse_infill_area": "15",
+    "internal_solid_infill_line_width": "0.42",
+    "internal_solid_infill_speed": "250",
+    "spiral_mode": "0",
+    "initial_layer_infill_speed": "105",
+    "standby_temperature_delta": "-5",
+    "enable_support": "0",
+    "resolution": "0.012",
+    "support_type": "normal(auto)",
+    "support_style": "default",
+    "support_on_build_plate_only": "0",
+    "support_top_z_distance": "0.2",
+    "support_bottom_z_distance": "0.2",
+    "support_filament": "0",
+    "support_line_width": "0.42",
+    "support_interface_loop_pattern": "0",
+    "support_interface_filament": "0",
+    "support_interface_top_layers": "2",
+    "support_interface_bottom_layers": "2",
+    "support_interface_spacing": "0.5",
+    "support_expansion": "0",
+    "support_interface_speed": "80",
+    "support_base_pattern": "default",
+    "support_base_pattern_spacing": "2.5",
+    "support_speed": "150",
+    "support_threshold_angle": "30",
+    "support_object_xy_distance": "0.35",
+    "tree_support_branch_diameter": "2",
+    "tree_support_branch_angle": "45",
+    "tree_support_wall_count": "1",
+    "detect_thin_wall": "0",
+    "top_surface_pattern": "monotonicline",
+    "top_surface_line_width": "0.42",
+    "top_surface_acceleration": "5000",
+    "top_surface_speed": "200",
+    "top_shell_layers": "5",
+    "top_shell_thickness": "0.6",
+    "travel_acceleration": "12000",
+    "travel_speed": "500",
+    "enable_prime_tower": "0",
+    "wipe_tower_no_sparse_layers": "0",
+    "prime_tower_width": "60",
+    "xy_hole_compensation": "0",
+    "xy_contour_compensation": "0",
+    "gcode_label_objects": "0",
+    "compatible_printers": [
+        "Creality K1 Max (0.4 nozzle)"
+    ]
+}
\ No newline at end of file
diff --git a/resources/profiles/Creality/process/0.16mm Optimal @Creality K1 (0.4 nozzle).json b/resources/profiles/Creality/process/0.16mm Optimal @Creality K1 (0.4 nozzle).json
index 314956dcf77..63ea8d7a56a 100644
--- a/resources/profiles/Creality/process/0.16mm Optimal @Creality K1 (0.4 nozzle).json	
+++ b/resources/profiles/Creality/process/0.16mm Optimal @Creality K1 (0.4 nozzle).json	
@@ -39,7 +39,7 @@
     "initial_layer_acceleration": "500",
     "initial_layer_line_width": "0.5",
     "initial_layer_print_height": "0.16",
-    "initial_layer_speed": "50",
+    "initial_layer_speed": "60",
     "gap_infill_speed": "300",
     "infill_combination": "0",
     "sparse_infill_line_width": "0.45",
diff --git a/resources/profiles/Creality/process/0.16mm Optimal @Creality K1C 0.4 nozzle.json b/resources/profiles/Creality/process/0.16mm Optimal @Creality K1C 0.4 nozzle.json
new file mode 100644
index 00000000000..e9c190d94c3
--- /dev/null
+++ b/resources/profiles/Creality/process/0.16mm Optimal @Creality K1C 0.4 nozzle.json	
@@ -0,0 +1,116 @@
+{
+    "type": "process",
+    "setting_id": "GP004",
+    "name": "0.16mm Optimal @Creality K1C",
+    "from": "system",
+    "inherits": "fdm_process_common_klipper",
+    "instantiation": "true",
+    "adaptive_layer_height": "0",
+    "reduce_crossing_wall": "0",
+    "max_travel_detour_distance": "0",
+    "bottom_surface_pattern": "monotonic",
+    "bottom_shell_layers": "3",
+    "bottom_shell_thickness": "0",
+    "bridge_flow": "1",
+    "bridge_speed": "25",
+    "internal_bridge_speed": "70",
+    "brim_width": "5",
+    "brim_object_gap": "0.1",
+    "compatible_printers": [
+        "Creality K1C 0.4 nozzle"
+    ],
+    "compatible_printers_condition": "",
+    "print_sequence": "by layer",
+    "default_acceleration": "12000",
+    "bridge_no_support": "0",
+    "draft_shield": "disabled",
+    "elefant_foot_compensation": "0.15",
+    "enable_arc_fitting": "1",
+    "outer_wall_line_width": "0.42",
+    "outer_wall_speed": "200",
+    "outer_wall_acceleration": "5000",
+    "inner_wall_acceleration": "5000",
+    "wall_infill_order": "inner wall/outer wall/infill",
+    "line_width": "0.42",
+    "infill_direction": "45",
+    "sparse_infill_density": "15%",
+    "sparse_infill_pattern": "grid",
+    "internal_bridge_support_thickness": "0.8",
+    "initial_layer_acceleration": "500",
+    "initial_layer_line_width": "0.5",
+    "initial_layer_print_height": "0.16",
+    "initial_layer_speed": "60",
+    "gap_infill_speed": "300",
+    "infill_combination": "0",
+    "sparse_infill_line_width": "0.45",
+    "infill_wall_overlap": "15%",
+    "sparse_infill_speed": "500",
+    "interface_shells": "0",
+    "ironing_flow": "10%",
+    "ironing_spacing": "0.15",
+    "ironing_speed": "100",
+    "ironing_type": "no ironing",
+    "layer_height": "0.16",
+    "reduce_infill_retraction": "1",
+    "filename_format": "{input_filename_base}_{filament_type[initial_tool]}_{print_time}.gcode",
+    "detect_overhang_wall": "1",
+    "overhang_1_4_speed": "0",
+    "overhang_2_4_speed": "50",
+    "overhang_3_4_speed": "30",
+    "overhang_4_4_speed": "10",
+    "only_one_wall_top": "1",
+    "inner_wall_line_width": "0.45",
+    "inner_wall_speed": "300",
+    "wall_loops": "3",
+    "print_settings_id": "",
+    "raft_layers": "0",
+    "seam_position": "aligned",
+    "skirt_distance": "2",
+    "skirt_height": "1",
+    "skirt_loops": "0",
+    "minimum_sparse_infill_area": "15",
+    "internal_solid_infill_line_width": "0.42",
+    "internal_solid_infill_speed": "300",
+    "spiral_mode": "0",
+    "initial_layer_infill_speed": "105",
+    "standby_temperature_delta": "-5",
+    "enable_support": "0",
+    "resolution": "0.012",
+    "support_type": "normal(auto)",
+    "support_style": "default",
+    "support_on_build_plate_only": "0",
+    "support_top_z_distance": "0.2",
+    "support_bottom_z_distance": "0.2",
+    "support_filament": "0",
+    "support_line_width": "0.42",
+    "support_interface_loop_pattern": "0",
+    "support_interface_filament": "0",
+    "support_interface_top_layers": "2",
+    "support_interface_bottom_layers": "2",
+    "support_interface_spacing": "0.5",
+    "support_expansion": "0",
+    "support_interface_speed": "80",
+    "support_base_pattern": "default",
+    "support_base_pattern_spacing": "2.5",
+    "support_speed": "150",
+    "support_threshold_angle": "30",
+    "support_object_xy_distance": "0.35",
+    "tree_support_branch_diameter": "2",
+    "tree_support_branch_angle": "45",
+    "tree_support_wall_count": "1",
+    "detect_thin_wall": "0",
+    "top_surface_pattern": "monotonicline",
+    "top_surface_line_width": "0.42",
+    "top_surface_acceleration": "5000",
+    "top_surface_speed": "200",
+    "top_shell_layers": "3",
+    "top_shell_thickness": "0.6",
+    "travel_acceleration": "12000",
+    "travel_speed": "500",
+    "enable_prime_tower": "0",
+    "wipe_tower_no_sparse_layers": "0",
+    "prime_tower_width": "60",
+    "xy_hole_compensation": "0",
+    "xy_contour_compensation": "0",
+    "gcode_label_objects": "0"
+}
\ No newline at end of file
diff --git a/resources/profiles/Creality/process/0.16mm Optimal @Creality K1Max (0.4 nozzle).json b/resources/profiles/Creality/process/0.16mm Optimal @Creality K1Max (0.4 nozzle).json
index fe78e7794ac..d3a62ef7982 100644
--- a/resources/profiles/Creality/process/0.16mm Optimal @Creality K1Max (0.4 nozzle).json	
+++ b/resources/profiles/Creality/process/0.16mm Optimal @Creality K1Max (0.4 nozzle).json	
@@ -36,7 +36,7 @@
     "initial_layer_acceleration": "500",
     "initial_layer_line_width": "0.5",
     "initial_layer_print_height": "0.16",
-    "initial_layer_speed": "50",
+    "initial_layer_speed": "60",
     "gap_infill_speed": "250",
     "infill_combination": "0",
     "sparse_infill_line_width": "0.45",
diff --git a/resources/profiles/Creality/process/0.20mm Standard @Creality K1 (0.4 nozzle).json b/resources/profiles/Creality/process/0.20mm Standard @Creality K1 (0.4 nozzle).json
index 926b6ce5572..eeb0412b1e2 100644
--- a/resources/profiles/Creality/process/0.20mm Standard @Creality K1 (0.4 nozzle).json	
+++ b/resources/profiles/Creality/process/0.20mm Standard @Creality K1 (0.4 nozzle).json	
@@ -39,7 +39,7 @@
     "initial_layer_acceleration": "500",
     "initial_layer_line_width": "0.5",
     "initial_layer_print_height": "0.2",
-    "initial_layer_speed": "50",
+    "initial_layer_speed": "60",
     "gap_infill_speed": "300",
     "infill_combination": "0",
     "sparse_infill_line_width": "0.45",
diff --git a/resources/profiles/Creality/process/0.20mm Standard @Creality K1C 0.4 nozzle.json b/resources/profiles/Creality/process/0.20mm Standard @Creality K1C 0.4 nozzle.json
new file mode 100644
index 00000000000..1f6accc5cf5
--- /dev/null
+++ b/resources/profiles/Creality/process/0.20mm Standard @Creality K1C 0.4 nozzle.json	
@@ -0,0 +1,116 @@
+{
+    "type": "process",
+    "setting_id": "GP004",
+    "name": "0.20mm Standard @Creality K1C",
+    "from": "system",
+    "inherits": "fdm_process_common_klipper",
+    "instantiation": "true",
+    "adaptive_layer_height": "0",
+    "reduce_crossing_wall": "0",
+    "max_travel_detour_distance": "0",
+    "bottom_surface_pattern": "monotonic",
+    "bottom_shell_layers": "3",
+    "bottom_shell_thickness": "0",
+    "bridge_flow": "1",
+    "bridge_speed": "25",
+    "internal_bridge_speed": "70",
+    "brim_width": "5",
+    "brim_object_gap": "0.1",
+    "compatible_printers": [
+        "Creality K1C 0.4 nozzle"
+    ],
+    "compatible_printers_condition": "",
+    "print_sequence": "by layer",
+    "default_acceleration": "12000",
+    "bridge_no_support": "0",
+    "draft_shield": "disabled",
+    "elefant_foot_compensation": "0.15",
+    "enable_arc_fitting": "1",
+    "outer_wall_line_width": "0.42",
+    "outer_wall_speed": "200",
+    "outer_wall_acceleration": "5000",
+    "inner_wall_acceleration": "5000",
+    "wall_infill_order": "inner wall/outer wall/infill",
+    "line_width": "0.42",
+    "infill_direction": "45",
+    "sparse_infill_density": "15%",
+    "sparse_infill_pattern": "grid",
+    "internal_bridge_support_thickness": "0.8",
+    "initial_layer_acceleration": "500",
+    "initial_layer_line_width": "0.5",
+    "initial_layer_print_height": "0.2",
+    "initial_layer_speed": "60",
+    "gap_infill_speed": "300",
+    "infill_combination": "0",
+    "sparse_infill_line_width": "0.45",
+    "infill_wall_overlap": "15%",
+    "sparse_infill_speed": "500",
+    "interface_shells": "0",
+    "ironing_flow": "10%",
+    "ironing_spacing": "0.15",
+    "ironing_speed": "100",
+    "ironing_type": "no ironing",
+    "layer_height": "0.2",
+    "reduce_infill_retraction": "1",
+    "filename_format": "{input_filename_base}_{filament_type[initial_tool]}_{print_time}.gcode",
+    "detect_overhang_wall": "1",
+    "overhang_1_4_speed": "0",
+    "overhang_2_4_speed": "50",
+    "overhang_3_4_speed": "30",
+    "overhang_4_4_speed": "10",
+    "only_one_wall_top": "1",
+    "inner_wall_line_width": "0.45",
+    "inner_wall_speed": "300",
+    "wall_loops": "3",
+    "print_settings_id": "",
+    "raft_layers": "0",
+    "seam_position": "aligned",
+    "skirt_distance": "2",
+    "skirt_height": "1",
+    "skirt_loops": "0",
+    "minimum_sparse_infill_area": "15",
+    "internal_solid_infill_line_width": "0.42",
+    "internal_solid_infill_speed": "300",
+    "spiral_mode": "0",
+    "initial_layer_infill_speed": "105",
+    "standby_temperature_delta": "-5",
+    "enable_support": "0",
+    "resolution": "0.012",
+    "support_type": "normal(auto)",
+    "support_style": "default",
+    "support_on_build_plate_only": "0",
+    "support_top_z_distance": "0.2",
+    "support_bottom_z_distance": "0.2",
+    "support_filament": "0",
+    "support_line_width": "0.42",
+    "support_interface_loop_pattern": "0",
+    "support_interface_filament": "0",
+    "support_interface_top_layers": "2",
+    "support_interface_bottom_layers": "2",
+    "support_interface_spacing": "0.5",
+    "support_expansion": "0",
+    "support_interface_speed": "80",
+    "support_base_pattern": "default",
+    "support_base_pattern_spacing": "2.5",
+    "support_speed": "150",
+    "support_threshold_angle": "30",
+    "support_object_xy_distance": "0.35",
+    "tree_support_branch_diameter": "2",
+    "tree_support_branch_angle": "45",
+    "tree_support_wall_count": "1",
+    "detect_thin_wall": "0",
+    "top_surface_pattern": "monotonicline",
+    "top_surface_line_width": "0.42",
+    "top_surface_acceleration": "5000",
+    "top_surface_speed": "200",
+    "top_shell_layers": "3",
+    "top_shell_thickness": "0.6",
+    "travel_acceleration": "12000",
+    "travel_speed": "500",
+    "enable_prime_tower": "0",
+    "wipe_tower_no_sparse_layers": "0",
+    "prime_tower_width": "60",
+    "xy_hole_compensation": "0",
+    "xy_contour_compensation": "0",
+    "gcode_label_objects": "0"
+}
\ No newline at end of file
diff --git a/resources/profiles/Creality/process/0.20mm Standard @Creality K1Max (0.4 nozzle).json b/resources/profiles/Creality/process/0.20mm Standard @Creality K1Max (0.4 nozzle).json
index 585d04314d5..1a78a16472e 100644
--- a/resources/profiles/Creality/process/0.20mm Standard @Creality K1Max (0.4 nozzle).json	
+++ b/resources/profiles/Creality/process/0.20mm Standard @Creality K1Max (0.4 nozzle).json	
@@ -36,7 +36,7 @@
     "initial_layer_acceleration": "500",
     "initial_layer_line_width": "0.5",
     "initial_layer_print_height": "0.2",
-    "initial_layer_speed": "50",
+    "initial_layer_speed": "60",
     "gap_infill_speed": "250",
     "infill_combination": "0",
     "sparse_infill_line_width": "0.45",
diff --git a/resources/profiles/Creality/process/0.24mm Draft @Creality K1 (0.4 nozzle).json b/resources/profiles/Creality/process/0.24mm Draft @Creality K1 (0.4 nozzle).json
index 93c64ecd3d5..b72764cbabb 100644
--- a/resources/profiles/Creality/process/0.24mm Draft @Creality K1 (0.4 nozzle).json	
+++ b/resources/profiles/Creality/process/0.24mm Draft @Creality K1 (0.4 nozzle).json	
@@ -39,7 +39,7 @@
     "initial_layer_acceleration": "500",
     "initial_layer_line_width": "0.5",
     "initial_layer_print_height": "0.2",
-    "initial_layer_speed": "50",
+    "initial_layer_speed": "60",
     "gap_infill_speed": "300",
     "infill_combination": "0",
     "sparse_infill_line_width": "0.45",
diff --git a/resources/profiles/Creality/process/0.24mm Draft @Creality K1C 0.4 nozzle.json b/resources/profiles/Creality/process/0.24mm Draft @Creality K1C 0.4 nozzle.json
new file mode 100644
index 00000000000..cd29aeac4c6
--- /dev/null
+++ b/resources/profiles/Creality/process/0.24mm Draft @Creality K1C 0.4 nozzle.json	
@@ -0,0 +1,116 @@
+{
+    "type": "process",
+    "setting_id": "GP004",
+    "name": "0.24mm Draft @Creality K1C",
+    "from": "system",
+    "inherits": "fdm_process_common_klipper",
+    "instantiation": "true",
+    "adaptive_layer_height": "0",
+    "reduce_crossing_wall": "0",
+    "max_travel_detour_distance": "0",
+    "bottom_surface_pattern": "monotonic",
+    "bottom_shell_layers": "3",
+    "bottom_shell_thickness": "0",
+    "bridge_flow": "1",
+    "bridge_speed": "25",
+    "internal_bridge_speed": "70",
+    "brim_width": "5",
+    "brim_object_gap": "0.1",
+    "compatible_printers": [
+        "Creality K1C 0.4 nozzle"
+    ],
+    "compatible_printers_condition": "",
+    "print_sequence": "by layer",
+    "default_acceleration": "12000",
+    "bridge_no_support": "0",
+    "draft_shield": "disabled",
+    "elefant_foot_compensation": "0.15",
+    "enable_arc_fitting": "1",
+    "outer_wall_line_width": "0.42",
+    "outer_wall_speed": "200",
+    "outer_wall_acceleration": "5000",
+    "inner_wall_acceleration": "5000",
+    "wall_infill_order": "inner wall/outer wall/infill",
+    "line_width": "0.42",
+    "infill_direction": "45",
+    "sparse_infill_density": "15%",
+    "sparse_infill_pattern": "grid",
+    "internal_bridge_support_thickness": "0.8",
+    "initial_layer_acceleration": "500",
+    "initial_layer_line_width": "0.5",
+    "initial_layer_print_height": "0.2",
+    "initial_layer_speed": "60",
+    "gap_infill_speed": "300",
+    "infill_combination": "0",
+    "sparse_infill_line_width": "0.45",
+    "infill_wall_overlap": "15%",
+    "sparse_infill_speed": "500",
+    "interface_shells": "0",
+    "ironing_flow": "10%",
+    "ironing_spacing": "0.15",
+    "ironing_speed": "100",
+    "ironing_type": "no ironing",
+    "layer_height": "0.24",
+    "reduce_infill_retraction": "1",
+    "filename_format": "{input_filename_base}_{filament_type[initial_tool]}_{print_time}.gcode",
+    "detect_overhang_wall": "1",
+    "overhang_1_4_speed": "0",
+    "overhang_2_4_speed": "50",
+    "overhang_3_4_speed": "30",
+    "overhang_4_4_speed": "10",
+    "only_one_wall_top": "1",
+    "inner_wall_line_width": "0.45",
+    "inner_wall_speed": "300",
+    "wall_loops": "3",
+    "print_settings_id": "",
+    "raft_layers": "0",
+    "seam_position": "aligned",
+    "skirt_distance": "2",
+    "skirt_height": "1",
+    "skirt_loops": "0",
+    "minimum_sparse_infill_area": "15",
+    "internal_solid_infill_line_width": "0.42",
+    "internal_solid_infill_speed": "300",
+    "spiral_mode": "0",
+    "initial_layer_infill_speed": "105",
+    "standby_temperature_delta": "-5",
+    "enable_support": "0",
+    "resolution": "0.012",
+    "support_type": "normal(auto)",
+    "support_style": "default",
+    "support_on_build_plate_only": "0",
+    "support_top_z_distance": "0.2",
+    "support_bottom_z_distance": "0.2",
+    "support_filament": "0",
+    "support_line_width": "0.42",
+    "support_interface_loop_pattern": "0",
+    "support_interface_filament": "0",
+    "support_interface_top_layers": "2",
+    "support_interface_bottom_layers": "2",
+    "support_interface_spacing": "0.5",
+    "support_expansion": "0",
+    "support_interface_speed": "80",
+    "support_base_pattern": "default",
+    "support_base_pattern_spacing": "2.5",
+    "support_speed": "150",
+    "support_threshold_angle": "30",
+    "support_object_xy_distance": "0.35",
+    "tree_support_branch_diameter": "2",
+    "tree_support_branch_angle": "45",
+    "tree_support_wall_count": "1",
+    "detect_thin_wall": "0",
+    "top_surface_pattern": "monotonicline",
+    "top_surface_line_width": "0.42",
+    "top_surface_acceleration": "5000",
+    "top_surface_speed": "200",
+    "top_shell_layers": "3",
+    "top_shell_thickness": "0.6",
+    "travel_acceleration": "12000",
+    "travel_speed": "500",
+    "enable_prime_tower": "0",
+    "wipe_tower_no_sparse_layers": "0",
+    "prime_tower_width": "60",
+    "xy_hole_compensation": "0",
+    "xy_contour_compensation": "0",
+    "gcode_label_objects": "0"
+}
\ No newline at end of file
diff --git a/resources/profiles/Creality/process/0.24mm Draft @Creality K1Max (0.4 nozzle).json b/resources/profiles/Creality/process/0.24mm Draft @Creality K1Max (0.4 nozzle).json
index bb554833344..c285e9abdd5 100644
--- a/resources/profiles/Creality/process/0.24mm Draft @Creality K1Max (0.4 nozzle).json	
+++ b/resources/profiles/Creality/process/0.24mm Draft @Creality K1Max (0.4 nozzle).json	
@@ -36,7 +36,7 @@
     "initial_layer_acceleration": "500",
     "initial_layer_line_width": "0.5",
     "initial_layer_print_height": "0.24",
-    "initial_layer_speed": "50",
+    "initial_layer_speed": "60",
     "gap_infill_speed": "250",
     "infill_combination": "0",
     "sparse_infill_line_width": "0.45",
diff --git a/resources/profiles/Creality/process/0.24mm Optimal @Creality K1C 0.6 nozzle.json b/resources/profiles/Creality/process/0.24mm Optimal @Creality K1C 0.6 nozzle.json
new file mode 100644
index 00000000000..b9a5cfbb6a5
--- /dev/null
+++ b/resources/profiles/Creality/process/0.24mm Optimal @Creality K1C 0.6 nozzle.json	
@@ -0,0 +1,115 @@
+{
+    "type": "process",
+    "setting_id": "GP004",
+    "name": "0.24mm Optimal @Creality K1C",
+    "from": "system",
+    "inherits": "fdm_process_common_klipper",
+    "instantiation": "true",
+    "adaptive_layer_height": "0",
+    "reduce_crossing_wall": "0",
+    "max_travel_detour_distance": "0",
+    "bottom_surface_pattern": "monotonic",
+    "bottom_shell_layers": "3",
+    "bottom_shell_thickness": "0",
+    "bridge_flow": "1",
+    "bridge_speed": "30",
+    "brim_width": "5",
+    "brim_object_gap": "0.1",
+    "compatible_printers_condition": "",
+    "print_sequence": "by layer",
+    "default_acceleration": "12000",
+    "bridge_no_support": "0",
+    "draft_shield": "disabled",
+    "elefant_foot_compensation": "0.15",
+    "enable_arc_fitting": "1",
+    "outer_wall_line_width": "0.62",
+    "outer_wall_speed": "120",
+    "outer_wall_acceleration": "5000",
+    "inner_wall_acceleration": "5000",
+    "wall_infill_order": "inner wall/outer wall/infill",
+    "line_width": "0.62",
+    "infill_direction": "45",
+    "sparse_infill_density": "15%",
+    "sparse_infill_pattern": "grid",
+    "internal_bridge_support_thickness": "0.8",
+    "initial_layer_acceleration": "500",
+    "initial_layer_line_width": "0.5",
+    "initial_layer_print_height": "0.24",
+    "initial_layer_speed": "50",
+    "gap_infill_speed": "50",
+    "infill_combination": "0",
+    "sparse_infill_line_width": "0.65",
+    "infill_wall_overlap": "15%",
+    "sparse_infill_speed": "150",
+    "interface_shells": "0",
+    "ironing_flow": "10%",
+    "ironing_spacing": "0.15",
+    "ironing_speed": "30",
+    "ironing_type": "no ironing",
+    "layer_height": "0.24",
+    "reduce_infill_retraction": "1",
+    "filename_format": "{input_filename_base}_{filament_type[initial_tool]}_{print_time}.gcode",
+    "detect_overhang_wall": "1",
+    "overhang_1_4_speed": "0",
+    "overhang_2_4_speed": "50",
+    "overhang_3_4_speed": "15",
+    "overhang_4_4_speed": "10",
+    "only_one_wall_top": "1",
+    "inner_wall_line_width": "0.65",
+    "inner_wall_speed": "150",
+    "wall_loops": "3",
+    "print_settings_id": "",
+    "raft_layers": "0",
+    "seam_position": "aligned",
+    "skirt_distance": "2",
+    "skirt_height": "1",
+    "skirt_loops": "0",
+    "minimum_sparse_infill_area": "15",
+    "internal_solid_infill_line_width": "0.62",
+    "internal_solid_infill_speed": "150",
+    "spiral_mode": "0",
+    "initial_layer_infill_speed": "105",
+    "standby_temperature_delta": "-5",
+    "enable_support": "0",
+    "resolution": "0.012",
+    "support_type": "normal(auto)",
+    "support_style": "default",
+    "support_on_build_plate_only": "0",
+    "support_top_z_distance": "0.2",
+    "support_bottom_z_distance": "0.2",
+    "support_filament": "0",
+    "support_line_width": "0.62",
+    "support_interface_loop_pattern": "0",
+    "support_interface_filament": "0",
+    "support_interface_top_layers": "2",
+    "support_interface_bottom_layers": "2",
+    "support_interface_spacing": "0.5",
+    "support_expansion": "0",
+    "support_interface_speed": "80",
+    "support_base_pattern": "default",
+    "support_base_pattern_spacing": "2.5",
+    "support_speed": "150",
+    "support_threshold_angle": "30",
+    "support_object_xy_distance": "0.35",
+    "tree_support_branch_diameter": "2",
+    "tree_support_branch_angle": "45",
+    "tree_support_wall_count": "1",
+    "detect_thin_wall": "0",
+    "top_surface_pattern": "monotonicline",
+    "top_surface_line_width": "0.62",
+    "top_surface_acceleration": "5000",
+    "top_surface_speed": "150",
+    "top_shell_layers": "3",
+    "top_shell_thickness": "0.6",
+    "travel_acceleration": "12000",
+    "travel_speed": "500",
+    "enable_prime_tower": "0",
+    "wipe_tower_no_sparse_layers": "0",
+    "prime_tower_width": "60",
+    "xy_hole_compensation": "0",
+    "xy_contour_compensation": "0",
+    "gcode_label_objects": "0",
+    "compatible_printers": [
+        "Creality K1C (0.6 nozzle)"
+    ]
+}
\ No newline at end of file
diff --git a/resources/profiles/Creality/process/0.30mm Standard @Creality K1C 0.6 nozzle.json b/resources/profiles/Creality/process/0.30mm Standard @Creality K1C 0.6 nozzle.json
new file mode 100644
index 00000000000..4bd1b24007c
--- /dev/null
+++ b/resources/profiles/Creality/process/0.30mm Standard @Creality K1C 0.6 nozzle.json	
@@ -0,0 +1,115 @@
+{
+    "type": "process",
+    "setting_id": "GP004",
+    "name": "0.30mm Standard @Creality K1C",
+    "from": "system",
+    "inherits": "fdm_process_common_klipper",
+    "instantiation": "true",
+    "adaptive_layer_height": "0",
+    "reduce_crossing_wall": "0",
+    "max_travel_detour_distance": "0",
+    "bottom_surface_pattern": "monotonic",
+    "bottom_shell_layers": "3",
+    "bottom_shell_thickness": "0",
+    "bridge_flow": "1",
+    "bridge_speed": "30",
+    "brim_width": "5",
+    "brim_object_gap": "0.1",
+    "compatible_printers_condition": "",
+    "print_sequence": "by layer",
+    "default_acceleration": "12000",
+    "bridge_no_support": "0",
+    "draft_shield": "disabled",
+    "elefant_foot_compensation": "0.15",
+    "enable_arc_fitting": "1",
+    "outer_wall_line_width": "0.62",
+    "outer_wall_speed": "120",
+    "outer_wall_acceleration": "5000",
+    "inner_wall_acceleration": "5000",
+    "wall_infill_order": "inner wall/outer wall/infill",
+    "line_width": "0.62",
+    "infill_direction": "45",
+    "sparse_infill_density": "15%",
+    "sparse_infill_pattern": "grid",
+    "internal_bridge_support_thickness": "0.8",
+    "initial_layer_acceleration": "500",
+    "initial_layer_line_width": "0.5",
+    "initial_layer_print_height": "0.3",
+    "initial_layer_speed": "50",
+    "gap_infill_speed": "50",
+    "infill_combination": "0",
+    "sparse_infill_line_width": "0.65",
+    "infill_wall_overlap": "15%",
+    "sparse_infill_speed": "150",
+    "interface_shells": "0",
+    "ironing_flow": "10%",
+    "ironing_spacing": "0.15",
+    "ironing_speed": "30",
+    "ironing_type": "no ironing",
+    "layer_height": "0.3",
+    "reduce_infill_retraction": "1",
+    "filename_format": "{input_filename_base}_{filament_type[initial_tool]}_{print_time}.gcode",
+    "detect_overhang_wall": "1",
+    "overhang_1_4_speed": "0",
+    "overhang_2_4_speed": "50",
+    "overhang_3_4_speed": "15",
+    "overhang_4_4_speed": "10",
+    "only_one_wall_top": "1",
+    "inner_wall_line_width": "0.65",
+    "inner_wall_speed": "150",
+    "wall_loops": "3",
+    "print_settings_id": "",
+    "raft_layers": "0",
+    "seam_position": "aligned",
+    "skirt_distance": "2",
+    "skirt_height": "1",
+    "skirt_loops": "0",
+    "minimum_sparse_infill_area": "15",
+    "internal_solid_infill_line_width": "0.62",
+    "internal_solid_infill_speed": "150",
+    "spiral_mode": "0",
+    "initial_layer_infill_speed": "105",
+    "standby_temperature_delta": "-5",
+    "enable_support": "0",
+    "resolution": "0.012",
+    "support_type": "normal(auto)",
+    "support_style": "default",
+    "support_on_build_plate_only": "0",
+    "support_top_z_distance": "0.2",
+    "support_bottom_z_distance": "0.2",
+    "support_filament": "0",
+    "support_line_width": "0.62",
+    "support_interface_loop_pattern": "0",
+    "support_interface_filament": "0",
+    "support_interface_top_layers": "2",
+    "support_interface_bottom_layers": "2",
+    "support_interface_spacing": "0.5",
+    "support_expansion": "0",
+    "support_interface_speed": "80",
+    "support_base_pattern": "default",
+    "support_base_pattern_spacing": "2.5",
+    "support_speed": "150",
+    "support_threshold_angle": "30",
+    "support_object_xy_distance": "0.35",
+    "tree_support_branch_diameter": "2",
+    "tree_support_branch_angle": "45",
+    "tree_support_wall_count": "1",
+    "detect_thin_wall": "0",
+    "top_surface_pattern": "monotonicline",
+    "top_surface_line_width": "0.62",
+    "top_surface_acceleration": "5000",
+    "top_surface_speed": "150",
+    "top_shell_layers": "3",
+    "top_shell_thickness": "0.6",
+    "travel_acceleration": "12000",
+    "travel_speed": "500",
+    "enable_prime_tower": "0",
+    "wipe_tower_no_sparse_layers": "0",
+    "prime_tower_width": "60",
+    "xy_hole_compensation": "0",
+    "xy_contour_compensation": "0",
+    "gcode_label_objects": "0",
+    "compatible_printers": [
+        "Creality K1C (0.6 nozzle)"
+    ]
+}
\ No newline at end of file
diff --git a/resources/profiles/Creality/process/0.32mm Optimal @Creality K1C 0.8 nozzle.json b/resources/profiles/Creality/process/0.32mm Optimal @Creality K1C 0.8 nozzle.json
new file mode 100644
index 00000000000..b5ecf953ceb
--- /dev/null
+++ b/resources/profiles/Creality/process/0.32mm Optimal @Creality K1C 0.8 nozzle.json	
@@ -0,0 +1,115 @@
+{
+    "type": "process",
+    "setting_id": "GP004",
+    "name": "0.32mm Optimal @Creality K1C",
+    "from": "system",
+    "inherits": "fdm_process_common_klipper",
+    "instantiation": "true",
+    "adaptive_layer_height": "0",
+    "reduce_crossing_wall": "0",
+    "max_travel_detour_distance": "0",
+    "bottom_surface_pattern": "monotonic",
+    "bottom_shell_layers": "3",
+    "bottom_shell_thickness": "0",
+    "bridge_flow": "1",
+    "bridge_speed": "30",
+    "brim_width": "5",
+    "brim_object_gap": "0.1",
+    "compatible_printers_condition": "",
+    "print_sequence": "by layer",
+    "default_acceleration": "12000",
+    "bridge_no_support": "0",
+    "draft_shield": "disabled",
+    "elefant_foot_compensation": "0.15",
+    "enable_arc_fitting": "1",
+    "outer_wall_line_width": "0.82",
+    "outer_wall_speed": "120",
+    "outer_wall_acceleration": "5000",
+    "inner_wall_acceleration": "5000",
+    "wall_infill_order": "inner wall/outer wall/infill",
+    "line_width": "0.82",
+    "infill_direction": "45",
+    "sparse_infill_density": "15%",
+    "sparse_infill_pattern": "grid",
+    "internal_bridge_support_thickness": "0.8",
+    "initial_layer_acceleration": "500",
+    "initial_layer_line_width": "0.7",
+    "initial_layer_print_height": "0.32",
+    "initial_layer_speed": "35",
+    "gap_infill_speed": "50",
+    "infill_combination": "0",
+    "sparse_infill_line_width": "0.85",
+    "infill_wall_overlap": "15%",
+    "sparse_infill_speed": "150",
+    "interface_shells": "0",
+    "ironing_flow": "10%",
+    "ironing_spacing": "0.15",
+    "ironing_speed": "30",
+    "ironing_type": "no ironing",
+    "layer_height": "0.32",
+    "reduce_infill_retraction": "1",
+    "filename_format": "{input_filename_base}_{filament_type[initial_tool]}_{print_time}.gcode",
+    "detect_overhang_wall": "1",
+    "overhang_1_4_speed": "0",
+    "overhang_2_4_speed": "50",
+    "overhang_3_4_speed": "25",
+    "overhang_4_4_speed": "5",
+    "only_one_wall_top": "1",
+    "inner_wall_line_width": "0.85",
+    "inner_wall_speed": "150",
+    "wall_loops": "3",
+    "print_settings_id": "",
+    "raft_layers": "0",
+    "seam_position": "aligned",
+    "skirt_distance": "2",
+    "skirt_height": "1",
+    "skirt_loops": "0",
+    "minimum_sparse_infill_area": "15",
+    "internal_solid_infill_line_width": "0.82",
+    "internal_solid_infill_speed": "150",
+    "spiral_mode": "0",
+    "initial_layer_infill_speed": "55",
+    "standby_temperature_delta": "-5",
+    "enable_support": "0",
+    "resolution": "0.012",
+    "support_type": "normal(auto)",
+    "support_style": "default",
+    "support_on_build_plate_only": "0",
+    "support_top_z_distance": "0.2",
+    "support_bottom_z_distance": "0.2",
+    "support_filament": "0",
+    "support_line_width": "0.82",
+    "support_interface_loop_pattern": "0",
+    "support_interface_filament": "0",
+    "support_interface_top_layers": "2",
+    "support_interface_bottom_layers": "2",
+    "support_interface_spacing": "0.5",
+    "support_expansion": "0",
+    "support_interface_speed": "80",
+    "support_base_pattern": "default",
+    "support_base_pattern_spacing": "2.5",
+    "support_speed": "150",
+    "support_threshold_angle": "30",
+    "support_object_xy_distance": "0.35",
+    "tree_support_branch_diameter": "2",
+    "tree_support_branch_angle": "45",
+    "tree_support_wall_count": "1",
+    "detect_thin_wall": "0",
+    "top_surface_pattern": "monotonicline",
+    "top_surface_line_width": "0.82",
+    "top_surface_acceleration": "5000",
+    "top_surface_speed": "150",
+    "top_shell_layers": "3",
+    "top_shell_thickness": "0.6",
+    "travel_acceleration": "12000",
+    "travel_speed": "500",
+    "enable_prime_tower": "0",
+    "wipe_tower_no_sparse_layers": "0",
+    "prime_tower_width": "60",
+    "xy_hole_compensation": "0",
+    "xy_contour_compensation": "0",
+    "gcode_label_objects": "0",
+    "compatible_printers": [
+        "Creality K1C (0.8 nozzle)"
+    ]
+}
\ No newline at end of file
diff --git a/resources/profiles/Creality/process/0.36mm Draft @Creality K1C 0.6 nozzle.json b/resources/profiles/Creality/process/0.36mm Draft @Creality K1C 0.6 nozzle.json
new file mode 100644
index 00000000000..c312c12ca7b
--- /dev/null
+++ b/resources/profiles/Creality/process/0.36mm Draft @Creality K1C 0.6 nozzle.json	
@@ -0,0 +1,115 @@
+{
+    "type": "process",
+    "setting_id": "GP004",
+    "name": "0.36mm Draft @Creality K1C",
+    "from": "system",
+    "inherits": "fdm_process_common_klipper",
+    "instantiation": "true",
+    "adaptive_layer_height": "0",
+    "reduce_crossing_wall": "0",
+    "max_travel_detour_distance": "0",
+    "bottom_surface_pattern": "monotonic",
+    "bottom_shell_layers": "3",
+    "bottom_shell_thickness": "0",
+    "bridge_flow": "1",
+    "bridge_speed": "30",
+    "brim_width": "5",
+    "brim_object_gap": "0.1",
+    "compatible_printers_condition": "",
+    "print_sequence": "by layer",
+    "default_acceleration": "12000",
+    "bridge_no_support": "0",
+    "draft_shield": "disabled",
+    "elefant_foot_compensation": "0.15",
+    "enable_arc_fitting": "1",
+    "outer_wall_line_width": "0.62",
+    "outer_wall_speed": "120",
+    "outer_wall_acceleration": "5000",
+    "inner_wall_acceleration": "5000",
+    "wall_infill_order": "inner wall/outer wall/infill",
+    "line_width": "0.62",
+    "infill_direction": "45",
+    "sparse_infill_density": "15%",
+    "sparse_infill_pattern": "grid",
+    "internal_bridge_support_thickness": "0.8",
+    "initial_layer_acceleration": "500",
+    "initial_layer_line_width": "0.5",
+    "initial_layer_print_height": "0.36",
+    "initial_layer_speed": "50",
+    "gap_infill_speed": "50",
+    "infill_combination": "0",
+    "sparse_infill_line_width": "0.65",
+    "infill_wall_overlap": "15%",
+    "sparse_infill_speed": "150",
+    "interface_shells": "0",
+    "ironing_flow": "10%",
+    "ironing_spacing": "0.15",
+    "ironing_speed": "30",
+    "ironing_type": "no ironing",
+    "layer_height": "0.36",
+    "reduce_infill_retraction": "1",
+    "filename_format": "{input_filename_base}_{filament_type[initial_tool]}_{print_time}.gcode",
+    "detect_overhang_wall": "1",
+    "overhang_1_4_speed": "0",
+    "overhang_2_4_speed": "50",
+    "overhang_3_4_speed": "15",
+    "overhang_4_4_speed": "10",
+    "only_one_wall_top": "1",
+    "inner_wall_line_width": "0.65",
+    "inner_wall_speed": "150",
+    "wall_loops": "3",
+    "print_settings_id": "",
+    "raft_layers": "0",
+    "seam_position": "aligned",
+    "skirt_distance": "2",
+    "skirt_height": "1",
+    "skirt_loops": "0",
+    "minimum_sparse_infill_area": "15",
+    "internal_solid_infill_line_width": "0.62",
+    "internal_solid_infill_speed": "150",
+    "spiral_mode": "0",
+    "initial_layer_infill_speed": "105",
+    "standby_temperature_delta": "-5",
+    "enable_support": "0",
+    "resolution": "0.012",
+    "support_type": "normal(auto)",
+    "support_style": "default",
+    "support_on_build_plate_only": "0",
+    "support_top_z_distance": "0.2",
+    "support_bottom_z_distance": "0.2",
+    "support_filament": "0",
+    "support_line_width": "0.62",
+    "support_interface_loop_pattern": "0",
+    "support_interface_filament": "0",
+    "support_interface_top_layers": "2",
+    "support_interface_bottom_layers": "2",
+    "support_interface_spacing": "0.5",
+    "support_expansion": "0",
+    "support_interface_speed": "80",
+    "support_base_pattern": "default",
+    "support_base_pattern_spacing": "2.5",
+    "support_speed": "150",
+    "support_threshold_angle": "30",
+    "support_object_xy_distance": "0.35",
+    "tree_support_branch_diameter": "2",
+    "tree_support_branch_angle": "45",
+    "tree_support_wall_count": "1",
+    "detect_thin_wall": "0",
+    "top_surface_pattern": "monotonicline",
+    "top_surface_line_width": "0.62",
+    "top_surface_acceleration": "5000",
+    "top_surface_speed": "150",
+    "top_shell_layers": "3",
+    "top_shell_thickness": "0.6",
+    "travel_acceleration": "12000",
+    "travel_speed": "500",
+    "enable_prime_tower": "0",
+    "wipe_tower_no_sparse_layers": "0",
+    "prime_tower_width": "60",
+    "xy_hole_compensation": "0",
+    "xy_contour_compensation": "0",
+    "gcode_label_objects": "0",
+    "compatible_printers": [
+        "Creality K1C (0.6 nozzle)"
+    ]
+}
\ No newline at end of file
diff --git a/resources/profiles/Creality/process/0.40mm Standard @Creality K1C 0.8 nozzle.json b/resources/profiles/Creality/process/0.40mm Standard @Creality K1C 0.8 nozzle.json
new file mode 100644
index 00000000000..e956dadee16
--- /dev/null
+++ b/resources/profiles/Creality/process/0.40mm Standard @Creality K1C 0.8 nozzle.json	
@@ -0,0 +1,115 @@
+{
+    "type": "process",
+    "setting_id": "GP004",
+    "name": "0.40mm Standard @Creality K1C",
+    "from": "system",
+    "inherits": "fdm_process_common_klipper",
+    "instantiation": "true",
+    "adaptive_layer_height": "0",
+    "reduce_crossing_wall": "0",
+    "max_travel_detour_distance": "0",
+    "bottom_surface_pattern": "monotonic",
+    "bottom_shell_layers": "3",
+    "bottom_shell_thickness": "0",
+    "bridge_flow": "1",
+    "bridge_speed": "30",
+    "brim_width": "5",
+    "brim_object_gap": "0.1",
+    "compatible_printers_condition": "",
+    "print_sequence": "by layer",
+    "default_acceleration": "12000",
+    "bridge_no_support": "0",
+    "draft_shield": "disabled",
+    "elefant_foot_compensation": "0.15",
+    "enable_arc_fitting": "1",
+    "outer_wall_line_width": "0.82",
+    "outer_wall_speed": "120",
+    "outer_wall_acceleration": "5000",
+    "inner_wall_acceleration": "5000",
+    "wall_infill_order": "inner wall/outer wall/infill",
+    "line_width": "0.82",
+    "infill_direction": "45",
+    "sparse_infill_density": "15%",
+    "sparse_infill_pattern": "grid",
+    "internal_bridge_support_thickness": "0.8",
+    "initial_layer_acceleration": "500",
+    "initial_layer_line_width": "0.7",
+    "initial_layer_print_height": "0.4",
+    "initial_layer_speed": "35",
+    "gap_infill_speed": "50",
+    "infill_combination": "0",
+    "sparse_infill_line_width": "0.85",
+    "infill_wall_overlap": "15%",
+    "sparse_infill_speed": "150",
+    "interface_shells": "0",
+    "ironing_flow": "10%",
+    "ironing_spacing": "0.15",
+    "ironing_speed": "30",
+    "ironing_type": "no ironing",
+    "layer_height": "0.4",
+    "reduce_infill_retraction": "1",
+    "filename_format": "{input_filename_base}_{filament_type[initial_tool]}_{print_time}.gcode",
+    "detect_overhang_wall": "1",
+    "overhang_1_4_speed": "0",
+    "overhang_2_4_speed": "50",
+    "overhang_3_4_speed": "25",
+    "overhang_4_4_speed": "5",
+    "only_one_wall_top": "1",
+    "inner_wall_line_width": "0.85",
+    "inner_wall_speed": "150",
+    "wall_loops": "3",
+    "print_settings_id": "",
+    "raft_layers": "0",
+    "seam_position": "aligned",
+    "skirt_distance": "2",
+    "skirt_height": "1",
+    "skirt_loops": "0",
+    "minimum_sparse_infill_area": "15",
+    "internal_solid_infill_line_width": "0.82",
+    "internal_solid_infill_speed": "150",
+    "spiral_mode": "0",
+    "initial_layer_infill_speed": "55",
+    "standby_temperature_delta": "-5",
+    "enable_support": "0",
+    "resolution": "0.012",
+    "support_type": "normal(auto)",
+    "support_style": "default",
+    "support_on_build_plate_only": "0",
+    "support_top_z_distance": "0.2",
+    "support_bottom_z_distance": "0.2",
+    "support_filament": "0",
+    "support_line_width": "0.82",
+    "support_interface_loop_pattern": "0",
+    "support_interface_filament": "0",
+    "support_interface_top_layers": "2",
+    "support_interface_bottom_layers": "2",
+    "support_interface_spacing": "0.5",
+    "support_expansion": "0",
+    "support_interface_speed": "80",
+    "support_base_pattern": "default",
+    "support_base_pattern_spacing": "2.5",
+    "support_speed": "150",
+    "support_threshold_angle": "30",
+    "support_object_xy_distance": "0.35",
+    "tree_support_branch_diameter": "2",
+    "tree_support_branch_angle": "45",
+    "tree_support_wall_count": "1",
+    "detect_thin_wall": "0",
+    "top_surface_pattern": "monotonicline",
+    "top_surface_line_width": "0.82",
+    "top_surface_acceleration": "5000",
+    "top_surface_speed": "150",
+    "top_shell_layers": "3",
+    "top_shell_thickness": "0.6",
+    "travel_acceleration": "12000",
+    "travel_speed": "500",
+    "enable_prime_tower": "0",
+    "wipe_tower_no_sparse_layers": "0",
+    "prime_tower_width": "60",
+    "xy_hole_compensation": "0",
+    "xy_contour_compensation": "0",
+    "gcode_label_objects": "0",
+    "compatible_printers": [
+        "Creality K1C (0.8 nozzle)"
+    ]
+}
\ No newline at end of file
diff --git a/resources/profiles/Creality/process/0.48mm Draft @Creality K1C 0.8 nozzle.json b/resources/profiles/Creality/process/0.48mm Draft @Creality K1C 0.8 nozzle.json
new file mode 100644
index 00000000000..4e275a2129d
--- /dev/null
+++ b/resources/profiles/Creality/process/0.48mm Draft @Creality K1C 0.8 nozzle.json	
@@ -0,0 +1,115 @@
+{
+    "type": "process",
+    "setting_id": "GP004",
+    "name": "0.48mm Draft @Creality K1C (0.8 nozzle)",
+    "from": "system",
+    "inherits": "fdm_process_common_klipper",
+    "instantiation": "true",
+    "adaptive_layer_height": "0",
+    "reduce_crossing_wall": "0",
+    "max_travel_detour_distance": "0",
+    "bottom_surface_pattern": "monotonic",
+    "bottom_shell_layers": "3",
+    "bottom_shell_thickness": "0",
+    "bridge_flow": "1",
+    "bridge_speed": "30",
+    "brim_width": "5",
+    "brim_object_gap": "0.1",
+    "compatible_printers_condition": "",
+    "print_sequence": "by layer",
+    "default_acceleration": "12000",
+    "bridge_no_support": "0",
+    "draft_shield": "disabled",
+    "elefant_foot_compensation": "0.15",
+    "enable_arc_fitting": "1",
+    "outer_wall_line_width": "0.82",
+    "outer_wall_speed": "120",
+    "outer_wall_acceleration": "5000",
+    "inner_wall_acceleration": "5000",
+    "wall_infill_order": "inner wall/outer wall/infill",
+    "line_width": "0.82",
+    "infill_direction": "45",
+    "sparse_infill_density": "15%",
+    "sparse_infill_pattern": "grid",
+    "internal_bridge_support_thickness": "0.8",
+    "initial_layer_acceleration": "500",
+    "initial_layer_line_width": "0.7",
+    "initial_layer_print_height": "0.48",
+    "initial_layer_speed": "35",
+    "gap_infill_speed": "50",
+    "infill_combination": "0",
+    "sparse_infill_line_width": "0.85",
+    "infill_wall_overlap": "15%",
+    "sparse_infill_speed": "150",
+    "interface_shells": "0",
+    "ironing_flow": "10%",
+    "ironing_spacing": "0.15",
+    "ironing_speed": "30",
+    "ironing_type": "no ironing",
+    "layer_height": "0.48",
+    "reduce_infill_retraction": "1",
+    "filename_format": "{input_filename_base}_{filament_type[initial_tool]}_{print_time}.gcode",
+    "detect_overhang_wall": "1",
+    "overhang_1_4_speed": "0",
+    "overhang_2_4_speed": "50",
+    "overhang_3_4_speed": "25",
+    "overhang_4_4_speed": "5",
+    "only_one_wall_top": "1",
+    "inner_wall_line_width": "0.85",
+    "inner_wall_speed": "150",
+    "wall_loops": "3",
+    "print_settings_id": "",
+    "raft_layers": "0",
+    "seam_position": "aligned",
+    "skirt_distance": "2",
+    "skirt_height": "1",
+    "skirt_loops": "0",
+    "minimum_sparse_infill_area": "15",
+    "internal_solid_infill_line_width": "0.82",
+    "internal_solid_infill_speed": "150",
+    "spiral_mode": "0",
+    "initial_layer_infill_speed": "55",
+    "standby_temperature_delta": "-5",
+    "enable_support": "0",
+    "resolution": "0.012",
+    "support_type": "normal(auto)",
+    "support_style": "default",
+    "support_on_build_plate_only": "0",
+    "support_top_z_distance": "0.2",
+    "support_bottom_z_distance": "0.2",
+    "support_filament": "0",
+    "support_line_width": "0.82",
+    "support_interface_loop_pattern": "0",
+    "support_interface_filament": "0",
+    "support_interface_top_layers": "2",
+    "support_interface_bottom_layers": "2",
+    "support_interface_spacing": "0.5",
+    "support_expansion": "0",
+    "support_interface_speed": "80",
+    "support_base_pattern": "default",
+    "support_base_pattern_spacing": "2.5",
+    "support_speed": "150",
+    "support_threshold_angle": "30",
+    "support_object_xy_distance": "0.35",
+    "tree_support_branch_diameter": "2",
+    "tree_support_branch_angle": "45",
+    "tree_support_wall_count": "1",
+    "detect_thin_wall": "0",
+    "top_surface_pattern": "monotonicline",
+    "top_surface_line_width": "0.82",
+    "top_surface_acceleration": "5000",
+    "top_surface_speed": "150",
+    "top_shell_layers": "3",
+    "top_shell_thickness": "0.6",
+    "travel_acceleration": "12000",
+    "travel_speed": "500",
+    "enable_prime_tower": "0",
+    "wipe_tower_no_sparse_layers": "0",
+    "prime_tower_width": "60",
+    "xy_hole_compensation": "0",
+    "xy_contour_compensation": "0",
+    "gcode_label_objects": "0",
+    "compatible_printers": [
+        "Creality K1C (0.8 nozzle)"
+    ]
+}
\ No newline at end of file