GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-25 15:48:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "The manually added priters by IP have "(manual) suffix"

Browse Source 
This reverts commit 977c0958a337505b3ef982bc6d77c11e5b8614b6.
This commit is contained in:
Aleksei S 2018-08-03 13:46:22 +02:00
parent 977c0958a3
commit 99cb9e93b3
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
plugins/UM3NetworkPrinting/DiscoverUM3Action.qml
View File

@ -349,6 +349,11 @@ Cura.MachineAction
addressField.focus = true; addressField.focus = true;
} }
onAccepted:
{
manager.setManualDevice(printerKey, addressText)
}
Column { Column {
anchors.fill: parent anchors.fill: parent
spacing: UM.Theme.getSize("default_margin").height spacing: UM.Theme.getSize("default_margin").height
@ -388,7 +393,7 @@ Cura.MachineAction
text: catalog.i18nc("@action:button", "OK") text: catalog.i18nc("@action:button", "OK")
onClicked: onClicked:
{ {
manager.setManualDevice(manualPrinterDialog.printerKey, manualPrinterDialog.addressText) manualPrinterDialog.accept()
manualPrinterDialog.hide() manualPrinterDialog.hide()
} }
enabled: manualPrinterDialog.addressText.trim() != "" enabled: manualPrinterDialog.addressText.trim() != ""

2
plugins/UM3NetworkPrinting/UM3OutputDevicePlugin.py
View File

@ -198,7 +198,7 @@ class UM3OutputDevicePlugin(OutputDevicePlugin):
has_cluster_capable_firmware = Version(system_info["firmware"]) > self._min_cluster_version has_cluster_capable_firmware = Version(system_info["firmware"]) > self._min_cluster_version
instance_name = "manual:%s" % address instance_name = "manual:%s" % address
properties = { properties = {
b"name": (system_info["name"] + " (manual)").encode("utf-8"), b"name": system_info["name"].encode("utf-8"),
b"address": address.encode("utf-8"), b"address": address.encode("utf-8"),
b"firmware_version": system_info["firmware"].encode("utf-8"), b"firmware_version": system_info["firmware"].encode("utf-8"),
b"manual": b"true", b"manual": b"true",