Browse Source

Move Validators to UM, so they can be used in UM components.

Update all TextFieldWithUnit to use our FloatValidator. This component now has proper styling when the input is invalid. The DoubleValidator was flagging numbers with a "." in them as an incorrect input (I assume this is because the region was set to europe on the OS where "," is common). The workaround is to use our FloatValidator which validates both "." and ","

CURA-9793
Joey de l'Arago 2 years ago
parent
commit
f601229390

+ 4 - 4
resources/qml/ColorDialog.qml

@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Ultimaker B.V.
+// Copyright (c) 2022 UltiMaker
 // Cura is released under the terms of the LGPLv3 or higher.
 
 import QtQuick 2.15
@@ -6,8 +6,8 @@ import QtQuick.Controls 2.2
 import QtQuick.Window 2.1
 import QtQuick.Layouts 1.1
 
-import UM 1.5 as UM
-import Cura 1.1 as Cura
+import UM 1.7 as UM
+import Cura 1.7 as Cura
 
 
 /*
@@ -119,7 +119,7 @@ UM.Dialog
                         text = `#${text}`;
                     }
                 }
-                validator: Cura.HexColorValidator {}
+                validator: UM.HexColorValidator {}
             }
 
             Rectangle

+ 2 - 2
resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml

@@ -81,7 +81,7 @@ RecommendedSettingSection
                         width: parent.width
                         settingName: "wall_thickness"
                         updateAllExtruders: true
-                        validator: Cura.FloatValidator {}
+                        validator: UM.FloatValidator {}
                         unitText: catalog.i18nc("@label", "mm")
                     }
                 }
@@ -94,7 +94,7 @@ RecommendedSettingSection
                         width: parent.width
                         settingName: "top_bottom_thickness"
                         updateAllExtruders: true
-                        validator: Cura.FloatValidator {}
+                        validator: UM.FloatValidator {}
                         unitText: catalog.i18nc("@label", "mm")
                     }
                 }

+ 0 - 12
resources/qml/Validators/FloatValidator.qml

@@ -1,12 +0,0 @@
-// Copyright (c) 2022 UltiMaker
-// Cura is released under the terms of the LGPLv3 or higher.
-
-import QtQuick 2.15
-
-RegularExpressionValidator
-{
-    property int maxBeforeDecimal: 11
-    property int maxAfterDecimal: 3
-
-    regularExpression: new RegExp("^-?[0-9]{0,%0}[.,]?[0-9]{0,%1}$".arg(maxBeforeDecimal).arg(maxAfterDecimal))
-}

+ 0 - 9
resources/qml/Validators/HexColorValidator.qml

@@ -1,9 +0,0 @@
-// Copyright (c) 2022 UltiMaker
-// Cura is released under the terms of the LGPLv3 or higher.
-
-import QtQuick 2.15
-
-RegularExpressionValidator
-{
-    regularExpression: /^#([a-fA-F0-9]{0,6})$/
-}

+ 0 - 9
resources/qml/Validators/IntListValidator.qml

@@ -1,9 +0,0 @@
-// Copyright (c) 2022 UltiMaker
-// Cura is released under the terms of the LGPLv3 or higher.
-
-import QtQuick 2.15
-
-RegularExpressionValidator
-{
-    regularExpression: new RegExp("^\[?(\s*-?[0-9]{0,11}\s*,)*(\s*-?[0-9]{0,11})\s*\]?$")
-}

+ 0 - 11
resources/qml/Validators/IntValidator.qml

@@ -1,11 +0,0 @@
-// Copyright (c) 2022 UltiMaker B.V.
-// Cura is released under the terms of the LGPLv3 or higher.
-
-import QtQuick 2.15
-
-RegularExpressionValidator
-{
-    property int maxNumbers: 12
-
-    regularExpression: new RegExp("^-?[0-9]{0,%0}$".arg(maxNumbers))
-}

+ 0 - 6
resources/qml/qmldir

@@ -19,12 +19,6 @@ SettingView 1.0 SettingView.qml
 ProfileMenu 1.0 ProfileMenu.qml
 PrintSelectorCard 1.0 PrintSelectorCard.qml
 
-# Cura/Validators
-FloatValidator              1.7 FloatValidator.qml
-IntValidator                1.7 IntValidator
-IntListValidator            1.7 IntListValidator
-HexColorValidator           1.7 HexColorValidator.qml
-
 # Cura/WelcomePages
 
 WizardPanel         1.0 WizardPanel.qml