|
@@ -384,7 +384,6 @@ Item {
|
|
|
title: catalog.i18nc("@title:window", "Select Settings to Customize for this model")
|
|
|
width: screenScaleFactor * 360
|
|
|
|
|
|
- property string labelFilter: ""
|
|
|
property var additional_excluded_settings
|
|
|
|
|
|
onVisibilityChanged:
|
|
@@ -395,11 +394,33 @@ Item {
|
|
|
// Set skip setting, it will prevent from resetting selected mesh_type
|
|
|
contents.model.visibilityHandler.addSkipResetSetting(meshTypeSelection.model.get(meshTypeSelection.currentIndex).type)
|
|
|
listview.model.forceUpdate()
|
|
|
+
|
|
|
+ updateFilter()
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ function updateFilter()
|
|
|
+ {
|
|
|
+ var new_filter = {};
|
|
|
+ if (printSequencePropertyProvider.properties.value == "one_at_a_time")
|
|
|
+ {
|
|
|
+ new_filter["settable_per_meshgroup"] = true;
|
|
|
}
|
|
|
+ else
|
|
|
+ {
|
|
|
+ new_filter["settable_per_mesh"] = true;
|
|
|
+ }
|
|
|
+
|
|
|
+ if(filterInput.text != "")
|
|
|
+ {
|
|
|
+ new_filter["i18n_label"] = "*" + filterInput.text;
|
|
|
+ }
|
|
|
+
|
|
|
+ listview.model.filter = new_filter;
|
|
|
}
|
|
|
|
|
|
TextField {
|
|
|
- id: filter
|
|
|
+ id: filterInput
|
|
|
|
|
|
anchors {
|
|
|
top: parent.top
|
|
@@ -410,17 +431,7 @@ Item {
|
|
|
|
|
|
placeholderText: catalog.i18nc("@label:textbox", "Filter...");
|
|
|
|
|
|
- onTextChanged:
|
|
|
- {
|
|
|
- if(text != "")
|
|
|
- {
|
|
|
- listview.model.filter = {"settable_per_mesh": true, "i18n_label": "*" + text}
|
|
|
- }
|
|
|
- else
|
|
|
- {
|
|
|
- listview.model.filter = {"settable_per_mesh": true}
|
|
|
- }
|
|
|
- }
|
|
|
+ onTextChanged: settingPickDialog.updateFilter()
|
|
|
}
|
|
|
|
|
|
CheckBox
|
|
@@ -446,7 +457,7 @@ Item {
|
|
|
|
|
|
anchors
|
|
|
{
|
|
|
- top: filter.bottom;
|
|
|
+ top: filterInput.bottom;
|
|
|
left: parent.left;
|
|
|
right: parent.right;
|
|
|
bottom: parent.bottom;
|
|
@@ -458,14 +469,6 @@ Item {
|
|
|
{
|
|
|
id: definitionsModel;
|
|
|
containerId: Cura.MachineManager.activeDefinitionId
|
|
|
- filter:
|
|
|
- {
|
|
|
- if (printSequencePropertyProvider.properties.value == "one_at_a_time")
|
|
|
- {
|
|
|
- return {"settable_per_meshgroup": true};
|
|
|
- }
|
|
|
- return {"settable_per_mesh": true};
|
|
|
- }
|
|
|
visibilityHandler: UM.SettingPreferenceVisibilityHandler {}
|
|
|
expanded: [ "*" ]
|
|
|
exclude:
|
|
@@ -497,6 +500,7 @@ Item {
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+ Component.onCompleted: settingPickDialog.updateFilter()
|
|
|
}
|
|
|
}
|
|
|
|