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

SettingInheritance manager now has a complete list of all settings that have inheritance overridden

Browse source 
CURA-2361
This commit is contained in:
Jaime van Kessel 2016-09-16 11:18:20 +02:00
parent 50f7c41ae4
commit 5d84490d70
3 changed files with 74 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

1
resources/qml/Cura.qml
View file

@ -22,7 +22,6 @@ UM.MainWindow
Component.onCompleted:
{
Printer.setMinimumWindowSize(UM.Theme.getSize("window_minimum_size"))
// Workaround silly issues with QML Action's shortcut property.
//
// Currently, there is no way to define shortcuts as "Application Shortcut".

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

@ -28,7 +28,6 @@ Button {
checked: definition.expanded
onClicked: { forceActiveFocus(); definition.expanded ? settingDefinitionsModel.collapse(definition.key) : settingDefinitionsModel.expandAll(definition.key) }
Component.onCompleted: print(definition.label, propertyProvider.isValueUsed)
UM.SimpleButton
{
id: settingsButton
@ -60,7 +59,11 @@ Button {
anchors.right: parent.right
anchors.rightMargin: UM.Theme.getSize("setting_preferences_button_margin").width
visible: true //false //hiddenValuesCount > 0
visible:
{
return Cura.SettingInheritanceManager.settingsWithInheritanceWarning.indexOf(definition.key) >= 0;
}
height: parent.height / 2
width: height