diff --git a/data/gfx/cards/default/0.png b/data/gfx/cards/default/0.png index 7e5a6007..e77fce1a 100644 Binary files a/data/gfx/cards/default/0.png and b/data/gfx/cards/default/0.png differ diff --git a/data/gfx/cards/default/1.png b/data/gfx/cards/default/1.png index 003b3ac7..78f1e55a 100644 Binary files a/data/gfx/cards/default/1.png and b/data/gfx/cards/default/1.png differ diff --git a/data/gfx/cards/default/10.png b/data/gfx/cards/default/10.png index 60562a2c..5f52f747 100644 Binary files a/data/gfx/cards/default/10.png and b/data/gfx/cards/default/10.png differ diff --git a/data/gfx/cards/default/11.png b/data/gfx/cards/default/11.png index 1ac71691..54f23e13 100644 Binary files a/data/gfx/cards/default/11.png and b/data/gfx/cards/default/11.png differ diff --git a/data/gfx/cards/default/12.png b/data/gfx/cards/default/12.png index ce3e67eb..e4e55941 100644 Binary files a/data/gfx/cards/default/12.png and b/data/gfx/cards/default/12.png differ diff --git a/data/gfx/cards/default/13.png b/data/gfx/cards/default/13.png index 2f92e7c0..1ab3a993 100644 Binary files a/data/gfx/cards/default/13.png and b/data/gfx/cards/default/13.png differ diff --git a/data/gfx/cards/default/14.png b/data/gfx/cards/default/14.png index a85e988c..6a0e57fb 100644 Binary files a/data/gfx/cards/default/14.png and b/data/gfx/cards/default/14.png differ diff --git a/data/gfx/cards/default/15.png b/data/gfx/cards/default/15.png index fd30b245..b64e7fa8 100644 Binary files a/data/gfx/cards/default/15.png and b/data/gfx/cards/default/15.png differ diff --git a/data/gfx/cards/default/16.png b/data/gfx/cards/default/16.png index 4150a10a..b50550a2 100644 Binary files a/data/gfx/cards/default/16.png and b/data/gfx/cards/default/16.png differ diff --git a/data/gfx/cards/default/17.png b/data/gfx/cards/default/17.png index 562ec6a4..5d68562b 100644 Binary files a/data/gfx/cards/default/17.png and b/data/gfx/cards/default/17.png differ diff --git a/data/gfx/cards/default/18.png b/data/gfx/cards/default/18.png index dc7305d8..d1300139 100644 Binary files a/data/gfx/cards/default/18.png and b/data/gfx/cards/default/18.png differ diff --git a/data/gfx/cards/default/19.png b/data/gfx/cards/default/19.png index 2725637a..91167fbc 100644 Binary files a/data/gfx/cards/default/19.png and b/data/gfx/cards/default/19.png differ diff --git a/data/gfx/cards/default/2.png b/data/gfx/cards/default/2.png index 39d55f92..487a11f4 100644 Binary files a/data/gfx/cards/default/2.png and b/data/gfx/cards/default/2.png differ diff --git a/data/gfx/cards/default/20.png b/data/gfx/cards/default/20.png index 75046917..58f5ad20 100644 Binary files a/data/gfx/cards/default/20.png and b/data/gfx/cards/default/20.png differ diff --git a/data/gfx/cards/default/21.png b/data/gfx/cards/default/21.png index a23b9da8..31006bb4 100644 Binary files a/data/gfx/cards/default/21.png and b/data/gfx/cards/default/21.png differ diff --git a/data/gfx/cards/default/22.png b/data/gfx/cards/default/22.png index f4263f35..8dccb8be 100644 Binary files a/data/gfx/cards/default/22.png and b/data/gfx/cards/default/22.png differ diff --git a/data/gfx/cards/default/23.png b/data/gfx/cards/default/23.png index 478cb22c..fb8b60d5 100644 Binary files a/data/gfx/cards/default/23.png and b/data/gfx/cards/default/23.png differ diff --git a/data/gfx/cards/default/24.png b/data/gfx/cards/default/24.png index ba1624e5..3a82e286 100644 Binary files a/data/gfx/cards/default/24.png and b/data/gfx/cards/default/24.png differ diff --git a/data/gfx/cards/default/25.png b/data/gfx/cards/default/25.png index 95d22a08..c6c4aca9 100644 Binary files a/data/gfx/cards/default/25.png and b/data/gfx/cards/default/25.png differ diff --git a/data/gfx/cards/default/26.png b/data/gfx/cards/default/26.png index 8a68d2af..60c9d357 100644 Binary files a/data/gfx/cards/default/26.png and b/data/gfx/cards/default/26.png differ diff --git a/data/gfx/cards/default/27.png b/data/gfx/cards/default/27.png index 723dd1a0..443fe9f0 100644 Binary files a/data/gfx/cards/default/27.png and b/data/gfx/cards/default/27.png differ diff --git a/data/gfx/cards/default/28.png b/data/gfx/cards/default/28.png index e9836312..8fcb6275 100644 Binary files a/data/gfx/cards/default/28.png and b/data/gfx/cards/default/28.png differ diff --git a/data/gfx/cards/default/29.png b/data/gfx/cards/default/29.png index 18970542..213311a5 100644 Binary files a/data/gfx/cards/default/29.png and b/data/gfx/cards/default/29.png differ diff --git a/data/gfx/cards/default/3.png b/data/gfx/cards/default/3.png index 313fdee7..3ef61ccd 100644 Binary files a/data/gfx/cards/default/3.png and b/data/gfx/cards/default/3.png differ diff --git a/data/gfx/cards/default/30.png b/data/gfx/cards/default/30.png index 02d4f650..4bcb0f1b 100644 Binary files a/data/gfx/cards/default/30.png and b/data/gfx/cards/default/30.png differ diff --git a/data/gfx/cards/default/31.png b/data/gfx/cards/default/31.png index 413b4bb6..9f4fbb68 100644 Binary files a/data/gfx/cards/default/31.png and b/data/gfx/cards/default/31.png differ diff --git a/data/gfx/cards/default/32.png b/data/gfx/cards/default/32.png index 38167bf0..b89974a4 100644 Binary files a/data/gfx/cards/default/32.png and b/data/gfx/cards/default/32.png differ diff --git a/data/gfx/cards/default/33.png b/data/gfx/cards/default/33.png index b82b456b..e6f16185 100644 Binary files a/data/gfx/cards/default/33.png and b/data/gfx/cards/default/33.png differ diff --git a/data/gfx/cards/default/34.png b/data/gfx/cards/default/34.png index 33cef892..5fd467d4 100644 Binary files a/data/gfx/cards/default/34.png and b/data/gfx/cards/default/34.png differ diff --git a/data/gfx/cards/default/35.png b/data/gfx/cards/default/35.png index 64a7804c..25e8246f 100644 Binary files a/data/gfx/cards/default/35.png and b/data/gfx/cards/default/35.png differ diff --git a/data/gfx/cards/default/36.png b/data/gfx/cards/default/36.png index 4093bc16..fdf9050b 100644 Binary files a/data/gfx/cards/default/36.png and b/data/gfx/cards/default/36.png differ diff --git a/data/gfx/cards/default/37.png b/data/gfx/cards/default/37.png index e22a5222..bd8fa374 100644 Binary files a/data/gfx/cards/default/37.png and b/data/gfx/cards/default/37.png differ diff --git a/data/gfx/cards/default/38.png b/data/gfx/cards/default/38.png index a426e97a..4986fb66 100644 Binary files a/data/gfx/cards/default/38.png and b/data/gfx/cards/default/38.png differ diff --git a/data/gfx/cards/default/39.png b/data/gfx/cards/default/39.png index 5bfabb8a..8feeb591 100644 Binary files a/data/gfx/cards/default/39.png and b/data/gfx/cards/default/39.png differ diff --git a/data/gfx/cards/default/4.png b/data/gfx/cards/default/4.png index 4b3b81d6..c28dde78 100644 Binary files a/data/gfx/cards/default/4.png and b/data/gfx/cards/default/4.png differ diff --git a/data/gfx/cards/default/40.png b/data/gfx/cards/default/40.png index e405bdff..afc9eab2 100644 Binary files a/data/gfx/cards/default/40.png and b/data/gfx/cards/default/40.png differ diff --git a/data/gfx/cards/default/41.png b/data/gfx/cards/default/41.png index 3de30e1f..b9d34c8d 100644 Binary files a/data/gfx/cards/default/41.png and b/data/gfx/cards/default/41.png differ diff --git a/data/gfx/cards/default/42.png b/data/gfx/cards/default/42.png index de2b850d..9d53cc1d 100644 Binary files a/data/gfx/cards/default/42.png and b/data/gfx/cards/default/42.png differ diff --git a/data/gfx/cards/default/43.png b/data/gfx/cards/default/43.png index 5b0f31cc..0d8ff6d8 100644 Binary files a/data/gfx/cards/default/43.png and b/data/gfx/cards/default/43.png differ diff --git a/data/gfx/cards/default/44.png b/data/gfx/cards/default/44.png index 19a43ff4..6a4029f8 100644 Binary files a/data/gfx/cards/default/44.png and b/data/gfx/cards/default/44.png differ diff --git a/data/gfx/cards/default/45.png b/data/gfx/cards/default/45.png index 1ea3776e..5a88a911 100644 Binary files a/data/gfx/cards/default/45.png and b/data/gfx/cards/default/45.png differ diff --git a/data/gfx/cards/default/46.png b/data/gfx/cards/default/46.png index 011d838a..52f6640e 100644 Binary files a/data/gfx/cards/default/46.png and b/data/gfx/cards/default/46.png differ diff --git a/data/gfx/cards/default/47.png b/data/gfx/cards/default/47.png index 3dee21b7..1fd50bda 100644 Binary files a/data/gfx/cards/default/47.png and b/data/gfx/cards/default/47.png differ diff --git a/data/gfx/cards/default/48.png b/data/gfx/cards/default/48.png index c402b8ab..cce0f94e 100644 Binary files a/data/gfx/cards/default/48.png and b/data/gfx/cards/default/48.png differ diff --git a/data/gfx/cards/default/49.png b/data/gfx/cards/default/49.png index 98d71352..f2124dad 100644 Binary files a/data/gfx/cards/default/49.png and b/data/gfx/cards/default/49.png differ diff --git a/data/gfx/cards/default/5.png b/data/gfx/cards/default/5.png index 44aafb79..d7ee0a65 100644 Binary files a/data/gfx/cards/default/5.png and b/data/gfx/cards/default/5.png differ diff --git a/data/gfx/cards/default/50.png b/data/gfx/cards/default/50.png index 384910de..f733c763 100644 Binary files a/data/gfx/cards/default/50.png and b/data/gfx/cards/default/50.png differ diff --git a/data/gfx/cards/default/51.png b/data/gfx/cards/default/51.png index 79ab191c..be7f5fd5 100644 Binary files a/data/gfx/cards/default/51.png and b/data/gfx/cards/default/51.png differ diff --git a/data/gfx/cards/default/6.png b/data/gfx/cards/default/6.png index 2b26a363..3201d46d 100644 Binary files a/data/gfx/cards/default/6.png and b/data/gfx/cards/default/6.png differ diff --git a/data/gfx/cards/default/7.png b/data/gfx/cards/default/7.png index 3f20897a..9acfb01f 100644 Binary files a/data/gfx/cards/default/7.png and b/data/gfx/cards/default/7.png differ diff --git a/data/gfx/cards/default/8.png b/data/gfx/cards/default/8.png index d6be9d9b..ec13b6b4 100644 Binary files a/data/gfx/cards/default/8.png and b/data/gfx/cards/default/8.png differ diff --git a/data/gfx/cards/default/9.png b/data/gfx/cards/default/9.png index 232ecbbd..422a1922 100644 Binary files a/data/gfx/cards/default/9.png and b/data/gfx/cards/default/9.png differ diff --git a/data/gfx/cards/default/flipside.png b/data/gfx/cards/default/flipside.png index 19722b8b..d6fe0d28 100644 Binary files a/data/gfx/cards/default/flipside.png and b/data/gfx/cards/default/flipside.png differ diff --git a/data/gfx/gui/table/default/playerSeatActive.png b/data/gfx/gui/table/default/playerSeatActive.png new file mode 100644 index 00000000..37af3750 Binary files /dev/null and b/data/gfx/gui/table/default/playerSeatActive.png differ diff --git a/data/gfx/gui/table/default/playerSeatInactive.png b/data/gfx/gui/table/default/playerSeatInactive.png new file mode 100644 index 00000000..d6d5312a Binary files /dev/null and b/data/gfx/gui/table/default/playerSeatInactive.png differ diff --git a/src/config/configfile.cpp b/src/config/configfile.cpp index be98a318..57cab935 100644 --- a/src/config/configfile.cpp +++ b/src/config/configfile.cpp @@ -48,7 +48,7 @@ ConfigFile::ConfigFile(char *argv0, bool readonly) : noWriteAccess(readonly) myQtToolsInterface = CreateQtToolsWrapper(); // !!!! Revisionsnummer der Configdefaults !!!!! - configRev = 58; + configRev = 59; //standard defaults logOnOffDefault = "1"; @@ -231,6 +231,12 @@ ConfigFile::ConfigFile(char *argv0, bool readonly) : noWriteAccess(readonly) configList.push_back(ConfigInfo("Opponent5Avatar", CONFIG_TYPE_STRING, "")); configList.push_back(ConfigInfo("Opponent6Name", CONFIG_TYPE_STRING, "Player 6")); configList.push_back(ConfigInfo("Opponent6Avatar", CONFIG_TYPE_STRING, "")); + configList.push_back(ConfigInfo("Opponent7Name", CONFIG_TYPE_STRING, "Player 7")); + configList.push_back(ConfigInfo("Opponent7Avatar", CONFIG_TYPE_STRING, "")); + configList.push_back(ConfigInfo("Opponent8Name", CONFIG_TYPE_STRING, "Player 8")); + configList.push_back(ConfigInfo("Opponent8Avatar", CONFIG_TYPE_STRING, "")); + configList.push_back(ConfigInfo("Opponent9Name", CONFIG_TYPE_STRING, "Player 9")); + configList.push_back(ConfigInfo("Opponent9Avatar", CONFIG_TYPE_STRING, "")); configList.push_back(ConfigInfo("LogOnOff", CONFIG_TYPE_INT, logOnOffDefault)); configList.push_back(ConfigInfo("LogDir", CONFIG_TYPE_STRING, logDir)); configList.push_back(ConfigInfo("LogStoreDuration", CONFIG_TYPE_INT, "2")); diff --git a/src/game_defs.h b/src/game_defs.h index 57190be5..d912b783 100644 --- a/src/game_defs.h +++ b/src/game_defs.h @@ -21,7 +21,7 @@ #define GAME_DEFS_H #define MIN_NUMBER_OF_PLAYERS 2 -#define MAX_NUMBER_OF_PLAYERS 7 +#define MAX_NUMBER_OF_PLAYERS 10 #define MIN_GUI_SPEED 1 #define MAX_GUI_SPEED 11 diff --git a/src/gui/qt/changecompleteblindsdialog.ui b/src/gui/qt/changecompleteblindsdialog.ui index a442060a..8bd7f42c 100644 --- a/src/gui/qt/changecompleteblindsdialog.ui +++ b/src/gui/qt/changecompleteblindsdialog.ui @@ -1,7 +1,8 @@ - + + changeCompleteBlindsDialog - - + + 0 0 @@ -9,99 +10,99 @@ 397 - + Change Blinds Settings - - - + + + - - + + First small blind: - - + + 5 - + 500 - - - + + + Raise blinds: - - + + 9 - + 0 - + 9 - - - + + + Every: - + true - - - + + + 1 - - - - + + + + 0 0 - + hands - - - + + + Every: - - - + + + 1 - - - - + + + + 0 0 - + minutes @@ -109,34 +110,34 @@ - - - - + + + + 0 0 - + Raise mode: - - + + 0 - - - + + + Always double blinds - + true - - - + + + Manual blinds order: @@ -144,36 +145,36 @@ - - - + + + false - + Manual blinds order: - - - - + + + + 4 - - + + - - - + + + Delete - + - + Qt::Vertical - + 20 121 @@ -181,28 +182,28 @@ - - - - 9999 + + + + 100000 - - - + + + Add - + - + Qt::Vertical - + 20 40 @@ -210,53 +211,53 @@ - - - + + + Afterwards: - - + + 0 - - - + + + Always double blinds - + true - - + + - - + + Always raise by: - - - 9999 + + + 10000 - - + + $ - - - + + + Keep last blind @@ -267,13 +268,13 @@ - - - + + + Qt::Horizontal - - QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok @@ -305,11 +306,11 @@ changeCompleteBlindsDialog accept() - + 237 387 - + 157 274 @@ -321,11 +322,11 @@ changeCompleteBlindsDialog reject() - + 279 387 - + 286 274 @@ -337,11 +338,11 @@ spinBox_afterThisAlwaysRaiseValue setEnabled(bool) - + 327 302 - + 389 304 @@ -353,11 +354,11 @@ groupBox_2 setEnabled(bool) - + 297 116 - + 306 164 diff --git a/src/gui/qt/createinternetgamedialog.ui b/src/gui/qt/createinternetgamedialog.ui index 535dbd56..c9a777e9 100644 --- a/src/gui/qt/createinternetgamedialog.ui +++ b/src/gui/qt/createinternetgamedialog.ui @@ -1,119 +1,108 @@ - + + createInternetGameDialog - - + + 0 0 - 275 - 291 + 302 + 329 - + Create Internet Game - - + + 9 - - 9 - - - 9 - - - 9 - - + 6 - - 6 - - - - + + + Internet Game Settings - - - - + + + + Maximum number of players: - + spinBox_quantityPlayers - - - + + + 2 - - 7 + + 10 - - 7 + + 10 - - - + + + Start Cash: - + spinBox_startCash - - - + + + - + $ - + 1000 - - 5000 + + 1000000 - + 50 - + 2000 - - - + + + Blinds - - + + 0 - - - + + + Use saved blinds settings - + true - - - + + + Change blinds settings ... @@ -121,85 +110,76 @@ - - - + + + Game Speed for computer opponents: - + spinBox_gameSpeed - - - + + + 1 - + 11 - + 4 - - - + + + Timeout for player action: - + spinBox_netTimeOutPlayerAction - - - + + + s - + 5 - + 60 - + 20 - - - + + + 6 - - 0 - - - 0 - - - 0 - - + 0 - - + + Password: - - + + false - + QLineEdit::Password @@ -209,29 +189,20 @@ - - - + + + 6 - - 0 - - - 0 - - - 0 - - + 0 - + Qt::Horizontal - + 181 20 @@ -240,15 +211,15 @@ - - + + Create Game - - + + Cancel @@ -277,11 +248,11 @@ createInternetGameDialog accept() - + 205 294 - + 87 215 @@ -293,11 +264,11 @@ createInternetGameDialog reject() - + 286 294 - + 288 190 @@ -309,11 +280,11 @@ lineEdit_Password setEnabled(bool) - + 76 239 - + 146 235 diff --git a/src/gui/qt/createnetworkgamedialog.ui b/src/gui/qt/createnetworkgamedialog.ui index bb6709fa..b67237c2 100644 --- a/src/gui/qt/createnetworkgamedialog.ui +++ b/src/gui/qt/createnetworkgamedialog.ui @@ -1,101 +1,102 @@ - + + createNetworkGameDialog - - + + 0 0 - 275 - 263 + 302 + 302 - + Create Network Game - - - - + + + + Network Game Settings - - + + 9 - - - + + + Maximum number of players: - + spinBox_quantityPlayers - - - + + + 2 - - 7 + + 10 - - 7 + + 10 - - - + + + Start Cash: - + spinBox_startCash - - - + + + - + $ - + 1000 - - 5000 + + 1000000 - + 2000 - - - + + + Blinds - - + + 0 - - - + + + Use saved blinds settings - + true - - - + + + Change blinds settings ... @@ -103,51 +104,51 @@ - - - + + + Game Speed for computer opponents: - + spinBox_gameSpeed - - - + + + 1 - + 11 - + 4 - - - + + + Timeout for player action: - + spinBox_netTimeOutPlayerAction - - - + + + s - + 5 - + 60 - + 20 @@ -155,29 +156,20 @@ - - - + + + 6 - - 0 - - - 0 - - - 0 - - + 0 - + Qt::Horizontal - + 181 20 @@ -186,15 +178,15 @@ - - + + Create Game - - + + Cancel @@ -221,11 +213,11 @@ createNetworkGameDialog accept() - + 223 292 - + 87 215 @@ -237,11 +229,11 @@ createNetworkGameDialog reject() - + 304 292 - + 288 190 diff --git a/src/gui/qt/gametable.ui b/src/gui/qt/gametable.ui index 8453ac58..28675c4e 100644 --- a/src/gui/qt/gametable.ui +++ b/src/gui/qt/gametable.ui @@ -1,1145 +1,1517 @@ - + + gameTable - - + + 0 0 - 1000 - 680 + 1024 + 600 - + - 1000 - 680 + 1024 + 600 - + 1920 1280 - + false - + PokerTH 0.6-beta - The Open-Source Texas Holdem Engine - - - - + + QStatusbar { height:0px; } + + + + + 2 + + + 0 + + + 2 + + + 3 + + + 0 + + + + + 0 + - - - Qt::Horizontal + + + Qt::Vertical - + - 40 - 20 + 20 + 17 - - - - - Qt::Vertical - - - - 221 - 36 - - - - - - - - - 223 - 185 - - - - - 223 - 185 - - - - - - - - - 17 - 70 - 50 - 34 - - - - QFrame::NoFrame - - - QFrame::Raised - - - - 0 - - - 0 - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - - - - - 22 - 123 - 40 - 40 - - - - QFrame::Raised - - - - 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 - - - - - - - - Qt::Vertical - - - - 221 - 36 - - - - - + + + + 190 + 142 + + + + + 190 + 142 + + + + + + + + + 13 + 13 + 50 + 50 + + + + + 50 + 50 + + + + + 50 + 50 + + + + true + + + + + + 70 + 11 + 104 + 14 + + + + + 0 + 14 + + + + + 16777215 + 14 + + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + + + + 70 + 119 + 104 + 14 + + + + + 0 + 14 + + + + + 16777215 + 14 + + + + Qt::AlignBottom|Qt::AlignHCenter + + + + + + 70 + 25 + 104 + 14 + + + + + 35 + 14 + + + + + 16777215 + 14 + + + + + + + 18 + 88 + 40 + 42 + + + + + 40 + 42 + + + + + 40 + 42 + + + + + + + true + + + + + + 86 + 39 + 48 + 76 + + + + true + + + + + + 110 + 39 + 48 + 76 + + + + true + + + + + + 67 + 55 + 111 + 40 + + + + + 0 + 20 + + + + + + + Qt::AlignCenter + + + - - - Qt::Horizontal + + + Qt::Vertical - - QSizePolicy::Expanding - - + - 40 - 20 + 20 + 13 - - - - - - 223 - 185 - - - - - 223 - 185 - - - - - - - - - 17 - 70 - 50 - 34 - - - - - 0 - - - 0 - - - - - - 35 - 0 - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - 35 - 0 - - - - - - - - - - 22 - 123 - 40 - 40 - - - - - 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 - - - - - - - - Qt::Vertical - - - - 151 - 90 - - - - - - - - - - Qt::Horizontal - - + + - 40 - 20 + 190 + 142 - - - - - - - - - 223 - 185 - - - - - 223 - 185 - - - - - - - - - 85 - 40 - 118 - 111 - - - - - - 9 - 35 - 100 - 40 - - - - - 0 - 20 - - - - - - - Qt::AlignCenter - - - - - - 0 - 0 - 80 - 111 - - - - true - - - - - - 39 - 0 - 80 - 111 - - - - true - - - - - - - 17 - 70 - 50 - 34 - - - - - 0 - - - 0 - - - - - - 35 - 0 - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - 35 - 0 - - - - - - - - - - 22 - 123 - 40 - 40 - - - - - 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 - - - - 21 - 81 - - - - - - - - - - Qt::Horizontal - - + - 40 - 20 + 190 + 142 - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - 223 - 185 - - - - - 223 - 185 - - - - - - - - - 17 - 70 - 50 - 34 - - - - - 0 - - - 0 - - - - - - 35 - 0 - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - 35 - 0 - - - - - - - - - - 22 - 123 - 40 - 40 - - - - - 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 - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - - Qt::Horizontal + + - + + + + 13 + 79 + 50 + 50 + + + + + 50 + 50 + + + + + 50 + 50 + + + + true + + + + + + 70 + 117 + 104 + 14 + + + + + 0 + 14 + + + + + 16777215 + 14 + + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + + + + 70 + 10 + 104 + 14 + + + + + 0 + 14 + + + + + 16777215 + 14 + + + + Qt::AlignBottom|Qt::AlignHCenter + + + + + + 70 + 104 + 104 + 14 + + + + + 35 + 14 + + + + + 16777215 + 14 + + + + + + + 18 + 16 + 40 + 42 + + + + + 40 + 42 + + + + + 40 + 42 + + + + + + + true + + + + + + 86 + 26 + 48 + 76 + + + + true + + + + + + 110 + 26 + 48 + 76 + + + + true + + + + + + 67 + 42 + 111 + 40 + + + + + 0 + 20 + + + + + + + Qt::AlignCenter + + + + + + + + Qt::Vertical + + - 40 - 20 + 20 + 18 - - - - 0 - - + + + 0 - - - 6 + + + + 190 + 142 + - - 0 + + + 190 + 142 + - - - - - 223 - 185 - - - - - 223 - 185 - - - - - - - - - 22 - 123 - 40 - 40 - - - - - 0 - - - 0 - - - - - - - - true - - - - - - - - - 17 - 70 - 50 - 34 - - - - - 0 - - - 0 - - - - - - 35 - 0 - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - 35 - 0 - - - - - - - - - - 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 - - - - - + + + + + + + 13 + 13 + 50 + 50 + + + + + 50 + 50 + + + + + 50 + 50 + + + + true + + + + + + 70 + 11 + 104 + 14 + + + + + 0 + 14 + + + + + 16777215 + 14 + + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + + + + 70 + 119 + 104 + 14 + + + + + 0 + 14 + + + + + 16777215 + 14 + + + + Qt::AlignBottom|Qt::AlignHCenter + + + + + + 70 + 25 + 104 + 14 + + + + + 35 + 14 + + + + + 16777215 + 14 + + + + + + + 18 + 88 + 40 + 42 + + + + + 40 + 42 + + + + + 40 + 42 + + + + + + + true + + + + + + 86 + 39 + 48 + 76 + + + + true + + + + + + 110 + 39 + 48 + 76 + + + + true + + + + + + 67 + 55 + 111 + 40 + + + + + 0 + 20 + + + + + + + Qt::AlignCenter + + + - - + + + + 190 + 142 + + + + + 190 + 142 + + + + + + + + + 13 + 13 + 50 + 50 + + + + + 50 + 50 + + + + + 50 + 50 + + + + true + + + + + + 70 + 11 + 104 + 14 + + + + + 0 + 14 + + + + + 16777215 + 14 + + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + + + + 70 + 119 + 104 + 14 + + + + + 0 + 14 + + + + + 16777215 + 14 + + + + Qt::AlignBottom|Qt::AlignHCenter + + + + + + 70 + 25 + 104 + 14 + + + + + 35 + 14 + + + + + 16777215 + 14 + + + + + + + 18 + 88 + 40 + 42 + + + + + 40 + 42 + + + + + 40 + 42 + + + + + + + true + + + + + + 86 + 39 + 48 + 76 + + + + true + + + + + + 110 + 39 + 48 + 76 + + + + true + + + + + + 67 + 55 + 111 + 40 + + + + + 0 + 20 + + + + + + + Qt::AlignCenter + + + + + + + + + 190 + 142 + + + + + 190 + 142 + + + + + + + + + 13 + 13 + 50 + 50 + + + + + 50 + 50 + + + + + 50 + 50 + + + + true + + + + + + 70 + 11 + 104 + 14 + + + + + 0 + 14 + + + + + 16777215 + 14 + + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + + + + 70 + 119 + 104 + 14 + + + + + 0 + 14 + + + + + 16777215 + 14 + + + + Qt::AlignBottom|Qt::AlignHCenter + + + + + + 70 + 25 + 104 + 14 + + + + + 35 + 14 + + + + + 16777215 + 14 + + + + + + + 18 + 88 + 40 + 42 + + + + + 40 + 42 + + + + + 40 + 42 + + + + + + + true + + + + + + 86 + 39 + 48 + 76 + + + + true + + + + + + 110 + 39 + 48 + 76 + + + + true + + + + + + 67 + 55 + 111 + 40 + + + + + 0 + 20 + + + + + + + Qt::AlignCenter + + + + + + + + + + 0 + + + + + Qt::Vertical + + + + 20 + 13 + + + + + + + + + 190 + 142 + + + + + 190 + 142 + + + + + + + + + 13 + 13 + 50 + 50 + + + + + 50 + 50 + + + + + 50 + 50 + + + + true + + + + + + 70 + 11 + 104 + 14 + + + + + 0 + 14 + + + + + 16777215 + 14 + + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + + + + 70 + 119 + 104 + 14 + + + + + 0 + 14 + + + + + 16777215 + 14 + + + + Qt::AlignBottom|Qt::AlignHCenter + + + + + + 70 + 25 + 104 + 14 + + + + + 35 + 14 + + + + + 16777215 + 14 + + + + + + + 18 + 88 + 40 + 42 + + + + + 40 + 42 + + + + + 40 + 42 + + + + + + + true + + + + + + 86 + 39 + 48 + 76 + + + + true + + + + + + 110 + 39 + 48 + 76 + + + + true + + + + + + 67 + 55 + 111 + 40 + + + + + 0 + 20 + + + + + + + Qt::AlignCenter + + + + + + + + Qt::Vertical + + + + 20 + 28 + + + + + + + + + 190 + 142 + + + + + 190 + 142 + + + + + + + + + 13 + 79 + 50 + 50 + + + + + 50 + 50 + + + + + 50 + 50 + + + + true + + + + + + 70 + 117 + 104 + 14 + + + + + 0 + 14 + + + + + 16777215 + 14 + + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + + + + 70 + 10 + 104 + 14 + + + + + 0 + 14 + + + + + 16777215 + 14 + + + + Qt::AlignBottom|Qt::AlignHCenter + + + + + + 70 + 104 + 104 + 12 + + + + + 35 + 12 + + + + + 16777215 + 12 + + + + + + + 18 + 16 + 40 + 42 + + + + + 40 + 42 + + + + + 40 + 42 + + + + + + + true + + + + + + 86 + 26 + 48 + 76 + + + + true + + + + + + 110 + 26 + 48 + 76 + + + + true + + + + + + 67 + 40 + 111 + 40 + + + + + 0 + 20 + + + + + + + Qt::AlignCenter + + + + + + + + Qt::Vertical + + + + 20 + 18 + + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + Qt::Horizontal - + 40 20 @@ -1148,304 +1520,303 @@ - - - + + + 0 0 - + - 460 - 185 + 535 + 94 - + - 460 - 185 + 520 + 94 - - + + QGroupBox {border-style:none;} + + + - 374 - 25 + 440 + 42 85 - 34 + 36 - + 85 0 - + 85 16777215 - - + + 0 - + + 2 + + 0 - - + + - - - - - - + + + - + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - + + + - + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + - - + + - 170 - 0 - 121 - 57 + 0 + 15 + 120 + 62 - - + + + 4 + + 0 - - 0 - - - - + + + + + + + Qt::AlignCenter + + + + + + 0 - + + 2 + + 0 - - - - - - - Qt::AlignCenter + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - 0 + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - 0 + + + + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - + - - + + - 3 - 35 - 111 + 440 + 15 + 91 22 - + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - + + - 0 - 60 - 90 - 124 + 140 + 5 + 54 + 82 - + true - - + + - 89 - 60 - 90 - 124 + 195 + 5 + 54 + 82 - + true - - + + - 178 - 60 - 90 - 124 + 250 + 5 + 54 + 82 - + true - - + + - 274 - 60 - 90 - 124 + 305 + 5 + 54 + 82 - + true - - + + - 370 - 60 - 90 - 124 + 360 + 5 + 54 + 82 - + true - - + + - 6 - 64 - 79 - 114 + 143 + 8 + 48 + 76 - + true - - + + - 95 - 64 - 79 - 114 + 198 + 8 + 48 + 76 - + true - - + + - 184 - 64 - 79 - 114 + 253 + 8 + 48 + 76 - + true - - + + - 280 - 64 - 79 - 114 + 308 + 8 + 48 + 76 - + true - - + + - 376 - 64 - 79 - 114 + 363 + 8 + 48 + 76 - + true - - + + Qt::Horizontal - + 40 20 @@ -1453,228 +1824,623 @@ - - - - 6 - - - 0 - - - - - - 223 - 185 - - - - - 223 - 185 - - - - - - - - - 17 - 70 - 50 - 34 - - - - - 0 - - - 0 - - - - - - 35 - 0 - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - 35 - 0 - - - - - - - - - - 22 - 123 - 40 - 40 - - - - - 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 - - - - - - - - - + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + 0 - - + + + + 190 + 142 + + + + + 190 + 142 + + + + + + + + + 13 + 79 + 50 + 50 + + + + + 50 + 50 + + + + + 50 + 50 + + + + true + + + + + + 70 + 117 + 104 + 14 + + + + + 0 + 14 + + + + + 16777215 + 14 + + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + + + + 70 + 10 + 104 + 14 + + + + + 0 + 14 + + + + + 16777215 + 14 + + + + Qt::AlignBottom|Qt::AlignHCenter + + + + + + 70 + 104 + 104 + 14 + + + + + 35 + 14 + + + + + 16777215 + 14 + + + + + + + 18 + 16 + 40 + 42 + + + + + 40 + 42 + + + + + 40 + 42 + + + + + + + true + + + + + + 86 + 26 + 48 + 76 + + + + true + + + + + + 110 + 26 + 48 + 76 + + + + true + + + + + + 67 + 42 + 111 + 40 + + + + + 0 + 20 + + + + + + + Qt::AlignCenter + + + + + + + + + 190 + 142 + + + + + 190 + 142 + + + + + + + + + 13 + 79 + 50 + 50 + + + + + 50 + 50 + + + + + 50 + 50 + + + + true + + + + + + 70 + 117 + 104 + 14 + + + + + 0 + 14 + + + + + 16777215 + 14 + + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + + + + 70 + 10 + 104 + 14 + + + + + 0 + 14 + + + + + 16777215 + 14 + + + + Qt::AlignBottom|Qt::AlignHCenter + + + + + + 70 + 104 + 104 + 12 + + + + + 35 + 12 + + + + + 16777215 + 12 + + + + + + + 18 + 16 + 40 + 42 + + + + + 40 + 42 + + + + + 40 + 42 + + + + + + + true + + + + + + 86 + 26 + 48 + 76 + + + + true + + + + + + 110 + 26 + 48 + 76 + + + + true + + + + + + 67 + 42 + 111 + 40 + + + + + 0 + 20 + + + + + + + Qt::AlignCenter + + + + + + + + + 190 + 142 + + + + + 190 + 142 + + + + + + + + + 13 + 79 + 50 + 50 + + + + + 50 + 50 + + + + + 50 + 50 + + + + true + + + + + + 70 + 117 + 104 + 14 + + + + + 0 + 14 + + + + + 16777215 + 14 + + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + + + + 70 + 10 + 104 + 14 + + + + + 0 + 14 + + + + + 16777215 + 14 + + + + Qt::AlignBottom|Qt::AlignHCenter + + + + + + 70 + 104 + 104 + 12 + + + + + 35 + 12 + + + + + 16777215 + 12 + + + + + + + 18 + 16 + 40 + 42 + + + + + 40 + 42 + + + + + 40 + 42 + + + + + + + true + + + + + + 86 + 26 + 48 + 76 + + + + true + + + + + + 110 + 26 + 48 + 76 + + + + true + + + + + + 67 + 40 + 111 + 40 + + + + + 0 + 20 + + + + + + + Qt::AlignCenter + + + + + + + + + + + 0 - + 0 - + Qt::Horizontal - + QSizePolicy::Fixed - + 260 0 @@ -1684,13 +2450,13 @@ - + Qt::Vertical - + QSizePolicy::Expanding - + 0 0 @@ -1699,123 +2465,120 @@ - - + + 260 - 195 + 190 - + 260 - 195 + 190 - - - 6 + + + 4 - - 1 - - - - + + + Qt::NoFocus - + 0 - - + + Hands - - + + 0 - + 0 - - - + + + Qt::AlignCenter - - + + Chat - - + + 0 - + 0 - - - + + + Qt::NoFocus - + true - + Qt::ScrollBarAlwaysOff - - + + - - + + Kick - - + + 0 - - -1 + + 6 - + 5 - - - + + + 0 - - + + 5 - - + + Vote started by: - - - + + + 0 0 - + @@ -1823,26 +2586,26 @@ - - + + 5 - - + + Vote Timeout: - - - + + + 0 0 - + @@ -1851,62 +2614,62 @@ - - - - + + + + 0 0 - + - - + + - - + + 80 20 - + Yes - - + + 80 20 - + No - - - + + + - - - + + + Qt::Vertical - + 20 27 @@ -1925,657 +2688,351 @@ - + Qt::Horizontal - + QSizePolicy::MinimumExpanding - + - 41 - 197 + 170 + 180 - - - - - Qt::Vertical - - - - 321 - 20 - - - - - - - - true - - - - 0 - 0 - - - - - 384 - 211 - - - - - 384 - 211 - - - - - - - - 28 + + + true + + + + 0 + 0 + + + + + 0 + 186 + + + + + 140 + 186 + + + + QGroupBox {border-style:none;} + + + + + + + 0 + + + 1 + + + 0 + + + + + 2 - - 28 - - - 25 - - - 22 - - - 11 - - - 0 - - - - - 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 - - - - - 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 - - - - - 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 - - - - - - - - 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 + 21 - + 16777215 - 22 + 21 - - Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft + + + + + + + 50 + 21 + + + + + 50 + 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 + + + + + + + + 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::Vertical + + + + 20 + 40 + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + - + Qt::Horizontal - + QSizePolicy::MinimumExpanding - + - 31 - 197 + 170 + 180 - - + + 0 - + 0 - + Qt::Horizontal - + QSizePolicy::Fixed - + 260 0 @@ -2585,13 +3042,13 @@ - + Qt::Vertical - + QSizePolicy::Expanding - + 0 0 @@ -2600,107 +3057,107 @@ - - + + 260 - 195 + 190 - + 260 - 195 + 190 - - + + 1 - + 2 - - 6 + + 4 - - - + + + Qt::NoFocus - + 0 - - + + Log - - + + 0 - + 0 - - - + + + Qt::NoFocus - + true - + Qt::ScrollBarAlwaysOff - - + + Away - - - - + + + + Qt::NoFocus - + Manual Action (default) - + true - - - + + + Qt::NoFocus - + Auto-Check / Auto-Fold - - - + + + Qt::NoFocus - + Auto-Check / Auto-Call-Any - + - + Qt::Vertical - + 20 40 @@ -2710,20 +3167,20 @@ - - + + Chance - - + + 2 - + 0 - - - + + + @@ -2732,31 +3189,31 @@ - - - + + + 6 - + 0 - - + + - - - + + + 240 240 240 - - - + + + 240 240 240 @@ -2765,18 +3222,18 @@ - - - + + + 240 240 240 - - - + + + 240 240 240 @@ -2785,18 +3242,18 @@ - - - + + + 128 128 128 - - - + + + 199 199 199 @@ -2806,34 +3263,34 @@ - + Speed: - - + + 18 0 - + - - - + + + 240 240 240 - - - + + + 240 240 240 @@ -2842,18 +3299,18 @@ - - - + + + 240 240 240 - - - + + + 240 240 240 @@ -2862,18 +3319,18 @@ - - - + + + 128 128 128 - - - + + + 199 199 199 @@ -2883,43 +3340,43 @@ - + - - - + + + 0 0 - + - - - + + + 102 153 0 - - - + + + 255 255 255 - - - + + + 40 100 0 @@ -2928,27 +3385,27 @@ - - - + + + 102 153 0 - - - + + + 255 255 255 - - - + + + 40 100 0 @@ -2957,27 +3414,27 @@ - - - + + + 102 153 0 - - - + + + 40 100 0 - - - + + + 40 100 0 @@ -2987,32 +3444,32 @@ - + Qt::NoFocus - + 1 - + 11 - + Qt::Horizontal - - + + true - + 40 20 - + Qt::NoFocus @@ -3028,163 +3485,162 @@ - - + + 0 0 - 1000 - 30 + 1024 + 25 - - + + View - - - - - - - + + + + + + + - - + + Settings - + - - + + - - - + + Start Local Game ... - + Ctrl+N - - + + Quit - + Ctrl+Q - - + + About PokerTH ... - - + + Settings ... - - + + Create Network Game ... - + Ctrl+O - - + + Join Network Game ... - + Ctrl+J - - - + + + :/gfx/view-fullscreen.png:/gfx/view-fullscreen.png - + Fullscreen - + Ctrl+F - - + + Show/Hide Chat Window - + Ctrl+T - - + + Show/Hide Hands Window - + Show/Hide Hands Window - + Show/Hide Hands Window - + Ctrl+H - - + + Show/Hide Log Window - + Ctrl+L - - + + Internet Game ... - + Ctrl+I - - + + Show/Hide Away Window - + Ctrl+A - - - + + + :/gfx/systemsettings.png:/gfx/systemsettings.png - + Configure PokerTH ... - - - + + + :/gfx/application_exit.png:/gfx/application_exit.png - + Close - + Ctrl+X - - + + Show/Hide Chance Window - + Ctrl+C @@ -3229,7 +3685,7 @@ - + @@ -3238,11 +3694,11 @@ label_speedValue setNum(int) - + 886 624 - + 800 638 diff --git a/src/gui/qt/gametable/gametableimpl.cpp b/src/gui/qt/gametable/gametableimpl.cpp index 681d57ce..4a328191 100755 --- a/src/gui/qt/gametable/gametableimpl.cpp +++ b/src/gui/qt/gametable/gametableimpl.cpp @@ -200,6 +200,9 @@ gameTableImpl::gameTableImpl(ConfigFile *c, QMainWindow *parent) buttonLabelArray[4] = textLabel_Button4; buttonLabelArray[5] = textLabel_Button5; buttonLabelArray[6] = textLabel_Button6; + buttonLabelArray[7] = textLabel_Button7; + buttonLabelArray[8] = textLabel_Button8; + buttonLabelArray[9] = textLabel_Button9; // cashLabelArray init cashLabelArray[0] = textLabel_Cash0; @@ -209,15 +212,9 @@ gameTableImpl::gameTableImpl(ConfigFile *c, QMainWindow *parent) cashLabelArray[4] = textLabel_Cash4; cashLabelArray[5] = textLabel_Cash5; cashLabelArray[6] = textLabel_Cash6; - - // cashTopLabelArray init - cashTopLabelArray[0] = textLabel_TopCash0; - cashTopLabelArray[1] = textLabel_TopCash1; - cashTopLabelArray[2] = textLabel_TopCash2; - cashTopLabelArray[3] = textLabel_TopCash3; - cashTopLabelArray[4] = textLabel_TopCash4; - cashTopLabelArray[5] = textLabel_TopCash5; - cashTopLabelArray[6] = textLabel_TopCash6; + cashLabelArray[7] = textLabel_Cash7; + cashLabelArray[8] = textLabel_Cash8; + cashLabelArray[9] = textLabel_Cash9; // playerNameLabelArray init playerNameLabelArray[0] = label_PlayerName0; @@ -227,6 +224,9 @@ gameTableImpl::gameTableImpl(ConfigFile *c, QMainWindow *parent) playerNameLabelArray[4] = label_PlayerName4; playerNameLabelArray[5] = label_PlayerName5; playerNameLabelArray[6] = label_PlayerName6; + playerNameLabelArray[7] = label_PlayerName7; + playerNameLabelArray[8] = label_PlayerName8; + playerNameLabelArray[9] = label_PlayerName9; // playerAvatarLabelArray init playerAvatarLabelArray[0] = label_Avatar0; @@ -236,6 +236,9 @@ gameTableImpl::gameTableImpl(ConfigFile *c, QMainWindow *parent) playerAvatarLabelArray[4] = label_Avatar4; playerAvatarLabelArray[5] = label_Avatar5; playerAvatarLabelArray[6] = label_Avatar6; + playerAvatarLabelArray[7] = label_Avatar7; + playerAvatarLabelArray[8] = label_Avatar8; + playerAvatarLabelArray[9] = label_Avatar9; for (i=0; isetMyW(this); playerAvatarLabelArray[i]->setMyId(i); @@ -249,6 +252,9 @@ gameTableImpl::gameTableImpl(ConfigFile *c, QMainWindow *parent) setLabelArray[4] = textLabel_Set4; setLabelArray[5] = textLabel_Set5; setLabelArray[6] = textLabel_Set6; + setLabelArray[7] = textLabel_Set7; + setLabelArray[8] = textLabel_Set8; + setLabelArray[9] = textLabel_Set9; for (i=0; isetMyW(this); } // statusLabelArray init @@ -259,6 +265,9 @@ gameTableImpl::gameTableImpl(ConfigFile *c, QMainWindow *parent) actionLabelArray[4] = textLabel_Status4; actionLabelArray[5] = textLabel_Status5; actionLabelArray[6] = textLabel_Status6; + actionLabelArray[7] = textLabel_Status7; + actionLabelArray[8] = textLabel_Status8; + actionLabelArray[9] = textLabel_Status9; textLabel_Status0->setMyW(this); @@ -270,6 +279,9 @@ gameTableImpl::gameTableImpl(ConfigFile *c, QMainWindow *parent) groupBoxArray[4] = groupBox4; groupBoxArray[5] = groupBox5; groupBoxArray[6] = groupBox6; + groupBoxArray[7] = groupBox7; + groupBoxArray[8] = groupBox8; + groupBoxArray[9] = groupBox9; // boardCardsArray init boardCardsArray[0] = pixmapLabel_cardBoard0; @@ -293,6 +305,12 @@ gameTableImpl::gameTableImpl(ConfigFile *c, QMainWindow *parent) holeCardsArray[5][1] = pixmapLabel_card5b; holeCardsArray[6][0] = pixmapLabel_card6a; holeCardsArray[6][1] = pixmapLabel_card6b; + holeCardsArray[7][0] = pixmapLabel_card7a; + holeCardsArray[7][1] = pixmapLabel_card7b; + holeCardsArray[8][0] = pixmapLabel_card8a; + holeCardsArray[8][1] = pixmapLabel_card8b; + holeCardsArray[9][0] = pixmapLabel_card9a; + holeCardsArray[9][1] = pixmapLabel_card9b; // Farben initalisieren active.setRgb(86,170,86); @@ -307,8 +325,8 @@ gameTableImpl::gameTableImpl(ConfigFile *c, QMainWindow *parent) font2String = "font-family: \"Nimbus Sans L\";"; QString textBrowserFontsize= "11"; QString cashFontSize = "11"; - QString setLabelFontSize = "13"; - QString playerNameLabelFontSize = "14"; + QString setLabelFontSize = "11"; + QString playerNameLabelFontSize = "11"; QString mediumTableFontSize = "13"; QString handLabelFontSize = "18"; QString labelPotFontSize = "19"; @@ -324,8 +342,8 @@ gameTableImpl::gameTableImpl(ConfigFile *c, QMainWindow *parent) #endif QString textBrowserFontsize= "10"; QString cashFontSize = "10"; - QString setLabelFontSize = "12"; - QString playerNameLabelFontSize = "13"; + QString setLabelFontSize = "10"; + QString playerNameLabelFontSize = "11"; QString mediumTableFontSize = "13"; QString handLabelFontSize = "17"; QString labelPotFontSize = "18"; @@ -347,23 +365,13 @@ gameTableImpl::gameTableImpl(ConfigFile *c, QMainWindow *parent) // tabWidget_Left->setStyleSheet("QTabWidget::pane { border: 1px solid #286400; border-radius: 2px; background-color: #145300; }"); #endif - - for (i=0; isetStyleSheet("QLabel { "+ font2String +" font-size: "+cashFontSize+"px; font-weight: bold; color: #F0F0F0; }"); - cashLabelArray[i]->setStyleSheet("QLabel { "+ font2String +" font-size: "+cashFontSize+"px; font-weight: bold; color: #F0F0F0; }"); - } - - for (i=0; isetStyleSheet("QLabel { "+ font2String +" font-size: "+setLabelFontSize+"px; font-weight: bold; color: #F0F0F0; }"); - } - for (i=0; isetStyleSheet("QLabel { "+ font2String +" font-size: "+cashFontSize+"px; font-weight: bold; color: #FFFF00; }"); + setLabelArray[i]->setStyleSheet("QLabel { "+ font2String +" font-size: "+setLabelFontSize+"px; font-weight: bold; color: #FFFF00; }"); playerNameLabelArray[i]->setStyleSheet("QLabel { "+ font2String +" font-size: "+playerNameLabelFontSize+"px; font-weight: bold; color: #F0F0F0; }"); } - + label_Sets->setStyleSheet("QLabel { "+ font2String +" font-size: "+mediumTableFontSize+"px; font-weight: bold; color: #669900; }"); label_Total->setStyleSheet("QLabel { "+ font2String +" font-size: "+mediumTableFontSize+"px; font-weight: bold; color: #669900; }"); textLabel_Sets->setStyleSheet("QLabel { "+ font2String +" font-size: "+mediumTableFontSize+"px; font-weight: bold; color: #669900; }"); @@ -404,15 +412,13 @@ gameTableImpl::gameTableImpl(ConfigFile *c, QMainWindow *parent) label_voteStarterNick->setStyleSheet("QLabel { color: #99D500; font-size: 11px;}"); label_votestartedby->setStyleSheet("QLabel { color: #99D500; font-size: 11px;}"); - statusbar->setStyleSheet(" QStatusBar { "+ font1String +" font-size: 12px; color: #B7FF00; }"); +// statusbar->setStyleSheet(" QStatusBar { "+ font1String +" font-size: 12px; color: #B7FF00; }"); //Groupbox Background - for (i=1; isetStyleSheet("QGroupBox { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/opponentBoxInactiveGlow.png) }"); + groupBoxArray[i]->setStyleSheet("QGroupBox { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playerSeatInactive.png) }"); } - groupBoxArray[0]->setStyleSheet("QGroupBox { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playerBoxInactiveGlow_0.6.png) }"); - //Human player button pushButton_BetRaise->setStyleSheet("QPushButton { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_green.png); "+ font2String +" font-size: "+humanPlayerButtonFontSize+"px; font-weight: bold; color: #F0F0F0;} QPushButton:unchecked { background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_green.png); } QPushButton:checked { background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_green_checked.png);} QPushButton:hover { background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_green_hover.png); } QPushButton:checked:hover { background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_green_checked_hover.png);}"); pushButton_CallCheck->setStyleSheet("QPushButton { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_blue.png); "+ font2String +" font-size: "+humanPlayerButtonFontSize+"px; font-weight: bold; color: #F0F0F0;} QPushButton:unchecked { background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_blue.png); } QPushButton:checked { background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_blue_checked.png);} QPushButton:hover { background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_blue_hover.png); } QPushButton:checked:hover { background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_blue_checked_hover.png);}"); @@ -469,9 +475,9 @@ gameTableImpl::gameTableImpl(ConfigFile *c, QMainWindow *parent) if(myConfig->readConfigInt("ShowStatusbarMessages")) { #ifdef __APPLE__ - statusBar()->showMessage(tr("Cmd+N to start a new game")); +// statusBar()->showMessage(tr("Cmd+N to start a new game")); #else - statusBar()->showMessage(tr("Ctrl+N to start a new game")); +// statusBar()->showMessage(tr("Ctrl+N to start a new game")); #endif } @@ -641,6 +647,9 @@ void gameTableImpl::applySettings(settingsDialogImpl* mySettingsDialog) { (*(++it))->setMyName(mySettingsDialog->lineEdit_Opponent4Name->text().toUtf8().constData()); (*(++it))->setMyName(mySettingsDialog->lineEdit_Opponent5Name->text().toUtf8().constData()); (*(++it))->setMyName(mySettingsDialog->lineEdit_Opponent6Name->text().toUtf8().constData()); + (*(++it))->setMyName(mySettingsDialog->lineEdit_Opponent7Name->text().toUtf8().constData()); + (*(++it))->setMyName(mySettingsDialog->lineEdit_Opponent8Name->text().toUtf8().constData()); + (*(++it))->setMyName(mySettingsDialog->lineEdit_Opponent9Name->text().toUtf8().constData()); mySettingsDialog->setPlayerNickIsChanged(FALSE); refreshPlayerName(); @@ -657,6 +666,9 @@ void gameTableImpl::applySettings(settingsDialogImpl* mySettingsDialog) { (*(++it))->setMyAvatar(mySettingsDialog->pushButton_Opponent4Avatar->getMyLink().toUtf8().constData()); (*(++it))->setMyAvatar(mySettingsDialog->pushButton_Opponent5Avatar->getMyLink().toUtf8().constData()); (*(++it))->setMyAvatar(mySettingsDialog->pushButton_Opponent6Avatar->getMyLink().toUtf8().constData()); + (*(++it))->setMyAvatar(mySettingsDialog->pushButton_Opponent7Avatar->getMyLink().toUtf8().constData()); + (*(++it))->setMyAvatar(mySettingsDialog->pushButton_Opponent8Avatar->getMyLink().toUtf8().constData()); + (*(++it))->setMyAvatar(mySettingsDialog->pushButton_Opponent9Avatar->getMyLink().toUtf8().constData()); //avatar refresh refreshPlayerAvatar(); @@ -682,10 +694,10 @@ void gameTableImpl::applySettings(settingsDialogImpl* mySettingsDialog) { if(myConfig->readConfigInt("AntiPeekMode")) { holeCardsArray[0][0]->setPixmap(*flipside, TRUE); tempCardsPixmapArray[0] = QPixmap::fromImage(QImage(myAppDataPath +"gfx/cards/default/"+QString::number(tempCardsIntArray[0], 10)+".png")); - holeCardsArray[0][0]->setFrontPixmap(tempCardsPixmapArray[0]); + holeCardsArray[0][0]->setHiddenFrontPixmap(tempCardsPixmapArray[0]); holeCardsArray[0][1]->setPixmap(*flipside, TRUE); tempCardsPixmapArray[1]= QPixmap::fromImage(QImage(myAppDataPath +"gfx/cards/default/"+QString::number(tempCardsIntArray[1], 10)+".png")); - holeCardsArray[0][1]->setFrontPixmap(tempCardsPixmapArray[1]); + holeCardsArray[0][1]->setHiddenFrontPixmap(tempCardsPixmapArray[1]); } else { tempCardsPixmapArray[0]= QPixmap::fromImage(QImage(myAppDataPath +"gfx/cards/default/"+QString::number(tempCardsIntArray[0], 10)+".png")); @@ -950,11 +962,11 @@ void gameTableImpl::refreshCash() { if((*it_c)->getMyActiveStatus()) { cashLabelArray[(*it_c)->getMyID()]->setText("$"+QString::number((*it_c)->getMyCash(),10)); - cashTopLabelArray[(*it_c)->getMyID()]->setText("Cash:"); +// cashTopLabelArray[(*it_c)->getMyID()]->setText("Cash:"); } else { cashLabelArray[(*it_c)->getMyID()]->setText(""); - cashTopLabelArray[(*it_c)->getMyID()]->setText(""); +// cashTopLabelArray[(*it_c)->getMyID()]->setText(""); } } } @@ -971,31 +983,22 @@ void gameTableImpl::refreshGroupbox(int playerID, int status) { if((*it_c)->getMyTurn()) { //Groupbox glow wenn der Spiele dran ist. - if((*it_c)->getMyID()==0) { - groupBoxArray[0]->setStyleSheet("QGroupBox { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playerBoxActiveGlow_0.6.png) }"); - } - else { - groupBoxArray[(*it_c)->getMyID()]->setStyleSheet("QGroupBox { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/opponentBoxActiveGlow.png) }"); - } - + groupBoxArray[(*it_c)->getMyID()]->setStyleSheet("QGroupBox { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playerSeatActive.png) }"); } else { //Groupbox auf Hintergrundfarbe setzen wenn der Spiele nicht dran aber aktiv ist. if((*it_c)->getMyActiveStatus()) { if((*it_c)->getMyID()==0) { - groupBoxArray[0]->setStyleSheet("QGroupBox { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playerBoxInactiveGlow_0.6.png) }"); //show buttons for(j=0; j<6; j++) { userWidgetsArray[j]->show(); } } - else { - groupBoxArray[(*it_c)->getMyID()]->setStyleSheet("QGroupBox { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/opponentBoxInactiveGlow.png) }"); - } + groupBoxArray[(*it_c)->getMyID()]->setStyleSheet("QGroupBox { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playerSeatInactive.png) }"); + } //Groupbox verdunkeln wenn der Spiele inactive ist. else { if((*it_c)->getMyID()==0) { - groupBoxArray[0]->setStyleSheet("QGroupBox { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playerBoxInactiveGlow_0.6.png) }"); //hide buttons for(j=0; j<6; j++) { userWidgetsArray[j]->hide(); @@ -1004,9 +1007,7 @@ void gameTableImpl::refreshGroupbox(int playerID, int status) { holeCardsArray[0][0]->signalFastFlipCards(FALSE); holeCardsArray[0][1]->signalFastFlipCards(FALSE); } - else { - groupBoxArray[(*it_c)->getMyID()]->setStyleSheet("QGroupBox { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/opponentBoxInactiveGlow.png) }"); - } + groupBoxArray[(*it_c)->getMyID()]->setStyleSheet("QGroupBox { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playerSeatInactive.png) }"); } } } @@ -1017,7 +1018,6 @@ void gameTableImpl::refreshGroupbox(int playerID, int status) { //inactive case 0: { if (!playerID) { - groupBoxArray[playerID]->setStyleSheet("QGroupBox { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playerBoxInactiveGlow_0.6.png) }"); //hide buttons for(j=0; j<6; j++) { userWidgetsArray[j]->hide(); @@ -1026,43 +1026,28 @@ void gameTableImpl::refreshGroupbox(int playerID, int status) { holeCardsArray[0][0]->signalFastFlipCards(FALSE); holeCardsArray[0][1]->signalFastFlipCards(FALSE); } - else { - groupBoxArray[playerID]->setStyleSheet("QGroupBox { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/opponentBoxInactiveGlow.png) }"); - } + groupBoxArray[playerID]->setStyleSheet("QGroupBox { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playerSeatInactive.png) }"); } break; //active but fold case 1: { if (!playerID) { - groupBoxArray[playerID]->setStyleSheet("QGroupBox { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playerBoxInactiveGlow_0.6.png) }"); //show buttons for(j=0; j<6; j++) { userWidgetsArray[j]->show(); } } - else { - groupBoxArray[playerID]->setStyleSheet("QGroupBox { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/opponentBoxInactiveGlow.png) }"); - } + groupBoxArray[playerID]->setStyleSheet("QGroupBox { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playerSeatInactive.png) }"); } break; //active in action case 2: { - if (!playerID) { - groupBoxArray[playerID]->setStyleSheet("QGroupBox { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playerBoxActiveGlow_0.6.png) }"); - } - else { - groupBoxArray[playerID]->setStyleSheet("QGroupBox { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/opponentBoxActiveGlow.png) }"); - } + groupBoxArray[playerID]->setStyleSheet("QGroupBox { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playerSeatActive.png) }"); } break; //active not in action case 3: { - if (!playerID) { - groupBoxArray[playerID]->setStyleSheet("QGroupBox { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playerBoxInactiveGlow_0.6.png) }"); - } - else { - groupBoxArray[playerID]->setStyleSheet("QGroupBox { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/opponentBoxInactiveGlow.png) }"); - } + groupBoxArray[playerID]->setStyleSheet("QGroupBox { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playerSeatInactive.png) }"); } break; default: {} @@ -1160,14 +1145,15 @@ void gameTableImpl::dealHoleCards() { for(j=0; j<2; j++) { if((*it_c)->getMyActiveStatus()) { if (( (*it_c)->getMyID() == 0) || DEBUG_MODE) { + tempCardsPixmapArray[j].load(myAppDataPath +"gfx/cards/default/"+QString::number(tempCardsIntArray[j], 10)+".png"); if(myConfig->readConfigInt("AntiPeekMode")) { holeCardsArray[(*it_c)->getMyID()][j]->setPixmap(*flipside, TRUE); - tempCardsPixmapArray[j].load(myAppDataPath +"gfx/cards/default/"+QString::number(tempCardsIntArray[j], 10)+".png"); - holeCardsArray[(*it_c)->getMyID()][j]->setFrontPixmap(tempCardsPixmapArray[j]); + holeCardsArray[(*it_c)->getMyID()][j]->setFront(*flipside); + holeCardsArray[(*it_c)->getMyID()][j]->setHiddenFrontPixmap(tempCardsPixmapArray[j]); } else { - tempCardsPixmapArray[j].load(myAppDataPath +"gfx/cards/default/"+QString::number(tempCardsIntArray[j], 10)+".png"); holeCardsArray[(*it_c)->getMyID()][j]->setPixmap(tempCardsPixmapArray[j],FALSE); + holeCardsArray[(*it_c)->getMyID()][j]->setFront(tempCardsPixmapArray[j]); } } else { @@ -1543,9 +1529,9 @@ void gameTableImpl::meInAction() { if(myConfig->readConfigInt("ShowStatusbarMessages")) { if ( myConfig->readConfigInt("AlternateFKeysUserActionMode") == 0 ) { - statusBar()->showMessage(tr("F1 - Fold | F2 - Check/Call | F3 - Bet/Raise | F4 - All-In"), 15000); +// // statusBar()->showMessage(tr("F1 - Fold | F2 - Check/Call | F3 - Bet/Raise | F4 - All-In"), 15000); } else { - statusBar()->showMessage(tr("F1 - All-In | F2 - Bet/Raise | F3 - Check/Call | F4 - Fold"), 15000); +// statusBar()->showMessage(tr("F1 - All-In | F2 - Bet/Raise | F3 - Check/Call | F4 - Fold"), 15000); } } @@ -1637,7 +1623,7 @@ void gameTableImpl::myFold(){ //set that i was the last active player. need this for unhighlighting groupbox currentHand->setLastPlayersTurn(0); - statusBar()->clearMessage(); +// statusBar()->clearMessage(); //Spiel läuft weiter myActionDone(); @@ -1653,7 +1639,7 @@ void gameTableImpl::myCheck() { //set that i was the last active player. need this for unhighlighting groupbox currentHand->setLastPlayersTurn(0); - statusBar()->clearMessage(); +// statusBar()->clearMessage(); //Spiel läuft weiter myActionDone(); @@ -1727,7 +1713,7 @@ void gameTableImpl::myCall(){ //set that i was the last active player. need this for unhighlighting groupbox currentHand->setLastPlayersTurn(0); - statusBar()->clearMessage(); +// statusBar()->clearMessage(); //Spiel läuft weiter myActionDone(); @@ -1777,7 +1763,7 @@ void gameTableImpl::mySet(){ currentHand->getBoard()->collectSets(); refreshPot(); - statusBar()->clearMessage(); +// statusBar()->clearMessage(); //set that i was the last active player. need this for unhighlighting groupbox currentHand->setLastPlayersTurn(0); @@ -1807,7 +1793,7 @@ void gameTableImpl::myAllIn(){ currentHand->getBoard()->collectSets(); refreshPot(); - statusBar()->clearMessage(); +// statusBar()->clearMessage(); //set that i was the last active player. need this for unhighlighting groupbox currentHand->setLastPlayersTurn(0); @@ -2284,7 +2270,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() ) { - cashTopLabelArray[(*it_c)->getMyID()]->setText(""); +// cashTopLabelArray[(*it_c)->getMyID()]->setText(""); } } } @@ -2294,7 +2280,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() ) { - cashTopLabelArray[(*it_c)->getMyID()]->setText("Cash:"); +// cashTopLabelArray[(*it_c)->getMyID()]->setText("Cash:"); } } } @@ -2520,7 +2506,7 @@ void gameTableImpl::nextRoundCleanGui() { pushButton_break->setText(tr("Stop")); } //Clear Statusbarmessage - statusBar()->clearMessage(); +// statusBar()->clearMessage(); //fix press mouse button during bankrupt with anti-peek-mode this->mouseOverFlipCards(FALSE); @@ -2697,13 +2683,13 @@ void gameTableImpl::changePlayingMode() { switch (mode) { - case 0: { statusBar()->showMessage(tr("Manual mode set. You've got to choose yourself now."), 5000); } +// case 0: { statusBar()->showMessage(tr("Manual mode set. You've got to choose yourself now."), 5000); } break; - case 1: { statusBar()->showMessage(tr("Auto mode set: Check or call any."), 5000); } +// case 1: { statusBar()->showMessage(tr("Auto mode set: Check or call any."), 5000); } break; - case 2: { statusBar()->showMessage(tr("Auto mode set: Check or fold."), 5000); } +// case 2: { statusBar()->showMessage(tr("Auto mode set: Check or fold."), 5000); } break; - default: { cout << "changePlayingMode ERROR!!!!" << endl; } + default: { /*cout << "changePlayingMode ERROR!!!!" << endl;*/ } } diff --git a/src/gui/qt/gametable/mycardspixmaplabel.cpp b/src/gui/qt/gametable/mycardspixmaplabel.cpp index 0f8da12d..43625c5e 100755 --- a/src/gui/qt/gametable/mycardspixmaplabel.cpp +++ b/src/gui/qt/gametable/mycardspixmaplabel.cpp @@ -13,7 +13,7 @@ #include "gametableimpl.h" // using namespace std; -MyCardsPixmapLabel::MyCardsPixmapLabel(QFrame* parent) +MyCardsPixmapLabel::MyCardsPixmapLabel(QGroupBox* parent) : QLabel(parent), myW(NULL) { @@ -46,7 +46,7 @@ MyCardsPixmapLabel::~MyCardsPixmapLabel() void MyCardsPixmapLabel::startFadeOut(int speed) { - frameOpacity = 0.0; + frameOpacity = 1.0; if(speed <= 4) { opacityRaiseInterval = 0.01; } if(speed > 4 && speed <= 7) { opacityRaiseInterval = 0.02; } @@ -54,7 +54,7 @@ void MyCardsPixmapLabel::startFadeOut(int speed) { if(speed != 11) { fadeOutAction = TRUE; - frameOpacity = 0.0; + frameOpacity = 1.0; fadeOutTimer->start(40); } @@ -63,8 +63,8 @@ void MyCardsPixmapLabel::startFadeOut(int speed) { void MyCardsPixmapLabel::nextFadeOutFrame() { - if (frameOpacity < 0.75) { - frameOpacity += opacityRaiseInterval; + if (frameOpacity > 0.25) { + frameOpacity -= opacityRaiseInterval; update(); } else { @@ -141,35 +141,23 @@ void MyCardsPixmapLabel::setPixmap(const QPixmap &pic, const bool flipsideIs) { QLabel::setPixmap(pic); isFlipside = flipsideIs; - } -void MyCardsPixmapLabel::setFrontPixmap ( const QPixmap &pic ) { +void MyCardsPixmapLabel::setHiddenFrontPixmap ( const QPixmap &pic ) { myHiddenFront = pic.scaled(width(), height(), Qt::IgnoreAspectRatio, Qt::SmoothTransformation);; } void MyCardsPixmapLabel::paintEvent(QPaintEvent * event) { - if (!(flipCardsAction1 || flipCardsAction2)) { + if (!(flipCardsAction1 || flipCardsAction2 || fadeOutAction)) { QLabel::paintEvent(event); } - if (fadeOutAction) { - + if (fadeOutAction && !fastFlipCardsFront) { QPainter painter(this); -// painter.setPen(QColor(74,131,83)); - painter.setBrush(QColor(74,131,83)); -// painter.setBrush(palette().color(QPalette::Background)); - // painter.setBrush(QColor(0,0,0)); - painter.setOpacity(frameOpacity); - // painter.drawRect(this->geometry()); - if(objectName().contains("pixmapLabel_cardBoard")) - painter.drawRect(-1,-1,80,115); - else - painter.drawRect(-1,-1,81,112); - + painter.drawPixmap(0,0, front); } if (flipCardsAction1) { @@ -193,12 +181,10 @@ void MyCardsPixmapLabel::paintEvent(QPaintEvent * event) { if (fastFlipCardsFront && !flipCardsAction1 && !flipCardsAction2) { if(objectName().contains("pixmapLabel_card0")) { QPainter painter4(this); - painter4.drawPixmap(0,0, myHiddenFront); if(fadeOutAction) { - painter4.setBrush(QColor(74,131,83)); - painter4.setOpacity(0.75); - painter4.drawRect(-1,-1,81,112); + painter4.setOpacity(0.25); } + painter4.drawPixmap(0,0, myHiddenFront); } } } diff --git a/src/gui/qt/gametable/mycardspixmaplabel.h b/src/gui/qt/gametable/mycardspixmaplabel.h index 47d4cff6..856f6a97 100755 --- a/src/gui/qt/gametable/mycardspixmaplabel.h +++ b/src/gui/qt/gametable/mycardspixmaplabel.h @@ -23,7 +23,7 @@ class MyCardsPixmapLabel : public QLabel { Q_OBJECT public: - MyCardsPixmapLabel(QFrame*); + MyCardsPixmapLabel(QGroupBox*); ~MyCardsPixmapLabel(); @@ -48,7 +48,7 @@ signals: public slots: void setPixmap ( const QPixmap &, const bool ); - void setFrontPixmap ( const QPixmap &); + void setHiddenFrontPixmap ( const QPixmap &); void nextFadeOutFrame(); void nextFlipCardsFrame(); @@ -60,6 +60,9 @@ public slots: void mousePressEvent ( QMouseEvent *); void mouseReleaseEvent ( QMouseEvent *); + void setFront ( const QPixmap& theValue ) { front = theValue; } + + private: gameTableImpl* myW; diff --git a/src/gui/qt/gametable/mystatuslabel.cpp b/src/gui/qt/gametable/mystatuslabel.cpp index d66ce0e7..bf74bdaa 100755 --- a/src/gui/qt/gametable/mystatuslabel.cpp +++ b/src/gui/qt/gametable/mystatuslabel.cpp @@ -15,7 +15,7 @@ using namespace std; -MyStatusLabel::MyStatusLabel(QFrame* parent) +MyStatusLabel::MyStatusLabel(QGroupBox* parent) : QLabel(parent) { mousePress = FALSE; diff --git a/src/gui/qt/gametable/mystatuslabel.h b/src/gui/qt/gametable/mystatuslabel.h index c7114208..6e22d07a 100755 --- a/src/gui/qt/gametable/mystatuslabel.h +++ b/src/gui/qt/gametable/mystatuslabel.h @@ -23,7 +23,7 @@ class MyStatusLabel : public QLabel { Q_OBJECT public: - MyStatusLabel(QFrame*); + MyStatusLabel(QGroupBox*); ~MyStatusLabel(); diff --git a/src/gui/qt/manualblindsorderdialog.ui b/src/gui/qt/manualblindsorderdialog.ui index 984029ed..dcaab721 100644 --- a/src/gui/qt/manualblindsorderdialog.ui +++ b/src/gui/qt/manualblindsorderdialog.ui @@ -1,7 +1,8 @@ - + + manualBlindsOrderDialog - - + + 0 0 @@ -9,31 +10,31 @@ 362 - + Manual Blinds Order - - - - + + + + 4 - - + + - - - + + + Delete - + - + Qt::Vertical - + 20 121 @@ -41,80 +42,83 @@ - - - + + + $ - - 5000 + + 1 - + + 100000 + + 5 - - - + + + Add - - - + + + Afterwards: - - + + 2 - + 2 - - - + + + Always double blinds - + true - - + + - - + + Always raise by: - - + + $ - + 5000 - + 5 - + 5 - - - + + + Keep last blind @@ -122,13 +126,13 @@ - - - + + + Qt::Horizontal - - QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok @@ -153,11 +157,11 @@ manualBlindsOrderDialog accept() - + 228 394 - + 157 274 @@ -169,11 +173,11 @@ manualBlindsOrderDialog reject() - + 270 400 - + 286 274 @@ -185,11 +189,11 @@ spinBox_alwaysRaiseValue setEnabled(bool) - + 109 307 - + 173 303 diff --git a/src/gui/qt/newgamedialog.ui b/src/gui/qt/newgamedialog.ui index c626ce46..2e547bb8 100755 --- a/src/gui/qt/newgamedialog.ui +++ b/src/gui/qt/newgamedialog.ui @@ -1,98 +1,99 @@ - + + newGameDialog - - + + 0 0 - 207 - 235 + 225 + 271 - + Start Local Game - - - - + + + + Local Game Settings - - - - + + + + Number of players: - + spinBox_quantityPlayers - - - + + + 2 - - 7 + + 10 - - 7 + + 10 - - - + + + Start Cash: - + spinBox_startCash - - - + + + $ - + 1000 - - 5000 + + 1000000 - + 50 - + 2000 - - - + + + Blinds - - + + 0 - - - + + + Use saved blinds settings - + true - - - + + + Change blinds settings ... @@ -100,25 +101,25 @@ - - - + + + Game Speed: - + spinBox_gameSpeed - - - + + + 1 - + 11 - + 4 @@ -126,13 +127,13 @@ - - - + + + Qt::Horizontal - - QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok @@ -154,11 +155,11 @@ newGameDialog accept() - + 248 254 - + 157 274 @@ -170,11 +171,11 @@ newGameDialog reject() - + 316 260 - + 286 274 diff --git a/src/gui/qt/settingsdialog.ui b/src/gui/qt/settingsdialog.ui index 9142ef42..1f404ed7 100644 --- a/src/gui/qt/settingsdialog.ui +++ b/src/gui/qt/settingsdialog.ui @@ -1,7 +1,8 @@ - + + settingsDialog - - + + 0 0 @@ -9,154 +10,154 @@ 530 - + 785 530 - + Settings - - - + + + - - + + 190 0 - + 190 16777215 - + 32 32 - + false - + true - + Interface - - + + :/gfx/preferences-desktop.png:/gfx/preferences-desktop.png - + Sound - - + + :/gfx/speaker.png:/gfx/speaker.png - + Local Game - - + + :/gfx/swbuttonlocalgame.png:/gfx/swbuttonlocalgame.png - + Network Game - - + + :/gfx/swbuttonjoinnetworkgame.png:/gfx/swbuttonjoinnetworkgame.png - + Internet Game - - + + :/gfx/swbuttoninternetgame.png:/gfx/swbuttoninternetgame.png - + Nicks/Avatars - - + + :/gfx/system_users.png:/gfx/system_users.png - + Log Messages - - + + :/gfx/utilities-log-viewer.png:/gfx/utilities-log-viewer.png - - + + 0 - - - - - - QLabel { font-weight: bold; } + + + + + + QLabel { font-weight: bold; } - + Interface - - - + + + Qt::Horizontal - - + + - - + + Language: - + comboBox_switchLanguage - + - + Qt::Horizontal - + 40 20 @@ -166,89 +167,89 @@ - - - - - + + + + + Show intro on startup - - - + + + Show left toolbox - - - + + + Show right toolbox - - - + + + Show statusbar messages - - - + + + Show fade-out animation for non-winning cards - - - + + + Show flip-card animation - - - + + + Reverse order of F-Keys (F1 - F4) - - - + + + Show own cards only on mouse click - - - + + + Show cards chance monitor - - - + + + Show buttons for small blind and big blind - - - + + + Network / Internet Game - - - - + + + + Switch keyboard focus to bet-input-field if it's your turn @@ -256,69 +257,69 @@ - - - + + + Flipside of Cards - - + + 9 - + 0 - + 9 - + 9 - + 6 - - - + + + 0 - + 0 - - + + 2 - + 0 - - + + Own flipside picture: - - + + false - - + + false - + 27 26 - + 27 26 @@ -329,26 +330,26 @@ - - - <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-weight:400; font-style:normal; text-decoration: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-style:italic;">Note: Best quality with image ratio like </span><span style=" font-weight:600; font-style:italic;">width=100, height=140.</span></p></body></html> +</style></head><body style="font-weight:400; font-style:normal; text-decoration: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-style:italic;">Note: Best quality with image ratio like </span><span style=" font-weight:600; font-style:italic;">width=100, height=140.</span></p></body></html> - + true - - - + + + Default - + true @@ -356,12 +357,12 @@ p, li { white-space: pre-wrap; } - + - + Qt::Vertical - + 400 111 @@ -371,112 +372,112 @@ p, li { white-space: pre-wrap; } - - - - - - QLabel { font-weight: bold; } + + + + + + QLabel { font-weight: bold; } - + Sound - - - + + + Qt::Horizontal - - - + + + Play sound effects - + true - + true - - - - + + + + 6 - + 0 - - + + Sound Volume: - - + + 20 0 - + 10 - - + + 1 - + 10 - + 8 - + Qt::Horizontal - - - + + + Sound Categories - - + + 0 - - - - Play game actions sounds like "check", "call", "raise" + + + + Play game actions sounds like "check", "call", "raise" - - - + + + Play lobby chat notifications - - - - Play network/internet game notifications like "player joined the game" + + + + Play network/internet game notifications like "player joined the game" - + false @@ -487,12 +488,12 @@ p, li { white-space: pre-wrap; } - + - + Qt::Vertical - + 400 321 @@ -502,76 +503,76 @@ p, li { white-space: pre-wrap; } - - + + - - - QLabel { font-weight: bold; } + + + QLabel { font-weight: bold; } - + Local Game Settings - - + + Qt::Horizontal - + - - + + Number of players: - + spinBox_quantityPlayers - - + + 2 - - 7 + + 10 - - 7 + + 10 - + - - + + Start Cash: - + spinBox_startCash - - + + $ - + 1000 - - 5000 + + 1000000 - + 50 @@ -579,26 +580,26 @@ p, li { white-space: pre-wrap; } - + - - + + First small blind: - + spinBox_firstSmallBlind - - + + $ - + 5 - + 500 @@ -606,85 +607,85 @@ p, li { white-space: pre-wrap; } - + - - + + Raise blinds: - - + + 9 - + 0 - + 9 - - - + + + Every: - + true - - - + + + 1 - - - - + + + + 0 0 - + hands - - - + + + Every: - - - + + + 1 - - - - + + + + 0 0 - + minutes - + - + Qt::Vertical - + 20 5 @@ -696,43 +697,43 @@ p, li { white-space: pre-wrap; } - - - + + + 0 0 - + Raise mode: - - + + 0 - - - + + + Always double blinds - + true - - - + + + Manual blinds order: - - - + + + false - + Edit ... @@ -743,26 +744,26 @@ p, li { white-space: pre-wrap; } - + - - + + Game Speed: - + spinBox_gameSpeed - - + + 1 - + 11 - + 1 @@ -770,25 +771,25 @@ p, li { white-space: pre-wrap; } - - - Pause between hands (press "start" button to go on) + + + Pause between hands (press "start" button to go on) - - + + Show game settings dialog on every new game - + Qt::Vertical - + 437 285 @@ -798,76 +799,76 @@ p, li { white-space: pre-wrap; } - - + + - - - QLabel { font-weight: bold; } + + + QLabel { font-weight: bold; } - + Network Game Settings - - + + Qt::Horizontal - + - - + + Maximum number of players: - + spinBox_netQuantityPlayers - - + + 2 - - 7 + + 10 - - 7 + + 10 - + - - + + Start Cash: - + spinBox_netStartCash - - + + $ - + 1000 - - 5000 + + 1000000 - + 50 @@ -875,26 +876,26 @@ p, li { white-space: pre-wrap; } - + - - + + First small blind: - + spinBox_netFirstSmallBlind - - + + $ - + 5 - + 500 @@ -902,94 +903,94 @@ p, li { white-space: pre-wrap; } - + - - + + 16777215 105 - + Raise blinds: - - + + 6 - + 0 - + 6 - + 6 - - - + + + Every: - + true - - - + + + 1 - - - - + + + + 0 0 - + hands - - - + + + Every: - - - + + + 1 - - - - + + + + 0 0 - + minutes - + - + Qt::Vertical - + 20 10 @@ -1001,58 +1002,58 @@ p, li { white-space: pre-wrap; } - - - + + + 0 0 - + 16777215 105 - + Raise mode: - - + + 6 - + 0 - + 6 - + 6 - - - + + + Always double blinds - + true - - - + + + Manual blinds order: - - - + + + false - + Edit ... @@ -1063,26 +1064,26 @@ p, li { white-space: pre-wrap; } - + - - + + Game Speed for computer opponents: - + spinBox_netGameSpeed - - + + 1 - + 11 - + 1 @@ -1090,29 +1091,29 @@ p, li { white-space: pre-wrap; } - + - - + + Timeout for player action: - + spinBox_netTimeOutPlayerAction - - + + s - + 5 - + 60 - + 20 @@ -1120,99 +1121,99 @@ p, li { white-space: pre-wrap; } - - + + Network Server Settings - - + + 6 - + 0 - + 6 - + 6 - + 6 - - - + + + 60 - + QLineEdit::Password - - - + + + Server Password: - + lineEdit_serverPassword - - - + + + 80 - + 65535 - + 7234 - - - + + + Server Port: - + spinBox_serverPort - - - + + + Use SCTP - - - + + + Use IPv6 - - - - <a href="http://en.wikipedia.org/wiki/Ipv6">What is this?</a> + + + + <a href="http://en.wikipedia.org/wiki/Ipv6">What is this?</a> - + true - - - - <a href="http://en.wikipedia.org/wiki/Stream_Control_Transmission_Protocol">What is this?</a> + + + + <a href="http://en.wikipedia.org/wiki/Stream_Control_Transmission_Protocol">What is this?</a> - + true @@ -1221,11 +1222,11 @@ p, li { white-space: pre-wrap; } - - + + Qt::Vertical - + 20 40 @@ -1235,196 +1236,196 @@ p, li { white-space: pre-wrap; } - - - - - - QLabel { font-weight: bold; } + + + + + + QLabel { font-weight: bold; } - + Internet Game Settings - - - + + + Qt::Horizontal - - - - <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-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-style:italic;">Note: Default </span><span style=" font-weight:600; font-style:italic;">Game Settings</span><span style=" font-style:italic;"> like "Maximum number of players", "Start Cash" and "Small Blind" will be used </span><span style=" font-weight:600; font-style:italic;">from Network Game Settings.</span></p></body></html> +</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-style:italic;">Note: Default </span><span style=" font-weight:600; font-style:italic;">Game Settings</span><span style=" font-style:italic;"> like "Maximum number of players", "Start Cash" and "Small Blind" will be used </span><span style=" font-weight:600; font-style:italic;">from Network Game Settings.</span></p></body></html> - + true - - - + + + 300 0 - + 300 16777215 - + Internet Server - - - - + + + + Automatic Server Configuration URL - + true - - - - + + + + Serverlist Address: - - + + - - - + + + 0 116 - + Manual Server Configuration - + true - + false - - - - + + + + Server Address: - + lineEdit_InternetServerAddress - - - + + + 60 - - - + + + Server Port: - + spinBox_InternetServerPort - - - + + + 80 - + 65535 - + 7234 - - - + + + Server Password: - + lineEdit_InternetServerPassword - - - + + + QLineEdit::Password - - - + + + Avatar Server: - - + + - - - + + + Use IPv6 - - - - <a href="http://en.wikipedia.org/wiki/Ipv6">What is this?</a> + + + + <a href="http://en.wikipedia.org/wiki/Ipv6">What is this?</a> - + true - - - + + + Use SCTP - - - - <a href="http://en.wikipedia.org/wiki/Stream_Control_Transmission_Protocol">What is this?</a> + + + + <a href="http://en.wikipedia.org/wiki/Stream_Control_Transmission_Protocol">What is this?</a> - + true @@ -1432,111 +1433,111 @@ p, li { white-space: pre-wrap; } - - - + + + Lobby Chat (IRC) - + true - - - - + + + + Server Address: - + lineEdit_IRCServerAddress - - - + + + chat.freenode.net - + 60 - - - + + + Server Port: - + spinBox_IRCServerPort - - - - + + + + 0 0 - + 80 - + 65535 - + 6667 - - - + + + Channel: - + lineEdit_IRCChannel - - - + + + Password: - + lineEdit_IRCChannelPassword - - - + + + QLineEdit::Password - - - + + + Use IPv6 - - - - <a href="http://en.wikipedia.org/wiki/Ipv6">What is this?</a> + + + + <a href="http://en.wikipedia.org/wiki/Ipv6">What is this?</a> - + true - - - + + + #pokerth @@ -1544,12 +1545,12 @@ p, li { white-space: pre-wrap; } - - - + + + Qt::Vertical - + 20 98 @@ -1557,36 +1558,36 @@ p, li { white-space: pre-wrap; } - - - + + + 0 - - + + Use password for private game: - - + + false - + QLineEdit::Password - + - + Qt::Vertical - + 437 16 @@ -1596,36 +1597,36 @@ p, li { white-space: pre-wrap; } - - - - - - QLabel { font-weight: bold; } + + + + + + QLabel { font-weight: bold; } - + Player Nicks/Avatars - - - + + + Qt::Horizontal - - - + + + 0 - - - + + + Qt::Horizontal - + 40 20 @@ -1633,34 +1634,34 @@ p, li { white-space: pre-wrap; } - - - - + + + + 0 0 - + 200 16777215 - + Human Player: - + Qt::AlignCenter - - - + + + Qt::Horizontal - + 40 20 @@ -1668,14 +1669,14 @@ p, li { white-space: pre-wrap; } - - + + - - + + Qt::Horizontal - + 40 20 @@ -1684,23 +1685,23 @@ p, li { white-space: pre-wrap; } - - + + 60 60 - + 60 60 - + - + 50 50 @@ -1709,11 +1710,11 @@ p, li { white-space: pre-wrap; } - - + + Qt::Horizontal - + 40 20 @@ -1723,12 +1724,12 @@ p, li { white-space: pre-wrap; } - - - + + + Qt::Horizontal - + 78 20 @@ -1736,37 +1737,37 @@ p, li { white-space: pre-wrap; } - - - - + + + + 0 0 - + 100 25 - + 100 25 - + 12 - - - + + + Qt::Horizontal - + 88 20 @@ -1776,814 +1777,1212 @@ p, li { white-space: pre-wrap; } - - - + + + Computer Engine - - - 1 - - - 0 - - - 10 - - - - - 0 - - - 0 - - - - - - 0 - 0 - - - - - 100 - 0 - - - - - 100 - 16777215 - - - - Opponent 6: - - - Qt::AlignCenter - - - - - - - 6 - - + + + + + + 0 - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 3 - 20 - - - - - - - - + + 0 + + + + + 0 0 - + - 60 - 60 + 100 + 25 - + - 60 - 60 + 100 + 25 - - - 50 - 50 - + + 12 - - - - Qt::Horizontal + + + + + 0 + 0 + - - QSizePolicy::Fixed - - + - 3 - 20 + 100 + 0 - + + + 100 + 16777215 + + + + Opponent 1: + + + Qt::AlignCenter + + + + + + + 6 + + + 0 + + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 3 + 20 + + + + + + + + + 0 + 0 + + + + + 60 + 60 + + + + + 60 + 60 + + + + + 50 + 50 + + + + + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 3 + 20 + + + + + - - - - - 0 - 0 - - - - - 100 - 25 - - - - - 100 - 25 - - - - 12 - - - - - - - - - 0 - - - 0 - - - - - - 0 - 0 - - - - - 100 - 0 - - - - - 100 - 16777215 - - - - Opponent 5: - - - Qt::AlignCenter - - - - - - - 6 - - + + + 0 - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 3 - 20 - - - - - - - - + + 0 + + + + + 0 0 - + - 60 - 60 + 100 + 25 - + - 60 - 60 + 100 + 25 - - - 50 - 50 - + + 12 - - - - Qt::Horizontal + + + + + 0 + 0 + - - QSizePolicy::Fixed - - + - 3 - 20 + 100 + 0 - + + + 100 + 16777215 + + + + Opponent 2: + + + Qt::AlignCenter + + + + + + + 6 + + + 0 + + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 3 + 20 + + + + + + + + + 0 + 0 + + + + + 60 + 60 + + + + + 60 + 60 + + + + + 50 + 50 + + + + + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 3 + 20 + + + + + - - - - - 0 - 0 - - - - - 100 - 25 - - - - - 100 - 25 - - - - 12 - - - - - - - - - 0 - - - 0 - - - - - - 0 - 0 - - - - - 100 - 25 - - - - - 100 - 25 - - - - 12 - - - - - - - - 0 - 0 - - - - - 100 - 0 - - - - - 100 - 16777215 - - - - Opponent 4: - - - Qt::AlignCenter - - - - - - - 6 - - + + + 0 - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 3 - 20 - - - - - - - - + + 0 + + + + + 0 0 - + - 60 - 60 + 100 + 0 - + - 60 - 60 + 100 + 16777215 - - - 50 - 50 - + + Opponent 3: + + + Qt::AlignCenter - - - - Qt::Horizontal + + + + + 0 + 0 + - - QSizePolicy::Fixed - - + - 3 - 20 + 100 + 25 - + + + 100 + 25 + + + + 12 + + + + + + + 6 + + + 0 + + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 3 + 20 + + + + + + + + + 0 + 0 + + + + + 60 + 60 + + + + + 60 + 60 + + + + + 50 + 50 + + + + + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 3 + 20 + + + + + + + + + + + + 0 + + + 0 + + + + + + 0 + 0 + + + + + 100 + 25 + + + + + 100 + 25 + + + + 12 + + + + + + + + 0 + 0 + + + + + 100 + 0 + + + + + 100 + 16777215 + + + + Opponent 4: + + + Qt::AlignCenter + + + + + + + 6 + + + 0 + + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 3 + 20 + + + + + + + + + 0 + 0 + + + + + 60 + 60 + + + + + 60 + 60 + + + + + 50 + 50 + + + + + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 3 + 20 + + + + + + + + + + + + 0 + + + 0 + + + + + + 0 + 0 + + + + + 100 + 0 + + + + + 100 + 16777215 + + + + Opponent 5: + + + Qt::AlignCenter + + + + + + + 6 + + + 0 + + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 3 + 20 + + + + + + + + + 0 + 0 + + + + + 60 + 60 + + + + + 60 + 60 + + + + + 50 + 50 + + + + + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 3 + 20 + + + + + + + + + + + 0 + 0 + + + + + 100 + 25 + + + + + 100 + 25 + + + + 12 + + - - - - 0 - - - 0 - - - - - - 0 - 0 - - - - - 100 - 0 - - - - - 100 - 16777215 - - - - Opponent 3: - - - Qt::AlignCenter - - - - - - - - 0 - 0 - - - - - 100 - 25 - - - - - 100 - 25 - - - - 12 - - - - - - - 6 - - + + + + + 0 - - - - Qt::Horizontal + + 0 + + + + + 6 - - QSizePolicy::Fixed + + 0 - - - 3 - 20 - - - + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 3 + 20 + + + + + + + + + 0 + 0 + + + + + 60 + 60 + + + + + 60 + 60 + + + + + 50 + 50 + + + + + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 3 + 20 + + + + + - - - - + + + + 0 0 - + - 60 - 60 + 100 + 25 - + - 60 - 60 + 100 + 25 - - - 50 - 50 - + + 12 - - - - Qt::Horizontal + + + + + 0 + 0 + - - QSizePolicy::Fixed - - + - 3 - 20 + 100 + 0 - + + + 100 + 16777215 + + + + Opponent 6: + + + Qt::AlignCenter + + - - - - - - 0 - - - 0 - - - - - - 0 - 0 - - - - - 100 - 25 - - - - - 100 - 25 - - - - 12 - - - - - - - - 0 - 0 - - - - - 100 - 0 - - - - - 100 - 16777215 - - - - Opponent 2: - - - Qt::AlignCenter - - - - - - - 6 - - + + + 0 - - - - Qt::Horizontal + + 0 + + + + + 6 - - QSizePolicy::Fixed + + 0 - - - 3 - 20 - - - + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 3 + 20 + + + + + + + + + 0 + 0 + + + + + 60 + 60 + + + + + 60 + 60 + + + + + 50 + 50 + + + + + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 3 + 20 + + + + + - - - - + + + + 0 0 - + - 60 - 60 + 100 + 25 - + - 60 - 60 + 100 + 25 - - - 50 - 50 - + + 12 - - - - Qt::Horizontal + + + + + 0 + 0 + - - QSizePolicy::Fixed - - + - 3 - 20 + 100 + 0 - + + + 100 + 16777215 + + + + Opponent 7: + + + Qt::AlignCenter + + - - - - - - 0 - - - 0 - - - - - - 0 - 0 - - - - - 100 - 25 - - - - - 100 - 25 - - - - 12 - - - - - - - - 0 - 0 - - - - - 100 - 0 - - - - - 100 - 16777215 - - - - Opponent 1: - - - Qt::AlignCenter - - - - - - - 6 - - + + + 0 - - - - Qt::Horizontal + + 0 + + + + + 6 - - QSizePolicy::Fixed + + 0 - - - 3 - 20 - - - + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 3 + 20 + + + + + + + + + 0 + 0 + + + + + 60 + 60 + + + + + 60 + 60 + + + + + 50 + 50 + + + + + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 3 + 20 + + + + + - - - - + + + + 0 0 - + - 60 - 60 + 100 + 25 - + - 60 - 60 + 100 + 25 - - - 50 - 50 - + + 12 - - - - Qt::Horizontal + + + + + 0 + 0 + - - QSizePolicy::Fixed - - + - 3 - 20 + 100 + 0 - + + + 100 + 16777215 + + + + Opponent 8: + + + Qt::AlignCenter + + + + + + + + + 0 + + + 0 + + + + + 6 + + + 0 + + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 3 + 20 + + + + + + + + + 0 + 0 + + + + + 60 + 60 + + + + + 60 + 60 + + + + + 50 + 50 + + + + + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 3 + 20 + + + + + + + + + + + 0 + 0 + + + + + 100 + 25 + + + + + 100 + 25 + + + + 12 + + + + + + + + 0 + 0 + + + + + 100 + 0 + + + + + 100 + 16777215 + + + + Opponent 10: + + + Qt::AlignCenter + + @@ -2592,25 +2991,25 @@ p, li { white-space: pre-wrap; } - - - - <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-weight:400; font-style:normal; text-decoration: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-style:italic;">Note: Best avatar quality with image ratio like </span><span style=" font-weight:600; font-style:italic;">width=50, height=50.</span></p></body></html> +</style></head><body style="font-weight:400; font-style:normal; text-decoration: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-style:italic;">Note: Best avatar quality with image ratio like </span><span style=" font-weight:600; font-style:italic;">width=50, height=50.</span></p></body></html> - + true - + - + Qt::Vertical - + 20 40 @@ -2620,59 +3019,59 @@ p, li { white-space: pre-wrap; } - - - + + + 9 - + 6 - - - + + + Enable/Disable Logging - + true - + true - - - - + + + + Log File Directory: - + lineEdit_logDir - - - + + + 2 - + - - + + 27 26 - + 27 26 - + ../../../../../../.designer/backup../../../../../../.designer/backup @@ -2680,65 +3079,65 @@ p, li { white-space: pre-wrap; } - - - + + + Store log files for - + spinBox_logStoreDuration - - - + + + Day(s) - + 1 - + 7 - + 2 - - - + + + Write log after every: - + false - + comboBox_logInterval - - - - + + + + 0 0 - + action (high frequent disc access) - + hand (medium disc access) - + game (low disc access) @@ -2747,29 +3146,29 @@ p, li { white-space: pre-wrap; } - - - - QLabel { font-weight: bold; } + + + + QLabel { font-weight: bold; } - + Log Messages - - - + + + Qt::Horizontal - + - + Qt::Vertical - + 20 40 @@ -2783,19 +3182,19 @@ p, li { white-space: pre-wrap; } - - - + + + Qt::Horizontal - - - + + + Qt::Horizontal - + QDialogButtonBox::Cancel|QDialogButtonBox::Ok @@ -2894,7 +3293,7 @@ p, li { white-space: pre-wrap; } buttonBox - + @@ -2903,11 +3302,11 @@ p, li { white-space: pre-wrap; } stackedWidget setCurrentIndex(int) - + 127 60 - + 281 85 @@ -2919,11 +3318,11 @@ p, li { white-space: pre-wrap; } lineEdit_OwnFlipsideFilename setEnabled(bool) - + 360 373 - + 723 374 @@ -2935,11 +3334,11 @@ p, li { white-space: pre-wrap; } pushButton_openFlipsidePicture setEnabled(bool) - + 360 373 - + 752 375 @@ -2951,11 +3350,11 @@ p, li { white-space: pre-wrap; } settingsDialog reject() - + 595 520 - + 599 497 @@ -2967,11 +3366,11 @@ p, li { white-space: pre-wrap; } lineEdit_InternetGamePassword setEnabled(bool) - + 411 443 - + 717 444 @@ -2983,11 +3382,11 @@ p, li { white-space: pre-wrap; } label_soundVolume setNum(int) - + 648 98 - + 336 99 @@ -2999,11 +3398,11 @@ p, li { white-space: pre-wrap; } pushButton_editManualBlindsOrder setEnabled(bool) - + 753 220 - + 753 256 @@ -3015,11 +3414,11 @@ p, li { white-space: pre-wrap; } pushButton_netEditManualBlindsOrder setEnabled(bool) - + 756 218 - + 756 245 @@ -3031,11 +3430,11 @@ p, li { white-space: pre-wrap; } lineEdit_avatarServerAddress setEnabled(bool) - + 314 318 - + 366 320 diff --git a/src/gui/qt/settingsdialog/settingsdialogimpl.cpp b/src/gui/qt/settingsdialog/settingsdialogimpl.cpp index c1cc9226..d77018db 100644 --- a/src/gui/qt/settingsdialog/settingsdialogimpl.cpp +++ b/src/gui/qt/settingsdialog/settingsdialogimpl.cpp @@ -72,6 +72,9 @@ settingsDialogImpl::settingsDialogImpl(QWidget *parent, ConfigFile *c, selectAva connect( lineEdit_Opponent4Name, SIGNAL( textChanged(const QString &) ), this, SLOT( playerNickChanged() ) ); connect( lineEdit_Opponent5Name, SIGNAL( textChanged(const QString &) ), this, SLOT( playerNickChanged() ) ); connect( lineEdit_Opponent6Name, SIGNAL( textChanged(const QString &) ), this, SLOT( playerNickChanged() ) ); + connect( lineEdit_Opponent7Name, SIGNAL( textChanged(const QString &) ), this, SLOT( playerNickChanged() ) ); + connect( lineEdit_Opponent8Name, SIGNAL( textChanged(const QString &) ), this, SLOT( playerNickChanged() ) ); + connect( lineEdit_Opponent9Name, SIGNAL( textChanged(const QString &) ), this, SLOT( playerNickChanged() ) ); connect( pushButton_openFlipsidePicture, SIGNAL( clicked() ), this, SLOT( setFlipsidePicFileName()) ); connect( pushButton_openLogDir, SIGNAL( clicked() ), this, SLOT( setLogDir()) ); connect( pushButton_HumanPlayerAvatar, SIGNAL( clicked() ), this, SLOT( setAvatarFile0()) ); @@ -81,7 +84,9 @@ settingsDialogImpl::settingsDialogImpl(QWidget *parent, ConfigFile *c, selectAva connect( pushButton_Opponent4Avatar, SIGNAL( clicked() ), this, SLOT( setAvatarFile4()) ); connect( pushButton_Opponent5Avatar, SIGNAL( clicked() ), this, SLOT( setAvatarFile5()) ); connect( pushButton_Opponent6Avatar, SIGNAL( clicked() ), this, SLOT( setAvatarFile6()) ); - + connect( pushButton_Opponent7Avatar, SIGNAL( clicked() ), this, SLOT( setAvatarFile7()) ); + connect( pushButton_Opponent8Avatar, SIGNAL( clicked() ), this, SLOT( setAvatarFile8()) ); + connect( pushButton_Opponent9Avatar, SIGNAL( clicked() ), this, SLOT( setAvatarFile9()) ); connect( pushButton_editManualBlindsOrder, SIGNAL( clicked() ), this, SLOT( callManualBlindsOrderDialog()) ); connect( pushButton_netEditManualBlindsOrder, SIGNAL( clicked() ), this, SLOT( callNetManualBlindsOrderDialog()) ); @@ -91,25 +96,17 @@ settingsDialogImpl::settingsDialogImpl(QWidget *parent, ConfigFile *c, selectAva // connect( spinBox_firstSmallBlind, SIGNAL( valueChanged(int) ), this, SLOT ( checkProperFirstSmallBlind(int))); connect( radioButton_netManualBlindsOrder, SIGNAL( toggled(bool) ), this, SLOT( setFirstSmallBlindMargin() )); - connect( radioButton_manualBlindsOrder, SIGNAL( toggled(bool) ), this, SLOT( setFirstSmallBlindMargin() )); //temporarely unused until ai is enabled in network + connect( radioButton_manualBlindsOrder, SIGNAL( toggled(bool) ), this, SLOT( setFirstSmallBlindMargin() )); connect( comboBox_switchLanguage, SIGNAL( currentIndexChanged (int) ), this, SLOT ( setLanguageChanged(int) )); connect(groupBox_automaticServerConfig, SIGNAL(toggled(bool)), this, SLOT(toggleGroupBoxAutomaticServerConfig(bool))); connect(groupBox_manualServerConfig, SIGNAL(toggled(bool)), this, SLOT(toggleGroupBoxManualServerConfig(bool))); -// label_36->hide(); -// spinBox_netGameSpeed->hide(); -// } void settingsDialogImpl::exec() { - -// stackedWidget->removeWidget(page_4); -// listWidget->takeItem(2); -// page_4->hide(); - playerNickIsChanged = FALSE; //Player Nicks @@ -127,6 +124,12 @@ void settingsDialogImpl::exec() { pushButton_Opponent5Avatar->setMyLink(QString::fromUtf8(myConfig->readConfigString("Opponent5Avatar").c_str())); lineEdit_Opponent6Name->setText(QString::fromUtf8(myConfig->readConfigString("Opponent6Name").c_str())); pushButton_Opponent6Avatar->setMyLink(QString::fromUtf8(myConfig->readConfigString("Opponent6Avatar").c_str())); + lineEdit_Opponent7Name->setText(QString::fromUtf8(myConfig->readConfigString("Opponent7Name").c_str())); + pushButton_Opponent7Avatar->setMyLink(QString::fromUtf8(myConfig->readConfigString("Opponent7Avatar").c_str())); + lineEdit_Opponent8Name->setText(QString::fromUtf8(myConfig->readConfigString("Opponent8Name").c_str())); + pushButton_Opponent8Avatar->setMyLink(QString::fromUtf8(myConfig->readConfigString("Opponent8Avatar").c_str())); + lineEdit_Opponent9Name->setText(QString::fromUtf8(myConfig->readConfigString("Opponent9Name").c_str())); + pushButton_Opponent9Avatar->setMyLink(QString::fromUtf8(myConfig->readConfigString("Opponent9Avatar").c_str())); //refresh AvatarIcons pushButton_HumanPlayerAvatar->setIcon(QIcon(pushButton_HumanPlayerAvatar->getMyLink())); @@ -136,6 +139,9 @@ void settingsDialogImpl::exec() { pushButton_Opponent4Avatar->setIcon(QIcon(pushButton_Opponent4Avatar->getMyLink())); pushButton_Opponent5Avatar->setIcon(QIcon(pushButton_Opponent5Avatar->getMyLink())); pushButton_Opponent6Avatar->setIcon(QIcon(pushButton_Opponent6Avatar->getMyLink())); + pushButton_Opponent7Avatar->setIcon(QIcon(pushButton_Opponent7Avatar->getMyLink())); + pushButton_Opponent8Avatar->setIcon(QIcon(pushButton_Opponent8Avatar->getMyLink())); + pushButton_Opponent9Avatar->setIcon(QIcon(pushButton_Opponent9Avatar->getMyLink())); //Local Game Settings spinBox_quantityPlayers->setValue(myConfig->readConfigInt("NumberOfPlayers")); @@ -287,7 +293,16 @@ void settingsDialogImpl::isAccepted() { myConfig->writeConfigString("Opponent5Avatar", pushButton_Opponent5Avatar->getMyLink().toUtf8().constData()); myConfig->writeConfigString("Opponent6Name", lineEdit_Opponent6Name->text().toUtf8().constData()); - myConfig->writeConfigString("Opponent6Avatar", pushButton_Opponent6Avatar->getMyLink().toUtf8().constData()); + myConfig->writeConfigString("Opponent6Avatar", pushButton_Opponent6Avatar->getMyLink().toUtf8().constData()); + + myConfig->writeConfigString("Opponent7Name", lineEdit_Opponent7Name->text().toUtf8().constData()); + myConfig->writeConfigString("Opponent7Avatar", pushButton_Opponent7Avatar->getMyLink().toUtf8().constData()); + + myConfig->writeConfigString("Opponent8Name", lineEdit_Opponent8Name->text().toUtf8().constData()); + myConfig->writeConfigString("Opponent8Avatar", pushButton_Opponent8Avatar->getMyLink().toUtf8().constData()); + + myConfig->writeConfigString("Opponent9Name", lineEdit_Opponent9Name->text().toUtf8().constData()); + myConfig->writeConfigString("Opponent9Avatar", pushButton_Opponent9Avatar->getMyLink().toUtf8().constData()); // Local Game Settings myConfig->writeConfigInt("NumberOfPlayers", spinBox_quantityPlayers->value()); @@ -525,6 +540,32 @@ void settingsDialogImpl::setAvatarFile6() { } } +void settingsDialogImpl::setAvatarFile7() { + + callSelectAvatarDialog(); + if(mySelectAvatarDialogImpl->getSettingsCorrect()) { + pushButton_Opponent7Avatar->setMyLink(mySelectAvatarDialogImpl->getAvatarLink()); + pushButton_Opponent7Avatar->setIcon(QIcon(pushButton_Opponent7Avatar->getMyLink())); + } +} + +void settingsDialogImpl::setAvatarFile8() { + + callSelectAvatarDialog(); + if(mySelectAvatarDialogImpl->getSettingsCorrect()) { + pushButton_Opponent8Avatar->setMyLink(mySelectAvatarDialogImpl->getAvatarLink()); + pushButton_Opponent8Avatar->setIcon(QIcon(pushButton_Opponent8Avatar->getMyLink())); + } +} + +void settingsDialogImpl::setAvatarFile9() { + + callSelectAvatarDialog(); + if(mySelectAvatarDialogImpl->getSettingsCorrect()) { + pushButton_Opponent9Avatar->setMyLink(mySelectAvatarDialogImpl->getAvatarLink()); + pushButton_Opponent9Avatar->setIcon(QIcon(pushButton_Opponent9Avatar->getMyLink())); + } +} void settingsDialogImpl::setLogDir() { QString dir = QFileDialog::getExistingDirectory(this, tr("Open Directory"), diff --git a/src/gui/qt/settingsdialog/settingsdialogimpl.h b/src/gui/qt/settingsdialog/settingsdialogimpl.h index fa4ed220..63f138d0 100644 --- a/src/gui/qt/settingsdialog/settingsdialogimpl.h +++ b/src/gui/qt/settingsdialog/settingsdialogimpl.h @@ -60,6 +60,9 @@ public slots: void setAvatarFile4(); void setAvatarFile5(); void setAvatarFile6(); + void setAvatarFile7(); + void setAvatarFile8(); + void setAvatarFile9(); void callManualBlindsOrderDialog(); void callNetManualBlindsOrderDialog(); @@ -101,7 +104,6 @@ private: bool languageIsChanged; int changedLanguageIndex; - }; #endif