From e3a4c83982942fdb47fd971d09894a7ab9b874b3 Mon Sep 17 00:00:00 2001 From: doitux Date: Fri, 3 Apr 2009 16:02:06 +0000 Subject: [PATCH] set different playerseat pics for top and bottom players --- .../gui/table/danuxi1/danuxi1tablestyle.xml | 6 ++-- .../table/danuxi1/playerBottomSeatActive.png | Bin 0 -> 2416 bytes .../gui/table/danuxi1/playerSeatActive.png | Bin 1089 -> 0 bytes .../gui/table/danuxi1/playerSeatInactive.png | Bin 529 -> 0 bytes .../gui/table/danuxi1/playerTopSeatActive.png | Bin 0 -> 2414 bytes .../gui/table/default/defaulttablestyle.xml | 6 ++-- src/gui/qt/gametable/gametableimpl.cpp | 12 +++---- src/gui/qt/styles/gametablestylereader.cpp | 30 ++++++++++++++---- src/gui/qt/styles/gametablestylereader.h | 8 +++-- 9 files changed, 42 insertions(+), 20 deletions(-) create mode 100644 data/gfx/gui/table/danuxi1/playerBottomSeatActive.png delete mode 100644 data/gfx/gui/table/danuxi1/playerSeatActive.png delete mode 100644 data/gfx/gui/table/danuxi1/playerSeatInactive.png create mode 100644 data/gfx/gui/table/danuxi1/playerTopSeatActive.png diff --git a/data/gfx/gui/table/danuxi1/danuxi1tablestyle.xml b/data/gfx/gui/table/danuxi1/danuxi1tablestyle.xml index 01f5f703..ac4da849 100644 --- a/data/gfx/gui/table/danuxi1/danuxi1tablestyle.xml +++ b/data/gfx/gui/table/danuxi1/danuxi1tablestyle.xml @@ -46,8 +46,10 @@ - - + + + + diff --git a/data/gfx/gui/table/danuxi1/playerBottomSeatActive.png b/data/gfx/gui/table/danuxi1/playerBottomSeatActive.png new file mode 100644 index 0000000000000000000000000000000000000000..66421b36603a8ddc7dde178edbfc182a5c6d5a67 GIT binary patch literal 2416 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 diff --git a/data/gfx/gui/table/danuxi1/playerTopSeatActive.png b/data/gfx/gui/table/danuxi1/playerTopSeatActive.png new file mode 100644 index 0000000000000000000000000000000000000000..35cacc85d8221f6918151e1bb16676629b4ee1b8 GIT binary patch literal 2414 zcmcJRX;c!5631}^6~kM(CQ4;dS-51WsVR|5mV23dW@eg7mU>;eEDF!m3VUYp#7Mj4 z5{b09T}{AlX}O-vT+qbaaz}wAK)Ck(eRyBq|D2iM%$)f)bLLE*uebXa%^jKm0AP#9 zDHs1uwr<)Tb>OBaLta{LLMhqb9R*dPK3C(fmhER8K(s0wZNbF2 z5O=;LbVd9uSI6$msnsQPUl!?gz|G{BND5r<3Oy4YX0K8;@RQLet%br+;svAD3(jUT zs);O7wKYrUjkVhi@;;<C$YLG^N`d~+FoC^AQy_OT^j#GTP47?!?}u|82b)n zr>wAF7jT&l|9YcLQ<5SUxjORWUt|n(V?Ndjl^Z{cJ9f6Y?^O@?` zr+I#0F2oHo8cj0{{0&EvsHfMk6J7YV^o<2f*YS;>Z8TjbjHkvYQ{bEnr#LXskTQn& zn6SHoZS>%DZBw_>v71fp8ckzYlWQZ4f`CDVW^#z7##MrM5w_m&Df7WGAgOMxrU}D3TA)UAAsp1&_~(gfn|&p9e0}CEOKW;x zu3kyaXJEJEy>_PEA|lDO!7*z(HT0n^57)V|u}fzqa+J*=>@ydMq*eiPm5cjk#!4wk zky3K{dhnb?S{VAs#yL?i?vyu28bJ-TJ@*EGrN0%nrn6Z}*t2yo=&O3>l1cLlZ_WU_ zpEnDzP?2dt?ZgM#l6iiNH5&y@8m1#)%!pKD@n=*N=m}%K518d(S3R-5?JEmUX1g*Z zb$X3&lls5)!z%U4n3fmXKC|md##FQEdtq||!?#X&?=lC|--}yzB04I^8nqGv=Y9^M zZnQ`)7{>7jEl>`g7Isvp(vp9tUaJ7UzoMHd#kYq6TupkPIJ<#O!OMJdrIuIru0UA> z&&Pki>=22a3l$eWySxerp{{7+Jfn;Z4H~LHNrN+&eah15%tSXndCghaDMUrGZ*wyE zXibG4-MBOtis`S3(MqVZ{Cb+((DTGPd^Kt5_+6!y`KgU8Z;sDd`+PH;WwCRy$SUHV z4bfx#_B%YCW6K-}PfXF2>+(+<4pZKt1Gg2R%ajMFj!T#lto6MYvsO*OFtuw`Y4Y#Y zqyFz$AF6Eip%lyKy-Byu4C)$+te=UYQ?tsOI}&g1%epKcd|Dx1NQk)Y`9Ik*yXe~Rg)c8YW2U}=hay+}zG<{~Gat8$JsLgL{!xGzp6@ZB8Z(cxui07zT|NJiFCNHGPG* zsA=xl6&D1puy)zVo!^-=I#8WlS4(EIyt!Fm5LVfh%4+gf3IPP_rQ-8Qeoj&8AoHnl zBhJ^gdY@Yds=|3EJtJ)4=) zt52lHWWpGk8OV+T`^2YTI!k{w*0u*nww;TSpnJl{wEya!)Of;AD;W9s)VMU5m<)Qf z8}l;}wOE*xr>H7^U{ z->m{LK>_l7VdOyR>n!W|i58Eg?qU>+!%>_U$5cNbH2DY<^iw2KKgb(v`gq`I(dyAD z4Qj9Qz!7xRedNza!t#N~VN0hE2&qH!qkU^au8Fod$^eF1g;eNiQk7Sh9)PE_w#tT@ zhYm$#`^{?4l;~SJdrL*p7K@^h$LBfYPk6Y!vW22D-i+qT%CNzL$QtQnV@nJ#9~bg) z?W#fAO|03dnnZC3A&}2 - - + + + +
diff --git a/src/gui/qt/gametable/gametableimpl.cpp b/src/gui/qt/gametable/gametableimpl.cpp index 97343af1..c56644af 100755 --- a/src/gui/qt/gametable/gametableimpl.cpp +++ b/src/gui/qt/gametable/gametableimpl.cpp @@ -905,7 +905,7 @@ void gameTableImpl::refreshGroupbox(int playerID, int status) { userWidgetsArray[j]->show(); } } - myGameTableStyle->setPlayerSeatInActiveStyle(groupBoxArray[(*it_c)->getMyID()]); + myGameTableStyle->setPlayerSeatInactiveStyle(groupBoxArray[(*it_c)->getMyID()]); } //Groupbox verdunkeln wenn der Spiele inactive ist. @@ -919,7 +919,7 @@ void gameTableImpl::refreshGroupbox(int playerID, int status) { holeCardsArray[0][0]->signalFastFlipCards(FALSE); holeCardsArray[0][1]->signalFastFlipCards(FALSE); } - myGameTableStyle->setPlayerSeatInActiveStyle(groupBoxArray[(*it_c)->getMyID()]); + myGameTableStyle->setPlayerSeatInactiveStyle(groupBoxArray[(*it_c)->getMyID()]); } } } @@ -938,7 +938,7 @@ void gameTableImpl::refreshGroupbox(int playerID, int status) { holeCardsArray[0][0]->signalFastFlipCards(FALSE); holeCardsArray[0][1]->signalFastFlipCards(FALSE); } - myGameTableStyle->setPlayerSeatInActiveStyle(groupBoxArray[playerID]); + myGameTableStyle->setPlayerSeatInactiveStyle(groupBoxArray[playerID]); } break; //active but fold @@ -949,7 +949,7 @@ void gameTableImpl::refreshGroupbox(int playerID, int status) { userWidgetsArray[j]->show(); } } - myGameTableStyle->setPlayerSeatInActiveStyle(groupBoxArray[playerID]); + myGameTableStyle->setPlayerSeatInactiveStyle(groupBoxArray[playerID]); } break; //active in action @@ -959,7 +959,7 @@ void gameTableImpl::refreshGroupbox(int playerID, int status) { break; //active not in action case 3: { - myGameTableStyle->setPlayerSeatInActiveStyle(groupBoxArray[playerID]); + myGameTableStyle->setPlayerSeatInactiveStyle(groupBoxArray[playerID]); } break; default: {} @@ -3212,7 +3212,7 @@ void gameTableImpl::refreshGameTableStyle() for (i=0; isetPlayerSeatInActiveStyle(groupBoxArray[i]); + myGameTableStyle->setPlayerSeatInactiveStyle(groupBoxArray[i]); } //Human player button myGameTableStyle->setButtonsStyle(pushButton_BetRaise, pushButton_CallCheck, pushButton_Fold, pushButton_AllIn, 0); diff --git a/src/gui/qt/styles/gametablestylereader.cpp b/src/gui/qt/styles/gametablestylereader.cpp index f98deec4..9bc2b5fb 100644 --- a/src/gui/qt/styles/gametablestylereader.cpp +++ b/src/gui/qt/styles/gametablestylereader.cpp @@ -152,8 +152,10 @@ void GameTableStyleReader::readStyleFile(QString file) { else if (itemsList->ValueStr() == "RadioButtonCheckedHover") { RadioButtonCheckedHover = currentDir+QString::fromUtf8(tempString1.c_str()); } else if (itemsList->ValueStr() == "RadioButtonUnchecked") { RadioButtonUnchecked = currentDir+QString::fromUtf8(tempString1.c_str()); } else if (itemsList->ValueStr() == "RadioButtonUncheckedHover") { RadioButtonUncheckedHover = currentDir+QString::fromUtf8(tempString1.c_str()); } - else if (itemsList->ValueStr() == "PlayerSeatInActive") { PlayerSeatInActive = currentDir+QString::fromUtf8(tempString1.c_str()); } - else if (itemsList->ValueStr() == "PlayerSeatActive") { PlayerSeatActive = currentDir+QString::fromUtf8(tempString1.c_str()); } + else if (itemsList->ValueStr() == "PlayerTopSeatInactive") { PlayerTopSeatInactive = currentDir+QString::fromUtf8(tempString1.c_str()); } + else if (itemsList->ValueStr() == "PlayerTopSeatActive") { PlayerTopSeatActive = currentDir+QString::fromUtf8(tempString1.c_str()); } + else if (itemsList->ValueStr() == "PlayerBottomSeatInactive") { PlayerBottomSeatInactive = currentDir+QString::fromUtf8(tempString1.c_str()); } + else if (itemsList->ValueStr() == "PlayerBottomSeatActive") { PlayerBottomSeatActive = currentDir+QString::fromUtf8(tempString1.c_str()); } else if (itemsList->ValueStr() == "Table") { Table = currentDir+QString::fromUtf8(tempString1.c_str()); } else if (itemsList->ValueStr() == "HandRanking") { HandRanking = currentDir+QString::fromUtf8(tempString1.c_str()); } else if (itemsList->ValueStr() == "ToolBoxBackground") { ToolBoxBackground = currentDir+QString::fromUtf8(tempString1.c_str()); } @@ -259,8 +261,10 @@ void GameTableStyleReader::readStyleFile(QString file) { if(RadioButtonCheckedHover == "") { wrongItems << "RadioButtonCheckedHover"; } if(RadioButtonUnchecked == "") { wrongItems << "RadioButtonUnchecked"; } if(RadioButtonUncheckedHover == "") { wrongItems << "RadioButtonUncheckedHover"; } - if(PlayerSeatActive == "") { wrongItems << "PlayerSeatActive"; } - if(PlayerSeatInActive == "") { wrongItems << "PlayerSeatInActive"; } + if(PlayerTopSeatActive == "") { wrongItems << "PlayerTopSeatActive"; } + if(PlayerTopSeatInactive == "") { wrongItems << "PlayerTopSeatInactive"; } + if(PlayerBottomSeatActive == "") { wrongItems << "PlayerBottomSeatActive"; } + if(PlayerBottomSeatInactive == "") { wrongItems << "PlayerBottomSeatInactive"; } if(Table == "") { wrongItems << "Table"; } if(HandRanking == "") { wrongItems << "HandRanking"; } if(ToolBoxBackground == "") { wrongItems << "ToolBoxBackground"; } @@ -418,14 +422,26 @@ void GameTableStyleReader::setVoteStringsStyle(QLabel *l) l->setStyleSheet("QLabel { color: #"+TabWidgetTextColor+"; font-size: 11px;}"); } -void GameTableStyleReader::setPlayerSeatInActiveStyle(QGroupBox *ps) +void GameTableStyleReader::setPlayerSeatInactiveStyle(QGroupBox *ps) { - ps->setStyleSheet("QGroupBox { border:none; background-image: url("+PlayerSeatInActive+") }"); + // check if seat is on top or bottom line + if(ps->objectName() == "groupBox2" || ps->objectName() == "groupBox1" || ps->objectName() == "groupBox0" || ps->objectName() == "groupBox9" || ps->objectName() == "groupBox8") { + ps->setStyleSheet("QGroupBox { border:none; background-image: url("+PlayerBottomSeatInactive+") }"); + } + else { + ps->setStyleSheet("QGroupBox { border:none; background-image: url("+PlayerTopSeatInactive+") }"); + } } void GameTableStyleReader::setPlayerSeatActiveStyle(QGroupBox *ps) { - ps->setStyleSheet("QGroupBox { border:none; background-image: url("+PlayerSeatActive+") }"); +// check if seat is on top or bottom line + if(ps->objectName() == "groupBox2" || ps->objectName() == "groupBox1" || ps->objectName() == "groupBox0" || ps->objectName() == "groupBox9" || ps->objectName() == "groupBox8") { + ps->setStyleSheet("QGroupBox { border:none; background-image: url("+PlayerBottomSeatActive+") }"); + } + else { + ps->setStyleSheet("QGroupBox { border:none; background-image: url("+PlayerTopSeatActive+") }"); + } } void GameTableStyleReader::setBetValueInputStyle(QLineEdit *bv) diff --git a/src/gui/qt/styles/gametablestylereader.h b/src/gui/qt/styles/gametablestylereader.h index 2f68a5e2..84506d9f 100644 --- a/src/gui/qt/styles/gametablestylereader.h +++ b/src/gui/qt/styles/gametablestylereader.h @@ -61,7 +61,7 @@ public: void setTableBackground(gameTableImpl*); void setCardHolderStyle(QLabel*, int /*bero*/); void setPlayerSeatActiveStyle(QGroupBox*); - void setPlayerSeatInActiveStyle(QGroupBox*); + void setPlayerSeatInactiveStyle(QGroupBox*); void setToolBoxBackground(QGroupBox*); //set fonts + colors @@ -144,8 +144,10 @@ private: QString RadioButtonCheckedHover; QString RadioButtonUnchecked; QString RadioButtonUncheckedHover; - QString PlayerSeatInActive; - QString PlayerSeatActive; + QString PlayerTopSeatInactive; + QString PlayerTopSeatActive; + QString PlayerBottomSeatInactive; + QString PlayerBottomSeatActive; QString Table; QString HandRanking; QString ToolBoxBackground;