3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-06 14:37:29 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Update RegExpValidator to RegularExpressionValidator

Browse source 
Due to Qt6 API change

CURA-8640
This commit is contained in:
c.lamboo 2022-03-30 15:10:37 +02:00
parent 99a3a8d11d
commit 3c9e2a1b08
13 changed files with 26 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

4
plugins/DigitalLibrary/resources/qml/CreateNewProjectPopup.qml
View file

@ -90,9 +90,9 @@ Popup
left: parent.left
right: parent.right
}
validator: RegExpValidator
validator: RegularExpressionValidator
{
regExp: /^[^\\\/\*\?\|\[\]]{0,99}$/
regularExpression: /^[^\\\/\*\?\|\[\]]{0,99}$/
}
text: PrintInformation.jobName

4
plugins/DigitalLibrary/resources/qml/SaveProjectFilesPage.qml
View file

@ -61,9 +61,9 @@ Item
anchors.left: parent.left
anchors.top: fileNameLabel.bottom
anchors.topMargin: UM.Theme.getSize("thin_margin").height
validator: RegExpValidator
validator: RegularExpressionValidator
{
regExp: /^[\w\-\. ()]{0,255}$/
regularExpression: /^[\w\-\. ()]{0,255}$/
}
text: PrintInformation.jobName

10
plugins/ImageReader/ConfigUI.qml
View file

@ -47,7 +47,7 @@ UM.Dialog
Layout.minimumWidth: UM.Theme.getSize("setting_control").width
selectByMouse: true
objectName: "Peak_Height"
validator: RegExpValidator { regExp: /^\d{0,3}([\,|\.]\d*)?$/ }
validator: RegularExpressionValidator { regularExpression: /^\d{0,3}([\,|\.]\d*)?$/ }
onTextChanged: manager.onPeakHeightChanged(text)
}
@ -81,7 +81,7 @@ UM.Dialog
Layout.fillWidth: true
Layout.minimumWidth: UM.Theme.getSize("setting_control").width
objectName: "Base_Height"
validator: RegExpValidator { regExp: /^\d{0,3}([\,|\.]\d*)?$/ }
validator: RegularExpressionValidator { regularExpression: /^\d{0,3}([\,|\.]\d*)?$/ }
onTextChanged: manager.onBaseHeightChanged(text)
}
@ -115,7 +115,7 @@ UM.Dialog
Layout.fillWidth: true
Layout.minimumWidth: UM.Theme.getSize("setting_control").width
focus: true
validator: RegExpValidator { regExp: /^[1-9]\d{0,2}([\,|\.]\d*)?$/ }
validator: RegularExpressionValidator { regularExpression: /^[1-9]\d{0,2}([\,|\.]\d*)?$/ }
onTextChanged: manager.onWidthChanged(text)
}
@ -149,7 +149,7 @@ UM.Dialog
selectByMouse: true
objectName: "Depth"
focus: true
validator: RegExpValidator { regExp: /^[1-9]\d{0,2}([\,|\.]\d*)?$/ }
validator: RegularExpressionValidator { regularExpression: /^[1-9]\d{0,2}([\,|\.]\d*)?$/ }
onTextChanged: manager.onDepthChanged(text)
}
@ -255,7 +255,7 @@ UM.Dialog
Layout.minimumWidth: UM.Theme.getSize("setting_control").width
selectByMouse: true
objectName: "Transmittance"
validator: RegExpValidator { regExp: /^[1-9]\d{0,2}([\,|\.]\d*)?$/ }
validator: RegularExpressionValidator { regularExpression: /^[1-9]\d{0,2}([\,|\.]\d*)?$/ }
onTextChanged: manager.onTransmittanceChanged(text)
UM.ToolTip

2
plugins/UM3NetworkPrinting/resources/qml/DiscoverUM3Action.qml
View file

@ -302,7 +302,7 @@ Cura.MachineAction
{
id: addressField
width: parent.width
validator: RegExpValidator { regExp: /[a-zA-Z0-9\.\-\_]*/ }
validator: RegularExpressionValidator { regularExpression: /[a-zA-Z0-9\.\-\_]*/ }
}
}

2
resources/qml/ColorDialog.qml
View file

