Merge branch 'replace_controls_1_for_controls_2' into CURA-8685-replace_text_and_progress_bars

# Conflicts:
#	plugins/PerObjectSettingsTool/PerObjectItem.qml
#	plugins/PerObjectSettingsTool/SettingPickDialog.qml
This commit is contained in:
casper 2022-02-18 09:07:25 +01:00
commit 5a2e26eff6
376 changed files with 41670 additions and 33274 deletions

View file

@ -303,22 +303,19 @@ Cura.MachineAction
id: addressField
width: parent.width
validator: RegExpValidator { regExp: /[a-zA-Z0-9\.\-\_]*/ }
onAccepted: btnOk.clicked()
}
}
onRejected:
{
manualPrinterDialog.reject()
manualPrinterDialog.hide()
}
onAccepted:
{
// Validate the input first
if (!networkingUtil.isValidIP(manualPrinterDialog.addressText))
{
invalidIPAddressMessageDialog.open()
return
// prefent closing of element, as we want to keep the dialog active after a wrongly entered IP adress
manualPrinterDialog.open()
// show invalid ip warning
invalidIPAddressMessageDialog.open();
return;
}
// if the entered IP address has already been discovered, switch the current item to that item
@ -328,14 +325,12 @@ Cura.MachineAction
var device = manager.foundDevices[i]
if (device.address == manualPrinterDialog.addressText)
{
currentItemIndex = i
manualPrinterDialog.hide()
return
currentItemIndex = i;
return;
}
}
manager.setManualDevice(manualPrinterDialog.printerKey, manualPrinterDialog.addressText)
manualPrinterDialog.hide()
manager.setManualDevice(manualPrinterDialog.printerKey, manualPrinterDialog.addressText);
}
}
}