From 6b5ea9086fa04fc35277c46e2a13dbb81a3674d6 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Mon, 23 Aug 2021 14:40:57 +0200 Subject: [PATCH 1/3] Fix spelling in documentation Saw this and wanted to take it along blindly with whatever next modification I made to Cura. However I need to switch branches now so it's just going to be a rather useless commit I guess. --- plugins/GCodeReader/FlavorParser.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/GCodeReader/FlavorParser.py b/plugins/GCodeReader/FlavorParser.py index 56e50d2145..2b6fa215e0 100644 --- a/plugins/GCodeReader/FlavorParser.py +++ b/plugins/GCodeReader/FlavorParser.py @@ -1,4 +1,4 @@ -# Copyright (c) 2020 Ultimaker B.V. +# Copyright (c) 2021 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. import math @@ -153,7 +153,7 @@ class FlavorParser: Af = (self._filament_diameter / 2) ** 2 * numpy.pi # Length of the extruded filament de = current_extrusion - previous_extrusion - # Volumne of the extruded filament + # Volume of the extruded filament dVe = de * Af # Length of the printed line dX = numpy.sqrt((current_point[0] - previous_point[0])**2 + (current_point[2] - previous_point[2])**2) From 2718d6a69a1eb9412fa3ac0618bf806175da069e Mon Sep 17 00:00:00 2001 From: Konstantinos Karmas Date: Tue, 24 Aug 2021 10:35:33 +0200 Subject: [PATCH 2/3] Change the ColumnLayout to Column in the ConfigurationMenu When the labels were getting truncated and invisible after reducing the width of Cura's window, their visibility wasn't being restored back and, as a result, the `materialTypeLabel` was the only one that was remaining visible, even if there was enough space for the full `materialBrandColorTypeLabel`. Changing the ColumnLayout to a Column, where the width is inherited from the parent, fixes that issue. CURA-8496 --- .../qml/Menus/ConfigurationMenu/ConfigurationMenu.qml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml b/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml index 8c09a5ffad..1a04b85fcb 100644 --- a/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml +++ b/resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml @@ -60,7 +60,7 @@ Cura.ExpandablePopup anchors.verticalCenter: parent.verticalCenter } - ColumnLayout + Column { opacity: model.enabled ? 1 : UM.Theme.getColor("extruder_disabled").a spacing: 0 @@ -83,7 +83,7 @@ Cura.ExpandablePopup font: UM.Theme.getFont("default") color: UM.Theme.getColor("text") renderType: Text.NativeRendering - Layout.preferredWidth: parent.width + width: parent.width visible: !truncated } @@ -96,7 +96,7 @@ Cura.ExpandablePopup font: UM.Theme.getFont("default") color: UM.Theme.getColor("text") renderType: Text.NativeRendering - Layout.preferredWidth: parent.width + width: parent.width visible: !materialBrandColorTypeLabel.visible && !truncated } @@ -109,7 +109,7 @@ Cura.ExpandablePopup font: UM.Theme.getFont("default") color: UM.Theme.getColor("text") renderType: Text.NativeRendering - Layout.preferredWidth: parent.width + width: parent.width visible: !materialBrandColorTypeLabel.visible && !materialColorTypeLabel.visible } // Label that shows the name of the variant From 82912ef20c1b0b89d2aac81eb1cb0ac9b9db8a64 Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Tue, 24 Aug 2021 16:34:28 +0200 Subject: [PATCH 3/3] Add alias for previously existing "star" icon --- resources/themes/cura-light/icons/deprecated_icons.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/resources/themes/cura-light/icons/deprecated_icons.json b/resources/themes/cura-light/icons/deprecated_icons.json index 8b71e063de..8fb1982617 100644 --- a/resources/themes/cura-light/icons/deprecated_icons.json +++ b/resources/themes/cura-light/icons/deprecated_icons.json @@ -167,6 +167,10 @@ "new_icon": "Check", "size": "default" }, + "star": { + "new_icon": "StarFilled", + "size": "default" + }, "pencil": { "new_icon": "Pen", "size": "default"