sco/pokerth
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

display nicks on the table including links to their poker-heroes.com

Browse Source 
profile page
This commit is contained in:
doitux
2010-09-13 23:10:10 +00:00
parent 9e2a3e40ae
commit 3a9db4957b
15 changed files with 251 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pokerth_game.pro
+1
View File
@@ -278,6 +278,7 @@ TRANSLATIONS = ts/pokerth_af.ts \
ts/pokerth_gr.ts \ ts/pokerth_gr.ts \
ts/pokerth_hu.ts \ ts/pokerth_hu.ts \
ts/pokerth_it.ts \ ts/pokerth_it.ts \
ts/pokerth_lt.ts \
ts/pokerth_no.ts \ ts/pokerth_no.ts \
ts/pokerth_pl.ts \ ts/pokerth_pl.ts \
ts/pokerth_ptbr.ts \ ts/pokerth_ptbr.ts \
src/gui/qt/aboutpokerth.ui
+53 -41
View File
@@ -49,14 +49,17 @@
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt; <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt; &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; } p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body&gt; &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Nimbus Sans L'; font-size:8pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;- Poker engine for the popular &quot;Texas Hold'em&quot; Poker&lt;/p&gt; &lt;table border=&quot;0&quot; style=&quot;-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;&quot;&gt;
&lt;tr&gt;
&lt;td style=&quot;border: none;&quot;&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;- Poker engine for the popular &amp;quot;Texas Hold'em&amp;quot; Poker&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;- Singleplayer games with up to 9 computer-opponents&lt;/p&gt; &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;- Singleplayer games with up to 9 computer-opponents&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;- Multiplayer network games&lt;br /&gt;- Internet online games&lt;br /&gt;- Changeable gui with online style gallery&lt;/p&gt; &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;- Multiplayer network games&lt;br /&gt;- Internet online games&lt;br /&gt;- Changeable gui with online style gallery&lt;br /&gt;- &lt;a href=&quot;http://online-ranking.pokerth.net&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;Online ranking website&lt;/span&gt;&lt;/a&gt; with result tables&lt;/p&gt;
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;/p&gt; &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;/p&gt;
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;/p&gt; &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;/p&gt;
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;/p&gt; &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;© 2006-2009, FHammer, FThauer, LMay&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;© 2006-2010, FHammer, FThauer, LMay&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set> <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
@@ -124,22 +127,25 @@ p, li { white-space: pre-wrap; }
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt; <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt; &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; } p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal;&quot;&gt; &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Nimbus Sans L'; font-size:8pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Project page: &lt;/span&gt;&lt;/p&gt; &lt;table style=&quot;-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;&quot;&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; &quot;&gt; &lt;/span&gt;&lt;a href=&quot;http://www.pokerth.net&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;http://www.pokerth.net&lt;/span&gt;&lt;/a&gt;&lt;/p&gt; &lt;tr&gt;
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; &quot;&gt;&lt;/p&gt; &lt;td style=&quot;border: none;&quot;&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;IRC: &lt;/span&gt;&lt;/p&gt; &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Project page: &lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; &quot;&gt; #pokerth (irc.freenode.net)&lt;/span&gt;&lt;/p&gt; &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt; &lt;a href=&quot;http://www.pokerth.net&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;http://www.pokerth.net&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; &quot;&gt;&lt;/p&gt; &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Authors: &lt;/span&gt;&lt;/p&gt; &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;IRC: &lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; &quot;&gt; Felix Hammer (&lt;/span&gt;&lt;a href=&quot;mailto:doitux@pokerth.net&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;doitux@pokerth.net&lt;/span&gt;&lt;/a&gt;&lt;span style=&quot; &quot;&gt;)&lt;/span&gt;&lt;/p&gt; &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt; #pokerth (irc.freenode.net)&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; &quot;&gt; - initial idea, basic architecture, gui implementation, gui graphics editing, linux package&lt;/span&gt;&lt;/p&gt; &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; &quot;&gt; Florian Thauer (&lt;/span&gt;&lt;a href=&quot;mailto:floty@pokerth.net&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;floty@pokerth.net&lt;/span&gt;&lt;/a&gt;&lt;span style=&quot; &quot;&gt;)&lt;/span&gt;&lt;/p&gt; &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Authors: &lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; &quot;&gt; - initial idea, basic architecture, engine development&lt;/span&gt;&lt;/p&gt; &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt; Felix Hammer (&lt;a href=&quot;mailto:doitux@pokerth.net&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;doitux@pokerth.net&lt;/span&gt;&lt;/a&gt;)&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; &quot;&gt; Lothar May (&lt;/span&gt;&lt;a href=&quot;mailto:lotodore@pokerth.net&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;lotodore@pokerth.net&lt;/span&gt;&lt;/a&gt;&lt;span style=&quot; &quot;&gt;)&lt;/span&gt;&lt;/p&gt; &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt; - initial idea, basic architecture, gui implementation, gui graphics editing, linux package&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; &quot;&gt; - basic architecture, network development, windows package, MacOS package&lt;/span&gt;&lt;/p&gt; &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt; Florian Thauer (&lt;a href=&quot;mailto:floty@pokerth.net&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;floty@pokerth.net&lt;/span&gt;&lt;/a&gt;)&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; &quot;&gt; Oskar Lindqvist (&lt;/span&gt;&lt;a href=&quot;mailto:tranberry@pokerth.net&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;tranberry@pokerth.net&lt;/span&gt;&lt;/a&gt;&lt;span style=&quot; &quot;&gt;)&lt;/span&gt;&lt;/p&gt; &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt; - initial idea, basic architecture, engine development&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; &quot;&gt; - initial gui graphics design&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt; Lothar May (&lt;a href=&quot;mailto:lotodore@pokerth.net&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;lotodore@pokerth.net&lt;/span&gt;&lt;/a&gt;)&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt; - basic architecture, network development, windows package, MacOS package&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt; Oskar Lindqvist (&lt;a href=&quot;mailto:tranberry@pokerth.net&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;tranberry@pokerth.net&lt;/span&gt;&lt;/a&gt;)&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt; - initial gui graphics design&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property> </property>
<property name="openExternalLinks"> <property name="openExternalLinks">
<bool>true</bool> <bool>true</bool>
@@ -165,8 +171,11 @@ p, li { white-space: pre-wrap; }
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt; <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt; &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; } p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal;&quot;&gt; &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Nimbus Sans L'; font-size:8pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; &quot;&gt;translator name - mail address&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> &lt;table style=&quot;-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;&quot;&gt;
&lt;tr&gt;
&lt;td style=&quot;border: none;&quot;&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;translator name - mail address&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property> </property>
<property name="openExternalLinks"> <property name="openExternalLinks">
<bool>true</bool> <bool>true</bool>
@@ -192,25 +201,28 @@ p, li { white-space: pre-wrap; }
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt; <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt; &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; } p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-weight:400; font-style:normal;&quot;&gt; &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Nimbus Sans L'; font-size:8pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://commons.wikimedia.org/wiki/Main_Page&quot;&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline; color:#0000ff;&quot;&gt;Wikimedia Commons&lt;/span&gt;&lt;/a&gt;&lt;/p&gt; &lt;table style=&quot;-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;&quot;&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt; - &lt;/span&gt;&lt;span style=&quot; &quot;&gt;for different popular avatar picture resources&lt;/span&gt;&lt;/p&gt; &lt;tr&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Benedikt, Erhard, Felix, Florian, Linus, Lothar, Steffi, Caro&lt;/span&gt;&lt;/p&gt; &lt;td style=&quot;border: none;&quot;&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; &quot;&gt; - for people avatar pictures&lt;/span&gt;&lt;/p&gt; &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://commons.wikimedia.org/wiki/Main_Page&quot;&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline; color:#0000ff;&quot;&gt;Wikimedia Commons&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;ZeiZei&lt;/span&gt;&lt;span style=&quot; &quot;&gt; &lt;/span&gt;&lt;/p&gt; &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt; - &lt;/span&gt;for different popular avatar picture resources&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; &quot;&gt; - for &quot;misc&quot; avatar pictures&lt;/span&gt;&lt;/p&gt; &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Benedikt, Erhard, Felix, Florian, Linus, Lothar, Steffi, Caro&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://kde-look.org/&quot;&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline; color:#0000ff;&quot;&gt;http://kde-look.org/&lt;/span&gt;&lt;/a&gt;&lt;/p&gt; &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt; - for people avatar pictures&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; &quot;&gt; - for different gpl licensed sounds&lt;/span&gt;&lt;/p&gt; &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;ZeiZei&lt;/span&gt; &lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;doc_dos&lt;/span&gt;&lt;/p&gt; &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt; - for &amp;quot;misc&amp;quot; avatar pictures&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; &quot;&gt; - for self recorded chip sounds&lt;/span&gt;&lt;/p&gt; &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://kde-look.org/&quot;&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline; color:#0000ff;&quot;&gt;http://kde-look.org/&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;thiger, dunkanx, BerndA, coldz&lt;/span&gt;&lt;/p&gt; &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt; - for different gpl licensed sounds&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; &quot;&gt; - for different patches&lt;/span&gt;&lt;/p&gt; &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;doc_dos&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;kraut&lt;/span&gt;&lt;/p&gt; &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt; - for self recorded chip sounds&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; &quot;&gt; - for internet-game-server hosting and administration&lt;/span&gt;&lt;/p&gt; &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;thiger, dunkanx, BerndA, coldz&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;danuxi&lt;/span&gt;&lt;/p&gt; &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt; - for different patches&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; &quot;&gt; - for startwindow background gfx and danuxi1 table background&lt;/span&gt;&lt;/p&gt; &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;kraut&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;heyn&lt;/span&gt;&lt;/p&gt; &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt; - for internet-game-server hosting and administration&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; &quot;&gt; - for moderating forum and organise bugtracker and feature requests&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;danuxi&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt; - for startwindow background gfx and danuxi1 table background&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;heyn&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt; - for moderating forum and organise bugtracker and feature requests&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property> </property>
<property name="openExternalLinks"> <property name="openExternalLinks">
<bool>true</bool> <bool>true</bool>
src/gui/qt/changecontentdialog.ui
+1
View File
@@ -64,6 +64,7 @@
</widget> </widget>
<tabstops> <tabstops>
<tabstop>lineEdit</tabstop> <tabstop>lineEdit</tabstop>
<tabstop>checkBox</tabstop>
<tabstop>buttonBox</tabstop> <tabstop>buttonBox</tabstop>
</tabstops> </tabstops>
<resources/> <resources/>
src/gui/qt/createinternetgamedialog.ui
+6 -2
View File
@@ -324,12 +324,16 @@
</layout> </layout>
</widget> </widget>
<tabstops> <tabstops>
<tabstop>lineEdit_gameName</tabstop>
<tabstop>comboBox_gameType</tabstop>
<tabstop>checkBox_Password</tabstop>
<tabstop>lineEdit_Password</tabstop>
<tabstop>spinBox_quantityPlayers</tabstop> <tabstop>spinBox_quantityPlayers</tabstop>
<tabstop>spinBox_startCash</tabstop> <tabstop>spinBox_startCash</tabstop>
<tabstop>radioButton_useSavedBlindsSettings</tabstop> <tabstop>radioButton_useSavedBlindsSettings</tabstop>
<tabstop>radioButton_changeBlindsSettings</tabstop> <tabstop>radioButton_changeBlindsSettings</tabstop>
<tabstop>checkBox_Password</tabstop> <tabstop>spinBox_netTimeOutPlayerAction</tabstop>
<tabstop>lineEdit_Password</tabstop> <tabstop>spinBox_netDelayBetweenHands</tabstop>
<tabstop>pushButton_createGame</tabstop> <tabstop>pushButton_createGame</tabstop>
<tabstop>pushButton_cancel</tabstop> <tabstop>pushButton_cancel</tabstop>
</tabstops> </tabstops>
src/gui/qt/createnetworkgamedialog.ui
+2
View File
@@ -203,6 +203,8 @@
<tabstop>spinBox_startCash</tabstop> <tabstop>spinBox_startCash</tabstop>
<tabstop>radioButton_useSavedBlindsSettings</tabstop> <tabstop>radioButton_useSavedBlindsSettings</tabstop>
<tabstop>radioButton_changeBlindsSettings</tabstop> <tabstop>radioButton_changeBlindsSettings</tabstop>
<tabstop>spinBox_netTimeOutPlayerAction</tabstop>
<tabstop>spinBox_netDelayBetweenHands</tabstop>
<tabstop>pushButton_createGame</tabstop> <tabstop>pushButton_createGame</tabstop>
<tabstop>pushButton_cancel</tabstop> <tabstop>pushButton_cancel</tabstop>
</tabstops> </tabstops>
src/gui/qt/gamelobbydialog.ui
+5
View File
@@ -864,13 +864,18 @@ p, li { white-space: pre-wrap; }
</layout> </layout>
</widget> </widget>
<tabstops> <tabstops>
<tabstop>lineEdit_searchForPlayers</tabstop>
<tabstop>treeView_NickList</tabstop> <tabstop>treeView_NickList</tabstop>
<tabstop>comboBox_nickListFilter</tabstop>
<tabstop>comboBox_gameListFilter</tabstop>
<tabstop>treeView_GameList</tabstop> <tabstop>treeView_GameList</tabstop>
<tabstop>pushButton_joinAnyGame</tabstop> <tabstop>pushButton_joinAnyGame</tabstop>
<tabstop>pushButton_CreateGame</tabstop> <tabstop>pushButton_CreateGame</tabstop>
<tabstop>pushButton_JoinGame</tabstop> <tabstop>pushButton_JoinGame</tabstop>
<tabstop>textBrowser_ChatDisplay</tabstop> <tabstop>textBrowser_ChatDisplay</tabstop>
<tabstop>lineEdit_ChatInput</tabstop> <tabstop>lineEdit_ChatInput</tabstop>
<tabstop>treeWidget_connectedPlayers</tabstop>
<tabstop>scrollArea_gameInfos</tabstop>
<tabstop>checkBox_fillUpWithComputerOpponents</tabstop> <tabstop>checkBox_fillUpWithComputerOpponents</tabstop>
<tabstop>pushButton_StartGame</tabstop> <tabstop>pushButton_StartGame</tabstop>
<tabstop>pushButton_Kick</tabstop> <tabstop>pushButton_Kick</tabstop>
src/gui/qt/gametable.ui
+33
View File
@@ -132,6 +132,9 @@
<property name="alignment"> <property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set> <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property> </property>
<property name="openExternalLinks">
<bool>true</bool>
</property>
</widget> </widget>
<widget class="MySetLabel" name="textLabel_Set3"> <widget class="MySetLabel" name="textLabel_Set3">
<property name="geometry"> <property name="geometry">
@@ -350,6 +353,9 @@
<property name="alignment"> <property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set> <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property> </property>
<property name="openExternalLinks">
<bool>true</bool>
</property>
</widget> </widget>
<widget class="MySetLabel" name="textLabel_Set2"> <widget class="MySetLabel" name="textLabel_Set2">
<property name="geometry"> <property name="geometry">
@@ -572,9 +578,15 @@
<height>14</height> <height>14</height>
</size> </size>
</property> </property>
<property name="autoFillBackground">
<bool>false</bool>
</property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set> <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property> </property>
<property name="openExternalLinks">
<bool>true</bool>
</property>
</widget> </widget>
<widget class="MySetLabel" name="textLabel_Set4"> <widget class="MySetLabel" name="textLabel_Set4">
<property name="geometry"> <property name="geometry">
@@ -780,6 +792,9 @@
<property name="alignment"> <property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set> <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property> </property>
<property name="openExternalLinks">
<bool>true</bool>
</property>
</widget> </widget>
<widget class="MySetLabel" name="textLabel_Set5"> <widget class="MySetLabel" name="textLabel_Set5">
<property name="geometry"> <property name="geometry">
@@ -985,6 +1000,9 @@
<property name="alignment"> <property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set> <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property> </property>
<property name="openExternalLinks">
<bool>true</bool>
</property>
</widget> </widget>
<widget class="MySetLabel" name="textLabel_Set6"> <widget class="MySetLabel" name="textLabel_Set6">
<property name="geometry"> <property name="geometry">
@@ -1210,6 +1228,9 @@
<property name="alignment"> <property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set> <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property> </property>
<property name="openExternalLinks">
<bool>true</bool>
</property>
</widget> </widget>
<widget class="MySetLabel" name="textLabel_Set7"> <widget class="MySetLabel" name="textLabel_Set7">
<property name="geometry"> <property name="geometry">
@@ -1428,6 +1449,9 @@
<property name="alignment"> <property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set> <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property> </property>
<property name="openExternalLinks">
<bool>true</bool>
</property>
</widget> </widget>
<widget class="MySetLabel" name="textLabel_Set8"> <widget class="MySetLabel" name="textLabel_Set8">
<property name="geometry"> <property name="geometry">
@@ -2108,6 +2132,9 @@
<property name="alignment"> <property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set> <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property> </property>
<property name="openExternalLinks">
<bool>true</bool>
</property>
</widget> </widget>
<widget class="MySetLabel" name="textLabel_Set1"> <widget class="MySetLabel" name="textLabel_Set1">
<property name="geometry"> <property name="geometry">
@@ -2313,6 +2340,9 @@
<property name="alignment"> <property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set> <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property> </property>
<property name="openExternalLinks">
<bool>true</bool>
</property>
</widget> </widget>
<widget class="MySetLabel" name="textLabel_Set0"> <widget class="MySetLabel" name="textLabel_Set0">
<property name="geometry"> <property name="geometry">
@@ -2531,6 +2561,9 @@
<property name="alignment"> <property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set> <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property> </property>
<property name="openExternalLinks">
<bool>true</bool>
</property>
</widget> </widget>
<widget class="MySetLabel" name="textLabel_Set9"> <widget class="MySetLabel" name="textLabel_Set9">
<property name="geometry"> <property name="geometry">
src/gui/qt/gametable/gametableimpl.cpp
+28 -13
View File
@@ -234,6 +234,9 @@ gameTableImpl::gameTableImpl(ConfigFile *c, QMainWindow *parent)
playerNameLabelArray[7] = label_PlayerName7; playerNameLabelArray[7] = label_PlayerName7;
playerNameLabelArray[8] = label_PlayerName8; playerNameLabelArray[8] = label_PlayerName8;
playerNameLabelArray[9] = label_PlayerName9; playerNameLabelArray[9] = label_PlayerName9;
for (i=0; i<MAX_NUMBER_OF_PLAYERS; i++) {
playerNameLabelArray[i]->setMyW(this);
}
// playerAvatarLabelArray init // playerAvatarLabelArray init
playerAvatarLabelArray[0] = label_Avatar0; playerAvatarLabelArray[0] = label_Avatar0;
@@ -781,12 +784,24 @@ void gameTableImpl::refreshPlayerName() {
PlayerListConstIterator it_c; PlayerListConstIterator it_c;
for (it_c=currentHand->getSeatsList()->begin(); it_c!=currentHand->getSeatsList()->end(); it_c++) { for (it_c=currentHand->getSeatsList()->begin(); it_c!=currentHand->getSeatsList()->end(); it_c++) {
if((*it_c)->getMyActiveStatus()) { 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((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) { 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 { else {
playerNameLabelArray[(*it_c)->getMyID()]->setText(""); 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++) { 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() ) { 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++) { 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() ) { 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; ctrlPressed = TRUE;
} }
} }
if (event->key() == Qt::Key_Escape && (myActionIsBet || myActionIsRaise)) { // if (event->key() == Qt::Key_Escape && (myActionIsBet || myActionIsRaise)) {
meInAction(); // meInAction();
} // }
if (event->key() == Qt::Key_Up && lineEdit_ChatInput->hasFocus()) { if (event->key() == Qt::Key_Up && lineEdit_ChatInput->hasFocus()) {
if((keyUpDownChatCounter + 1) <= myChat->getChatLinesHistorySize()) { keyUpDownChatCounter++; } if((keyUpDownChatCounter + 1) <= myChat->getChatLinesHistorySize()) { keyUpDownChatCounter++; }
// std::cout << "Up keyUpDownChatCounter: " << keyUpDownChatCounter << "\n"; // std::cout << "Up keyUpDownChatCounter: " << keyUpDownChatCounter << "\n";
@@ -2597,7 +2612,7 @@ void gameTableImpl::keyPressEvent ( QKeyEvent * event ) {
else { keyUpDownChatCounter = 0; } else { keyUpDownChatCounter = 0; }
//TESTING UNIT //TESTING UNIT
if (event->key() == Qt::Key_M) { showShowMyCardsButton(); } // if (event->key() == Qt::Key_M) { showShowMyCardsButton(); }
} }
void gameTableImpl::changePlayingMode() { void gameTableImpl::changePlayingMode() {
@@ -3391,9 +3406,9 @@ void gameTableImpl::sendShowMyCardsSignal()
void gameTableImpl::showWarningAutoFoldInRankingGame(unsigned remainingAutoFolds) void gameTableImpl::showWarningAutoFoldInRankingGame(unsigned remainingAutoFolds)
{ {
QMessageBox::warning(this, tr("PokerTH - Warning"), QMessageBox::warning(this, tr("PokerTH - Warning"),
tr("You have triggered a warning level of timeouts in a ranking game.\n" 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" "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), "If you are temporarily away, you can use the \"away\" tools in the tool box on the right.").arg(remainingAutoFolds),
QMessageBox::Ok); QMessageBox::Ok);
tabWidget_Right->setCurrentIndex(1); tabWidget_Right->setCurrentIndex(1);
} }
src/gui/qt/gametable/mynamelabel.cpp
+42 -17
View File
@@ -10,9 +10,12 @@
// //
// //
#include "mynamelabel.h" #include "mynamelabel.h"
#include "gametableimpl.h"
#include "session.h"
#include "gametablestylereader.h"
MyNameLabel::MyNameLabel(QGroupBox* parent) 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; QString text;
transparent = trans; QColor transColor;
update(); 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 = "<a style='color: rgba("+red+", "+green+", "+blue+", 80);' href='"+link.toEncoded()+"'>"+t+"</a>";
}
else {
text = "<a style='color: #"+myW->getMyGameTableStyle()->getPlayerNickTextColor()+";' href='"+link.toEncoded()+"'>"+t+"</a>";
}
}
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);
}
src/gui/qt/gametable/mynamelabel.h
+7 -4
View File
@@ -17,6 +17,8 @@
#include <QtGui> #include <QtGui>
#include <QtCore> #include <QtCore>
class gameTableImpl;
class MyNameLabel : public QLabel class MyNameLabel : public QLabel
{ {
Q_OBJECT Q_OBJECT
@@ -24,15 +26,16 @@ public:
MyNameLabel(QGroupBox*); MyNameLabel(QGroupBox*);
~MyNameLabel(); ~MyNameLabel();
void setMyW(gameTableImpl* theValue) { myW = theValue; }
public slots: public slots:
void setText ( const QString &, const bool = FALSE); void setText ( const QString &, bool = FALSE, bool = FALSE, bool = FALSE);
void paintEvent(QPaintEvent*);
private: private:
QString myText; QString myText;
bool transparent; gameTableImpl *myW;
}; };
#endif #endif
src/gui/qt/internetgamelogindialog.ui
+9
View File
@@ -114,6 +114,15 @@ p, li { white-space: pre-wrap; }
</item> </item>
</layout> </layout>
</widget> </widget>
<tabstops>
<tabstop>groupBox_reguser</tabstop>
<tabstop>lineEdit_username</tabstop>
<tabstop>lineEdit_password</tabstop>
<tabstop>checkBox_rememberPassword</tabstop>
<tabstop>checkBox_guest</tabstop>
<tabstop>pushButton_login</tabstop>
<tabstop>pushButton_cancel</tabstop>
</tabstops>
<resources/> <resources/>
<connections> <connections>
<connection> <connection>
src/gui/qt/joinnetworkgamedialog.ui
+2
View File
@@ -308,7 +308,9 @@ p, li { white-space: pre-wrap; }
</layout> </layout>
</widget> </widget>
<tabstops> <tabstops>
<tabstop>lineEdit_profileName</tabstop>
<tabstop>lineEdit_ipAddress</tabstop> <tabstop>lineEdit_ipAddress</tabstop>
<tabstop>spinBox_port</tabstop>
<tabstop>checkBox_ipv6</tabstop> <tabstop>checkBox_ipv6</tabstop>
<tabstop>checkBox_sctp</tabstop> <tabstop>checkBox_sctp</tabstop>
<tabstop>treeWidget</tabstop> <tabstop>treeWidget</tabstop>
src/gui/qt/settingsdialog.ui
+33 -2
View File
@@ -3610,9 +3610,14 @@ p, li { white-space: pre-wrap; }
<tabstop>listWidget</tabstop> <tabstop>listWidget</tabstop>
<tabstop>comboBox_switchLanguage</tabstop> <tabstop>comboBox_switchLanguage</tabstop>
<tabstop>checkBox_showRightToolbox</tabstop> <tabstop>checkBox_showRightToolbox</tabstop>
<tabstop>checkBox_showLeftToolbox</tabstop>
<tabstop>checkBox_showFadeOutCardsAnimation</tabstop> <tabstop>checkBox_showFadeOutCardsAnimation</tabstop>
<tabstop>checkBox_showFlipCardsAnimation</tabstop>
<tabstop>checkBox_alternateFKeysUserActionMode</tabstop> <tabstop>checkBox_alternateFKeysUserActionMode</tabstop>
<tabstop>checkBox_showBlindButtons</tabstop> <tabstop>checkBox_showBlindButtons</tabstop>
<tabstop>checkBox_cardsChanceMonitor</tabstop>
<tabstop>checkBox_antiPeekMode</tabstop>
<tabstop>checkBox_disableSplashscreen</tabstop>
<tabstop>checkBox_dontTranslatePokerStrings</tabstop> <tabstop>checkBox_dontTranslatePokerStrings</tabstop>
<tabstop>checkBox_enableBetInputFocusSwitch</tabstop> <tabstop>checkBox_enableBetInputFocusSwitch</tabstop>
<tabstop>tabWidget</tabstop> <tabstop>tabWidget</tabstop>
@@ -3622,6 +3627,10 @@ p, li { white-space: pre-wrap; }
<tabstop>treeWidget_cardDeckStyles</tabstop> <tabstop>treeWidget_cardDeckStyles</tabstop>
<tabstop>pushButton_addCardDeckStyle</tabstop> <tabstop>pushButton_addCardDeckStyle</tabstop>
<tabstop>pushButton_removeCardDeckStyle</tabstop> <tabstop>pushButton_removeCardDeckStyle</tabstop>
<tabstop>radioButton_flipsideTux</tabstop>
<tabstop>radioButton_flipsideOwn</tabstop>
<tabstop>lineEdit_OwnFlipsideFilename</tabstop>
<tabstop>pushButton_openFlipsidePicture</tabstop>
<tabstop>groupBox_playSoundEffects</tabstop> <tabstop>groupBox_playSoundEffects</tabstop>
<tabstop>horizontalSlider_soundVolume</tabstop> <tabstop>horizontalSlider_soundVolume</tabstop>
<tabstop>checkBox_playGameActions</tabstop> <tabstop>checkBox_playGameActions</tabstop>
@@ -3655,6 +3664,23 @@ p, li { white-space: pre-wrap; }
<tabstop>spinBox_serverPort</tabstop> <tabstop>spinBox_serverPort</tabstop>
<tabstop>checkBox_useIpv6</tabstop> <tabstop>checkBox_useIpv6</tabstop>
<tabstop>checkBox_useSctp</tabstop> <tabstop>checkBox_useSctp</tabstop>
<tabstop>tabWidget_2</tabstop>
<tabstop>groupBox_automaticServerConfig</tabstop>
<tabstop>lineEdit_InternetServerListAddress</tabstop>
<tabstop>groupBox_manualServerConfig</tabstop>
<tabstop>lineEdit_InternetServerAddress</tabstop>
<tabstop>spinBox_InternetServerPort</tabstop>
<tabstop>checkBox_useAvatarServer</tabstop>
<tabstop>lineEdit_avatarServerAddress</tabstop>
<tabstop>checkBox_InternetServerUseIpv6</tabstop>
<tabstop>checkBox_InternetServerUseSctp</tabstop>
<tabstop>lineEdit_internetGameName</tabstop>
<tabstop>comboBox_internetGameType</tabstop>
<tabstop>checkBox_UseInternetGamePassword</tabstop>
<tabstop>lineEdit_InternetGamePassword</tabstop>
<tabstop>checkBox_UseLobbyChat</tabstop>
<tabstop>treeWidget_internetGameIgnoredPlayers</tabstop>
<tabstop>pushButton_internetGameRemoveIgnoredPlayer</tabstop>
<tabstop>pushButton_HumanPlayerAvatar</tabstop> <tabstop>pushButton_HumanPlayerAvatar</tabstop>
<tabstop>lineEdit_HumanPlayerName</tabstop> <tabstop>lineEdit_HumanPlayerName</tabstop>
<tabstop>pushButton_Opponent1Avatar</tabstop> <tabstop>pushButton_Opponent1Avatar</tabstop>
@@ -3676,10 +3702,15 @@ p, li { white-space: pre-wrap; }
<tabstop>pushButton_Opponent9Avatar</tabstop> <tabstop>pushButton_Opponent9Avatar</tabstop>
<tabstop>lineEdit_Opponent9Name</tabstop> <tabstop>lineEdit_Opponent9Name</tabstop>
<tabstop>groupBox_logOnOff</tabstop> <tabstop>groupBox_logOnOff</tabstop>
<tabstop>lineEdit_logDir</tabstop>
<tabstop>pushButton_openLogDir</tabstop>
<tabstop>spinBox_logStoreDuration</tabstop> <tabstop>spinBox_logStoreDuration</tabstop>
<tabstop>comboBox_logInterval</tabstop> <tabstop>comboBox_logInterval</tabstop>
<tabstop>lineEdit_logDir</tabstop>
<tabstop>pushButton_openLogDir</tabstop>
<tabstop>treeWidget_logFiles</tabstop>
<tabstop>pushButton_exportLogHtml</tabstop>
<tabstop>pushButton_exportLogTxt</tabstop>
<tabstop>pushButton_saveLogAs</tabstop>
<tabstop>pushButton_deleteLog</tabstop>
<tabstop>buttonBox</tabstop> <tabstop>buttonBox</tabstop>
</tabstops> </tabstops>
<resources> <resources>
src/gui/qt/settingsdialog/settingsdialogimpl.cpp
+25 -24
View File
@@ -48,30 +48,31 @@ settingsDialogImpl::settingsDialogImpl(QWidget *parent, ConfigFile *c, selectAva
if (myConfig->readConfigInt("CLA_NoWriteAccess")) { groupBox_logOnOff->setDisabled(TRUE); } if (myConfig->readConfigInt("CLA_NoWriteAccess")) { groupBox_logOnOff->setDisabled(TRUE); }
comboBox_switchLanguage->addItem(tr("Afrikaans"),"af"); comboBox_switchLanguage->addItem(trUtf8("Afrikaans (Afrikaans)"),"af");
comboBox_switchLanguage->addItem(tr("Bulgarian"),"bg"); comboBox_switchLanguage->addItem(trUtf8("Bulgarian (Български)"),"bg");
comboBox_switchLanguage->addItem(tr("Chinese"),"zhcn"); comboBox_switchLanguage->addItem(trUtf8("Catalan (Català)"),"ca");
comboBox_switchLanguage->addItem(tr("Catalan"),"ca"); comboBox_switchLanguage->addItem(trUtf8("Chinese (简体中文)"),"zhcn");
comboBox_switchLanguage->addItem(tr("Czech"),"cz"); comboBox_switchLanguage->addItem(trUtf8("Czech (čeština)"),"cz");
comboBox_switchLanguage->addItem(tr("Danish"),"dk"); comboBox_switchLanguage->addItem(trUtf8("Danish (Dansk)"),"dk");
comboBox_switchLanguage->addItem(tr("Dutch"),"nl"); comboBox_switchLanguage->addItem(trUtf8("Dutch (Nederlands)"),"nl");
comboBox_switchLanguage->addItem(tr("English"),"en"); comboBox_switchLanguage->addItem(trUtf8("English (English)"),"en");
comboBox_switchLanguage->addItem(tr("French"),"fr"); comboBox_switchLanguage->addItem(trUtf8("Finnish (suomi)"),"fi");
comboBox_switchLanguage->addItem(tr("Finnish"),"fi"); comboBox_switchLanguage->addItem(trUtf8("French (français)"),"fr");
comboBox_switchLanguage->addItem(tr("German"),"de"); comboBox_switchLanguage->addItem(trUtf8("German (Deutsch)"),"de");
comboBox_switchLanguage->addItem(tr("Greek"),"gr"); comboBox_switchLanguage->addItem(trUtf8("Greek (Ελληνικά)"),"gr");
comboBox_switchLanguage->addItem(tr("Hungarian"),"hu"); comboBox_switchLanguage->addItem(trUtf8("Hungarian (Magyar)"),"hu");
comboBox_switchLanguage->addItem(tr("Italian"),"it"); comboBox_switchLanguage->addItem(trUtf8("Italian (italiano)"),"it");
comboBox_switchLanguage->addItem(tr("Norwegian"),"no"); comboBox_switchLanguage->addItem(trUtf8("Lithuania (Lietuviškai)"),"lt");
comboBox_switchLanguage->addItem(tr("Polish"),"pl"); comboBox_switchLanguage->addItem(trUtf8("Norwegian (Norsk)"),"no");
comboBox_switchLanguage->addItem(tr("Portuguese (Brazilian)"),"ptbr"); comboBox_switchLanguage->addItem(trUtf8("Polish (polski)"),"pl");
comboBox_switchLanguage->addItem(tr("Portuguese (Portuguese)"),"ptpt"); comboBox_switchLanguage->addItem(trUtf8("Portuguese-Brazilian (português brasileiro)"),"ptbr");
comboBox_switchLanguage->addItem(tr("Russian"),"ru"); comboBox_switchLanguage->addItem(trUtf8("Portuguese-Portuguese (português português)"),"ptpt");
comboBox_switchLanguage->addItem(tr("Slovak"),"sk"); comboBox_switchLanguage->addItem(trUtf8("Russian (Pyccĸий)"),"ru");
comboBox_switchLanguage->addItem(tr("Spanish"),"es"); comboBox_switchLanguage->addItem(trUtf8("Slovak (Slovenčina)"),"sk");
comboBox_switchLanguage->addItem(tr("Swedish"),"sv"); comboBox_switchLanguage->addItem(trUtf8("Spanish (Español)"),"es");
comboBox_switchLanguage->addItem(tr("Tamil"),"ta"); comboBox_switchLanguage->addItem(trUtf8("Swedish (svenska)"),"sv");
comboBox_switchLanguage->addItem(tr("Turkish"),"tr"); comboBox_switchLanguage->addItem(trUtf8("Tamil (தமிழ்)"),"ta");
comboBox_switchLanguage->addItem(trUtf8("Turkish (Tϋrkçe)"),"tr");
connect( buttonBox, SIGNAL( accepted() ), this, SLOT( isAccepted() ) ); connect( buttonBox, SIGNAL( accepted() ), this, SLOT( isAccepted() ) );
connect( lineEdit_HumanPlayerName, SIGNAL( textChanged( const QString &) ), this, SLOT( playerNickChanged() ) ); connect( lineEdit_HumanPlayerName, SIGNAL( textChanged( const QString &) ), this, SLOT( playerNickChanged() ) );
src/gui/qt/styles/gametablestylereader.h
+4
View File
@@ -78,6 +78,10 @@ public:
QString getLogNewGameAdminColor() const { return LogNewGameAdminColor; } QString getLogNewGameAdminColor() const { return LogNewGameAdminColor; }
QString getBreakLobbyButtonBgColor() const { return BreakLobbyButtonBgColor; } 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 getMinimumWindowWidth() const { return MinimumWindowWidth; }
QString getMinimumWindowHeight() const { return MinimumWindowHeight; } QString getMinimumWindowHeight() const { return MinimumWindowHeight; }
QString getMaximumWindowWidth() const { return MaximumWindowWidth; } QString getMaximumWindowWidth() const { return MaximumWindowWidth; }