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

Merge branch 'fix_material_print_settings' of https://github.com/fieldOfView/Cura into 5.0

Browse Source
This commit is contained in:
Jaime van Kessel 2022-05-10 13:11:05 +02:00
commit 4819b2484e
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
resources/qml/MachineSettings/NumericTextFieldWithUnit.qml
View File

@ -38,6 +38,7 @@ UM.TooltipArea
property alias textField: textFieldWithUnit property alias textField: textFieldWithUnit
property alias valueText: textFieldWithUnit.text property alias valueText: textFieldWithUnit.text
property alias enabled: textFieldWithUnit.enabled
property alias editingFinishedFunction: textFieldWithUnit.editingFinishedFunction property alias editingFinishedFunction: textFieldWithUnit.editingFinishedFunction
property string tooltipText: propertyProvider.properties.description ? propertyProvider.properties.description : "" property string tooltipText: propertyProvider.properties.description ? propertyProvider.properties.description : ""

6
resources/qml/Preferences/Materials/MaterialsView.qml
View File

@ -601,8 +601,12 @@ Item
maximum: 99999 maximum: 99999
unitText: model.unit unitText: model.unit
decimals: model.unit == "mm" ? 2 : 0 decimals: model.unit == "mm" ? 2 : 0
enabled: base.editingEnabled
editingFinishedFunction: materialPropertyProvider.setPropertyValue("value", value) editingFinishedFunction: function()
{
materialPropertyProvider.setPropertyValue("value", parseFloat(valueText.replace(",", ".")))
}
} }
UM.ContainerPropertyProvider UM.ContainerPropertyProvider