diff --git a/data/translations/pokerth_nl.qm b/data/translations/pokerth_nl.qm
index 821d1489..8628d942 100644
Binary files a/data/translations/pokerth_nl.qm and b/data/translations/pokerth_nl.qm differ
diff --git a/src/gui/qt/changehumanplayernamedialog.ui b/src/gui/qt/changehumanplayernamedialog.ui
index 86135163..6c3aed50 100644
--- a/src/gui/qt/changehumanplayernamedialog.ui
+++ b/src/gui/qt/changehumanplayernamedialog.ui
@@ -42,6 +42,9 @@
Name:
+
+ lineEdit
+
-
diff --git a/src/gui/qt/createinternetgamedialog.ui b/src/gui/qt/createinternetgamedialog.ui
index 0898a227..2869d82d 100644
--- a/src/gui/qt/createinternetgamedialog.ui
+++ b/src/gui/qt/createinternetgamedialog.ui
@@ -42,6 +42,9 @@
Maximum number of players:
+
+ spinBox_quantityPlayers
+
-
@@ -62,6 +65,9 @@
Start Cash:
+
+ spinBox_startCash
+
-
@@ -111,6 +117,9 @@
Game Speed for computer opponents:
+
+ spinBox_gameSpeed
+
-
@@ -131,6 +140,9 @@
Timeout for player action (sec):
+
+ spinBox_netTimeOutPlayerAction
+
-
diff --git a/src/gui/qt/createnetworkgamedialog.ui b/src/gui/qt/createnetworkgamedialog.ui
index b0dd1a25..26033b4e 100644
--- a/src/gui/qt/createnetworkgamedialog.ui
+++ b/src/gui/qt/createnetworkgamedialog.ui
@@ -27,6 +27,9 @@
Maximum number of players:
+
+ spinBox_quantityPlayers
+
-
@@ -47,6 +50,9 @@
Start Cash:
+
+ spinBox_startCash
+
-
@@ -96,6 +102,9 @@
Game Speed for computer opponents:
+
+ spinBox_gameSpeed
+
-
@@ -116,6 +125,9 @@
Timeout for player action (sec):
+
+ spinBox_netTimeOutPlayerAction
+
-
diff --git a/src/gui/qt/gamelobbydialog.ui b/src/gui/qt/gamelobbydialog.ui
index 5e4db5aa..87b3b393 100644
--- a/src/gui/qt/gamelobbydialog.ui
+++ b/src/gui/qt/gamelobbydialog.ui
@@ -538,8 +538,18 @@
+ treeWidget_NickList
treeWidget_GameList
+ pushButton_joinAnyGame
pushButton_CreateGame
+ pushButton_JoinGame
+ textBrowser_ChatDisplay
+ lineEdit_ChatInput
+ treeWidget_connectedPlayers
+ checkBox_fillUpWithComputerOpponents
+ pushButton_StartGame
+ pushButton_Kick
+ pushButton_Leave
diff --git a/src/gui/qt/joinnetworkgamedialog.ui b/src/gui/qt/joinnetworkgamedialog.ui
index 4d480954..fc9b1f7e 100644
--- a/src/gui/qt/joinnetworkgamedialog.ui
+++ b/src/gui/qt/joinnetworkgamedialog.ui
@@ -13,10 +13,22 @@
Join Network Game
-
+
9
-
+
+ 9
+
+
+ 9
+
+
+ 9
+
+
+ 6
+
+
6
-
@@ -25,10 +37,22 @@
Connect to Network Game
-
+
9
-
+
+ 9
+
+
+ 9
+
+
+ 9
+
+
+ 6
+
+
6
-
@@ -37,10 +61,22 @@
Server Profiles
-
+
9
-
+
+ 9
+
+
+ 9
+
+
+ 9
+
+
+ 6
+
+
6
-
@@ -92,12 +128,21 @@
-
-
- 0
-
6
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
-
@@ -119,12 +164,21 @@
-
-
- 0
-
6
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
-
@@ -162,12 +216,21 @@ p, li { white-space: pre-wrap; }
-
-
- 0
-
6
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
-
@@ -237,16 +300,19 @@ p, li { white-space: pre-wrap; }
Password (optional):
+
+ lineEdit_password
+
-
-
- 65535
-
80
+
+ 65535
+
7234
@@ -257,6 +323,9 @@ p, li { white-space: pre-wrap; }
Port:
+
+ spinBox_port
+
-
@@ -264,6 +333,9 @@ p, li { white-space: pre-wrap; }
IP Address / Domain Name:
+
+ lineEdit_ipAddress
+
-
@@ -271,6 +343,9 @@ p, li { white-space: pre-wrap; }
Profile Name:
+
+ lineEdit_profileName
+
-
@@ -285,12 +360,21 @@ p, li { white-space: pre-wrap; }
-
-
- 0
-
6
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
-
diff --git a/src/gui/qt/mainwindow.ui b/src/gui/qt/mainwindow.ui
index f21dd8b8..e252c10f 100644
--- a/src/gui/qt/mainwindow.ui
+++ b/src/gui/qt/mainwindow.ui
@@ -25,24 +25,9 @@
PokerTH 0.6-beta - The Open-Source Texas Holdem Engine
-
-
-
+
+
-
-
- 0
-
-
- 0
-
-
- 0
-
-
- 0
-
-
- 0
-
-
@@ -57,212 +42,487 @@
-
-
-
-
- 223
- 185
-
-
-
-
- 223
- 185
-
-
-
-
-
-
-
-
- 17
- 70
- 50
- 34
-
-
-
- QFrame::NoFrame
-
-
- QFrame::Raised
-
-
-
- 0
+
+
-
+
+
+ Qt::Vertical
-
- 0
+
+
+ 221
+ 36
+
-
- 0
+
+
+ -
+
+
+
+ 223
+ 185
+
-
- 0
+
+
+ 223
+ 185
+
-
- 0
+
+
-
- 0
-
-
-
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+
+ 17
+ 70
+ 50
+ 34
+
+
+
+ QFrame::NoFrame
+
+
+ QFrame::Raised
+
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
-
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+
+ -
+
+
+
+
+
+
+
+ 22
+ 123
+ 40
+ 40
+
+
+
+ QFrame::Raised
+
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+ -
+
+
+
+
+
+ true
+
+
+
+
+
+
+
+
+ 85
+ 40
+ 118
+ 111
+
+
+
+
+
+ 9
+ 35
+ 100
+ 40
+
+
+
+
+ 0
+ 20
+
-
-
- -
-
-
-
-
-
-
-
- 22
- 123
- 40
- 40
-
-
-
- QFrame::Raised
-
-
-
- 0
-
-
- 0
-
-
- 0
-
-
- 0
-
-
- 0
-
-
- 0
-
- -
-
+
+ Qt::AlignCenter
+
+
+
+
+
+ 0
+ 0
+ 80
+ 111
+
+
true
-
-
-
-
-
-
- 85
- 40
- 118
- 111
-
-
-
-
-
- 9
- 35
- 100
- 40
-
+
+
+
+ 39
+ 0
+ 80
+ 111
+
+
+
+ true
+
+
+
+
+
+
+ 17
+ 17
+ 50
+ 50
+
+
+
+
+
+
+ true
+
+
+
+
+
+ 85
+ 17
+ 118
+ 23
+
+
+
+ Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop
+
+
+
+
+
+ 85
+ 155
+ 118
+ 20
+
+
+
+ Qt::AlignBottom|Qt::AlignHCenter
+
+
+
+
+ -
+
+
+ Qt::Vertical
-
+
- 0
- 20
+ 221
+ 36
-
+
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+ QSizePolicy::Expanding
+
+
+
+ 40
+ 20
+
+
+
+
+ -
+
+
-
+
+
+
+ 223
+ 185
+
+
+
+
+ 223
+ 185
+
+
+
-
- Qt::AlignCenter
-
+
+
+
+ 17
+ 70
+ 50
+ 34
+
+
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
-
+
+
+
+ 35
+ 0
+
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+
+ -
+
+
+
+ 35
+ 0
+
+
+
+
+
+
+
+
+
+ 22
+ 123
+ 40
+ 40
+
+
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+ -
+
+
+
+
+
+ true
+
+
+
+
+
+
+
+
+ 85
+ 40
+ 118
+ 111
+
+
+
+
+
+ 9
+ 35
+ 100
+ 40
+
+
+
+
+ 0
+ 20
+
+
+
+
+
+
+ Qt::AlignCenter
+
+
+
+
+
+ 0
+ 0
+ 80
+ 111
+
+
+
+ true
+
+
+
+
+
+ 39
+ 0
+ 80
+ 111
+
+
+
+ true
+
+
+
+
+
+
+ 17
+ 17
+ 50
+ 50
+
+
+
+
+
+
+ true
+
+
+
+
+
+ 85
+ 17
+ 118
+ 23
+
+
+
+ Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop
+
+
+
+
+
+ 85
+ 155
+ 118
+ 20
+
+
+
+ Qt::AlignBottom|Qt::AlignHCenter
+
+
-
-
-
- 0
- 0
- 80
- 111
-
+
+ -
+
+
+ Qt::Vertical
-
- true
+
+
+ 151
+ 90
+
-
-
-
-
- 39
- 0
- 80
- 111
-
-
-
- true
-
-
-
-
-
-
- 17
- 17
- 50
- 50
-
-
-
-
-
-
- true
-
-
-
-
-
- 85
- 17
- 118
- 23
-
-
-
- Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop
-
-
-
-
-
- 85
- 155
- 118
- 20
-
-
-
- Qt::AlignBottom|Qt::AlignHCenter
-
-
-
+
+
+
-
@@ -278,216 +538,233 @@
-
-
-
-
- 223
- 185
-
-
-
-
- 223
- 185
-
-
-
-
-
-
-
-
- 17
- 70
- 50
- 34
-
-
-
-
- 0
+
+
-
+
+
+
+ 223
+ 185
+
-
- 0
+
+
+ 223
+ 185
+
-
- 0
+
+
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
+
+
+
+ 85
+ 40
+ 118
+ 111
+
+
+
+
+
+ 9
+ 35
+ 100
+ 40
+
+
- 35
- 0
+ 0
+ 20
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
-
- -
-
-
-
- 35
- 0
-
-
-
-
-
-
-
-
-
- 22
- 123
- 40
- 40
-
-
-
-
- 0
-
-
- 0
-
-
- 0
-
-
- 0
-
-
- 0
-
-
- 0
-
- -
-
+
+ Qt::AlignCenter
+
+
+
+
+
+ 0
+ 0
+ 80
+ 111
+
+
true
-
-
-
-
-
-
- 85
- 40
- 118
- 111
-
-
-
-
-
- 9
- 35
- 100
- 40
-
+
+
+
+ 39
+ 0
+ 80
+ 111
+
+
+
+ true
+
+
+
+
+
+
+ 17
+ 70
+ 50
+ 34
+
+
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+ -
+
+
+
+ 35
+ 0
+
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+
+ -
+
+
+
+ 35
+ 0
+
+
+
+
+
+
+
+
+
+ 22
+ 123
+ 40
+ 40
+
+
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+ -
+
+
+
+
+
+ true
+
+
+
+
+
+
+
+
+ 17
+ 17
+ 50
+ 50
+
+
+
+
+
+
+ true
+
+
+
+
+
+ 85
+ 17
+ 118
+ 23
+
+
+
+ Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop
+
+
+
+
+
+ 85
+ 155
+ 118
+ 20
+
+
+
+ Qt::AlignBottom|Qt::AlignHCenter
+
+
+
+
+ -
+
+
+ Qt::Vertical
-
+
- 0
- 20
+ 21
+ 81
-
-
-
-
- Qt::AlignCenter
-
-
-
-
-
- 0
- 0
- 80
- 111
-
-
-
- true
-
-
-
-
-
- 39
- 0
- 80
- 111
-
-
-
- true
-
-
-
-
-
-
- 17
- 17
- 50
- 50
-
-
-
-
-
-
- true
-
-
-
-
-
- 85
- 17
- 118
- 23
-
-
-
- Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop
-
-
-
-
-
- 85
- 155
- 118
- 20
-
-
-
- Qt::AlignBottom|Qt::AlignHCenter
-
-
-
+
+
+
-
@@ -503,441 +780,246 @@
-
-
-
-
- 223
- 185
-
-
-
-
- 223
- 185
-
-
-
-
-
-
-
-
- 85
- 40
- 118
- 111
-
-
-
-
-
- 9
- 35
- 100
- 40
-
+
+
-
+
+
+ Qt::Vertical
-
+
- 0
- 20
+ 20
+ 40
-
+
+
+ -
+
+
+
+ 223
+ 185
+
+
+
+
+ 223
+ 185
+
+
+
-
- Qt::AlignCenter
-
-
-
-
-
- 0
- 0
- 80
- 111
-
-
-
- true
-
-
-
-
-
- 39
- 0
- 80
- 111
-
-
-
- true
-
-
-
-
-
-
- 17
- 70
- 50
- 34
-
-
-
-
- 0
-
-
- 0
-
-
- 0
-
-
- 0
-
-
- 0
-
-
- 0
-
- -
-
+
+
+
+ 17
+ 70
+ 50
+ 34
+
+
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
-
+
+
+
+ 35
+ 0
+
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+
+ -
+
+
+
+ 35
+ 0
+
+
+
+
+
+
+
+
+
+ 22
+ 123
+ 40
+ 40
+
+
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+ -
+
+
+
+
+
+ true
+
+
+
+
+
+
+
+
+ 85
+ 40
+ 118
+ 111
+
+
+
+
+
+ 9
+ 35
+ 100
+ 40
+
+
- 35
- 0
+ 0
+ 20
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
-
- -
-
-
-
- 35
- 0
-
-
-
-
-
-
-
-
-
- 22
- 123
- 40
- 40
-
-
-
-
- 0
-
-
- 0
-
-
- 0
-
-
- 0
-
-
- 0
-
-
- 0
-
- -
-
+
+ Qt::AlignCenter
+
+
+
+
+
+ 0
+ 0
+ 80
+ 111
+
+
true
-
-
-
-
-
-
- 17
- 17
- 50
- 50
-
-
-
-
-
-
- true
-
-
-
-
-
- 85
- 17
- 118
- 23
-
-
-
- Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop
-
-
-
-
-
- 85
- 155
- 118
- 20
-
-
-
- Qt::AlignBottom|Qt::AlignHCenter
-
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
- -
-
-
-
- 223
- 185
-
-
-
-
- 223
- 185
-
-
-
-
-
-
-
-
- 17
- 70
- 50
- 34
-
-
-
-
- 0
-
-
- 0
-
-
- 0
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
-
-
- 35
- 0
-
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
-
- -
-
-
-
- 35
- 0
-
-
-
-
-
-
-
-
-
- 22
- 123
- 40
- 40
-
-
-
-
- 0
-
-
- 0
-
-
- 0
-
-
- 0
-
-
- 0
-
-
- 0
-
- -
-
-
-
+
+
+
+ 39
+ 0
+ 80
+ 111
+
true
-
-
-
-
-
-
- 85
- 40
- 118
- 111
-
-
-
-
-
- 9
- 35
- 100
- 40
-
+
+
+
+
+ 17
+ 17
+ 50
+ 50
+
+
+
+
+
+
+ true
+
+
+
+
+
+ 85
+ 17
+ 118
+ 23
+
+
+
+ Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop
+
+
+
+
+
+ 85
+ 155
+ 118
+ 20
+
+
+
+ Qt::AlignBottom|Qt::AlignHCenter
+
+
+
+
+ -
+
+
+ Qt::Vertical
-
+
- 0
- 20
+ 20
+ 40
-
-
-
-
- Qt::AlignCenter
-
-
-
-
-
- 0
- 0
- 80
- 111
-
-
-
- true
-
-
-
-
-
- 39
- 0
- 80
- 111
-
-
-
- true
-
-
-
-
-
-
- 17
- 17
- 50
- 50
-
-
-
-
-
-
- true
-
-
-
-
-
- 85
- 17
- 118
- 23
-
-
-
- Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop
-
-
-
-
-
- 85
- 155
- 118
- 20
-
-
-
- Qt::AlignBottom|Qt::AlignHCenter
-
-
-
+
+
+
-
@@ -954,20 +1036,7 @@
- -
-
-
- Qt::Vertical
-
-
-
- 982
- 16
-
-
-
-
- -
+
-
0
@@ -1830,20 +1899,7 @@
- -
-
-
- Qt::Vertical
-
-
-
- 982
- 16
-
-
-
-
- -
+
-
0
@@ -2032,606 +2088,623 @@
-
-
-
- true
-
-
-
- 0
- 0
-
-
-
-
- 384
- 211
-
-
-
-
- 384
- 211
-
-
-
-
-
-
-
- 28
-
-
- 28
-
-
- 25
-
-
- 22
-
-
- 11
-
-
- 0
-
-
-
-
-
+
+
-
+
+
+ Qt::Vertical
+
+
+
+ 321
+ 20
+
+
+
+
+ -
+
+
+ true
+
+
+
+ 0
+ 0
+
+
+
+
+ 384
+ 211
+
+
+
+
+ 384
+ 211
+
+
+
+
+
+
+
+ 28
+
+
+ 28
+
+
+ 25
+
+
+ 22
+
+
+ 11
+
+
0
-
-
-
+
-
+
0
-
-
-
- Qt::Horizontal
-
-
- QSizePolicy::Fixed
-
-
-
- 5
- 20
-
-
-
-
- -
-
-
-
- 40
- 40
-
-
-
-
- 40
- 40
-
-
-
- true
-
-
- Qt::AlignCenter
-
-
-
- -
-
-
- Qt::Horizontal
-
-
- QSizePolicy::Fixed
-
-
-
- 5
- 20
-
-
-
-
-
-
- -
-
-
- Qt::Vertical
-
-
- QSizePolicy::Fixed
-
-
-
- 20
- 28
-
-
-
-
- -
-
-
-
- 50
- 34
-
-
-
-
- 50
- 34
-
-
-
- QFrame::Raised
-
-
-
- 0
-
-
- 0
-
-
- 0
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
-
- -
-
-
-
-
-
- -
-
-
-
- 50
- 50
-
-
-
-
- 50
- 50
-
-
-
-
-
-
- true
-
-
-
-
-
- -
-
-
-
- 16777215
- 20
-
-
-
- Qt::AlignHCenter|Qt::AlignTop
-
-
-
- -
-
-
- 1
-
-
-
-
-
- 0
-
-
-
-
-
- Qt::Horizontal
-
-
- QSizePolicy::Fixed
-
-
-
- 13
- 20
-
-
-
-
- -
-
+
- 3
+ 0
-
-
-
- 2
-
-
-
-
-
-
- 0
- 21
-
-
-
-
- 16777215
- 21
-
-
-
-
- -
-
-
-
- 40
- 21
-
-
-
-
- 40
- 21
-
-
-
- Qt::NoFocus
-
-
-
-
-
- -
-
-
-
-
-
-
-
- 102
- 153
- 0
-
-
-
-
-
-
- 255
- 255
- 255
-
-
-
-
-
-
- 40
- 100
- 0
-
-
-
-
-
-
-
-
- 102
- 153
- 0
-
-
-
-
-
-
- 255
- 255
- 255
-
-
-
-
-
-
- 40
- 100
- 0
-
-
-
-
-
-
-
-
- 102
- 153
- 0
-
-
-
-
-
-
- 40
- 100
- 0
-
-
-
-
-
-
- 40
- 100
- 0
-
-
-
-
-
-
-
- Qt::NoFocus
-
-
- 99999
-
-
- 10
-
+
Qt::Horizontal
-
- QSlider::NoTicks
+
+ QSizePolicy::Fixed
-
- 10
+
+
+ 5
+ 20
+
+
+
+
+ -
+
+
+
+ 40
+ 40
+
+
+
+
+ 40
+ 40
+
+
+
+ true
+
+
+ Qt::AlignCenter
+ -
+
+
+ Qt::Horizontal
+
+
+ QSizePolicy::Fixed
+
+
+
+ 5
+ 20
+
+
+
+
-
- Qt::Horizontal
+ Qt::Vertical
QSizePolicy::Fixed
- 13
- 20
+ 20
+ 28
+ -
+
+
+
+ 50
+ 34
+
+
+
+
+ 50
+ 34
+
+
+
+ QFrame::Raised
+
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
-
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+ 50
+ 50
+
+
+
+
+ 50
+ 50
+
+
+
+
+
+
+ true
+
+
+
- -
+
-
+
+
+
+ 16777215
+ 20
+
+
+
+ Qt::AlignHCenter|Qt::AlignTop
+
+
+
+ -
- 0
+ 1
-
-
-
-
- 0
- 0
-
+
+
+ 0
-
-
- 140
- 35
-
-
-
-
- 140
- 35
-
-
-
- Qt::NoFocus
-
-
+
-
+
+
+ Qt::Horizontal
+
+
+ QSizePolicy::Fixed
+
+
+
+ 13
+ 20
+
+
+
+
+ -
+
+
+ 3
+
+
-
+
+
+ 2
+
+
-
+
+
+
+ 0
+ 21
+
+
+
+
+ 16777215
+ 21
+
+
+
+
+ -
+
+
+
+ 40
+ 21
+
+
+
+
+ 40
+ 21
+
+
+
+ Qt::NoFocus
+
+
+
+
+
+ -
+
+
+
+
+
+
+
+ 102
+ 153
+ 0
+
+
+
+
+
+
+ 255
+ 255
+ 255
+
+
+
+
+
+
+ 40
+ 100
+ 0
+
+
+
+
+
+
+
+
+ 102
+ 153
+ 0
+
+
+
+
+
+
+ 255
+ 255
+ 255
+
+
+
+
+
+
+ 40
+ 100
+ 0
+
+
+
+
+
+
+
+
+ 102
+ 153
+ 0
+
+
+
+
+
+
+ 40
+ 100
+ 0
+
+
+
+
+
+
+ 40
+ 100
+ 0
+
+
+
+
+
+
+
+ Qt::NoFocus
+
+
+ 99999
+
+
+ 10
+
+
+ Qt::Horizontal
+
+
+ QSlider::NoTicks
+
+
+ 10
+
+
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+ QSizePolicy::Fixed
+
+
+
+ 13
+ 20
+
+
+
+
+
-
-
-
-
- 0
- 0
-
+
+
+ 0
-
-
- 140
- 35
-
-
-
-
- 140
- 35
-
-
-
- Qt::NoFocus
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
-
- 140
- 35
-
-
-
-
- 140
- 35
-
-
-
- Qt::NoFocus
-
-
-
- -
-
-
- Qt::Horizontal
-
-
- QSizePolicy::Fixed
-
-
-
- 140
- 0
-
-
-
+
-
+
+
+
+ 0
+ 0
+
+
+
+
+ 140
+ 35
+
+
+
+
+ 140
+ 35
+
+
+
+ Qt::NoFocus
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 140
+ 35
+
+
+
+
+ 140
+ 35
+
+
+
+ Qt::NoFocus
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 140
+ 35
+
+
+
+
+ 140
+ 35
+
+
+
+ Qt::NoFocus
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+ QSizePolicy::Fixed
+
+
+
+ 140
+ 0
+
+
+
+
+
+ -
+
+
+
+ 118
+ 111
+
+
+
+
+
+ 9
+ 35
+ 100
+ 40
+
+
+
+
+ 0
+ 20
+
+
+
+
+
+
+ Qt::AlignCenter
+
+
+ Qt::NoTextInteraction
+
+
+
+
+
+ 0
+ 0
+ 80
+ 111
+
+
+
+ true
+
+
+
+
+
+ 39
+ 0
+ 80
+ 111
+
+
+
+ true
+
+
+
+
+ -
+
+
+
+ 0
+ 22
+
+
+
+
+ 16777215
+ 22
+
+
+
+ Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft
+
+
+
-
- -
-
-
-
- 118
- 111
-
-
-
-
-
- 9
- 35
- 100
- 40
-
-
-
-
- 0
- 20
-
-
-
-
-
-
- Qt::AlignCenter
-
-
- Qt::NoTextInteraction
-
-
-
-
-
- 0
- 0
- 80
- 111
-
-
-
- true
-
-
-
-
-
- 39
- 0
- 80
- 111
-
-
-
- true
-
-
-
-
- -
-
-
-
- 0
- 22
-
-
-
-
- 16777215
- 22
-
-
-
- Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft
-
-
-
-
-
+
+
+
-
diff --git a/src/gui/qt/mainwindow/mainwindowimpl.cpp b/src/gui/qt/mainwindow/mainwindowimpl.cpp
index 0af5187f..c5a1271a 100755
--- a/src/gui/qt/mainwindow/mainwindowimpl.cpp
+++ b/src/gui/qt/mainwindow/mainwindowimpl.cpp
@@ -563,7 +563,6 @@ mainWindowImpl::mainWindowImpl(ConfigFile *c, QMainWindow *parent)
connect(this, SIGNAL(signalNextPlayerAnimation()), this, SLOT(nextPlayerAnimation()));
- ;
connect(this, SIGNAL(signalBeRoAnimation2(int)), this, SLOT(beRoAnimation2(int)));
connect(this, SIGNAL(signalPreflopAnimation1()), this, SLOT(preflopAnimation1()));
diff --git a/src/gui/qt/manualblindsorderdialog.ui b/src/gui/qt/manualblindsorderdialog.ui
index d6ab91d2..3ccb0330 100644
--- a/src/gui/qt/manualblindsorderdialog.ui
+++ b/src/gui/qt/manualblindsorderdialog.ui
@@ -128,9 +128,9 @@
listWidget_blinds
+ pushButton_delete
spinBox_input
pushButton_add
- pushButton_delete
radioButton_alwaysDoubleBlinds
radioButton_alwaysRaiseAbout
spinBox_alwaysRaiseValue
diff --git a/src/gui/qt/newgamedialog.ui b/src/gui/qt/newgamedialog.ui
index ae898084..c90ce385 100755
--- a/src/gui/qt/newgamedialog.ui
+++ b/src/gui/qt/newgamedialog.ui
@@ -6,7 +6,7 @@
0
0
236
- 278
+ 235
@@ -24,6 +24,9 @@
Number of players:
+
+ spinBox_quantityPlayers
+
-
@@ -44,6 +47,9 @@
Start Cash:
+
+ spinBox_startCash
+
-
@@ -93,6 +99,9 @@
Game Speed:
+
+ spinBox_gameSpeed
+
-
diff --git a/src/gui/qt/settingsdialog.ui b/src/gui/qt/settingsdialog.ui
index ccaf9c9f..004b14be 100644
--- a/src/gui/qt/settingsdialog.ui
+++ b/src/gui/qt/settingsdialog.ui
@@ -68,6 +68,9 @@
Language:
+
+ comboBox_switchLanguage
+
-
@@ -466,6 +469,9 @@ p, li { white-space: pre-wrap; }
Number of players:
+
+ spinBox_quantityPlayers
+
-
@@ -490,6 +496,9 @@ p, li { white-space: pre-wrap; }
Start Cash:
+
+ spinBox_startCash
+
-
@@ -511,6 +520,9 @@ p, li { white-space: pre-wrap; }
First small blind:
+
+ spinBox_firstSmallBlind
+
-
@@ -669,6 +681,9 @@ p, li { white-space: pre-wrap; }
Game Speed:
+
+ spinBox_gameSpeed
+
-
@@ -741,6 +756,9 @@ p, li { white-space: pre-wrap; }
Maximum number of players:
+
+ spinBox_netQuantityPlayers
+
-
@@ -765,6 +783,9 @@ p, li { white-space: pre-wrap; }
Start Cash:
+
+ spinBox_netStartCash
+
-
@@ -786,6 +807,9 @@ p, li { white-space: pre-wrap; }
First small blind:
+
+ spinBox_netFirstSmallBlind
+
-
@@ -938,6 +962,9 @@ p, li { white-space: pre-wrap; }
Game Speed for computer opponents:
+
+ spinBox_netGameSpeed
+
-
@@ -962,6 +989,9 @@ p, li { white-space: pre-wrap; }
Timeout for player action (sec):
+
+ spinBox_netTimeOutPlayerAction
+
-
@@ -1025,6 +1055,9 @@ p, li { white-space: pre-wrap; }
Server Password:
+
+ lineEdit_serverPassword
+
-
@@ -1045,6 +1078,9 @@ p, li { white-space: pre-wrap; }
Server Port:
+
+ spinBox_serverPort
+
-
@@ -1200,6 +1236,9 @@ p, li { white-space: pre-wrap; }
Server Port:
+
+ spinBox_InternetServerPort
+
-
@@ -1230,6 +1269,9 @@ p, li { white-space: pre-wrap; }
Server Address:
+
+ lineEdit_InternetServerAddress
+
-
@@ -1244,6 +1286,9 @@ p, li { white-space: pre-wrap; }
Server Password:
+
+ lineEdit_InternetServerPassword
+
-
@@ -1306,6 +1351,9 @@ p, li { white-space: pre-wrap; }
Server Address:
+
+ lineEdit_IRCServerAddress
+
-
@@ -1323,6 +1371,9 @@ p, li { white-space: pre-wrap; }
Server Port:
+
+ spinBox_IRCServerPort
+
-
@@ -1343,6 +1394,9 @@ p, li { white-space: pre-wrap; }
Channel:
+
+ lineEdit_IRCChannel
+
-
@@ -1381,6 +1435,9 @@ p, li { white-space: pre-wrap; }
Channel Password:
+
+ lineEdit_IRCChannelPassword
+
@@ -2778,6 +2835,9 @@ p, li { white-space: pre-wrap; }
Store log files for
+
+ spinBox_logStoreDuration
+
-
@@ -2843,6 +2903,9 @@ p, li { white-space: pre-wrap; }
Log File Directory:
+
+ lineEdit_logDir
+
-
@@ -2882,6 +2945,9 @@ p, li { white-space: pre-wrap; }
true
+
+ comboBox_logInterval
+
-
@@ -3042,6 +3108,7 @@ p, li { white-space: pre-wrap; }
checkBox_showBlindButtons
checkBox_antiPeekMode
checkBox_alternateFKeysUserActionMode
+ checkBox_enableBetInputFocusSwitch
radioButton_flipsideTux
radioButton_flipsideOwn
lineEdit_OwnFlipsideFilename
@@ -3091,20 +3158,21 @@ p, li { white-space: pre-wrap; }
lineEdit_IRCServerAddress
spinBox_IRCServerPort
lineEdit_IRCChannel
+ lineEdit_IRCChannelPassword
checkBox_IRCServerUseIpv6
pushButton_HumanPlayerAvatar
lineEdit_HumanPlayerName
pushButton_Opponent1Avatar
- lineEdit_Opponent1Name
pushButton_Opponent2Avatar
- lineEdit_Opponent2Name
pushButton_Opponent3Avatar
+ lineEdit_Opponent1Name
+ lineEdit_Opponent2Name
lineEdit_Opponent3Name
pushButton_Opponent4Avatar
- lineEdit_Opponent4Name
pushButton_Opponent5Avatar
- lineEdit_Opponent5Name
pushButton_Opponent6Avatar
+ lineEdit_Opponent4Name
+ lineEdit_Opponent5Name
lineEdit_Opponent6Name
groupBox_logOnOff
lineEdit_logDir
diff --git a/src/pokerth.cpp b/src/pokerth.cpp
index 95e5bfa4..5d0b6429 100755
--- a/src/pokerth.cpp
+++ b/src/pokerth.cpp
@@ -59,8 +59,8 @@
// //Uncomment this for RELEASE
// #include
-// Q_IMPORT_PLUGIN(qjpeg)
-// Q_IMPORT_PLUGIN(qgif)
+Q_IMPORT_PLUGIN(qjpeg)
+Q_IMPORT_PLUGIN(qgif)
using namespace std;
diff --git a/ts/pokerth_nl.ts b/ts/pokerth_nl.ts
index c15387e6..3f1e8a07 100644
--- a/ts/pokerth_nl.ts
+++ b/ts/pokerth_nl.ts
@@ -1,5 +1,6 @@
+
Chat
@@ -10,7 +11,7 @@
You cannot kick any player - You are not game admin!
- U kunt geen spelers verwijderen - U bent geen spelleider!
+ U kunt geen spelers verwijderen - U bent niet de spelleider!
@@ -1112,10 +1113,10 @@ p, li { white-space: pre-wrap; }
p, li { white-space: pre-wrap; }
</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; 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; font-family:'Nimbus Sans L';">!!!Please replace this with your translator name!!! - !!!Please replace this with your language!!! - !!!If you like please replace this with your mail address (otherwise please remove)!!!</p></body></html>
- <html><head><meta name="qrichtext" content="1" /><style type="text/css">
+ <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-size:9pt; 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; font-family:'Nimbus Sans L';">Jan Hein Dijkstra - Nederlands - janheyn@gmail.com</p></body></html>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Nimbus Sans L';">Jan Hein Dykstra - Nederlands - janheyn@gmail.com</p></body></html>
@@ -1136,7 +1137,7 @@ p, li { white-space: pre-wrap; }
<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';"></p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Nimbus Sans L';"><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; font-family:'Nimbus Sans L';"> - for self recorded chip sounds</p></body></html>
- <html><head><meta name="qrichtext" content="1" /><style type="text/css">
+ <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-size:9pt; 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; font-family:'Nimbus Sans L';"><a href="http://commons.wikimedia.org/wiki/Main_Page"><span style=" font-weight:600; text-decoration: underline; color:#0000ff;">Wikimedia Commons</span></a></p>
@@ -1152,7 +1153,7 @@ p, li { white-space: pre-wrap; }
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Nimbus Sans L';"> - voor geluiden met GPL-licentie</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';"></p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Nimbus Sans L';"><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; font-family:'Nimbus Sans L';"> - voor zelf opgenomen geluiden van fiches</p></body></html>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Nimbus Sans L';"> - voor zelf opgenomen fichegeluiden</p></body></html>
@@ -1272,7 +1273,26 @@ p, li { white-space: pre-wrap; }
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Nimbus Sans L';"> - gui graphics design, webdesign</p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Nimbus Sans L';"> Erhard List (<a href="mailto:dunkanx@pokerth.net"><span style=" text-decoration: underline; color:#0000ff;">dunkanx@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; font-family:'Nimbus Sans L';"> - MacOS package</p></body></html>
-
+ <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-size:9pt; 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; font-family:'Nimbus Sans L';"><span style=" font-weight:600;">Projectpage: </span></p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Nimbus Sans L';"> <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; font-family:'Nimbus Sans L';"></p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Nimbus Sans L';"><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; font-family:'Nimbus Sans L';"> #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; font-family:'Nimbus Sans L';"></p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Nimbus Sans L';"><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; font-family:'Nimbus Sans L';"> 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; font-family:'Nimbus Sans L';"> - idee, basisarchitectuur, implementatie van de grafische interface, Linux-pakket</p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Nimbus Sans L';"> 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; font-family:'Nimbus Sans L';"> - idee, basisarchitectuur, ontwikkeling van de simulator</p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Nimbus Sans L';"> 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; font-family:'Nimbus Sans L';"> - basisarchitectuur, ontwikkeling van netwerkondersteuning, Windows-pakket</p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Nimbus Sans L';"> 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; font-family:'Nimbus Sans L';"> - grafisch ontwerp van de interface, webdesign</p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Nimbus Sans L';"> Erhard List (<a href="mailto:dunkanx@pokerth.net"><span style=" text-decoration: underline; color:#0000ff;">dunkanx@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; font-family:'Nimbus Sans L';"> - MacOS-pakket</p></body></html>
@@ -1280,12 +1300,12 @@ p, li { white-space: pre-wrap; }
PokerTH %1
-
+ PokerTH %1
About PokerTH %1
-
+ Info over PokerTH %1
@@ -1829,7 +1849,7 @@ p, li { white-space: pre-wrap; }
Join any game
-
+ Meedoen met willekeurig spel
@@ -2670,7 +2690,7 @@ Please go to <a href="http://www.pokerth.net/" target="_blank&
The PokerTH server does not support this version of the game.<br>Please go to <a href="http://www.pokerth.net/" target="_blank">http://www.pokerth.net</a> and download the latest version.
- De PokerTH-server ondersteunt deze versie van het spel niet.<br>Ga naar <a href="http://www.pokerth.net/" target="_blank">http://www.pokerth.net/<a/> en download de nieuwste versie.
+ De PokerTH-server ondersteunt deze versie van het spel niet.<br>Ga naar <a href="http://www.pokerth.net/" target="_blank">http://www.pokerth.net/</a> en download de nieuwste versie.
@@ -2702,12 +2722,12 @@ en teruggaan naar de lobby?
PokerTH %1 - The Open-Source Texas Holdem Engine
-
+ PokertTH %1 - De Open-Source Texas Holdem-simulator
An internal avatar error occured. Please report this to an admin in the lobby chat.
-
+ Er is een interne avatarfout opgetreden. Meld dit bij het chatten in de lobby aan een administrator.