3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-12 17:27:51 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Resolve formula in Keep or Discard dialog

Browse source 
CURA-10111
This commit is contained in:
c.lamboo 2023-01-04 13:17:48 +01:00
parent 5c65ba5058
commit 16c64014b2
2 changed files with 23 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

14
cura/Machines/Models/UserChangesModel.py
View file

@ -118,12 +118,14 @@ class UserChangesModel(ListModel):
if original_value is not None: if original_value is not None:
break break
item_to_add = {"key": setting_key, item_to_add = {
"label": label, "key": setting_key,
"user_value": str(user_changes.getProperty(setting_key, "value")), "label": label,
"original_value": str(original_value), "user_value": str(user_changes.getProperty(setting_key, "value", default_value_resolve_context)),
"extruder": "", "original_value": str(original_value),
"category": category_label} "extruder": "",
"category": category_label,
}
if stack != global_stack: if stack != global_stack:
item_to_add["extruder"] = stack.getName() item_to_add["extruder"] = stack.getName()

28
resources/qml/Dialogs/DiscardOrKeepProfileChangesDialog.qml
View file

@ -107,7 +107,7 @@ UM.Dialog
[ [
Cura.ComboBox Cura.ComboBox
{ {
visible: buttonState == DiscardOrKeepProfileChangesDialog.ButtonsType.DiscardOrKeep visible: buttonState === DiscardOrKeepProfileChangesDialog.ButtonsType.DiscardOrKeep
implicitHeight: UM.Theme.getSize("combobox").height implicitHeight: UM.Theme.getSize("combobox").height
implicitWidth: UM.Theme.getSize("combobox").width implicitWidth: UM.Theme.getSize("combobox").width
@ -128,20 +128,22 @@ UM.Dialog
onActivated: onActivated:
{ {
var code = model.get(index).code; const code = model.get(index).code;
UM.Preferences.setValue("cura/choice_on_profile_override", code); UM.Preferences.setValue("cura/choice_on_profile_override", code);
if (code == "always_keep") { switch (code) {
keepButton.enabled = true; case "always_keep":
discardButton.enabled = false; keepButton.enabled = true;
} discardButton.enabled = false;
else if (code == "always_discard") { break;
keepButton.enabled = false; case "always_discard":
discardButton.enabled = true; keepButton.enabled = false;
} discardButton.enabled = true;
else { break;
keepButton.enabled = true; default:
discardButton.enabled = true; keepButton.enabled = true;
discardButton.enabled = true;
break;
} }
} }
} }