sco/pokerth
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

windows fonts fix (next try)

Browse Source
This commit is contained in:
doitux
2007-12-04 22:41:38 +00:00
parent a3152ba87e
commit f51cba271f
3 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/fonts/DejaVuSansBold.ttf
BIN
View File
Binary file not shown.
src/gui/qt/mainwindow/mainwindowimpl.cpp
+3 -1
View File
@@ -297,7 +297,8 @@ mainWindowImpl::mainWindowImpl(ConfigFile *c, QMainWindow *parent)
// Schriftart laden und für Dialoge setzen // Schriftart laden und für Dialoge setzen
#ifdef _WIN32 #ifdef _WIN32
font1String = "font-family: \"Arial\";"; font1String = "font-family: \"Arial\";";
font2String = "font-family: \"Bitstream Vera Sans\";"; // font2String = "font-family: \"Bitstream Vera Sans\";";
font2String = "font-family: \"DejaVu Sans\";";
QString fontsize= "11"; QString fontsize= "11";
#else #else
#ifdef __APPLE__ #ifdef __APPLE__
@@ -307,6 +308,7 @@ mainWindowImpl::mainWindowImpl(ConfigFile *c, QMainWindow *parent)
#else #else
font1String = "font-family: \"Nimbus Sans L\";"; font1String = "font-family: \"Nimbus Sans L\";";
// font2String = "font-family: \"DejaVu Sans\";";
font2String = "font-family: \"Bitstream Vera Sans\";"; font2String = "font-family: \"Bitstream Vera Sans\";";
QString fontsize= "10"; QString fontsize= "10";
src/pokerth.cpp
+7 -5
View File
@@ -58,9 +58,9 @@
#endif #endif
//Uncomment this for RELEASE //Uncomment this for RELEASE
#include <QtPlugin> // #include <QtPlugin>
Q_IMPORT_PLUGIN(qjpeg) // Q_IMPORT_PLUGIN(qjpeg)
Q_IMPORT_PLUGIN(qgif) // Q_IMPORT_PLUGIN(qgif)
using namespace std; using namespace std;
@@ -87,6 +87,7 @@ int main( int argc, char **argv )
QString myAppDataPath = QString::fromUtf8(myConfig->readConfigString("AppDataDir").c_str()); QString myAppDataPath = QString::fromUtf8(myConfig->readConfigString("AppDataDir").c_str());
//set QApplication default font //set QApplication default font
#ifdef _WIN32 #ifdef _WIN32
QString font1String("font-family: \"Arial\";"); QString font1String("font-family: \"Arial\";");
a.setStyleSheet("QApplication, QWidget, QDialog { " + font1String + " font-size: 12px; }"); a.setStyleSheet("QApplication, QWidget, QDialog { " + font1String + " font-size: 12px; }");
@@ -94,15 +95,16 @@ int main( int argc, char **argv )
// #ifdef __APPLE__ // #ifdef __APPLE__
// QString font1String("font-family: \"Lucida Grande\";"); // QString font1String("font-family: \"Lucida Grande\";");
// #else // #else
QFontDatabase::addApplicationFont (myAppDataPath +"fonts/VeraBd.ttf");
QFontDatabase::addApplicationFont (myAppDataPath +"fonts/n019003l.pfb"); QFontDatabase::addApplicationFont (myAppDataPath +"fonts/n019003l.pfb");
QString font1String("font-family: \"Nimbus Sans L\";"); QString font1String("font-family: \"Nimbus Sans L\";");
// #endif // #endif
a.setStyleSheet("QApplication, QWidget, QDialog { " + font1String + " font-size: 12px; }"); a.setStyleSheet("QApplication, QWidget, QDialog { " + font1String + " font-size: 12px; }");
#endif #endif
//add OS-independent fonts //add OS-independent fonts
QFontDatabase::addApplicationFont (myAppDataPath +"fonts/VeraBd.ttf");
QFontDatabase::addApplicationFont (myAppDataPath +"fonts/DejaVuSansBold.ttf");
QFontDatabase::addApplicationFont (myAppDataPath +"fonts/c059013l.pfb"); QFontDatabase::addApplicationFont (myAppDataPath +"fonts/c059013l.pfb");
//Set translations //Set translations
QTranslator qtTranslator; QTranslator qtTranslator;
qtTranslator.load(QString(myAppDataPath +"translations/qt_") + QString::fromStdString(myConfig->readConfigString("Language"))); qtTranslator.load(QString(myAppDataPath +"translations/qt_") + QString::fromStdString(myConfig->readConfigString("Language")));