From 1b87fa6ed8ca9afedd5c2cba46c9256e68d008ae Mon Sep 17 00:00:00 2001 From: Ricardo Markiewicz Date: Mon, 1 Dec 2003 06:15:22 +0000 Subject: [PATCH] * La animacion es mas linda ahora * Se implementa el menu comandos --- Client/dialogs/client.glade | 2 +- Client/include/principal.h | 3 ++- Client/pixmaps/Makefile.am | 5 ++++- Client/pixmaps/anim_0.png | Bin 393 -> 1738 bytes Client/pixmaps/anim_1.png | Bin 289 -> 1606 bytes Client/pixmaps/anim_2.png | Bin 287 -> 1793 bytes Client/pixmaps/anim_3.png | Bin 290 -> 1763 bytes Client/pixmaps/anim_4.png | Bin 288 -> 1782 bytes Client/pixmaps/anim_5.png | Bin 0 -> 1582 bytes Client/pixmaps/anim_6.png | Bin 0 -> 1726 bytes Client/pixmaps/anim_7.png | Bin 0 -> 1716 bytes Client/src/principal.cpp | 33 +++++++++++++++++++++++---------- 12 files changed, 30 insertions(+), 13 deletions(-) create mode 100644 Client/pixmaps/anim_5.png create mode 100644 Client/pixmaps/anim_6.png create mode 100644 Client/pixmaps/anim_7.png diff --git a/Client/dialogs/client.glade b/Client/dialogs/client.glade index bac40c9..15a7538 100644 --- a/Client/dialogs/client.glade +++ b/Client/dialogs/client.glade @@ -138,7 +138,7 @@ - + True Detener Servidor True diff --git a/Client/include/principal.h b/Client/include/principal.h index 818d016..f93cb78 100644 --- a/Client/include/principal.h +++ b/Client/include/principal.h @@ -51,7 +51,7 @@ protected: // Archivo XML del Padre Glib::RefPtr refXml; - Glib::RefPtr anim_frames[5]; + Glib::RefPtr anim_frames[8]; int current_frame; Gtk::Image *anim; bool paused; @@ -87,6 +87,7 @@ protected: virtual bool on_item_clicked(GdkEventButton *, ViewItem *); virtual bool on_workplace_expose_event(GdkEventExpose *); virtual bool on_delete_event(GdkEventAny *); + virtual void on_mnu_server_stop_activate(); // Callbacks para las conexiones void on_conexion_finished(); diff --git a/Client/pixmaps/Makefile.am b/Client/pixmaps/Makefile.am index 05a00db..f7489ce 100644 --- a/Client/pixmaps/Makefile.am +++ b/Client/pixmaps/Makefile.am @@ -40,7 +40,10 @@ anim_0.png \ anim_1.png \ anim_2.png \ anim_3.png \ -anim_4.png +anim_4.png \ +anim_5.png \ +anim_6.png \ +anim_7.png EXTRA_DIST = $(plaqui_DATA) diff --git a/Client/pixmaps/anim_0.png b/Client/pixmaps/anim_0.png index 097654acf9e58bb3c57bc9fde0996afd68c8a0b8..eb849e44f43d5fdb5871c4352570662b27a8d492 100644 GIT binary patch literal 1738 zcma)-`B%~j7skK1g1I2$h`ZtnYMW+am^+E+Xp-rhrdi}lnuX@pxMD8RNQPoA)vMWS zuc4>h7t%B(mvCb=H_W}_b+Ap+R0iiSct7Vn_c_l!_nvcqySb-5T@~as|e*(3NKo<}i*9d(=e}5v8 zNFtHQB&vYK6q3owR(#2F21VSMW($9ijm35R>)1ssPR2QHIU6u7|iiH}8L869exduTGTa(+1!2 z?;srOhF?YAP33jPn&fc9>TOCM*l)q*rml7Ta#@vZl`tDHtfyvq{)qDJJYl+uEGI6y zvCQ*Nqb}%=sX-@Wo@|Exlh_mvzlMsGa`-;J9jlb1v~h_IiFb38XwL&}V;uC+^>*K& zQP+tBsI^PETsisGck&DQEQ`K01P9bUk~lAXuu30JR2on|$Rd3@zFTPNFQQumG@C}AFeOgTG zW|tyB+Rl%_YtM(QObAGSN%(5-LC|r0@rTWrElIY)2N>2|QZC?=)F&o)hdQ3S-}l!GoQt_(BP@8!=bt{69*g&HH?1yf&60k#25I#er6z~8r>s1$18M3d zJqAs{W%?Ew&+xEIm2xJex&Yr&CVy(6ablPUF`}*q5?Lb zG)d@4D+t;sA8J&ts|on*S|<<4jL)}c5uHQhzFbIf7IPi2T=N_skA}}p@tYtM}q9bCo6yA91yiR*S z#aWlIs+z&J6E-T=W!9dkmq~7l%QeTMhas}>ed20@UN3pUDV-FPi<*=u0Xt4laS$#G z2|G-Ec=*eiC}=dZ0aw&KxI1Z+cCvXZ$Q@sIX62m>%IX7@16d#}_Xn6-4u4$x+WISu zq|0VdX<@-Bq;Uqi$uZB?NB4DNg+?9qsx6x`k*+x<5pNzlbpLH#=gQrTn`VX!7bEm6 zH?o!o&b}_hIN%!?9effI`9*$Iv0r(TpWP07rolYIX>C0)%!Mcpe4jydf_ZP(8IO*Q z&c^u-`{``q(Yct}26Q8tejq#o|&q2~k5J4R?q3mdz_sNm+eyT2l zyfAH@tB{GpvW|LK(afYPqB0q9VXPwzb%D<-Am}cT6R(ukaMVsFSDZuuSV5dD>?9)I zzRA|>k<|MJ#$lF*Y5gaGios3Vt0<-WK2usw!i^;_=mi~MbjJBa>|T>2{}*Uw;Y9Tg zE+9z)2yfu}fB#KqS8>s?x>HIo(!hJ{I5c~4>*JLE1w^6p(kZCHgHPLEeszR2d$$~O z-updidVNn77Nd!K@8RQhqy4Z+mZqbz&yV57e)!0{4f~3r*_^BatAekL{@k57N`@8$W-Z{akbwb1G)PQrhcmuM&zr&xv5x^FW)tj6Qx zd2?yEP>WuH=tPI9qCfJ_Ys>sWKl1d79LlxjvsbcRTzTat>8A1uh@YyJn4yd38TIae N05`0sORZCI#^2KiB)k9s literal 393 zcmeAS@N?(olHy`uVBq!ia0vp^DIm3Meo!xj3+-1Ws60t?@mwRockPN1|_yXt#U4>f4=@H%SVc zEh#-=pqATFX^M4=q;k4EZ`#(#mKIBB=rrLp)@J1)5A(3DEz_n$6uPeF z;jWESvSP={&GYI|s1QB4YvX%VmgIKy7u@^x`n*1`&*$~|yk4K5KG$^>Fp&*s9S8*4 zkB*I7P3=K}A$|}D#L3Ck%Zr4U10)iKB-c_XREj`MDF!G_GZck}N{xw$q0{MXx&WX{ zG;DSTyJ;e06<5v`%efMOD}TaOXas^{fkaWfW~Nv%QL#o+Q2~h8XvIoEB9SyT$vJYl z;tS;$PgYG#OaK6&(P*?=vNe^&vAuTq1=r+`K2ek3v**Sin?rJGuw*@ zv3S+#oK9=g1+<|acZVp8(WY7OVa@maQUwH}(a727B#}LS^FK4kBEY!?(bj?Os1+Z`= zV@gX=dMY~JJDbz+(7GYo_THnQC~u+C&w`lZNw>Z6r)x7Z&K_E+qG6A(jEUBdndhNk z8ozEY9I_59Rc2ZJh{1mhZ$E}rx3~GsT?i_gF*6}D4-S2|TWlC%D=;_aJMPFob1U*f zL0CGWjC}=Pr}F*!;TelM{lPKxVe=T_%_GCMUIWww3P=4m9#>M}0D)TrqbvtX8Fcw5 zO6ir9Ts5uMj1Shajcx)dK0g?3_b+V-=9TfTb~ra*zOQ1V4}|(B=BSf%iB4Ds++#<9 zV&l1=RXrmn(4Ye55U9s_hq2oLo7vrHcR0A`H)$Lr%(}tqC~h;qe__J@k_jW``^+2k z{1!7#&F7+b$nDMF)Q89In#N!9nXE-;AGtDIGKIN|RWSbcdbEDf)-B`7GI=Sh(x;@q z^Z1Z1KlZ|v<>x%LMLc&M;WXU8&V)3+<-=C_^SNGCmi?RsU#wXiWj~6vsVq*&7sUSD z()bg5X?j;p9vYmC80EKa-!(AVSf%bZICsLDQ|=TU<%`eNH`kG+o;`#a920$~liWms z9x}_#rk+Uy7x5xb75a-7W2y)wS4DZDTiAf~jVH4o`~GdXJd-UFgBODOy>n<##cumE{kmvk=K4*;go$} z`$ttZ>dtF!lue`QdGnHtrtwT?6!KxErBNY=-8&2`XKka?K)#~ZYzyQwL*g;Jh2Ju= z5F5Kv0$|}nyElckf?b_)mL|hcDaYl*la#Y}9QN!R47Bk6@Mg%EyBi(#C_*H+KSepx%feD#b-ArTN?y#H+$M<&Jb~pQJLk>LEn76*S z_OOw4PIn^7_o@uS6{hdsCxh#?#kcHS^b3#$$~MfuTuy0`-@CW;2{o?^4|)8<)qdHM zuJyd$Rz~w<XAq@P^)+kgfA{=4}Bg(7RnH2?qr delta 226 zcmX@cvyf?mq!b$i14F^1sUbj$Ey>&6h2cL4F4((#^2A?C_41NkC$v5QN!u6}Ec1IEGZ*dVBLCXM+Kc!@(ne z%h$>4Ex6I<@J=kCLgj)P6HpNpyiizew?*k%_k2&sSw{qxDx8=uaL7h4y81-RpP79p zgD1r*CHwRyrE)eYG%0i_a42#3z4CkYd`HZdO+F{yd47}&I?}B;@t}yfNg=bhsF2*3 Sk1YBilRaJiT-G@yGywp|x>Uaa diff --git a/Client/pixmaps/anim_2.png b/Client/pixmaps/anim_2.png index 4cbe59c32d553d4f783f6ec6d4929b3b7769d839..3a62b5d9f27986957a84e1d378ddaf3b90e8e35c 100644 GIT binary patch literal 1793 zcma)-`8OMg7RO_YEx|-+?U|AxcD2?T5nC+LP+Fuds#8s^Nl~e^I%!ZTMXZk=j8ID` znwC`hw6V8!dQderqP9jE;^~-p#CS1(!TX$Z@Auq$zW1E_)4lm2!Miu&6ci8$n=@xHD6SBL!C|;ZI9w!-&crc}Gma53hWRzeuxe_A%wvw2 z6G9e?#b$H4+~I$i_=gz@d_G?&6pBQmqoX6BoUCN8{~w88N^N;nG9VQj;EM+2$?5q? z3dIz^3q$}w8FCy_lk*g@q$yAG5Av3u0!hi)oU$Gq-va>TM*Pv9VVR$~l{rasP9Pe5 z=3`1R^%kmA{r8~=WcQLSoQqmGVik7JlelbN?2yfeH^CsvsXHYNZ+7O&&QmhDWazDf z-3c|`3vwqsAi2mmodansZuXyf>e9C`kMe_tzI=OPk<%M+IpUq{1?mQ}dvW;L z)h^vjN{@aKk&<=Neu|ctHXqz`2SWgHH7AmvJ&gFz;P)Oq-b4wyqvFb!c@3BpJu=B$ z)mi&QXduE2-38z}pYvMlQpX@VtPK}q39L=?U>g>P9MUqQ{=iKc!BS*52?L%N{(iwW zNQd5nQIA47R2WIWi20$BX;rvN>pYoDX&tr1w}(RDPzyBJ{X!W=3ng`G3U1|m+2IB) z)0$~_+E#NX%r2pF0G^U`k$fdOmxk?ii*EWgGqXxYSxbhw&Cpu4%L+9qSp4&bZkw9E zP86Lz-3NttDgj(ItD4SqzRb_;c&JE#CB_()mL!I>v?J20vzTKoc>e13S1tEa8dr7` z3yu8HYp32aIJ3}N9B3q+HGN*@TO=WfiA)j}9 zelFi#(f;oGX%F`$sZhOIJI{1AP;Y#&udl9d+_7~wH(uu2`^i=U>=m9+xG`$0p;YzU z^TlHC4Pz&>Qce@FdUBFkPk-2!>Dn??!T0P_Ll=~< zC$Z;dSd+?@y49)Yg3)dBPaR&XkJDCyhHnAFqk)h;Xfem%vMBD-Ev1BJ_jz*V)BOu z#p2gQUW66Htq5%C1(uzY5-^yX)U(NUx`oqUU4FZK`(MHM$#aNy;JPtIgNiBsN$B$= zA975)C-~XJ<(co z_M;{x!PJ{&{KcTjh`&1OF5Rp!D5@Wua}7^lbb6g8wld)z#t?oL_ zT>H>)c5Yps6MM7ypp9I=EWT#?qtRw@c9t0ZwsHi-R@3hGaPxt?+Gxk7Mag&lA&Syp zH_Tr6h=h2F4->5SyJ-d9F*^J6L*D;ZoLrDjOXzp-vcL0#-3da5-+yOQ(7Eo5J=rA9*AXX*}}CU;-t^osr21Pl-{; zEIR3W(I72cE_J(>fvF^AE4=5Y>au4r-+cTPDe~AIllmW3tAT5kV@`Ckl#V`qu(vsKI5nm2IqU}Wi?k*0Z6N7ZviW4B4{$(#OEu%j)eQld{WT+= zr>&C9I}|m)66kX9uxi-)-*dGltCsGiE0EF7Z&i24sSAojIiXK`16(q3BzZpcpeC#G zE+seCX#Qp>WuW=AU9CaZM;a+{6lu|=#@IZ}GhCY8`1=RJ)VR;mO*8j*jKvk_pgbSHeZlfaM;5AUMHUYRLjgP$vRHwhW3KQ3ip(X0 zAYr@8_Xoe+o{cZMWC$cS4r*|=1@G^hOw+J7Liw@s+lxDn&1FXbMp+j6N{ILIg9G?` L2ctVsm+$=#7ThyY delta 240 zcmZqVo6j^sQi_d%fuZ2h)DR%WmgMd3!tfsi7wla=dEzgndU?$?f>JR+IoT4|h!W@g z+}zZ>5(ej@)Wnk16ovB4k_?5Aj8p}8Pv3y|DXMuuh0UHWjv*Dd-rjWNI-tPgdT`12 z{hQy#mR@xFb7qc1rAxqSpc)jQ5ab{KU{#d9*~KQF&WU16^Z6%=JuA$bJ>mW`W$#2U zE8Syn17#wc6gm_*lsK9=nr82s{mVv9+)y#zzw7@5$G}N-Jd7v?He6;~)gUCt)ADW> ONZixa&t;ucLK6V9+fVfX diff --git a/Client/pixmaps/anim_3.png b/Client/pixmaps/anim_3.png index 5092e1a06d42590f9f4696d33564ff0bba3db57e..92dbbe899eca0c3d7323f4c92fff6f9dd180eb26 100644 GIT binary patch delta 1756 zcma*o`BxJ7765RBa6?T=Ger|KN6j?%Bpvq!QAZz=Ixb|nOQuPKYobLXDT*mfF0}Y2 z^c7L2nVI55=7vj+7M2A>IZ`sn(;OL>adP%f7%6pF2_EmiOi9L`N;j2FwKE~%ftMn|L`T<7!w7Ex0DLnfz!y_6D{B(xeX!OV1`p)nRnk1)o*H|! z6fS8W9Rgy_cFq!vw278PIF*#5(<0YB;ld)6g~!JasDSy zYTzyvXxrnpM+)`v9o(QkuY?E8f|Ubm>P8^u{~OBljEm!~>%}V>-yhW7d%H?MhVr zB#kz(ZN1W&U|{1w*5f2;@}eBi9_cF0`b%?wnBo4YXCllW%dxC^;ebfScx3wwFJ&R~ zDD;zq##gm0_A(0BVWH%Y@yB74v<-%p3ve*=KhIwN9$`$abkk;grAy0a#&leKxn@4?C0uO2xj$px!WyXNIzR^RQ;aMA+N`sk9m(`{BHkBSPo07y3bc`^cY`k07V zpnr1JulMsSpZup^i`3mfd>V6DBQobcCI7{IyrqLzL|b6TDPK)#`Fe;q#E*%r@2)K} zIW#Wn^~WrAho)`AtUJ^!tc@N3a5yP9M0<(5w-0AXt0;5_n&XLJdWA4!JPzxSPyo6 zYep`+pHJv}LXW}61(-C?3nVP>?@cAWVBNY0=kux8J_3puIq`rN^9?~V<_YMzZoM~~ zXZciR>kk{_a0TX9F$xLXoXB)oeRlS-{qwm2>8@J|J4X+fmv|9a8mOr+d zTmva~w7m@~EChZcwO2YPnAIJxX^>2zRN*x+pAPmlsb;22nInAN4vr{$&$CwD{5qy{ zQ7pb(~SFt@_s#1)#WyZtGRZDL$6>_{F_=*i3J%1Zh~(R-8*kr zHT!t(sXa#UAkX($lMD=O3Q(8r(dyz$|>^RQP$-=d4#VZ<_PQsLAi#x%pw^)=9 zE$dwBHPQ`H|FjCe-ekBX3XN)sju5|{?&QS;s|GJbHnERc(FPtcp}2V+Yc zBOQgK@6l>_+xzsx0SiBJM|kh@s)R=!eRpfcpxXNk_Fq0^eLWYuIh7{Josh=%87=>E m6+;oGJ$$oXvaF_z`E@gI8p$Y=OG0da5+Q*<1l;jUI`&6h2cL4F4((#^2A?C!SYrb>!X{1awv@I)4;2&E!i+74Q_Dcu+Kz{p(w9nb60_)wU=o8eUrT<+b9aLp6T6mdKI;Vst08EBY>i_@% diff --git a/Client/pixmaps/anim_4.png b/Client/pixmaps/anim_4.png index a89a499c9f300eeedf1c90761cfa383329a624be..ea3107b8e3d18fc1c520ce18bf6b947d5960ee89 100644 GIT binary patch literal 1782 zcma)+`#TegAICQ%_v;Qh%iK<-C0njVj&Mdch967p8drDIcq6Po}G*Mni ztlXn^r2>-IQ_jR_xpn#bobgamQGvm%9Ual`ToD?LMRR3XEFN1>i=~UOt&7-x2_8=% z5J)6aBB?+`Vo4Gc(-K?f(&SLN)LJf;C8BaCsr{0I0(t?fpT5f?y?>6e3yZ-J)$Ssz z9TTxwtkza8m)rjjWB)KIXKrpzBoav^5}8c4M@dnB*Z+@v9;hQ&kS_ouy-y(lG$p8) zyitw!!X*L#>Uz5Zj?ZT7$U|ic3ge;tMgyp1^V39tMl}GS#6cn5&LqF*-pPy;9MZ{+ zSZ-khoDj=Nx7*hO6~OnDlXE&`A+zV(KYx4QX8 zC*U9dX%wzjoGsai%gj>cWdhW#I}q85U51MXAY?(H`PvSrC?W=B&hxewe^Dz2cv>OK zl%a(;VRdx<>fr0=DjLi-n!#vT)6rk%BT1~)Bfi!wcA9^^gWmA3>M)j4YnjOVX;BZ( z60@(M9t{q`I<)OqXp7LTsYMhmysn9J{t% zMjs47E}4&cXHG9|27h&IxG9`dVdEziEdto&@S^T1x{am3f;Y@UoXdp z7J(V1sIUMKYTdy8+w%zGN{z|^+Km)@&#H43?EdAL6i|hQn~4ST_>C;+J6$Jq`Q4yX z#AVZrxdtKe0!ec)GRW|}J1>4{xc&|t&eA@Mu=atVb6z?jew*8|Ofc_N9IL;|zHSh2 zyB{~^-O6WFjvjQz{n&>3(UzPp8h;!=XP{c>nvgP>7)ZI<|F0U%W8aF#Z;I=U*XHb4 zlx)qhU)y~t#5Z-}$BL{u9{IV5XXM`Hl&T2BPi*}~ely~sN}BJjePqoSn!SHnftv6A zA)XQ2s}WxjvPb+u-B-GvM~!s*&UvXimAt&#(k*qUVAnLFgEfT~8TwTG?Smpu=7rQ_ zGPbb6w3!C{gdr)^$@~)D)TRG;;5U(&pUDE3et$CSZnYn@T4AK_lMMBDagN%<*3zrG zs~N?onB|ANZKFkM+kscNwhYTTFA25k1FB^!d0Wo7ckM8;&H`86Z_4I9bNeD=bJ7R* z_FR@Zf8uHQm$%&4Nf~yfIwhNf9h{76;wT{(?*)*4g_Me4#L|Yy&=)P?CMnEY8`pwB zD2+8~zGC6AezvDWBeQtc?;@iMSdEa|yKlu5n0XD@=mx6oe zo{%uH+sOmEQ%!&8+I8{(>e4OfCu|6thsR)Mu$+SP4NMPtQM|G0@5gLR*+L<8h~pj3|1yO(bJ>g{vhOU#pn;B!OSBr>;LtX<)RHLX23G63 z4}0>HPPmNH=Y>ufny1(HtAR!nd`=`xB^3fW1jvPsNp%fDI2}6dx|YOnKXYZTT7LJ| zqmiFGqcuMH)z`Cth_jR_EcB-W*6p8BLazCH- EH*dH@FaQ7m delta 217 zcmeyyyMSqeq!b$i14F^1sUbj$Ey>&6h2cL4F4((#^2A?CfeHevPwmJ6%E^|vMwB?` z=jNv7l`uFLr6!i7rYMwWmSiY|WTYy%d-?{vPf^VSDs1s|aSW-r_4Y<5Cxapn!@(!N z-bY4%;O;OFcABOk#W?YxbbRV1j%Qms%nYuGJeef1JCMavCdvFv`ki+Z?&lmoHH{-k zCfTe@`L$6KN0UO6LWcs!qosY*eYB*a1*N30z*x=6J$ z-Dt;UqO>O0=rj}SGK+-eb{5jk^cS4Z^Ss~pdEe*zKF|Bpd%>URr3*2E00018JPu1z z=kVnKYpP!_mxxGpYWDXbdxF7WYwN8$cM>oH1%W^!2vj6eFo{`7Vkt>Wz|p>D2>$NPG&?1KV9DEo^P#$5nl#Vj6+CMOO|l>X-TZWpY1B5-OC z)eTIWb#kujbo4p?B)W{;SCiR`z$)99_&RoFh)1(~q@3LNy2gOk zZ}BeN{1<&+$|npnj@4%ljE4I~E#S}*6Bt-`3gz#OEI5q6x&tVKYxALq=<3?uz4XK` zHzyx`fw38N5CscGX7Qt8KqHyU{tBNUjWEm9Hx-hth;#Q!p^YJcPwwr>J@nfdPvBWb zMbE5kVhR@{!Datq2yGUYhy(t@V(GQbggg-<{8%j`#qaQiY{sse3OdTsQnGJ?go`4fRsYD7x|iQQ>q$o~d`9ScBiQ z>QWsiIxIRlK_kFlPAi!c6N^~Yym}Cd>(LpzCJC}tSs=BRXDy5end`sw)j_bm$mEgI z^Kq;Vj5jtks=;(+Airio?~vC_E4QU+8tu*%0F&cN?FRzJ97SZ)T3h|HUc>tJkoXU; zPb9vaCNu9Qp-zuBYW$w<7}#7tm{D$W>jUTL?SvzMEm_#-NnI4XNqmP)D*EgFR8CHV zbkO=k**wQ$bzl|7b)VLL>UdieXKuQfcP4!o6dBB$eOxl(lrMN78A?t_jDb#uTO2(U zOL4Tn@Hq*YWSiecEf0Zx9xdOKQ#R7_7BodhGS{U(z?8}!wTxMU$BeySeQqf~vnl)B zK+5~$Fu!|&?{=UIIozv0+3AV1trGB;r7LqMZEto2In`_G0%ePPIVUe_m!Klo^&j?( zNc%B z*?F+PB8(L>Js6ja8rb1M`i=(O=vo!q-ml?o51DB0I^p)(!SS$jE0CkyHEA5Wt<~YX z9BJ}TdfsF%R28+u=+;jA)kPugckTn~#x=Qq7_+6?;e^a@Zd%WN8i-PKacOzQ#WZ*1 z54)uujBhme{;L|s_koudAO-CvOPk?8Okk%$IRY*0Hm;mDW$TVzYfXGcIoIQ;uxj3y z(X6!Ndp0?=h+_@mrcEdL@2*_Aa=%-HlAd109t;D3ZD(B1;-T8v&{n?8Y z>zUw<_lG@JEt+A!#wHYGFAm`&LocGko&ZxVQ_$e35yqB53X=V_z_0BoKkhiuhLHJS O`O4xwiP&mPXvTj^@#aqe literal 0 HcmV?d00001 diff --git a/Client/pixmaps/anim_6.png b/Client/pixmaps/anim_6.png new file mode 100644 index 0000000000000000000000000000000000000000..ee207da9e2f0b58a557829842648d54afaa68664 GIT binary patch literal 1726 zcma)+`#%$k8^^b1XLG;ikX(ipeUl^QoSB9ZW5VWsNiK&lw-Q~3Gs3|%YwlT&P8O-n zaajqA#Dw9X!`E$LI#L+PS@|wI(_ip?zh2Mtc|FhT`Mh4w>-piy_jGqwlshB`000zS zFphYs{=6ShkTg5nL`F%a+tbbaEEEbgHMKw>T+tk%t1I4>Bf;YX@r4Y0i4f0T!E;4{ zfe{fA1Og$MP$(oYMajv;WHz5DC7YAY;AAs}*__F2uBfoEq>#xi*=MDM%ct+dq|=3r zeI$$#A(P2uvpF0N_ZuVMn3Tfj^Myj8NF2ab4@P-$zv{u`z$c0#_`<6b*^oEQC zbOnx#u0ui##fxxc@srFN4EzFXXt&-#4)~|I6_p6wQVm)AX^~|*5IPl33Ik!#7bnR; z+VF{G8unoshS?qcAOZSDX;2H4d(7g*>KP24@6=5f_Y7?LLi< zxsqrm@S)#z=(o8FC6h`qoEiRYU8&cI+2l7Uloj_>~Xc~V^Md+DSw0IRBtWlAJ6)yYh~cnU)Oa>p_l!WZ3xw^T0AVyUGV!Q<+3tB6cO9_^uzA|5z1?AmSG<1 zcy-G5HS8b!fdPn71SdUBQ*BPypnXFbb{&$}c$M@HY1i2Ssx8_=U>dHHJ|pd-J3+PO zTiTdJClpv)2)IYI+tu#MrO$seY0vLbTN*kXqUCKfz*{>?DjeHo;N2qce{!^#txj)2 z>#MSWnlU`#wBwBIl6}3cj6tjsZXBiZ>(c7hfT2FDR5k2qo@!Bi+823y*{5D@ryTaK zr`a6d(@;y&$1J;@@=*HKd{pjg79F?vhJ5sbozWU-pk`rqaaJT$zyVt2YfWTQ1)Dob z3)Z>YC>8n5Zfad!BLH8UZeT>}?$Y`wQzObOiSsm)+w}0D>A*Jtrs`y)x*mfXNN(Y* z!z<)(55|7CgEQ==$3E)Y4U&%RA@7c^Eclb{W8ivLxh1$~`6Cm(6&ku&<6~h~xyF&D zI(1Gl^o3JXm3*zGQXKw&Kb$x5(ki9uI5aOBV`6e!ZzNYcaS*kdqaW_k1}V3{{?v~v zSck0_VM8_gd6#&G=Di0*f3l!!^2!3|mkR9BLmp<~hfn69^H^WsOJt2>s52(1AoRRE zz6DZ}zWSLr7PgF$E&jlwTEDm@nb{8NN4&S?`r(8>?19!}GBr~}U(@!#zROv6M;1CX F>tE`)A?pAD literal 0 HcmV?d00001 diff --git a/Client/pixmaps/anim_7.png b/Client/pixmaps/anim_7.png new file mode 100644 index 0000000000000000000000000000000000000000..25d7927b930e9c2b1574076017709822e3ca0563 GIT binary patch literal 1716 zcma)+`#%$k8^%8FM>jDOYjf~7~Y;YK!1c$@pczbw!0G`gq7fbNmc|2bl z5I`gnqobn}qv?`pjx;ebEs-lulSAcE**q#oLgfjmd?}q?Oy}^6_n9x|i!1lxR8~sZ z`|PoYBpeQh%jNNS{C^qx7oi-nSS*o9q*CeL-kuT&D8K9fM?S9ro1T>~C|q-Qbq3^v zj$`G;!8ojcA^-r<*q6eH=(bGWR8Dg9bWwf>RRCGQ`cD464FG^r-JBhL$sbnBCSoV8 zp}B6DH^JDhP!P*cL?#Ndp$nTTDSN*M^d+Avv#j`qn9@*ZGED9qK9R{}DlaV;T(}_| zbUm}Rc9RGmS>{@)h{vvkE&>llSp{b6{Rbj2NauG|x9okRgXPi@mW z``|zGK?z2qtP@s`-uGVxXX>zo@SAnC_;F~gR!~99N{SR;T2mF*8y`ThxF0+N869LV zU48L1#%q?*8U&FAFlldcqA@FDW`EUL+5b&;xboN^kzncu@5@c+J|0;0QY4-A{N`|$ z>MbX`aRU5EWeq&g3)s^H8frK;OgROnFYd;T(-4AsI8rd<-{lSxCVd@vxsvbcRsCk{F4yiSogZFYin2dYM#q<=H?pafXa}R-63tCJ9Fc#gyCc;W;1liQ z?qGxk#}+0(3y46op7~)rJ*iUw7CN+?uqxCsoN6A<5f7+OSXPX}O%quhSRgKWFE%@B z>dZOeP!Xfvjt%0cc@DpZwKvT6g$T_euymci}yO^+2>1zPPw7b z<*53a^A=$muE?+q=ZpI4zqJQ*0gVr&{L@<%D<4G!;igiR;Y+&tN%(9XNGtNwqrv(u z)~b1a2*OXV!t6{4o^$0S3R4a;j=0z;Yi_z7wPl?1Iy51zV!U(J@MJfDp#T1^HYTBX zEmt#dOi(Ud_sx%t-)=2CZRBrZQ-AQM9kh1|n;)ZBJ+x6W{RDPMDZ_6WBQU<%9_T*z(gwVM!FK zu)DWot~`r9sg~V3pe*gOJdX(d=rbtki>Xo0gyB<6F0~MSCR$uFcG|L%tB>c*%t3}< z^@tR2+|xH0^uv6_>P%Il^QAHB%u&Qu)W_TH}Zv#PaiOuHsYt^}(qHEJAvj zMkDk_$7^wuh!zi9rzpa!js;Qa*>w*EQAU-fCSK*dS=u$7WS{k&Oph$ZQ{2EQrTb?$ z^8|;qU0OP8Z&fB^4IS!&jYbCPWF_nQfy?=Xg6k+ice)CTq*?GQ*dSu5$zb~tL^%TZ xs6~(pXWccKTH&oD(`&<>S{uG+>_ &rg):Gtk::Window(co),refXml(rg) { - Gtk::MenuItem *conect=0, *exit=0, *about=0, *mnu_prop=0, *mnu_disconnect=0; + Gtk::MenuItem *conect=0, *exit=0, *about=0, *mnu_prop=0, *mnu_disconnect=0, *server_stop=0; Gtk::Button *bar_connect=0; txt_view = 0; work_place = 0; @@ -32,6 +32,9 @@ Principal::Principal(BaseObjectType *co, const Glib::RefPtr & anim_frames[2] = Gdk::Pixbuf::create_from_file(PACKAGE_DATA_DIR"/plaqui-client/pixmaps/anim_2.png"); anim_frames[3] = Gdk::Pixbuf::create_from_file(PACKAGE_DATA_DIR"/plaqui-client/pixmaps/anim_3.png"); anim_frames[4] = Gdk::Pixbuf::create_from_file(PACKAGE_DATA_DIR"/plaqui-client/pixmaps/anim_4.png"); + anim_frames[5] = Gdk::Pixbuf::create_from_file(PACKAGE_DATA_DIR"/plaqui-client/pixmaps/anim_5.png"); + anim_frames[6] = Gdk::Pixbuf::create_from_file(PACKAGE_DATA_DIR"/plaqui-client/pixmaps/anim_6.png"); + anim_frames[7] = Gdk::Pixbuf::create_from_file(PACKAGE_DATA_DIR"/plaqui-client/pixmaps/anim_7.png"); current_frame = 0; anim = 0; @@ -51,6 +54,7 @@ Principal::Principal(BaseObjectType *co, const Glib::RefPtr & rg->get_widget("mnu_file_disconnect", mnu_disconnect); rg->get_widget("mnu_file_exit", exit); rg->get_widget("mnu_help_about", about); + rg->get_widget("mnu_server_stop", server_stop); rg->get_widget("mnu_prop", mnu_prop); rg->get_widget_derived("dlg_property", dlg_property); rg->get_widget_derived("dlgConectar", dlg_conectar); @@ -64,6 +68,7 @@ Principal::Principal(BaseObjectType *co, const Glib::RefPtr & dlg_conectar->get_ok_button()->signal_clicked().connect( SigC::slot(*this, &Principal::on_dlg_connect_ok) ); mnu_prop->signal_activate().connect( SigC::slot(*this, &Principal::on_mnu_property)); mnu_disconnect->signal_activate().connect( SigC::slot(*this, &Principal::on_mnu_file_disconnect)); + server_stop->signal_activate().connect( SigC::slot(*this, &Principal::on_mnu_server_stop_activate)); conect->signal_activate().connect( SigC::slot(*this, &Principal::on_mnu_file_connect)); bar_connect->signal_clicked().connect( SigC::slot(*this, &Principal::on_mnu_file_connect)); exit->signal_activate().connect( SigC::slot(*this, &Principal::on_mnu_file_exit)); @@ -87,13 +92,6 @@ Principal::Principal(BaseObjectType *co, const Glib::RefPtr & Principal::~Principal() { - if (conexion) { - conexion->finish(); - } - // Espera a que termine realmente. - while (conexion) { - Glib::usleep(100000); // 0,1 segundo - } } void Principal::on_realize() @@ -197,6 +195,13 @@ void Principal::on_dlg_connect_ok() void Principal::on_mnu_file_exit() { on_mnu_file_disconnect(); + if (conexion) { + conexion->finish(); + } + // Espera a que termine realmente. + while (conexion) { + Glib::usleep(100000); // 0,1 segundo + } Gtk::Main::quit(); } @@ -206,6 +211,14 @@ bool Principal::on_delete_event(GdkEventAny *e) return false; } +void Principal::on_mnu_server_stop_activate() +{ + if (conexion == NULL) return; + + PlaQui::Server::Command c("server", "stop"); + conexion->send(c); +} + void Principal::on_btn_activar_clicked() { if ((conexion == NULL) || (last_selected == NULL)) return; @@ -235,7 +248,6 @@ void Principal::on_mnu_file_disconnect() c2.add_arg(conexion->get_host()); c2.add_arg(conexion->get_port()); conexion->send(c2); - } void Principal::on_mnu_file_connect() @@ -302,7 +314,7 @@ void Principal::update_items_prop() if (!paused) { current_frame++; - if (current_frame > 4) { + if (current_frame > 7) { current_frame = 0; } anim->set(anim_frames[current_frame]); @@ -334,6 +346,7 @@ void Principal::on_conexion_finished() delete i->second; } mapItems.clear(); + is_xml_loaded = false; } void Principal::on_conexion_ok(const std::string &body) -- 2.43.0