diff options
| -rw-r--r-- | cura/UI/CuraSplashScreen.py | 26 | ||||
| -rw-r--r-- | plugins/3MFReader/WorkspaceDialog.qml | 13 | ||||
| -rw-r--r-- | resources/definitions/fdmprinter.def.json | 7 | ||||
| -rw-r--r-- | resources/definitions/ultimaker.def.json | 3 | ||||
| -rw-r--r-- | resources/images/cura.png | bin | 25786 -> 325136 bytes | |||
| -rw-r--r-- | resources/images/cura_enterprise.png | bin | 28320 -> 327226 bytes | |||
| -rw-r--r-- | resources/images/cura_wip.png | bin | 34915 -> 324496 bytes |
7 files changed, 21 insertions, 28 deletions
diff --git a/cura/UI/CuraSplashScreen.py b/cura/UI/CuraSplashScreen.py index 4fa798247d..dfeba843a2 100644 --- a/cura/UI/CuraSplashScreen.py +++ b/cura/UI/CuraSplashScreen.py @@ -14,7 +14,7 @@ import time class CuraSplashScreen(QSplashScreen): def __init__(self): super().__init__() - self._scale = 0.7 + self._scale = 1 self._version_y_offset = 0 # when extra visual elements are in the background image, move version text down if ApplicationMetadata.IsAlternateVersion: @@ -69,23 +69,21 @@ class CuraSplashScreen(QSplashScreen): version = Application.getInstance().getVersion().split("-") # Draw version text - font = QFont() # Using system-default font here - font.setPixelSize(18) + font = QFont() + font.setPixelSize(24) painter.setFont(font) - painter.drawText(60, 70 + self._version_y_offset, round(330 * self._scale), round(230 * self._scale), Qt.AlignLeft | Qt.AlignTop, version[0] if not ApplicationMetadata.IsAlternateVersion else ApplicationMetadata.CuraBuildType) - if len(version) > 1: - font.setPixelSize(16) - painter.setFont(font) - painter.setPen(QColor(200, 200, 200, 255)) - painter.drawText(247, 105 + self._version_y_offset, round(330 * self._scale), round(255 * self._scale), Qt.AlignLeft | Qt.AlignTop, version[1]) - painter.setPen(QColor(255, 255, 255, 255)) + + if len(version) == 1: + painter.drawText(40, 104 + self._version_y_offset, round(330 * self._scale), round(230 * self._scale), Qt.AlignLeft | Qt.AlignTop, version[0] if not ApplicationMetadata.IsAlternateVersion else ApplicationMetadata.CuraBuildType) + elif len(version) > 1: + painter.drawText(40, 104 + self._version_y_offset, round(330 * self._scale), round(230 * self._scale), Qt.AlignLeft | Qt.AlignTop, version[0] +" "+ version[1] if not ApplicationMetadata.IsAlternateVersion else ApplicationMetadata.CuraBuildType) # Draw the loading image pen = QPen() - pen.setWidthF(6 * self._scale) - pen.setColor(QColor(32, 166, 219, 255)) + pen.setWidthF(2 * self._scale) + pen.setColor(QColor(255, 255, 255, 255)) painter.setPen(pen) - painter.drawArc(60, 150, round(32 * self._scale), round(32 * self._scale), round(self._loading_image_rotation_angle * 16), 300 * 16) + painter.drawArc(38, 324, round(20 * self._scale), round(20 * self._scale), round(self._loading_image_rotation_angle * 16), 300 * 16) # Draw message text if self._current_message: @@ -95,7 +93,7 @@ class CuraSplashScreen(QSplashScreen): pen.setColor(QColor(255, 255, 255, 255)) painter.setPen(pen) painter.setFont(font) - painter.drawText(100, 128, 170, 64, + painter.drawText(70, 320, 170, 24, Qt.AlignLeft | Qt.AlignVCenter | Qt.TextWordWrap, self._current_message) diff --git a/plugins/3MFReader/WorkspaceDialog.qml b/plugins/3MFReader/WorkspaceDialog.qml index 898b1ea993..e8739dcf64 100644 --- a/plugins/3MFReader/WorkspaceDialog.qml +++ b/plugins/3MFReader/WorkspaceDialog.qml @@ -17,8 +17,7 @@ UM.Dialog minimumWidth: UM.Theme.getSize("popup_dialog").width minimumHeight: UM.Theme.getSize("popup_dialog").height width: minimumWidth - height: Math.max(dialogSummaryItem.height + 2 * buttonsItem.height, minimumHeight) // 2 * button height to also have some extra space around the button relative to the button size - + property int comboboxHeight: UM.Theme.getSize("default_margin").height onClosing: manager.notifyClosed() @@ -67,7 +66,7 @@ UM.Dialog Column { width: parent.width - height: cildrenRect.height + height: childrenRect.height UM.Label { @@ -149,7 +148,7 @@ UM.Dialog Column { width: parent.width - height: cildrenRect.height + height: childrenRect.height UM.Label { @@ -225,7 +224,7 @@ UM.Dialog Column { width: parent.width - height: cildrenRect.height + height: childrenRect.height UM.Label { @@ -341,7 +340,7 @@ UM.Dialog Column { width: parent.width - height: cildrenRect.height + height: childrenRect.height Row { height: childrenRect.height @@ -382,7 +381,7 @@ UM.Dialog Column { width: parent.width - height: cildrenRect.height + height: childrenRect.height UM.Label { diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 4fde50693f..b76120834d 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -1211,8 +1211,6 @@ "unit": "mm", "minimum_value_warning": ".5 * max(wall_line_width_0, wall_line_width_x)", "maximum_value_warning": "min(wall_line_width_0, wall_line_width_x)", - "minimum_value_warning_old": "(0.1 + 0.4 * machine_nozzle_size) if inset_direction == \"outside_in\" else 0.1 * machine_nozzle_size", - "maximum_value_warning_old": "2 * machine_nozzle_size", "default_value": 0.3, "value": "machine_nozzle_size * .75", "type": "float", @@ -1239,7 +1237,6 @@ "unit": "%", "default_value": 50, "value": "max(1, min(99, 100 * (2 * min_even_wall_line_width - wall_line_width_0) / wall_line_width_0))", - "value_explicit": "100 * (2 * min_even_wall_line_width - wall_line_width_0) / (wall_line_width_0 + wall_line_width_x - wall_line_width_0)", "minimum_value": "1", "maximum_value": "99" } @@ -6454,8 +6451,10 @@ "description": "The maximum extrusion area deviation allowed when removing intermediate points from a straight line. An intermediate point may serve as width-changing point in a long straight line. Therefore, if it is removed, it will cause the line to have a uniform width and, as a result, lose (or gain) a bit of extrusion area. If you increase this you may notice slight under- (or over-) extrusion in between straight parallel walls, as more intermediate width-changing points will be allowed to be removed. Your print will be less accurate, but the g-code will be smaller.", "type": "float", "unit": "μm²", - "default_value": 50000, + "default_value": 2000, "minimum_value": "0", + "minimum_value_warning": "500", + "maximum_value_warning": "50000", "settable_per_mesh": true } } diff --git a/resources/definitions/ultimaker.def.json b/resources/definitions/ultimaker.def.json index d062a043f3..978deeb7f4 100644 --- a/resources/definitions/ultimaker.def.json +++ b/resources/definitions/ultimaker.def.json @@ -62,9 +62,6 @@ "speed_equalize_flow_width_factor": { "value": "110.0" }, - "meshfix_maximum_extrusion_area_deviation": { - "value": "50000" - }, "top_layers": { "value": "math.ceil(round(top_thickness / resolveOrValue('layer_height'), 4))" }, diff --git a/resources/images/cura.png b/resources/images/cura.png Binary files differindex 2d6a75f571..66b10d5118 100644 --- a/resources/images/cura.png +++ b/resources/images/cura.png diff --git a/resources/images/cura_enterprise.png b/resources/images/cura_enterprise.png Binary files differindex 789e0ae215..fd5025b67c 100644 --- a/resources/images/cura_enterprise.png +++ b/resources/images/cura_enterprise.png diff --git a/resources/images/cura_wip.png b/resources/images/cura_wip.png Binary files differindex e62768f11e..f98957a0b5 100644 --- a/resources/images/cura_wip.png +++ b/resources/images/cura_wip.png |
