diff --git a/pokerth_game.pro b/pokerth_game.pro index 31b5a65f..70ddb54d 100644 --- a/pokerth_game.pro +++ b/pokerth_game.pro @@ -278,6 +278,7 @@ TRANSLATIONS = ts/pokerth_af.ts \ ts/pokerth_gr.ts \ ts/pokerth_hu.ts \ ts/pokerth_it.ts \ + ts/pokerth_lt.ts \ ts/pokerth_no.ts \ ts/pokerth_pl.ts \ ts/pokerth_ptbr.ts \ diff --git a/src/gui/qt/aboutpokerth.ui b/src/gui/qt/aboutpokerth.ui index 951d8c10..8dca7eed 100755 --- a/src/gui/qt/aboutpokerth.ui +++ b/src/gui/qt/aboutpokerth.ui @@ -49,14 +49,17 @@ <!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> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">- Poker engine for the popular "Texas Hold'em" Poker</p> +</style></head><body style=" font-family:'Nimbus Sans L'; font-size:8pt; 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;">- Poker engine for the popular &quot;Texas Hold'em&quot; Poker</p> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">- Singleplayer games with up to 9 computer-opponents</p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">- Multiplayer network games<br />- Internet online games<br />- Changeable gui with online style gallery</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">- Multiplayer network games<br />- Internet online games<br />- Changeable gui with online style gallery<br />- <a href="http://online-ranking.pokerth.net"><span style=" text-decoration: underline; color:#0057ae;">Online ranking website</span></a> with result tables</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="-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="-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;">© 2006-2009, FHammer, FThauer, LMay</p></body></html> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">© 2006-2010, FHammer, FThauer, LMay</p></td></tr></table></body></html> Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop @@ -124,22 +127,25 @@ p, li { white-space: pre-wrap; } <!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-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" 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=" "> </span><a href="http://www.pokerth.net"><span style=" 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; "></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-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=" "> #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; "></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-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=" "> Felix Hammer (</span><a href="mailto:doitux@pokerth.net"><span style=" text-decoration: underline; color:#0000ff;">doitux@pokerth.net</span></a><span style=" ">)</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=" "> - 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=" "> Florian Thauer (</span><a href="mailto:floty@pokerth.net"><span style=" text-decoration: underline; color:#0000ff;">floty@pokerth.net</span></a><span style=" ">)</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=" "> - 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=" "> Lothar May (</span><a href="mailto:lotodore@pokerth.net"><span style=" text-decoration: underline; color:#0000ff;">lotodore@pokerth.net</span></a><span style=" ">)</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=" "> - 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=" "> Oskar Lindqvist (</span><a href="mailto:tranberry@pokerth.net"><span style=" text-decoration: underline; color:#0000ff;">tranberry@pokerth.net</span></a><span style=" ">)</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=" "> - initial gui graphics design</span></p></body></html> +</style></head><body style=" font-family:'Nimbus Sans L'; font-size:8pt; font-weight:400; font-style:normal;"> +<table 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-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;"> <a href="http://www.pokerth.net"><span style=" 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;"></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-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;"> #pokerth (irc.freenode.net)</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;"><span style=" 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;"> Felix Hammer (<a href="mailto:doitux@pokerth.net"><span style=" text-decoration: underline; color:#0000ff;">doitux@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;"> - initial idea, basic architecture, gui implementation, gui graphics editing, linux package</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> Florian Thauer (<a href="mailto:floty@pokerth.net"><span style=" text-decoration: underline; color:#0000ff;">floty@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;"> - initial idea, basic architecture, engine development</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> Lothar May (<a href="mailto:lotodore@pokerth.net"><span style=" text-decoration: underline; color:#0000ff;">lotodore@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;"> - basic architecture, network development, windows package, MacOS package</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> Oskar Lindqvist (<a href="mailto:tranberry@pokerth.net"><span style=" text-decoration: underline; color:#0000ff;">tranberry@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;"> - initial gui graphics design</p></td></tr></table></body></html> true @@ -165,8 +171,11 @@ p, li { white-space: pre-wrap; } <!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-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" ">translator name - mail address</span></p></body></html> +</style></head><body style=" font-family:'Nimbus Sans L'; font-size:8pt; font-weight:400; font-style:normal;"> +<table 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;">translator name - mail address</p></td></tr></table></body></html> true @@ -192,25 +201,28 @@ p, li { white-space: pre-wrap; } <!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-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://commons.wikimedia.org/wiki/Main_Page"><span style=" font-weight:600; text-decoration: underline; color:#0000ff;">Wikimedia Commons</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-weight:600;"> - </span><span style=" ">for different popular avatar picture resources</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-weight:600;">Benedikt, Erhard, Felix, Florian, Linus, Lothar, Steffi, Caro</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=" "> - for people avatar pictures</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-weight:600;">ZeiZei</span><span style=" "> </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=" "> - for "misc" avatar pictures</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://kde-look.org/"><span style=" font-weight:600; text-decoration: underline; color:#0000ff;">http://kde-look.org/</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=" "> - for different gpl licensed sounds</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-weight:600;">doc_dos</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=" "> - for self recorded chip sounds</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-weight:600;">thiger, dunkanx, BerndA, coldz</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=" "> - for different patches</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-weight:600;">kraut</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=" "> - for internet-game-server hosting and administration</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-weight:600;">danuxi</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=" "> - for startwindow background gfx and danuxi1 table background</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-weight:600;">heyn</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=" "> - for moderating forum and organise bugtracker and feature requests</span></p></body></html> +</style></head><body style=" font-family:'Nimbus Sans L'; font-size:8pt; font-weight:400; font-style:normal;"> +<table 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;"><a href="http://commons.wikimedia.org/wiki/Main_Page"><span style=" font-weight:600; text-decoration: underline; color:#0000ff;">Wikimedia Commons</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-weight:600;"> - </span>for different popular avatar picture resources</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-weight:600;">Benedikt, Erhard, Felix, Florian, Linus, Lothar, Steffi, Caro</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> - for people avatar pictures</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-weight:600;">ZeiZei</span> </p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> - for &quot;misc&quot; avatar pictures</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://kde-look.org/"><span style=" font-weight:600; text-decoration: underline; color:#0000ff;">http://kde-look.org/</span></a></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> - for different gpl licensed sounds</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-weight:600;">doc_dos</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> - for self recorded chip sounds</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-weight:600;">thiger, dunkanx, BerndA, coldz</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> - for different patches</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-weight:600;">kraut</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> - for internet-game-server hosting and administration</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-weight:600;">danuxi</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> - for startwindow background gfx and danuxi1 table background</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-weight:600;">heyn</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> - for moderating forum and organise bugtracker and feature requests</p></td></tr></table></body></html> true diff --git a/src/gui/qt/changecontentdialog.ui b/src/gui/qt/changecontentdialog.ui index 6b8ca24b..d8b8bf09 100644 --- a/src/gui/qt/changecontentdialog.ui +++ b/src/gui/qt/changecontentdialog.ui @@ -64,6 +64,7 @@ lineEdit + checkBox buttonBox diff --git a/src/gui/qt/createinternetgamedialog.ui b/src/gui/qt/createinternetgamedialog.ui index 86cb56fe..f676c8f3 100644 --- a/src/gui/qt/createinternetgamedialog.ui +++ b/src/gui/qt/createinternetgamedialog.ui @@ -324,12 +324,16 @@ + lineEdit_gameName + comboBox_gameType + checkBox_Password + lineEdit_Password spinBox_quantityPlayers spinBox_startCash radioButton_useSavedBlindsSettings radioButton_changeBlindsSettings - checkBox_Password - lineEdit_Password + spinBox_netTimeOutPlayerAction + spinBox_netDelayBetweenHands pushButton_createGame pushButton_cancel diff --git a/src/gui/qt/createnetworkgamedialog.ui b/src/gui/qt/createnetworkgamedialog.ui index 025b4611..153ec81f 100644 --- a/src/gui/qt/createnetworkgamedialog.ui +++ b/src/gui/qt/createnetworkgamedialog.ui @@ -203,6 +203,8 @@ spinBox_startCash radioButton_useSavedBlindsSettings radioButton_changeBlindsSettings + spinBox_netTimeOutPlayerAction + spinBox_netDelayBetweenHands pushButton_createGame pushButton_cancel diff --git a/src/gui/qt/gamelobbydialog.ui b/src/gui/qt/gamelobbydialog.ui index 3d208f27..1f9c4577 100644 --- a/src/gui/qt/gamelobbydialog.ui +++ b/src/gui/qt/gamelobbydialog.ui @@ -864,13 +864,18 @@ p, li { white-space: pre-wrap; } + lineEdit_searchForPlayers treeView_NickList + comboBox_nickListFilter + comboBox_gameListFilter treeView_GameList pushButton_joinAnyGame pushButton_CreateGame pushButton_JoinGame textBrowser_ChatDisplay lineEdit_ChatInput + treeWidget_connectedPlayers + scrollArea_gameInfos checkBox_fillUpWithComputerOpponents pushButton_StartGame pushButton_Kick diff --git a/src/gui/qt/gametable.ui b/src/gui/qt/gametable.ui index 1f796270..95fa0586 100644 --- a/src/gui/qt/gametable.ui +++ b/src/gui/qt/gametable.ui @@ -132,6 +132,9 @@ Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + true + @@ -350,6 +353,9 @@ Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + true + @@ -572,9 +578,15 @@ 14 + + false + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + true + @@ -780,6 +792,9 @@ Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + true + @@ -985,6 +1000,9 @@ Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + true + @@ -1210,6 +1228,9 @@ Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + true + @@ -1428,6 +1449,9 @@ Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + true + @@ -2108,6 +2132,9 @@ Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + true + @@ -2313,6 +2340,9 @@ Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + true + @@ -2531,6 +2561,9 @@ Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + true + diff --git a/src/gui/qt/gametable/gametableimpl.cpp b/src/gui/qt/gametable/gametableimpl.cpp index 2151f66a..c84a6849 100755 --- a/src/gui/qt/gametable/gametableimpl.cpp +++ b/src/gui/qt/gametable/gametableimpl.cpp @@ -234,6 +234,9 @@ gameTableImpl::gameTableImpl(ConfigFile *c, QMainWindow *parent) playerNameLabelArray[7] = label_PlayerName7; playerNameLabelArray[8] = label_PlayerName8; playerNameLabelArray[9] = label_PlayerName9; + for (i=0; isetMyW(this); + } // playerAvatarLabelArray init playerAvatarLabelArray[0] = label_Avatar0; @@ -781,12 +784,24 @@ void gameTableImpl::refreshPlayerName() { PlayerListConstIterator it_c; for (it_c=currentHand->getSeatsList()->begin(); it_c!=currentHand->getSeatsList()->end(); it_c++) { if((*it_c)->getMyActiveStatus()) { - playerNameLabelArray[(*it_c)->getMyID()]->setText(QString::fromUtf8((*it_c)->getMyName().c_str())); - } else { + bool guest = myStartWindow->getSession()->getClientPlayerInfo((*it_c)->getMyUniqueID()).isGuest; + bool computerPlayer = false; + if((*it_c)->getMyType() == PLAYER_TYPE_COMPUTER) { computerPlayer = true; } + + playerNameLabelArray[(*it_c)->getMyID()]->setText(QString::fromUtf8((*it_c)->getMyName().c_str()), FALSE, guest, computerPlayer ); + + } + else { if((myStartWindow->getSession()->getGameType() == Session::GAME_TYPE_INTERNET || myStartWindow->getSession()->getGameType() == Session::GAME_TYPE_NETWORK)) { if((*it_c)->getMyStayOnTableStatus() == TRUE && (*it_c)->getMyType() != PLAYER_TYPE_COMPUTER) { - playerNameLabelArray[(*it_c)->getMyID()]->setText(QString::fromUtf8((*it_c)->getMyName().c_str()), TRUE); + + bool guest = myStartWindow->getSession()->getClientPlayerInfo((*it_c)->getMyUniqueID()).isGuest; + bool computerPlayer = false; + if((*it_c)->getMyType() == PLAYER_TYPE_COMPUTER) { computerPlayer = true; } + + playerNameLabelArray[(*it_c)->getMyID()]->setText(QString::fromUtf8((*it_c)->getMyName().c_str()), TRUE, guest, computerPlayer); + } else { playerNameLabelArray[(*it_c)->getMyID()]->setText(""); @@ -2218,7 +2233,7 @@ void gameTableImpl::postRiverRunAnimation5() { for(it_c=currentHand->getActivePlayerList()->begin(); it_c!=currentHand->getActivePlayerList()->end(); it_c++) { if((*it_c)->getMyAction() != PLAYER_ACTION_FOLD && (*it_c)->getMyCardsValueInt() == currentHand->getCurrentBeRo()->getHighestCardsValue() ) { - playerNameLabelArray[(*it_c)->getMyID()]->setText(""); + playerNameLabelArray[(*it_c)->getMyID()]->hide(); } } } @@ -2228,7 +2243,7 @@ void gameTableImpl::postRiverRunAnimation5() { for(it_c=currentHand->getActivePlayerList()->begin(); it_c!=currentHand->getActivePlayerList()->end(); it_c++) { if((*it_c)->getMyAction() != PLAYER_ACTION_FOLD && (*it_c)->getMyCardsValueInt() == currentHand->getCurrentBeRo()->getHighestCardsValue() ) { - playerNameLabelArray[(*it_c)->getMyID()]->setText(QString::fromUtf8((*it_c)->getMyName().c_str())); + playerNameLabelArray[(*it_c)->getMyID()]->show(); } } } @@ -2581,9 +2596,9 @@ void gameTableImpl::keyPressEvent ( QKeyEvent * event ) { ctrlPressed = TRUE; } } - if (event->key() == Qt::Key_Escape && (myActionIsBet || myActionIsRaise)) { - meInAction(); - } +// if (event->key() == Qt::Key_Escape && (myActionIsBet || myActionIsRaise)) { +// meInAction(); +// } if (event->key() == Qt::Key_Up && lineEdit_ChatInput->hasFocus()) { if((keyUpDownChatCounter + 1) <= myChat->getChatLinesHistorySize()) { keyUpDownChatCounter++; } // std::cout << "Up keyUpDownChatCounter: " << keyUpDownChatCounter << "\n"; @@ -2597,7 +2612,7 @@ void gameTableImpl::keyPressEvent ( QKeyEvent * event ) { else { keyUpDownChatCounter = 0; } //TESTING UNIT - if (event->key() == Qt::Key_M) { showShowMyCardsButton(); } + // if (event->key() == Qt::Key_M) { showShowMyCardsButton(); } } void gameTableImpl::changePlayingMode() { @@ -3391,9 +3406,9 @@ void gameTableImpl::sendShowMyCardsSignal() void gameTableImpl::showWarningAutoFoldInRankingGame(unsigned remainingAutoFolds) { QMessageBox::warning(this, tr("PokerTH - Warning"), - tr("You have triggered a warning level of timeouts in a ranking game.\n" - "After %1 additional timeouts the server needs to kick you to provide a better game flow!\n\n" - "If you are temporarily away, you can use the \"away\" tools in the tool box on the right.").arg(remainingAutoFolds), - QMessageBox::Ok); + tr("You have triggered a warning level of timeouts in a ranking game.\n" + "After %1 additional timeouts the server needs to kick you to provide a better game flow!\n\n" + "If you are temporarily away, you can use the \"away\" tools in the tool box on the right.").arg(remainingAutoFolds), + QMessageBox::Ok); tabWidget_Right->setCurrentIndex(1); } diff --git a/src/gui/qt/gametable/mynamelabel.cpp b/src/gui/qt/gametable/mynamelabel.cpp index 4f26cd1a..67e549e4 100644 --- a/src/gui/qt/gametable/mynamelabel.cpp +++ b/src/gui/qt/gametable/mynamelabel.cpp @@ -10,9 +10,12 @@ // // #include "mynamelabel.h" +#include "gametableimpl.h" +#include "session.h" +#include "gametablestylereader.h" MyNameLabel::MyNameLabel(QGroupBox* parent) - : QLabel(parent), transparent(FALSE) + : QLabel(parent) { } @@ -21,22 +24,44 @@ MyNameLabel::~MyNameLabel() { } -void MyNameLabel::setText ( const QString &text, const bool trans) { +void MyNameLabel::setText ( const QString &t, bool trans, bool guest, bool computerplayer) { - myText = text; - transparent = trans; - update(); + QString text; + QColor transColor; + transColor.setNamedColor("#"+myW->getMyGameTableStyle()->getPlayerNickTextColor()); + QString red = QString::number(transColor.red()); + QString green = QString::number(transColor.green()); + QString blue = QString::number(transColor.blue()); + + if(trans) { + this->setStyleSheet("QLabel { "+ myW->getMyGameTableStyle()->getFont2String() +" font-size: "+myW->getMyGameTableStyle()->getPlayerNameLabelFontSize()+"px; font-weight: bold; color: rgba("+red+", "+green+", "+blue+", 80); }"); + } + else { + this->setStyleSheet("QLabel { "+ myW->getMyGameTableStyle()->getFont2String() +" font-size: "+myW->getMyGameTableStyle()->getPlayerNameLabelFontSize()+"px; font-weight: bold; color: #"+myW->getMyGameTableStyle()->getPlayerNickTextColor()+"; }"); + } + + if(myW->getSession()) { + + if(myW->getSession()->getGameType() == Session::GAME_TYPE_INTERNET && !guest && !computerplayer ) { + //for internetgame show players name with links to their profile included + this->setTextFormat(Qt::RichText); + QUrl link(QString("http://pokerth.net/redirect_user_profile.php?nick=%1").arg(t)); + + if(trans) { + text = ""+t+""; + } + else { + text = ""+t+""; + } + + } + else { + this->setTextFormat(Qt::PlainText); + text = t; + } + } + else { text = t; } + + QLabel::setText(text); } - -void MyNameLabel::paintEvent(QPaintEvent*) { - - QPainter painter(this); - if(transparent) - painter.setOpacity(0.4); - else - painter.setOpacity(1.0); - - painter.drawText(0,11,myText); -} - diff --git a/src/gui/qt/gametable/mynamelabel.h b/src/gui/qt/gametable/mynamelabel.h index b0d78aed..44b2449a 100644 --- a/src/gui/qt/gametable/mynamelabel.h +++ b/src/gui/qt/gametable/mynamelabel.h @@ -17,6 +17,8 @@ #include #include +class gameTableImpl; + class MyNameLabel : public QLabel { Q_OBJECT @@ -24,15 +26,16 @@ public: MyNameLabel(QGroupBox*); ~MyNameLabel(); + void setMyW(gameTableImpl* theValue) { myW = theValue; } + public slots: - void setText ( const QString &, const bool = FALSE); - - void paintEvent(QPaintEvent*); + void setText ( const QString &, bool = FALSE, bool = FALSE, bool = FALSE); private: QString myText; - bool transparent; + gameTableImpl *myW; + }; #endif diff --git a/src/gui/qt/internetgamelogindialog.ui b/src/gui/qt/internetgamelogindialog.ui index e880bc69..0c93b085 100644 --- a/src/gui/qt/internetgamelogindialog.ui +++ b/src/gui/qt/internetgamelogindialog.ui @@ -114,6 +114,15 @@ p, li { white-space: pre-wrap; } + + groupBox_reguser + lineEdit_username + lineEdit_password + checkBox_rememberPassword + checkBox_guest + pushButton_login + pushButton_cancel + diff --git a/src/gui/qt/joinnetworkgamedialog.ui b/src/gui/qt/joinnetworkgamedialog.ui index 0ca20873..21c61832 100644 --- a/src/gui/qt/joinnetworkgamedialog.ui +++ b/src/gui/qt/joinnetworkgamedialog.ui @@ -308,7 +308,9 @@ p, li { white-space: pre-wrap; } + lineEdit_profileName lineEdit_ipAddress + spinBox_port checkBox_ipv6 checkBox_sctp treeWidget diff --git a/src/gui/qt/settingsdialog.ui b/src/gui/qt/settingsdialog.ui index 20d68616..d6efc457 100644 --- a/src/gui/qt/settingsdialog.ui +++ b/src/gui/qt/settingsdialog.ui @@ -3610,9 +3610,14 @@ p, li { white-space: pre-wrap; } listWidget comboBox_switchLanguage checkBox_showRightToolbox + checkBox_showLeftToolbox checkBox_showFadeOutCardsAnimation + checkBox_showFlipCardsAnimation checkBox_alternateFKeysUserActionMode checkBox_showBlindButtons + checkBox_cardsChanceMonitor + checkBox_antiPeekMode + checkBox_disableSplashscreen checkBox_dontTranslatePokerStrings checkBox_enableBetInputFocusSwitch tabWidget @@ -3622,6 +3627,10 @@ p, li { white-space: pre-wrap; } treeWidget_cardDeckStyles pushButton_addCardDeckStyle pushButton_removeCardDeckStyle + radioButton_flipsideTux + radioButton_flipsideOwn + lineEdit_OwnFlipsideFilename + pushButton_openFlipsidePicture groupBox_playSoundEffects horizontalSlider_soundVolume checkBox_playGameActions @@ -3655,6 +3664,23 @@ p, li { white-space: pre-wrap; } spinBox_serverPort checkBox_useIpv6 checkBox_useSctp + tabWidget_2 + groupBox_automaticServerConfig + lineEdit_InternetServerListAddress + groupBox_manualServerConfig + lineEdit_InternetServerAddress + spinBox_InternetServerPort + checkBox_useAvatarServer + lineEdit_avatarServerAddress + checkBox_InternetServerUseIpv6 + checkBox_InternetServerUseSctp + lineEdit_internetGameName + comboBox_internetGameType + checkBox_UseInternetGamePassword + lineEdit_InternetGamePassword + checkBox_UseLobbyChat + treeWidget_internetGameIgnoredPlayers + pushButton_internetGameRemoveIgnoredPlayer pushButton_HumanPlayerAvatar lineEdit_HumanPlayerName pushButton_Opponent1Avatar @@ -3676,10 +3702,15 @@ p, li { white-space: pre-wrap; } pushButton_Opponent9Avatar lineEdit_Opponent9Name groupBox_logOnOff - lineEdit_logDir - pushButton_openLogDir spinBox_logStoreDuration comboBox_logInterval + lineEdit_logDir + pushButton_openLogDir + treeWidget_logFiles + pushButton_exportLogHtml + pushButton_exportLogTxt + pushButton_saveLogAs + pushButton_deleteLog buttonBox diff --git a/src/gui/qt/settingsdialog/settingsdialogimpl.cpp b/src/gui/qt/settingsdialog/settingsdialogimpl.cpp index a00919e3..c0523ff8 100644 --- a/src/gui/qt/settingsdialog/settingsdialogimpl.cpp +++ b/src/gui/qt/settingsdialog/settingsdialogimpl.cpp @@ -48,30 +48,31 @@ settingsDialogImpl::settingsDialogImpl(QWidget *parent, ConfigFile *c, selectAva if (myConfig->readConfigInt("CLA_NoWriteAccess")) { groupBox_logOnOff->setDisabled(TRUE); } - comboBox_switchLanguage->addItem(tr("Afrikaans"),"af"); - comboBox_switchLanguage->addItem(tr("Bulgarian"),"bg"); - comboBox_switchLanguage->addItem(tr("Chinese"),"zhcn"); - comboBox_switchLanguage->addItem(tr("Catalan"),"ca"); - comboBox_switchLanguage->addItem(tr("Czech"),"cz"); - comboBox_switchLanguage->addItem(tr("Danish"),"dk"); - comboBox_switchLanguage->addItem(tr("Dutch"),"nl"); - comboBox_switchLanguage->addItem(tr("English"),"en"); - comboBox_switchLanguage->addItem(tr("French"),"fr"); - comboBox_switchLanguage->addItem(tr("Finnish"),"fi"); - comboBox_switchLanguage->addItem(tr("German"),"de"); - comboBox_switchLanguage->addItem(tr("Greek"),"gr"); - comboBox_switchLanguage->addItem(tr("Hungarian"),"hu"); - comboBox_switchLanguage->addItem(tr("Italian"),"it"); - comboBox_switchLanguage->addItem(tr("Norwegian"),"no"); - comboBox_switchLanguage->addItem(tr("Polish"),"pl"); - comboBox_switchLanguage->addItem(tr("Portuguese (Brazilian)"),"ptbr"); - comboBox_switchLanguage->addItem(tr("Portuguese (Portuguese)"),"ptpt"); - comboBox_switchLanguage->addItem(tr("Russian"),"ru"); - comboBox_switchLanguage->addItem(tr("Slovak"),"sk"); - comboBox_switchLanguage->addItem(tr("Spanish"),"es"); - comboBox_switchLanguage->addItem(tr("Swedish"),"sv"); - comboBox_switchLanguage->addItem(tr("Tamil"),"ta"); - comboBox_switchLanguage->addItem(tr("Turkish"),"tr"); + comboBox_switchLanguage->addItem(trUtf8("Afrikaans (Afrikaans)"),"af"); + comboBox_switchLanguage->addItem(trUtf8("Bulgarian (Български)"),"bg"); + comboBox_switchLanguage->addItem(trUtf8("Catalan (Català)"),"ca"); + comboBox_switchLanguage->addItem(trUtf8("Chinese (简体中文)"),"zhcn"); + comboBox_switchLanguage->addItem(trUtf8("Czech (čeština)"),"cz"); + comboBox_switchLanguage->addItem(trUtf8("Danish (Dansk)"),"dk"); + comboBox_switchLanguage->addItem(trUtf8("Dutch (Nederlands)"),"nl"); + comboBox_switchLanguage->addItem(trUtf8("English (English)"),"en"); + comboBox_switchLanguage->addItem(trUtf8("Finnish (suomi)"),"fi"); + comboBox_switchLanguage->addItem(trUtf8("French (français)"),"fr"); + comboBox_switchLanguage->addItem(trUtf8("German (Deutsch)"),"de"); + comboBox_switchLanguage->addItem(trUtf8("Greek (Ελληνικά)"),"gr"); + comboBox_switchLanguage->addItem(trUtf8("Hungarian (Magyar)"),"hu"); + comboBox_switchLanguage->addItem(trUtf8("Italian (italiano)"),"it"); + comboBox_switchLanguage->addItem(trUtf8("Lithuania (Lietuviškai)"),"lt"); + comboBox_switchLanguage->addItem(trUtf8("Norwegian (Norsk)"),"no"); + comboBox_switchLanguage->addItem(trUtf8("Polish (polski)"),"pl"); + comboBox_switchLanguage->addItem(trUtf8("Portuguese-Brazilian (português brasileiro)"),"ptbr"); + comboBox_switchLanguage->addItem(trUtf8("Portuguese-Portuguese (português português)"),"ptpt"); + comboBox_switchLanguage->addItem(trUtf8("Russian (Pyccĸий)"),"ru"); + comboBox_switchLanguage->addItem(trUtf8("Slovak (Slovenčina)"),"sk"); + comboBox_switchLanguage->addItem(trUtf8("Spanish (Español)"),"es"); + comboBox_switchLanguage->addItem(trUtf8("Swedish (svenska)"),"sv"); + comboBox_switchLanguage->addItem(trUtf8("Tamil (தமிழ்)"),"ta"); + comboBox_switchLanguage->addItem(trUtf8("Turkish (Tϋrkçe)"),"tr"); connect( buttonBox, SIGNAL( accepted() ), this, SLOT( isAccepted() ) ); connect( lineEdit_HumanPlayerName, SIGNAL( textChanged( const QString &) ), this, SLOT( playerNickChanged() ) ); diff --git a/src/gui/qt/styles/gametablestylereader.h b/src/gui/qt/styles/gametablestylereader.h index 198b062b..8889d839 100644 --- a/src/gui/qt/styles/gametablestylereader.h +++ b/src/gui/qt/styles/gametablestylereader.h @@ -78,6 +78,10 @@ public: QString getLogNewGameAdminColor() const { return LogNewGameAdminColor; } QString getBreakLobbyButtonBgColor() const { return BreakLobbyButtonBgColor; } + QString getPlayerNickTextColor() const { return PlayerNickTextColor; } + QString getPlayerNameLabelFontSize() const { return playerNameLabelFontSize; } + QString getFont2String() const { return font2String; } + QString getMinimumWindowWidth() const { return MinimumWindowWidth; } QString getMinimumWindowHeight() const { return MinimumWindowHeight; } QString getMaximumWindowWidth() const { return MaximumWindowWidth; }