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

Merge branch 'master' of github.com:Ultimaker/Cura

Browse source
This commit is contained in:
Jaime van Kessel 2018-10-03 16:37:34 +02:00
commit 37eedb0256
3 changed files with 26 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

12
plugins/MachineSettingsAction/MachineSettingsAction.qml
View file

@ -435,6 +435,18 @@ Cura.MachineAction
property bool allowNegative: true property bool allowNegative: true
} }
Loader
{
id: extruderCoolingFanNumberField
sourceComponent: numericTextFieldWithUnit
property string settingKey: "machine_extruder_cooling_fan_number"
property string label: catalog.i18nc("@label", "Cooling Fan Number")
property string unit: catalog.i18nc("@label", "")
property bool isExtruderSetting: true
property bool forceUpdateOnChange: true
property bool allowNegative: false
}
Item { width: UM.Theme.getSize("default_margin").width; height: UM.Theme.getSize("default_margin").height } Item { width: UM.Theme.getSize("default_margin").width; height: UM.Theme.getSize("default_margin").height }
Row Row

2
plugins/Toolbox/resources/qml/ToolboxDetailPage.qml
View file

@ -126,7 +126,7 @@ Item
return "" return ""
} }
var date = new Date(details.last_updated) var date = new Date(details.last_updated)
return date.toLocaleDateString(UM.Preferences.getValue("general/language")) return date.toLocaleString(UM.Preferences.getValue("general/language"))
} }
font: UM.Theme.getFont("very_small") font: UM.Theme.getFont("very_small")
color: UM.Theme.getColor("text") color: UM.Theme.getColor("text")

12
resources/definitions/fdmextruder.def.json
View file

@ -178,6 +178,18 @@
"maximum_value": "machine_height", "maximum_value": "machine_height",
"settable_per_mesh": false, "settable_per_mesh": false,
"settable_per_extruder": true "settable_per_extruder": true
},
"machine_extruder_cooling_fan_number":
{
"label": "Extruder Print Cooling Fan",
"description": "The number of the print cooling fan associated with this extruder. Only change this from the default value of 0 when you have a different print cooling fan for each extruder.",
"type": "int",
"default_value": 0,
"minimum_value": "0",
"settable_per_mesh": false,
"settable_per_extruder": true,
"settable_per_meshgroup": false,
"setttable_globally": false
} }
} }
}, },