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

Bed temperature is now either a resolved value or a global value.

Browse source 
Contributes to CURA-2007
This commit is contained in:
Jack Ha 2016-08-04 14:30:48 +02:00
parent aba027373b
commit 2402ba3d0e
6 changed files with 34 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -57,6 +57,7 @@ ScrollView
property var definition: model
property var settingDefinitionsModel: definitionsModel
property var propertyProvider: provider
property var globalPropertyProvider: inheritStackProvider
//Qt5.4.2 and earlier has a bug where this causes a crash: https://bugreports.qt.io/browse/QTBUG-35989
//In addition, while it works for 5.5 and higher, the ordering of the actual combo box drop down changes,
@ -118,7 +119,7 @@ ScrollView
id: inheritStackProvider
containerStackId: Cura.MachineManager.activeMachineId
key: model.key
watchedProperties: [ "global_inherits_stack"]
watchedProperties: [ "global_inherits_stack", "value" ]
}
UM.SettingPropertyProvider
@ -127,7 +128,7 @@ ScrollView
containerStackId: Cura.MachineManager.activeMachineId
key: model.key ? model.key : ""
watchedProperties: [ "value", "enabled", "state", "validationState", "settable_per_extruder" ]
watchedProperties: [ "value", "enabled", "state", "validationState", "settable_per_extruder", "resolve" ]
storeIndex: 0
}