From 906074d6ceab2f53ade716c64e407eb2ff7b122e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars-S=C3=B6ren=20Steck?= Date: Mon, 8 Apr 2019 01:15:49 +0200 Subject: [PATCH 1/3] Fix anycubic 4max gcode comments --- resources/definitions/anycubic_4max.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/anycubic_4max.def.json b/resources/definitions/anycubic_4max.def.json index c14ce1ac31..58cbaa3b22 100644 --- a/resources/definitions/anycubic_4max.def.json +++ b/resources/definitions/anycubic_4max.def.json @@ -83,6 +83,6 @@ "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_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"} } } From b47489eb3053476d236994abc5ad83e78c595755 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars-S=C3=B6ren=20Steck?= Date: Mon, 8 Apr 2019 01:16:26 +0200 Subject: [PATCH 2/3] Fix anycubic i3 mega gcode comments --- resources/definitions/anycubic_i3_mega.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/anycubic_i3_mega.def.json b/resources/definitions/anycubic_i3_mega.def.json index 8a96d98023..6e81085fdd 100644 --- a/resources/definitions/anycubic_i3_mega.def.json +++ b/resources/definitions/anycubic_i3_mega.def.json @@ -58,7 +58,7 @@ }, "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" } } } From c9a4f0c8b14b69ca4b61bde0416a1a72c817333a Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Thu, 11 Apr 2019 10:51:57 +0200 Subject: [PATCH 3/3] Fixed some minor qml issues with userOperations popup --- resources/qml/Account/UserOperations.qml | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/resources/qml/Account/UserOperations.qml b/resources/qml/Account/UserOperations.qml index b6ae1efff6..10a4119dfc 100644 --- a/resources/qml/Account/UserOperations.qml +++ b/resources/qml/Account/UserOperations.qml @@ -9,10 +9,9 @@ import Cura 1.1 as Cura Column { - width: Math.max(title.width, - accountButton.width) * 1.5 + width: Math.max(title.width, accountButton.width) + 2 * UM.Theme.getSize("default_margin").width - spacing: UM.Theme.getSize("default_margin").width + spacing: UM.Theme.getSize("default_margin").height Label { @@ -20,17 +19,11 @@ Column anchors.horizontalCenter: parent.horizontalCenter horizontalAlignment: Text.AlignHCenter renderType: Text.NativeRendering - text: catalog.i18nc("@label The argument is a username.", "Hi %1").format(profile.username) + text: catalog.i18nc("@label The argument is a username.", "Hi %1").arg(profile.username) font: UM.Theme.getFont("large_bold") color: UM.Theme.getColor("text") } - // placeholder - Label - { - text: " " - } - Cura.SecondaryButton { id: accountButton