From 72e7d367d78970f37c9c3e76074be8dc6ebc5401 Mon Sep 17 00:00:00 2001 From: doitux Date: Thu, 17 May 2007 23:28:36 +0000 Subject: [PATCH] optional blind buttons --- src/config/configfile.cpp | 3 +- src/gui/qt/mainwindow/mainwindowimpl.cpp | 27 +++- src/gui/qt/resources.qrc | 2 + .../qt/resources/graphics/bigblindPuck.png | Bin 0 -> 3686 bytes .../qt/resources/graphics/smallblindPuck.png | Bin 0 -> 4099 bytes src/gui/qt/settingsdialog.ui | 129 +++++++++--------- .../qt/settingsdialog/settingsdialogimpl.cpp | 2 + 7 files changed, 96 insertions(+), 67 deletions(-) create mode 100644 src/gui/qt/resources/graphics/bigblindPuck.png create mode 100644 src/gui/qt/resources/graphics/smallblindPuck.png diff --git a/src/config/configfile.cpp b/src/config/configfile.cpp index ddf871dd..a7a9d19d 100644 --- a/src/config/configfile.cpp +++ b/src/config/configfile.cpp @@ -39,7 +39,7 @@ ConfigFile::ConfigFile(int argc, char **argv) : noWriteAccess(0) if(strcmp(argv[i], "--nowriteaccess") == 0) { noWriteAccess = 1; } } // !!!! Revisionsnummer der Configdefaults !!!!! - configRev = 20; + configRev = 21; //standard defaults logOnOffDefault = "1"; @@ -131,6 +131,7 @@ ConfigFile::ConfigFile(int argc, char **argv) : noWriteAccess(0) configList.push_back(ConfigInfo("ShowIntro", CONFIG_TYPE_INT, "1")); configList.push_back(ConfigInfo("ShowFadeOutCardsAnimation", CONFIG_TYPE_INT, "1")); configList.push_back(ConfigInfo("ShowFlipCardsAnimation", CONFIG_TYPE_INT, "1")); + configList.push_back(ConfigInfo("ShowBlindButtons", CONFIG_TYPE_INT, "1")); configList.push_back(ConfigInfo("FlipsideTux", CONFIG_TYPE_INT, "1")); configList.push_back(ConfigInfo("FlipsideOwn", CONFIG_TYPE_INT, "0")); configList.push_back(ConfigInfo("FlipsideOwnFile", CONFIG_TYPE_STRING, "")); diff --git a/src/gui/qt/mainwindow/mainwindowimpl.cpp b/src/gui/qt/mainwindow/mainwindowimpl.cpp index a69c411b..3e5569e3 100755 --- a/src/gui/qt/mainwindow/mainwindowimpl.cpp +++ b/src/gui/qt/mainwindow/mainwindowimpl.cpp @@ -759,6 +759,10 @@ void mainWindowImpl::callSettingsDialog() { } else { flipside->load(":/cards/resources/graphics/cards/flipside.png"); } + if(mySession->getCurrentGame()) { + //blind buttons refresh + refreshButton(); + } int i,j; for (i=1; igetPlayerArray()[i]->getMyActiveStatus()) { if(activePlayersCounter > 2) { - if (currentHand->getPlayerArray()[i]->getMyButton()==1) { - buttonLabelArray[i]->setPixmap(dealerButton); - } - else { - buttonLabelArray[i]->setPixmap(onePix); + switch (currentHand->getPlayerArray()[i]->getMyButton()) { + + case 1 : buttonLabelArray[i]->setPixmap(dealerButton); + break; + case 2 : { + if ( myConfig->readConfigInt("ShowBlindButtons")) buttonLabelArray[i]->setPixmap(smallblindButton); + else { buttonLabelArray[i]->setPixmap(onePix); } + } + break; + case 3 : { + if (myConfig->readConfigInt("ShowBlindButtons")) buttonLabelArray[i]->setPixmap(bigblindButton); + else { buttonLabelArray[i]->setPixmap(onePix); } + } + break; + default: buttonLabelArray[i]->setPixmap(onePix); + } } else { diff --git a/src/gui/qt/resources.qrc b/src/gui/qt/resources.qrc index 9bf4833f..77eea62d 100755 --- a/src/gui/qt/resources.qrc +++ b/src/gui/qt/resources.qrc @@ -86,6 +86,8 @@ resources/graphics/toolboxFrameBG.png resources/graphics/logoChip3D.png resources/graphics/windowicon.png + resources/graphics/smallblindPuck.png + resources/graphics/bigblindPuck.png resources/guiv2/cardholder_03.png diff --git a/src/gui/qt/resources/graphics/bigblindPuck.png b/src/gui/qt/resources/graphics/bigblindPuck.png new file mode 100644 index 0000000000000000000000000000000000000000..83390ff9cfa5ce526336ebfdf8d9c0a66942227f GIT binary patch literal 3686 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 Ef^&QPZvX%Q literal 0 HcmV?d00001 diff --git a/src/gui/qt/resources/graphics/smallblindPuck.png b/src/gui/qt/resources/graphics/smallblindPuck.png new file mode 100644 index 0000000000000000000000000000000000000000..cf4e3a0a4ff478828b61b7ecec3f6d757b5636ec GIT binary patch literal 4099 zcmV+e5d80nP)l}SWFRCwCd zS$l9D)p`GR@B8Xr$+E47WgAOIwv6OAe&E_hHU&dGj+qc+f>TIK9VbkuVOkO>bV5k_ zATycJnb0zXnLK8o(3pqE9oi663Qi{AM}szp5t->f zUHfRyo_qG3-}jyG@jGV~n#Q$o=L7hwa8VS+X%u&^D^0kyqp|_@Ww_U)y~%sow!87S z50wvaf7iC@FzVfCCobGY+?`^3?Y8`HQ_p|=OBo)~CrHz}R0r@l*aU9-aK8u7D_udv zKT@uExe0SO0l)^#xQ}1A?GvQf&td*&@sL#{SOG{;1XN2Z%0f3~Qbf}NuBfU5Oi==; z>_g?dC^e4uJz>0sn0N_XPP3=Yl>oUCfd2;1-vPR3@oXxdwjIzm6y~hNWU8Dda79sf zqHbu3=zlw!Q*7!}m`d=|Kx66N2EdgJ$_Lo9dDp&K zDDv6+Bu38m9bmAEt#Y&=+{pquRq+HMTWLq1x6y42hE3V_RR9O*Fu-By0xP9`Q<=uS zXOf!tN0bTReW8t9uzrn;z6{uQ1V9wAEd}$^LHxW;AxoP!aDWvy-R?Pv1j{zbcBhWt z)d{9D(Omo*b4^8PnZY|iS$NBIqK_p#&*t3l6uNzFTEG|G`N$UlaGwj>aUi#@`b=yj9>S15M^XqZUgL)$W&O|3{)DGx;$ zu$Ul)VwI$ZB4ipG*?NiV!B~=ovPwC!be+^ljN8<36boD=JqQ2Nixdb&DHun4FifUa zAfuRLVFKY8_r-if$zSzj+M>qZRaDr+TS(tVl*7LyK!7 zv~k5U26(({kUs8BlTgUI=2}|bvXD;qX6V?tegF`N<=TsN% z*}jqP-+e2$MP7T4e)6mL$->I)*?u$1W^VuKq2E!*zaMAKE??A058b01FbL6-%z=_Kz+M(uSo?tmVyXmeEJ&`?7Ev@7IV(#%0a?EZ$FL z3tYc`(Hx8&^&(KouxT`>v1xLMlviFeXe=kq#AVRHCvcVlhXdS7ZcIimqmZTISRXz0 z{6Si`_xp6{y-qA?ly+=c&l(fgSqb!u8<)`8zA?&{oJop?#ZhPbCWq}luyYOf5!bp! z^&DB;$ezvRX|(?mmC{3qUb+`HM@CbW9_l46H%2z18cD4)PQPbYinj-}>@x zv}x56$`lM*dhJ~9Jet>NbL#@G&rHVXME4-AY^tG?=Z7d7a+d#w#r3qmwt?E38Yl;0 zoZYzkvR9=bz>W?U(x_=+w{X3!_yHsAsS|~Il5#v?O>n4(*paC|ObPGa+r~-l*rp+WOgbbO&DviQk6KJ2E zL}G$=b43j+q(Uhn3PMpjKxK<1Dr!1aK=622Wpu@oM*YJnx`4otfuC5W)_3NG$LGWO z4WaQ6IB$igahQyW!LubDNgzu@*%G%G;YcRZa{ypQr2vNI`YPKWB7uhD)Lm9rgm4Br z=3zFeg3jsPgkU1;2UX`yu>u-Q!Lke%Bp|kL=%;HMge*}(vs`XoDe$5=z|oQ<-);lr zLVAP2Dyl9w3O=%>ndAI~eZutKRVLYV3hiqEmo4fZ*>X0;mXjTsvp9E=MMV*$%Q8jX zaQZs<;u3g401sfQEapuxIduUEg^8Eo)fT&f$`OHt12I1`xSudD5;2z)24UHzBu$F9 zc~Hn9W^6zJ;|V0j#yDg;nbTE5PjHnnbv|}EnD13 zhyJINhVxmvbK45vE=r+a9{q^=(kTjnW%6p$_~u05^aB?Yc0+5ezH<}D-k`BZ_Ugy~gs{nUkFy8p*-(xcD)8WcgJzuvutR<<<4B7k!2boj6Y~|M~-dzG-uKKXBxONS z1FCQoU4~AZlT4w21fgr?drTjwSC4hmdT^E2#`^Isope4Op|ZOl!u562$ncQE5JLgZ z+CkOXNDF)drysarN2S8x`NN(UPcr!}-+6_ec;z_Fsji@V+grSY8cjE-@A4;97`TWn zS!Tk!wzN8h-u$4Kd3o#n*>a^6FG-0phWjsrHjmITJBK7!KAxu4`7qvUUzO>M5`CpaeZJc56b<3&kIjQ)&nm^j0ebt?B``+E#AYTUR5Qc*eeSFTJ#hOv-u1k8 z{4725`upJH1?KX)p_9NR@ClqQaQ7?$I|N#SO>N`iyC3^uARMn#;nDGEl!?~7nkoQ6 zfI`w@<&%Cs#&yY{R@U;}YJ zkLWU-7EI4#Rw($!P%6vk;yQ#WAs-ZqMZTNpFYpLl0-wZb`*-=m=*3=a_T?i7-ig;Q zTpFuguvKV9GYepKC3%WfezGMPpFe4hA7Ck0IH)a;;0m@b5An;%6?p_}oM;sWFT5r2 z;Kh{0SDLt47R)D&B4Sbg{I8yU&d80OC6~d8iTK!T{8NWJu{){PZ;CSB$N!#hJj?R+ z!)jxGfkQgvki=(Bc0OK|9Y#T}@?Ebz^#dcHKF@$X(3VFZ;L*S9Pic=lzyIL0qBxx-*n8nNA*K?yCE>A97)-o-ZgDcbaM855R^u_etKWn+!bKq9MJiJp102b@|owMX<^F(xX6?}(#9?S*`YGU3GOWZT1M0$_>e#} zXXCDQGg~(74n*R0<=<(Pasj5e$^iR(M`#=Aynp1(yZbNy_T^)~DA$W3J~a-z+42to zC%HYUk(#e}!6VKG=eF$46w-E9S zALu@*>A{w}AJ@;k_&7}$I5Soe9;L~M6k6f>M5L-VUcccB?TLow&4Flgei`s75BA4_ zo5jq#LzO>t_^`e^_0f?yGJ{Yp2}SKaBzYL7}5dzq=}5S z?D?+70YL!&#ou2waM$LO(sb&iAo1yb-2DTWA>;I@)U*&N15F$Lq}2J+6Q2pV8*L&| zE`-(;Qv7N(~7T9+jX4F`FSmrW7jVo*GQZ50;F< zhGcebs2h`MJS~%pIc>>518~0p5vlPCS>jTtu>4(qyktO{1ecc%n3EbWT@B#>3*i0) z7LeNZYh3XGw 6 - - - - - 75 - true - - - - Interface - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - Show flip-card animation - - - - Flipside of Cards @@ -159,34 +126,6 @@ p, li { white-space: pre-wrap; } - - - - Show fade-out animation for non-winning cards - - - - - - - Show intro on startup - - - - - - - Qt::Horizontal - - - - - - - Show right toolbox (F11 to switch on/off) - - - @@ -201,6 +140,74 @@ p, li { white-space: pre-wrap; } + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + Show fade-out animation for non-winning cards + + + + + + + Qt::Horizontal + + + + + + + + 75 + true + + + + Interface + + + + + + + Show flip-card animation + + + + + + + Show intro on startup + + + + + + + Show right toolbox (F11 to switch on/off) + + + + + + + Show buttons for small blind and big blind + + + diff --git a/src/gui/qt/settingsdialog/settingsdialogimpl.cpp b/src/gui/qt/settingsdialog/settingsdialogimpl.cpp index 556eb98d..fbb43635 100644 --- a/src/gui/qt/settingsdialog/settingsdialogimpl.cpp +++ b/src/gui/qt/settingsdialog/settingsdialogimpl.cpp @@ -104,6 +104,7 @@ void settingsDialogImpl::exec() { checkBox_showIntro->setChecked(myConfig->readConfigInt("ShowIntro")); checkBox_showFadeOutCardsAnimation->setChecked(myConfig->readConfigInt("ShowFadeOutCardsAnimation")); checkBox_showFlipCardsAnimation->setChecked(myConfig->readConfigInt("ShowFlipCardsAnimation")); + checkBox_showBlindButtons->setChecked(myConfig->readConfigInt("ShowBlindButtons")); radioButton_flipsideTux->setChecked(myConfig->readConfigInt("FlipsideTux")); radioButton_flipsideOwn->setChecked(myConfig->readConfigInt("FlipsideOwn")); if(radioButton_flipsideOwn->isChecked()) { @@ -232,6 +233,7 @@ void settingsDialogImpl::isAccepted() { myConfig->writeConfigInt("ShowIntro", checkBox_showIntro->isChecked()); myConfig->writeConfigInt("ShowFadeOutCardsAnimation", checkBox_showFadeOutCardsAnimation->isChecked()); myConfig->writeConfigInt("ShowFlipCardsAnimation", checkBox_showFlipCardsAnimation->isChecked()); + myConfig->writeConfigInt("ShowBlindButtons", checkBox_showBlindButtons->isChecked()); myConfig->writeConfigInt("FlipsideTux", radioButton_flipsideTux->isChecked()); myConfig->writeConfigInt("FlipsideOwn", radioButton_flipsideOwn->isChecked());