Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0

plugins/GCodeReader/FlavorParser.py

@@ -364,6 +364,8 @@ class FlavorParser:
                     self._layer_type = LayerPolygon.SupportType
                 elif type == "FILL":
                     self._layer_type = LayerPolygon.InfillType
+                elif type == "SUPPORT-INTERFACE":
+                    self._layer_type = LayerPolygon.SupportInterfaceType
                 else:
                     Logger.log("w", "Encountered a unknown type (%s) while parsing g-code.", type)
 

resources/qml/Settings/SettingView.qml

@@ -558,17 +558,6 @@ Item
 
                     onTriggered: Cura.Actions.configureSettingVisibility.trigger(contextMenu);
                 }
-                MenuSeparator {}
-                MenuItem
-                {
-                    text: catalog.i18nc("@action:inmenu", "Collapse All")
-                    onTriggered: definitionsModel.collapseAll()
-                }
-                MenuItem
-                {
-                    text: catalog.i18nc("@action:inmenu", "Expand All")
-                    onTriggered: definitionsModel.expandRecursive()
-                }
             }
 
             UM.SettingPropertyProvider

resources/themes/cura-dark/theme.json

@@ -40,6 +40,8 @@
         "text_scene": [255, 255, 255, 162],
         "text_scene_hover": [255, 255, 255, 204],
 
+        "printer_type_label_background": [95, 95, 95, 255],
+
         "error": [212, 31, 53, 255],
         "disabled": [32, 32, 32, 255],