Rename setting skirt_line_width to skirt_brim_line_width

Also updated the description. Because this concerns not only the skirt, but also the brim.

Contributes to issue CURA-1678.

cura/BuildVolume.py

@@ -364,9 +364,9 @@ class BuildVolume(SceneNode):
         if adhesion_type == "skirt":
             skirt_distance = container_stack.getProperty("skirt_gap", "value")
             skirt_line_count = container_stack.getProperty("skirt_line_count", "value")
-            skirt_size = skirt_distance + (skirt_line_count * container_stack.getProperty("skirt_line_width", "value"))
+            skirt_size = skirt_distance + (skirt_line_count * container_stack.getProperty("skirt_brim_line_width", "value"))
         elif adhesion_type == "brim":
-            skirt_size = container_stack.getProperty("brim_line_count", "value") * container_stack.getProperty("skirt_line_width", "value")
+            skirt_size = container_stack.getProperty("brim_line_count", "value") * container_stack.getProperty("skirt_brim_line_width", "value")
         elif adhesion_type == "raft":
             skirt_size = container_stack.getProperty("raft_margin", "value")
 
@@ -381,5 +381,5 @@ class BuildVolume(SceneNode):
     def _clamp(self, value, min_value, max_value):
         return max(min(value, max_value), min_value)
 
-    _skirt_settings = ["adhesion_type", "skirt_gap", "skirt_line_count", "skirt_line_width", "brim_width", "brim_line_count", "raft_margin", "draft_shield_enabled", "draft_shield_dist", "xy_offset"]
+    _skirt_settings = ["adhesion_type", "skirt_gap", "skirt_line_count", "skirt_brim_line_width", "brim_width", "brim_line_count", "raft_margin", "draft_shield_enabled", "draft_shield_dist", "xy_offset"]
     _raft_settings = ["adhesion_type", "raft_base_thickness", "raft_interface_thickness", "raft_surface_layers", "raft_surface_thickness", "raft_airgap"]

plugins/VersionUpgrade/VersionUpgrade21to22/VersionUpgrade21to22.py

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

resources/definitions/fdmprinter.def.json

@@ -603,10 +603,10 @@
                             "value": "line_width",
                             "settable_per_mesh": true
                         },
-                        "skirt_line_width":
+                        "skirt_brim_line_width":
                         {
-                            "label": "Skirt Line Width",
-                            "description": "Width of a single skirt line.",
+                            "label": "Skirt/Brim Line Width",
+                            "description": "Width of a single skirt or brim line.",
                             "unit": "mm",
                             "minimum_value": "0.0001",
                             "minimum_value_warning": "0.2",
@@ -2557,7 +2557,7 @@
                             "default_value": 20,
                             "minimum_value": "0",
                             "maximum_value_warning": "300",
-                            "value": "math.ceil(brim_width / skirt_line_width)",
+                            "value": "math.ceil(brim_width / skirt_brim_line_width)",
                             "enabled": "adhesion_type == \"brim\"",
                             "settable_per_mesh": false,
                             "settable_per_extruder": true