3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-09 23:05:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge remote-tracking branch 'origin/master' into CURA-6959_collapse_categories

Browse source 
# Conflicts:
#	resources/qml/Menus/SettingVisibilityPresetsMenu.qml
#	resources/qml/Settings/SettingView.qml
This commit is contained in:
Nino van Hooff 2020-01-02 15:32:26 +01:00
commit 8dbd67f5bd
16 changed files with 313 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

12
resources/qml/Menus/SettingVisibilityPresetsMenu.qml
View file

@ -14,7 +14,6 @@ Menu
property QtObject settingVisibilityPresetsModel: CuraApplication.getSettingVisibilityPresetsModel()
signal showAllSettings()
signal collapseAllCategories()
Instantiator
@ -37,17 +36,6 @@ Menu
onObjectRemoved: menu.removeItem(object)
}
MenuSeparator {}
MenuItem
{
text: catalog.i18nc("@action:inmenu", "Show All Settings")
checkable: false
exclusiveGroup: group
onTriggered:
{
showAllSettings();
}
}
MenuSeparator {}
MenuItem
{