GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-13 22:35:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

Make sure that printer name is not empty

Browse Source 
CURA-6435
This commit is contained in:
Lipu Fei 2019-04-05 09:35:00 +02:00
parent b269dc95b0
commit b0fd6628a5
3 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
resources/qml/WelcomePages/AddLocalPrinterScrollView.qml
View File

@ -32,6 +32,7 @@ Item
// User-editable printer name // User-editable printer name
property alias printerName: printerNameTextField.text property alias printerName: printerNameTextField.text
property alias isPrinterNameValid: printerNameTextField.acceptableInput
onCurrentItemChanged: onCurrentItemChanged:
{ {
@ -211,6 +212,10 @@ Item
id: printerNameTextField id: printerNameTextField
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
width: (parent.width / 2) | 0 width: (parent.width / 2) | 0
placeholderText: catalog.i18nc("@text", "Please give your printer a name")
// Make sure that the fill is not empty
validator: RegExpValidator { regExp: /.+/ }
} }
} }
} }

5
resources/qml/WelcomePages/AddNetworkOrLocalPrinterContent.qml
View File

@ -118,7 +118,10 @@ Item
} }
else else
{ {
return addLocalPrinterDropDown.contentItem.currentItem != null // Printer name cannot be empty
const localPrinterItem = addLocalPrinterDropDown.contentItem.currentItem
const isPrinterNameValid = addLocalPrinterDropDown.contentItem.isPrinterNameValid
return localPrinterItem != null && isPrinterNameValid
} }
} }

17
resources/qml/Widgets/TextField.qml
View File

@ -37,11 +37,28 @@ TextField
{ {
return UM.Theme.getColor("setting_control_disabled_border") return UM.Theme.getColor("setting_control_disabled_border")
} }
if (!textField.acceptableInput)
{
return UM.Theme.getColor("setting_validation_error")
}
if (textField.hovered || textField.activeFocus) if (textField.hovered || textField.activeFocus)
{ {
return UM.Theme.getColor("setting_control_border_highlight") return UM.Theme.getColor("setting_control_border_highlight")
} }
return UM.Theme.getColor("setting_control_border") return UM.Theme.getColor("setting_control_border")
} }
color:
{
if (!textField.enabled)
{
return UM.Theme.getColor("setting_control_disabled")
}
if (!textField.acceptableInput)
{
return UM.Theme.getColor("setting_validation_error_background")
}
return UM.Theme.getColor("setting_control")
}
} }
} }