3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-09 14:55:03 -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
{

2
resources/qml/Settings/SettingCategory.qml
View file

@ -19,7 +19,7 @@ Button
background: Rectangle
{
id: backgroundRectangle
implicitHeight: UM.Theme.getSize("section").height
height: UM.Theme.getSize("section").height
color:
{
if (base.color)

9
resources/qml/Settings/SettingView.qml
View file

@ -187,12 +187,6 @@ Item
menu: SettingVisibilityPresetsMenu
{
onShowAllSettings:
{
definitionsModel.setAllVisible(true)
filter.updateDefinitionModel()
}
onCollapseAllCategories:
{
settingsSearchTimer.stop()
@ -230,7 +224,6 @@ Item
ListView
{
id: contents
spacing: UM.Theme.getSize("default_lining").height
cacheBuffer: 1000000 // Set a large cache to effectively just cache every list item.
model: UM.SettingDefinitionsModel
@ -259,7 +252,7 @@ Item
id: delegate
width: scrollView.width
height: provider.properties.enabled === "True" ? UM.Theme.getSize("section").height : - contents.spacing
height: provider.properties.enabled === "True" ? UM.Theme.getSize("section").height + 2 * UM.Theme.getSize("default_lining").height : 0
Behavior on height { NumberAnimation { duration: 100 } }
opacity: provider.properties.enabled === "True" ? 1 : 0
Behavior on opacity { NumberAnimation { duration: 100 } }