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

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

Browse Source
This commit is contained in:
Jaime van Kessel 2019-04-11 10:52:19 +02:00
commit 767ccad970
4 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resources/definitions/anycubic_4max.def.json
View File

@ -83,6 +83,6 @@
"machine_gcode_flavor":{"default_value": "RepRap (Marlin/Sprinter)"}, "machine_gcode_flavor":{"default_value": "RepRap (Marlin/Sprinter)"},
"machine_start_gcode":{"default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z15.0 F{speed_travel} ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E3 ;extrude 3mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F{speed_travel}\nM117 Printing...\nG5"}, "machine_start_gcode":{"default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z15.0 F{speed_travel} ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E3 ;extrude 3mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F{speed_travel}\nM117 Printing...\nG5"},
"machine_end_gcode":{"default_value": "M104 S0 ; turn off extruder\nM140 S0 ; turn off bed\nM84 ; disable motors\nM107\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle\nto release some of the pressure\nG1 Z+0.5 E-5 ;X-20 Y-20 F{speed_travel} ;move Z up a bit and retract filament even more\nG28 X0 ;Y0 ;move X/Y to min endstops\nso the head is out of the way\nG1 Y180 F2000\nM84 ;steppers off\nG90\nM300 P300 S4000"} "machine_end_gcode":{"default_value": "M104 S0 ; turn off extruder\nM140 S0 ; turn off bed\nM84 ; disable motors\nM107\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 ;X-20 Y-20 F{speed_travel} ;move Z up a bit and retract filament even more\nG28 X0 ;Y0 ;move X/Y to min endstops, so the head is out of the way\nG1 Y180 F2000\nM84 ;steppers off\nG90\nM300 P300 S4000"}
} }
} }

2
resources/definitions/anycubic_i3_mega.def.json
View File

@ -58,7 +58,7 @@
}, },
"machine_end_gcode": "machine_end_gcode":
{ {
"default_value": "M104 S0 ; turn off extruder\nM140 S0 ; turn off bed\nM84 ; disable motors\nM107\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle\nto release some of the pressure\nG1 Z+0.5 E-5 ;X-20 Y-20 F{speed_travel} ;move Z up a bit and retract filament even more\nG28 X0 ;Y0 ;move X/Y to min endstops\nso the head is out of the way\nG1 Y180 F2000\nM84 ;steppers off\nG90\nM300 P300 S4000" "default_value": "M104 S0 ; turn off extruder\nM140 S0 ; turn off bed\nM84 ; disable motors\nM107\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 ;X-20 Y-20 F{speed_travel} ;move Z up a bit and retract filament even more\nG28 X0 ;Y0 ;move X/Y to min endstops, so the head is out of the way\nG1 Y180 F2000\nM84 ;steppers off\nG90\nM300 P300 S4000"
} }
} }
} }

18
resources/qml/WelcomePages/AddPrinterByIpContent.qml
View File

@ -48,17 +48,19 @@ Item
Item Item
{ {
width: parent.width anchors.left: parent.left
anchors.right: parent.right
anchors.margins: UM.Theme.getSize("default_margin").width
Label Label
{ {
id: explainLabel id: explainLabel
height: contentHeight height: contentHeight
width: parent.width anchors.left: parent.left
anchors.right: parent.right
anchors.top: parent.top anchors.top: parent.top
anchors.margins: UM.Theme.getSize("default_margin").width
font: UM.Theme.getFont("default")
font: UM.Theme.getFont("default")
text: catalog.i18nc("@label", "Enter the IP address or hostname of your printer on the network.") text: catalog.i18nc("@label", "Enter the IP address or hostname of your printer on the network.")
} }
@ -66,8 +68,10 @@ Item
{ {
id: userInputFields id: userInputFields
height: childrenRect.height height: childrenRect.height
width: parent.width anchors.left: parent.left
anchors.right: parent.right
anchors.top: explainLabel.bottom anchors.top: explainLabel.bottom
anchors.topMargin: UM.Theme.getSize("default_margin").width
Cura.TextField Cura.TextField
{ {
@ -76,7 +80,6 @@ Item
height: addPrinterButton.height height: addPrinterButton.height
anchors.verticalCenter: addPrinterButton.verticalCenter anchors.verticalCenter: addPrinterButton.verticalCenter
anchors.left: parent.left anchors.left: parent.left
anchors.margins: UM.Theme.getSize("default_margin").width
validator: RegExpValidator validator: RegExpValidator
{ {
@ -92,8 +95,7 @@ Item
id: addPrinterButton id: addPrinterButton
anchors.top: parent.top anchors.top: parent.top
anchors.left: hostnameField.right anchors.left: hostnameField.right
anchors.margins: UM.Theme.getSize("default_margin").width anchors.leftMargin: UM.Theme.getSize("default_margin").width
text: catalog.i18nc("@button", "Add") text: catalog.i18nc("@button", "Add")
onClicked: onClicked:
{ {

14
resources/qml/Widgets/ScrollableTextArea.qml
View File

@ -15,6 +15,14 @@ ScrollView
{ {
property alias textArea: _textArea property alias textArea: _textArea
clip: true
background: Rectangle // Border
{
border.color: UM.Theme.getColor("lining")
border.width: UM.Theme.getSize("default_lining").width
}
TextArea TextArea
{ {
id: _textArea id: _textArea
@ -22,11 +30,5 @@ ScrollView
textFormat: TextEdit.PlainText textFormat: TextEdit.PlainText
renderType: Text.NativeRendering renderType: Text.NativeRendering
selectByMouse: true selectByMouse: true
background: Rectangle // Border
{
border.color: UM.Theme.getColor("lining")
border.width: UM.Theme.getSize("default_lining").width
}
} }
} }