diff --git a/plugins/3MFReader/ThreeMFWorkspaceReader.py b/plugins/3MFReader/ThreeMFWorkspaceReader.py index c8d1c85273..6de4ddc998 100755 --- a/plugins/3MFReader/ThreeMFWorkspaceReader.py +++ b/plugins/3MFReader/ThreeMFWorkspaceReader.py @@ -378,7 +378,11 @@ class ThreeMFWorkspaceReader(WorkspaceReader): Logger.log("e", "Could not find 'metadata/position' in extruder stack file") raise RuntimeError(msg) extruder_position = extruder_config.get("metadata", "position") - extruder_stack = global_stack.extruders[extruder_position] + try: + extruder_stack = global_stack.extruders[extruder_position] + except KeyError: + Logger.log("w", "Could not find the matching extruder stack to override for position %s", extruder_position) + return None # Override the given extruder stack extruder_stack.deserialize(extruder_file_content) @@ -701,6 +705,8 @@ class ThreeMFWorkspaceReader(WorkspaceReader): if global_stack.getProperty("machine_extruder_count", "value") > 1: # deserialize new extruder stack over the current ones (if any) stack = self._overrideExtruderStack(global_stack, extruder_file_content) + if stack is None: + continue elif self._resolve_strategies["machine"] == "new": new_id = extruder_stack_id_map[container_id] diff --git a/resources/qml/Topbar.qml b/resources/qml/Topbar.qml index 152a677467..b3a5137111 100644 --- a/resources/qml/Topbar.qml +++ b/resources/qml/Topbar.qml @@ -18,8 +18,6 @@ Rectangle height: UM.Theme.getSize("sidebar_header").height color: base.monitoringPrint ? UM.Theme.getColor("topbar_background_color_monitoring") : UM.Theme.getColor("topbar_background_color") - Behavior on color { ColorAnimation { duration: 100; } } - property bool printerConnected: Cura.MachineManager.printerOutputDevices.length != 0 property bool printerAcceptsCommands: printerConnected && Cura.MachineManager.printerOutputDevices[0].acceptsCommands property bool monitoringPrint: false diff --git a/resources/themes/cura-dark/theme.json b/resources/themes/cura-dark/theme.json index f39fe96c37..e61c48bffd 100644 --- a/resources/themes/cura-dark/theme.json +++ b/resources/themes/cura-dark/theme.json @@ -16,7 +16,7 @@ "secondary": [241, 242, 242, 255], "topbar_background_color": [0, 0, 0, 0], - "topbar_background_color_monitoring": [0, 0, 0, 0], + "topbar_background_color_monitoring": [31, 36, 39, 255], "topbar_button_text_active": [255, 255, 255, 255], "topbar_button_text_inactive": [128, 128, 128, 255], diff --git a/resources/themes/cura-light/theme.json b/resources/themes/cura-light/theme.json index 5d50618eea..96ccd469b6 100644 --- a/resources/themes/cura-light/theme.json +++ b/resources/themes/cura-light/theme.json @@ -68,7 +68,7 @@ "secondary": [245, 245, 245, 255], "topbar_background_color": [255, 255, 255, 0], - "topbar_background_color_monitoring": [255, 255, 255, 0], + "topbar_background_color_monitoring": [255, 255, 255, 255], "topbar_button_text_active": [0, 0, 0, 255], "topbar_button_text_inactive": [128, 128, 128, 255],