Remove the CAD Primitive and Sketch gizmos from Prepare

Speed up the Linux incremental rebuild (optimizes packaging step) (#16244 )
## Speeds up OrcaSlicer incremental rebuild on Linux Profiled `build_linux_image.sh`: 96 s, of which 51 s in the dependency audit. **`appimage_is_elf_file()`** ran `file` and `grep` per candidate. An AppDir holds ~9.6k of them, 4.8k being the bundled Python runtime and none of them ELF: ~19k processes, 14 s. Reads the four-byte magic instead. Checked against the old result on 4000 files, no disagreement. **The dependency walk** popped its queue with `"${queue[@]:1}"`, which rebuilds the whole array each time. At ~4.8k entries that was 22 s of copying an array around. Uses a read index. Audit still passes. `shellcheck` v0.11.0, the version CI uses, is clean. ## Notes The 96 s -> 12.7 s. Measured on a 32-core / 48 GB machine, but the audit is a serial bash loop, so cores and RAM is not the bottleneck. On slower hardware the saving should be larger ## Images <img width="1987" height="782" alt="Screenshot_20261007_092516" src="https://github.com/user-attachments/assets/96fcb917-38e5-49e7-8cbe-b37be1a2f23a" /> <img width="1807" height="742" alt="Screenshot_20261007_092621" src="https://github.com/user-attachments/assets/4a65ffae-4d59-41f0-a1c7-ee5b49f3c4be" />
2026-10-07 15:51:08 +00:00 · 2026-10-07 21:20:05 +08:00 · 2026-10-07 19:07:22 +08:00 · 2026-10-07 19:05:37 +08:00 · 2026-10-07 18:42:09 +08:00 · 2026-10-07 18:40:37 +08:00
26 changed files with 405 additions and 1122 deletions
@@ -105,11 +105,12 @@ Rules:
   `single_extruder_multi_material` off, and in the app when the printer tab loads a printer with a
   different number of extruders, the pair is rebuilt from `extruder_variant_list` (one
   `Direct Drive Standard` per extruder when the list is absent) and the variant arrays are resized to
-   the rebuilt pair, padded with their first value or cut. The resize skips the `machine_max_*` limits
-   and `hotend_heating_rate` / `hotend_cooling_rate`: they keep their width, and an extruder beyond it
-   reads their first value, so extruder 2 and up of a list-less printer take extruder 1's normal limit
-   as their silent one too. With the three in agreement that changes nothing; a pair written without
-   the list is replaced. A listed variant the pair lacks is a menu choice that reads variant index 0.
+   the rebuilt pair, padded with their first value or cut. The `machine_max_*` limits are padded the
+   same way, so extruder 2 and up of a list-less printer take extruder 1's normal limit as their
+   silent one too. The resize skips `hotend_heating_rate` / `hotend_cooling_rate`: they keep their
+   width, and an extruder beyond it reads their first value. With the three in agreement that changes
+   nothing; a pair written without the list is replaced. A listed variant the pair lacks is a menu
+   choice that reads variant index 0.
   - The pair without `extruder_variant_list` slices, but the sidebar offers no variant switch and
     the app cannot add variants to a list-less process: nothing is lost while every extruder
     has exactly one variant, and every further variant is unreachable.
@@ -295,8 +295,6 @@ src/slic3r/GUI/CAD/DesignSketchTool.cpp
 src/slic3r/GUI/CAD/SketchInlineEditor.cpp
 src/slic3r/GUI/CAD/DesignOffer.hpp
 src/slic3r/GUI/CAD/DesignTextDialog.cpp
-src/slic3r/GUI/Gizmos/GLGizmoPrimitive.cpp
-src/slic3r/GUI/Gizmos/GLGizmoSketch.cpp
 src/slic3r/GUI/KeyChord.cpp
 src/slic3r/GUI/Shortcuts.cpp
 src/libslic3r/CAD/CadDocument.cpp
@@ -1,4 +0,0 @@
-<svg width="35" height="35" viewBox="0 0 35 35" fill="none" xmlns="http://www.w3.org/2000/svg">
-  <path fill-rule="evenodd" clip-rule="evenodd" d="M17.0007 3.15607L5.26748 9.97446C5.0759 10.0857 4.8723 10.2988 4.71546 10.5713C4.55862 10.8438 4.47656 11.127 4.47656 11.349V24.4715C4.47656 24.6929 4.55879 24.9752 4.71606 25.2472C4.87328 25.5192 5.07737 25.7322 5.26956 25.8438L17.1143 32.6992C17.3061 32.8102 17.5904 32.8795 17.902 32.8782C18.2136 32.8768 18.4968 32.8049 18.6868 32.6927L30.2729 25.8523C30.4645 25.739 30.6677 25.524 30.8242 25.2501C30.9806 24.9761 31.0625 24.6919 31.0625 24.4693V11.2435C31.0625 11.0216 30.9805 10.7392 30.8238 10.4679C30.667 10.1966 30.4635 9.98491 30.2715 9.87455L18.582 3.15275C18.3912 3.04273 18.1054 2.97271 17.7915 2.97339C17.4777 2.97408 17.192 3.045 17.0007 3.15607ZM6.3957 11.3642C6.53284 11.1245 6.83831 11.0414 7.07799 11.1785L16.9733 16.8405C17.3553 17.0587 17.6738 17.4171 17.8953 17.7985C18.1169 18.1801 18.2703 18.6338 18.2717 19.0733L18.2893 30.4075C18.2897 30.6837 18.0662 30.9079 17.7901 30.9083C17.5139 30.9087 17.2897 30.6852 17.2893 30.4091L17.2717 19.0767C17.2708 18.8547 17.1879 18.5717 17.0305 18.3007C16.8729 18.0294 16.6691 17.8183 16.4776 17.709L6.58136 12.0465C6.34168 11.9093 6.25855 11.6039 6.3957 11.3642Z" fill="#4db6ac"/>
-  <path fill-rule="evenodd" clip-rule="evenodd" d="M19.0809 2.28613C18.7002 2.0665 18.2304 1.97243 17.7893 1.9734C17.3481 1.97436 16.8787 2.07053 16.4985 2.29133L4.76515 9.10978C4.38527 9.33044 4.06884 9.69007 3.84874 10.0725C3.6286 10.455 3.47656 10.9093 3.47656 11.349V24.4715C3.47656 24.9118 3.62953 25.3658 3.85033 25.7477C4.07118 26.1297 4.38804 26.4882 4.76735 26.7085L16.6135 33.5647C16.9954 33.7857 17.4651 33.8801 17.9064 33.8782C18.3475 33.8762 18.8161 33.7778 19.1954 33.5537L30.7814 26.7133C31.1591 26.4902 31.4737 26.1292 31.6925 25.746C31.9114 25.3627 32.0625 24.9084 32.0625 24.4693V11.2435C32.0625 10.8037 31.9104 10.3497 31.6896 9.96764C31.4689 9.58563 31.1515 9.22695 30.7698 9.00759L19.0809 2.28613ZM29.6625 11.8015C29.786 12.0485 29.6859 12.3489 29.4389 12.4723L20.3956 16.994C20.1486 17.1175 19.8483 17.0174 19.7248 16.7704C19.6013 16.5234 19.7014 16.2231 19.9484 16.0996L28.9917 11.5779C29.2387 11.4544 29.539 11.5545 29.6625 11.8015Z" fill="#bdbdbd"/>
-</svg>
@@ -1,8 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="40" height="40" viewBox="0 0 40 40">
-  <!-- Pencil body -->
-  <path d="M28.5 6.5l5 5L14 31l-5.5 1.5L10 27 28.5 6.5z" style="fill:#009688"/>
-  <!-- Pencil tip (dark) -->
-  <path d="M8.5 28.5l1.5 1.5 4.5-1L28.5 15l-3.5-3.5L8.5 28z" style="fill:#2b3436"/>
-  <!-- Pencil line -->
-  <line x1="10" y1="26" x2="25" y2="11" stroke="#2b3436" stroke-width="2"/>
-</svg>
@@ -1,8 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="40" height="40" viewBox="0 0 40 40">
-  <!-- Pencil body (dark mode colors) -->
-  <path d="M28.5 6.5l5 5L14 31l-5.5 1.5L10 27 28.5 6.5z" style="fill:#4db6ac"/>
-  <!-- Pencil tip -->
-  <path d="M8.5 28.5l1.5 1.5 4.5-1L28.5 15l-3.5-3.5L8.5 28z" style="fill:#e0e0e0"/>
-  <!-- Pencil line -->
-  <line x1="10" y1="26" x2="25" y2="11" stroke="#e0e0e0" stroke-width="2"/>
-</svg>
@@ -311,7 +311,7 @@ function CreatePrinterBlock(OneModel)

 	return	'<div class="PrinterBlock" onClick="ChooseModel(\''+vendor+'\',\''+OneModel['model']+'\')">'+
 			'	<div class="PImg">'+
-			'		<img class="ModelThumbnail" src="' + OneModel['cover'] + '" />'+
+			'		<img class="ModelThumbnail" src="' + OneModel['cover'] + '" onerror="this.onerror=null;this.src=\'../img/printer-dummy.png\';"/>'+
 			'	</div>'+
 			'	<div class="PrinterInfoMark">?</div>'+
 			'	<div class="PrinterInfo">'+
@@ -23,7 +23,13 @@ appimage_is_host_library() {
 }

 appimage_is_elf_file() {
-    file -b "$1" 2>/dev/null | grep -q '^ELF '
+    # Read the four-byte ELF magic rather than asking file(1): this runs once per candidate, and an
+    # AppDir holds thousands of them (the bundled Python runtime alone is ~5k files, none of them
+    # ELF). Two processes per call made this ~14 s of a ~95 s image build on its own.
+    local magic
+    [[ -f "$1" && -r "$1" ]] || return 1
+    IFS= read -r -n 4 -d '' magic < "$1" 2>/dev/null
+    [[ $magic == $'\177ELF' ]]
 }

 appimage_list_direct_dependencies() {
@@ -118,9 +118,13 @@ bundle_dependency_closure() {
    # (scripts/check_appimage_libs.sh).
    local -a search_dirs=("$dst_dir")

-    while [ ${#queue[@]} -gt 0 ]; do
-        target="${queue[0]}"
-        queue=("${queue[@]:1}")
+    # Walked with a read index rather than by reslicing the array: "${queue[@]:1}" rebuilds the whole
+    # queue on every pop, so draining it costs O(n^2). At the ~5k entries this bundle reaches that was
+    # ~22 s of the image build spent copying an array around.
+    local head=0
+    while [ "$head" -lt ${#queue[@]} ]; do
+        target="${queue[$head]}"
+        head=$((head + 1))

        if [ ! -e "$target" ] || ! appimage_is_elf_file "$target"; then
            continue
@@ -62,6 +62,7 @@
 #include <TopoDS_Face.hxx>
 #include <TopAbs.hxx>
 #include <TopoDS_Shell.hxx>
+#include <TopoDS_Solid.hxx>
 #include <TopoDS_Compound.hxx>      // multi-body: compound of bodies for display/compat
 #include <BRep_Builder.hxx>
 #include <TopAbs_Orientation.hxx>   // outward-normal orientation for face-extrude
@@ -33,7 +33,6 @@
 #include <NCollection_IndexedMap.hxx>
 #include <NCollection_List.hxx>
 #include <Poly_Triangulation.hxx>
-#include <gp_Ax2.hxx>
 #include <gp_Dir.hxx>
 #include <gp_Pnt.hxx>
 #include <BRepGProp.hxx>
@@ -53,6 +52,7 @@
 #include <BRepBuilderAPI_MakeSolid.hxx>
 #include <BRep_Builder.hxx>
 #include <TopoDS_Shell.hxx>
+#include <TopoDS_Solid.hxx>
 #include <TopoDS_Vertex.hxx>
 #include <ShapeUpgrade_UnifySameDomain.hxx>
 #include <array>
@@ -244,30 +244,6 @@ TopoDS_Shape GeometryEngine::mesh_to_brep(const indexed_triangle_set& its,
    return shape;
 }

-// ---- Primitive creation ----
-
-TopoDS_Solid GeometryEngine::make_primitive(const PrimitiveParams& params)
-{
-    switch (params.type) {
-    case PrimitiveType::Box:
-        return BRepPrimAPI_MakeBox(gp_Pnt(-params.box_w/2, -params.box_d/2, 0),
-                                   params.box_w, params.box_d, params.box_h).Solid();
-    case PrimitiveType::Cylinder:
-        return BRepPrimAPI_MakeCylinder(gp_Ax2(gp_Pnt(0,0,0), gp_Dir(0,0,1)),
-                                        params.cyl_radius, params.cyl_height).Solid();
-    case PrimitiveType::Sphere:
-        return BRepPrimAPI_MakeSphere(gp_Pnt(0,0,params.sph_radius), params.sph_radius).Solid();
-    case PrimitiveType::Cone:
-        return BRepPrimAPI_MakeCone(gp_Ax2(gp_Pnt(0,0,0), gp_Dir(0,0,1)),
-                                    params.cone_r1, params.cone_r2, params.cone_height).Solid();
-    case PrimitiveType::Torus:
-        return BRepPrimAPI_MakeTorus(gp_Ax2(gp_Pnt(0,0,params.torus_r2), gp_Dir(0,0,1)),
-                                     params.torus_r1, params.torus_r2).Solid();
-    default:
-        return BRepPrimAPI_MakeBox(gp_Pnt(-10,-10,0), 20,20,20).Solid();
-    }
-}
-
 // ---- Face classification ----

 FaceGroup GeometryEngine::classify_face(const TopoDS_Face& face, const TopoDS_Shape& /*solid*/)
@@ -545,19 +521,6 @@ GeometryEngine::MassProps GeometryEngine::mass_properties(const TopoDS_Shape& sh
    return p;
 }

-std::string GeometryEngine::primitive_name(PrimitiveType type)
-{
-    switch (type) {
-    // TRN Default name of an object created from the box primitive shape.
-    case PrimitiveType::Box:      return _u8L("Box");
-    case PrimitiveType::Cylinder: return _u8L("Cylinder");
-    case PrimitiveType::Sphere:   return _u8L("Sphere");
-    case PrimitiveType::Cone:     return _u8L("Cone");
-    case PrimitiveType::Torus:    return _u8L("Torus");
-    default:                      return _u8L("Unknown");
-    }
-}
-
 // ---- Topology accessors ----

 int GeometryEngine::face_count(const TopoDS_Shape& shape)
@@ -4,15 +4,8 @@
 #include "libslic3r/Point.hpp"
 #include "libslic3r/TriangleMesh.hpp"

-#include <BRepPrimAPI_MakeBox.hxx>
-#include <BRepPrimAPI_MakeCylinder.hxx>
-#include <BRepPrimAPI_MakeSphere.hxx>
-#include <BRepPrimAPI_MakeCone.hxx>
-#include <BRepPrimAPI_MakeTorus.hxx>
 #include <TopoDS_Shape.hxx>
 #include <array>
-#include <gp_Ax2.hxx>
-#include <TopoDS_Solid.hxx>
 #include <TopoDS_Face.hxx>
 #include <TopoDS_Edge.hxx>
 #include <vector>
@@ -20,44 +13,11 @@

 namespace Slic3r {

-enum class PrimitiveType { Box, Cylinder, Sphere, Cone, Torus, COUNT };
-enum class DressUpType   { Fillet, Chamfer };
 enum class FaceGroup     { Top, Bottom, Lateral, All };

-struct PrimitiveParams {
-    PrimitiveType type{PrimitiveType::Box};
-    double box_w{20}, box_h{20}, box_d{20};
-    double cyl_radius{10}, cyl_height{20};
-    double sph_radius{10};
-    double cone_r1{10}, cone_r2{5}, cone_height{20};
-    double torus_r1{10}, torus_r2{3};
-
-    // Dress-up
-    bool   dressup_enabled{false};
-    DressUpType dressup_type{DressUpType::Fillet};
-    FaceGroup   dressup_faces{FaceGroup::All};
-    double dressup_radius{1.0};    // fillet radius
-    double dressup_chamfer_dist{1.0}; // chamfer distance (symmetric)
-
-    // Mesh quality — the Design tab's own density (CadDocument::linear_deflection), so a
-    // primitive and the same body modelled in the Design tab reach the screen alike.
-    double linear_deflection{0.003};
-    double angular_deflection{0.5};
-
-    template<class Archive>
-    void serialize(Archive& ar) {
-        ar(type, box_w, box_h, box_d, cyl_radius, cyl_height, sph_radius,
-           cone_r1, cone_r2, cone_height, torus_r1, torus_r2,
-           dressup_enabled, dressup_type, dressup_faces, dressup_radius, dressup_chamfer_dist,
-           linear_deflection, angular_deflection);
-    }
-};
-
 class GeometryEngine
 {
 public:
-    static TopoDS_Solid make_primitive(const PrimitiveParams& params);
-
    // Read a STEP file into its top-level solids (one TopoDS_Shape per solid; falls back to
    // the whole shape if it contains no closed solids). Reuses OCCT's STEPControl_Reader,
    // already linked via Format/STEP.cpp — no new dependency. err is set on failure (empty result).
@@ -132,7 +92,6 @@ public:
    static TriangleMesh tessellate(const TopoDS_Shape& shape,
                                   double linear_deflection = 0.003,
                                   double angular_deflection = 0.5);
-    static std::string  primitive_name(PrimitiveType type);

    // Topology accessors for in-viewport face/edge picking (Design tab). Face index is the
    // TopExp_Explorer(shape, TopAbs_FACE) ordinal — identical to SketchEngine::tessellate's
@@ -3,7 +3,6 @@

 #include "libslic3r/TriangleMesh.hpp"
 #include "libslic3r/Point.hpp"
-#include "libslic3r/CAD/GeometryEngine.hpp"

 #include <gp_Pln.hxx>
 #include <gp_Ax1.hxx>
@@ -211,30 +210,6 @@ ConstraintPlan plan_entity_constraint(const std::vector<SketchEntity>& ents,
 bool solve_sketch_entities(std::vector<SketchEntity>& entities,
                           const std::vector<SketchEntityConstraintDef>& constraints);

-struct SketchParams {
-    // Extrude/Revolve
-    double extrude_len{10}; bool extrude_sym{false}; double extrude_taper{0};
-    double revolve_deg{360};
-    bool   is_pocket{false}; // cut into selected object instead of new
-
-    // Dress-up
-    bool        dressup_enabled{false};
-    DressUpType dressup_type{DressUpType::Fillet};
-    FaceGroup   dressup_faces{FaceGroup::All};
-    double      dressup_radius{1.0};
-    double      dressup_chamfer_dist{1.0};
-
-    // Mesh
-    double linear_deflection{0.01};
-
-    template<class Archive>
-    void serialize(Archive& ar) {
-        ar(extrude_len, extrude_sym, extrude_taper, revolve_deg, is_pocket,
-           dressup_enabled, dressup_type, dressup_faces, dressup_radius, dressup_chamfer_dist,
-           linear_deflection);
-    }
-};
-
 class SketchEngine
 {
 public:
@@ -10030,6 +10030,13 @@ static void extend_extruder_variant(DynamicPrintConfig& config, const unsigned i
            printer_extruder_variant_opt->values.insert(printer_extruder_variant_opt->values.end(), variants_list.begin(), variants_list.end());
        }
    }
+
+    // 3. Size the machine limits to the rebuilt variants, padded with their first value like the other variant keys.
+    // They are not extruder option keys, so the resize loop in set_num_extruders skips them.
+    const auto &defaults = FullPrintConfig::defaults();
+    for (const std::string &key : printer_options_with_variant_2)
+        if (auto *opt = config.option<ConfigOptionFloats>(key))
+            opt->resize(config.get_parameter_size(key, num_extruders), defaults.option(key));
 }

 void DynamicPrintConfig::set_num_extruders(unsigned int num_extruders)
@@ -849,11 +849,6 @@ if (SLIC3R_CAD)
        GUI/CAD/SketchInlineEditor.hpp
        GUI/CAD/McpControl.cpp
        GUI/CAD/McpControl.hpp
-        GUI/Gizmos/GLGizmoSketch.cpp
-        GUI/Gizmos/GLGizmoSketch.hpp
-        # Needs GeometryEngine (make_primitive / apply_fillet / tessellate).
-        GUI/Gizmos/GLGizmoPrimitive.cpp
-        GUI/Gizmos/GLGizmoPrimitive.hpp
    )
 endif ()

@@ -1,206 +0,0 @@
-#include "GLGizmoPrimitive.hpp"
-#include "slic3r/GUI/GLCanvas3D.hpp"
-#include "slic3r/GUI/ImGuiWrapper.hpp"
-#include "slic3r/GUI/Plater.hpp"
-#include "slic3r/GUI/NotificationManager.hpp"
-#include "libslic3r/Model.hpp"
-#include <string>
-#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp"
-#include "slic3r/GUI/Gizmos/GLGizmosCommon.hpp"
-#include "libslic3r/CAD/GeometryEngine.hpp"
-#include <TopoDS_Solid.hxx>
-#include <TopoDS_Shape.hxx>
-#include "slic3r/GUI/GUI_App.hpp"
-#include <utility>
-#include <algorithm>
-#include <imgui.h>
-
-#ifndef IMGUI_DEFINE_MATH_OPERATORS
-#define IMGUI_DEFINE_MATH_OPERATORS
-#endif
-#include <imgui/imgui_internal.h>
-#include "libslic3r/TriangleMesh.hpp"
-#include "slic3r/GUI/I18N.hpp"
-
-namespace Slic3r {
-namespace GUI {
-
-GLGizmoPrimitive::GLGizmoPrimitive(GLCanvas3D& parent, const std::string& icon_filename, unsigned int sprite_id)
-    : GLGizmoBase(parent, icon_filename, sprite_id) {}
-
-bool GLGizmoPrimitive::on_init() { return true; }
-std::string GLGizmoPrimitive::on_get_name() const { return _u8L("Primitive"); }
-// Part of the experimental CAD feature: built into every CAD build, but offered in the Prepare
-// toolbar only when that feature is switched on in Preferences — switched off, Prepare must be
-// exactly what it is without it.
-bool GLGizmoPrimitive::on_is_activable() const { return wxGetApp().is_enable_cad_feature(); }
-bool GLGizmoPrimitive::on_is_selectable() const { return wxGetApp().is_enable_cad_feature(); }
-void GLGizmoPrimitive::on_render() {}
-void GLGizmoPrimitive::on_set_state()
-{ if (m_state == EState::On) { m_params = PrimitiveParams{}; m_preview_dirty = true; } }
-
-bool GLGizmoPrimitive::on_mouse(const wxMouseEvent&) { return false; }
-
-CommonGizmosDataID GLGizmoPrimitive::on_get_requirements() const
-{ return CommonGizmosDataID(int(CommonGizmosDataID::SelectionInfo) | int(CommonGizmosDataID::InstancesHider)); }
-
-void GLGizmoPrimitive::on_load(cereal::BinaryInputArchive& ar)
-{ ar(m_params); m_preview_dirty = true; }
-void GLGizmoPrimitive::on_save(cereal::BinaryOutputArchive& ar) const
-{ ar(m_params); }
-
-void GLGizmoPrimitive::apply_preset(const char*, double w, double h, double d)
-{
-    m_params.type = PrimitiveType::Box;
-    m_params.box_w = w; m_params.box_h = h; m_params.box_d = d;
-    m_preview_dirty = true;
-}
-
-static void gen_mesh_and_add(PrimitiveParams& p, const char* snap_name)
-{
-    TopoDS_Solid solid = GeometryEngine::make_primitive(p);
-    TopoDS_Shape shape = solid;
-    if (p.dressup_enabled) {
-        if (p.dressup_type == DressUpType::Fillet)
-            shape = GeometryEngine::apply_fillet(shape, p.dressup_radius, p.dressup_faces);
-        else
-            shape = GeometryEngine::apply_chamfer(shape, p.dressup_chamfer_dist, p.dressup_faces);
-    }
-    TriangleMesh mesh = GeometryEngine::tessellate(shape, p.linear_deflection, p.angular_deflection);
-    if (mesh.its.indices.empty()) {
-        wxGetApp().notification_manager()->push_notification(NotificationType::CustomNotification, NotificationManager::NotificationLevel::WarningNotificationLevel, _u8L("Empty mesh generated"));
-        return;
-    }
-    wxGetApp().plater()->take_snapshot(snap_name);
-    ModelObject* mo = wxGetApp().model().add_object();
-    std::string name = GeometryEngine::primitive_name(p.type);
-    if (p.dressup_enabled && p.dressup_type == DressUpType::Fillet) name += " (Fillet)";
-    else if (p.dressup_enabled) name += " (Chamfer)";
-    mo->name = name;
-    mo->add_volume(std::move(mesh))->set_new_unique_id();
-    mo->ensure_on_bed();
-    wxGetApp().plater()->update();
-}
-
-void GLGizmoPrimitive::apply_primitive() { gen_mesh_and_add(m_params, "Add Primitive"); }
-
-void GLGizmoPrimitive::on_render_input_window(float x, float y, float bottom_limit)
-{
-    y = std::min(y, bottom_limit - ImGui::GetWindowHeight());
-    const float scale = m_parent.get_scale();
-    ImGuiWrapper::push_toolbar_style(scale);
-    GizmoImguiSetNextWIndowPos(x, y, ImGuiCond_Always, 0.0f, 0.0f);
-    GizmoImguiBegin("Primitive", ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_NoMove
-                                  | ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoCollapse
-                                  | ImGuiWindowFlags_NoTitleBar);
-
-    if (ImGui::CollapsingHeader(_u8L("Shape").c_str(), ImGuiTreeNodeFlags_DefaultOpen)) {
-        const std::string names_s[] = {_u8L("Box"), _u8L("Cylinder"), _u8L("Sphere"), _u8L("Cone"), _u8L("Torus")};
-        const char* names[] = {names_s[0].c_str(), names_s[1].c_str(), names_s[2].c_str(), names_s[3].c_str(), names_s[4].c_str()};
-        int cur = (int)m_params.type;
-        if (ImGui::Combo("##type", &cur, names, (int)PrimitiveType::COUNT)) {
-            m_params.type = (PrimitiveType)cur;
-            m_preview_dirty = true;
-        }
-        // TRN Primitive gizmo: label in front of the preset cube size buttons
-        ImGui::TextUnformatted(_u8L("Quick:").c_str());
-        ImGui::SameLine();
-        if (ImGui::SmallButton("10mm")) apply_preset("10mm cube", 10, 10, 10);
-        ImGui::SameLine();
-        if (ImGui::SmallButton("20mm")) apply_preset("20mm cube", 20, 20, 20);
-        ImGui::SameLine();
-        if (ImGui::SmallButton("50mm")) apply_preset("50mm cube", 50, 50, 50);
-    }
-
-    ImGui::Separator();
-
-    if (ImGui::CollapsingHeader(_u8L("Dimensions").c_str(), ImGuiTreeNodeFlags_DefaultOpen)) {
-        auto dim = [&](const char* label, double& val, double step=0.5, double fast=5.0) {
-            ImGui::SetNextItemWidth(130);
-            if (ImGui::InputDouble(label, &val, step, fast, "%.1f mm")) m_preview_dirty = true;
-            if (val < 0.5) val = 0.5;
-        };
-        switch (m_params.type) {
-        case PrimitiveType::Box:
-            dim(_u8L("Width (X)").c_str(),  m_params.box_w);
-            dim(_u8L("Depth (Y)").c_str(),  m_params.box_d);
-            dim(_u8L("Height (Z)").c_str(), m_params.box_h);
-            break;
-        case PrimitiveType::Cylinder:
-            dim(_u8L("Radius").c_str(), m_params.cyl_radius);
-            dim(_u8L("Height").c_str(), m_params.cyl_height);
-            break;
-        case PrimitiveType::Sphere:
-            dim(_u8L("Radius").c_str(), m_params.sph_radius);
-            break;
-        case PrimitiveType::Cone:
-            // TRN Primitive gizmo: bottom radius of a cone ("Top R" is the top radius)
-            dim(_u8L("Bottom R").c_str(), m_params.cone_r1);
-            dim(_u8L("Top R").c_str(),    m_params.cone_r2);
-            dim(_u8L("Height").c_str(),   m_params.cone_height);
-            break;
-        case PrimitiveType::Torus:
-            // TRN Primitive gizmo: major radius of a torus ("Minor R" is the tube radius)
-            dim(_u8L("Major R").c_str(), m_params.torus_r1);
-            dim(_u8L("Minor R").c_str(), m_params.torus_r2, 0.1, 1.0);
-            break;
-        default: break;
-        }
-    }
-
-    ImGui::Separator();
-
-    if (ImGui::CollapsingHeader(_u8L("Fillet / Chamfer").c_str())) {
-        ImGui::Checkbox(_u8L("Enable").c_str(), &m_params.dressup_enabled);
-        if (m_params.dressup_enabled) {
-            const std::string dn_s[] = {_u8L("Fillet"), _u8L("Chamfer")};
-            const char* dn[] = {dn_s[0].c_str(), dn_s[1].c_str()};
-            int du = (int)m_params.dressup_type;
-            ImGui::SetNextItemWidth(100);
-            if (ImGui::Combo("##dtype", &du, dn, 2)) { m_params.dressup_type = (DressUpType)du; m_preview_dirty = true; }
-            const std::string fn_s[] = {_u8L("All edges"), _u8L("Top edges"), _u8L("Bottom edges"), _u8L("Lateral edges")};
-            const char* fn[] = {fn_s[0].c_str(), fn_s[1].c_str(), fn_s[2].c_str(), fn_s[3].c_str()};
-            int fg = (int)m_params.dressup_faces;
-            ImGui::SetNextItemWidth(140);
-            if (ImGui::Combo(_u8L("Edges").c_str(), &fg, fn, 4)) { m_params.dressup_faces = (FaceGroup)fg; m_preview_dirty = true; }
-            if (m_params.dressup_type == DressUpType::Fillet) {
-                ImGui::SetNextItemWidth(100);
-                if (ImGui::InputDouble(_u8L("Radius").c_str(), &m_params.dressup_radius, 0.1, 1.0, "%.1f mm")) {
-                    if (m_params.dressup_radius < 0.1) m_params.dressup_radius = 0.1;
-                    m_preview_dirty = true;
-                }
-            } else {
-                ImGui::SetNextItemWidth(100);
-                if (ImGui::InputDouble(_u8L("Distance").c_str(), &m_params.dressup_chamfer_dist, 0.1, 1.0, "%.1f mm")) {
-                    if (m_params.dressup_chamfer_dist < 0.1) m_params.dressup_chamfer_dist = 0.1;
-                    m_preview_dirty = true;
-                }
-            }
-        }
-    }
-
-    ImGui::Separator();
-
-    if (ImGui::CollapsingHeader(_u8L("Quality").c_str())) {
-        ImGui::SetNextItemWidth(130);
-        if (ImGui::InputDouble(_u8L("Mesh resolution").c_str(), &m_params.linear_deflection, 0.001, 0.1, "%.3f mm")) {
-            if (m_params.linear_deflection < 0.001) m_params.linear_deflection = 0.001;
-            if (m_params.linear_deflection > 1.0)   m_params.linear_deflection = 1.0;
-            m_preview_dirty = true;
-        }
-    }
-
-    ImGui::Separator();
-
-    if (ImGui::Button(_u8L("Add Shape").c_str(), {-1, 28}))
-        apply_primitive();
-
-    if (ImGui::Button(_u8L("Close").c_str(), {-1, 0}))
-        m_parent.reset_all_gizmos();
-
-    GizmoImguiEnd();
-    ImGuiWrapper::pop_toolbar_style();
-}
-
-} // namespace GUI
-} // namespace Slic3r
@@ -1,48 +0,0 @@
-#ifndef slic3r_GLGizmoPrimitive_hpp_
-#define slic3r_GLGizmoPrimitive_hpp_
-
-#include "GLGizmoBase.hpp"
-#include "GLGizmosCommon.hpp"
-#include "libslic3r/CAD/GeometryEngine.hpp"
-#include <string>
-#include <wx/event.h>
-#include <cereal/archives/binary.hpp>
-#include "libslic3r/TriangleMesh.hpp"
-
-namespace Slic3r {
-namespace GUI {
-
-class GLGizmoPrimitive : public GLGizmoBase
-{
-public:
-    GLGizmoPrimitive(GLCanvas3D& parent, const std::string& icon_filename, unsigned int sprite_id);
-    ~GLGizmoPrimitive() = default;
-
-    bool on_mouse(const wxMouseEvent& mouse_event) override;
-
-protected:
-    bool on_init() override;
-    std::string on_get_name() const override;
-    bool on_is_activable() const override;
-    bool on_is_selectable() const override;
-    void on_render() override;
-    void on_set_state() override;
-    CommonGizmosDataID on_get_requirements() const override;
-    void on_render_input_window(float x, float y, float bottom_limit) override;
-
-    void on_load(cereal::BinaryInputArchive& ar) override;
-    void on_save(cereal::BinaryOutputArchive& ar) const override;
-
-private:
-    void apply_primitive();
-    void apply_preset(const char* name, double w, double h, double d);
-
-    PrimitiveParams m_params;
-    TriangleMesh    m_preview_mesh;
-    bool            m_preview_dirty{true};
-};
-
-} // namespace GUI
-} // namespace Slic3r
-
-#endif // slic3r_GLGizmoPrimitive_hpp_
@@ -1,488 +0,0 @@
-#include "GLGizmoSketch.hpp"
-#include "slic3r/GUI/GLCanvas3D.hpp"
-#include "slic3r/GUI/ImGuiWrapper.hpp"
-#include "slic3r/GUI/Plater.hpp"
-#include "slic3r/GUI/NotificationManager.hpp"
-#include "slic3r/GUI/format.hpp"
-#include "libslic3r/Model.hpp"
-#include <BRepBuilderAPI_MakeFace.hxx>
-#include <BRepPrimAPI_MakeRevol.hxx>
-#include <BRepAlgoAPI_Fuse.hxx>
-#include <string>
-#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp"
-#include "slic3r/GUI/Gizmos/GLGizmosCommon.hpp"
-#include "libslic3r/CAD/SketchEngine.hpp"
-#include "libslic3r/Point.hpp"
-#include <cmath>
-#include <math.h>
-#include <imgui.h>
-#include <cstddef>
-#include <vector>
-#include <stdexcept>
-#include <gp_Pnt.hxx>
-#include <gp_Dir.hxx>
-#include "libslic3r/CAD/GeometryEngine.hpp"
-#include <algorithm>
-#include "slic3r/GUI/GUI_App.hpp"
-#include <utility>
-#include <exception>
-
-#ifndef IMGUI_DEFINE_MATH_OPERATORS
-#define IMGUI_DEFINE_MATH_OPERATORS
-#endif
-#include <imgui/imgui_internal.h>
-#include "libslic3r/TriangleMesh.hpp"
-#include "slic3r/GUI/I18N.hpp"
-#include "slic3r/GUI/Selection.hpp"
-
-namespace Slic3r {
-namespace GUI {
-
-GLGizmoSketch::GLGizmoSketch(GLCanvas3D& parent, const std::string& icon_filename, unsigned int sprite_id)
-    : GLGizmoBase(parent, icon_filename, sprite_id) {}
-
-bool GLGizmoSketch::on_init() { return true; }
-std::string GLGizmoSketch::on_get_name() const { return _u8L("Sketch"); }
-// Part of the experimental CAD feature: built into every CAD build, but offered in the Prepare
-// toolbar only when that feature is switched on in Preferences — switched off, Prepare must be
-// exactly what it is without it.
-bool GLGizmoSketch::on_is_activable() const { return wxGetApp().is_enable_cad_feature(); }
-bool GLGizmoSketch::on_is_selectable() const { return wxGetApp().is_enable_cad_feature(); }
-void GLGizmoSketch::on_render() {}
-void GLGizmoSketch::on_set_state() { if (m_state == EState::On) clear_all(); }
-bool GLGizmoSketch::on_mouse(const wxMouseEvent&) { return false; }
-
-CommonGizmosDataID GLGizmoSketch::on_get_requirements() const
-{ return CommonGizmosDataID(int(CommonGizmosDataID::SelectionInfo)); }
-
-void GLGizmoSketch::on_load(cereal::BinaryInputArchive& ar)
-{
-    ar(m_tool, m_profiles, m_plane, m_sp, m_rect_w, m_rect_h, m_circle_r, m_poly_sides, m_poly_r, m_snap_grid, m_grid_step);
-    m_active_profile = -1;
-}
-
-void GLGizmoSketch::on_save(cereal::BinaryOutputArchive& ar) const
-{
-    ar(m_tool, m_profiles, m_plane, m_sp, m_rect_w, m_rect_h, m_circle_r, m_poly_sides, m_poly_r, m_snap_grid, m_grid_step);
-}
-
-SketchProfile& GLGizmoSketch::active_profile()
-{
-    if (m_active_profile < 0 || m_active_profile >= (int)m_profiles.size()) {
-        m_profiles.emplace_back();
-        m_active_profile = (int)m_profiles.size() - 1;
-    }
-    return m_profiles[m_active_profile];
-}
-
-bool GLGizmoSketch::has_closed_profile() const
-{
-    for (auto& p : m_profiles) if (p.closed && p.points.size() >= 3) return true;
-    return false;
-}
-
-void GLGizmoSketch::clear_all()
-{
-    m_profiles.clear();
-    m_canvas_points.clear();
-    m_active_profile = -1;
-}
-
-void GLGizmoSketch::add_closed_profile()
-{
-    auto& ap = active_profile();
-    if (ap.points.size() >= 3) {
-        ap.closed = true;
-        m_active_profile = -1;
-    }
-}
-
-void GLGizmoSketch::delete_profile(int idx)
-{
-    if (idx >= 0 && idx < (int)m_profiles.size()) {
-        m_profiles.erase(m_profiles.begin() + idx);
-        if (m_active_profile >= (int)m_profiles.size()) m_active_profile = -1;
-    }
-}
-
-Vec2d GLGizmoSketch::snap(Vec2d pt) const
-{
-    if (!m_snap_grid) return pt;
-    double gs = m_grid_step;
-    return {round(pt.x() / gs) * gs, round(pt.y() / gs) * gs};
-}
-
-void GLGizmoSketch::build_preset_profile()
-{
-    auto& ap = active_profile();
-    ap.clear();
-    auto add = [&](double x, double y) { ap.points.emplace_back(x, y); };
-    switch (m_tool) {
-    case SketchTool::Rectangle:
-        add(-m_rect_w/2, -m_rect_h/2); add( m_rect_w/2, -m_rect_h/2);
-        add( m_rect_w/2,  m_rect_h/2); add(-m_rect_w/2,  m_rect_h/2);
-        ap.closed = true; m_active_profile = -1; break;
-    case SketchTool::Circle:
-        for (int i = 0; i <= m_circle_seg; ++i) {
-            double a = 2.0*M_PI*i/m_circle_seg;
-            add(cos(a)*m_circle_r, sin(a)*m_circle_r);
-        }
-        ap.closed = true; m_active_profile = -1; break;
-    case SketchTool::Polygon:
-        for (int i = 0; i < m_poly_sides; ++i) {
-            double a = 2.0*M_PI*i/m_poly_sides - M_PI/2;
-            add(cos(a)*m_poly_r, sin(a)*m_poly_r);
-        }
-        ap.closed = true; m_active_profile = -1; break;
-    default: break;
-    }
-}
-
-void GLGizmoSketch::handle_canvas_click(ImVec2 pos)
-{
-    Vec2d pt = snap({pos.x / m_canvas_scale, -pos.y / m_canvas_scale});
-    if (m_tool == SketchTool::Line) {
-        auto& ap = active_profile();
-        if (ap.points.size() >= 3 && (pt - ap.points.front()).norm() < m_grid_step) {
-            ap.points.push_back(ap.points.front());
-            ap.closed = true;
-            m_active_profile = -1;
-            return;
-        }
-        ap.points.push_back(pt);
-    }
-}
-
-void GLGizmoSketch::draw_canvas()
-{
-    ImDrawList* dl = ImGui::GetWindowDrawList();
-    ImVec2 pos = ImGui::GetCursorScreenPos();
-    float w = 280, h = 200;
-    ImVec2 end(pos.x+w, pos.y+h);
-    float cx = pos.x+w/2, cy = pos.y+h/2;
-    auto tc = [&](const ImVec2& p) { return ImVec2(cx+p.x*m_canvas_scale, cy-p.y*m_canvas_scale); };
-
-    dl->AddRectFilled(pos, end, IM_COL32(28,28,36,255));
-    dl->AddRect(pos, end, IM_COL32(55,55,68,255));
-
-    float gs = m_grid_step;
-    for (float g = 0; g < w; g += gs * m_canvas_scale) {
-        ImU32 gc = (int(g/(gs*m_canvas_scale)) % 5 == 0) ? IM_COL32(60,60,75,100) : IM_COL32(45,45,55,60);
-        dl->AddLine({pos.x+g,pos.y}, {pos.x+g,end.y}, gc);
-    }
-    for (float g = 0; g < h; g += gs * m_canvas_scale) {
-        ImU32 gc = (int(g/(gs*m_canvas_scale)) % 5 == 0) ? IM_COL32(60,60,75,100) : IM_COL32(45,45,55,60);
-        dl->AddLine({pos.x,pos.y+g}, {end.x,pos.y+g}, gc);
-    }
-
-    dl->AddLine({cx,pos.y},{cx,end.y}, IM_COL32(70,70,85,180), 1.5f);
-    dl->AddLine({pos.x,cy},{end.x,cy}, IM_COL32(70,70,85,180), 1.5f);
-    dl->AddText({end.x-12, cy+2}, IM_COL32(120,120,140,200), "X");
-    dl->AddText({cx+4, pos.y+2}, IM_COL32(120,120,140,200), "Y");
-
-    for (size_t pi = 0; pi < m_profiles.size(); ++pi) {
-        auto& prof = m_profiles[pi];
-        if (prof.points.size() < 2) continue;
-        std::vector<ImVec2> sp;
-        for (auto& p : prof.points) sp.push_back(tc({(float)p.x(), (float)p.y()}));
-        if (prof.closed && sp.size() >= 3) {
-            bool is_outer = (pi == 0);
-            ImU32 fill = is_outer ? IM_COL32(0,180,90,35) : IM_COL32(180,60,60,35);
-            ImU32 line = is_outer ? IM_COL32(0,220,100,255) : IM_COL32(220,80,80,255);
-            dl->AddConvexPolyFilled(sp.data(), (int)sp.size(), fill);
-            for (size_t i=0; i<sp.size(); ++i)
-                dl->AddLine(sp[i], sp[(i+1)%sp.size()], line, (pi==0)?2.5f:2.0f);
-            for (size_t i=0; i<sp.size()-1; ++i)
-                dl->AddCircleFilled(sp[i], 3.0f, IM_COL32(255,255,255,255));
-        }
-    }
-
-    auto& ap = active_profile();
-    if (!ap.closed && ap.points.size() >= 1) {
-        std::vector<ImVec2> sp;
-        for (auto& p : ap.points) sp.push_back(tc({(float)p.x(), (float)p.y()}));
-        for (size_t i=1; i<sp.size(); ++i)
-            dl->AddLine(sp[i-1], sp[i], IM_COL32(0,200,255,200), 2.0f);
-        for (auto& s : sp) dl->AddCircleFilled(s, 3.5f, IM_COL32(100,200,255,255));
-        ImVec2 mouse = ImGui::GetMousePos();
-        if (mouse.x > pos.x && mouse.x < end.x && mouse.y > pos.y && mouse.y < end.y)
-            dl->AddLine(sp.back(), mouse, IM_COL32(100,160,220,120), 1.5f);
-    }
-
-    ImGui::InvisibleButton("canvas", ImVec2(w,h));
-    if (ImGui::IsItemHovered()) {
-        ImVec2 m = ImGui::GetMousePos();
-        Vec2d sk({(m.x-cx)/m_canvas_scale, -(m.y-cy)/m_canvas_scale});
-        if (m_snap_grid) sk = snap(sk);
-        auto txt = wxString::Format("X:%.1f Y:%.1f", sk.x(), sk.y()).ToStdString();
-        dl->AddText({pos.x+4, end.y-16}, IM_COL32(160,160,180,200), txt.c_str());
-        if (ImGui::IsMouseClicked(ImGuiMouseButton_Left))
-            handle_canvas_click({(m.x-cx)/m_canvas_scale, -(m.y-cy)/m_canvas_scale});
-        if (ImGui::IsMouseClicked(ImGuiMouseButton_Right)) {
-            auto& ap2 = active_profile();
-            if (ap2.points.size() >= 3) {
-                ap2.points.push_back(ap2.points.front());
-                ap2.closed = true;
-                m_active_profile = -1;
-            }
-        }
-    }
-}
-
-TopoDS_Shape GLGizmoSketch::build_combined_shape()
-{
-    if (m_profiles.empty() || !m_profiles[0].closed)
-        throw std::runtime_error(_u8L("No outer profile"));
-
-    TopoDS_Wire outer_wire = m_profiles[0].to_occt_wire(m_plane);
-    BRepBuilderAPI_MakeFace face_maker(outer_wire);
-    if (!face_maker.IsDone()) throw std::runtime_error(_u8L("Failed to make outer face"));
-
-    for (size_t i = 1; i < m_profiles.size(); ++i) {
-        if (!m_profiles[i].closed) continue;
-        TopoDS_Wire inner = m_profiles[i].to_occt_wire(m_plane);
-        face_maker.Add(inner);
-    }
-    face_maker.Build();
-    if (!face_maker.IsDone()) throw std::runtime_error(_u8L("Failed to build face with holes"));
-
-    TopoDS_Face face = face_maker.Face();
-
-    TopoDS_Shape shape;
-    if (m_sp.revolve_deg < 360.0 && m_sp.revolve_deg > 0.0) {
-        gp_Pnt o(m_plane.origin.x(), m_plane.origin.y(), m_plane.origin.z());
-        gp_Dir xd(m_plane.x_axis.x(), m_plane.x_axis.y(), m_plane.x_axis.z());
-        gp_Ax1 axis(o, xd);
-        BRepPrimAPI_MakeRevol rev(face, axis, m_sp.revolve_deg * M_PI / 180.0);
-        if (!rev.IsDone()) throw std::runtime_error(_u8L("Revolve failed"));
-        shape = rev.Shape();
-    } else {
-        shape = SketchEngine::make_extrude_face(face, m_plane, m_sp.extrude_len, m_sp.extrude_sym);
-    }
-
-    if (m_sp.dressup_enabled) {
-        if (m_sp.dressup_type == DressUpType::Fillet)
-            shape = GeometryEngine::apply_fillet(shape, m_sp.dressup_radius, m_sp.dressup_faces);
-        else
-            shape = GeometryEngine::apply_chamfer(shape, m_sp.dressup_chamfer_dist, m_sp.dressup_faces);
-    }
-    return shape;
-}
-
-void GLGizmoSketch::on_render_input_window(float x, float y, float bottom_limit)
-{
-    y = std::min(y, bottom_limit - ImGui::GetWindowHeight());
-    const float scale = m_parent.get_scale();
-    ImGuiWrapper::push_toolbar_style(scale);
-    GizmoImguiSetNextWIndowPos(x, y, ImGuiCond_Always, 0.0f, 0.0f);
-    GizmoImguiBegin("Sketch", ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_NoMove
-                               | ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoCollapse
-                               | ImGuiWindowFlags_NoTitleBar);
-
-    if (ImGui::CollapsingHeader(_u8L("Profile").c_str(), ImGuiTreeNodeFlags_DefaultOpen)) {
-        const std::string names_s[] = {_u8L("Line"), _u8L("Rectangle"), _u8L("Circle"), _u8L("Polygon")};
-        const char* names[] = {names_s[0].c_str(), names_s[1].c_str(), names_s[2].c_str(), names_s[3].c_str()};
-        int cur = (int)m_tool;
-        if (ImGui::Combo("##shape", &cur, names, (int)SketchTool::COUNT)) {
-            m_tool = (SketchTool)cur;
-            if (m_tool != SketchTool::Line) build_preset_profile();
-        }
-        ImGui::SameLine();
-        if (m_imgui->button("+##newprofile")) m_active_profile = -1;
-        if (ImGui::IsItemHovered()) ImGui::SetTooltip("%s", _u8L("Start new profile (for holes)").c_str());
-
-        if (m_tool == SketchTool::Rectangle) {
-            ImGui::SetNextItemWidth(80); if (ImGui::InputDouble(_u8L("Width").c_str(), &m_rect_w,1,10,"%.0f")) build_preset_profile();
-            ImGui::SameLine();
-            ImGui::SetNextItemWidth(80); if (ImGui::InputDouble(_u8L("Height").c_str(), &m_rect_h,1,10,"%.0f")) build_preset_profile();
-        } else if (m_tool == SketchTool::Circle) {
-            ImGui::SetNextItemWidth(80); if (ImGui::InputDouble(_u8L("Radius").c_str(), &m_circle_r,1,5,"%.0f")) build_preset_profile();
-            ImGui::SameLine();
-            ImGui::SetNextItemWidth(80); if (ImGui::SliderInt(_u8L("Segments").c_str(), &m_circle_seg,8,64)) build_preset_profile();
-        } else if (m_tool == SketchTool::Polygon) {
-            ImGui::SetNextItemWidth(80); if (ImGui::SliderInt(_u8L("Sides").c_str(), &m_poly_sides,3,12)) build_preset_profile();
-            ImGui::SameLine();
-            ImGui::SetNextItemWidth(80); if (ImGui::InputDouble((_u8L("Radius") + "##poly").c_str(), &m_poly_r,1,5,"%.0f")) build_preset_profile();
-        } else {
-            ImGui::Text("%s", _u8L("Click on canvas to draw").c_str());
-        }
-
-        ImGui::Checkbox(_u8L("Snap to grid").c_str(), &m_snap_grid);
-        ImGui::SameLine();
-        ImGui::SetNextItemWidth(80); ImGui::InputFloat(_u8L("Grid step").c_str(), &m_grid_step, 1, 5, "%.0f mm");
-
-        draw_canvas();
-
-        if (!m_profiles.empty()) {
-            ImGui::Text("%s: %zu", _u8L("Profiles").c_str(), m_profiles.size());
-            for (int i = 0; i < (int)m_profiles.size(); ++i) {
-                auto& p = m_profiles[i];
-                ImGui::PushID(i);
-                bool outer = (i == 0);
-                ImVec4 col = outer ? ImVec4(0,1,0,1) : ImVec4(1,0.3f,0.3f,1);
-                const std::string label = outer ? _u8L("Outer") : _u8L("Hole");
-                const std::string state = p.closed ? _u8L("closed") : std::string();
-                // TRN Sketch gizmo profile list: "Outer" or "Hole", profile number, point count, "closed" or nothing
-                ImGui::TextColored(col, "%s", GUI::format(_u8L("%1% %2%: %3% points %4%"), label, i + 1, p.points.size(), state).c_str());
-                ImGui::SameLine();
-                if (ImGui::SmallButton("X")) delete_profile(i);
-                ImGui::PopID();
-            }
-        }
-    }
-
-    ImGui::Separator();
-
-    bool is_revolve = false;
-    bool has_sel = false;
-
-    if (ImGui::CollapsingHeader(_u8L("Operation").c_str(), ImGuiTreeNodeFlags_DefaultOpen)) {
-        static int pi = 0;
-        const std::string plane_names[] = {_u8L("XY (Top)"), _u8L("XZ (Front)"), _u8L("YZ (Side)")};
-        const char* planes[] = {plane_names[0].c_str(), plane_names[1].c_str(), plane_names[2].c_str()};
-        if (ImGui::Combo(_u8L("Plane").c_str(), &pi, planes, 3))
-            m_plane = (pi==0) ? SketchPlane::XY() : (pi==1) ? SketchPlane::XZ() : SketchPlane::YZ();
-
-        is_revolve = (m_sp.revolve_deg > 0 && m_sp.revolve_deg < 360);
-        ImGui::SetNextItemWidth(100);
-        if (ImGui::InputDouble(_u8L("Revolve deg").c_str(), &m_sp.revolve_deg, 15, 90, "%.0f")) {
-            if (m_sp.revolve_deg > 360) m_sp.revolve_deg = 360;
-            if (m_sp.revolve_deg < 0) m_sp.revolve_deg = 0;
-        }
-        if (ImGui::IsItemHovered()) ImGui::SetTooltip("%s", _u8L("Set to 0 for extrude, >0 for revolve").c_str());
-
-        if (!is_revolve) {
-            ImGui::SetNextItemWidth(100);
-            ImGui::InputDouble(_u8L("Length").c_str(), &m_sp.extrude_len, 0.5, 5, "%.1f mm");
-            ImGui::SameLine();
-            ImGui::Checkbox(_u8L("Symmetric").c_str(), &m_sp.extrude_sym);
-        }
-
-        has_sel = !m_parent.get_selection().is_empty();
-        if (has_sel) {
-            if (ImGui::Checkbox(_u8L("Pocket (cut)").c_str(), &m_sp.is_pocket))
-                if (m_sp.is_pocket) m_sp.dressup_enabled = false;
-        } else m_sp.is_pocket = false;
-    }
-
-    ImGui::Separator();
-
-    if (!m_sp.is_pocket && ImGui::CollapsingHeader(_u8L("Fillet / Chamfer").c_str())) {
-        ImGui::Checkbox(_u8L("Enable").c_str(), &m_sp.dressup_enabled);
-        if (m_sp.dressup_enabled) {
-            const std::string dn_s[] = {_u8L("Fillet"), _u8L("Chamfer")};
-            const char* dn[] = {dn_s[0].c_str(), dn_s[1].c_str()};
-            int du = (int)m_sp.dressup_type;
-            ImGui::SetNextItemWidth(100);
-            if (ImGui::Combo("##dtype", &du, dn, 2)) m_sp.dressup_type = (DressUpType)du;
-            const std::string fn_s[] = {_u8L("All edges"), _u8L("Top edges"), _u8L("Bottom edges"), _u8L("Lateral edges")};
-            const char* fn[] = {fn_s[0].c_str(), fn_s[1].c_str(), fn_s[2].c_str(), fn_s[3].c_str()};
-            int fg = (int)m_sp.dressup_faces;
-            ImGui::SetNextItemWidth(140);
-            ImGui::Combo(_u8L("Edges").c_str(), &fg, fn, 4); m_sp.dressup_faces = (FaceGroup)fg;
-            ImGui::SetNextItemWidth(100);
-            if (m_sp.dressup_type == DressUpType::Fillet)
-                ImGui::InputDouble(_u8L("Radius").c_str(), &m_sp.dressup_radius, 0.1, 1, "%.1f mm");
-            else
-                ImGui::InputDouble(_u8L("Distance").c_str(), &m_sp.dressup_chamfer_dist, 0.1, 1, "%.1f mm");
-        }
-    }
-
-    ImGui::Separator();
-
-    bool ok = has_closed_profile();
-    if (ok) ImGui::TextColored({0,1,0,1}, "%s", wxString::Format(_L_PLURAL("%zu closed profile", "%zu closed profiles",
-                                                                             unsigned(m_profiles.size())), m_profiles.size()).ToUTF8().data());
-    else ImGui::TextColored({0.6f,0.6f,0.6f,1}, "%s", _u8L("Draw a closed profile to enable").c_str());
-
-    auto btn = [&](const char* label, bool enabled) {
-        if (!enabled) { ImGui::PushItemFlag(ImGuiItemFlags_Disabled,true); ImGui::PushStyleColor(ImGuiCol_Button,{0.25f,0.25f,0.25f,1}); }
-        bool clicked = ImGui::Button(label, {-1,0});
-        if (!enabled) { ImGui::PopStyleColor(); ImGui::PopItemFlag(); }
-        return clicked && enabled;
-    };
-
-    if (m_sp.is_pocket && has_sel) {
-        if (btn(_u8L("Pocket (cut)").c_str(), ok)) apply_pocket();
-    } else if (is_revolve) {
-        if (btn(_u8L("Revolve").c_str(), ok)) apply_revolve();
-    } else {
-        if (btn(_u8L_CONTEXT("Extrude", "Design").c_str(), ok)) apply_extrude();
-    }
-
-    if (ImGui::Button(_u8L("Clear all").c_str(), {-1,0})) clear_all();
-    if (ImGui::Button(_u8L("Close").c_str(), {-1,0})) m_parent.reset_all_gizmos();
-
-    GizmoImguiEnd();
-    ImGuiWrapper::pop_toolbar_style();
-}
-
-void GLGizmoSketch::apply_extrude()
-{
-    try {
-        TopoDS_Shape shape = build_combined_shape();
-        TriangleMesh mesh = SketchEngine::tessellate(shape, m_sp.linear_deflection);
-        if (mesh.its.indices.empty()) throw std::runtime_error(_u8L("Empty result"));
-        wxGetApp().plater()->take_snapshot("Sketch Extrude");
-        ModelObject* mo = wxGetApp().model().add_object();
-        mo->name = "Extrusion";
-        mo->add_volume(std::move(mesh))->set_new_unique_id();
-        mo->ensure_on_bed();
-        wxGetApp().plater()->update();
-        clear_all();
-    } catch (const std::exception& e) {
-        wxGetApp().notification_manager()->push_notification(NotificationType::CustomNotification, NotificationManager::NotificationLevel::ErrorNotificationLevel, GUI::format(_u8L("Extrude: %1%"), e.what()));
-    }
-}
-
-void GLGizmoSketch::apply_revolve()
-{
-    try {
-        TopoDS_Shape shape = build_combined_shape();
-        TriangleMesh mesh = SketchEngine::tessellate(shape, m_sp.linear_deflection);
-        if (mesh.its.indices.empty()) throw std::runtime_error(_u8L("Empty result"));
-        wxGetApp().plater()->take_snapshot("Sketch Revolve");
-        ModelObject* mo = wxGetApp().model().add_object();
-        mo->name = "Revolve";
-        mo->add_volume(std::move(mesh))->set_new_unique_id();
-        mo->ensure_on_bed();
-        wxGetApp().plater()->update();
-        clear_all();
-    } catch (const std::exception& e) {
-        wxGetApp().notification_manager()->push_notification(NotificationType::CustomNotification, NotificationManager::NotificationLevel::ErrorNotificationLevel, GUI::format(_u8L("Revolve: %1%"), e.what()));
-    }
-}
-
-void GLGizmoSketch::apply_pocket()
-{
-    try {
-        Selection& sel = m_parent.get_selection();
-        int obj_idx = sel.get_object_idx();
-        if (obj_idx < 0) throw std::runtime_error(_u8L("No object selected"));
-        ModelObject* mo = wxGetApp().model().objects[obj_idx];
-
-        TopoDS_Wire outer = m_profiles[0].to_occt_wire(m_plane);
-        BRepBuilderAPI_MakeFace fm(outer);
-        if (!fm.IsDone()) throw std::runtime_error(_u8L("Face failed"));
-        for (size_t i = 1; i < m_profiles.size(); ++i)
-            if (m_profiles[i].closed) fm.Add(m_profiles[i].to_occt_wire(m_plane));
-        fm.Build();
-        if (!fm.IsDone()) throw std::runtime_error(_u8L("Face with holes failed"));
-
-        TopoDS_Shape tool = SketchEngine::make_extrude_face(fm.Face(), m_plane, m_sp.extrude_len + 5.0, false);
-        TriangleMesh tool_mesh = SketchEngine::tessellate(tool, m_sp.linear_deflection);
-        if (tool_mesh.its.indices.empty()) throw std::runtime_error(_u8L("Tool mesh empty"));
-
-        wxGetApp().plater()->take_snapshot("Sketch Pocket");
-        mo->add_volume(std::move(tool_mesh), ModelVolumeType::NEGATIVE_VOLUME)->set_new_unique_id();
-        mo->ensure_on_bed();
-        wxGetApp().plater()->update();
-        clear_all();
-        wxGetApp().notification_manager()->push_notification(NotificationType::CustomNotification, NotificationManager::NotificationLevel::RegularNotificationLevel, _u8L("Pocket added (negative volume)").c_str());
-    } catch (const std::exception& e) {
-        wxGetApp().notification_manager()->push_notification(NotificationType::CustomNotification, NotificationManager::NotificationLevel::ErrorNotificationLevel, GUI::format(_u8L("Pocket: %1%"), e.what()));
-    }
-}
-
-} // namespace GUI
-} // namespace Slic3r
@@ -1,81 +0,0 @@
-#ifndef slic3r_GLGizmoSketch_hpp_
-#define slic3r_GLGizmoSketch_hpp_
-
-#include "GLGizmoBase.hpp"
-#include "GLGizmosCommon.hpp"
-#include "libslic3r/CAD/SketchEngine.hpp"
-#include <cereal/archives/binary.hpp>
-#include <TopoDS_Shape.hxx>
-#include <imgui/imgui.h>
-#include <string>
-#include <wx/event.h>
-#include <vector>
-#include "libslic3r/Point.hpp"
-
-namespace Slic3r {
-namespace GUI {
-
-enum class SketchTool { Line, Rectangle, Circle, Polygon, COUNT };
-
-class GLGizmoSketch : public GLGizmoBase
-{
-public:
-    GLGizmoSketch(GLCanvas3D& parent, const std::string& icon_filename, unsigned int sprite_id);
-
-    bool on_mouse(const wxMouseEvent& mouse_event) override;
-
-protected:
-    bool on_init() override;
-    std::string on_get_name() const override;
-    bool on_is_activable() const override;
-    bool on_is_selectable() const override;
-    void on_render() override;
-    void on_set_state() override;
-    CommonGizmosDataID on_get_requirements() const override;
-    void on_render_input_window(float x, float y, float bottom_limit) override;
-
-    void on_load(cereal::BinaryInputArchive& ar) override;
-    void on_save(cereal::BinaryOutputArchive& ar) const override;
-
-private:
-    SketchTool    m_tool{SketchTool::Line};
-    std::vector<SketchProfile> m_profiles;  // multiple profiles (outer + holes)
-    SketchPlane   m_plane{SketchPlane::XY()};
-    SketchParams  m_sp;
-
-    // Shape presets
-    double m_rect_w{20}, m_rect_h{15};
-    double m_circle_r{10}; int m_circle_seg{32};
-    int    m_poly_sides{6}; double m_poly_r{10};
-
-    // Canvas
-    std::vector<ImVec2> m_canvas_points;
-    Vec2d               m_canvas_center{0,0};
-    float               m_canvas_scale{5.0f};
-    bool                m_snap_grid{true};
-    float               m_grid_step{5.0f};
-
-    // Current profile being drawn
-    int m_active_profile{-1};
-
-    SketchProfile& active_profile();
-    bool has_closed_profile() const;
-
-    void build_preset_profile();
-    void add_closed_profile();
-    void delete_profile(int idx);
-    void clear_all();
-
-    TopoDS_Shape build_combined_shape(); // all profiles as face with holes
-    void apply_extrude();
-    void apply_revolve();
-    void apply_pocket();
-    void draw_canvas();
-    void handle_canvas_click(ImVec2 pos);
-    Vec2d snap(Vec2d pt) const;
-};
-
-} // namespace GUI
-} // namespace Slic3r
-
-#endif // slic3r_GLGizmoSketch_hpp_
@@ -50,10 +50,6 @@
 #include <wx/event.h>
 #include <optional>
 #include "libslic3r/AppConfig.hpp"
-#ifdef SLIC3R_CAD
-#include "slic3r/GUI/Gizmos/GLGizmoPrimitive.hpp"
-#include "slic3r/GUI/Gizmos/GLGizmoSketch.hpp"
-#endif

 #include "libslic3r/Model.hpp"

@@ -217,14 +213,6 @@ void GLGizmosManager::switch_gizmos_icon_filename()
        case (EType::BrimEars):
            gizmo->set_icon_filename(m_is_dark ? "toolbar_brimears_dark.svg" : "toolbar_brimears.svg");
            break;
-#ifdef SLIC3R_CAD
-        case (EType::Primitive):
-            gizmo->set_icon_filename(m_is_dark ? "toolbar_modifier_cube_dark.svg" : "toolbar_modifier_cube.svg");
-            break;
-        case (EType::Sketch):
-            gizmo->set_icon_filename(m_is_dark ? "toolbar_sketch_dark.svg" : "toolbar_sketch.svg");
-            break;
-#endif
        }

    }
@@ -270,14 +258,6 @@ bool GLGizmosManager::init()
    m_gizmos.emplace_back(new GLGizmoAssembly(m_parent, m_is_dark ? "toolbar_assembly_dark.svg" : "toolbar_assembly.svg", EType::Assembly));
    m_gizmos.emplace_back(new GLGizmoSimplify(m_parent, "reduce_triangles.svg", EType::Simplify));
    m_gizmos.emplace_back(new GLGizmoBrimEars(m_parent, m_is_dark ? "toolbar_brimears_dark.svg" : "toolbar_brimears.svg", EType::BrimEars));
-#ifdef SLIC3R_CAD
-    // Registered last: Primitive and Sketch are the final entries before Undefined, so
-    // omitting them leaves every preceding m_gizmos index (indexed by EType) untouched.
-    if (wxGetApp().is_enable_cad_feature()) {
-        m_gizmos.emplace_back(new GLGizmoPrimitive(m_parent, m_is_dark ? "toolbar_modifier_cube_dark.svg" : "toolbar_modifier_cube.svg", static_cast<unsigned int>(Primitive)));
-        m_gizmos.emplace_back(new GLGizmoSketch(m_parent, m_is_dark ? "toolbar_sketch_dark.svg" : "toolbar_sketch.svg", static_cast<unsigned int>(Sketch)));
-    }
-#endif
    //m_gizmos.emplace_back(new GLGizmoSlaSupports(m_parent, "sla_supports.svg", sprite_id++));
    //m_gizmos.emplace_back(new GLGizmoFaceDetector(m_parent, "face recognition.svg", sprite_id++));
    //m_gizmos.emplace_back(new GLGizmoHollow(m_parent, "hollow.svg", sprite_id++));
@@ -1375,8 +1355,7 @@ GLGizmoBase* GLGizmosManager::get_current() const

 GLGizmoBase* GLGizmosManager::get_gizmo(GLGizmosManager::EType type) const
 {
-    // m_gizmos ends before the enum does when the CAD gizmos are not registered.
-    return type < m_gizmos.size() ? m_gizmos[type].get() : nullptr;
+    return ((type == Undefined) || m_gizmos.empty()) ? nullptr : m_gizmos[type].get();
 }

 GLGizmosManager::EType GLGizmosManager::get_gizmo_from_name(const std::string& gizmo_name) const
@@ -102,12 +102,6 @@ public:
        Assembly,
        Simplify,
        BrimEars,
-#ifdef SLIC3R_CAD
-        // Both need the CAD kernel (GeometryEngine); keep them last so that with
-        // SLIC3R_CAD off the enum matches upstream's numbering exactly.
-        Primitive,
-        Sketch,
-#endif
        //SlaSupports,
        // BBS
        //FaceRecognition,
@@ -14,6 +14,7 @@
 #include "Widgets/DialogButtons.hpp"
 #include "Widgets/StaticLine.hpp"
 #include "Widgets/StateColor.hpp"
+#include "Widgets/SwitchButton.hpp"

 #include "libslic3r/PrintConfig.hpp"
 #include "libslic3r/Preset.hpp"
@@ -864,34 +865,25 @@ void PublishSettingsDialog::build_option_model()
    };

    // --- Phase 1: printer per-extruder retraction settings (first, mirroring the sidebar's
-    // Printer group), from the printer tab's "Extruder"/"Extruder N" pages. One inner tab per
-    // extruder (e.g. "Left Extruder"/"Right Extruder" via Tab::translate_category), each holding
-    // that extruder's Retraction and Z-Hop rows with per-extruder "#N" values.
+    // Printer group), from the printer tab's "Extruder" page. One inner tab per extruder (named
+    // as on the printer tab's switch, e.g. "Left Extruder"/"Right Extruder" via
+    // Tab::translate_category), each holding that extruder's Retraction and Z-Hop rows with
+    // per-extruder "#N" values.
    {
        size_t g = section_group_for(Section::Printer);
        std::set<std::string> printer_added;
        for (Tab* tab : wxGetApp().tabs_list) {
-            if (tab->m_type != Preset::TYPE_PRINTER)
+            // The page's controls edit the extruder chosen on the printer tab's switch, so its
+            // option list is read once per extruder.
+            auto*       printer_tab = dynamic_cast<TabPrinter*>(tab);
+            const Page* page        = printer_tab ? printer_tab->extruder_page() : nullptr;
+            if (page == nullptr)
                continue;
-            for (const PageShp& page : tab->m_pages) {
-                if (!page->title().StartsWith("Extruder"))
-                    continue;
-                // The extruder index of this page: its options are appended with the same
-                // "#N" opt_index (opt.second.second), so derive the tab's index from the first
-                // allowlisted option; skip the page when none is found (defensive).
-                int extruder_idx = -1;
-                for (const ConfigOptionsGroupShp& optgroup : page->m_optgroups) {
-                    if (optgroup->title != "Retraction" && optgroup->title != "Z-Hop")
-                        continue;
-                    for (const auto& opt : optgroup->opt_map())
-                        if (extruder_idx < 0)
-                            extruder_idx = opt.second.second;
-                    if (extruder_idx >= 0)
-                        break;
-                }
-                if (extruder_idx < 0)
-                    continue;
-                const wxString page_title = Tab::translate_category(page->title(), tab->m_type);
+            const size_t extruders_count = printer_tab->m_extruders_count;
+            for (size_t extruder_idx = 0; extruder_idx < extruders_count; ++extruder_idx) {
+                const wxString page_title = Tab::translate_category(extruders_count > 1 ? wxString::Format("Extruder %d", int(extruder_idx + 1)) : wxString("Extruder"), tab->m_type);
+                // Retraction and Z-Hop values are stored per variant column, not per extruder.
+                const int variant_index = printer_tab->extruder_variant_index(int(extruder_idx));
                for (const ConfigOptionsGroupShp& optgroup : page->m_optgroups) {
                    // Allowlist on the untranslated optgroup title; the "Retraction when
                    // switching material" group is intentionally skipped.
@@ -899,17 +891,17 @@ void PublishSettingsDialog::build_option_model()
                        continue;
                    const wxString subcategory = _(optgroup->title);
                    for (const auto& opt : optgroup->opt_map()) {
-                        const std::string& opt_id   = opt.first;
                        const std::string& pure_key = opt.second.first;
                        // Rows are keyed by the full per-extruder "#N" opt_id so each extruder
                        // tab publishes its own value; GetPublishedKeys() emits the checked rows
                        // as-is.
+                        const std::string opt_id = pure_key + "#" + std::to_string(variant_index);
                        if (!printer_added.insert(opt_id).second)
                            continue;
                        wxString label, value, unit;
                        if (!option_text(opt_id, pure_key, label, value, unit))
                            continue;
-                        size_t cat_index = category_index_for(page_title, Section::Printer, g, size_t(extruder_idx));
+                        size_t cat_index = category_index_for(page_title, Section::Printer, g, extruder_idx);
                        size_t sub_index = subcategory_index_for(cat_index, subcategory, optgroup->icon);
                        add_row_ui(opt_id, label, value, unit, cat_index, sub_index);
                    }
@@ -1098,6 +1090,10 @@ void PublishSettingsDialog::build_option_model()
    for (SectionGroup& section : m_sections)
        if (!section.categories.empty())
            section.tabs->SelectItem(0);
+    // Orca: the Printer section shows its extruders on the same switch as the printer tab's Extruder page.
+    for (size_t s = 0; s < m_sections.size(); ++s)
+        if (m_sections[s].kind == Section::Printer && m_sections[s].categories.size() > 1)
+            setup_variant_switch(s);
    if (!m_sections.empty()) {
        m_outer_tabs->SelectItem(0);
        show_outer_page(0);
@@ -1630,6 +1626,8 @@ void PublishSettingsDialog::show_inner_page(size_t section_index, int inner_inde
        section.selected_mixed = -1;
    }
    section.selected_inner = inner_index;
+    if (section.variant_switch != nullptr)
+        section.variant_switch->SetSelection(inner_index); // fires its event, which ignores the shown page
    Category& category     = m_categories[section.categories[inner_index]];
    category.page->Show();
    category.scroll->FitInside();
@@ -1639,6 +1637,32 @@ void PublishSettingsDialog::show_inner_page(size_t section_index, int inner_inde
    section.page_host_sizer->Layout();
 }

+void PublishSettingsDialog::setup_variant_switch(size_t section_index)
+{
+    SectionGroup& section = m_sections[section_index];
+    std::vector<wxString> titles;
+    for (size_t category : section.categories)
+        titles.push_back(m_categories[category].title);
+
+    section.variant_switch = new MultiSwitchButton(section.page);
+    section.variant_switch->SetFitToOptions();
+    section.variant_switch->SetOptions(titles);
+    section.variant_switch->SetSelection(section.selected_inner);
+    section.variant_switch->Bind(wxCUSTOMEVT_MULTISWITCH_SELECTION, [this, section_index](wxCommandEvent& evt) {
+        evt.Skip();
+        // The hidden tab strip stays the selection model; its event shows the page.
+        SectionGroup& sec = m_sections[section_index];
+        if (evt.GetInt() != sec.selected_inner)
+            sec.tabs->SelectItem(evt.GetInt());
+    });
+
+    // The switch takes the place of the tab strip, centered like on the printer tab.
+    wxSizer* page_sizer = section.page->GetSizer();
+    page_sizer->Insert(1, section.variant_switch, 0, wxALIGN_CENTER_HORIZONTAL | wxTOP, FromDIP(4));
+    section.tabs->Hide();
+    section.page->Layout();
+}
+
 void PublishSettingsDialog::show_mixed_page(size_t section_index, int mixed_index)
 {
    if (section_index >= m_sections.size())
@@ -2184,6 +2208,13 @@ void PublishSettingsDialog::refresh_tab_indicators()
        for (size_t i = 0; i < section.categories.size(); ++i) {
            const bool on = category_has_selection(m_categories[section.categories[i]]);
            section.tabs->SetItemIndicator(static_cast<unsigned int>(i), on);
+            // The switch has no indicator dot; mark its option text instead.
+            if (section.variant_switch != nullptr) {
+                const wxString& title = m_categories[section.categories[i]].title;
+                const wxString  text  = on ? title + wxString(" ") + wxString(wxUniChar(0x2022)) : title;
+                if (section.variant_switch->GetOptionText(static_cast<unsigned int>(i)) != text)
+                    section.variant_switch->SetOptionText(static_cast<unsigned int>(i), text);
+            }
            any = any || on;
        }
        if (section.mixed_tabs != nullptr)
@@ -2248,6 +2279,8 @@ void PublishSettingsDialog::on_dpi_changed(const wxRect& suggested_rect)
        section.tabs->Rescale();
        if (section.mixed_tabs != nullptr)
            section.mixed_tabs->Rescale();
+        if (section.variant_switch != nullptr)
+            section.variant_switch->Rescale();
    }

    // Refresh the per-row Color chips at the new DPI (they carry the slot number too).
@@ -37,6 +37,7 @@ namespace Slic3r { class DynamicPrintConfig; }
 class TextInput;
 class StaticLine;
 class CheckBox;
+class MultiSwitchButton;

 namespace Slic3r { namespace GUI {

@@ -195,6 +196,10 @@ private:
        ScalableBitmap icon_bmp;      // tab icon next to the title; rescaled on DPI change
        wxPanel* page{nullptr};
        TabCtrl* tabs{nullptr};
+        // Printer section with several extruders: the extruder switch shown instead of `tabs`, the
+        // same MultiSwitchButton (and option names) as the printer tab's Extruder page. One option
+        // per entry of `categories`, named by its title; `tabs` stays as the hidden selection model.
+        MultiSwitchButton* variant_switch{nullptr};
        // Second tab strip, below the main one, listing only the mixed-color filament slots.
        // Present on the Material section only (null elsewhere).
        TabCtrl* mixed_tabs{nullptr};
@@ -277,6 +282,8 @@ private:
    bool row_is_visible(const Row& row) const;
    void apply_visibility();
    void bind_tab_events();
+    // Replaces a section's inner tab strip with a variant switch (see SectionGroup::variant_switch).
+    void setup_variant_switch(size_t section_index);

    TabCtrl* m_outer_tabs{nullptr};
    wxPanel* m_outer_host{nullptr};
@@ -811,6 +811,12 @@ wxString Tab::translate_category(const wxString& title, Preset::Type preset_type
        }
        return _("Extruder") + title.SubString(8, title.Last());
    }
+    // Orca: one "Extruder" page serves all extruders; name it "Extruders" when there are several.
+    if (preset_type == Preset::TYPE_PRINTER && title == "Extruder") {
+        auto preset = wxGetApp().preset_bundle;
+        if (preset && preset->get_printer_extruder_count() > 1)
+            return _("Extruders");
+    }
    return _(title);
 }

@@ -1153,6 +1159,38 @@ std::string Tab::options_list_storage_key(const std::string& opt_key) const
    return (serialized || is_plugin_field) ? opt_key : opt_key + "#0";
 }

+// Orca: deep_diff() flags every vector entry at or past the reference vector's length as changed,
+// whatever its value (e.g. the values of an extruder added by raising the extruder count). A vector
+// grows by copying its first entry (ConfigOptionVector::resize), so such an entry only counts as
+// changed when it differs from the reference's first entry, as before Orca's deep_diff() change.
+// The change of the count itself shows on "extruders_count".
+static void drop_unchanged_added_entries(std::vector<std::string> &options, const DynamicPrintConfig &current, const Preset *reference)
+{
+    if (reference == nullptr)
+        return;
+    // deep_diff() lists a key's entries one after another, so serialize each key's vectors once.
+    std::string              serialized_key;
+    std::vector<std::string> cur_values;
+    std::string              ref_first;
+    options.erase(std::remove_if(options.begin(), options.end(), [&](const std::string &opt) {
+        const auto pos = opt.find('#');
+        if (pos == std::string::npos)
+            return false;
+        const std::string key = opt.substr(0, pos);
+        const size_t      idx = size_t(std::atoi(opt.c_str() + pos + 1));
+        auto ref = dynamic_cast<const ConfigOptionVectorBase *>(reference->config.option(key));
+        auto cur = dynamic_cast<const ConfigOptionVectorBase *>(current.option(key));
+        if (ref == nullptr || cur == nullptr || idx < ref->size() || ref->size() == 0 || idx >= cur->size())
+            return false;
+        if (key != serialized_key) {
+            serialized_key = key;
+            cur_values     = cur->vserialize();
+            ref_first      = ref->vserialize().front();
+        }
+        return cur_values[idx] == ref_first;
+    }), options.end());
+}
+
 void Tab::update_all_extruder_options_status()
 {
    if (!m_extruder_switch && !m_variant_combo) {
@@ -1183,6 +1221,8 @@ void Tab::update_all_extruder_options_status()

    auto dirty_options = m_presets->current_dirty_options(true);
    auto nonsys_options = m_presets->current_different_from_parent_options(true);
+    if (m_type == Preset::TYPE_PRINTER)
+        update_custom_dirty(dirty_options, nonsys_options);
    auto filter_extruder_options = [](const std::vector<std::string>& options) {
        std::vector<std::string> filtered_options;
        for (const auto& opt : options) {
@@ -1231,7 +1271,7 @@ void Tab::update_extruder_switch_colors()

        if (m_active_page) {
            if (m_active_page->title() == "Speed" || m_active_page->title() == "Motion ability" || m_active_page->title() == "Filament" ||
-                m_active_page->title() == "Setting Overrides" || m_active_page->title() == "Multimaterial") {
+                m_active_page->title() == "Setting Overrides" || m_active_page->title() == "Multimaterial" || is_printer_extruder_page(m_active_page)) {
                for (auto page_ptr : m_pages) {
                    if (page_ptr.get() == m_active_page) {
                        pages_to_check.push_back(page_ptr);
@@ -1262,8 +1302,8 @@ void Tab::update_extruder_switch_colors()
 void Tab::check_extruder_options_status(int index, bool &sys_extruder, bool &modified_extruder, const std::vector<PageShp>& pages_to_check)
 {
    int config_index = index;
+    int extruder_id  = index;
    if (m_type == Preset::TYPE_PRINT || m_type == Preset::TYPE_PRINTER || m_type == Preset::TYPE_MODEL) {
-        int extruder_id;
        NozzleVolumeType nozzle_type;
        parse_extruder_selection(index, extruder_id, nozzle_type);

@@ -1296,6 +1336,10 @@ void Tab::check_extruder_options_status(int index, bool &sys_extruder, bool &mod
                }

                std::string target_opt_key = base_opt_key + "#" + std::to_string(config_index * stride);
+                // Orca: on the printer's Extruder page only per-variant options use the variant column,
+                // the others (nozzle_diameter, extruder_offset, ...) are indexed by the extruder.
+                if (is_printer_extruder_page(page.get()) && printer_options_with_variant_1.count(base_opt_key) == 0)
+                    target_opt_key = base_opt_key + "#" + std::to_string(extruder_id);

                auto status_iter = m_all_extruder_options_status.find(target_opt_key);
                if (status_iter != m_all_extruder_options_status.end()) {
@@ -1336,18 +1380,6 @@ void TabPrinter::init_options_list()
    Tab::init_options_list();
    if (m_printer_technology == ptFFF)
        m_options_list.emplace("extruders_count", m_opt_status_value);
-    for (size_t i = 1; i < m_extruders_count; ++i) {
-        wxString target_title = wxString::Format("Extruder %d", int(i + 1));
-        for (auto &page : m_pages) {
-            if (page->title() == target_title) {
-                for (auto group : page->m_optgroups) {
-                    for (auto &opt : group->opt_map())
-                        m_options_list.emplace(opt.first, m_opt_status_value);
-                }
-                break;
-            }
-        }
-    }
 }

 void TabPrinter::msw_rescale()
@@ -1437,7 +1469,7 @@ void Tab::update_changed_tree_ui()
                    get_sys_and_mod_flags("compatible_printers", sys_page, modified_page);
                }
            }
-            if (page->title() == "Speed" || page->title() == "Motion ability" || page->title() == "Filament" || page->title() == "Setting Overrides" || page->title() == "Multimaterial") {
+            if (page->title() == "Speed" || page->title() == "Motion ability" || page->title() == "Filament" || page->title() == "Setting Overrides" || page->title() == "Multimaterial" || is_printer_extruder_page(page.get())) {
                auto options = generate_extruder_options();
                for (size_t switch_index = 0; switch_index < options.size(); ++switch_index) {
                    std::vector<PageShp> pages_to_check = { page };
@@ -1540,6 +1572,10 @@ void Tab::on_roll_back_value(const bool to_sys /*= true*/)

    m_postpone_update_ui = false;

+    // Orca: the restored config may have another extruder count than the tab shows.
+    if (auto printer_tab = dynamic_cast<TabPrinter *>(this))
+        printer_tab->sync_extruders_count();
+
    // When all values are rolled, then we have to update whole tab in respect to the reverted values
    update();
    if (m_active_page)
@@ -1877,6 +1913,17 @@ static wxString pad_combo_value_for_config(const DynamicPrintConfig &config)
    return config.opt_bool("pad_enable") ? (config.opt_bool("pad_around_object") ? _("Around object") : _("Below object")) : _("None");
 }

+// Rebuilds the variant switch of every tab that has one, e.g. after the extruder count or a nozzle volume type changed.
+static void update_all_extruder_variants(int extruder_idx = -1)
+{
+    for (auto tab : wxGetApp().tabs_list)
+        tab->update_extruder_variants(extruder_idx);
+    if (auto tab = wxGetApp().plate_tab)
+        tab->update_extruder_variants(extruder_idx);
+    for (auto tab : wxGetApp().model_tabs_list)
+        tab->update_extruder_variants(extruder_idx);
+}
+
 void Tab::on_value_change(const std::string& opt_key, const boost::any& value)
 {
    // Orca:
@@ -2319,15 +2366,7 @@ void Tab::on_value_change(const std::string& opt_key, const boost::any& value)

    if (opt_key.find("nozzle_volume_type") != std::string::npos) {
        int extruder_idx = std::atoi(opt_key.substr(opt_key.find_last_of('#') + 1).c_str());
-        for (auto tab : wxGetApp().tabs_list) {
-            tab->update_extruder_variants(extruder_idx);
-        }
-        if (auto tab = wxGetApp().plate_tab) {
-            tab->update_extruder_variants(extruder_idx);
-        }
-        for (auto tab : wxGetApp().model_tabs_list) {
-            tab->update_extruder_variants(extruder_idx);
-        }
+        update_all_extruder_variants(extruder_idx);
        if (wxGetApp().app_config->get("auto_calculate_flush") == "all") {
            wxGetApp().plater()->sidebar().auto_calc_flushing_volumes(-1,extruder_idx);
        }
@@ -5685,9 +5724,13 @@ if (is_marlin_flavor)
            size_t extruders_count = size_t(boost::any_cast<int>(v));
            wxTheApp->CallAfter([this, opt_key, value, extruders_count]() {
                if (opt_key == "extruders_count" || opt_key == "single_extruder_multi_material") {
+                    const size_t old_extruders_count = m_extruders_count;
                    extruders_count_changed(extruders_count);
                    init_options_list(); // m_options_list should be updated before UI updating
                    update_dirty();
+                    // Orca: the variant switches (here, Process in the sidebar, ...) list one option per extruder.
+                    if (m_extruders_count != old_extruders_count)
+                        update_all_extruder_variants();
                    if (opt_key == "single_extruder_multi_material") { // the single_extruder_multimaterial was added to force pages
                        on_value_change(opt_key, value);                      // rebuild - let's make sure the on_value_change is not skipped

@@ -5697,6 +5740,7 @@ if (is_marlin_flavor)
 // Orca: we use a different logic here. If SEMM is enabled, we set extruder count to 1.
 #if 1
                            extruders_count_changed(1);
+                            update_all_extruder_variants();
 #else

                            std::vector<double> nozzle_diameters =
@@ -5768,14 +5812,13 @@ if (is_marlin_flavor)
        m_pages.insert(m_pages.end() - n_after_single_extruder_MM, page);
    }

-    // Orca: build missed extruder pages
-    for (auto extruder_idx = m_extruders_count_old; extruder_idx < m_extruders_count; ++extruder_idx) {
-        const wxString& page_name = (m_extruders_count > 1) ? wxString::Format("Extruder %d", int(extruder_idx + 1)) : wxString::Format("Extruder");
-
-        //# build page
-        //const wxString& page_name = wxString::Format("Extruder %d", int(extruder_idx + 1));
-        auto page = add_options_page(page_name, "custom-gcode_extruder", true); // ORCA: icon only visible on placeholders
-        m_pages.insert(m_pages.begin() + n_before_extruders + extruder_idx, page);
+    // Orca: a single "Extruder" page serves all extruders. Its controls are created once for extruder 0;
+    // switch_excluder() re-targets them to the extruder selected on the variant switch (m_extruder_switch),
+    // which the printer tab shows on this page too.
+    if (extruder_page() == nullptr && m_extruders_count > 0) {
+        const size_t extruder_idx = 0;
+        auto page = add_options_page(L("Extruder"), "custom-gcode_extruder", true); // ORCA: icon only visible on placeholders
+        m_pages.insert(m_pages.begin() + n_before_extruders, page);

        auto optgroup = page->new_optgroup(L("Basic information"), L"param_information", -1, true);
            optgroup->append_single_option_line("nozzle_diameter", "printer_extruder_basic_information#nozzle-diameter", extruder_idx);
@@ -5788,8 +5831,10 @@ if (is_marlin_flavor)
            option.opt.full_width = true;
            optgroup->append_single_option_line(option, "printer_extruder_basic_information#extruder-offset-position");

-            optgroup->m_on_change = [this, extruder_idx](const t_config_option_key& opt_key, boost::any value)
+            optgroup->m_on_change = [this](const t_config_option_key& opt_key, boost::any value)
            {
+                // The page edits the extruder selected on the variant switch.
+                const size_t extruder_idx = size_t(get_current_active_extruder());
                bool is_SEMM = m_config->opt_bool("single_extruder_multi_material");
                if (is_SEMM && m_extruders_count > 1 && boost::starts_with(opt_key, "nozzle_diameter"))
                {
@@ -5884,22 +5929,22 @@ if (is_marlin_flavor)
            //optgroup->append_line(line);
 #endif
    }
-    // BBS. No extra extruder page for single physical extruder machine
-    // # remove extra pages
-    auto &first_extruder_title = const_cast<wxString &>(m_pages[n_before_extruders]->title());
-    if (m_extruders_count < m_extruders_count_old) {
-        m_pages.erase(	m_pages.begin() + n_before_extruders + m_extruders_count,
-                        m_pages.begin() + n_before_extruders + m_extruders_count_old);
-        if (m_extruders_count == 1)
-            first_extruder_title = wxString::Format("Extruder");
-    } else if (m_extruders_count_old == 1) {
-        first_extruder_title = wxString::Format("Extruder %d", 1);
-    }
-    auto & index = wxGetApp().sidebar().settings_index();
-    for (auto &group : m_pages[n_before_extruders]->m_optgroups) {
-        group->set_config_category_and_type(first_extruder_title, m_type);
-        for (auto &opt : group->opt_map())
-            index.add_key(opt.first + "#0", m_type, group->title, first_extruder_title, group->icon);
+
+    // The page holds only the "#0" controls, so register every extruder's options with the search
+    // index under "Extruder N"; a search hit selects that extruder (TabPrinter::activate_option()).
+    if (Page *page = extruder_page()) {
+        auto &index = wxGetApp().sidebar().settings_index();
+        for (auto &group : page->m_optgroups) {
+            group->set_config_category_and_type(page->title(), m_type);
+            for (auto &opt : group->opt_map()) {
+                if (opt.second.second < 0)
+                    continue;
+                for (size_t i = 0; i < m_extruders_count; ++i) {
+                    const wxString category = m_extruders_count > 1 ? wxString::Format("Extruder %d", int(i + 1)) : wxString("Extruder");
+                    index.add_key(opt.second.first + "#" + std::to_string(i), m_type, group->title, category, group->icon);
+                }
+            }
+        }
    }

    Thaw();
@@ -6180,12 +6225,6 @@ void TabPrinter::toggle_options()
        return;

    auto nozzle_volumes = m_preset_bundle->project_config.option<ConfigOptionEnumsGeneric>("nozzle_volume_type");
-    auto extruders      = m_config->option<ConfigOptionEnumsGeneric>("extruder_type");
-        auto get_index_for_extruder =
-            [this, &extruders](int extruder_id, int stride = 1) {
-        return m_config->get_index_for_extruder(extruder_id + 1, "printer_extruder_id",
-            ExtruderType(extruders->values[extruder_id]), get_actual_nozzle_volume_type(extruder_id), "printer_extruder_variant", stride);
-    };

    //BBS: whether the preset is Bambu Lab printer
    bool is_BBL_printer = false;
@@ -6260,14 +6299,13 @@ void TabPrinter::toggle_options()
        toggle_option("tool_change_on_wipe_tower", !bSEMM && supports_wipe_tower_2 && extruders_count > 1);
        toggle_option("wait_for_temp_on_wipe_tower", !bSEMM && supports_wipe_tower_2 && extruders_count > 1);
    }
-    wxString extruder_number;
-    long val = 1;
-    if ( m_active_page->title().IsSameAs(L("Extruder")) ||
-        (m_active_page->title().StartsWith("Extruder ", &extruder_number) && extruder_number.ToLong(&val) &&
-        val > 0 && (size_t)val <= m_extruders_count))
+    if (m_active_page->title() == L("Extruder") && m_extruders_count > 0)
    {
-        size_t i = size_t(val - 1);
-        int variant_index = get_index_for_extruder(i);
+        // Orca: the single Extruder page edits the extruder selected on the variant switch; its
+        // controls carry field index 0 (i), the values are read for `extruder`.
+        const size_t i        = 0;
+        const size_t extruder = std::min<size_t>(size_t(get_current_active_extruder()), m_extruders_count - 1);
+        const int    variant_index = extruder_variant_index(int(extruder));
        bool have_retract_length = m_config->opt_float("retraction_length", variant_index) > 0;

        toggle_option("extruder_printable_area", false, i);          // disable
@@ -6294,7 +6332,7 @@ void TabPrinter::toggle_options()
        vec.resize(0);
        vec = {"retract_lift_above", "retract_lift_below", "retract_lift_enforce"};
        for (auto el : vec)
-          toggle_option(el, retraction && (m_config->opt_float("z_hop", i) > 0), i);
+          toggle_option(el, retraction && (m_config->opt_float("z_hop", variant_index) > 0), i);

        // some options only apply when not using firmware retraction
        vec.resize(0);
@@ -6347,7 +6385,7 @@ void TabPrinter::toggle_options()
        toggle_option("long_retractions_when_cut", !use_firmware_retraction && m_config->opt_int("enable_long_retraction_when_cut"), i);
        toggle_line("retraction_distances_when_cut", m_config->opt_bool("long_retractions_when_cut", variant_index), i);

-        toggle_option("travel_slope", m_config->opt_enum("z_hop_types", i) != ZHopType::zhtNormal, i);
+        toggle_option("travel_slope", m_config->opt_enum("z_hop_types", variant_index) != ZHopType::zhtNormal, i);
    }

    if (m_active_page->title() == L("Motion ability")) {
@@ -6421,12 +6459,16 @@ void TabPrinter::on_value_change(const std::string& opt_key, const boost::any& v
        return;

    const int pos = opt_key.find("#");
+    // Orca: fields of the single Extruder page keep index 0 but edit the selected extruder.
+    const int data_idx = pos > 0 ? extruder_page_data_index(opt_key) : -1;

    if (pos > 0) {
        std::string temp_str = opt_key;
        boost::erase_head(temp_str, pos + 1);
        int orig_opt_idx = static_cast<size_t>(atoi(temp_str.c_str()));
        int opt_idx = orig_opt_idx >= 0 ? orig_opt_idx : 0;
+        if (data_idx >= 0)
+            opt_idx = data_idx;

        std::string opt_key_pure = opt_key;
        boost::erase_tail(opt_key_pure, opt_key_pure.size() - pos);
@@ -6461,7 +6503,12 @@ void TabPrinter::on_value_change(const std::string& opt_key, const boost::any& v
        }
    }

-    Tab::on_value_change(opt_key, value);
+    // Orca: report Extruder page changes as "key#<extruder>", as the former "Extruder N" pages did,
+    // so per-extruder handling in Tab::on_value_change() sees the extruder that was edited.
+    if (data_idx >= 0)
+        Tab::on_value_change(opt_key.substr(0, pos) + "#" + std::to_string(get_current_active_extruder()), value);
+    else
+        Tab::on_value_change(opt_key, value);
 }

 void TabPrinter::update()
@@ -7393,12 +7440,7 @@ bool Tab::tree_sel_change_delayed(wxCommandEvent& event)
        // update_undo_buttons();
        this->OnActivate();
        m_parent->set_active_tab(this);
-        if (m_variant_sizer) {
-            wxWindow *variant_ctrl = m_extruder_switch ? (wxWindow *) m_extruder_switch : m_variant_combo;
-            m_main_sizer->Show(m_variant_sizer, variant_ctrl->IsThisEnabled() && !m_active_page->m_opt_id_map.empty() && !m_active_page->title().StartsWith("Extruder "));
-            if (m_extruder_sync) m_extruder_sync->Show(variant_ctrl->IsShown());
-            GetParent()->Layout();
-        }
+        update_variant_sizer_visibility();

        m_page_view->Thaw();
        return false;
@@ -7409,12 +7451,7 @@ bool Tab::tree_sel_change_delayed(wxCommandEvent& event)
        return false;

    m_active_page = page;
-    if (m_variant_sizer) {
-        wxWindow *variant_ctrl = m_extruder_switch ? (wxWindow *) m_extruder_switch : m_variant_combo;
-        m_main_sizer->Show(m_variant_sizer, variant_ctrl->IsThisEnabled() && !m_active_page->m_opt_id_map.empty() && !m_active_page->title().StartsWith("Extruder"));
-        if (m_extruder_sync) m_extruder_sync->Show(variant_ctrl->IsShown());
-        GetParent()->Layout();
-    }
+    update_variant_sizer_visibility();

    auto throw_if_canceled = std::function<void()>([this](){
 #ifdef WIN32
@@ -8240,9 +8277,11 @@ void Tab::update_extruder_variants(int extruder_id, bool reload)
        m_actual_nozzle_volumes.resize(extruder_nums, NozzleVolumeType::nvtStandard);
        for (int i = 0; i < extruder_nums; i++) m_actual_nozzle_volumes[i] = (NozzleVolumeType)nozzle_volumes->values[i];

-        // Orca: a non-Bambu dual-nozzle printer has two extruders but a single variant column, so
-        // the nozzle switch and sync button have nothing to act on. Only enable with real variants.
-        if (extruder_nums >= 2 && m_preset_bundle->support_different_extruders()) {
+        // Orca: when every extruder uses the same variant (e.g. a non-Bambu dual-nozzle printer), the
+        // switch has no nozzle variants to select and nothing to sync. The printer tab still enables it
+        // to choose the extruder its Extruder and Motion ability pages edit.
+        m_extruder_switch_variants = extruder_nums >= 2 && m_preset_bundle->support_different_extruders();
+        if (m_extruder_switch_variants || (m_type == Preset::TYPE_PRINTER && extruder_nums >= 2)) {
            auto options = generate_extruder_options();
            m_extruder_switch->SetOptions(options);

@@ -8281,12 +8320,8 @@ void Tab::update_extruder_variants(int extruder_id, bool reload)
    if (m_type == Preset::TYPE_PRINT) {
        update_pages_with_multi_variant();
    }
-    if (m_variant_sizer) {
-        wxWindow *variant_ctrl = m_extruder_switch ? (wxWindow *) m_extruder_switch : m_variant_combo;
-        m_main_sizer->Show(m_variant_sizer, variant_ctrl->IsThisEnabled() && m_active_page && !m_active_page->m_opt_id_map.empty() && !m_active_page->title().StartsWith("Extruder "));
-        if (m_extruder_sync) m_extruder_sync->Show(variant_ctrl->IsShown());
-        GetParent()->Layout();
-    }
+    update_extruder_switch_colors();
+    update_variant_sizer_visibility();
 }

 // The variant switch tags are the narrowest place a volume type is named, so they abbreviate it;
@@ -8361,12 +8396,21 @@ std::vector<wxString> Tab::generate_extruder_options()
        return options;
    }

+    // Orca: the printer tab has one tag per extruder, named as its former "Extruder N" pages were.
+    // parse_extruder_selection() counts a hybrid extruder as two tags; that still lines up because
+    // only the last extruder can be hybrid.
+    if (m_type == Preset::TYPE_PRINTER) {
+        for (int i = 0; i < extruder_nums; ++i)
+            options.push_back(translate_category(wxString::Format("Extruder %d", i + 1), m_type));
+        return options;
+    }
+
    std::string pt = m_preset_bundle->printers.get_edited_preset().get_printer_type(m_preset_bundle);
-    // Orca: the main/deputy toolhead names describe a dual-nozzle printer, where extruder 0 is the
-    // left (deputy) and extruder 1 the right (main) nozzle. From three extruders on the tools are
-    // interchangeable, so name them by index instead of repeating one side.
+    // Orca: the main/deputy toolhead names describe a Bambu dual-nozzle printer, where extruder 0 is
+    // the left (deputy) and extruder 1 the right (main) nozzle. Other printers number their tools.
+    const bool toolhead_names = extruder_nums == 2 && m_preset_bundle->is_bbl_vendor();
    for (int i = 0; i < extruder_nums; ++i) {
-        wxString extruder_name = extruder_nums > 2 ? wxString::Format("T%d", i + 1) :
+        wxString extruder_name = !toolhead_names ? wxString::Format("T%d", i + 1) :
                                                     _L(DevPrinterConfigUtil::get_toolhead_display_name(
                                                         pt, (i == 0) ? DEPUTY_EXTRUDER_ID : MAIN_EXTRUDER_ID,
                                                         ToolHeadComponent::Nozzle, ToolHeadNameCase::TitleCase, true));
@@ -8383,6 +8427,71 @@ std::vector<wxString> Tab::generate_extruder_options()
    return options;
 }

+Page *TabPrinter::extruder_page() const
+{
+    for (const PageShp &page : m_pages)
+        if (page->title() == "Extruder")
+            return page.get();
+    return nullptr;
+}
+
+int TabPrinter::extruder_page_data_index(const std::string &field_id) const
+{
+    if (Page *page = extruder_page())
+        for (const auto &group : page->m_optgroups)
+            if (auto it = group->opt_map().find(field_id); it != group->opt_map().end())
+                return it->second.second;
+    return -1;
+}
+
+int TabPrinter::extruder_variant_index(int extruder)
+{
+    const auto *extruders = m_config->option<ConfigOptionEnumsGeneric>("extruder_type");
+    const int   index     = extruder < int(extruders->size()) ?
+                                m_config->get_index_for_extruder(extruder + 1, "printer_extruder_id", ExtruderType(extruders->values[extruder]),
+                                                                 get_actual_nozzle_volume_type(extruder), "printer_extruder_variant") :
+                                -1;
+    return index < 0 ? extruder : index;
+}
+
+void TabPrinter::update_custom_dirty(std::vector<std::string> &dirty_options, std::vector<std::string> &nonsys_options)
+{
+    drop_unchanged_added_entries(dirty_options, *m_config, &m_presets->get_selected_preset());
+    drop_unchanged_added_entries(nonsys_options, *m_config, m_presets->get_selected_preset_parent());
+}
+
+void TabPrinter::sync_extruders_count()
+{
+    if (m_printer_technology != ptFFF)
+        return;
+    const auto *nozzle_diameter = m_config->option<ConfigOptionFloats>("nozzle_diameter");
+    if (nozzle_diameter == nullptr || nozzle_diameter->size() == m_extruders_count)
+        return;
+    extruders_count_changed(nozzle_diameter->size());
+    init_options_list();
+    update_all_extruder_variants();
+}
+
+void TabPrinter::activate_option(const std::string &opt_key, const wxString &category)
+{
+    wxString number;
+    long     n = 0;
+    const bool numbered = category.StartsWith("Extruder ", &number) && number.ToLong(&n);
+    if (extruder_page() == nullptr || (!numbered && category != "Extruder")) {
+        Tab::activate_option(opt_key, category);
+        return;
+    }
+
+    // Selecting fires the switch's event, which re-targets the page (switch_excluder()).
+    const int extruder_idx = (n >= 1 && n <= long(m_extruders_count)) ? int(n - 1) : 0;
+    if (m_extruder_switch && m_extruder_switch->IsThisEnabled() && extruder_idx != get_current_active_extruder())
+        m_extruder_switch->SetSelection(calculate_selection_index_for_extruder(extruder_idx, get_actual_nozzle_volume_type(extruder_idx)));
+
+    // The page's controls are created for index 0.
+    const auto pos = opt_key.find('#');
+    Tab::activate_option(pos == std::string::npos ? opt_key : opt_key.substr(0, pos) + "#0", "Extruder");
+}
+
 NozzleVolumeType Tab::get_actual_nozzle_volume_type(int extruder_id)
 {
    int extruder_count = m_preset_bundle->get_printer_extruder_count();
@@ -8459,18 +8568,44 @@ bool Tab::get_extruder_sync_enable_state(int extruder_id)
    return false;
 }

+bool Tab::variant_switch_active() const
+{
+    if (m_extruder_switch)
+        return m_extruder_switch->IsThisEnabled();
+    return m_variant_combo && m_variant_combo->IsThisEnabled();
+}
+
+void Tab::update_variant_sizer_visibility()
+{
+    if (!m_variant_sizer)
+        return;
+    const bool show = variant_switch_active() && m_active_page && !m_active_page->m_opt_id_map.empty();
+    m_main_sizer->Show(m_variant_sizer, show);
+    if (m_extruder_sync) {
+        m_extruder_sync->Show(show);
+        // Orca: copying between extruders is offered only between nozzle variants, and not on the Extruder page.
+        m_extruder_sync->Enable(m_extruder_switch_variants && !is_printer_extruder_page(m_active_page) &&
+                                get_extruder_sync_enable_state(get_current_active_extruder()));
+    }
+    GetParent()->Layout();
+}
+
 void Tab::switch_excluder(int extruder_id, bool reload)
 {
    Preset & printer_preset = m_preset_bundle->printers.get_edited_preset();
    auto nozzle_volumes = m_preset_bundle->project_config.option<ConfigOptionEnumsGeneric>("nozzle_volume_type");
    auto extruders      = printer_preset.config.option<ConfigOptionEnumsGeneric>("extruder_type");

+    // Orca: the printer tab re-targets its pages to the extruder selected on the switch. Resolved before
+    // the range check below, which keeps the extruder_type read in get_index_for_extruder in range.
+    if (m_type == Preset::TYPE_PRINTER && extruder_id == -1)
+        extruder_id = get_current_active_extruder();
    if (!m_variant_combo && (extruder_id >= (int)nozzle_volumes->size() || extruder_id >= (int)extruders->size()))
        extruder_id = 0;
    if (m_extruder_switch) {
        int current_extruder = get_current_active_extruder();
        bool sync_enable = get_extruder_sync_enable_state(current_extruder);
-        m_extruder_sync->Enable(m_extruder_switch->IsThisEnabled() && sync_enable);
+        m_extruder_sync->Enable(m_extruder_switch_variants && sync_enable && !is_printer_extruder_page(m_active_page));
        m_extruder_sync->Show();
        if (m_type != Preset::TYPE_PRINTER) {
            if (extruder_id == -1)
@@ -8497,24 +8632,26 @@ void Tab::switch_excluder(int extruder_id, bool reload)
        return;
    if (m_extruder_switch) m_extruder_switch->SetClientData(reinterpret_cast<void*>(static_cast<std::uintptr_t>(index)));
    if (m_variant_combo) m_variant_combo->SetClientData(reinterpret_cast<void *>(static_cast<std::uintptr_t>(index)));
-    wxWindow *variant_ctrl = m_extruder_switch ? (wxWindow *) m_extruder_switch : m_variant_combo;
    for (auto page : m_pages) {
        bool is_extruder = false;
+        int  page_index  = index;
        if (m_type == Preset::TYPE_PRINTER) {
-            if (page->title().StartsWith("Extruder")) {
-                int extruder_id2 = std::atoi(page->title().Mid(9).ToUTF8()) - 1;
-                if (extruder_id >= 0 && extruder_id2 != extruder_id)
-                    continue;
-                if (extruder_id2 > 0)
-                    index = get_index_for_extruder(extruder_id2);
+            if (page->title() == "Extruder")
                is_extruder = true;
-            } else if (page->title().StartsWith("Motion ability")) {
-                index = get_index_for_extruder(extruder_id == -1 ? 0 : extruder_id, 2);
-            }
+            else if (page->title().StartsWith("Motion ability"))
+                page_index = get_index_for_extruder(extruder_id == -1 ? 0 : extruder_id, 2);
        }
        page->m_opt_id_map.clear();
        for (auto group : page->m_optgroups) {
            for (auto &opt : group->opt_map()) {
+                if (is_extruder && opt.second.second >= 0) {
+                    // Per-variant options use the variant column, the others (nozzle_diameter,
+                    // extruder_offset, ...) are sized by the extruder count and use the extruder.
+                    const int idx = printer_options_with_variant_1.count(opt.second.first) > 0 ? page_index : extruder_id;
+                    const_cast<int &>(opt.second.second) = idx;
+                    page->m_opt_id_map.insert({opt.second.first + "#" + std::to_string(idx), opt.first});
+                    continue;
+                }
                auto iter = std::find(printer_extruder_options.begin(), printer_extruder_options.end(), opt.second.first);
                if (iter != printer_extruder_options.end()) {
                    page->m_opt_id_map.insert({opt.first, opt.first});
@@ -8522,9 +8659,9 @@ void Tab::switch_excluder(int extruder_id, bool reload)
                }

                if (opt.second.second >= 0) {
-                    const_cast<int &>(opt.second.second) = index;
-                    page->m_opt_id_map.insert({opt.second.first + "#" + std::to_string(index), opt.first});
-                    group->draw_multi_extruder = !is_extruder && variant_ctrl->IsThisEnabled();
+                    const_cast<int &>(opt.second.second) = page_index;
+                    page->m_opt_id_map.insert({opt.second.first + "#" + std::to_string(page_index), opt.first});
+                    group->draw_multi_extruder = variant_switch_active();
                }
            }
        }
@@ -331,6 +331,10 @@ public:
    MultiSwitchButton *  m_variant_combo   = nullptr;
    ScalableButton *m_extruder_sync   = nullptr;
 	wxPanel *       m_extruder_sync_box  = nullptr;
+    // Orca: whether m_extruder_switch switches nozzle variants (it then offers sync between them).
+    // The printer tab also enables the switch for printers without variants, to choose the extruder
+    // its Extruder and Motion ability pages edit.
+    bool            m_extruder_switch_variants = false;
    std::vector<NozzleVolumeType> m_actual_nozzle_volumes;

 public:
@@ -387,6 +391,13 @@ public:
    void        update_changed_tree_ui();
 	void		update_undo_buttons();
    void        update_extruder_switch_colors();
+    // Whether the variant switch (m_extruder_switch / m_variant_combo) is enabled: on the printer tab for
+    // any multi-extruder printer, on the other tabs when it switches nozzle variants.
+    bool        variant_switch_active() const;
+    // Orca: whether `page` is the printer tab's single "Extruder" page, which edits the extruder selected on the switch.
+    bool        is_printer_extruder_page(const Page* page) const { return m_type == Preset::TYPE_PRINTER && page && page->title() == "Extruder"; }
+    // Shows the variant switch row on pages with options that follow it.
+    void        update_variant_sizer_visibility();
    void        update_all_extruder_options_status();
    void        check_extruder_options_status(int index, bool &sys_extruder, bool &modified_extruder, const std::vector<PageShp>& pages_to_check);

@@ -444,7 +455,7 @@ public:
 	virtual void    on_value_change(const std::string& opt_key, const boost::any& value);

    void            update_wiping_button_visibility();
-	void			activate_option(const std::string& opt_key, const wxString& category);
+	virtual void	activate_option(const std::string& opt_key, const wxString& category);
    void			apply_searcher();
 	void			cache_config_diff(const std::vector<std::string>& selected_options, const DynamicPrintConfig* config = nullptr);
 	void			apply_config_from_cache();
@@ -710,6 +721,25 @@ public:
 	void		cache_extruder_cnt(const DynamicPrintConfig* config = nullptr);
 	bool		apply_extruder_cnt_from_cache();
 	void		refresh_printer_agent_dropdown() const;
+
+	// Orca: a single "Extruder" page for all extruders. Its controls are created once (index 0) and
+	// switch_excluder() re-targets them to the extruder selected on m_extruder_switch.
+	Page*		extruder_page() const;
+	// Config index an "Extruder" page field (e.g. "retraction_length#0") currently edits, -1 if not on that page.
+	int			extruder_page_data_index(const std::string& field_id) const;
+	// Config index of an extruder's per-variant options (Retraction, Z-Hop, ...): its variant column
+	// for the nozzle selected on the switch, or the extruder index on a printer without variants.
+	int			extruder_variant_index(int extruder);
+	// After the config was restored (roll back): follow its extruder count, if it differs.
+	void		sync_extruders_count();
+	// Search jump to "Extruder N" / "key#N": selects extruder N on the switch, then activates the
+	// page's own field on the "Extruder" page.
+	void		activate_option(const std::string& opt_key, const wxString& category) override;
+
+protected:
+	// Orca: values of extruders added by raising the extruder count have no saved / system value to
+	// revert to; the change is shown on "extruders_count", not on each of their parameters.
+	void		update_custom_dirty(std::vector<std::string> &dirty_options, std::vector<std::string> &nonsys_options) override;
 };

 class TabSLAMaterial : public Tab
@@ -800,6 +800,43 @@ TEST_CASE("A per-variant filament option read with a single value gives it to ev
    REQUIRE(config.option<ConfigOptionFloats>("pressure_advance")->values == std::vector<double>({0.021, 0.021, 0.021}));
 }

+// Machine limits (printer_options_with_variant_2) hold a (normal, silent) pair per printer variant, so the
+// printer Tab's Motion ability page can edit each extruder's own limits.
+TEST_CASE("set_num_extruders gives every printer variant its own pair of machine limits", "[Config]")
+{
+    DynamicPrintConfig config = DynamicPrintConfig::full_print_config();
+    auto speed_x = [&config]() { return config.option<ConfigOptionFloats>("machine_max_speed_x")->values; };
+
+    SECTION("a new extruder's pair is padded with the first value, like the other variant keys") {
+        config.option<ConfigOptionFloats>("machine_max_speed_x")->values = {500., 200.};
+        config.set_num_extruders(3);
+        REQUIRE(config.option<ConfigOptionStrings>("printer_extruder_variant")->size() == 3);
+        REQUIRE(speed_x() == std::vector<double>({500., 200., 500., 500., 500., 500.}));
+    }
+
+    SECTION("per-extruder pairs are kept, and removing an extruder removes its pair") {
+        config.option<ConfigOptionFloats>("machine_max_speed_x")->values = {500., 200., 400., 150., 300., 100.};
+        config.set_num_extruders(3);
+        REQUIRE(speed_x() == std::vector<double>({500., 200., 400., 150., 300., 100.}));
+        config.set_num_extruders(2);
+        REQUIRE(speed_x() == std::vector<double>({500., 200., 400., 150.}));
+    }
+
+    SECTION("a printer with nozzle variants gets a pair per variant") {
+        // 2 extruders x 2 variants each = 4 variants
+        config.option<ConfigOptionStrings>("extruder_variant_list", true)->values = {"Direct Drive Standard,Direct Drive High Flow",
+                                                                                     "Direct Drive Standard,Direct Drive High Flow"};
+        const std::vector<double> per_variant = {500., 200., 510., 210., 520., 220., 530., 230.};
+        config.option<ConfigOptionFloats>("machine_max_speed_x")->values = per_variant;
+        config.set_num_extruders(2);
+        REQUIRE(speed_x() == per_variant);
+
+        config.option<ConfigOptionFloats>("machine_max_speed_x")->values = {500., 200.};
+        config.set_num_extruders(2);
+        REQUIRE(speed_x() == std::vector<double>({500., 200., 500., 500., 500., 500., 500., 500.}));
+    }
+}
+
 // The device drying options hold several values per filament, as many as each filament preset gives.
 TEST_CASE("The device drying options are rebuilt as each filament's values in slot order", "[Config]")
 {
Author	SHA1	Message	Date
SoftFever	e027f8b225	Remove the CAD Primitive and Sketch gizmos from Prepare	2026-10-07 21:20:05 +08:00
SoftFever	6d02a945e0	Speed up the Linux incremental rebuild (optimizes packaging step) (#16244 ) ## Speeds up OrcaSlicer incremental rebuild on Linux Profiled `build_linux_image.sh`: 96 s, of which 51 s in the dependency audit. `appimage_is_elf_file()` ran `file` and `grep` per candidate. An AppDir holds ~9.6k of them, 4.8k being the bundled Python runtime and none of them ELF: ~19k processes, 14 s. Reads the four-byte magic instead. Checked against the old result on 4000 files, no disagreement. The dependency walk popped its queue with `"${queue[@]:1}"`, which rebuilds the whole array each time. At ~4.8k entries that was 22 s of copying an array around. Uses a read index. Audit still passes. `shellcheck` v0.11.0, the version CI uses, is clean. ## Notes The 96 s -> 12.7 s. Measured on a 32-core / 48 GB machine, but the audit is a serial bash loop, so cores and RAM is not the bottleneck. On slower hardware the saving should be larger ## Images <img width="1987" height="782" alt="Screenshot_20261007_092516" src="https://github.com/user-attachments/assets/96fcb917-38e5-49e7-8cbe-b37be1a2f23a" /> <img width="1807" height="742" alt="Screenshot_20261007_092621" src="https://github.com/user-attachments/assets/4a65ffae-4d59-41f0-a1c7-ee5b49f3c4be" />	2026-10-07 19:07:22 +08:00
SoftFever	01afd3b5b9	Use multiswitch for extruders instead new tabs on printer settings & publish dialog (#16162 ) # CHANGES / TESTS • Uses "Extruders" as tab name if it has multiple or it uses "Extruder" for single ones • Keeps selected extruder while switching between "Extruders" and "Motion ability" tab • Revert functions are working • New extruders generated with values so they will shown in "Unchanged values" dialog if you try to change preset while its edited. revert functions not works properly without this • BBL printers visible as Left / Right while normal printers visible as T1 / T2. i think there should be a separate option for how many toolheads and how many extruders it has. we might see 4 nozzles on same toolhead if one brand is brave enough :) • Sidebar and other sections updates itself properly <img width="751" height="173" alt="Screenshot-20261005173918" src="https://github.com/user-attachments/assets/3be0a6bd-84bd-4d15-822c-ed34acd98a9f" /> <img width="768" height="184" alt="Screenshot-20261005173905" src="https://github.com/user-attachments/assets/46164926-e385-4482-9fd1-41325eb9f61d" /> <img width="755" height="289" alt="Screenshot-20261005175318" src="https://github.com/user-attachments/assets/4550fa51-4c71-4a0a-b15e-9ca82dd0f1ad" /> # FIXES • Extruders count on parameters section not updated when extruder count changed on printer settings. fixed on this PR <img width="800" height="478" alt="Screenshot-20261005174702" src="https://github.com/user-attachments/assets/734e53df-f23f-4f83-8f87-2ecfeb6c162c" /> • New extruders gets randomly modifed parameters. fixed on this PR <img width="871" height="87" alt="Screenshot-20261005174840" src="https://github.com/user-attachments/assets/254dae2a-fcfa-44ed-b3b0-038faf019abb" /> • Changed parameters not triggers revert / modified on extruder tabs. fixed on this PR • Multi switch on motion ability tab not updated on extruder count change. fixed on this PR <img width="813" height="184" alt="Screenshot-20261005174929" src="https://github.com/user-attachments/assets/f4f33f8f-b1bd-4a30-b91b-6ff632d08c2a" />	2026-10-07 19:05:37 +08:00
SoftFever	b805f2ffd6	Fill a new extruder's machine limits the same way as its other settings	2026-10-07 18:42:09 +08:00
SoftFever	6b2b200f50	Merge branch 'main' into pr/yw4z/16162	2026-10-07 18:40:37 +08:00
yw4z	a38e6c61f2	Show dummy image for printers without cover on printer selectiondialog (#16235 ) init	2026-10-07 12:57:28 +03:00
SoftFever	cc3769453f	Merge branch 'main' into pr/yw4z/16162	2026-10-07 17:25:29 +08:00
ExPikaPaka	bd0ef35b90	Speed up the Linux image build Profiling build_linux_image.sh: 96 s, of which 51 s in the dependency audit. appimage_is_elf_file() ran file(1) and grep per candidate. An AppDir holds ~9.6k of them, 4.8k being the bundled Python runtime, none of them ELF: ~19k processes for 14 s. Read the four-byte magic instead; checked against the old result on 4000 files, no disagreement. The dependency walk popped its queue with "${queue[@]:1}", which rebuilds the whole array each time. At ~4.8k entries that was 22 s of copying. Use a read index. 96 s -> 12.7 s. The audit still passes.	2026-10-07 09:25:19 +02:00
SoftFever	b0da039eae	Merge branch 'main' into pr/yw4z/16162	2026-10-07 14:44:59 +08:00
SoftFever	ba5ecc5470	Edit the selected extruder's machine limits on the Motion ability page	2026-10-07 13:41:42 +08:00
SoftFever	82349e1ba4	Give each extruder its own machine limits	2026-10-07 13:41:42 +08:00
SoftFever	c740ddf0a6	Publish each extruder's own retraction and Z-hop values	2026-10-07 01:45:24 +08:00
SoftFever	d068468bbb	Simplify the unified Extruder page and its Publish dialog switch	2026-10-07 01:40:10 +08:00
SoftFever	67e29f69e7	Merge branch 'main' into exturuder-tab-multi-switch	2026-10-07 01:38:10 +08:00
SoftFever	919f507cca	Merge branch 'main' into exturuder-tab-multi-switch	2026-10-06 20:04:09 +08:00
SoftFever	26329e7147	Show Left/Right Extruder or Extruder N on the extruder switch	2026-10-06 20:03:07 +08:00
SoftFever	e47fdcaef7	Merge branch 'main' into exturuder-tab-multi-switch	2026-10-06 17:56:06 +08:00
yw4z	26be825234	init	2026-10-05 17:37:52 +03:00