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

Add GCode Flavor switch

Browse Source
This commit is contained in:
fieldOfView 2016-08-03 20:50:47 +02:00
parent 6a8aa15678
commit 6f9a8ea691
1 changed files with 49 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
MachineSettingsAction.qml
View File

@ -71,7 +71,7 @@ Cura.MachineAction
Label Label
{ {
text: catalog.i18nc("@label","X (Width)") text: catalog.i18nc("@label", "X (Width)")
} }
TextField TextField
{ {
@ -82,12 +82,12 @@ Cura.MachineAction
} }
Label Label
{ {
text: catalog.i18nc("@label","mm") text: catalog.i18nc("@label", "mm")
} }
Label Label
{ {
text: catalog.i18nc("@label","Y (Depth)") text: catalog.i18nc("@label", "Y (Depth)")
} }
TextField TextField
{ {
@ -98,12 +98,12 @@ Cura.MachineAction
} }
Label Label
{ {
text: catalog.i18nc("@label","mm") text: catalog.i18nc("@label", "mm")
} }
Label Label
{ {
text: catalog.i18nc("@label","Z (Height)") text: catalog.i18nc("@label", "Z (Height)")
} }
TextField TextField
{ {
@ -114,7 +114,7 @@ Cura.MachineAction
} }
Label Label
{ {
text: catalog.i18nc("@label","mm") text: catalog.i18nc("@label", "mm")
} }
} }
@ -123,18 +123,35 @@ Cura.MachineAction
CheckBox CheckBox
{ {
id: heatedBedCheckBox id: heatedBedCheckBox
text: catalog.i18nc("@option:check","Heated Bed") text: catalog.i18nc("@option:check", "Heated Bed")
checked: String(machineHeatedBedProvider.properties.value).toLowerCase() != 'false' checked: String(machineHeatedBedProvider.properties.value).toLowerCase() != 'false'
onClicked: machineHeatedBedProvider.setPropertyValue("value", checked) onClicked: machineHeatedBedProvider.setPropertyValue("value", checked)
} }
CheckBox CheckBox
{ {
id: centerIsZeroCheckBox id: centerIsZeroCheckBox
text: catalog.i18nc("@option:check","Machine Center is Zero") text: catalog.i18nc("@option:check", "Machine Center is Zero")
checked: String(machineCenterIsZeroProvider.properties.value).toLowerCase() != 'false' checked: String(machineCenterIsZeroProvider.properties.value).toLowerCase() != 'false'
onClicked: machineCenterIsZeroProvider.setPropertyValue("value", checked) onClicked: machineCenterIsZeroProvider.setPropertyValue("value", checked)
} }
} }
Row
{
spacing: UM.Theme.getSize("default_margin").width
Label
{
text: catalog.i18nc("@label", "GCode Flavor")
}
ComboBox
{
model: ["RepRap (Marlin/Sprinter)", "UltiGCode"]
currentIndex: machineGCodeFlavorProvider.properties.value != model[1] ? 0 : 1
onActivated: machineGCodeFlavorProvider.setPropertyValue("value", model[index])
}
}
} }
Column Column
@ -155,7 +172,7 @@ Cura.MachineAction
Label Label
{ {
text: catalog.i18nc("@label","X min") text: catalog.i18nc("@label", "X min")
} }
TextField TextField
{ {
@ -166,12 +183,12 @@ Cura.MachineAction
} }
Label Label
{ {
text: catalog.i18nc("@label","mm") text: catalog.i18nc("@label", "mm")
} }
Label Label
{ {
text: catalog.i18nc("@label","Y min") text: catalog.i18nc("@label", "Y min")
} }
TextField TextField
{ {
@ -182,12 +199,12 @@ Cura.MachineAction
} }
Label Label
{ {
text: catalog.i18nc("@label","mm") text: catalog.i18nc("@label", "mm")
} }
Label Label
{ {
text: catalog.i18nc("@label","X max") text: catalog.i18nc("@label", "X max")
} }
TextField TextField
{ {
@ -198,12 +215,12 @@ Cura.MachineAction
} }
Label Label
{ {
text: catalog.i18nc("@label","mm") text: catalog.i18nc("@label", "mm")
} }
Label Label
{ {
text: catalog.i18nc("@label","Y max") text: catalog.i18nc("@label", "Y max")
} }
TextField TextField
{ {
@ -214,7 +231,7 @@ Cura.MachineAction
} }
Label Label
{ {
text: catalog.i18nc("@label","mm") text: catalog.i18nc("@label", "mm")
} }
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 }
@ -223,7 +240,7 @@ Cura.MachineAction
Label Label
{ {
text: catalog.i18nc("@label","Gantry height") text: catalog.i18nc("@label", "Gantry height")
} }
TextField TextField
{ {
@ -234,7 +251,7 @@ Cura.MachineAction
} }
Label Label
{ {
text: catalog.i18nc("@label","mm") text: catalog.i18nc("@label", "mm")
} }
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 }
@ -243,7 +260,7 @@ Cura.MachineAction
Label Label
{ {
text: catalog.i18nc("@label","Nozzle size") text: catalog.i18nc("@label", "Nozzle size")
} }
TextField TextField
{ {
@ -254,7 +271,7 @@ Cura.MachineAction
} }
Label Label
{ {
text: catalog.i18nc("@label","mm") text: catalog.i18nc("@label", "mm")
} }
} }
} }
@ -272,7 +289,7 @@ Cura.MachineAction
width: parent.width / 2 width: parent.width / 2
Label Label
{ {
text: catalog.i18nc("@label","Start Gcode") text: catalog.i18nc("@label", "Start Gcode")
} }
TextArea TextArea
{ {
@ -294,7 +311,7 @@ Cura.MachineAction
width: parent.width / 2 width: parent.width / 2
Label Label
{ {
text: catalog.i18nc("@label","End Gcode") text: catalog.i18nc("@label", "End Gcode")
} }
TextArea TextArea
{ {
@ -390,6 +407,16 @@ Cura.MachineAction
storeIndex: 3 storeIndex: 3
} }
UM.SettingPropertyProvider
{
id: machineGCodeFlavorProvider
containerStackId: Cura.MachineManager.activeMachineId
key: "machine_gcode_flavor"
watchedProperties: [ "value" ]
storeIndex: 3
}
UM.SettingPropertyProvider UM.SettingPropertyProvider
{ {
id: machineNozzleSizeProvider id: machineNozzleSizeProvider