Merge branch 'replace_controls_1_for_controls_2' into CURA-8685-replace_text_and_progress_bars

# Conflicts:
#	plugins/PerObjectSettingsTool/PerObjectItem.qml
#	plugins/PerObjectSettingsTool/SettingPickDialog.qml
This commit is contained in:
casper 2022-02-18 09:07:25 +01:00
commit 5a2e26eff6
376 changed files with 41670 additions and 33274 deletions

View file

@ -60,13 +60,14 @@ UM.Dialog
onTextChanged: settingPickDialog.updateFilter()
}
Cura.CheckBox
UM.CheckBox
{
id: toggleShowAll
anchors
{
top: parent.top
right: parent.right
verticalCenter: filterInput.verticalCenter
}
text: catalog.i18nc("@label:checkbox", "Show all")
}