From 8b73f7cef9896f68474a40ae53535f764bd52eb9 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Fri, 17 May 2019 09:47:47 +0200 Subject: [PATCH 1/5] No longer create convex hulls for modifier meshes CURA-6030 --- cura/PlatformPhysics.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cura/PlatformPhysics.py b/cura/PlatformPhysics.py index 8fffac4501..d9876b3b36 100755 --- a/cura/PlatformPhysics.py +++ b/cura/PlatformPhysics.py @@ -76,7 +76,7 @@ class PlatformPhysics: move_vector = move_vector.set(y = -bbox.bottom + z_offset) # If there is no convex hull for the node, start calculating it and continue. - if not node.getDecorator(ConvexHullDecorator): + if not node.getDecorator(ConvexHullDecorator) and not node.callDecoration("isNonPrintingMesh"): node.addDecorator(ConvexHullDecorator()) # only push away objects if this node is a printing mesh From a28ca1964785e123d62fa25969e79ecc46d62de1 Mon Sep 17 00:00:00 2001 From: Diego Prado Gesto Date: Fri, 17 May 2019 11:54:40 +0200 Subject: [PATCH 2/5] Change the font size To make it consistent with the size of texts in the other Welcome pages. --- resources/qml/WelcomePages/UserAgreementContent.qml | 2 +- resources/qml/WelcomePages/WhatsNewContent.qml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/resources/qml/WelcomePages/UserAgreementContent.qml b/resources/qml/WelcomePages/UserAgreementContent.qml index c6fb03ccd4..764ef03e18 100644 --- a/resources/qml/WelcomePages/UserAgreementContent.qml +++ b/resources/qml/WelcomePages/UserAgreementContent.qml @@ -43,7 +43,7 @@ Item + "

Unless required by applicable law or agreed to in writing, in no event will Ultimaker be liable to you for damages, including any general, special, incidental, or consequential damages arising out of the use or inability to use any Ultimaker software or third party software.

" textFormat: Text.RichText wrapMode: Text.WordWrap - font: UM.Theme.getFont("default") + font: UM.Theme.getFont("medium") color: UM.Theme.getColor("text") renderType: Text.NativeRendering } diff --git a/resources/qml/WelcomePages/WhatsNewContent.qml b/resources/qml/WelcomePages/WhatsNewContent.qml index 51a347779a..39695dabc4 100644 --- a/resources/qml/WelcomePages/WhatsNewContent.qml +++ b/resources/qml/WelcomePages/WhatsNewContent.qml @@ -44,6 +44,7 @@ Item textArea.textFormat: Text.RichText textArea.wrapMode: Text.WordWrap textArea.readOnly: true + textArea.font: UM.Theme.getFont("medium") } Cura.PrimaryButton From 4e65232364c4383f507bc2a1b59f676e50c1e476 Mon Sep 17 00:00:00 2001 From: Diego Prado Gesto Date: Fri, 17 May 2019 11:58:30 +0200 Subject: [PATCH 3/5] Change the font size of settings in extruder tab To make it consistent with the sizes in the Printer tab. --- plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml b/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml index 65f1e8a57a..9341f7f67e 100644 --- a/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml +++ b/plugins/MachineSettingsAction/MachineSettingsExtruderTab.qml @@ -22,7 +22,7 @@ Item property int labelWidth: 210 * screenScaleFactor property int controlWidth: (UM.Theme.getSize("setting_control").width * 3 / 4) | 0 - property var labelFont: UM.Theme.getFont("medium") + property var labelFont: UM.Theme.getFont("default") property int columnWidth: ((parent.width - 2 * UM.Theme.getSize("default_margin").width) / 2) | 0 property int columnSpacing: 3 * screenScaleFactor From 584a101902b19c0551e2a44bd061eb3fed5cde3a Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Fri, 17 May 2019 14:19:37 +0200 Subject: [PATCH 4/5] Fix limit to extruder for support infill angle CURA-6529 --- resources/definitions/fdmprinter.def.json | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 7cd9c42338..18dcd83978 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -3944,6 +3944,7 @@ "maximum_value": "180", "default_value": 0, "enabled": "support_enable and support_pattern != 'concentric' and support_infill_rate > 0", + "limit_to_extruder": "support_infill_extruder_nr", "settable_per_mesh": false, "settable_per_extruder": true }, From 361636af29c1bd3fa55deaff2cf929b3479c2391 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Fri, 17 May 2019 14:30:18 +0200 Subject: [PATCH 5/5] Allow WizardDialog to resize --- resources/qml/WelcomePages/WizardDialog.qml | 2 -- 1 file changed, 2 deletions(-) diff --git a/resources/qml/WelcomePages/WizardDialog.qml b/resources/qml/WelcomePages/WizardDialog.qml index c81f9daff0..4a0867c9a2 100644 --- a/resources/qml/WelcomePages/WizardDialog.qml +++ b/resources/qml/WelcomePages/WizardDialog.qml @@ -24,8 +24,6 @@ Window minimumWidth: 580 * screenScaleFactor minimumHeight: 600 * screenScaleFactor - maximumWidth: minimumWidth - maximumHeight: minimumHeight color: UM.Theme.getColor("main_background")