removing update existing/ create new in case of UCP

also, making sure post processing scripts are not loaded.

CURA-11403
This commit is contained in:
Saumya Jain 2024-03-05 16:37:17 +01:00
parent b119a010ca
commit 8ef7b65710
3 changed files with 47 additions and 36 deletions

View file

@ -253,7 +253,7 @@ UM.Dialog
id: qualityChangesResolveComboBox
model: resolveStrategiesModel
textRole: "label"
visible: manager.qualityChangesConflict
visible: manager.qualityChangesConflict && !manager.isUcp
contentLeftPadding: UM.Theme.getSize("default_margin").width + UM.Theme.getSize("narrow_margin").width
textFont: UM.Theme.getFont("medium")
@ -307,7 +307,7 @@ UM.Dialog
id: materialResolveComboBox
model: resolveStrategiesModel
textRole: "label"
visible: manager.materialConflict
visible: manager.materialConflict && !manager.isUcp
contentLeftPadding: UM.Theme.getSize("default_margin").width + UM.Theme.getSize("narrow_margin").width
textFont: UM.Theme.getFont("medium")