diff options
author | 10r3n20 <l.romagnoli@ultimaker.com> | 2022-03-16 19:03:03 +0300 |
---|---|---|
committer | 10r3n20 <l.romagnoli@ultimaker.com> | 2022-03-16 19:03:03 +0300 |
commit | 044c3e9da29a7696a2e0dd50dffcf9ad44a2ec61 (patch) | |
tree | f6b48e19dea0b132b7374d02b5aaffb80b66e75c | |
parent | f4e57b82f83391f96cd2918124046bfd2e9bf1b9 (diff) |
updated splash screens
-rw-r--r-- | cura/UI/CuraSplashScreen.py | 26 | ||||
-rw-r--r-- | resources/images/cura.png | bin | 25786 -> 323797 bytes | |||
-rw-r--r-- | resources/images/cura_enterprise.png | bin | 28320 -> 329725 bytes | |||
-rw-r--r-- | resources/images/cura_wip.png | bin | 34915 -> 323227 bytes |
4 files changed, 12 insertions, 14 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/resources/images/cura.png b/resources/images/cura.png Binary files differindex 2d6a75f571..8cfc93ef1b 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..afba9956b8 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..3e19bdf4aa 100644 --- a/resources/images/cura_wip.png +++ b/resources/images/cura_wip.png |