3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-12-11 16:00:47 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge, fix qml files. Contributes to CURA-2007.

Browse source 
Merge branch 'feature_quality_changes' into cura-2007

Conflicts:
	resources/qml/Settings/SettingItem.qml
	resources/qml/Settings/SettingView.qml
This commit is contained in:
Jack Ha 2016-08-04 18:22:36 +02:00
commit bfabf8d11a
10 changed files with 207 additions and 184 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -27,7 +27,6 @@ Item {
// Create properties to put property provider stuff in (bindings break in qt 5.5.1 otherwise)
property var state: propertyProvider.properties.state
property var settablePerExtruder: propertyProvider.properties.settable_per_extruder
property var value: propertyProvider.properties.value
property var globalValue: globalPropertyProvider.properties.value
property var resolve: propertyProvider.properties.resolve
@ -141,7 +140,7 @@ Item {
{
id: linkedSettingIcon;
visible: Cura.MachineManager.activeStackId != Cura.MachineManager.activeMachineId && base.settablePerExtruder != "True" && base.showLinkedSettingIcon
visible: Cura.MachineManager.activeStackId != Cura.MachineManager.activeMachineId && !definition.settable_per_extruder && base.showLinkedSettingIcon
height: parent.height;
width: height;

3
resources/qml/Settings/SettingTextField.qml
View file

@ -111,6 +111,9 @@ SettingItem
// We have a resolve function. Indicates that the setting is not settable per extruder and that
// we have to choose between the resolved value (default) and the global value
// (if user has explicitly set this).
if (definition.key == "material_bed_temperature") {
CuraApplication.log("## global value " + globalPropertyProvider.properties.value);
}
return (globalPropertyProvider.properties.value != null) ? globalPropertyProvider.properties.value : propertyProvider.properties.resolve;
} else {
return propertyProvider.properties.value;

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

@ -95,6 +95,7 @@ ScrollView
{
target: provider
property: "containerStackId"
when: model.settable_per_extruder || (inheritStackProvider.properties.global_inherits_stack != -1 && inheritStackProvider.properties.global_inherits_stack != null)
value:
{
if(inheritStackProvider.properties.global_inherits_stack == -1 || inheritStackProvider.properties.global_inherits_stack == null)