Running astyle.
This commit is contained in:
lotodore
+71
-71
@@ -64,102 +64,102 @@ class Game;
|
||||
int main( int argc, char **argv )
|
||||
{
|
||||
|
||||
//ENABLE_LEAK_CHECK();
|
||||
//ENABLE_LEAK_CHECK();
|
||||
|
||||
//_CrtSetBreakAlloc(49937);
|
||||
socket_startup();
|
||||
curl_global_init(CURL_GLOBAL_NOTHING);
|
||||
//_CrtSetBreakAlloc(49937);
|
||||
socket_startup();
|
||||
curl_global_init(CURL_GLOBAL_NOTHING);
|
||||
|
||||
/////// can be removed for non-qt-guis ////////////
|
||||
QtSingleApplication a( argc, argv );
|
||||
/////// can be removed for non-qt-guis ////////////
|
||||
QtSingleApplication a( argc, argv );
|
||||
|
||||
if (a.sendMessage("Wake up!")) {
|
||||
return 0;
|
||||
}
|
||||
if (a.sendMessage("Wake up!")) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
#ifdef __APPLE__
|
||||
// The following needs to be done directly after the application is created.
|
||||
QDir dir(QApplication::applicationDirPath());
|
||||
dir.cdUp();
|
||||
dir.cd("plugins");
|
||||
QApplication::setLibraryPaths(QStringList(dir.absolutePath()));
|
||||
// The following needs to be done directly after the application is created.
|
||||
QDir dir(QApplication::applicationDirPath());
|
||||
dir.cdUp();
|
||||
dir.cd("plugins");
|
||||
QApplication::setLibraryPaths(QStringList(dir.absolutePath()));
|
||||
#endif
|
||||
|
||||
//create defaultconfig
|
||||
ConfigFile *myConfig = new ConfigFile(argv[0], false);
|
||||
Log *myLog = new Log(myConfig);
|
||||
//create defaultconfig
|
||||
ConfigFile *myConfig = new ConfigFile(argv[0], false);
|
||||
Log *myLog = new Log(myConfig);
|
||||
|
||||
// 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
|
||||
// set PlastiqueStyle even for mac-version to prevent artefacts on styled widgets
|
||||
a.setStyle(new QPlastiqueStyle);
|
||||
|
||||
QFontDatabase::addApplicationFont (myAppDataPath +"fonts/n019003l.pfb");
|
||||
QFontDatabase::addApplicationFont (myAppDataPath +"fonts/VeraBd.ttf");
|
||||
QFontDatabase::addApplicationFont (myAppDataPath +"fonts/c059013l.pfb");
|
||||
QFontDatabase::addApplicationFont (myAppDataPath +"fonts/DejaVuSans-Bold.ttf");
|
||||
QString myAppDataPath = QString::fromUtf8(myConfig->readConfigString("AppDataDir").c_str());
|
||||
//set QApplication default font
|
||||
|
||||
QFontDatabase::addApplicationFont (myAppDataPath +"fonts/n019003l.pfb");
|
||||
QFontDatabase::addApplicationFont (myAppDataPath +"fonts/VeraBd.ttf");
|
||||
QFontDatabase::addApplicationFont (myAppDataPath +"fonts/c059013l.pfb");
|
||||
QFontDatabase::addApplicationFont (myAppDataPath +"fonts/DejaVuSans-Bold.ttf");
|
||||
|
||||
#ifdef _WIN32
|
||||
QString font1String("QApplication, QWidget, QDialog { font-size: 12px; }");
|
||||
QString font1String("QApplication, QWidget, QDialog { font-size: 12px; }");
|
||||
#elif __APPLE__
|
||||
// QString font1String("font-family: \"Lucida Grande\";");
|
||||
QString font1String("QApplication, QWidget, QDialog { font-size: 11px; }");
|
||||
// QString font1String("font-family: \"Lucida Grande\";");
|
||||
QString font1String("QApplication, QWidget, QDialog { font-size: 11px; }");
|
||||
#elif ANDROID
|
||||
QString font1String("QApplication, QWidget, QDialog { font-family: \"Nimbus Sans L\"; font-size: 26px; }");
|
||||
QPalette p = a.palette();
|
||||
p.setColor(QPalette::Button, QColor::fromRgb(80,80,80));
|
||||
p.setColor(QPalette::Base, QColor::fromRgb(80,80,80));
|
||||
p.setColor(QPalette::Window, QColor::fromRgb(50,50,50));
|
||||
p.setColor(QPalette::ButtonText, QColor::fromRgb(255,255,255));
|
||||
p.setColor(QPalette::Disabled, QPalette::ButtonText, QColor::fromRgb(100,100,100));
|
||||
p.setColor(QPalette::WindowText, QColor::fromRgb(255,255,255));
|
||||
p.setColor(QPalette::Disabled, QPalette::WindowText, QColor::fromRgb(100,100,100));
|
||||
p.setColor(QPalette::Text, QColor::fromRgb(255,255,255));
|
||||
p.setColor(QPalette::Disabled, QPalette::Text, QColor::fromRgb(100,100,100));
|
||||
p.setColor(QPalette::Link, QColor::fromRgb(192,192,255));
|
||||
p.setColor(QPalette::LinkVisited, QColor::fromRgb(192,192,255));
|
||||
a.setPalette(p);
|
||||
QString font1String("QApplication, QWidget, QDialog { font-family: \"Nimbus Sans L\"; font-size: 26px; }");
|
||||
QPalette p = a.palette();
|
||||
p.setColor(QPalette::Button, QColor::fromRgb(80,80,80));
|
||||
p.setColor(QPalette::Base, QColor::fromRgb(80,80,80));
|
||||
p.setColor(QPalette::Window, QColor::fromRgb(50,50,50));
|
||||
p.setColor(QPalette::ButtonText, QColor::fromRgb(255,255,255));
|
||||
p.setColor(QPalette::Disabled, QPalette::ButtonText, QColor::fromRgb(100,100,100));
|
||||
p.setColor(QPalette::WindowText, QColor::fromRgb(255,255,255));
|
||||
p.setColor(QPalette::Disabled, QPalette::WindowText, QColor::fromRgb(100,100,100));
|
||||
p.setColor(QPalette::Text, QColor::fromRgb(255,255,255));
|
||||
p.setColor(QPalette::Disabled, QPalette::Text, QColor::fromRgb(100,100,100));
|
||||
p.setColor(QPalette::Link, QColor::fromRgb(192,192,255));
|
||||
p.setColor(QPalette::LinkVisited, QColor::fromRgb(192,192,255));
|
||||
a.setPalette(p);
|
||||
#else
|
||||
QString font1String("QApplication, QWidget, QDialog { font-family: \"Nimbus Sans L\"; font-size: 12px; }");
|
||||
QString font1String("QApplication, QWidget, QDialog { font-family: \"Nimbus Sans L\"; font-size: 12px; }");
|
||||
#endif
|
||||
a.setStyleSheet(font1String + " QDialogButtonBox, QMessageBox { dialogbuttonbox-buttons-have-icons: 1; dialog-ok-icon: url(:/gfx/dialog_ok_apply.png); dialog-cancel-icon: url(:/gfx/dialog_close.png); dialog-close-icon: url(:/gfx/dialog_close.png); dialog-yes-icon: url(:/gfx/dialog_ok_apply.png); dialog-no-icon: url(:/gfx/dialog_close.png) }");
|
||||
a.setStyleSheet(font1String + " QDialogButtonBox, QMessageBox { dialogbuttonbox-buttons-have-icons: 1; dialog-ok-icon: url(:/gfx/dialog_ok_apply.png); dialog-cancel-icon: url(:/gfx/dialog_close.png); dialog-close-icon: url(:/gfx/dialog_close.png); dialog-yes-icon: url(:/gfx/dialog_ok_apply.png); dialog-no-icon: url(:/gfx/dialog_close.png) }");
|
||||
|
||||
QPixmap pixmap(myAppDataPath + "gfx/gui/misc/welcomepokerth.png");
|
||||
QPixmap pixmap(myAppDataPath + "gfx/gui/misc/welcomepokerth.png");
|
||||
#ifdef ANDROID
|
||||
QDesktopWidget dw;
|
||||
pixmap = pixmap.scaled(dw.screenGeometry().width(), dw.screenGeometry().height(), Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
|
||||
QDesktopWidget dw;
|
||||
pixmap = pixmap.scaled(dw.screenGeometry().width(), dw.screenGeometry().height(), Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
|
||||
#endif
|
||||
StartSplash splash(pixmap);
|
||||
if(!myConfig->readConfigInt("DisableSplashScreenOnStartup")) {
|
||||
splash.show();
|
||||
splash.showMessage(QString("Version %1").arg(POKERTH_BETA_RELEASE_STRING), 0x0042, QColor(255,255,255));
|
||||
}
|
||||
StartSplash splash(pixmap);
|
||||
if(!myConfig->readConfigInt("DisableSplashScreenOnStartup")) {
|
||||
splash.show();
|
||||
splash.showMessage(QString("Version %1").arg(POKERTH_BETA_RELEASE_STRING), 0x0042, QColor(255,255,255));
|
||||
}
|
||||
|
||||
//Set translations
|
||||
QTranslator qtTranslator;
|
||||
qtTranslator.load(QString(myAppDataPath +"translations/qt_") + QString::fromStdString(myConfig->readConfigString("Language")));
|
||||
a.installTranslator(&qtTranslator);
|
||||
//Set translations
|
||||
QTranslator qtTranslator;
|
||||
qtTranslator.load(QString(myAppDataPath +"translations/qt_") + QString::fromStdString(myConfig->readConfigString("Language")));
|
||||
a.installTranslator(&qtTranslator);
|
||||
|
||||
QTranslator translator;
|
||||
translator.load(QString(myAppDataPath +"translations/pokerth_") + QString::fromStdString(myConfig->readConfigString("Language")));
|
||||
a.installTranslator(&translator);
|
||||
QTranslator translator;
|
||||
translator.load(QString(myAppDataPath +"translations/pokerth_") + QString::fromStdString(myConfig->readConfigString("Language")));
|
||||
a.installTranslator(&translator);
|
||||
|
||||
qRegisterMetaType<unsigned>("unsigned");
|
||||
qRegisterMetaType<boost::shared_ptr<Game> >("boost::shared_ptr<Game>");
|
||||
qRegisterMetaType<ServerStats>("ServerStats");
|
||||
qRegisterMetaType<DenyGameInvitationReason>("DenyGameInvitationReason");
|
||||
///////////////////////////////////////////////////
|
||||
qRegisterMetaType<unsigned>("unsigned");
|
||||
qRegisterMetaType<boost::shared_ptr<Game> >("boost::shared_ptr<Game>");
|
||||
qRegisterMetaType<ServerStats>("ServerStats");
|
||||
qRegisterMetaType<DenyGameInvitationReason>("DenyGameInvitationReason");
|
||||
///////////////////////////////////////////////////
|
||||
|
||||
startWindowImpl mainWin(myConfig,myLog);
|
||||
a.setActivationWindow(&mainWin, true);
|
||||
startWindowImpl mainWin(myConfig,myLog);
|
||||
a.setActivationWindow(&mainWin, true);
|
||||
|
||||
int retVal = a.exec();
|
||||
int retVal = a.exec();
|
||||
|
||||
curl_global_cleanup();
|
||||
socket_cleanup();
|
||||
curl_global_cleanup();
|
||||
socket_cleanup();
|
||||
|
||||
|
||||
return retVal;
|
||||
return retVal;
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user