diff --git a/cura/Settings/CuraStackBuilder.py b/cura/Settings/CuraStackBuilder.py index 7ede6950d7..ff9a795c43 100644 --- a/cura/Settings/CuraStackBuilder.py +++ b/cura/Settings/CuraStackBuilder.py @@ -17,7 +17,7 @@ class CuraStackBuilder: """Contains helper functions to create new machines.""" @classmethod - def createMachine(cls, name: str, definition_id: str, machine_extruder_count: Optional[int] = None) -> Optional[GlobalStack]: + def createMachine(cls, name: str, definition_id: str, machine_extruder_count: Optional[int] = None, show_warning_message: bool = True) -> Optional[GlobalStack]: """Create a new instance of a machine. :param name: The name of the new machine. @@ -34,7 +34,8 @@ class CuraStackBuilder: definitions = registry.findDefinitionContainers(id = definition_id) if not definitions: - ConfigurationErrorMessage.getInstance().addFaultyContainers(definition_id) + if show_warning_message: + ConfigurationErrorMessage.getInstance().addFaultyContainers(definition_id) Logger.log("w", "Definition {definition} was not found!", definition = definition_id) return None diff --git a/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py b/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py index d88814818a..f7f659124c 100644 --- a/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py +++ b/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py @@ -236,6 +236,8 @@ class CloudOutputDeviceManager: ) message.show() + new_devices_added = [] + for idx, device in enumerate(new_devices): message_text = self.i18n_catalog.i18nc("info:status Filled in with printer name and printer model.", "Adding printer {name} ({model}) from your account").format(name = device.name, model = device.printerTypeName) message.setText(message_text) @@ -246,21 +248,25 @@ class CloudOutputDeviceManager: # If there is no active machine, activate the first available cloud printer activate = not CuraApplication.getInstance().getMachineManager().activeMachine - self._createMachineFromDiscoveredDevice(device.getId(), activate = activate) + + if self._createMachineFromDiscoveredDevice(device.getId(), activate = activate): + new_devices_added.append(device) message.setProgress(None) max_disp_devices = 3 - if len(new_devices) > max_disp_devices: - num_hidden = len(new_devices) - max_disp_devices + if len(new_devices_added) > max_disp_devices: + num_hidden = len(new_devices_added) - max_disp_devices device_name_list = ["