From 8aa08944f23682e8bec9dc74e534e51d3f9441f1 Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Fri, 6 May 2022 13:11:49 +0200 Subject: Disable "Print Settings" fields for read-only materials --- resources/qml/MachineSettings/NumericTextFieldWithUnit.qml | 1 + resources/qml/Preferences/Materials/MaterialsView.qml | 1 + 2 files changed, 2 insertions(+) (limited to 'resources/qml') diff --git a/resources/qml/MachineSettings/NumericTextFieldWithUnit.qml b/resources/qml/MachineSettings/NumericTextFieldWithUnit.qml index b5147d63db..75fe56c8e7 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..16a2b1b7de 100644 --- a/resources/qml/Preferences/Materials/MaterialsView.qml +++ b/resources/qml/Preferences/Materials/MaterialsView.qml @@ -601,6 +601,7 @@ Item maximum: 99999 unitText: model.unit decimals: model.unit == "mm" ? 2 : 0 + enabled: base.editingEnabled editingFinishedFunction: materialPropertyProvider.setPropertyValue("value", value) } -- cgit v1.2.3 From 81c6ade4450eb4eb7ea49c932b14573b3dfb927e Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Fri, 6 May 2022 13:25:48 +0200 Subject: Fix setting values --- resources/qml/Preferences/Materials/MaterialsView.qml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'resources/qml') diff --git a/resources/qml/Preferences/Materials/MaterialsView.qml b/resources/qml/Preferences/Materials/MaterialsView.qml index 16a2b1b7de..d37150075b 100644 --- a/resources/qml/Preferences/Materials/MaterialsView.qml +++ b/resources/qml/Preferences/Materials/MaterialsView.qml @@ -603,7 +603,10 @@ Item decimals: model.unit == "mm" ? 2 : 0 enabled: base.editingEnabled - editingFinishedFunction: materialPropertyProvider.setPropertyValue("value", value) + editingFinishedFunction: function() + { + materialPropertyProvider.setPropertyValue("value", parseFloat(valueText.replace(",", "."))) + } } UM.ContainerPropertyProvider -- cgit v1.2.3 From 44a616addd52ab077537c4dd3f35eea0eb82ceeb Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Tue, 10 May 2022 10:26:39 +0200 Subject: Fix storing the "dont show this again" of the project saving --- resources/qml/Dialogs/WorkspaceSummaryDialog.qml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'resources/qml') 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") } -- cgit v1.2.3