diff --git a/Orange/canvas/__main__.py b/Orange/canvas/__main__.py index b84fdc55ddc..6334b777c61 100644 --- a/Orange/canvas/__main__.py +++ b/Orange/canvas/__main__.py @@ -410,7 +410,7 @@ def onPaletteChange(): app.paletteChanged.connect(onPaletteChange) onPaletteChange() - def show_splash_message(self, message: str, color=QColor("#FFD39F")): + def show_splash_message(self, message: str, color=QColor("#FFFFFF")): super().show_splash_message(message, color) def create_main_window(self): diff --git a/Orange/canvas/config.py b/Orange/canvas/config.py index 6720fe9bf34..05c9fb19d9c 100644 --- a/Orange/canvas/config.py +++ b/Orange/canvas/config.py @@ -2,6 +2,7 @@ Orange Canvas Configuration """ +import random import uuid import warnings @@ -98,14 +99,15 @@ def application_icon(): Return the main application icon. """ path = pkg_resources.resource_filename( - __name__, "icons/orange-canvas.svg" + __name__, "icons/orange-256.png" ) return QIcon(path) @staticmethod def splash_screen(): + splash_n = random.randint(1, 3) path = pkg_resources.resource_filename( - __name__, "icons/orange-splash-screen.png") + __name__, f"icons/orange-splash-screen-{splash_n:02}.png") pm = QPixmap(path) version = Config.ApplicationVersion @@ -113,24 +115,21 @@ def splash_screen(): version_parsed = LooseVersion(version) version_comp = version_parsed.version version = ".".join(map(str, version_comp[:2])) - size = 21 if len(version) < 5 else 16 + size = 13 font = QFont("Helvetica") font.setPixelSize(size) - font.setBold(True) - font.setItalic(True) - font.setLetterSpacing(QFont.AbsoluteSpacing, 2) metrics = QFontMetrics(font) - br = metrics.boundingRect(version).adjusted(-5, 0, 5, 0) - br.moveCenter(QPoint(436, 224)) + br = metrics.boundingRect(version) + br.moveTopLeft(QPoint(171, 438)) p = QPainter(pm) p.setRenderHint(QPainter.Antialiasing) p.setRenderHint(QPainter.TextAntialiasing) p.setFont(font) - p.setPen(QColor("#231F20")) - p.drawText(br, Qt.AlignCenter, version) + p.setPen(QColor("#000000")) + p.drawText(br, Qt.AlignLeft, version) p.end() - return pm, QRect(88, 193, 200, 20) + return pm, QRect(23, 24, 200, 20) @staticmethod def widgets_entry_points(): diff --git a/Orange/canvas/icons/orange-256.png b/Orange/canvas/icons/orange-256.png new file mode 100644 index 00000000000..d2cf9b27deb Binary files /dev/null and b/Orange/canvas/icons/orange-256.png differ diff --git a/Orange/canvas/icons/orange-canvas.svg b/Orange/canvas/icons/orange-canvas.svg deleted file mode 100644 index 539a8f20492..00000000000 --- a/Orange/canvas/icons/orange-canvas.svg +++ /dev/null @@ -1,88 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Orange/canvas/icons/orange-splash-screen-01.png b/Orange/canvas/icons/orange-splash-screen-01.png new file mode 100644 index 00000000000..979f79cc198 Binary files /dev/null and b/Orange/canvas/icons/orange-splash-screen-01.png differ diff --git a/Orange/canvas/icons/orange-splash-screen-02.png b/Orange/canvas/icons/orange-splash-screen-02.png new file mode 100644 index 00000000000..8695b4e071f Binary files /dev/null and b/Orange/canvas/icons/orange-splash-screen-02.png differ diff --git a/Orange/canvas/icons/orange-splash-screen-03.png b/Orange/canvas/icons/orange-splash-screen-03.png new file mode 100644 index 00000000000..d2ff3cfbd52 Binary files /dev/null and b/Orange/canvas/icons/orange-splash-screen-03.png differ diff --git a/Orange/canvas/icons/orange-splash-screen.png b/Orange/canvas/icons/orange-splash-screen.png deleted file mode 100644 index a1e49fe9f3a..00000000000 Binary files a/Orange/canvas/icons/orange-splash-screen.png and /dev/null differ diff --git a/Orange/canvas/icons/orange.ico b/Orange/canvas/icons/orange.ico index 32735f30466..88d24c6413e 100644 Binary files a/Orange/canvas/icons/orange.ico and b/Orange/canvas/icons/orange.ico differ diff --git a/distribute/icon-256.png b/distribute/icon-256.png index 05a666671d1..d2cf9b27deb 100644 Binary files a/distribute/icon-256.png and b/distribute/icon-256.png differ diff --git a/distribute/icon-48.png b/distribute/icon-48.png index f87b6f86dbb..39098322e9f 100644 Binary files a/distribute/icon-48.png and b/distribute/icon-48.png differ diff --git a/distribute/orange-canvas.png b/distribute/orange-canvas.png new file mode 100644 index 00000000000..d2cf9b27deb Binary files /dev/null and b/distribute/orange-canvas.png differ diff --git a/distribute/orange-canvas.svg b/distribute/orange-canvas.svg deleted file mode 100644 index 539a8f20492..00000000000 --- a/distribute/orange-canvas.svg +++ /dev/null @@ -1,88 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - -