From 6f5a5ff035fc9b4b0a0ac246a1b20e9e61076a37 Mon Sep 17 00:00:00 2001 From: doitux Date: Thu, 9 Apr 2009 20:35:56 +0000 Subject: [PATCH] move action pics --- .../actionpics}/action_allin.png | Bin .../actionpics}/action_bet.png | Bin .../actionpics}/action_call.png | Bin .../actionpics}/action_check.png | Bin .../actionpics}/action_fold.png | Bin .../actionpics}/action_raise.png | Bin .../actionpics}/action_winner.png | Bin .../gfx/gui/table/danuxi1/action_template.xcf | Bin 21578 -> 0 bytes .../gui/table/danuxi1/danuxi1tablestyle.xml | 14 +- data/gfx/gui/table/default/action_allin.png | Bin 1383 -> 0 bytes data/gfx/gui/table/default/action_bet.png | Bin 1223 -> 0 bytes data/gfx/gui/table/default/action_call.png | Bin 1259 -> 0 bytes data/gfx/gui/table/default/action_check.png | Bin 2059 -> 0 bytes data/gfx/gui/table/default/action_fold.png | Bin 1309 -> 0 bytes data/gfx/gui/table/default/action_raise.png | Bin 1694 -> 0 bytes .../gui/table/default/defaulttablestyle.xml | 16 +- src/config/configfile.cpp | 3 +- src/gui/qt/settingsdialog.ui | 22 +- .../qt/settingsdialog/settingsdialogimpl.cpp | 2 + src/gui/qt/styles/gametablestylereader.cpp | 260 ++++++++++-------- src/gui/qt/styles/gametablestylereader.h | 22 +- 21 files changed, 184 insertions(+), 155 deletions(-) rename data/gfx/gui/{table/danuxi1 => misc/actionpics}/action_allin.png (100%) rename data/gfx/gui/{table/danuxi1 => misc/actionpics}/action_bet.png (100%) rename data/gfx/gui/{table/danuxi1 => misc/actionpics}/action_call.png (100%) rename data/gfx/gui/{table/danuxi1 => misc/actionpics}/action_check.png (100%) rename data/gfx/gui/{table/danuxi1 => misc/actionpics}/action_fold.png (100%) rename data/gfx/gui/{table/danuxi1 => misc/actionpics}/action_raise.png (100%) rename data/gfx/gui/{table/default => misc/actionpics}/action_winner.png (100%) delete mode 100644 data/gfx/gui/table/danuxi1/action_template.xcf delete mode 100644 data/gfx/gui/table/default/action_allin.png delete mode 100644 data/gfx/gui/table/default/action_bet.png delete mode 100644 data/gfx/gui/table/default/action_call.png delete mode 100644 data/gfx/gui/table/default/action_check.png delete mode 100644 data/gfx/gui/table/default/action_fold.png delete mode 100644 data/gfx/gui/table/default/action_raise.png diff --git a/data/gfx/gui/table/danuxi1/action_allin.png b/data/gfx/gui/misc/actionpics/action_allin.png similarity index 100% rename from data/gfx/gui/table/danuxi1/action_allin.png rename to data/gfx/gui/misc/actionpics/action_allin.png diff --git a/data/gfx/gui/table/danuxi1/action_bet.png b/data/gfx/gui/misc/actionpics/action_bet.png similarity index 100% rename from data/gfx/gui/table/danuxi1/action_bet.png rename to data/gfx/gui/misc/actionpics/action_bet.png diff --git a/data/gfx/gui/table/danuxi1/action_call.png b/data/gfx/gui/misc/actionpics/action_call.png similarity index 100% rename from data/gfx/gui/table/danuxi1/action_call.png rename to data/gfx/gui/misc/actionpics/action_call.png diff --git a/data/gfx/gui/table/danuxi1/action_check.png b/data/gfx/gui/misc/actionpics/action_check.png similarity index 100% rename from data/gfx/gui/table/danuxi1/action_check.png rename to data/gfx/gui/misc/actionpics/action_check.png diff --git a/data/gfx/gui/table/danuxi1/action_fold.png b/data/gfx/gui/misc/actionpics/action_fold.png similarity index 100% rename from data/gfx/gui/table/danuxi1/action_fold.png rename to data/gfx/gui/misc/actionpics/action_fold.png diff --git a/data/gfx/gui/table/danuxi1/action_raise.png b/data/gfx/gui/misc/actionpics/action_raise.png similarity index 100% rename from data/gfx/gui/table/danuxi1/action_raise.png rename to data/gfx/gui/misc/actionpics/action_raise.png diff --git a/data/gfx/gui/table/default/action_winner.png b/data/gfx/gui/misc/actionpics/action_winner.png similarity index 100% rename from data/gfx/gui/table/default/action_winner.png rename to data/gfx/gui/misc/actionpics/action_winner.png diff --git a/data/gfx/gui/table/danuxi1/action_template.xcf b/data/gfx/gui/table/danuxi1/action_template.xcf deleted file mode 100644 index 5a86581087edb8a3a6f2376e0b710a1413c112b6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 21578 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 diff --git a/data/gfx/gui/table/danuxi1/danuxi1tablestyle.xml b/data/gfx/gui/table/danuxi1/danuxi1tablestyle.xml index 1f79387b..945f6d61 100644 --- a/data/gfx/gui/table/danuxi1/danuxi1tablestyle.xml +++ b/data/gfx/gui/table/danuxi1/danuxi1tablestyle.xml @@ -11,13 +11,13 @@ - - - - - - - + + + + + + + diff --git a/data/gfx/gui/table/default/action_allin.png b/data/gfx/gui/table/default/action_allin.png deleted file mode 100644 index f99507e24a56c4028a7d5e19899c40ecbe77590a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1383 zcmV-t1(^DYP)|9A1Vvh_80&F03CEiSad^g zZEa<4bO1wgWnpw>WFU8GbZ8({Xk{QrNlj4iWF>9@00hrTL_t(o!|j-BY!p=#$A2@k zv$L;mcl+4V($Y;s3lw5Y2_RyMfUUelgF!18frudy5{)rN6J6tK2ng|QVoZ!d6k|wD z)EJ3~Knqv_F)0)RiWJhcXwojsp()EgTIB92E(U!Q7{bWe80 zzM1UV=qbLCMsdXzaF5=h! zoQOxZKQ_%=LjwRAESF~7UNe_(u{kW4*+c*n+o=TMJ6-~E*^NWS!3{(V3yYPL97jc> zO3cq~ojwjkn3Y=;;Vq5p0G4 zRbdx7Oik2n?{Q6?&4Z$YC7;YJh4g$Xeh(6<B{(WZc<(mhAgXT z@m}etoAqR}hh}0N<1+5FbJIskWE7z#-|Nn5;vgWgh;%A&0gcp>VJR#(*y73AaENVO zYcXMh5N|6lvV-S%83AacjWi3{3C|Ia$-HV3`v?O@mI0Z}1Nu2cge6M$Klt_}l|yYi z;W(?(s6<9$5=Nk(COl0! z)+Lj(>-hx@xH_zO>f(!kA(GFQp?(R*F{xii>JeAoe3SeW{+mAB&oiXN71eO#9U7^q zj0HwW#4;^wuFBV_z+F79*XwYCtw0lpSrJ$EJaylT*JDLBl|Gm^ZbVX7<)oaZ0Wh+Z=qN_gYm^z1vWsUl&^g!z-rPnM>Nk!kWQ8SNausg)kVH5sr3R zm$vJ4s_-*2BPX`QRhR)D_V->a!j@SWWw zkxmK%pwWll8yzeoapKfIX^`KMHC3s23jwCg^$w p@OgWazg3b*B8eoDNaFv9KLJs|9ARL^sNxc9703CEiSad^g zZEa<4bO1wgWnpw>WFU8GbZ8({Xk{QrNlj4iWF>9@00b{dL_t(o!|j(@OdNF_$3HWB zvIT}^DU=0D2|W-R>1ioit42+0+Mp&ThLofxHpZjzNUM!Ct67g1ZG!csQ63D&rxw%H zXxgR_dQcB)0BtZUEON8JF4)~=_M9Cb*pj75;{#0=lleSN@}J*#^2z`B{RcEOG&D3c zG!T{=;1DsTq^N|Q>iZ59pBtUI|nTPHw59hz|;iL^KqOB2yAsk)@RTohXv zNQui8iu4cY%eQwm-8jI7yVOYq2Y1_1Xv3FI5z#0FIK$;dff7|5W27)Mm_y@6ciKLK083J<*OM%$%Ip-^mskDo% z;S>gZe9C3uCR41;wcM9ccYpnw6-L|)qo;_+vZfnG_7>+!j35IbGl7LXDh!!*-A$ZN zyNH<$m{53>%RrboMqSREH8#m~kuR7gihzk)UZXnC$XPzb13(*Hh`_hx=uHL7U}?$x zj)7S&0#HF71=QK2e8Sg+Fj7dE2~N{ZBM&miIN@a7{LDlVmUM>RGm#-)ML=d0uydHz zh?r>O8$w7N;z@!ua+N+#P{S6Ea*iILnthmnVuB>%%RnT|UklGB5-0#P69lR`fCV_j zPsHe?lN}V|q6gT(OX!FYQwIib{k9B5R?&ct5LfBuZyZ?JLzG?s204~oMhXzcMGd-z zb(ElQY^*&v<-HJhF9VT6j$k5A2S?~*nilpDVZJepB{%l`=M01vRVoDC{hu+2e<|Jl zo{8L!E5k+~-~udI0N71KY8R#IjvCwc%CmC6_jAX2XKa~>#JQHdu;c1pZ@;Kk)B0@J{ML-mF z>FXm2%xp;s5s)aSmQBRes~6<~UaU7)(#)?6qasnkHg==X6;ceF^e6d_A!0x#peB#( zbclEcM=Gn{zC$gJthhXXv51N3Q^=lr>FN+bRu-TqU1f@?PJ)h z`u>!I>H9-`c-_&Qd@*&qN9F0Mo4yXNIp@G(6dqc+ujmm=nNdPe!jZ9{d$P;h&UM1< z%zvt2vpHK70DKc;O`-G7c$!4Ok&k&%ib9xMsmG|pLcTFeGD1iR%J`XeMv^0DtQeBj lGBZvE4Gj$q4Gj$q;9qb$fwLe+rkDT#002ovPDHLkV1oHDA$0%% diff --git a/data/gfx/gui/table/default/action_call.png b/data/gfx/gui/table/default/action_call.png deleted file mode 100644 index 5566174e314f582c01c1efec67335db8b83631cf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1259 zcmV|9AUaOJ%s>DD03CEiSad^g zZEa<4bO1wgWnpw>WFU8GbZ8({Xk{QrNlj4iWF>9@00dJ>L_t(o!|j+`Y!p=(fWNuy z?(C)8ZoA#W0xeCY+lG57Ek#3&G+u}?3P~e~FB-hTgNc$7O$Hrr59q6((Nv#?cTaGv*SbS8~VUPx)1Zc&iPNym-CU3R z#s=X|O{BUhK_-ET43?!WB zW`BC%V*H)<&Ra%ARvcbi8zln-DZ;|wDj*Z$%FQ3QYTw=7O60sWB;k?z4;Rl<=;Azo zk;FxqI;q7MY5ZxQ`m+|lMUcPLH9|W*z)qe4{^TiO4sTN>6S&>A(!u!k*_EzsnSYc~EB}nL8k0FigP$8)O;e7dnM?KIktfk@=<0QKrjMIdydD6T7s_pdLB*W$YodYFS%(sF^3Y2R9~{ zd6(<_%|SE@?Tjdjm|zNk5DpSi{VIT_b5=c1?dbaDq1VVVP8yRSEgS;6NZ~0k5!193 zM3^a~vd`fl4WK$$DmMCy4Z1nZ1!81@7ywfw3QlBf!U$6Yz%Vi9`ujGiUx0IgV@LhN zC8Y}kCwYYdES$(Nb4yrQ1(#ZV!_hSrE9nAm@DBB-G%o^I5i@<|S(!ph*nU}bN3@pL{C`8Bs z71ON_4M2#Zyb3|S?-7UhjmVbB0>9)yCxL<+gJf)fYW^?P%_Vw{5}3vejO% z#pI22zv7l;u&kRSL#M0m^_K|(7{*X{W}@v+{ zEIG-jHVLYOkh{WPX6434^hqQ{z#>DOAT9(TM;x8dOoHo-Xc_xAij9qpjg5^B`~#HP Vf(kHiY;ynr002ovPDHLkV1jo|H0J;S diff --git a/data/gfx/gui/table/default/action_check.png b/data/gfx/gui/table/default/action_check.png deleted file mode 100644 index 6f76e635bfc10a665e993d66907eeb86134c1712..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2059 zcmV+m2=w=fP)|9BnNW4MO6R*03CEiSad^g zZEa<4bO1wgWnpw>WFU8GbZ8({Xk{QrNlj4iWF>9@00(nPL_t(o!|j)8a8uV6$A9nX zX|ZfemSkJru#L@T17;~;Vh3;&XrZJO$|N`il9nu;2HJ##lF*QsSWJ^PZ9|z!%ZE-E z7~0aL+mKF@Ht_@~6g8L-aM*0{0(g;E*^+Io@AiX*htL@aQTnB$|NHXZyXV|{|M#4G z7Dyn01QJLffdr6lM_4uDAO#4~?HU4Aq0~6pAVHMCfOf<+6wg*vhdjq@m4Hwr*yyVN zpAbx9+kQQGgFiL)|`Hw3!mB`#Z#(F zoL2}V;iU3&O>6k9iKvA+HM7?h$PK(n6Wv6yFp(Kbd72s6$t%D-eu~YAIS$V4# zfHw4OXRU0u-k$m`i9B!3dZB!cUEa-pnhB1nW%6yl1%&VcBWP$T%JLnv=@ZAJ9W^l* zQ*}zJG?gL@3{kILiUwUGHXt;Nd&K6!n04d~QCO{`0wA~=eN(lEE>?sQ=O06)@0e!Q5eA^x*ED( zR^M=St1<=YYi%1c3Z0S(!2n&Fx5b=x{oPGnlCvT!PX~ZcwESM(U=YvBnxWACq%&JIPlI-S#O;v$ev8tr(fr-P>q71b67*~n19n9Z( zjwXz(W)psKx|Tz65K)yhr=ss-VAMEx>3k!+*A)Qu;E8!@v(uN~v2aw+#w$qG}YMxgKb?30xQ`M3^}H&U0*`Dpf1h(ZL=}Jb2S;G@o?3 z@Z(_B*xxfqn8_uV9$+8KDW4LWVx}GQmDb@- z^k(@uCyDYFZl;h)4;Sg@pd*jo`<=pVT-IA@yk^OT_x#1A;AA1O$DAFi^}AzKlYc2AmYLkV%**BY=fMeB>}m-xutC z=a4_H#!8js@wQzvD{^gSNr@>%2+})zwYMPC8S{t`$GS5OldQT}%sJ8j!4p~4a~5Tq zjp$;LD8dK>!>8(7o=vSTU!7}9LWzxp@kfWE4!vQt+T}{9u4#Tzw&B|L`l1Ja>Dh9# zd-6#;M7!<_Ig2yrn(_@+Ns5dNUmp1A%AvrS%rA|*Q;|Spp!?#lt>f}mn3F*;>~H;> zZx`7~tMivwrzPd;^qLm#4Yc)s*ijd(b)8o&hLt&Abj(T~uQQ_(IIvmGCOIs8!SFDB_*~j(KY|r|N@|i$6N90!k8VOZVhLWO&o!i`U_*{2 pCEv}9_yiJ2Ab|uDNZ|hq{{hwL?gp~UDN6tV002ovPDHLkV1gcbzT^M^ diff --git a/data/gfx/gui/table/default/action_fold.png b/data/gfx/gui/table/default/action_fold.png deleted file mode 100644 index 2e56d3bb309d0c669cc2b782432282ed238b677c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1309 zcmV+&1>*XNP)|9BQFR~duRXv03CEiSad^g zZEa<4bO1wgWnpw>WFU8GbZ8({Xk{QrNlj4iWF>9@00f0eL_t(o!|j+`Y*a-U$A9Ot zyWMWP>~33H3cUcO&=%IlSnz>B1%VjZ2zZHUd_WUJOhnWeHHIvD0uKaCOduG863~Vq z!8@QfLX?11LlA8hp#_>=C|kC4>0Y{*v*-BWwzLZ`7Set2{GVp#JO9l0n=>4DU1qZgKq%I7#P_z+GaTDgJat#q0-G6h0^vWK{4Xep|DKaP4h(zV`zs&Gk#3KK zlE)W&7b%fDn3mRgN}N7apaQAkr=xr^9C9sld!~t30f}mtx;D6za}xqWS;Z__`jVcs z<~$yg$}75N(0T`tBhPe>x3~@*B0Jk|yA?9!*~PQ016=IEA&JiM%#!hd$XQ~5ef*r( zJcor?1WaC0GE1fUOe{pXtaT(+MFWW8!v`b)0k0rP@)YJ_PF4!U=mip}<4S0}AfqI4 zYiM&2(FLI@-{W|;pxlL-IQ`o7_P~DczVx-IOV;K2uN2f5TTJK_+=I>JEg_H6onK}Yvkl%Yp!>T1e!X=jkKyG`O=fVfyQrf!vsrr%&Q zO$?Gm!og~u78b2=#>|#mPfcdYsv^0CcWEVwg9eH-4H6!;!MG?zt4%ikPl zkNA*vw9Cd!(;3#&20$NMn3rjgE36wSd)P>fUHpPh4h_twnMR^CvlHdEjy|9b$mJ;> z<#{UD1~{-1pFj{_cVE@4t*J`CK5%JxQ&L)# zC%@f$f9-nfYs86Q!$g$+*f&l7W7ap_MUAOpX!V``xN22x#Ycilj2tw?)HbftJecg5 zD3IRHZKpJQz94{(zrAY*f#Hza*7eN5<7J*nbFB`OaE2p}h>Y+9GSLHh`h< zm4oW;^WP1uol-xkL?SX2yeRADEI<$5>^cx}!t|HkSx)JIJBtR!YpAt2Gr5G|~$dDmJ|9AZZpW1y4 TlQ2u000000NkvXXu0mjf%(_k- diff --git a/data/gfx/gui/table/default/action_raise.png b/data/gfx/gui/table/default/action_raise.png deleted file mode 100644 index 8051bbf9adec1de191cb16c67ce9a5718c496af4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1694 zcmV;P24VS$P)|9A`G)LJ6iw%03CEiSad^g zZEa<4bO1wgWnpw>WFU8GbZ8({Xk{QrNlj4iWF>9@00st0L_t(o!|m8_Y?b91$MMhk z*VFd2r7e`!B9)4va}oqbK&MeB6WlT(P8}I8W78MTWzo$^+)V6T=VpRg<_mnGQ@0ua zC7U|g)SzVkiEhp)1+fAOiUKXPrJSDj^z{6F_5xHivZ1l@#m@KT_1wSbd4A7zU)O!# z4`s@fDO09Q8KH^2eP_rtC#ystZA;hSL_H~bj4u>*cH-iiNgqUV`PBa6M$dKi{@3qx z+_bePFG^GpNTz$9?7Xro|G65en0NAB3#V6vj|c_%QeSSz=fEZGH*B8Kxw>ok<8`sgb>WS!K%=|W zN5T!C^VEt}MD5Y_Az_Uc%UxSJcIoI7oqrXntS+?$&1x}fXQ{WC?0g^;I08n5V68?Sx3}Dw zyZ2DGCLkkWvn<7#9@mGYoOu;0w)v@j@(PG*@O3|oH!STwy}^rqghscUsi}Fl)t;7B z5*9PrN-JZtSH(joR&`sgTMiZGyT*d{=uO?J&UMFTCHiTL>%CM?6&HvY&@E6eZp?sQ zTlKmre11I{yD%yz?4avCB~YzF&Y<09S!qEvx4XrluzDf=cH87;XG}lv;~g8lJ0V5_ zy}G46?jS-|NPDF)H(F_xMVeI@_qe+hZ17EsKce32MS+>FHcQ^1XVnYgZMPT{bDPHb7#174H!kV|wp$6HF)TaVdV?Kw)L*zP%NkEpmW`;xrrx~#F=GoCr(T7XdT zGc{5YNSKePW5YoBPP@$gN+RBHo@?Z+lT>4=RUWhrtwN|XAN8s*)e6sh(+I+* zS?*GCPp6t=7gx2r-%|#aL`}2E*=l6RM+%>8f&L$?Id{$@r`EmKO8W{AUl$r(`rG!J z_ab9KK~0FXgplCPi$ta6 zCB)>7>rZw6dEd{w20p`#jCQ|qOJ;dh4dnBCUU7ereR<}g}YU)7`#ipAcZ%wXGTmDLDFhj(qLu5X&1I4Rx|kB03xo=$Dq``p2MZtUrNsr&7{ z%Z@v%rlYDdtWS10y<=$0-e(I>9-EC%aAxnU)+Ba#o(**+>8#Nta(Lg8lnozO*HoFv zj->{R85M`)2jxr=MIf(VSVO3`uBNgs94+QXl9?d`U75qD`|8lt>c*N$p=dFa8qN+& oN_7S0-zsIwlqplD%>N_*0eV75?bN`IX#fBK07*qoM6N<$f-CktnE(I) diff --git a/data/gfx/gui/table/default/defaulttablestyle.xml b/data/gfx/gui/table/default/defaulttablestyle.xml index 4c44de75..2d686e02 100644 --- a/data/gfx/gui/table/default/defaulttablestyle.xml +++ b/data/gfx/gui/table/default/defaulttablestyle.xml @@ -15,13 +15,6 @@ - - - - - - - @@ -57,7 +50,14 @@ - + + + + + + + + diff --git a/src/config/configfile.cpp b/src/config/configfile.cpp index d8acf1bc..10cd5f59 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 = 64; + configRev = 65; //standard defaults logOnOffDefault = "1"; @@ -139,6 +139,7 @@ ConfigFile::ConfigFile(char *argv0, bool readonly) : noWriteAccess(readonly) configList.push_back(ConfigInfo("ShowFlipCardsAnimation", CONFIG_TYPE_INT, "1")); configList.push_back(ConfigInfo("ShowBlindButtons", CONFIG_TYPE_INT, "1")); configList.push_back(ConfigInfo("ShowCardsChanceMonitor", CONFIG_TYPE_INT, "1")); + configList.push_back(ConfigInfo("DontTranslateInternationalPokerStringsFromStyle", CONFIG_TYPE_INT, "0")); configList.push_back(ConfigInfo("AntiPeekMode", CONFIG_TYPE_INT, "0")); configList.push_back(ConfigInfo("AlternateFKeysUserActionMode", CONFIG_TYPE_INT, "0")); configList.push_back(ConfigInfo("EnableBetInputFocusSwitch", CONFIG_TYPE_INT, "0")); diff --git a/src/gui/qt/settingsdialog.ui b/src/gui/qt/settingsdialog.ui index f30b5471..5b567793 100644 --- a/src/gui/qt/settingsdialog.ui +++ b/src/gui/qt/settingsdialog.ui @@ -212,13 +212,6 @@ - - - - Show buttons for small blind and big blind - - - @@ -240,6 +233,20 @@ + + + + Show buttons for small blind and big blind + + + + + + + Don't translate poker strings like check, call, raise from game table style + + + @@ -3399,7 +3406,6 @@ p, li { white-space: pre-wrap; } checkBox_showRightToolbox checkBox_showFadeOutCardsAnimation checkBox_alternateFKeysUserActionMode - checkBox_showBlindButtons checkBox_enableBetInputFocusSwitch radioButton_flipsideTux radioButton_flipsideOwn diff --git a/src/gui/qt/settingsdialog/settingsdialogimpl.cpp b/src/gui/qt/settingsdialog/settingsdialogimpl.cpp index 39b33377..5b1ce317 100644 --- a/src/gui/qt/settingsdialog/settingsdialogimpl.cpp +++ b/src/gui/qt/settingsdialog/settingsdialogimpl.cpp @@ -228,6 +228,7 @@ void settingsDialogImpl::exec() { checkBox_alternateFKeysUserActionMode->setChecked(myConfig->readConfigInt("AlternateFKeysUserActionMode")); checkBox_enableBetInputFocusSwitch->setChecked(myConfig->readConfigInt("EnableBetInputFocusSwitch")); checkBox_cardsChanceMonitor->setChecked(myConfig->readConfigInt("ShowCardsChanceMonitor")); + checkBox_dontTranslatePokerStrings->setChecked(myConfig->readConfigInt("DontTranslateInternationalPokerStringsFromStyle")); radioButton_flipsideTux->setChecked(myConfig->readConfigInt("FlipsideTux")); radioButton_flipsideOwn->setChecked(myConfig->readConfigInt("FlipsideOwn")); @@ -513,6 +514,7 @@ void settingsDialogImpl::isAccepted() { myConfig->writeConfigInt("ShowCardsChanceMonitor", checkBox_cardsChanceMonitor->isChecked()); myConfig->writeConfigInt("AntiPeekMode", checkBox_antiPeekMode->isChecked()); myConfig->writeConfigInt("AlternateFKeysUserActionMode", checkBox_alternateFKeysUserActionMode->isChecked()); + myConfig->writeConfigInt("DontTranslateInternationalPokerStringsFromStyle", checkBox_dontTranslatePokerStrings->isChecked()); myConfig->writeConfigInt("EnableBetInputFocusSwitch", checkBox_enableBetInputFocusSwitch->isChecked()); myConfig->writeConfigInt("FlipsideTux", radioButton_flipsideTux->isChecked()); myConfig->writeConfigInt("FlipsideOwn", radioButton_flipsideOwn->isChecked()); diff --git a/src/gui/qt/styles/gametablestylereader.cpp b/src/gui/qt/styles/gametablestylereader.cpp index 7fd9e314..2e85b7b4 100644 --- a/src/gui/qt/styles/gametablestylereader.cpp +++ b/src/gui/qt/styles/gametablestylereader.cpp @@ -117,13 +117,13 @@ void GameTableStyleReader::readStyleFile(QString file) { else if (itemsList->ValueStr() == "MaximumWindowHeight") { MaximumWindowHeight = QString::fromUtf8(tempString1.c_str()); } // PICS else if (itemsList->ValueStr() == "Preview") { Preview = currentDir+QString::fromUtf8(tempString1.c_str()); } - else if (itemsList->ValueStr() == "ActionAllIn") { ActionAllIn = currentDir+QString::fromUtf8(tempString1.c_str()); } - else if (itemsList->ValueStr() == "ActionRaise") { ActionRaise = currentDir+QString::fromUtf8(tempString1.c_str()); } - else if (itemsList->ValueStr() == "ActionBet") { ActionBet = currentDir+QString::fromUtf8(tempString1.c_str()); } - else if (itemsList->ValueStr() == "ActionCall") { ActionCall = currentDir+QString::fromUtf8(tempString1.c_str()); } - else if (itemsList->ValueStr() == "ActionCheck") { ActionCheck = currentDir+QString::fromUtf8(tempString1.c_str()); } - else if (itemsList->ValueStr() == "ActionFold") { ActionFold = currentDir+QString::fromUtf8(tempString1.c_str()); } - else if (itemsList->ValueStr() == "ActionWinner") { ActionWinner = currentDir+QString::fromUtf8(tempString1.c_str()); } + else if (itemsList->ValueStr() == "ActionAllInI18N") { ActionAllInI18N = currentDir+QString::fromUtf8(tempString1.c_str()); } + else if (itemsList->ValueStr() == "ActionRaiseI18N") { ActionRaiseI18N = currentDir+QString::fromUtf8(tempString1.c_str()); } + else if (itemsList->ValueStr() == "ActionBetI18N") { ActionBetI18N = currentDir+QString::fromUtf8(tempString1.c_str()); } + else if (itemsList->ValueStr() == "ActionCallI18N") { ActionCallI18N = currentDir+QString::fromUtf8(tempString1.c_str()); } + else if (itemsList->ValueStr() == "ActionCheckI18N") { ActionCheckI18N = currentDir+QString::fromUtf8(tempString1.c_str()); } + else if (itemsList->ValueStr() == "ActionFoldI18N") { ActionFoldI18N = currentDir+QString::fromUtf8(tempString1.c_str()); } + else if (itemsList->ValueStr() == "ActionWinnerI18N") { ActionWinnerI18N = currentDir+QString::fromUtf8(tempString1.c_str()); } else if (itemsList->ValueStr() == "BigBlindPuck") { BigBlindPuck = currentDir+QString::fromUtf8(tempString1.c_str()); } else if (itemsList->ValueStr() == "SmallBlindPuck") { SmallBlindPuck = currentDir+QString::fromUtf8(tempString1.c_str()); } else if (itemsList->ValueStr() == "DealerPuck") { DealerPuck = currentDir+QString::fromUtf8(tempString1.c_str()); } @@ -217,128 +217,146 @@ void GameTableStyleReader::readStyleFile(QString file) { // std::cout << "ÖLP" << itemsList->ValueStr() <<"§4s"<< itemsList->ValueStr()<<"§89"<< endl; } } - wrongItems.clear(); + + //check if style items are left and if pictures where not found and show warning + leftItems.clear(); + itemPicsLeft.clear(); // INFOS - if(StyleDescription == "") { wrongItems << "StyleDescription"; } + if(StyleDescription == "") { leftItems << "StyleDescription"; } // WINDOWS SETTINGS - if(IfFixedWindowSize == "") { wrongItems << "IfFixedWindowSize"; } - if(FixedWindowWidth == "") { wrongItems << "FixedWindowWidth"; } - if(FixedWindowHeight == "") { wrongItems << "FixedWindowHeight"; } - if(MinimumWindowWidth == "") { wrongItems << "MinimumWindowWidth"; } - if(MinimumWindowHeight == "") { wrongItems << "MinimumWindowHeight"; } - if(MaximumWindowWidth == "") { wrongItems << "MaximumWindowWidth"; } - if(MaximumWindowHeight == "") { wrongItems << "MaximumWindowHeight"; } + if(IfFixedWindowSize == "") { leftItems << "IfFixedWindowSize"; } + if(FixedWindowWidth == "") { leftItems << "FixedWindowWidth"; } + if(FixedWindowHeight == "") { leftItems << "FixedWindowHeight"; } + if(MinimumWindowWidth == "") { leftItems << "MinimumWindowWidth"; } + if(MinimumWindowHeight == "") { leftItems << "MinimumWindowHeight"; } + if(MaximumWindowWidth == "") { leftItems << "MaximumWindowWidth"; } + if(MaximumWindowHeight == "") { leftItems << "MaximumWindowHeight"; } // PICS - if(ActionAllIn == "") { wrongItems << "ActionAllIn"; } - if(ActionRaise == "") { wrongItems << "ActionRaise"; } - if(ActionBet == "") { wrongItems << "ActionBet"; } - if(ActionCall == "") { wrongItems << "ActionCall"; } - if(ActionCheck == "") { wrongItems << "ActionCheck"; } - if(ActionFold == "") { wrongItems << "ActionFold"; } - if(ActionWinner == "") { wrongItems << "ActionWinner"; } - if(BigBlindPuck == "") { wrongItems << "BigBlindPuck"; } - if(SmallBlindPuck == "") { wrongItems << "SmallBlindPuck"; } - if(DealerPuck == "") { wrongItems << "DealerPuck"; } - if(DefaultAvatar == "") { wrongItems << "DefaultAvatar"; } - if(CardHolderFlop == "") { wrongItems << "CardHolderFlop"; } - if(CardHolderTurn == "") { wrongItems << "CardHolderTurn"; } - if(CardHolderRiver == "") { wrongItems << "CardHolderRiver"; } - if(FoldButtonDefault == "") { wrongItems << "FoldButtonDefault"; } - if(FoldButtonHover == "") { wrongItems << "FoldButtonHover"; } - if(FoldButtonChecked == "") { wrongItems << "FoldButtonChecked"; } - if(FoldButtonCheckedHover == "") { wrongItems << "FoldButtonCheckedHover"; } - if(CheckCallButtonDefault == "") { wrongItems << "CheckCallButtonDefault"; } - if(CheckCallButtonHover == "") { wrongItems << "CheckCallButtonHover"; } - if(CheckCallButtonChecked == "") { wrongItems << "CheckCallButtonChecked"; } - if(CheckCallButtonCheckedHover == "") { wrongItems << "CheckCallButtonCheckedHover"; } - if(BetRaiseButtonDefault == "") { wrongItems << "BetRaiseButtonDefault"; } - if(BetRaiseButtonHover == "") { wrongItems << "BetRaiseButtonHover"; } - if(BetRaiseButtonChecked == "") { wrongItems << "BetRaiseButtonChecked"; } - if(BetRaiseButtonCheckedHover == "") { wrongItems << "BetRaiseButtonCheckedHover"; } - if(AllInButtonDefault == "") { wrongItems << "AllInButtonDefault"; } - if(AllInButtonHover == "") { wrongItems << "AllInButtonHover"; } - if(AllInButtonChecked == "") { wrongItems << "AllInButtonChecked"; } - if(AllInButtonCheckedHover == "") { wrongItems << "AllInButtonCheckedHover"; } - if(RadioButtonPressed == "") { wrongItems << "RadioButtonPressed"; } - if(RadioButtonChecked == "") { wrongItems << "RadioButtonChecked"; } - if(RadioButtonCheckedHover == "") { wrongItems << "RadioButtonCheckedHover"; } - if(RadioButtonUnchecked == "") { wrongItems << "RadioButtonUnchecked"; } - if(RadioButtonUncheckedHover == "") { wrongItems << "RadioButtonUncheckedHover"; } - 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"; } + if(ActionAllInI18N == "") { leftItems << "ActionAllInI18N"; } + else if(ActionAllInI18N != QString(currentDir+"NULL") && !QFile(ActionAllInI18N).exists()) { itemPicsLeft << "ActionAllInI18N = "+ActionAllInI18N; } + if(ActionRaiseI18N == "") { leftItems << "ActionRaiseI18N"; } + else if(ActionRaiseI18N != QString(currentDir+"NULL") && !QFile(ActionRaiseI18N).exists()) { itemPicsLeft << "ActionRaiseI18N = "+ActionRaiseI18N; } + if(ActionBetI18N == "") { leftItems << "ActionBetI18N"; } + else if(ActionBetI18N != QString(currentDir+"NULL") && !QFile(ActionBetI18N).exists()) { itemPicsLeft << "ActionBetI18N = "+ActionBetI18N; } + if(ActionCallI18N == "") { leftItems << "ActionCallI18N"; } + else if(ActionCallI18N != QString(currentDir+"NULL") && !QFile(ActionCallI18N).exists()) { itemPicsLeft << "ActionCallI18N = "+ActionCallI18N; } + if(ActionCheckI18N == "") { leftItems << "ActionCheckI18N"; } + if(ActionFoldI18N == "") { leftItems << "ActionFoldI18N"; } + if(ActionWinnerI18N == "") { leftItems << "ActionWinnerI18N"; } + if(BigBlindPuck == "") { leftItems << "BigBlindPuck"; } + if(SmallBlindPuck == "") { leftItems << "SmallBlindPuck"; } + if(DealerPuck == "") { leftItems << "DealerPuck"; } + if(DefaultAvatar == "") { leftItems << "DefaultAvatar"; } + if(CardHolderFlop == "") { leftItems << "CardHolderFlop"; } + if(CardHolderTurn == "") { leftItems << "CardHolderTurn"; } + if(CardHolderRiver == "") { leftItems << "CardHolderRiver"; } + if(FoldButtonDefault == "") { leftItems << "FoldButtonDefault"; } + if(FoldButtonHover == "") { leftItems << "FoldButtonHover"; } + if(FoldButtonChecked == "") { leftItems << "FoldButtonChecked"; } + if(FoldButtonCheckedHover == "") { leftItems << "FoldButtonCheckedHover"; } + if(CheckCallButtonDefault == "") { leftItems << "CheckCallButtonDefault"; } + if(CheckCallButtonHover == "") { leftItems << "CheckCallButtonHover"; } + if(CheckCallButtonChecked == "") { leftItems << "CheckCallButtonChecked"; } + if(CheckCallButtonCheckedHover == "") { leftItems << "CheckCallButtonCheckedHover"; } + if(BetRaiseButtonDefault == "") { leftItems << "BetRaiseButtonDefault"; } + if(BetRaiseButtonHover == "") { leftItems << "BetRaiseButtonHover"; } + if(BetRaiseButtonChecked == "") { leftItems << "BetRaiseButtonChecked"; } + if(BetRaiseButtonCheckedHover == "") { leftItems << "BetRaiseButtonCheckedHover"; } + if(AllInButtonDefault == "") { leftItems << "AllInButtonDefault"; } + if(AllInButtonHover == "") { leftItems << "AllInButtonHover"; } + if(AllInButtonChecked == "") { leftItems << "AllInButtonChecked"; } + if(AllInButtonCheckedHover == "") { leftItems << "AllInButtonCheckedHover"; } + if(RadioButtonPressed == "") { leftItems << "RadioButtonPressed"; } + if(RadioButtonChecked == "") { leftItems << "RadioButtonChecked"; } + if(RadioButtonCheckedHover == "") { leftItems << "RadioButtonCheckedHover"; } + if(RadioButtonUnchecked == "") { leftItems << "RadioButtonUnchecked"; } + if(RadioButtonUncheckedHover == "") { leftItems << "RadioButtonUncheckedHover"; } + if(PlayerTopSeatActive == "") { leftItems << "PlayerTopSeatActive"; } + if(PlayerTopSeatInactive == "") { leftItems << "PlayerTopSeatInactive"; } + if(PlayerBottomSeatActive == "") { leftItems << "PlayerBottomSeatActive"; } + if(PlayerBottomSeatInactive == "") { leftItems << "PlayerBottomSeatInactive"; } + if(Table == "") { leftItems << "Table"; } + if(HandRanking == "") { leftItems << "HandRanking"; } + if(ToolBoxBackground == "") { leftItems << "ToolBoxBackground"; } // COLORS - if(FKeyIndicatorColor == "") { wrongItems << "FKeyIndicatorColor"; } - if(ChanceLabelPossibleColor == "") { wrongItems << "ChanceLabelPossibleColor"; } - if(ChanceLabelImpossibleColor == "") { wrongItems << "ChanceLabelImpossibleColor"; } - if(ChatLogTextColor == "") { wrongItems << "ChatLogTextColor"; } - if(ChatTextNickNotifyColor == "") { wrongItems << "ChatTextNickNotifyColor"; } - if(ChatLogBgColor == "") { wrongItems << "ChatLogBgColor"; } - if(ChatLogScrollBarBorderColor == "") { wrongItems << "ChatLogScrollBarBorderColor"; } - if(ChatLogScrollBarBgColor == "") { wrongItems << "ChatLogScrollBarBgColor"; } - if(ChatLogScrollBarHandleBorderColor == "") { wrongItems << "ChatLogScrollBarHandleBorderColor"; } - if(ChatLogScrollBarHandleBgColor == "") { wrongItems << "ChatLogScrollBarHandleBgColor"; } - if(ChatLogScrollBarArrowBorderColor == "") { wrongItems << "ChatLogScrollBarArrowBorderColor"; } - if(ChatLogScrollBarArrowBgColor == "") { wrongItems << "ChatLogScrollBarArrowBgColor"; } - if(LogWinnerMainPotColor == "") { wrongItems << "LogWinnerMainPotColor"; } - if(LogWinnerSidePotColor == "") { wrongItems << "LogWinnerSidePotColor"; } - if(LogPlayerSitsOutColor == "") { wrongItems << "LogPlayerSitsOutColor"; } - if(LogNewGameAdminColor == "") { wrongItems << "LogNewGameAdminColor"; } - if(TabWidgetBorderColor == "") { wrongItems << "TabWidgetBorderColor"; } - if(TabWidgetBgColor == "") { wrongItems << "TabWidgetBgColor"; } - if(TabWidgetTextColor == "") { wrongItems << "TabWidgetTextColor"; } - if(MenuBgColor == "") { wrongItems << "MenuBgColor"; } - if(MenuTextColor == "") { wrongItems << "MenuTextColor"; } - if(BreakLobbyButtonBgColor == "") { wrongItems << "BreakLobbyButtonBgColor"; } - if(BreakLobbyButtonTextColor == "") { wrongItems << "BreakLobbyButtonTextColor"; } - if(BreakLobbyButtonBgDisabledColor == "") { wrongItems << "BreakLobbyButtonBgDisabledColor"; } - if(BreakLobbyButtonTextDisabledColor == "") { wrongItems << "BreakLobbyButtonTextDisabledColor"; } - if(BreakLobbyButtonBgBlinkColor == "") { wrongItems << "BreakLobbyButtonBgBlinkColor"; } - if(BreakLobbyButtonTextBlinkColor == "") { wrongItems << "BreakLobbyButtonTextBlinkColor"; } - if(PlayerCashTextColor == "") { wrongItems << "PlayerCashTextColor"; } - if(PlayerBetTextColor == "") { wrongItems << "PlayerBetTextColor"; } - if(PlayerNickTextColor == "") { wrongItems << "PlayerNickTextColor"; } - if(BoardBigTextColor == "") { wrongItems << "BoardBigTextColor"; } - if(BoardSmallTextColor == "") { wrongItems << "BoardSmallTextColor"; } - if(SpeedTextColor == "") { wrongItems << "SpeedTextColor"; } - if(VoteButtonBgColor == "") { wrongItems << "VoteButtonBgColor"; } - if(VoteButtonTextColor == "") { wrongItems << "VoteButtonTextColor"; } - if(BetInputTextColor == "") { wrongItems << "BetInputTextColor"; } - if(BetInputBgColor == "") { wrongItems << "BetInputBgColor"; } - if(BetInputDisabledTextColor == "") { wrongItems << "BetInputDisabledTextColor"; } - if(BetInputDisabledBgColor == "") { wrongItems << "BetInputDisabledBgColor"; } - if(FoldButtonTextColor == "") { wrongItems << "FoldButtonTextColor"; } - if(FoldButtonCheckableTextColor == "") { wrongItems << "FoldButtonCheckableTextColor"; } - if(CheckCallButtonTextColor == "") { wrongItems << "CheckCallButtonTextColor"; } - if(CheckCallButtonCheckableTextColor == "") { wrongItems << "CheckCallButtonCheckableTextColor"; } - if(BetRaiseButtonTextColor == "") { wrongItems << "BetRaiseButtonTextColor"; } - if(BetRaiseButtonCheckableTextColor == "") { wrongItems << "BetRaiseButtonCheckableTextColor"; } - if(AllInButtonTextColor == "") { wrongItems << "AllInButtonTextColor"; } - if(AllInButtonCheckableTextColor == "") { wrongItems << "AllInButtonCheckableTextColor"; } - if(BetSpeedSliderGrooveBgColor == "") { wrongItems << "BetSpeedSliderGrooveBgColor"; } - if(BetSpeedSliderGrooveBorderColor == "") { wrongItems << "BetSpeedSliderGrooveBorderColor"; } - if(BetSpeedSliderHandleBgColor == "") { wrongItems << "BetSpeedSliderHandleBgColor"; } - if(BetSpeedSliderHandleBorderColor == "") { wrongItems << "BetSpeedSliderHandleBorderColor"; } + if(FKeyIndicatorColor == "") { leftItems << "FKeyIndicatorColor"; } + if(ChanceLabelPossibleColor == "") { leftItems << "ChanceLabelPossibleColor"; } + if(ChanceLabelImpossibleColor == "") { leftItems << "ChanceLabelImpossibleColor"; } + if(ChatLogTextColor == "") { leftItems << "ChatLogTextColor"; } + if(ChatTextNickNotifyColor == "") { leftItems << "ChatTextNickNotifyColor"; } + if(ChatLogBgColor == "") { leftItems << "ChatLogBgColor"; } + if(ChatLogScrollBarBorderColor == "") { leftItems << "ChatLogScrollBarBorderColor"; } + if(ChatLogScrollBarBgColor == "") { leftItems << "ChatLogScrollBarBgColor"; } + if(ChatLogScrollBarHandleBorderColor == "") { leftItems << "ChatLogScrollBarHandleBorderColor"; } + if(ChatLogScrollBarHandleBgColor == "") { leftItems << "ChatLogScrollBarHandleBgColor"; } + if(ChatLogScrollBarArrowBorderColor == "") { leftItems << "ChatLogScrollBarArrowBorderColor"; } + if(ChatLogScrollBarArrowBgColor == "") { leftItems << "ChatLogScrollBarArrowBgColor"; } + if(LogWinnerMainPotColor == "") { leftItems << "LogWinnerMainPotColor"; } + if(LogWinnerSidePotColor == "") { leftItems << "LogWinnerSidePotColor"; } + if(LogPlayerSitsOutColor == "") { leftItems << "LogPlayerSitsOutColor"; } + if(LogNewGameAdminColor == "") { leftItems << "LogNewGameAdminColor"; } + if(TabWidgetBorderColor == "") { leftItems << "TabWidgetBorderColor"; } + if(TabWidgetBgColor == "") { leftItems << "TabWidgetBgColor"; } + if(TabWidgetTextColor == "") { leftItems << "TabWidgetTextColor"; } + if(MenuBgColor == "") { leftItems << "MenuBgColor"; } + if(MenuTextColor == "") { leftItems << "MenuTextColor"; } + if(BreakLobbyButtonBgColor == "") { leftItems << "BreakLobbyButtonBgColor"; } + if(BreakLobbyButtonTextColor == "") { leftItems << "BreakLobbyButtonTextColor"; } + if(BreakLobbyButtonBgDisabledColor == "") { leftItems << "BreakLobbyButtonBgDisabledColor"; } + if(BreakLobbyButtonTextDisabledColor == "") { leftItems << "BreakLobbyButtonTextDisabledColor"; } + if(BreakLobbyButtonBgBlinkColor == "") { leftItems << "BreakLobbyButtonBgBlinkColor"; } + if(BreakLobbyButtonTextBlinkColor == "") { leftItems << "BreakLobbyButtonTextBlinkColor"; } + if(PlayerCashTextColor == "") { leftItems << "PlayerCashTextColor"; } + if(PlayerBetTextColor == "") { leftItems << "PlayerBetTextColor"; } + if(PlayerNickTextColor == "") { leftItems << "PlayerNickTextColor"; } + if(BoardBigTextColor == "") { leftItems << "BoardBigTextColor"; } + if(BoardSmallTextColor == "") { leftItems << "BoardSmallTextColor"; } + if(SpeedTextColor == "") { leftItems << "SpeedTextColor"; } + if(VoteButtonBgColor == "") { leftItems << "VoteButtonBgColor"; } + if(VoteButtonTextColor == "") { leftItems << "VoteButtonTextColor"; } + if(BetInputTextColor == "") { leftItems << "BetInputTextColor"; } + if(BetInputBgColor == "") { leftItems << "BetInputBgColor"; } + if(BetInputDisabledTextColor == "") { leftItems << "BetInputDisabledTextColor"; } + if(BetInputDisabledBgColor == "") { leftItems << "BetInputDisabledBgColor"; } + if(FoldButtonTextColor == "") { leftItems << "FoldButtonTextColor"; } + if(FoldButtonCheckableTextColor == "") { leftItems << "FoldButtonCheckableTextColor"; } + if(CheckCallButtonTextColor == "") { leftItems << "CheckCallButtonTextColor"; } + if(CheckCallButtonCheckableTextColor == "") { leftItems << "CheckCallButtonCheckableTextColor"; } + if(BetRaiseButtonTextColor == "") { leftItems << "BetRaiseButtonTextColor"; } + if(BetRaiseButtonCheckableTextColor == "") { leftItems << "BetRaiseButtonCheckableTextColor"; } + if(AllInButtonTextColor == "") { leftItems << "AllInButtonTextColor"; } + if(AllInButtonCheckableTextColor == "") { leftItems << "AllInButtonCheckableTextColor"; } + if(BetSpeedSliderGrooveBgColor == "") { leftItems << "BetSpeedSliderGrooveBgColor"; } + if(BetSpeedSliderGrooveBorderColor == "") { leftItems << "BetSpeedSliderGrooveBorderColor"; } + if(BetSpeedSliderHandleBgColor == "") { leftItems << "BetSpeedSliderHandleBgColor"; } + if(BetSpeedSliderHandleBorderColor == "") { leftItems << "BetSpeedSliderHandleBorderColor"; } // SIZE - if(ChatLogTextSize == "") { wrongItems << "ChatLogTextSize"; } + if(ChatLogTextSize == "") { leftItems << "ChatLogTextSize"; } - //if one or more items are wrong or left show detailed error message - if(!wrongItems.isEmpty() && myW != 0) showErrorMessage(StyleDescription, wrongItems, StyleMaintainerEMail); + //if one or more items are left show detailed error message + if(!leftItems.isEmpty() && myW != 0) showLeftItemsErrorMessage(StyleDescription, leftItems, StyleMaintainerEMail); + //if one or more pictures where not found show detailed error message + if(!itemPicsLeft.isEmpty() && myW != 0) showItemPicsLeftErrorMessage(StyleDescription, itemPicsLeft, StyleMaintainerEMail); } else { qDebug() << "could not load game table style file: " << tinyFileName.c_str(); } } -void GameTableStyleReader::showErrorMessage(QString style, QStringList failedItems, QString email) +void GameTableStyleReader::showLeftItemsErrorMessage(QString style, QStringList failedItems, QString email) { QString items = failedItems.join(", "); QMessageBox::warning(myW, tr("Game Table Style Error"), - tr("Selected game table style \"%1\" seems to be incomplete or defective. \nThe value(s) of \"%2\" is/are wrong or left. \n\nPlease contact the game table style builder %3.").arg(style).arg(items).arg(email), + tr("Current game table style \"%1\" seems to be incomplete or defective. \n\nThe value(s) of \"%2\" is/are left. \n\nPlease contact the game table style builder %3.").arg(style).arg(items).arg(email), + QMessageBox::Ok); +} + +void GameTableStyleReader::showItemPicsLeftErrorMessage(QString style, QStringList picsLeft, QString email) +{ + QString pics = picsLeft.join("\n"); + + QMessageBox::warning(myW, tr("Game Table Style Error"), + tr("One or more pictures from current game table style \"%1\" where not found: \n\n\"%2\" \n\nPlease contact the game table style builder %3.").arg(style).arg(pics).arg(email), QMessageBox::Ok); } @@ -465,19 +483,19 @@ QString GameTableStyleReader::getActionPic(int action) { // 1 = fold, 2 = check, 3 = call, 4 = bet, 5 = raise, 6 = allin, 7 = winner switch(action) { - case 1: { return ActionFold; } + case 1: { return ActionFoldI18N; } break; - case 2: { return ActionCheck; } + case 2: { return ActionCheckI18N; } break; - case 3: { return ActionCall; } + case 3: { return ActionCallI18N; } break; - case 4: { return ActionBet; } + case 4: { return ActionBetI18N; } break; - case 5: { return ActionRaise; } + case 5: { return ActionRaiseI18N; } break; - case 6: { return ActionAllIn; } + case 6: { return ActionAllInI18N; } break; - case 7: { return ActionWinner; } + case 7: { return ActionWinnerI18N; } break; default: return QString(""); } diff --git a/src/gui/qt/styles/gametablestylereader.h b/src/gui/qt/styles/gametablestylereader.h index 96b3fc4b..81b42c1b 100644 --- a/src/gui/qt/styles/gametablestylereader.h +++ b/src/gui/qt/styles/gametablestylereader.h @@ -37,7 +37,8 @@ public: void readStyleFile(QString); - void showErrorMessage(QString, QStringList, QString); + void showLeftItemsErrorMessage(QString, QStringList, QString); + void showItemPicsLeftErrorMessage(QString, QStringList, QString); QString getStyleDescription() const { return StyleDescription; } QString getCurrentFileName() const { return currentFileName; } @@ -114,13 +115,13 @@ private: QString MaximumWindowHeight; // PICS QString Preview; - QString ActionAllIn; - QString ActionRaise; - QString ActionBet; - QString ActionCall; - QString ActionCheck; - QString ActionFold; - QString ActionWinner; + QString ActionAllInI18N; + QString ActionRaiseI18N; + QString ActionBetI18N; + QString ActionCallI18N; + QString ActionCheckI18N; + QString ActionFoldI18N; + QString ActionWinnerI18N; QString BigBlindPuck; QString SmallBlindPuck; QString DealerPuck; @@ -229,8 +230,9 @@ private: QString currentFileName; QString currentDir; - QStringList wrongItems; - + QStringList leftItems; + QStringList itemPicsLeft; + ConfigFile *myConfig; gameTableImpl *myW;