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

Add (placeholder) head polygon controls and tweak layout

Browse Source
This commit is contained in:
fieldOfView 2016-08-02 09:53:30 +02:00
parent 5868a8bed3
commit 9a0e78ff46
1 changed files with 230 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

213
MachineSettingsAction.qml
View File

@ -40,14 +40,30 @@ Cura.MachineAction
Column
{
id: pageCheckboxes
height: childrenRect.height
height: parent.height - y
width: parent.width - UM.Theme.getSize("default_margin").width
spacing: UM.Theme.getSize("default_margin").height
anchors.left: parent.left
anchors.top: pageDescription.bottom
anchors.topMargin: UM.Theme.getSize("default_margin").height
width: parent.width - UM.Theme.getSize("default_margin").width
Row
{
width: parent.width
spacing: UM.Theme.getSize("default_margin").height
Column
{
width: parent.width / 2
spacing: UM.Theme.getSize("default_margin").height
Label
{
text: catalog.i18nc("@label", "Printer Settings")
font.bold: true
}
Grid
{
columns: 3
@ -100,38 +116,6 @@ Cura.MachineAction
{
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
}
Item
{
width: UM.Theme.getSize("default_margin").width
height: UM.Theme.getSize("default_margin").height
}
Label
{
text: catalog.i18nc("@label","Nozzle size")
}
TextField
{
id: nozzleSizeField
text: machineNozzleSizeProvider.properties.value
validator: RegExpValidator { regExp: /[0-9\.]{0,6}/ }
onEditingFinished: { machineNozzleSizeProvider.setPropertyValue("value", text) }
}
Label
{
text: catalog.i18nc("@label","mm")
}
}
Column
@ -151,14 +135,140 @@ Cura.MachineAction
onClicked: machineCenterIsZeroProvider.setPropertyValue("value", checked)
}
}
}
Column
{
width: parent.width / 2
spacing: UM.Theme.getSize("default_margin").height
Label
{
text: catalog.i18nc("@label", "Printhead Settings")
font.bold: true
}
Grid
{
columns: 3
columnSpacing: UM.Theme.getSize("default_margin").width
Label
{
text: catalog.i18nc("@label","X (Width)")
}
TextField
{
id: printheadXMinField
text: ""
validator: RegExpValidator { regExp: /[0-9]{0,6}/ }
onEditingFinished: { }
}
Label
{
text: catalog.i18nc("@label","mm")
}
Label
{
text: catalog.i18nc("@label","X (Width)")
}
TextField
{
id: printheadYMinField
text: ""
validator: RegExpValidator { regExp: /[0-9]{0,6}/ }
onEditingFinished: { }
}
Label
{
text: catalog.i18nc("@label","mm")
}
Label
{
text: catalog.i18nc("@label","X (Width)")
}
TextField
{
id: printheadXMaxField
text: ""
validator: RegExpValidator { regExp: /[0-9]{0,6}/ }
onEditingFinished: { }
}
Label
{
text: catalog.i18nc("@label","mm")
}
Label
{
text: catalog.i18nc("@label","X (Width)")
}
TextField
{
id: printheadYMaxField
text: ""
validator: RegExpValidator { regExp: /[0-9]{0,6}/ }
onEditingFinished: { }
}
Label
{
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 }
Item { width: UM.Theme.getSize("default_margin").width; height: UM.Theme.getSize("default_margin").height }
Label
{
text: catalog.i18nc("@label","Gantry height")
}
TextField
{
id: gantryHeightField
text: gantryHeightProvider.properties.value
validator: RegExpValidator { regExp: /[0-9\.]{0,6}/ }
onEditingFinished: { gantryHeightProvider.setPropertyValue("value", text) }
}
Label
{
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 }
Item { width: UM.Theme.getSize("default_margin").width; height: UM.Theme.getSize("default_margin").height }
Label
{
text: catalog.i18nc("@label","Nozzle size")
}
TextField
{
id: nozzleSizeField
text: machineNozzleSizeProvider.properties.value
validator: RegExpValidator { regExp: /[0-9\.]{0,6}/ }
onEditingFinished: { machineNozzleSizeProvider.setPropertyValue("value", text) }
}
Label
{
text: catalog.i18nc("@label","mm")
}
}
}
}
Row
{
spacing: UM.Theme.getSize("default_margin").width
anchors.left: parent.left
anchors.right: parent.right
height: parent.height - y
Column
{
height: parent.height
width: parent.width / 2
Label
{
@ -168,6 +278,7 @@ Cura.MachineAction
{
id: machineStartGcodeField
width: parent.width
height: parent.height - y
text: machineStartGcodeProvider.properties.value
onActiveFocusChanged:
{
@ -179,6 +290,7 @@ Cura.MachineAction
}
}
Column {
height: parent.height
width: parent.width / 2
Label
{
@ -188,6 +300,7 @@ Cura.MachineAction
{
id: machineEndGcodeField
width: parent.width
height: parent.height - y
text: machineEndGcodeProvider.properties.value
onActiveFocusChanged:
{
@ -232,16 +345,6 @@ Cura.MachineAction
storeIndex: 3
}
UM.SettingPropertyProvider
{
id: machineNozzleSizeProvider
containerStackId: Cura.MachineManager.activeMachineId
key: "machine_nozzle_size"
watchedProperties: [ "value" ]
storeIndex: 3
}
UM.SettingPropertyProvider
{
id: machineHeatedBedProvider
@ -262,6 +365,26 @@ Cura.MachineAction
storeIndex: 3
}
UM.SettingPropertyProvider
{
id: machineNozzleSizeProvider
containerStackId: Cura.MachineManager.activeMachineId
key: "machine_nozzle_size"
watchedProperties: [ "value" ]
storeIndex: 3
}
UM.SettingPropertyProvider
{
id: gantryHeightProvider
containerStackId: Cura.MachineManager.activeMachineId
key: "gantry_height"
watchedProperties: [ "value" ]
storeIndex: 3
}
UM.SettingPropertyProvider
{