diff --git a/src/main.cpp b/src/main.cpp index e2cfc298..40190550 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -4,10 +4,13 @@ #include "QUMessageBox.h" #include +#include #include +#include #include #include #include +#include #include #include #include @@ -29,7 +32,24 @@ 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 + + QFont font(":/splash/KozGoPro-ExtraLight.otf"); + font.setPointSize(24); + painter.setFont(font); + + 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 index 2a8d555f..23d15609 100644 --- 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 new file mode 100644 index 00000000..40ccc0ae Binary files /dev/null and b/src/resources/KozGoPro-ExtraLight.otf differ diff --git a/src/resources/UltraStar-Manager.qrc b/src/resources/UltraStar-Manager.qrc index 337bea7d..801a22ad 100644 --- a/src/resources/UltraStar-Manager.qrc +++ b/src/resources/UltraStar-Manager.qrc @@ -145,8 +145,6 @@ mediumVideoQuality.png - splash.png - splash2.png cup.png UltraStar-Manager128.png UltraStar-Manager32.png @@ -282,4 +280,8 @@ user_big.png cover_big.png + + splash.png + KozGoPro-ExtraLight.otf + diff --git a/src/resources/splash.png b/src/resources/splash.png index 77549ebc..cb3f3ea5 100644 Binary files a/src/resources/splash.png and b/src/resources/splash.png differ diff --git a/src/resources/splash.psd b/src/resources/splash.psd index d120952b..3c1fe05c 100644 Binary files a/src/resources/splash.psd and b/src/resources/splash.psd differ diff --git a/src/resources/splash2.png b/src/resources/splash2.png deleted file mode 100644 index db2d48e5..00000000 Binary files a/src/resources/splash2.png and /dev/null differ diff --git a/src/resources/splash2.psd b/src/resources/splash2.psd deleted file mode 100644 index c4ccd7e8..00000000 Binary files a/src/resources/splash2.psd and /dev/null differ