Running astyle.
This commit is contained in:
lotodore
@@ -21,8 +21,8 @@
|
||||
#include <QtCore>
|
||||
|
||||
#ifdef ANDROID
|
||||
#include <QPlatformNativeInterface>
|
||||
#include <jni.h>
|
||||
#include <QPlatformNativeInterface>
|
||||
#include <jni.h>
|
||||
#endif
|
||||
|
||||
aboutPokerthImpl::aboutPokerthImpl(QWidget *parent, ConfigFile *c)
|
||||
@@ -39,11 +39,11 @@ aboutPokerthImpl::aboutPokerthImpl(QWidget *parent, ConfigFile *c)
|
||||
QPalette myPalette = textBrowser_licence->palette();
|
||||
#ifdef GUI_800x480
|
||||
#ifdef ANDROID
|
||||
myPalette.setColor(QPalette::Base, QColor(255,255,255,255));
|
||||
myPalette.setColor(QPalette::Text, QColor(0,0,0,255));
|
||||
myPalette.setColor(QPalette::Base, QColor(255,255,255,255));
|
||||
myPalette.setColor(QPalette::Text, QColor(0,0,0,255));
|
||||
#else
|
||||
myPalette.setColor(QPalette::Base, QColor(0,0,0,255));
|
||||
myPalette.setColor(QPalette::Text, QColor(255,255,255,255));
|
||||
myPalette.setColor(QPalette::Base, QColor(0,0,0,255));
|
||||
myPalette.setColor(QPalette::Text, QColor(255,255,255,255));
|
||||
#endif
|
||||
#else
|
||||
QColor myColor = myPalette.color(QPalette::Window);
|
||||
@@ -52,7 +52,7 @@ aboutPokerthImpl::aboutPokerthImpl(QWidget *parent, ConfigFile *c)
|
||||
textBrowser_licence->setPalette(myPalette);
|
||||
textBrowser_2->setPalette(myPalette);
|
||||
textBrowser_3->setPalette(myPalette);
|
||||
textBrowser_4->setPalette(myPalette);
|
||||
textBrowser_4->setPalette(myPalette);
|
||||
|
||||
QFile gplFile(QDir::toNativeSeparators(myAppDataPath+"misc/agpl.html"));
|
||||
QString gplString;
|
||||
@@ -68,32 +68,31 @@ aboutPokerthImpl::aboutPokerthImpl(QWidget *parent, ConfigFile *c)
|
||||
label_logo->setPixmap(QPixmap(":/gfx/logoChip3D.png"));
|
||||
|
||||
#ifdef GUI_800x480
|
||||
label_pokerthVersion->setStyleSheet("QLabel { font-size: 30px; font-weight: bold;}");
|
||||
label_pokerthVersion->setStyleSheet("QLabel { font-size: 30px; font-weight: bold;}");
|
||||
#else
|
||||
label_pokerthVersion->setStyleSheet("QLabel { font-size: 16px; font-weight: bold;}");
|
||||
#endif
|
||||
|
||||
#ifdef ANDROID
|
||||
JavaVM *currVM = (JavaVM *)QApplication::platformNativeInterface()->nativeResourceForWidget("JavaVM", 0);
|
||||
JNIEnv* env;
|
||||
int api = -2;
|
||||
if (currVM->AttachCurrentThread(&env, NULL)<0) {
|
||||
qCritical()<<"AttachCurrentThread failed";
|
||||
}
|
||||
else {
|
||||
jclass jclassApplicationClass = env->FindClass("android/os/Build$VERSION");
|
||||
if (jclassApplicationClass) {
|
||||
api = env->GetStaticIntField(jclassApplicationClass, env->GetStaticFieldID(jclassApplicationClass,"SDK_INT", "I"));
|
||||
}
|
||||
currVM->DetachCurrentThread();
|
||||
}
|
||||
label_pokerthVersion->setText(QString(tr("PokerTH %1 for Android (API%2)").arg(POKERTH_BETA_RELEASE_STRING).arg(api)));
|
||||
JavaVM *currVM = (JavaVM *)QApplication::platformNativeInterface()->nativeResourceForWidget("JavaVM", 0);
|
||||
JNIEnv* env;
|
||||
int api = -2;
|
||||
if (currVM->AttachCurrentThread(&env, NULL)<0) {
|
||||
qCritical()<<"AttachCurrentThread failed";
|
||||
} else {
|
||||
jclass jclassApplicationClass = env->FindClass("android/os/Build$VERSION");
|
||||
if (jclassApplicationClass) {
|
||||
api = env->GetStaticIntField(jclassApplicationClass, env->GetStaticFieldID(jclassApplicationClass,"SDK_INT", "I"));
|
||||
}
|
||||
currVM->DetachCurrentThread();
|
||||
}
|
||||
label_pokerthVersion->setText(QString(tr("PokerTH %1 for Android (API%2)").arg(POKERTH_BETA_RELEASE_STRING).arg(api)));
|
||||
#else
|
||||
label_pokerthVersion->setText(QString(tr("PokerTH %1").arg(POKERTH_BETA_RELEASE_STRING)));
|
||||
label_pokerthVersion->setText(QString(tr("PokerTH %1").arg(POKERTH_BETA_RELEASE_STRING)));
|
||||
#endif
|
||||
this->setWindowTitle(QString(tr("About PokerTH %1").arg(POKERTH_BETA_RELEASE_STRING)));
|
||||
|
||||
//add text to lables and textbrowsers
|
||||
//add text to lables and textbrowsers
|
||||
QString thxToInfos;
|
||||
thxToInfos.append(tr("- Wikimedia Commons: for different popular avatar picture resources")+"<br>");
|
||||
thxToInfos.append(tr("- Benedikt, Erhard, Felix, Florian, Linus, Lothar, Steffi, Caro: for people avatar pictures")+"<br>");
|
||||
@@ -102,36 +101,36 @@ aboutPokerthImpl::aboutPokerthImpl(QWidget *parent, ConfigFile *c)
|
||||
thxToInfos.append(tr("- doc_dos: for self recorded chip sounds")+"<br>");
|
||||
thxToInfos.append(tr("- thiger, dunkanx, BerndA, coldz, drull: for different patches")+"<br>");
|
||||
thxToInfos.append(tr("- kraut: for internet-game-server hosting and administration")+"<br>");
|
||||
thxToInfos.append(tr("- danuxi: for startwindow background gfx and danuxi1 table background")+"<br>");
|
||||
thxToInfos.append(tr("- danuxi: for startwindow background gfx and danuxi1 table background")+"<br>");
|
||||
thxToInfos.append(tr("- heyn: for moderating forum and organise bugtracker and feature requests")+"<br>");
|
||||
thxToInfos.append(tr("- texas_outlaw: for new table sounds")+"<br>");
|
||||
textBrowser_3->setHtml(thxToInfos);
|
||||
|
||||
QString infoText;
|
||||
infoText.append(tr("- Poker engine for the popular Texas Hold'em Poker")+"\n");
|
||||
infoText.append(tr("- Singleplayer games with up to 9 computer-opponents")+"\n");
|
||||
infoText.append(tr("- Multiplayer network games")+"\n");
|
||||
infoText.append(tr("- Internet online games")+"\n");
|
||||
infoText.append(tr("- Changeable gui with online style gallery")+"\n");
|
||||
infoText.append(tr("- Online ranking website with result tables")+"\n");
|
||||
infoText.append("\n");
|
||||
QString thisYear = QDate::currentDate().toString("yyyy");
|
||||
infoText.append("(c)2006-"+thisYear+", Felix Hammer, Florian Thauer, Lothar May");
|
||||
label_infotext->setText(infoText);
|
||||
QString infoText;
|
||||
infoText.append(tr("- Poker engine for the popular Texas Hold'em Poker")+"\n");
|
||||
infoText.append(tr("- Singleplayer games with up to 9 computer-opponents")+"\n");
|
||||
infoText.append(tr("- Multiplayer network games")+"\n");
|
||||
infoText.append(tr("- Internet online games")+"\n");
|
||||
infoText.append(tr("- Changeable gui with online style gallery")+"\n");
|
||||
infoText.append(tr("- Online ranking website with result tables")+"\n");
|
||||
infoText.append("\n");
|
||||
QString thisYear = QDate::currentDate().toString("yyyy");
|
||||
infoText.append("(c)2006-"+thisYear+", Felix Hammer, Florian Thauer, Lothar May");
|
||||
label_infotext->setText(infoText);
|
||||
|
||||
QString projectText;
|
||||
projectText.append("<b>"+tr("Project page:")+"</b><br>");
|
||||
projectText.append(" <a href='http://www.pokerth.net'>http://www.pokerth.net</a><br>");
|
||||
projectText.append("<b>IRC:</b><br>");
|
||||
projectText.append(" #pokerth (irc.freenode.net)<br>");
|
||||
projectText.append("<b>"+tr("Authors:")+"</b><br>");
|
||||
projectText.append(" Felix Hammer (<a href=mailto:doitux@pokerth.net>doitux@pokerth.net</a>)<br>");
|
||||
projectText.append(" - "+tr("initial idea, basic architecture, gui implementation, gui graphics editing, linux package")+"<br>");
|
||||
projectText.append(" Florian Thauer (<a href=mailto:floty@pokerth.net>floty@pokerth.net</a>)<br>");
|
||||
projectText.append(" - "+tr("initial idea, basic architecture, engine development")+"<br>");
|
||||
projectText.append(" Lothar May (<a href=mailto:lotodore@pokerth.net>lotodore@pokerth.net</a>)<br>");
|
||||
projectText.append(" - "+tr("basic architecture, network development, windows package, MacOS package")+"<br>");
|
||||
projectText.append(" Oskar Lindqvist (<a href=mailto:tranberry@pokerth.net>tranberry@pokerth.net</a>)<br>");
|
||||
projectText.append(" - "+tr("initial gui graphics design")+"<br>");
|
||||
textBrowser_2->setHtml(projectText);
|
||||
QString projectText;
|
||||
projectText.append("<b>"+tr("Project page:")+"</b><br>");
|
||||
projectText.append(" <a href='http://www.pokerth.net'>http://www.pokerth.net</a><br>");
|
||||
projectText.append("<b>IRC:</b><br>");
|
||||
projectText.append(" #pokerth (irc.freenode.net)<br>");
|
||||
projectText.append("<b>"+tr("Authors:")+"</b><br>");
|
||||
projectText.append(" Felix Hammer (<a href=mailto:doitux@pokerth.net>doitux@pokerth.net</a>)<br>");
|
||||
projectText.append(" - "+tr("initial idea, basic architecture, gui implementation, gui graphics editing, linux package")+"<br>");
|
||||
projectText.append(" Florian Thauer (<a href=mailto:floty@pokerth.net>floty@pokerth.net</a>)<br>");
|
||||
projectText.append(" - "+tr("initial idea, basic architecture, engine development")+"<br>");
|
||||
projectText.append(" Lothar May (<a href=mailto:lotodore@pokerth.net>lotodore@pokerth.net</a>)<br>");
|
||||
projectText.append(" - "+tr("basic architecture, network development, windows package, MacOS package")+"<br>");
|
||||
projectText.append(" Oskar Lindqvist (<a href=mailto:tranberry@pokerth.net>tranberry@pokerth.net</a>)<br>");
|
||||
projectText.append(" - "+tr("initial gui graphics design")+"<br>");
|
||||
textBrowser_2->setHtml(projectText);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user