From 044c3e9da29a7696a2e0dd50dffcf9ad44a2ec61 Mon Sep 17 00:00:00 2001 From: 10r3n20 Date: Wed, 16 Mar 2022 17:03:03 +0100 Subject: updated splash screens --- cura/UI/CuraSplashScreen.py | 26 ++++++++++++-------------- resources/images/cura.png | Bin 25786 -> 323797 bytes resources/images/cura_enterprise.png | Bin 28320 -> 329725 bytes 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 index 2d6a75f571..8cfc93ef1b 100644 Binary files a/resources/images/cura.png and b/resources/images/cura.png differ diff --git a/resources/images/cura_enterprise.png b/resources/images/cura_enterprise.png index 789e0ae215..afba9956b8 100644 Binary files a/resources/images/cura_enterprise.png and b/resources/images/cura_enterprise.png differ diff --git a/resources/images/cura_wip.png b/resources/images/cura_wip.png index e62768f11e..3e19bdf4aa 100644 Binary files a/resources/images/cura_wip.png and b/resources/images/cura_wip.png differ -- cgit v1.2.3 From c8f34e26c708b9cb98ef41bc5aa9209923008b97 Mon Sep 17 00:00:00 2001 From: 10r3n20 Date: Fri, 18 Mar 2022 13:46:17 +0100 Subject: updated image --- resources/images/cura-enterprise.png | Bin 0 -> 320328 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 resources/images/cura-enterprise.png diff --git a/resources/images/cura-enterprise.png b/resources/images/cura-enterprise.png new file mode 100644 index 0000000000..496415391c Binary files /dev/null and b/resources/images/cura-enterprise.png differ -- cgit v1.2.3 From fa3aa696fbbe89b17f560168291756906521c230 Mon Sep 17 00:00:00 2001 From: 10r3n20 Date: Fri, 25 Mar 2022 10:22:46 +0100 Subject: updated payoff --- resources/images/cura.png | Bin 323797 -> 325136 bytes resources/images/cura_enterprise.png | Bin 329725 -> 327226 bytes resources/images/cura_wip.png | Bin 323227 -> 324496 bytes 3 files changed, 0 insertions(+), 0 deletions(-) diff --git a/resources/images/cura.png b/resources/images/cura.png index 8cfc93ef1b..66b10d5118 100644 Binary files a/resources/images/cura.png and b/resources/images/cura.png differ diff --git a/resources/images/cura_enterprise.png b/resources/images/cura_enterprise.png index afba9956b8..fd5025b67c 100644 Binary files a/resources/images/cura_enterprise.png and b/resources/images/cura_enterprise.png differ diff --git a/resources/images/cura_wip.png b/resources/images/cura_wip.png index 3e19bdf4aa..f98957a0b5 100644 Binary files a/resources/images/cura_wip.png and b/resources/images/cura_wip.png differ -- cgit v1.2.3 From 32153b0e570f9642391df83417a1587cb2c94d30 Mon Sep 17 00:00:00 2001 From: 10r3n20 Date: Fri, 25 Mar 2022 10:44:50 +0100 Subject: removed wrong enterprise image --- resources/images/cura-enterprise.png | Bin 320328 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 resources/images/cura-enterprise.png diff --git a/resources/images/cura-enterprise.png b/resources/images/cura-enterprise.png deleted file mode 100644 index 496415391c..0000000000 Binary files a/resources/images/cura-enterprise.png and /dev/null differ -- cgit v1.2.3