@ -116,7 +116,7 @@ UM.Dialog
text = `#${text}`;
}
}
validator: RegExpValidator { regExp: /^#([a-fA-F0-9]{0,6})$/ }
validator: RegularExpressionValidator { regularExpression: /^#([a-fA-F0-9]{0,6})$/ }
}
Rectangle

4
resources/qml/JobSpecs.qml
View file

@ -97,8 +97,8 @@ Item
cursorPosition = 0
}
validator: RegExpValidator {
regExp: /^[^\\\/\*\?\|\[\]]*$/
validator: RegularExpressionValidator {
regularExpression: /^[^\\\/\*\?\|\[\]]*$/
}
color: UM.Theme.getColor("text_scene")
background: Item {}

4
resources/qml/MachineSettings/NumericTextFieldWithUnit.qml
View file

@ -172,9 +172,9 @@ UM.TooltipArea
return "^%0\\d{0,%1}[.,]?\\d{0,%2}$".arg(minus).arg(digits).arg(numericTextFieldWithUnit.decimals)
}
}
validator: RegExpValidator
validator: RegularExpressionValidator
{
regExp: new RegExp(textFieldWithUnit.validatorString)
regularExpression: new RegExp(textFieldWithUnit.validatorString)
}
//Enforce actual minimum and maximum values.

2
resources/qml/PrinterOutput/ExtruderBox.qml
View file

@ -206,7 +206,7 @@ Item
selectByMouse: true
maximumLength: 5
enabled: parent.enabled
validator: RegExpValidator { regExp: /^-?[0-9]{0,9}[.,]?[0-9]{0,10}$/ } //Floating point regex.
validator: RegularExpressionValidator { regularExpression: /^-?[0-9]{0,9}[.,]?[0-9]{0,10}$/ } //Floating point regex.
anchors.left: parent.left
anchors.leftMargin: UM.Theme.getSize("setting_unit_margin").width
anchors.right: unit.left

2
resources/qml/PrinterOutput/HeatedBedBox.qml
View file

@ -186,7 +186,7 @@ Item
selectByMouse: true
maximumLength: 5
enabled: parent.enabled
validator: RegExpValidator { regExp: /^-?[0-9]{0,9}[.,]?[0-9]{0,10}$/ } //Floating point regex.
validator: RegularExpressionValidator { regularExpression: /^-?[0-9]{0,9}[.,]?[0-9]{0,10}$/ } //Floating point regex.
anchors.left: parent.left
anchors.leftMargin: UM.Theme.getSize("setting_unit_margin").width
anchors.right: unit.left

6
resources/qml/Settings/SettingTextField.qml
View file

@ -1,8 +1,8 @@
// Copyright (c) 2021 Ultimaker B.V.
// Cura is released under the terms of the LGPLv3 or higher.
import QtQuick 2.7
import QtQuick.Controls 2.0
import QtQuick 2.14
import QtQuick.Controls 2.15
import UM 1.5 as UM
@ -154,7 +154,7 @@ SettingItem
// should be done as little as possible)
clip: definition.type == "str" || definition.type == "[int]"
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
validator: RegularExpressionValidator { regularExpression: (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
{

4
resources/qml/SpinBox.qml
View file

@ -28,9 +28,9 @@ Item
property bool editable: true
property var validator: RegExpValidator
property var validator: RegularExpressionValidator
{
regExp: new RegExp("^" + prefix + "([0-9]+[.|,]?[0-9]*)?" + suffix + "$")
regularExpression: new RegExp("^" + prefix + "([0-9]+[.|,]?[0-9]*)?" + suffix + "$")
}
signal editingFinished()

4
resources/qml/WelcomePages/AddLocalPrinterScrollView.qml
View file

@ -235,9 +235,9 @@ Item
placeholderText: catalog.i18nc("@text", "Please name your printer")
maximumLength: 40
width: parent.width - (printerNameLabel.width + (3 * UM.Theme.getSize("default_margin").width))
validator: RegExpValidator
validator: RegularExpressionValidator
{
regExp: printerNameTextField.machineNameValidator.machineNameRegex
regularExpression: printerNameTextField.machineNameValidator.machineNameRegex
}
property var machineNameValidator: Cura.MachineNameValidator { }
}

4
resources/qml/WelcomePages/AddPrinterByIpContent.qml
View file

@ -123,9 +123,9 @@ Item
onInvalidInputDetected: invalidInputLabel.visible = true
validator: RegExpValidator
validator: RegularExpressionValidator
{
regExp: /([a-fA-F0-9.:]+)?/
regularExpression: /([a-fA-F0-9.:]+)?/
}
onTextEdited: invalidInputLabel.visible = false