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

Fix some more bindings for SettingItem

Browse source
This commit is contained in:
Jaime van Kessel 2019-02-21 16:17:25 +01:00
parent 27370dd45d
commit 1b36a8e12c
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -32,7 +32,7 @@ Item
// Create properties to put property provider stuff in (bindings break in qt 5.5.1 otherwise) // Create properties to put property provider stuff in (bindings break in qt 5.5.1 otherwise)
property var state: propertyProvider.properties.state property var state: propertyProvider.properties.state
// There is no resolve property if there is only one stack. // There is no resolve property if there is only one stack.
property var resolve: Cura.MachineManager.activeStackId != Cura.MachineManager.activeMachineId ? propertyProvider.properties.resolve : "None" property var resolve: Cura.MachineManager.activeStackId !== Cura.MachineManager.activeMachineId ? propertyProvider.properties.resolve : "None"
property var stackLevels: propertyProvider.stackLevels property var stackLevels: propertyProvider.stackLevels
property var stackLevel: stackLevels[0] property var stackLevel: stackLevels[0]
@ -233,19 +233,19 @@ Item
} }
// There are no settings with any warning. // There are no settings with any warning.
if (Cura.SettingInheritanceManager.settingsWithInheritanceWarning.length == 0) if (Cura.SettingInheritanceManager.settingsWithInheritanceWarning.length === 0)
{ {
return false return false
} }
// This setting has a resolve value, so an inheritance warning doesn't do anything. // This setting has a resolve value, so an inheritance warning doesn't do anything.
if (resolve != "None") if (resolve !== "None")
{ {
return false return false
} }
// If the setting does not have a limit_to_extruder property (or is -1), use the active stack. // If the setting does not have a limit_to_extruder property (or is -1), use the active stack.
if (globalPropertyProvider.properties.limit_to_extruder == null || String(globalPropertyProvider.properties.limit_to_extruder) == "-1") if (globalPropertyProvider.properties.limit_to_extruder === null || String(globalPropertyProvider.properties.limit_to_extruder) === "-1")
{ {
return Cura.SettingInheritanceManager.settingsWithInheritanceWarning.indexOf(definition.key) >= 0 return Cura.SettingInheritanceManager.settingsWithInheritanceWarning.indexOf(definition.key) >= 0
} }