Rename setting skirt_minimal_length to skirt_brim_minimal_length

Also updated the description and made it a bit more accurate. Because this concerns not only the skirt, but also the brim.

Contributes to issue CURA-1678.

plugins/LegacyProfileReader/DictionaryOfDoom.json

@@ -47,7 +47,7 @@
         "adhesion_type": "\"skirt\" if (platform_adhesion == \"None\") else platform_adhesion.lower()",
         "skirt_line_count": "skirt_line_count",
         "skirt_gap": "skirt_gap",
-        "skirt_minimal_length": "skirt_minimal_length",
+        "skirt_brim_minimal_length": "skirt_minimal_length",
         "brim_line_count": "brim_line_count",
         "raft_margin": "raft_margin",
         "raft_airgap": "float(raft_airgap_all) + float(raft_airgap)",

plugins/VersionUpgrade/VersionUpgrade21to22/VersionUpgrade21to22.py

@@ -32,6 +32,7 @@ _setting_name_translations = {
     "remove_overlapping_walls_x_enabled": "travel_compensate_overlapping_walls_x_enabled",
     "retraction_hop": "retraction_hop_enabled",
     "skirt_line_width": "skirt_brim_line_width",
+    "skirt_minimal_length": "skirt_brim_minimal_length",
     "skirt_speed": "skirt_brim_speed",
     "speed_support_lines": "speed_support_infill"
 }
@@ -159,6 +160,9 @@ class VersionUpgrade21to22(VersionUpgrade):
             elif key == "retraction_hop": #Setting key was changed.
                 del settings[key]
                 settings["retraction_hop_enabled"] = value
+            elif key == "skirt_minimal_length": #Setting key was changed.
+                del settings[key]
+                settings["skirt_brim_minimal_length"] = value
             elif key == "skirt_line_width": #Setting key was changed.
                 del settings[key]
                 settings["skirt_brim_line_width"] = value

resources/definitions/bq_hephestos_2.def.json

@@ -40,7 +40,7 @@
         "speed_topbottom": { "default_value": 35 },
         "skirt_brim_speed": { "default_value": 35 },
         "skirt_line_count": { "default_value": 4 },
-        "skirt_minimal_length": { "default_value": 30 },
+        "skirt_brim_minimal_length": { "default_value": 30 },
         "skirt_gap": { "default_value": 6 },
         "cool_fan_full_at_height": { "default_value": 0.4 }
     }

resources/definitions/bq_witbox_2.def.json

@@ -95,7 +95,7 @@
         "skirt_line_count": {
             "default_value": 4
         },
-        "skirt_minimal_length": {
+        "skirt_brim_minimal_length": {
             "default_value": 30
         },
         "skirt_gap": {

resources/definitions/fdmprinter.def.json

@@ -2521,10 +2521,10 @@
                     "settable_per_mesh": false,
                     "settable_per_extruder": true
                 },
-                "skirt_minimal_length":
+                "skirt_brim_minimal_length":
                 {
-                    "label": "Skirt Minimum Length",
-                    "description": "The minimum length of the skirt. If this length is not reached by the skirt line count, more skirt lines will be added until the minimum length is reached. Note: If the line count is set to 0 this is ignored.",
+                    "label": "Skirt/Brim Minimum Length",
+                    "description": "The minimum length of the skirt or brim. If this length is not reached by all skirt or brim lines together, more skirt or brim lines will be added until the minimum length is reached. Note: If the line count is set to 0 this is ignored.",
                     "unit": "mm",
                     "type": "float",
                     "default_value": 250,

resources/definitions/mankati_fullscale_xt_plus.def.json

@@ -61,6 +61,6 @@
         "cool_fan_speed": { "default": 0 },
         "skirt_line_count": { "default": 3 },
         "skirt_gap": { "default": 4 },
-        "skirt_minimal_length": { "default": 200 }
+        "skirt_brim_minimal_length": { "default": 200 }
     }
 }

resources/definitions/rigidbot.def.json

@@ -94,7 +94,7 @@
             "default_value": 4,
             "enabled": "adhesion_type == \"Skirt\""
         },
-        "skirt_minimal_length": {
+        "skirt_brim_minimal_length": {
             "default_value": 200,
             "enabled": "adhesion_type == \"Skirt\""
         }

resources/definitions/rigidbot_big.def.json

@@ -97,7 +97,7 @@
             "default_value": 4,
             "enabled": "adhesion_type == \"Skirt\""
         },
-        "skirt_minimal_length": {
+        "skirt_brim_minimal_length": {
             "default_value": 200,
             "enabled": "adhesion_type == \"Skirt\""
         }