diff options
Diffstat (limited to 'resources/qml/Settings/SettingView.qml')
| -rw-r--r-- | resources/qml/Settings/SettingView.qml | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/resources/qml/Settings/SettingView.qml b/resources/qml/Settings/SettingView.qml index 4557bd2019..02e20a5a5b 100644 --- a/resources/qml/Settings/SettingView.qml +++ b/resources/qml/Settings/SettingView.qml @@ -85,7 +85,7 @@ Item onEditingFinished: { - definitionsModel.filter = {"i18n_label": "*" + text} + definitionsModel.filter = {"i18n_label|i18n_description" : "*" + text} findingSettings = (text.length > 0) if (findingSettings != lastFindingSettings) { @@ -246,25 +246,18 @@ Item } property int indexWithFocus: -1 + property double delegateHeight: UM.Theme.getSize("section").height + 2 * UM.Theme.getSize("default_lining").height property string activeMachineId: Cura.MachineManager.activeMachine !== null ? Cura.MachineManager.activeMachine.id : "" delegate: Loader { id: delegate width: scrollView.width - height: provider.properties.enabled === "True" ? UM.Theme.getSize("section").height + 2 * UM.Theme.getSize("default_lining").height : 0 + height: enabled ? contents.delegateHeight: 0 Behavior on height { NumberAnimation { duration: 100 } } - opacity: provider.properties.enabled === "True" ? 1 : 0 + opacity: enabled ? 1 : 0 Behavior on opacity { NumberAnimation { duration: 100 } } - enabled: - { - if (!Cura.ExtruderManager.activeExtruderStackId && machineExtruderCount.properties.value > 1) - { - // disable all controls on the global tab, except categories - return model.type === "category" - } - return provider.properties.enabled === "True" - } + enabled: provider.properties.enabled === "True" property var definition: model property var settingDefinitionsModel: definitionsModel @@ -355,7 +348,7 @@ Item id: provider containerStackId: contents.activeMachineId - key: model.key ? model.key : "" + key: model.key watchedProperties: [ "value", "enabled", "state", "validationState", "settable_per_extruder", "resolve" ] storeIndex: 0 removeUnusedValue: model.resolve === undefined |