From c0dd19ce089b21881f299f0db8e8616776cf3ad4 Mon Sep 17 00:00:00 2001 From: Jack Ha Date: Thu, 4 Aug 2016 19:23:23 +0200 Subject: [PATCH] Seems to work, except for the tooltip (shows global value). CURA-2007 --- resources/qml/Settings/SettingItem.qml | 2 +- resources/qml/Settings/SettingTextField.qml | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/resources/qml/Settings/SettingItem.qml b/resources/qml/Settings/SettingItem.qml index 68cbea1b2a..6eb2c2da11 100644 --- a/resources/qml/Settings/SettingItem.qml +++ b/resources/qml/Settings/SettingItem.qml @@ -155,7 +155,7 @@ Item { onEntered: { hoverTimer.stop(); var tooltipText = catalog.i18nc("@label", "This setting is always shared between all extruders. Changing it here will change the value for all extruders") + "."; - if ((resolve != "None") && (globalValue == null)) { + if ((resolve != "None") && (stackLevel != 0)) { // We come here if a setting has a resolve and the setting is not manually edited. tooltipText += " " + catalog.i18nc("@label", "The value is resolved from the individual value ") + value + "."; } diff --git a/resources/qml/Settings/SettingTextField.qml b/resources/qml/Settings/SettingTextField.qml index 7ed7105354..629e942554 100644 --- a/resources/qml/Settings/SettingTextField.qml +++ b/resources/qml/Settings/SettingTextField.qml @@ -107,14 +107,11 @@ SettingItem target: input property: "text" value: { - if (propertyProvider.properties.resolve != "None") { + if ((propertyProvider.properties.resolve != "None") && (stackLevel != 0)) { // 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; + return propertyProvider.properties.resolve; } else { return propertyProvider.properties.value; }