diff --git a/src/gui/qt/deck.qrc b/src/gui/qt/deck.qrc index 70280ad4..d5d49037 100755 --- a/src/gui/qt/deck.qrc +++ b/src/gui/qt/deck.qrc @@ -56,8 +56,8 @@ fonts/andybold.ttf - fonts/c059013l.ttf - fonts/n019003l.ttf + fonts/c059013l.pfb + fonts/n019003l.pfb graphics/1px.png diff --git a/src/gui/qt/fonts/c059013l.pfb b/src/gui/qt/fonts/c059013l.pfb new file mode 100644 index 00000000..0abd0a10 Binary files /dev/null and b/src/gui/qt/fonts/c059013l.pfb differ diff --git a/src/gui/qt/fonts/c059013l.ttf b/src/gui/qt/fonts/c059013l.ttf deleted file mode 100644 index 83ebf3ea..00000000 Binary files a/src/gui/qt/fonts/c059013l.ttf and /dev/null differ diff --git a/src/gui/qt/fonts/n019003l.pfb b/src/gui/qt/fonts/n019003l.pfb new file mode 100644 index 00000000..82b6ad86 Binary files /dev/null and b/src/gui/qt/fonts/n019003l.pfb differ diff --git a/src/gui/qt/fonts/n019003l.ttf b/src/gui/qt/fonts/n019003l.ttf deleted file mode 100644 index 309c0a23..00000000 Binary files a/src/gui/qt/fonts/n019003l.ttf and /dev/null differ diff --git a/src/gui/qt/mainwindow/mainwindowimpl.cpp b/src/gui/qt/mainwindow/mainwindowimpl.cpp index e5d862ed..15d6631e 100755 --- a/src/gui/qt/mainwindow/mainwindowimpl.cpp +++ b/src/gui/qt/mainwindow/mainwindowimpl.cpp @@ -53,8 +53,12 @@ mainWindowImpl::mainWindowImpl(QMainWindow *parent) int i; // Schriftart laden - QFontDatabase::addApplicationFont (":fonts/fonts/n019003l.ttf"); +#ifdef _WIN32 + QFont tmpFont("Arial",9); +#else + QFontDatabase::addApplicationFont (":fonts/fonts/n019003l.pfb"); QFont tmpFont("Nimbus Sans L",9); +#endif QApplication::setFont(tmpFont); myConfig = new ConfigFile; diff --git a/src/gui/qt/mainwindow/startsplash/startsplash.cpp b/src/gui/qt/mainwindow/startsplash/startsplash.cpp index 9f01d0fe..2c643e9b 100644 --- a/src/gui/qt/mainwindow/startsplash/startsplash.cpp +++ b/src/gui/qt/mainwindow/startsplash/startsplash.cpp @@ -22,7 +22,7 @@ StartSplash::StartSplash(mainWindowImpl *parent) : QSplashScreen(parent), myW(parent) { - QFontDatabase::addApplicationFont (":fonts/fonts/c059013l.ttf"); + QFontDatabase::addApplicationFont (":fonts/fonts/c059013l.pfb"); QFontDatabase::addApplicationFont (":fonts/fonts/andybold.ttf"); frameNo = 52; @@ -48,7 +48,12 @@ void StartSplash::nextAnimationFrame() { void StartSplash::paintEvent(QPaintEvent * event) { QPainter painter(this); + +#ifdef _WIN32 + QFont welcomeFont("Times New Roman",29); +#else QFont welcomeFont("Century Schoolbook L",29); +#endif QFont haveFont("Andy MT",30); QPixmap logo(":/graphics/graphics/logo-140-100.png");