mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-07-08 07:27:29 -06:00
Pressing inheritance button for category now makes all inherited children visible
CURA-2361
This commit is contained in:
parent
7793cb16d1
commit
132ed1d258
4 changed files with 23 additions and 5 deletions
|
@ -22,6 +22,18 @@ class SettingInheritanceManager(QObject):
|
||||||
def test(self):
|
def test(self):
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
## Get the keys of all children settings with an override.
|
||||||
|
@pyqtSlot(str, result = "QStringList")
|
||||||
|
def getChildrenKeysWithOverride(self, key):
|
||||||
|
definitions = self._global_container_stack.getBottom().findDefinitions(key=key)
|
||||||
|
if not definitions:
|
||||||
|
return
|
||||||
|
result = []
|
||||||
|
for key in definitions[0].getAllKeys():
|
||||||
|
if key in self._settings_with_inheritance_warning:
|
||||||
|
result.append(key)
|
||||||
|
return result
|
||||||
|
|
||||||
def _onActiveExtruderChanged(self):
|
def _onActiveExtruderChanged(self):
|
||||||
if self._active_container_stack:
|
if self._active_container_stack:
|
||||||
self._active_container_stack.propertyChanged.disconnect(self._onPropertyChanged)
|
self._active_container_stack.propertyChanged.disconnect(self._onPropertyChanged)
|
||||||
|
|
|
@ -17,13 +17,11 @@ Button {
|
||||||
signal showTooltip(string text);
|
signal showTooltip(string text);
|
||||||
signal hideTooltip();
|
signal hideTooltip();
|
||||||
signal contextMenuRequested()
|
signal contextMenuRequested()
|
||||||
signal showAllHiddenInheritedSettings()
|
signal showAllHiddenInheritedSettings(string category_id)
|
||||||
|
|
||||||
text: definition.label
|
text: definition.label
|
||||||
iconSource: UM.Theme.getIcon(definition.icon)
|
iconSource: UM.Theme.getIcon(definition.icon)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
checkable: true
|
checkable: true
|
||||||
checked: definition.expanded
|
checked: definition.expanded
|
||||||
|
|
||||||
|
@ -69,7 +67,7 @@ Button {
|
||||||
|
|
||||||
onClicked:
|
onClicked:
|
||||||
{
|
{
|
||||||
base.showAllHiddenInheritedSettings()
|
base.showAllHiddenInheritedSettings(definition.key)
|
||||||
}
|
}
|
||||||
|
|
||||||
color: UM.Theme.getColor("setting_control_button")
|
color: UM.Theme.getColor("setting_control_button")
|
||||||
|
|
|
@ -34,7 +34,7 @@ Item {
|
||||||
signal contextMenuRequested()
|
signal contextMenuRequested()
|
||||||
signal showTooltip(string text);
|
signal showTooltip(string text);
|
||||||
signal hideTooltip();
|
signal hideTooltip();
|
||||||
|
signal showAllHiddenInheritedSettings(string category_id)
|
||||||
property string tooltipText:
|
property string tooltipText:
|
||||||
{
|
{
|
||||||
var affects = settingDefinitionsModel.getRequiredBy(definition.key, "value")
|
var affects = settingDefinitionsModel.getRequiredBy(definition.key, "value")
|
||||||
|
|
|
@ -149,6 +149,14 @@ ScrollView
|
||||||
}
|
}
|
||||||
onShowTooltip: base.showTooltip(delegate, { x: 0, y: delegate.height / 2 }, text)
|
onShowTooltip: base.showTooltip(delegate, { x: 0, y: delegate.height / 2 }, text)
|
||||||
onHideTooltip: base.hideTooltip()
|
onHideTooltip: base.hideTooltip()
|
||||||
|
onShowAllHiddenInheritedSettings:
|
||||||
|
{
|
||||||
|
var test = Cura.SettingInheritanceManager.getChildrenKeysWithOverride(category_id)
|
||||||
|
for(var i = 0; i < test.length; i++)
|
||||||
|
{
|
||||||
|
definitionsModel.setVisible(test[i], true)
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue