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

Merge branch '5.0' of github.com:Ultimaker/Cura

Browse Source
This commit is contained in:
Jaime van Kessel 2022-05-10 13:23:28 +02:00
commit 5c7423e007
3 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
resources/qml/Dialogs/WorkspaceSummaryDialog.qml
View File

@ -20,11 +20,18 @@ UM.Dialog
property bool dontShowAgain: true property bool dontShowAgain: true
onClosing: UM.Preferences.setValue("cura/dialog_on_project_save", !dontShowAgainCheckbox.checked) function storeDontShowAgain()
{
UM.Preferences.setValue("cura/dialog_on_project_save", !dontShowAgainCheckbox.checked)
UM.Preferences.setValue("asked_dialog_on_project_save", true)
}
onClosing: storeDontShowAgain()
onRejected: storeDontShowAgain()
onAccepted: storeDontShowAgain()
onVisibleChanged: onVisibleChanged:
{ {
if(visible) if(visible && UM.Preferences.getValue("cura/asked_dialog_on_project_save"))
{ {
dontShowAgain = !UM.Preferences.getValue("cura/dialog_on_project_save") dontShowAgain = !UM.Preferences.getValue("cura/dialog_on_project_save")
} }

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