From 4c9c2ad131dbd047a1c5c0b03a2ba4fd9aa67f4c Mon Sep 17 00:00:00 2001 From: "j.delarago" Date: Fri, 21 Jan 2022 18:16:16 +0100 Subject: [PATCH] "checkedState" is now "checkState" in newer CheckBox Remove partiallyCheckedEnabled since Cura.CheckBox manages this itself. --- resources/qml/Preferences/SettingVisibilityPage.qml | 7 +++---- resources/qml/Widgets/MenuItem.qml | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/resources/qml/Preferences/SettingVisibilityPage.qml b/resources/qml/Preferences/SettingVisibilityPage.qml index d2fd5c7e94..8618030bc7 100644 --- a/resources/qml/Preferences/SettingVisibilityPage.qml +++ b/resources/qml/Preferences/SettingVisibilityPage.qml @@ -36,7 +36,7 @@ UM.PreferencesPage id: base; anchors.fill: parent; - CheckBox + Cura.CheckBox { id: toggleVisibleSettings anchors @@ -46,7 +46,7 @@ UM.PreferencesPage leftMargin: UM.Theme.getSize("default_margin").width } text: catalog.i18nc("@label:textbox", "Check all") - checkedState: + checkState: { if(definitionsModel.visibleCount == definitionsModel.categoryCount) { @@ -61,14 +61,13 @@ UM.PreferencesPage return Qt.PartiallyChecked } } - partiallyCheckedEnabled: true MouseArea { anchors.fill: parent; onClicked: { - if(parent.checkedState == Qt.Unchecked || parent.checkedState == Qt.PartiallyChecked) + if(parent.checkState == Qt.Unchecked || parent.checkState == Qt.PartiallyChecked) { definitionsModel.setAllExpandedVisible(true) } diff --git a/resources/qml/Widgets/MenuItem.qml b/resources/qml/Widgets/MenuItem.qml index f0824b4d98..b937687086 100644 --- a/resources/qml/Widgets/MenuItem.qml +++ b/resources/qml/Widgets/MenuItem.qml @@ -37,7 +37,7 @@ MenuItem anchors.verticalCenter: parent.verticalCenter anchors.left: parent.left anchors.leftMargin: UM.Theme.getSize("default_margin").width - source: UM.Theme.getIcon("Check") + source: UM.Theme.getIcon("EmptyCheck", "low") color: UM.Theme.getColor("setting_control_text") }