diff --git a/pokerth.png b/pokerth.png index e36e86aa..b5e981b5 100644 Binary files a/pokerth.png and b/pokerth.png differ diff --git a/src/gui/qt/aboutpokerth.ui b/src/gui/qt/aboutpokerth.ui index 412f17bd..6d844ac2 100755 --- a/src/gui/qt/aboutpokerth.ui +++ b/src/gui/qt/aboutpokerth.ui @@ -38,7 +38,7 @@ - + 0 @@ -46,20 +46,7 @@ - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Nimbus Sans L'; font-size:9pt; font-weight:400; font-style:normal;"> -<table border="0" style="-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;"> -<tr> -<td style="border: none;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">- Poker engine for the popular &quot;Texas Hold'em&quot; Poker</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">- Singleplayer games with up to 9 computer-opponents</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">- Multiplayer network games<br />- Internet online games<br />- Changeable gui with online style gallery<br />- </span><a href="http://online-ranking.pokerth.net"><span style=" font-size:8pt; text-decoration: underline; color:#0057ae;">Online ranking website</span></a><span style=" font-size:8pt;"> with result tables</span></p> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"></p> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"></p> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">© 2006-2011, Felix Hammer, Florian Thauer, Lothar May</span></p></td></tr></table></body></html> + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop @@ -131,24 +118,7 @@ p, li { white-space: pre-wrap; } <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'Nimbus Sans L'; font-size:9pt; font-weight:400; font-style:normal;"> -<table border="0" style="-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;"> -<tr> -<td style="border: none;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">Project page: </span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;"> </span><a href="http://www.pokerth.net"><span style=" font-size:8pt; text-decoration: underline; color:#0000ff;">http://www.pokerth.net</span></a></p> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">IRC: </span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;"> #pokerth (irc.freenode.net)</span></p> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">Authors: </span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;"> Felix Hammer (</span><a href="mailto:doitux@pokerth.net"><span style=" font-size:8pt; text-decoration: underline; color:#0000ff;">doitux@pokerth.net</span></a><span style=" font-size:8pt;">)</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;"> - initial idea, basic architecture, gui implementation, gui graphics editing, linux package</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;"> Florian Thauer (</span><a href="mailto:floty@pokerth.net"><span style=" font-size:8pt; text-decoration: underline; color:#0000ff;">floty@pokerth.net</span></a><span style=" font-size:8pt;">)</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;"> - initial idea, basic architecture, engine development</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;"> Lothar May (</span><a href="mailto:lotodore@pokerth.net"><span style=" font-size:8pt; text-decoration: underline; color:#0000ff;">lotodore@pokerth.net</span></a><span style=" font-size:8pt;">)</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;"> - basic architecture, network development, windows package, MacOS package</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;"> Oskar Lindqvist (</span><a href="mailto:tranberry@pokerth.net"><span style=" font-size:8pt; text-decoration: underline; color:#0000ff;">tranberry@pokerth.net</span></a><span style=" font-size:8pt;">)</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;"> - initial gui graphics design</span></p></td></tr></table></body></html> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p></body></html> true diff --git a/src/gui/qt/aboutpokerth/aboutpokerthimpl.cpp b/src/gui/qt/aboutpokerth/aboutpokerthimpl.cpp index aa83f231..2913c434 100755 --- a/src/gui/qt/aboutpokerth/aboutpokerthimpl.cpp +++ b/src/gui/qt/aboutpokerth/aboutpokerthimpl.cpp @@ -34,8 +34,13 @@ aboutPokerthImpl::aboutPokerthImpl(QWidget *parent, ConfigFile *c) QPalette myPalette = textBrowser_licence->palette(); #ifdef GUI_800x480 - myPalette.setColor(QPalette::Base, QColor(0,0,0,0)); - myPalette.setColor(QPalette::Text, QColor(255,255,255,255)); +#ifdef ANDROID + 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)); +#endif #else QColor myColor = myPalette.color(QPalette::Window); myPalette.setColor(QPalette::Base, myColor); @@ -43,7 +48,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; @@ -59,14 +64,14 @@ aboutPokerthImpl::aboutPokerthImpl(QWidget *parent, ConfigFile *c) label_logo->setPixmap(QPixmap(":/gfx/logoChip3D.png")); #ifdef GUI_800x480 - label_pokerthVersion->setStyleSheet("QLabel { font-size: 20px; 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 label_pokerthVersion->setText(QString(tr("PokerTH %1").arg(POKERTH_BETA_RELEASE_STRING))); this->setWindowTitle(QString(tr("About PokerTH %1").arg(POKERTH_BETA_RELEASE_STRING))); - //add thx to infos: + //add text to lables and textbrowsers QString thxToInfos; thxToInfos.append(tr("- Wikimedia Commons: for different popular avatar picture resources")+"
"); thxToInfos.append(tr("- Benedikt, Erhard, Felix, Florian, Linus, Lothar, Steffi, Caro: for people avatar pictures")+"
"); @@ -75,8 +80,35 @@ aboutPokerthImpl::aboutPokerthImpl(QWidget *parent, ConfigFile *c) thxToInfos.append(tr("- doc_dos: for self recorded chip sounds")+"
"); thxToInfos.append(tr("- thiger, dunkanx, BerndA, coldz, drull: for different patches")+"
"); thxToInfos.append(tr("- kraut: for internet-game-server hosting and administration")+"
"); - thxToInfos.append(tr("- danuxi: for startwindow background gfx and danuxi1 table background")+"
"); + thxToInfos.append(tr("- danuxi: for startwindow background gfx and danuxi1 table background")+"
"); thxToInfos.append(tr("- heyn: for moderating forum and organise bugtracker and feature requests")+"
"); thxToInfos.append(tr("- texas_outlaw: for new table sounds")+"
"); 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"); + infoText.append("(c)2006-2012, Felix Hammer, Florian Thauer, Lothar May"); + label_infotext->setText(infoText); + + QString projectText; + projectText.append(""+tr("Project page:")+"
"); + projectText.append("    http://www.pokerth.net
"); + projectText.append("IRC:
"); + projectText.append("    #pokerth (irc.freenode.net)
"); + projectText.append(""+tr("Authors:")+"
"); + projectText.append("    Felix Hammer (doitux@pokerth.net)
"); + projectText.append("        - "+tr("initial idea, basic architecture, gui implementation, gui graphics editing, linux package")+"
"); + projectText.append("    Florian Thauer (floty@pokerth.net)
"); + projectText.append("        - "+tr("initial idea, basic architecture, engine development")+"
"); + projectText.append("    Lothar May (lotodore@pokerth.net)
"); + projectText.append("        - "+tr("basic architecture, network development, windows package, MacOS package")+"
"); + projectText.append("    Oskar Lindqvist (tranberry@pokerth.net)
"); + projectText.append("        - "+tr("initial gui graphics design")+"
"); + textBrowser_2->setHtml(projectText); } diff --git a/src/gui/qt/gui_800x480/aboutpokerth_800x480.ui b/src/gui/qt/gui_800x480/aboutpokerth_800x480.ui index 7ec9f2d7..2048b7f6 100755 --- a/src/gui/qt/gui_800x480/aboutpokerth_800x480.ui +++ b/src/gui/qt/gui_800x480/aboutpokerth_800x480.ui @@ -45,7 +45,7 @@ - QObject {font-size: 20px; font-color: rgb(0, 0, 0)} + QObject {font-size: 26px; font-color: rgb(0, 0, 0)} 0 @@ -59,10 +59,14 @@ - + + + :/gfx/logoChip3D.png + + - + true @@ -73,21 +77,10 @@ - QObject {font-size: 18px} + QObject {font-size: 22px; font-color: rgb(0, 0, 0)} - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Sans Serif'; font-weight:400; font-style:normal;"> -<table border="0" style="-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;"> -<tr> -<td style="border: none;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Nimbus Sans L'; font-size:14pt;">- Poker engine for the popular &quot;Texas Hold'em&quot; Poker</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Nimbus Sans L'; font-size:14pt;">- Singleplayer games with up to 9 computer-opponents</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Nimbus Sans L'; font-size:14pt;">- Multiplayer network games<br />- Internet online games<br />- Changeable gui with online style gallery<br />- </span><a href="http://online-ranking.pokerth.net"><span style=" font-family:'Nimbus Sans L'; font-size:14pt; text-decoration: underline; color:#0057ae;">Online ranking website</span></a><span style=" font-family:'Nimbus Sans L'; font-size:14pt;"> with result tables</span></p> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Nimbus Sans L'; font-size:14pt;"></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Nimbus Sans L'; font-size:14pt;">© 2006-2011, Felix Hammer, Florian Thauer, Lothar May</span></p></td></tr></table></body></html> + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop @@ -154,9 +147,6 @@ p, li { white-space: pre-wrap; } - - QObject {font-size: 20px; font-color: rgb(0, 0, 0)} - QTextEdit::NoWrap @@ -165,22 +155,7 @@ p, li { white-space: pre-wrap; } <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'Nimbus Sans L'; font-weight:400; font-style:normal;"> -<table border="0" style="-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;"> -<tr> -<td style="border: none;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:14pt; font-weight:600;">Project page: </span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:14pt;"> </span><a href="http://www.pokerth.net"><span style=" font-size:14pt; text-decoration: underline; color:#0000ff;">http://www.pokerth.net</span></a></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:14pt; font-weight:600;">IRC: </span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:14pt;"> #pokerth (irc.freenode.net)</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:14pt; font-weight:600;">Authors: </span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:14pt;"> Felix Hammer (</span><a href="mailto:doitux@pokerth.net"><span style=" font-size:14pt; text-decoration: underline; color:#0000ff;">doitux@pokerth.net</span></a><span style=" font-size:14pt;">)</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:14pt;"> - initial idea, basic architecture, gui implementation, gui graphics editing, linux package</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:14pt;"> Florian Thauer (</span><a href="mailto:floty@pokerth.net"><span style=" font-size:14pt; text-decoration: underline; color:#0000ff;">floty@pokerth.net</span></a><span style=" font-size:14pt;">)</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:14pt;"> - initial idea, basic architecture, engine development</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:14pt;"> Lothar May (</span><a href="mailto:lotodore@pokerth.net"><span style=" font-size:14pt; text-decoration: underline; color:#0000ff;">lotodore@pokerth.net</span></a><span style=" font-size:14pt;">)</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:14pt;"> - basic architecture, network development, windows package, MacOS package</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:14pt;"> Oskar Lindqvist (</span><a href="mailto:tranberry@pokerth.net"><span style=" font-size:14pt; text-decoration: underline; color:#0000ff;">tranberry@pokerth.net</span></a><span style=" font-size:14pt;">)</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:14pt;"> - initial gui graphics design</span></p></td></tr></table></body></html> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p></body></html> true @@ -211,9 +186,19 @@ p, li { white-space: pre-wrap; } <tr> <td style="border: none;"> <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p> <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif';"></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans Serif';"><br /></span></p> <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif';"></p> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif';"></p></td></tr></table></body></html> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans Serif';"><br /></span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif';"></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans Serif';"><br /></span></p></td></tr></table></body></html> true @@ -308,6 +293,41 @@ p, li { white-space: pre-wrap; } - - + + + + + + buttonBox + accepted() + aboutPokerth + accept() + + + 735 + 396 + + + -5 + 370 + + + + + buttonBox + rejected() + aboutPokerth + reject() + + + 670 + 412 + + + 4 + 68 + + + + diff --git a/src/gui/qt/gui_800x480/changecontentdialog_800x480.ui b/src/gui/qt/gui_800x480/changecontentdialog_800x480.ui index a39fde21..752f64d5 100644 --- a/src/gui/qt/gui_800x480/changecontentdialog_800x480.ui +++ b/src/gui/qt/gui_800x480/changecontentdialog_800x480.ui @@ -7,25 +7,31 @@ 0 0 800 - 150 + 424 + + + 0 + 0 + + 800 - 150 - - - - - 800 - 150 + 424 Network Error + + QObject {font-size: 26px} + + + 35 + @@ -33,9 +39,6 @@ - - QObject {font-size: 20px} - Name: @@ -61,9 +64,6 @@ - - QObject {font-size: 18px} - Save in configuration @@ -75,7 +75,7 @@ - QObject {font: bold 20px} + QObject {font: bold 30px} Qt::Horizontal diff --git a/src/gui/qt/gui_800x480/startwindow_800x480.ui b/src/gui/qt/gui_800x480/startwindow_800x480.ui index b65626b0..71e8fc9c 100755 --- a/src/gui/qt/gui_800x480/startwindow_800x480.ui +++ b/src/gui/qt/gui_800x480/startwindow_800x480.ui @@ -245,7 +245,7 @@ Qt::NoFocus - Configure PokerTH + Configure PokerTH ... diff --git a/src/gui/qt/resources/pokerth_android.qrc b/src/gui/qt/resources/pokerth_android.qrc index 36ee986e..0f7aefe1 100644 --- a/src/gui/qt/resources/pokerth_android.qrc +++ b/src/gui/qt/resources/pokerth_android.qrc @@ -534,5 +534,6 @@ android-data/translations/pokerth_ta.qm android-data/translations/pokerth_tr.qm android-data/translations/pokerth_zhcn.qm + android-data/misc/agpl.html diff --git a/src/pokerth.cpp b/src/pokerth.cpp index a5fd008a..0add355e 100755 --- a/src/pokerth.cpp +++ b/src/pokerth.cpp @@ -102,13 +102,13 @@ int main( int argc, char **argv ) #ifdef _WIN32 QString font1String("QApplication, QWidget, QDialog { font-size: 12px; }"); -#else -#ifdef __APPLE__ +#elif __APPLE__ // 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; }"); #else - QString font1String("QApplication, QWidget, QDialog { font-family: \"Nimbus Sans L\"; font-size: 12px; }"); -#endif + 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) }");