From 8a55469499117bc9a64ed047b70cc14801419cb6 Mon Sep 17 00:00:00 2001 From: Mark Date: Mon, 3 Jul 2017 14:49:26 +0200 Subject: [PATCH 1/2] Revert "Add margins to buttons and progressBar so they align" This reverts commit 8776cedd278ab0830f4f621d013e7ef75efbb9d1. --- plugins/PluginBrowser/PluginBrowser.qml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/plugins/PluginBrowser/PluginBrowser.qml b/plugins/PluginBrowser/PluginBrowser.qml index f992efa926..fc9612a798 100644 --- a/plugins/PluginBrowser/PluginBrowser.qml +++ b/plugins/PluginBrowser/PluginBrowser.qml @@ -33,7 +33,6 @@ UM.Dialog text: catalog.i18nc("@action:button", "Refresh") onClicked: manager.requestPluginList() anchors.right: parent.right - anchors.rightMargin: -3 } } ScrollView @@ -69,8 +68,7 @@ UM.Dialog anchors.left:parent.left anchors.right: closeButton.left anchors.rightMargin: UM.Theme.getSize("default_margin").width - anchors.bottomMargin: 4 - height: UM.Theme.getSize("default_margin").height + height: 10 value: manager.downloadProgress } @@ -82,7 +80,6 @@ UM.Dialog onClicked: base.close() anchors.bottom: parent.bottom anchors.right: parent.right - anchors.rightMargin: -3 } } From 68cae135a9c4f5e1efdbfb7b6d0c0f3681549f2f Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Mon, 3 Jul 2017 16:19:08 +0200 Subject: [PATCH 2/2] Make outer wall line width to evaluate its value accroding to its extruder CURA-3891 This commit fixes the problem that limit to extruder for outer wall doesn't work. --- resources/definitions/fdmprinter.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 0760533f33..992424db46 100755 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -677,7 +677,7 @@ "minimum_value_warning": "(0.1 + 0.4 * machine_nozzle_size) if outer_inset_first else 0.1 * machine_nozzle_size", "maximum_value_warning": "2 * machine_nozzle_size", "default_value": 0.4, - "value": "wall_line_width", + "value": "extruderValue(wall_0_extruder_nr, 'wall_line_width')", "type": "float", "limit_to_extruder": "wall_0_extruder_nr", "settable_per_mesh": true