font fixes

This commit is contained in:
doitux
2007-09-04 22:54:07 +00:00
parent def679e66c
commit 2f9f603bef
2 changed files with 13 additions and 19 deletions
-19
View File
@@ -72,25 +72,6 @@ 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!
+13
View File
@@ -81,6 +81,19 @@ 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, QWidget, QDialog { " + font1String + " font-size: 12px; }");
//Set translations
QTranslator qtTranslator;
qtTranslator.load(QString(myQtHelper->getDataPath() +"translations/qt_") + QString::fromStdString(myConfig->readConfigString("Language")));
a.installTranslator(&qtTranslator);