Merge branch '5.5' into PPM-profile-updates-petg-abs

Ultimaker · Oct 6, 2023 · 1bdff0f · 1bdff0f
2 parents d66be6d + 8ea04f0
commit 1bdff0f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml
@@ -43,8 +43,10 @@ RecommendedSettingSection
 
             settingControl: Cura.SingleSettingComboBox
             {
+                id:support
                 width: parent.width
                 settingName: "support_structure"
+                propertyRemoveUnusedValue: false
             }
         },
         RecommendedSettingItem
@@ -60,6 +62,7 @@ RecommendedSettingSection
             settingControl: Cura.SingleSettingExtruderSelectorBar
             {
                 extruderSettingName: "support_extruder_nr"
+                onSelectedIndexChanged: support.forceUpdateSettings()
             }
         },
         RecommendedSettingItem

diff --git a/resources/qml/Widgets/SingleSettingComboBox.qml b/resources/qml/Widgets/SingleSettingComboBox.qml
@@ -15,6 +15,7 @@ import Cura 1.7 as Cura
 Cura.ComboBox {
     textRole: "text"
     property alias settingName: propertyProvider.key
+    property alias propertyRemoveUnusedValue: propertyProvider.removeUnusedValue
 
     // If true, all extruders will have "settingName" property updated.
     // The displayed value will be read from the extruder with index "defaultExtruderIndex" instead of the machine.
@@ -87,6 +88,10 @@ Cura.ComboBox {
         }
 
     }
+    function forceUpdateSettings()
+    {
+        comboboxModel.updateModel();
+    }
 
     function updateSetting(value)
     {