diff --git a/cura/Machines/Models/GlobalStacksModel.py b/cura/Machines/Models/GlobalStacksModel.py
index 9db4ffe6db..201fbacd30 100644
--- a/cura/Machines/Models/GlobalStacksModel.py
+++ b/cura/Machines/Models/GlobalStacksModel.py
@@ -19,6 +19,7 @@ class GlobalStacksModel(ListModel):
ConnectionTypeRole = Qt.UserRole + 4
MetaDataRole = Qt.UserRole + 5
DiscoverySourceRole = Qt.UserRole + 6 # For separating local and remote printers in the machine management page
+ RemovalWarningRole = Qt.UserRole + 7
def __init__(self, parent = None) -> None:
super().__init__(parent)
@@ -65,13 +66,21 @@ class GlobalStacksModel(ListModel):
if parseBool(container_stack.getMetaDataEntry("hidden", False)):
continue
- section_name = "Network enabled printers" if has_remote_connection else "Local printers"
+ device_name = container_stack.getMetaDataEntry("group_name", container_stack.getName())
+ section_name = "Connected printers" if has_remote_connection else "Preset printers"
section_name = self._catalog.i18nc("@info:title", section_name)
- items.append({"name": container_stack.getMetaDataEntry("group_name", container_stack.getName()),
+ default_removal_warning = self._catalog.i18nc(
+ "@label ({} is object name)",
+ "Are you sure you wish to remove {}? This cannot be undone!", device_name
+ )
+ removal_warning = container_stack.getMetaDataEntry("removal_warning", default_removal_warning)
+
+ items.append({"name": device_name,
"id": container_stack.getId(),
"hasRemoteConnection": has_remote_connection,
"metadata": container_stack.getMetaData().copy(),
- "discoverySource": section_name})
- items.sort(key = lambda i: (not i["hasRemoteConnection"], i["name"]))
+ "discoverySource": section_name,
+ "removalWarning": removal_warning})
+ items.sort(key=lambda i: (not i["hasRemoteConnection"], i["name"]))
self.setItems(items)
diff --git a/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py b/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py
index f233e59fe5..3322bbd639 100644
--- a/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py
+++ b/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py
@@ -265,6 +265,13 @@ class CloudOutputDeviceManager:
machine.setName(device.name)
machine.setMetaDataEntry(self.META_CLUSTER_ID, device.key)
machine.setMetaDataEntry("group_name", device.name)
+ machine.setMetaDataEntry("removal_warning", self.I18N_CATALOG.i18nc(
+ "@label ({} is printer name)",
+ "{} will be removed until the next account sync.
To remove {} permanently, "
+ "visit Ultimaker Digital Factory. "
+ "
Are you sure you want to remove {} temporarily?",
+ device.name, device.name, device.name
+ ))
machine.addConfiguredConnectionType(device.connectionType.value)
def _connectToOutputDevice(self, device: CloudOutputDevice, machine: GlobalStack) -> None:
diff --git a/resources/qml/Preferences/MachinesPage.qml b/resources/qml/Preferences/MachinesPage.qml
index a3a8ec0e29..5341af65db 100644
--- a/resources/qml/Preferences/MachinesPage.qml
+++ b/resources/qml/Preferences/MachinesPage.qml
@@ -136,6 +136,7 @@ UM.ManagementPage
{
id: confirmDialog
object: base.currentItem && base.currentItem.name ? base.currentItem.name : ""
+ text: base.currentItem ? base.currentItem.removalWarning : "";
onYes:
{
Cura.MachineManager.removeMachine(base.currentItem.id)