myQtHelper->getDataPath() removed
This commit is contained in:
+5
-7
@@ -36,8 +36,6 @@
|
||||
#include <QtGui>
|
||||
#include <QtCore>
|
||||
|
||||
#include "qthelper.h"
|
||||
|
||||
#include <cstdlib>
|
||||
#include <ctime>
|
||||
|
||||
@@ -68,7 +66,6 @@ int main( int argc, char **argv )
|
||||
{
|
||||
//create defaultconfig
|
||||
ConfigFile *myConfig = new ConfigFile(argc, argv);
|
||||
QtHelper *myQtHelper = new QtHelper;
|
||||
//ENABLE_LEAK_CHECK();
|
||||
|
||||
//_CrtSetBreakAlloc(49937);
|
||||
@@ -81,13 +78,14 @@ int main( int argc, char **argv )
|
||||
// set PlastiqueStyle even for mac-version to prevent artefacts on styled widgets
|
||||
a.setStyle(new QPlastiqueStyle);
|
||||
|
||||
QString myAppDataPath = QString::fromUtf8(myConfig->readConfigString("AppDataDir").c_str());
|
||||
//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");
|
||||
QFontDatabase::addApplicationFont (myAppDataPath +"fonts/n019003l.pfb");
|
||||
QFontDatabase::addApplicationFont (myAppDataPath +"fonts/VeraBd.ttf");
|
||||
|
||||
QString font1String("font-family: \"Nimbus Sans L\";");
|
||||
#endif
|
||||
@@ -95,11 +93,11 @@ int main( int argc, char **argv )
|
||||
|
||||
//Set translations
|
||||
QTranslator qtTranslator;
|
||||
qtTranslator.load(QString(myQtHelper->getDataPath() +"translations/qt_") + QString::fromStdString(myConfig->readConfigString("Language")));
|
||||
qtTranslator.load(QString(myAppDataPath +"translations/qt_") + QString::fromStdString(myConfig->readConfigString("Language")));
|
||||
a.installTranslator(&qtTranslator);
|
||||
|
||||
QTranslator translator;
|
||||
translator.load(QString(myQtHelper->getDataPath() +"translations/pokerth_") + QString::fromStdString(myConfig->readConfigString("Language")));
|
||||
translator.load(QString(myAppDataPath +"translations/pokerth_") + QString::fromStdString(myConfig->readConfigString("Language")));
|
||||
a.installTranslator(&translator);
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user