GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-07-26 10:14:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Seems to work, except for the tooltip (shows global value). CURA-2007

Browse Source
This commit is contained in:
Jack Ha 2016-08-04 19:23:23 +02:00
parent 30898f9642
commit c0dd19ce08
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resources/qml/Settings/SettingItem.qml
View File

@ -155,7 +155,7 @@ Item {
onEntered: { onEntered: {
hoverTimer.stop(); 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") + "."; 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. // 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 + "."; tooltipText += " " + catalog.i18nc("@label", "The value is resolved from the individual value ") + value + ".";
} }

7
resources/qml/Settings/SettingTextField.qml
View File

@ -107,14 +107,11 @@ SettingItem
target: input target: input
property: "text" property: "text"
value: { 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 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 // we have to choose between the resolved value (default) and the global value
// (if user has explicitly set this). // (if user has explicitly set this).
if (definition.key == "material_bed_temperature") { return propertyProvider.properties.resolve;
CuraApplication.log("## global value " + globalPropertyProvider.properties.value);
}
return (globalPropertyProvider.properties.value != null) ? globalPropertyProvider.properties.value : propertyProvider.properties.resolve;
} else { } else {
return propertyProvider.properties.value; return propertyProvider.properties.value;
} }