3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-07 23:17:32 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Refactor removal warning message to CloudOutputDeviceManager

Browse source 
CURA-7436
This commit is contained in:
Nino van Hooff 2020-05-18 16:22:55 +02:00
parent c61f5a162e
commit 252b993169
3 changed files with 21 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

20
cura/Machines/Models/GlobalStacksModel.py
View file

@ -19,9 +19,9 @@ class GlobalStacksModel(ListModel):
ConnectionTypeRole = Qt.UserRole + 4 ConnectionTypeRole = Qt.UserRole + 4
MetaDataRole = Qt.UserRole + 5 MetaDataRole = Qt.UserRole + 5
DiscoverySourceRole = Qt.UserRole + 6 # For separating local and remote printers in the machine management page DiscoverySourceRole = Qt.UserRole + 6 # For separating local and remote printers in the machine management page
HasCloudConnectionRole = Qt.UserRole + 7 RemovalWarningRole = Qt.UserRole + 7
def __init__(self, parent = None) -> None: def __init__(self, parent=None) -> None:
super().__init__(parent) super().__init__(parent)
self._catalog = i18nCatalog("cura") self._catalog = i18nCatalog("cura")
@ -55,7 +55,7 @@ class GlobalStacksModel(ListModel):
def _update(self) -> None: def _update(self) -> None:
items = [] items = []
container_stacks = CuraContainerRegistry.getInstance().findContainerStacks(type = "machine") container_stacks = CuraContainerRegistry.getInstance().findContainerStacks(type="machine")
for container_stack in container_stacks: for container_stack in container_stacks:
has_remote_connection = False has_remote_connection = False
has_cloud_connection = False has_cloud_connection = False
@ -68,14 +68,22 @@ class GlobalStacksModel(ListModel):
if parseBool(container_stack.getMetaDataEntry("hidden", False)): if parseBool(container_stack.getMetaDataEntry("hidden", False)):
continue continue
device_name = container_stack.getMetaDataEntry("group_name", container_stack.getName())
section_name = "Connected printers" if has_remote_connection else "Preset printers" section_name = "Connected printers" if has_remote_connection else "Preset printers"
section_name = self._catalog.i18nc("@info:title", section_name) 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(), "id": container_stack.getId(),
"hasRemoteConnection": has_remote_connection, "hasRemoteConnection": has_remote_connection,
"hasCloudConnection": has_cloud_connection, "hasCloudConnection": has_cloud_connection,
"metadata": container_stack.getMetaData().copy(), "metadata": container_stack.getMetaData().copy(),
"discoverySource": section_name}) "discoverySource": section_name,
items.sort(key = lambda i: (not i["hasRemoteConnection"], i["name"])) "removalWarning": removal_warning})
items.sort(key=lambda i: (not i["hasRemoteConnection"], i["name"]))
self.setItems(items) self.setItems(items)

6
plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py
View file

@ -265,6 +265,12 @@ class CloudOutputDeviceManager:
machine.setName(device.name) machine.setName(device.name)
machine.setMetaDataEntry(self.META_CLUSTER_ID, device.key) machine.setMetaDataEntry(self.META_CLUSTER_ID, device.key)
machine.setMetaDataEntry("group_name", device.name) machine.setMetaDataEntry("group_name", device.name)
machine.setMetaDataEntry("removal_warning", self.I18N_CATALOG.i18nc(
"@label ({} is printer name)",
"{} will be removed but will be added again in the next sync. To remove the printer permanently, "
"visit <a href='https://mycloud.ultimaker.com/'>Ultimaker Digital Factory</a>",
device.name
))
machine.addConfiguredConnectionType(device.connectionType.value) machine.addConfiguredConnectionType(device.connectionType.value)
def _connectToOutputDevice(self, device: CloudOutputDevice, machine: GlobalStack) -> None: def _connectToOutputDevice(self, device: CloudOutputDevice, machine: GlobalStack) -> None:

6
resources/qml/Preferences/MachinesPage.qml
View file

@ -136,11 +136,7 @@ UM.ManagementPage
{ {
id: confirmDialog id: confirmDialog
object: base.currentItem && base.currentItem.name ? base.currentItem.name : "" object: base.currentItem && base.currentItem.name ? base.currentItem.name : ""
text: base.currentItem && base.currentItem.hasCloudConnection? text: base.currentItem ? base.currentItem.removalWarning : "";
catalog.i18nc("@label (%1 is object name)", "%1 will be removed but will be added again in the next sync. To remove the printer permanently, visit <a href='https://mycloud.ultimaker.com/'>Ultimaker Digital Factory</a>").arg(base.currentItem.name)
:
catalog.i18nc("@label (%1 is object name)", "Are you sure you wish to remove %1? This cannot be undone!").arg(base.currentItem.name)
;
onYes: onYes:
{ {
Cura.MachineManager.removeMachine(base.currentItem.id) Cura.MachineManager.removeMachine(base.currentItem.id)