Merge branch 'master' into CURA-8112_Inform_the_user_about_their_subscription_limits

resources/definitions/atom2.def.json

@@ -0,0 +1,35 @@
+{
+  "name": "Atom 2",
+  "version": 2,
+  "inherits": "fdmprinter",
+  "metadata": {
+    "visible": true,
+    "author": "Victor (Yu Chieh) Lin",
+    "manufacturer": "Layer One",
+    "file_formats": "text/x-gcode",
+    "platform_offset": [0,0,0],
+    "machine_extruder_trains":  { "0": "atom2_extruder_0"
+    }
+  },
+
+  "overrides": {
+    "machine_name":           { "default_value": "Atom 2" },
+    "machine_shape":          { "default_value": "elliptic" },
+    "machine_width":          { "default_value": 210 },
+    "machine_depth":          { "default_value": 210 },
+    "machine_height":         { "default_value": 320 },
+    "machine_extruder_count": { "default_value": 1 },
+    "machine_heated_bed":     { "default_value": false },
+    "machine_center_is_zero": { "default_value": true },
+
+    "machine_start_gcode":    { "default_value": "G21\nG90 \nM107\nG28\nG92 E0\nG1 F200 E3\nG92 E0" },
+    "machine_end_gcode":      { "default_value": "M104 S0\nG28\nG91\nG1 E-6 F300\nM84\nG90" },
+
+    "layer_height": { "default_value": 0.2 },
+    "default_material_print_temperature": { "default_value": 210 },
+    "speed_print": { "default_value": 32 },
+    "optimize_wall_printing_order": { "value": "True" },
+    "infill_sparse_density": { "default_value": 10 },
+    "brim_width": { "default_value": 4 }
+  }
+}

resources/extruders/atom2_extruder_0.def.json

@@ -0,0 +1,15 @@
+{
+    "version": 2,
+    "name": "Extruder 1",
+    "inherits": "fdmextruder",
+    "metadata": {
+        "machine": "atom2",
+        "position": "0"
+    },
+
+    "overrides": {
+        "extruder_nr": { "default_value": 0 },
+        "machine_nozzle_size": { "default_value": 0.4 },
+        "material_diameter": { "default_value": 1.75 }
+    }
+}

resources/qml/Widgets/TextField.qml

@@ -1,4 +1,4 @@
-// Copyright (c) 2019 Ultimaker B.V.
+// Copyright (c) 2021 Ultimaker B.V.
 // Cura is released under the terms of the LGPLv3 or higher.
 
 import QtQuick 2.10
@@ -15,6 +15,8 @@ TextField
 {
     id: textField
 
+    property alias leftIcon: iconLeft.source
+
     UM.I18nCatalog { id: catalog; name: "cura" }
 
     hoverEnabled: true
@@ -22,6 +24,7 @@ TextField
     font: UM.Theme.getFont("default")
     color: UM.Theme.getColor("text")
     renderType: Text.NativeRendering
+    leftPadding: iconLeft.visible ? iconLeft.width + UM.Theme.getSize("default_margin").width * 2 : UM.Theme.getSize("thin_margin").width
 
     states: [
         State
@@ -52,7 +55,6 @@ TextField
 
         color: UM.Theme.getColor("main_background")
 
-        anchors.margins: Math.round(UM.Theme.getSize("default_lining").width)
         radius: UM.Theme.getSize("setting_control_radius").width
 
         border.color:
@@ -67,5 +69,23 @@ TextField
             }
             return UM.Theme.getColor("setting_control_border")
         }
+
+        //Optional icon added on the left hand side.
+        UM.RecolorImage
+        {
+            id: iconLeft
+
+            anchors
+            {
+                verticalCenter: parent.verticalCenter
+                left: parent.left
+                leftMargin: UM.Theme.getSize("default_margin").width
+            }
+
+            visible: source != ""
+            height: UM.Theme.getSize("small_button_icon").height
+            width: visible ? height : 0
+            color: textField.color
+        }
     }
 }

resources/themes/cura-light/icons/medium/ExtruderColor.svg

@@ -6,8 +6,8 @@
 	.st0{fill:#231F20;}
 </style>
 <g id="Layer_1_1_">
-	<path class="st0" d="M15,26C8.9,26,4,21.1,4,15S8.9,4,15,4s11,4.9,11,11S21.1,26,15,26z M15,7c-4.4,0-8,3.6-8,8s3.6,8,8,8
-		s8-3.6,8-8S19.4,7,15,7z"/>
+	<path class="st0" d="M15,26C8.9,26,4,21.1,4,15S8.9,4,15,4s11,4.9,11,11S21.1,26,15,26z M15,8c-3.8,0-7,3.2-7,7s3.2,7,7,7
+		s7-3.1,7-7S18.9,8,15,8z"/>
 </g>
 <g id="Comments">
 </g>