From 0bbde663e46b6c6bf7e4ebc578841f754eb2a9bd Mon Sep 17 00:00:00 2001
From: Saumya Jain <saumya.jain@ultimaker.com>
Date: Mon, 6 May 2024 16:07:48 +0200
Subject: [PATCH] Update file format and removed 'Sketch' flavor option

The file format 'application/x-makerbotsketch' has been updated to 'application/x-makerbot-sketch' across all instances in the code base. In addition, the 'Sketch' option for gcode flavor has been removed from all printer selection menus in different sections of the code. This should be added again once the code is implemented in gcode for this flavor.
Also, change flavor in ultimaker_sketch.def.json file

CURA-11777
---
 plugins/MakerbotWriter/MakerbotWriter.py               | 4 ++--
 plugins/MakerbotWriter/__init__.py                     | 2 +-
 plugins/PostProcessingPlugin/scripts/FilamentChange.py | 1 -
 plugins/PostProcessingPlugin/scripts/PauseAtHeight.py  | 1 -
 resources/definitions/fdmprinter.def.json              | 1 -
 resources/definitions/ultimaker_sketch.def.json        | 3 +--
 6 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/plugins/MakerbotWriter/MakerbotWriter.py b/plugins/MakerbotWriter/MakerbotWriter.py
index 926fd54f62..9535f7b107 100644
--- a/plugins/MakerbotWriter/MakerbotWriter.py
+++ b/plugins/MakerbotWriter/MakerbotWriter.py
@@ -41,7 +41,7 @@ class MakerbotWriter(MeshWriter):
         )
         MimeTypeDatabase.addMimeType(
             MimeType(
-                name="application/x-makerbotsketch",
+                name="application/x-makerbot-sketch",
                 comment="Makerbot Toolpath Package",
                 suffixes=["makerbot"]
             )
@@ -106,7 +106,7 @@ class MakerbotWriter(MeshWriter):
             self.setInformation(gcode_writer.getInformation())
             return False
 
-        if file_format == "application/x-makerbotsketch":
+        if file_format == "application/x-makerbot-sketch":
             filename, filedata = "print.gcode", gcode_text_io.getvalue()
         else:
             filename, filedata = "print.jsontoolpath", du.gcode_2_miracle_jtp(gcode_text_io.getvalue())
diff --git a/plugins/MakerbotWriter/__init__.py b/plugins/MakerbotWriter/__init__.py
index 29ae9f083d..60f232fbc0 100644
--- a/plugins/MakerbotWriter/__init__.py
+++ b/plugins/MakerbotWriter/__init__.py
@@ -23,7 +23,7 @@ def getMetaData():
                 {
                     "extension": file_extension,
                     "description": catalog.i18nc("@item:inlistbox", "Makerbot Sketch Printfile"),
-                    "mime_type": "application/x-makerbotsketch",
+                    "mime_type": "application/x-makerbot-sketch",
                     "mode": MakerbotWriter.MakerbotWriter.OutputMode.BinaryMode,
                 }
             ]
diff --git a/plugins/PostProcessingPlugin/scripts/FilamentChange.py b/plugins/PostProcessingPlugin/scripts/FilamentChange.py
index 44c27fda50..6fe28ef2f2 100644
--- a/plugins/PostProcessingPlugin/scripts/FilamentChange.py
+++ b/plugins/PostProcessingPlugin/scripts/FilamentChange.py
@@ -117,7 +117,6 @@ class FilamentChange(Script):
                         "UltiGCode": "Ultimaker 2",
                         "Griffin": "Griffin",
                         "Makerbot": "Makerbot",
-                        "Sketch": "Sketch",
                         "BFB": "Bits from Bytes",
                         "MACH3": "Mach3",
                         "Repetier": "Repetier"
diff --git a/plugins/PostProcessingPlugin/scripts/PauseAtHeight.py b/plugins/PostProcessingPlugin/scripts/PauseAtHeight.py
index d292021f79..f502678317 100644
--- a/plugins/PostProcessingPlugin/scripts/PauseAtHeight.py
+++ b/plugins/PostProcessingPlugin/scripts/PauseAtHeight.py
@@ -206,7 +206,6 @@ class PauseAtHeight(Script):
                         "UltiGCode": "Ultimaker 2",
                         "Griffin": "Griffin",
                         "Makerbot": "Makerbot",
-                        "Sketch": "Sketch",
                         "BFB": "Bits from Bytes",
                         "MACH3": "Mach3",
                         "Repetier": "Repetier"
diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json
index 7b189f7bbe..7591a30232 100644
--- a/resources/definitions/fdmprinter.def.json
+++ b/resources/definitions/fdmprinter.def.json
@@ -381,7 +381,6 @@
                         "UltiGCode": "Ultimaker 2",
                         "Griffin": "Griffin",
                         "Makerbot": "Makerbot",
-                        "makerbotSketch": "Sketch",
                         "BFB": "Bits from Bytes",
                         "MACH3": "Mach3",
                         "Repetier": "Repetier"
diff --git a/resources/definitions/ultimaker_sketch.def.json b/resources/definitions/ultimaker_sketch.def.json
index 67abb8c85f..31d6e80b62 100644
--- a/resources/definitions/ultimaker_sketch.def.json
+++ b/resources/definitions/ultimaker_sketch.def.json
@@ -7,7 +7,7 @@
         "visible": true,
         "author": "Ultimaker",
         "manufacturer": "Ultimaker B.V.",
-        "file_formats": "application/x-makerbotsketch",
+        "file_formats": "application/x-makerbot-sketch",
         "platform": "ultimaker_sketch_platform.obj",
         "exclude_materials": [
             "dsm_175_novamidid1030cf",
@@ -199,7 +199,6 @@
         "adhesion_type": { "value": "'raft'" },
         "brim_width": { "value": "3" },
         "cool_fan_speed": { "value": "100" },
-        "cool_min_time": { "value": 3 },
         "default_material_print_temperature": { "value": "215" },
         "extruder_prime_pos_abs": { "default_value": true },
         "gantry_height": { "value": "60" },