Browse Source

Merge branch 'master' of github.com:Ultimaker/Cura

Cherubim 5 years ago
parent
commit
6bf3b1509a

+ 0 - 4
plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py

@@ -236,10 +236,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()))
 

+ 1 - 1
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
             {