Merge pull request #44 from UltraStar-Deluxe/dynamic_splashscreen

Dynamically add the major and minor version number to splashscreen.
UltraStar-Deluxe · Oct 1, 2024 · 260062e · 260062e
2 parents 0ad072e + bcac880
commit 260062e
Show file tree

Hide file tree

Showing 9 changed files with 30 additions and 5 deletions.
diff --git a/src/main.cpp b/src/main.cpp
@@ -4,10 +4,14 @@
 #include "QUMessageBox.h"
 
 #include <QApplication>
+#include <QColor>
 #include <QDateTime>
+#include <QFont>
+#include <QFontDatabase>
 #include <QTranslator>
 #include <QSettings>
 #include <QSplashScreen>
+#include <QPainter>
 #include <QPixmap>
 #include <QString>
 #include <QFile>
@@ -29,7 +33,26 @@ int main(int argc, char *argv[]) {
 	QTranslator  trContent;
 	QTranslator  trQt;
 
-	QSplashScreen splash(QPixmap(":/icons/splash2.png"));
+	// create splash screen with major and minor version number
+	QPixmap canvas(":/splash/splash.png");
+
+	QPainter painter(&canvas);
+	painter.setPen(QColor(0, 174, 239));  // light blue
+
+	int fontId = QFontDatabase::addApplicationFont(":/splash/KozGoPro-ExtraLight.otf");
+	QString fontFamily = QFontDatabase::applicationFontFamilies(fontId).at(0);
+	QFont versionFont(fontFamily);
+	versionFont.setPixelSize(24);
+	painter.setFont(versionFont);
+
+	painter.drawText(
+		0, 0, 418, 130,
+		Qt::AlignRight | Qt::AlignBottom,
+		QString("%1.%2").arg(MAJOR_VERSION).arg(MINOR_VERSION)
+	);
+
+	painter.end();
+	QSplashScreen splash(canvas);
 	splash.show();
 
 	initLanguage(app, trContent, trQt, splash);

diff --git a/src/main.h b/src/main.h
@@ -2,8 +2,8 @@
 #define MAIN_H_
 
 #define MAJOR_VERSION 0x0001
-#define MINOR_VERSION 0x0008
-#define PATCH_VERSION 0x0004
+#define MINOR_VERSION 0x0009
+#define PATCH_VERSION 0x0000
 
 #define WIP_TEXT "" //" *work in progress* -> Please do not distribute."
 //#define WIP_VERSION

diff --git a/src/resources/KozGoPro-ExtraLight.otf b/src/resources/KozGoPro-ExtraLight.otf
diff --git a/src/resources/UltraStar-Manager.qrc b/src/resources/UltraStar-Manager.qrc
@@ -145,8 +145,6 @@
         <file>mediumVideoQuality.png</file>
     </qresource>
     <qresource prefix="/icons">
-        <file>splash.png</file>
-        <file>splash2.png</file>
         <file>cup.png</file>
         <file>UltraStar-Manager128.png</file>
         <file>UltraStar-Manager32.png</file>
@@ -282,4 +280,8 @@
         <file>user_big.png</file>
         <file>cover_big.png</file>
     </qresource>
+    <qresource prefix="/splash">
+        <file>splash.png</file>
+        <file>KozGoPro-ExtraLight.otf</file>
+    </qresource>
 </RCC>
diff --git a/src/resources/about_bgr.png b/src/resources/about_bgr.png
diff --git a/src/resources/splash.png b/src/resources/splash.png
diff --git a/src/resources/splash.psd b/src/resources/splash.psd
diff --git a/src/resources/splash2.png b/src/resources/splash2.png
diff --git a/src/resources/splash2.psd b/src/resources/splash2.psd