diff --git a/data/fonts/DejaVuSansBold.ttf b/data/fonts/DejaVuSansBold.ttf new file mode 100644 index 00000000..773d6334 Binary files /dev/null and b/data/fonts/DejaVuSansBold.ttf differ diff --git a/src/gui/qt/mainwindow/mainwindowimpl.cpp b/src/gui/qt/mainwindow/mainwindowimpl.cpp index 11972250..80eb7118 100755 --- a/src/gui/qt/mainwindow/mainwindowimpl.cpp +++ b/src/gui/qt/mainwindow/mainwindowimpl.cpp @@ -297,7 +297,8 @@ mainWindowImpl::mainWindowImpl(ConfigFile *c, QMainWindow *parent) // Schriftart laden und für Dialoge setzen #ifdef _WIN32 font1String = "font-family: \"Arial\";"; - font2String = "font-family: \"Bitstream Vera Sans\";"; +// font2String = "font-family: \"Bitstream Vera Sans\";"; + font2String = "font-family: \"DejaVu Sans\";"; QString fontsize= "11"; #else #ifdef __APPLE__ @@ -307,6 +308,7 @@ mainWindowImpl::mainWindowImpl(ConfigFile *c, QMainWindow *parent) #else font1String = "font-family: \"Nimbus Sans L\";"; +// font2String = "font-family: \"DejaVu Sans\";"; font2String = "font-family: \"Bitstream Vera Sans\";"; QString fontsize= "10"; diff --git a/src/pokerth.cpp b/src/pokerth.cpp index fcdd1f0f..a230fa15 100755 --- a/src/pokerth.cpp +++ b/src/pokerth.cpp @@ -58,9 +58,9 @@ #endif //Uncomment this for RELEASE -#include -Q_IMPORT_PLUGIN(qjpeg) -Q_IMPORT_PLUGIN(qgif) +// #include +// Q_IMPORT_PLUGIN(qjpeg) +// Q_IMPORT_PLUGIN(qgif) using namespace std; @@ -87,6 +87,7 @@ int main( int argc, char **argv ) QString myAppDataPath = QString::fromUtf8(myConfig->readConfigString("AppDataDir").c_str()); //set QApplication default font + #ifdef _WIN32 QString font1String("font-family: \"Arial\";"); a.setStyleSheet("QApplication, QWidget, QDialog { " + font1String + " font-size: 12px; }"); @@ -94,15 +95,16 @@ int main( int argc, char **argv ) // #ifdef __APPLE__ // QString font1String("font-family: \"Lucida Grande\";"); // #else - QFontDatabase::addApplicationFont (myAppDataPath +"fonts/VeraBd.ttf"); QFontDatabase::addApplicationFont (myAppDataPath +"fonts/n019003l.pfb"); QString font1String("font-family: \"Nimbus Sans L\";"); // #endif a.setStyleSheet("QApplication, QWidget, QDialog { " + font1String + " font-size: 12px; }"); #endif //add OS-independent fonts + QFontDatabase::addApplicationFont (myAppDataPath +"fonts/VeraBd.ttf"); + QFontDatabase::addApplicationFont (myAppDataPath +"fonts/DejaVuSansBold.ttf"); QFontDatabase::addApplicationFont (myAppDataPath +"fonts/c059013l.pfb"); - + //Set translations QTranslator qtTranslator; qtTranslator.load(QString(myAppDataPath +"translations/qt_") + QString::fromStdString(myConfig->readConfigString("Language")));