3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-17 03:37:48 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Rename expandAll to expandRecursive

Browse source 
Because it doesn't expand all settings, just a category.
This commit is contained in:
Ghostkeeper 2018-03-30 14:30:40 +02:00
parent 261945b469
commit 60a217fc84
No known key found for this signature in database
GPG key ID: 5252B696FB5E7C7A
2 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
plugins/PerObjectSettingsTool/PerObjectCategory.qml
View file

@ -58,5 +58,5 @@ Button {
checkable: true checkable: true
checked: definition.expanded checked: definition.expanded
onClicked: definition.expanded ? settingDefinitionsModel.collapse(definition.key) : settingDefinitionsModel.expandAll(definition.key) onClicked: definition.expanded ? settingDefinitionsModel.collapse(definition.key) : settingDefinitionsModel.expandRecursive(definition.key)
} }

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

@ -1,4 +1,4 @@
// Copyright (c) 2017 Ultimaker B.V. // Copyright (c) 2018 Ultimaker B.V.
// Cura is released under the terms of the LGPLv3 or higher. // Cura is released under the terms of the LGPLv3 or higher.
import QtQuick 2.7 import QtQuick 2.7
@ -63,8 +63,6 @@ Button
property var focusItem: base property var focusItem: base
//text: definition.label
contentItem: Item { contentItem: Item {
anchors.fill: parent anchors.fill: parent
anchors.left: parent.left anchors.left: parent.left
@ -160,7 +158,7 @@ Button
if (definition.expanded) { if (definition.expanded) {
settingDefinitionsModel.collapse(definition.key); settingDefinitionsModel.collapse(definition.key);
} else { } else {
settingDefinitionsModel.expandAll(definition.key); settingDefinitionsModel.expandRecursive(definition.key);
} }
//Set focus so that tab navigation continues from this point on. //Set focus so that tab navigation continues from this point on.
//NB: This must be set AFTER collapsing/expanding the category so that the scroll position is correct. //NB: This must be set AFTER collapsing/expanding the category so that the scroll position is correct.
@ -237,7 +235,7 @@ Button
onClicked: onClicked:
{ {
settingDefinitionsModel.expandAll(definition.key); settingDefinitionsModel.expandRecursive(definition.key);
base.checked = true; base.checked = true;
base.showAllHiddenInheritedSettings(definition.key); base.showAllHiddenInheritedSettings(definition.key);
} }