diff --git a/cura/Machines/Models/DiscoveredUltimakerCloudPrintersModel.py b/cura/Machines/Models/DiscoveredUltimakerCloudPrintersModel.py index f2c5cf0374..32e432ea68 100644 --- a/cura/Machines/Models/DiscoveredUltimakerCloudPrintersModel.py +++ b/cura/Machines/Models/DiscoveredUltimakerCloudPrintersModel.py @@ -27,7 +27,7 @@ class DiscoveredUltimakerCloudPrintersModel(ListModel): self._discovered_ultimaker_cloud_printers_list = [] self._application = application - def addDiscoveredUltimakerCloudPrinter(self, new_devices) -> None: + def addDiscoveredUltimakerCloudPrinters(self, new_devices) -> None: for device in new_devices: self._discovered_ultimaker_cloud_printers_list.append({ "ip_address": device.key, @@ -39,7 +39,7 @@ class DiscoveredUltimakerCloudPrintersModel(ListModel): self._update() @pyqtSlot() - def clearDiscoveredUltimakerCloudPrinters(self): + def clear(self): self._discovered_ultimaker_cloud_printers_list = [] self._update() diff --git a/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py b/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py index c8dbbfd121..40dbeadbec 100644 --- a/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py +++ b/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py @@ -146,7 +146,7 @@ class CloudOutputDeviceManager: self._remote_clusters[device.getId()] = device remote_clusters_added = True - CuraApplication.getInstance().getDiscoveredUltimakerCloudPrintersModel().addDiscoveredUltimakerCloudPrinter(new_devices) + CuraApplication.getInstance().getDiscoveredUltimakerCloudPrintersModel().addDiscoveredUltimakerCloudPrinters(new_devices) if not new_devices: if remote_clusters_added: diff --git a/resources/qml/WelcomePages/AddCloudPrintersView.qml b/resources/qml/WelcomePages/AddCloudPrintersView.qml index 170563ccaf..11823101e7 100644 --- a/resources/qml/WelcomePages/AddCloudPrintersView.qml +++ b/resources/qml/WelcomePages/AddCloudPrintersView.qml @@ -169,7 +169,7 @@ Item text: catalog.i18nc("@button", "Add printer manually") onClicked: { - discoveredCloudPrintersModel.clearDiscoveredUltimakerCloudPrinters() + discoveredCloudPrintersModel.clear() base.showPreviousPage() } } @@ -182,7 +182,7 @@ Item text: catalog.i18nc("@button", "Finish") onClicked: { - addCloudPrinterScreen.discoveredCloudPrintersModel.clearDiscoveredUltimakerCloudPrinters() + discoveredCloudPrintersModel.clear() base.showNextPage() } diff --git a/resources/qml/WelcomePages/AddNetworkPrinterScrollView.qml b/resources/qml/WelcomePages/AddNetworkPrinterScrollView.qml index cbb27c66ea..0139064258 100644 --- a/resources/qml/WelcomePages/AddNetworkPrinterScrollView.qml +++ b/resources/qml/WelcomePages/AddNetworkPrinterScrollView.qml @@ -202,7 +202,10 @@ Item anchors.verticalCenter: parent.verticalCenter text: catalog.i18nc("@label", "Add cloud printer") height: UM.Theme.getSize("message_action_button").height - onClicked: base.addCloudPrinterButtonClicked() + onClicked: { + CuraApplication.getDiscoveredUltimakerCloudPrintersModel().clear() + base.addCloudPrinterButtonClicked() + } } Item