diff options
| author | Jaime van Kessel <nallath@gmail.com> | 2022-05-10 14:23:28 +0300 |
|---|---|---|
| committer | Jaime van Kessel <nallath@gmail.com> | 2022-05-10 14:23:28 +0300 |
| commit | 5c7423e007ffebddb43eda840cab8411a355f981 (patch) | |
| tree | 3b7620017dd2f05fb3f8e1134d45c4dc06ef8edd /resources/qml | |
| parent | 12901e351e66ce9c9bc692e8093585061c3886c0 (diff) | |
| parent | 4819b2484eaa82679fcd0b9048f968c1947bc018 (diff) | |
Merge branch '5.0' of github.com:Ultimaker/Cura
Diffstat (limited to 'resources/qml')
| -rw-r--r-- | resources/qml/Dialogs/WorkspaceSummaryDialog.qml | 11 | ||||
| -rw-r--r-- | resources/qml/MachineSettings/NumericTextFieldWithUnit.qml | 1 | ||||
| -rw-r--r-- | resources/qml/Preferences/Materials/MaterialsView.qml | 6 |
3 files changed, 15 insertions, 3 deletions
diff --git a/resources/qml/Dialogs/WorkspaceSummaryDialog.qml b/resources/qml/Dialogs/WorkspaceSummaryDialog.qml index 411dc44f83..ee189ab73c 100644 --- a/resources/qml/Dialogs/WorkspaceSummaryDialog.qml +++ b/resources/qml/Dialogs/WorkspaceSummaryDialog.qml @@ -20,11 +20,18 @@ UM.Dialog 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: { - if(visible) + if(visible && UM.Preferences.getValue("cura/asked_dialog_on_project_save")) { dontShowAgain = !UM.Preferences.getValue("cura/dialog_on_project_save") } diff --git a/resources/qml/MachineSettings/NumericTextFieldWithUnit.qml b/resources/qml/MachineSettings/NumericTextFieldWithUnit.qml index 3755f0ead1..2950714d6a 100644 --- a/resources/qml/MachineSettings/NumericTextFieldWithUnit.qml +++ b/resources/qml/MachineSettings/NumericTextFieldWithUnit.qml @@ -38,6 +38,7 @@ UM.TooltipArea property alias textField: textFieldWithUnit property alias valueText: textFieldWithUnit.text + property alias enabled: textFieldWithUnit.enabled property alias editingFinishedFunction: textFieldWithUnit.editingFinishedFunction property string tooltipText: propertyProvider.properties.description ? propertyProvider.properties.description : "" diff --git a/resources/qml/Preferences/Materials/MaterialsView.qml b/resources/qml/Preferences/Materials/MaterialsView.qml index a172949812..d37150075b 100644 --- a/resources/qml/Preferences/Materials/MaterialsView.qml +++ b/resources/qml/Preferences/Materials/MaterialsView.qml @@ -601,8 +601,12 @@ Item maximum: 99999 unitText: model.unit decimals: model.unit == "mm" ? 2 : 0 + enabled: base.editingEnabled - editingFinishedFunction: materialPropertyProvider.setPropertyValue("value", value) + editingFinishedFunction: function() + { + materialPropertyProvider.setPropertyValue("value", parseFloat(valueText.replace(",", "."))) + } } UM.ContainerPropertyProvider |