GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-12 16:28:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup. CURA-2007

Browse Source
This commit is contained in:
Jack Ha 2016-08-23 13:18:20 +02:00
parent 090b8d4f50
commit 0268bf3f56
2 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,8 +27,6 @@ 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
property var value: propertyProvider.properties.value
property var globalValue: globalPropertyProvider.properties.value
property var resolve: propertyProvider.properties.resolve property var resolve: propertyProvider.properties.resolve
property var stackLevels: propertyProvider.stackLevels property var stackLevels: propertyProvider.stackLevels
property var stackLevel: stackLevels[0] property var stackLevel: stackLevels[0]
@ -157,8 +155,6 @@ Item {
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") && (stackLevel != 0)) { 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.
// Individual value does not work yet.
tooltipText += " " + catalog.i18nc("@label", "The value is resolved from per-extruder values ") + "[" + ExtruderManager.getInstanceExtruderValues(definition.key) + "]."; tooltipText += " " + catalog.i18nc("@label", "The value is resolved from per-extruder values ") + "[" + ExtruderManager.getInstanceExtruderValues(definition.key) + "].";
} }
base.showTooltip(tooltipText); base.showTooltip(tooltipText);

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

@ -107,9 +107,6 @@ SettingItem
target: input target: input
property: "text" property: "text"
value: { value: {
if (definition.key === "material_bed_temperature") {
CuraApplication.log("## " + propertyProvider.properties.resolve + " " + stackLevel);
}
if ((propertyProvider.properties.resolve != "None") && (stackLevel != 0)) { 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