diff --git a/src/gui/qt/mainwindow/mainwindowimpl.cpp b/src/gui/qt/mainwindow/mainwindowimpl.cpp index 09a82683..1659beeb 100755 --- a/src/gui/qt/mainwindow/mainwindowimpl.cpp +++ b/src/gui/qt/mainwindow/mainwindowimpl.cpp @@ -72,6 +72,25 @@ mainWindowImpl::mainWindowImpl(ConfigFile *c, QMainWindow *parent) myQtHelper = new QtHelper; + +#ifdef _WIN32 + QFont tmpFont1; + tmpFont1.setFamily("Arial"); + tmpFont1.setPixelSize(12); +// if(this->logicalDpiX() > 105) { tmpFont.setFont("Arial",8); } +// else { QFont tmpFont("Arial",9); } + +#else + QFontDatabase::addApplicationFont (myQtHelper->getDataPath() +"fonts/n019003l.pfb"); + QFontDatabase::addApplicationFont (myQtHelper->getDataPath() +"fonts/VeraBd.ttf"); +// QFont tmpFont("Nimbus Sans L",9); + QFont tmpFont1; + tmpFont1.setFamily("Nimbus Sans L"); + tmpFont1.setPixelSize(12); +#endif + QApplication::setFont(tmpFont1); + + setupUi(this); //pixmapCardsLabel erstellen und ins Layout einfügen! diff --git a/src/pokerth.cpp b/src/pokerth.cpp index 03bac386..f776fb68 100755 --- a/src/pokerth.cpp +++ b/src/pokerth.cpp @@ -81,19 +81,6 @@ int main( int argc, char **argv ) // set PlastiqueStyle even for mac-version to prevent artefacts on styled widgets a.setStyle(new QPlastiqueStyle); - //set QApplication default font -#ifdef _WIN32 - QString font1String("font-family: \"Arial\";"); - -#else - QFontDatabase::addApplicationFont (myQtHelper->getDataPath() +"fonts/n019003l.pfb"); - QFontDatabase::addApplicationFont (myQtHelper->getDataPath() +"fonts/VeraBd.ttf"); - - QString font1String("font-family: \"Nimbus Sans L\";"); -#endif - a.setStyleSheet("QApplication { " + font1String + " font-size: 12px; }"); - - QTranslator qtTranslator; qtTranslator.load(QString(myQtHelper->getDataPath() +"translations/qt_") + QString::fromStdString(myConfig->readConfigString("Language"))); a.installTranslator(&qtTranslator);