From fc908cdf9b1e0759c24af4ee35fad0604f4c6611 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Tue, 28 May 2019 11:33:17 +0200 Subject: [PATCH 1/2] Revert "Settings-GUI: Max decimal places to 4 (from 3)." This reverts commit 020bedcfeea844a3a785fc12d5a590cef4b8e0a8. --- resources/qml/Settings/SettingTextField.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/qml/Settings/SettingTextField.qml b/resources/qml/Settings/SettingTextField.qml index fd52281ff0..096f320a7c 100644 --- a/resources/qml/Settings/SettingTextField.qml +++ b/resources/qml/Settings/SettingTextField.qml @@ -155,7 +155,7 @@ SettingItem maximumLength: (definition.type == "str" || definition.type == "[int]") ? -1 : 10 clip: true; //Hide any text that exceeds the width of the text box. - validator: RegExpValidator { regExp: (definition.type == "[int]") ? /^\[?(\s*-?[0-9]{0,9}\s*,)*(\s*-?[0-9]{0,9})\s*\]?$/ : (definition.type == "int") ? /^-?[0-9]{0,10}$/ : (definition.type == "float") ? /^-?[0-9]{0,9}[.,]?[0-9]{0,4}$/ : /^.*$/ } // definition.type property from parent loader used to disallow fractional number entry + validator: RegExpValidator { regExp: (definition.type == "[int]") ? /^\[?(\s*-?[0-9]{0,9}\s*,)*(\s*-?[0-9]{0,9})\s*\]?$/ : (definition.type == "int") ? /^-?[0-9]{0,10}$/ : (definition.type == "float") ? /^-?[0-9]{0,9}[.,]?[0-9]{0,3}$/ : /^.*$/ } // definition.type property from parent loader used to disallow fractional number entry Binding { From 63316fa4e9049043e36a35ff91bc2a9cd5aee465 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Tue, 28 May 2019 11:59:17 +0200 Subject: [PATCH 2/2] Fix manual output devices not being added on boot --- plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py b/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py index 41c76dc4c0..5168c0252c 100644 --- a/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py +++ b/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py @@ -235,10 +235,6 @@ class UM3OutputDevicePlugin(OutputDevicePlugin): self._application.callLater(manual_printer_request.callback, False, address) def addManualDevice(self, address: str, callback: Optional[Callable[[bool, str], None]] = None) -> None: - if address in self._manual_instances: - Logger.log("i", "Manual printer with address [%s] has already been added, do nothing", address) - return - self._manual_instances[address] = ManualPrinterRequest(address, callback = callback) self._preferences.setValue("um3networkprinting/manual_instances", ",".join(self._manual_instances.keys()))