From d6267c9618b85ac2d39a1a07a1fddb5ad2c70294 Mon Sep 17 00:00:00 2001 From: doitux Date: Tue, 16 Oct 2007 11:06:38 +0000 Subject: [PATCH] starts human player input filed redesign - PART I --- .../table/default/playerBoxActiveGlow_0.6.png | Bin 0 -> 2355 bytes .../default/playerBoxInactiveGlow_0.6.png | Bin 0 -> 830 bytes .../gui/table/default/playeraction_03_0.6.png | Bin 0 -> 1823 bytes .../gui/table/default/playeraction_05_0.6.png | Bin 0 -> 1808 bytes .../gui/table/default/playeraction_07_0.6.png | Bin 0 -> 1709 bytes src/gui/qt/mainwindow.ui | 2447 ++++++++++------- src/gui/qt/mainwindow/mainwindowimpl.cpp | 63 +- src/gui/qt/mainwindow/mainwindowimpl.h | 2 +- 8 files changed, 1415 insertions(+), 1097 deletions(-) create mode 100644 data/gfx/gui/table/default/playerBoxActiveGlow_0.6.png create mode 100644 data/gfx/gui/table/default/playerBoxInactiveGlow_0.6.png create mode 100644 data/gfx/gui/table/default/playeraction_03_0.6.png create mode 100644 data/gfx/gui/table/default/playeraction_05_0.6.png create mode 100644 data/gfx/gui/table/default/playeraction_07_0.6.png diff --git a/data/gfx/gui/table/default/playerBoxActiveGlow_0.6.png b/data/gfx/gui/table/default/playerBoxActiveGlow_0.6.png new file mode 100644 index 0000000000000000000000000000000000000000..e84626d2fba2a99d03f9a3cba1a30531050b16d8 GIT binary patch literal 2355 zcmc&!`BxJ77XN~Zr1->gAs3K0O=Qlb9L#zOiel5arOy^DODucVxTL0uh6paHr4!B5 z#>!mZxU`97X@(1K)2fzCxut@ZOCw5v0*3IIf8hNv^TWIM+*$Lm1qn0TT;+Pojl7u_zu-X=8k`g1>d_E8kK`s^>GG>I3gXlujzq zv{fQBqa$9achd=aYh(7q=q*po@~?_8hO5fR!MVt4dl;BesChlagBp^_UHHCZ$6W02 z#W9q2_xGilyAk&gz^AfpFU?w76E~k2saZ)D8r~L*N}9Lw;=TgF3e9%?^29FR>&0xW z5tH%d0>zV=-MN5Rt0l-~c zH(2p`<|#)e7K>GNK^2w^2IC&hhToT}Rwl|8N1L9%d-rZpC7WwvD3$_GH66Zt7bQh~ z$jd%Y1u6-~CUc>y%S$a0^{B<;E!xqEiJeNwj*-d9a9&Hx@Y3SqHHi*G2RmYoV!6NO z@ngO5nHw*J%M4x~Ault;FOg1fA-TD21Z;noia|k%6Yb}xD>yx~c?N#zI*_lwDLDc^ zQF#Az4CJvJE@{`_5SlR}w*max0F&Zi!cRYr&TyFY@N<%q@C9Q&CKP@kN?MN$aM#ne zIYNLY01OaHBjH#VhnlKgQ8wobPJ@QM`q2cQ@*H8>iz3O;fMF68E7!J85^iJ~+Q@Ri zQ4YA9TsmtTH2vC?zf#EelZ}3T6YTo!8Wu9W{u-i?dE?L4b4G8!aDQ{Y*w)VdQk%M*C8K$ zZH=Ih(LJ6AQwA7w48no@?oGw6K(i>J{mZou=^Z`rxiaq5CcyTzVh;tNEpnoIvpE+b zfXa=Z&#Su1AE81O_n;wuzWSiy?67wDeISXU%}#1PoXGWLRrj4Oz}Mn}%3We&V%~5K zgwj`0O-kJp&Ys-r^dN5Wcx6(%h0jiC%bAI2T4%=k;OuNI07t70P0_u(;wRNfUslB_ z5z09k@AMc!?$6MEKIv|exw5kI{AG#LsiNmwV&mfn=_x6e6`rh=P`EIQcwSzgwkBUV zsk^s2-B&QWwswBIF60mL9q>8G5I?NVlImS@vu|^tjN?$Vpje*j(P%Pu6Nw0!is%{` zxd%u}$C?A1M!%V8O~S>-#^&_*_ah^T9vjGtnd*(X1h09Ry*U&a1Y@Ezw;J<*k);V* znVM8kxZh3t1YS4Tg{FJNyZ5kun$W(o@D`YPl6B-(Cqq@WB)b_$Vg0nnKE)f^3o7Ze zwFAO4#*CGxWhl8FZ2OH|q<10y7urj9sM701J?+Rtb$Ago_5nOu4{3A( z^!0@0Rp-LAZ^@VNmO;?EfrurI^F)oW+vxb99?~$EMV~JK34%OUJz}{T2dfd$E|Ky2 z0*j1B*PEoABDXv2A#6qHW_7LyS?gDsyfaEH#zaHv(XdZEgv+6&V$58;_j<^i+6TkS zL_j8iNAzPm+J|;w*06}qZ+jh1V0hm*lR|W=Gkgz^$1m6 zegyJ?1&vrdNLF1G9syETi~$gK>mk2GtWVBpTE~2ap{gpsmfzjG+>;mT;GlReR=mBu zgQPY;q|A2igQQEl8#_p=W9ap3BqjwDk&YO8wk@Yzr2YME2mZ3nuUFxPCX~iG(*%)Y zW@GnUdk-rCdCF{_Cth9@8$oRdohjK##% o-f{-qDoYo0N15i|nW`JK(2iSSjRl&55uhvIJ^Oqbyd$#y3$cK}2mk;8 literal 0 HcmV?d00001 diff --git a/data/gfx/gui/table/default/playerBoxInactiveGlow_0.6.png b/data/gfx/gui/table/default/playerBoxInactiveGlow_0.6.png new file mode 100644 index 0000000000000000000000000000000000000000..0b1587162ef939eb5c16dede130bcb0de2814ecb GIT binary patch literal 830 zcmeAS@N?(olHy`uVBq!ia0y~yU~B-gFLST~$&OV=fC3C`N#5=*4F5rJ!QSPQfg+p* z9+AZi4BWyX%*Zfnjs#GUy~NYkmHj%G0Ed#IP2aim3=B-CJzX3_DsH{Kc{;1bL7?qo z{P78#mH)%fvhGQlD0SlAs|gP*FYx3^6$Zw?RsouT1@M@dzAs;G%6~)p!Kpr#>Pc&_ z&F4H2()?fbWbve>N(>JDwkKyjF+N%C`oN+(>Als@{nw)A{A0Xj%XiDabniS~hwGZP zensX#7~5ul{<}5x-HjEWm$5KBD8I)R)n>*ZUOSb+fq_AQfq@0+Z?c#Js~zZQN*qrO z?fqm08&YV~Bm^IHG2WOgBd2+wKzH*tZHDSe{EQ3|?+o+5Z$S`3-Uj# yH~n+pis^#wlIdMt|HT-Nxg@Lxh9?&A|Cl)ECizm&O|!p)WIbK|T-G@yGywn$MUGhj literal 0 HcmV?d00001 diff --git a/data/gfx/gui/table/default/playeraction_03_0.6.png b/data/gfx/gui/table/default/playeraction_03_0.6.png new file mode 100644 index 0000000000000000000000000000000000000000..82de5f831ccdc54ff728513d733d61921a43b4dd GIT binary patch literal 1823 zcmV+)2jKXLP)>m>7Q~X8+P`iMnC4|A@a5b=Am%C`JLRMJPgxT9i_3Z3|;*XWqPb@9~fKro0&_ zA|mNb?@3Ok$;{kLdOrD{bM8I&0mh8|3Zql8NGrFH`B#pAOHwnRc3=WHMDSfHKoo&x zqEQ503A3dsagLnz~n%Y5SFKu+_A5_Y+Luw+SMON27=9 zt7}rTs-`$s&Y3r2+fsSZ9s&A9!J!ibg#bh%u&j-pUnO2?-O{wDw`Y-Hy+AQf?a!pk zO-ROh?Lk1?va<=>?)MlS(<`TZxa5MlpWfBa&cUK45}ZUuk@B z6oWkO`NNF5ho8Rgmba=VmH&h>l!nHDMM5LK=97=kY58#df3u|L!G`dG0U*M#kb$O{ zEUYpirGdwg3VR!-pY_=4Tkd^>u_KFxQV~Kwz*rG?O$8uH02U$Tj4Xe-ZS#T%EW41ALWL3C1A~!wceX8eq0aV| z1xM15Fe#|yprMf3NC1+cNKYOZ9=f%w|3^U}8CID>VC1H+JIY7WBTKZThz|+nx6THZ z(g#Qi8WFujKFnGwCR#ic*+(Joe zW-Cw^0zeF~V44b#<4_?$O#L#kfKdP|A}8(Cb`K8N)2b@ysFdV?hd~-P6a-WNi7H4* z#!7pCCIAKsL<*6#lg%qcto)jXz?w5q@Zg0O5~hBcaKLzAZ6Oo0BRcf14@{Dpxs_X3 z0MLqhNsAHokjQJk4KNb}8s$Sn9yk$+9jLFV@s0u}_i+!JCdK04RoKykDc7wTEq0{= zW}?+F(q(6MO>I~83=EFIVv}fVoKyeMa}V79 zF%vRLYIX~k8S4g`X2IEIiyC@&eY^jW*Z#jXJM1{uK#I^z44YQF=!gm8Ryf2gjJ@#fgME2MvKDyZ7ub|L2-_{Yhp3MPCAz`ynpASWH@&|t8Er3lO3Q}L`AW5#~begM8&L N002ovPDHLkV1i14tiMuMh>nEex z__Aw6O^im9U85hG=q3moNI*>_k?6*5Fl#hAv6R{fSt~|BX)P~9r_9T}=Xv~a@7QZ! z1PktVrstoW%uL#QKg{!+|MQ%4o^uIjsjRdStg1>av_ZyuEuAGS>TK^}^?wnM7aIDB zfKYUe2B4A<5&#T9EH@Kg3IY|qFM@xw^}BC8b(mck0m`RKS9At7 zitCr*z4&T+{(BwXoqflhb!B$W6RjO6MSuc`!eLbnE)xwFVkswe&@-#a-?Zk+!j5}y z9_)ic2|waCbQ)M3Hc0<%b86Af_VhFPl6!?X+JkZdr2$gm04y-o1PlNOhl34>gM7Ug z?ELdxxsBIdRrs2L;#ko97%&MoNNw0ycWu|_-qV4&3*a~iVR2%xRNTb^Qw6ldppgg~ z1F!*1fTZJp^qXaa4?X^efh+?B0A@He&KR(07sgv zINRH)v9}+$i$WTNAy6vIbR_osuAwXyrX>#JEI<%o#=$;XfA|};&pHo!Oke=0!2}lWzy99;I4foW;UYyD5spSd)NBrgncpOL94M)HR?yro(i8&MD1k0f`=h#n`Fy zWN{e@p<%`D@nh2R{$AR4%~ev&N*lM(2KfOnEb^4u^`mL#-^K_anhtZF_j!2k$I5!V+=qT_KNWm;_j2!*fl z0@>CtlOioi1sDUs2m=ywFbXgRBJ~+LS?8JJi6HJSY#nA&7|ahG1}wo~%GDfSwD}&G z7TO?LX_E!BDZgj0=|55Sn?tZFH_;ZD$xy=#0b`7q19O{{AN%8ol*EhX>Y@+sh6KwX zq#+djtJtEq)`5}AhGYO`jHz$nPcLhBilaJA1(+2rUSZoi`SxR-{%r=R153Dvq?Dan zPX=Jv0LDO>;OOPei4T4;oqQA9wH^VCQZOqo^FHeA9_T6fvKTCYmS~q+#rj?>IJH%~ z2*6Q~Ob|%J6zRBjdEzq(bJXZXZ&b$wcU)iJx8tpon|ltGo5hhNi~+P8^}xUaQ**UT z1PzA`RhonT+0&g@e!VE+mmtCEcB{Dv;Z?1vH+#R$tsE%IS||r$YSP2nF)cJT1&c6X z0%@3nt?PfA`LG1>G0b5`jd)ht95F~e_WY4c-`+jAm7(WDJF&LRVO@5Xo2ukwsL+jy zU1N}RxZ~mb8rR)$b^SL6C=5S>;*4=iqcloS+&{Csx9{KsUEQU>_{J;=JMJnjQ)$n% z-+$Eu0|t!Yj4SW8E=@nSc6I#`6E;qbIInctCh)O zcwH%=UqUGd%AOdg+F20`AW}|w*xxiwzxv$9xmz!|Aej@4^O(snXtV|;I=cqzUf$H( z{N=&YZT-iBD}y5D0Z1D~%J$$*d=UW6FhVlW(CF-++MstgFHF7ur+a38IcK(8V8F*H zCk1{IFvC-n2D$J-Z|v%C-1BMvlKx}CoSrX=Gg-#0hpZ-u5(!mWcz*Kmj3)Qctv5Aw z{%T>mR01Oc<=h;V9mQ>kLdQ`8C}V{BzV;nI5Sy1KxY8*l(`Gt>qOdvJKz_c%_+!Ci y7i6k-jwIuG1_>Uous7Jf}DS0000 z%M%nX5`dC`mZJrS#-J!R!LpoPe+GNs`L@B^(RP_miG`$et&a4ULMhXh^4))w20aRw zL?L7wKf7X6Xwj_g;n(jxq#+fcT>x^Vwnd|Wg+oyw@x`w4{`WRC%7e!r(b2@!T&fDL zv_$~1Gi8QM{HLK$rBa-^%3?>^^y;;N*;7BOT=~FZst6_lcz>rhG$Jfu!GSM#pLODi z)lZ-+{vdZnjh%*s`^=1q@db@ar(oo%;=m4T!G$ZT*F3(N$}9(f+dxfn)WG;*>3(|c zti%UfUu3b=?KS`_oh+T?OB3TtWllO@0l*{bV{^}YBmC~-)uDwK^#E{kDa~-=z@RA5 z|H<~6zUD1&=ve9&?t_F41B}W1PGtS@QUsS2BS6VWBLuWTJ5AGijA6i)}r4se8D0 zyIoiAwd!WwKuy~6`xgca0|$>+d)@I$+eaLw&+4WfO^mjr27zI2+^J8rwgbCS6{ z3=tTFRFk}Yx;(wXN*qpgP{B9^N6x1-Fo*F@n1BLE1_WXU<<17!_$ zE(UMr<($K)ss%F=Z6CF46NGuturd$fMqwrvFpQ!ljnj78HKjsB4Lj*oRo9-MD!*jP z=152HqaQ5H zV}O|;CnU~dp>x9@Od4M-53+&Utuz^D2pAcx~l$_ z>o+{J9zjZB@Iv?yU~=vfJ@)GD06~}4Pxgf4?LD#QSeZBA&eZ^A8>As$SeeZ09PYxK z03e8tRn0&D<@sxxzOgEU0{}#>m6MUS1{i^YUEBXCZ&|+j-v0fa%XQML=KwdYsW6m9 zaTd2LiZ<2Wbn#pBS1tR6Lge6YR!v5=mqZ{t+0kFTdD*Iq`wm3zPaf^LUMpS8gbI<_ zG#PgXBF#vGQLj}RI#@cj>f>p5U9n;IOE*Wr;iQ#i?0ZRB&=3HNf!o?qv~$JRQ@eMx z&pzJTehq9sg&0+X$Shdrdng@)R1rI5@2_1rW80LQX6~zB+!zyZR)X><^qR6 zoWQu&njiUUPbl6IwVi0(QbL)6i$K zvd8U=?&MiztUm$rj|-i( - - 9 - - - 9 - - - 9 - - - 9 - - - 6 - - - 6 - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 230 - 0 - - - - - - - - Qt::Vertical - - - QSizePolicy::Expanding - - - - 0 - 0 - - - - - - - - - 230 - 195 - - - - - 197 - 195 - - - - - 6 - - - 6 - - - 6 - - - 6 - - - 1 - - - 1 - - - - - Qt::NoFocus - - - 0 - - - - Hands - - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - - - Qt::AlignCenter - - - - - - - - Chat - - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - - - - - - - - 102 - 153 - 0 - - - - - - - - - 102 - 153 - 0 - - - - - - - - - 102 - 153 - 0 - - - - - - - - Qt::NoFocus - - - Qt::ScrollBarAlwaysOff - - - - - - - - - - - - 102 - 153 - 0 - - - - - - - - - 102 - 153 - 0 - - - - - - - - - 102 - 153 - 0 - - - - - - - - - - - - - - - - - - - - - Qt::Horizontal - - - QSizePolicy::MinimumExpanding - - - - 106 - 40 - - - - - - - - true - - - - 310 - 195 - - - - - 310 - 195 - - - - - - - - - 25 - 80 - 50 - 34 - - - - QFrame::Raised - - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - - - - - 25 - 25 - 40 - 40 - - - - true - - - Qt::AlignCenter - - - - - - 232 - 44 - 55 - 21 - - - - - 40 - 0 - - - - Qt::NoFocus - - - 5 - - - - - - 25 - 120 - 50 - 50 - - - - - - - true - - - - - - 95 - 156 - 118 - 16 - - - - Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft - - - - - - 95 - 20 - 118 - 16 - - - - Qt::AlignHCenter|Qt::AlignTop - - - - - - 95 - 40 - 118 - 111 - - - - - - 9 - 35 - 100 - 40 - - - - - 0 - 20 - - - - - - - Qt::AlignCenter - - - Qt::NoTextInteraction - - - - - - - 232 - 122 - 55 - 55 - - - - Qt::NoFocus - - - - - - 232 - 70 - 55 - 55 - - - - Qt::NoFocus - - - - - - 232 - 18 - 55 - 55 - - - - Qt::NoFocus - - - - - - - - Qt::Horizontal - - - QSizePolicy::MinimumExpanding - - - - 106 - 40 - - - - - - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 230 - 0 - - - - - - - - Qt::Vertical - - - QSizePolicy::Expanding - - - - 0 - 0 - - - - - - - - - 230 - 195 - - - - - 197 - 195 - - - - - 6 - - - 6 - - - 6 - - - 6 - - - 1 - - - 1 - - - - - Qt::NoFocus - - - 0 - - - - Log - - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - - - - - - - - 102 - 153 - 0 - - - - - - - - - 102 - 153 - 0 - - - - - - - - - 102 - 153 - 0 - - - - - - - - Qt::NoFocus - - - 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 - - - - - - - - - - - - 6 - - - 0 - - - 0 - - - 0 - - - 0 - - - - - - - - - - 240 - 240 - 240 - - - - - - - 240 - 240 - 240 - - - - - - - - - 240 - 240 - 240 - - - - - - - 240 - 240 - 240 - - - - - - - - - 128 - 128 - 128 - - - - - - - 199 - 199 - 199 - - - - - - - - Speed: - - - - - - - - 16 - 0 - - - - - - - - - 240 - 240 - 240 - - - - - - - 240 - 240 - 240 - - - - - - - - - 240 - 240 - 240 - - - - - - - 240 - 240 - 240 - - - - - - - - - 128 - 128 - 128 - - - - - - - 199 - 199 - 199 - - - - - - - - - - - - - - - - 0 - 0 - - - - - - - - - 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 - - - 1 - - - 11 - - - Qt::Horizontal - - - - - - - true - - - - 40 - 20 - - - - Qt::NoFocus - - - Stop - - - - - - - - - - - - @@ -1920,6 +856,19 @@ + + + + Qt::Vertical + + + + 982 + 16 + + + + @@ -2666,19 +1615,1347 @@ - + Qt::Vertical - 20 - 40 + 982 + 16 + + + + 0 + + + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 260 + 0 + + + + + + + + Qt::Vertical + + + QSizePolicy::Expanding + + + + 0 + 0 + + + + + + + + + 260 + 195 + + + + + 260 + 195 + + + + + 6 + + + 6 + + + 6 + + + 6 + + + 1 + + + 1 + + + + + Qt::NoFocus + + + 0 + + + + Hands + + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + Qt::AlignCenter + + + + + + + + Chat + + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + + + + + 102 + 153 + 0 + + + + + + + + + 102 + 153 + 0 + + + + + + + + + 102 + 153 + 0 + + + + + + + + Qt::NoFocus + + + Qt::ScrollBarAlwaysOff + + + + + + + + + + + + 102 + 153 + 0 + + + + + + + + + 102 + 153 + 0 + + + + + + + + + 102 + 153 + 0 + + + + + + + + + + + + + + + + + + + + + Qt::Horizontal + + + QSizePolicy::MinimumExpanding + + + + 41 + 197 + + + + + + + + true + + + + + + + 26 + + + 26 + + + 20 + + + 26 + + + 10 + + + + + + 40 + 40 + + + + + 40 + 40 + + + + true + + + Qt::AlignCenter + + + + + + + Qt::AlignCenter + + + + + + + 0 + + + + + 0 + + + 0 + + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 16 + 20 + + + + + + + + 0 + + + 0 + + + + + + 40 + 0 + + + + + + + + + 255 + 255 + 255 + + + + + + + 102 + 153 + 0 + + + + + + + + + 255 + 255 + 255 + + + + + + + 102 + 153 + 0 + + + + + + + + + 118 + 111 + 107 + + + + + + + 255 + 255 + 255 + + + + + + + + Qt::NoFocus + + + 99999 + + + 5 + + + 99990 + + + + + + + + + + + + 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 + + + Qt::Horizontal + + + + + + + Qt::Vertical + + + QSizePolicy::Fixed + + + + 1 + 25 + + + + + + + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 16 + 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 + + + + + + + + + 50 + 34 + + + + QFrame::Raised + + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + + + + + + + 50 + 50 + + + + + 50 + 50 + + + + + + + true + + + + + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + + + + Qt::Horizontal + + + QSizePolicy::MinimumExpanding + + + + 31 + 197 + + + + + + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 260 + 0 + + + + + + + + Qt::Vertical + + + QSizePolicy::Expanding + + + + 0 + 0 + + + + + + + + + 260 + 195 + + + + + 260 + 195 + + + + + 6 + + + 6 + + + 6 + + + 6 + + + 1 + + + 1 + + + + + Qt::NoFocus + + + 0 + + + + Log + + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + + + + + 102 + 153 + 0 + + + + + + + + + 102 + 153 + 0 + + + + + + + + + 102 + 153 + 0 + + + + + + + + Qt::NoFocus + + + 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 + + + + + + + + + + + + 6 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + + + + + 240 + 240 + 240 + + + + + + + 240 + 240 + 240 + + + + + + + + + 240 + 240 + 240 + + + + + + + 240 + 240 + 240 + + + + + + + + + 128 + 128 + 128 + + + + + + + 199 + 199 + 199 + + + + + + + + Speed: + + + + + + + + 16 + 0 + + + + + + + + + 240 + 240 + 240 + + + + + + + 240 + 240 + 240 + + + + + + + + + 240 + 240 + 240 + + + + + + + 240 + 240 + 240 + + + + + + + + + 128 + 128 + 128 + + + + + + + 199 + 199 + 199 + + + + + + + + + + + + + + + + 0 + 0 + + + + + + + + + 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 + + + 1 + + + 11 + + + Qt::Horizontal + + + + + + + true + + + + 40 + 20 + + + + Qt::NoFocus + + + Stop + + + + + + + + + + + + @@ -2850,8 +3127,40 @@ 624 - 831 - 636 + 808 + 638 + + + + + horizontalSlider_bet + valueChanged(int) + spinBox_set + setValue(int) + + + 585 + 509 + + + 579 + 479 + + + + + spinBox_set + valueChanged(int) + horizontalSlider_bet + setValue(int) + + + 621 + 479 + + + 621 + 509 diff --git a/src/gui/qt/mainwindow/mainwindowimpl.cpp b/src/gui/qt/mainwindow/mainwindowimpl.cpp index cb502a78..983c79c2 100755 --- a/src/gui/qt/mainwindow/mainwindowimpl.cpp +++ b/src/gui/qt/mainwindow/mainwindowimpl.cpp @@ -207,9 +207,10 @@ mainWindowImpl::mainWindowImpl(ConfigFile *c, QMainWindow *parent) userWidgetsArray[1] = pushButton_CallCheckSet; userWidgetsArray[2] = pushButton_FoldAllin; userWidgetsArray[3] = spinBox_set; + userWidgetsArray[4] = horizontalSlider_bet; //hide userWidgets - for(i=0; i<4; i++) { + for(i=0; i<5; i++) { userWidgetsArray[i]->hide(); } @@ -481,12 +482,12 @@ mainWindowImpl::mainWindowImpl(ConfigFile *c, QMainWindow *parent) groupBoxArray[i]->setStyleSheet("QGroupBox { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/opponentBoxInactiveGlow.png) }"); } - groupBoxArray[0]->setStyleSheet("QGroupBox { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playerBoxInactiveGlow.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_03.png); "+ font2String +" font-size: 11px; font-weight: bold; color: #F0F0F0; }"); - pushButton_CallCheckSet->setStyleSheet("QPushButton { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_05.png); "+ font2String +" font-size: 11px; font-weight: bold; color: #F0F0F0; }"); - pushButton_FoldAllin->setStyleSheet("QPushButton { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_07.png); "+ font2String +" font-size: 11px; font-weight: bold; color: #F0F0F0; }"); + pushButton_BetRaise->setStyleSheet("QPushButton { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_03_0.6.png); "+ font2String +" font-size: 11px; font-weight: bold; color: #F0F0F0; }"); + pushButton_CallCheckSet->setStyleSheet("QPushButton { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_05_0.6.png); "+ font2String +" font-size: 11px; font-weight: bold; color: #F0F0F0; }"); + pushButton_FoldAllin->setStyleSheet("QPushButton { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_07_0.6.png); "+ font2String +" font-size: 11px; font-weight: bold; color: #F0F0F0; }"); // away radiobuttons QString radioButtonString("QRadioButton { color: #F0F0F0; } QRadioButton::indicator { width: 13px; height: 13px; } QRadioButton::indicator::checked { image: url("+myAppDataPath+"gfx/gui/misc/radiobutton_checked.png); }"); @@ -1147,7 +1148,7 @@ void mainWindowImpl::initGui(int speed) groupBox_LeftToolBox->setDisabled(FALSE); //show human player buttons - for(int i=0; i<3; i++) { + for(int i=0; i<5; i++) { userWidgetsArray[i]->show(); } @@ -1642,7 +1643,7 @@ void mainWindowImpl::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.png) }"); + 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) }"); @@ -1652,9 +1653,9 @@ void mainWindowImpl::refreshGroupbox(int playerID, int status) { //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.png) }"); + groupBoxArray[0]->setStyleSheet("QGroupBox { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playerBoxInactiveGlow_0.6.png) }"); //show buttons - for(j=0; j<3; j++) { + for(j=0; j<5; j++) { userWidgetsArray[j]->show(); } } @@ -1665,9 +1666,9 @@ void mainWindowImpl::refreshGroupbox(int playerID, int status) { //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.png) }"); + groupBoxArray[0]->setStyleSheet("QGroupBox { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playerBoxInactiveGlow_0.6.png) }"); //hide buttons - for(j=0; j<4; j++) { + for(j=0; j<5; j++) { userWidgetsArray[j]->hide(); } } @@ -1697,9 +1698,9 @@ void mainWindowImpl::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.png) }"); + groupBoxArray[playerID]->setStyleSheet("QGroupBox { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playerBoxInactiveGlow_0.6.png) }"); //hide buttons - for(j=0; j<4; j++) { + for(j=0; j<5; j++) { userWidgetsArray[j]->hide(); } } @@ -1711,9 +1712,9 @@ void mainWindowImpl::refreshGroupbox(int playerID, int status) { //active but fold case 1: { if (!playerID) { - groupBoxArray[playerID]->setStyleSheet("QGroupBox { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playerBoxInactiveGlow.png) }"); + groupBoxArray[playerID]->setStyleSheet("QGroupBox { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playerBoxInactiveGlow_0.6.png) }"); //show buttons - for(j=0; j<3; j++) { + for(j=0; j<5; j++) { userWidgetsArray[j]->show(); } } @@ -1725,7 +1726,7 @@ void mainWindowImpl::refreshGroupbox(int playerID, int status) { //active in action case 2: { if (!playerID) { - groupBoxArray[playerID]->setStyleSheet("QGroupBox { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playerBoxActiveGlow.png) }"); + 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) }"); @@ -1735,7 +1736,7 @@ void mainWindowImpl::refreshGroupbox(int playerID, int status) { //active not in action case 3: { if (!playerID) { - groupBoxArray[playerID]->setStyleSheet("QGroupBox { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playerBoxInactiveGlow.png) }"); + 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) }"); @@ -2095,8 +2096,12 @@ void mainWindowImpl::dealRiverCards2() { void mainWindowImpl::meInAction() { //fix buttons if escape is pressed during raise or bet - spinBox_set->hide(); - pushButton_BetRaise->show(); +// spinBox_set->hide(); +// pushButton_BetRaise->show(); + + horizontalSlider_bet->setEnabled(TRUE); + spinBox_set->setEnabled(TRUE); + myActionIsRaise = 0; myActionIsBet = 0; @@ -2201,9 +2206,13 @@ void mainWindowImpl::disableMyButtons() { //clear userWidgets spinBox_set->setMinimum(0); + horizontalSlider_bet->setMinimum(0); spinBox_set->setValue(0); - spinBox_set->hide(); - pushButton_BetRaise->show(); + horizontalSlider_bet->setValue(0); + spinBox_set->setDisabled(TRUE); + horizontalSlider_bet->setDisabled(TRUE); +// spinBox_set->hide(); +// pushButton_BetRaise->show(); pushButton_BetRaise->setText(""); pushButton_CallCheckSet->setText(""); pushButton_FoldAllin->setText(""); @@ -2290,8 +2299,8 @@ void mainWindowImpl::myCall(){ void mainWindowImpl::myBet(){ - pushButton_BetRaise->hide(); - spinBox_set->show(); +// pushButton_BetRaise->hide(); +// spinBox_set->show(); pushButton_CallCheckSet->setText("Set"); pushButton_FoldAllin->setText("All-In"); @@ -2299,8 +2308,9 @@ void mainWindowImpl::myBet(){ HandInterface *currentHand = mySession->getCurrentGame()->getCurrentHand(); spinBox_set->setMinimum(currentHand->getSmallBlind()*2); - + horizontalSlider_bet->setMinimum(currentHand->getSmallBlind()*2); spinBox_set->setMaximum(currentHand->getSeatsList()->front()->getMyCash()); + horizontalSlider_bet->setMaximum(currentHand->getSeatsList()->front()->getMyCash()); spinBox_set->setValue(spinBox_set->minimum()); spinBox_set->setFocus(); spinBox_set->selectAll(); @@ -2310,12 +2320,11 @@ void mainWindowImpl::myBet(){ void mainWindowImpl::myRaise(){ - pushButton_BetRaise->hide(); - spinBox_set->show(); +// pushButton_BetRaise->hide(); +// spinBox_set->show(); pushButton_CallCheckSet->setText("Set"); pushButton_FoldAllin->setText("All-In"); - HandInterface *currentHand = mySession->getCurrentGame()->getCurrentHand(); spinBox_set->setMinimum(currentHand->getCurrentBeRo()->getHighestSet() - currentHand->getSeatsList()->front()->getMySet() + currentHand->getCurrentBeRo()->getMinimumRaise()); diff --git a/src/gui/qt/mainwindow/mainwindowimpl.h b/src/gui/qt/mainwindow/mainwindowimpl.h index 625efaaa..a7679e75 100755 --- a/src/gui/qt/mainwindow/mainwindowimpl.h +++ b/src/gui/qt/mainwindow/mainwindowimpl.h @@ -382,7 +382,7 @@ private: QTimer *blinkingStartButtonAnimationTimer; - QWidget *userWidgetsArray[4]; + QWidget *userWidgetsArray[5]; QLabel *buttonLabelArray[MAX_NUMBER_OF_PLAYERS]; QLabel *cashLabelArray[MAX_NUMBER_OF_PLAYERS]; QLabel *cashTopLabelArray[MAX_NUMBER_OF_PLAYERS];