From cffb65c31030d1fe008b66a59fcfeaf961011941 Mon Sep 17 00:00:00 2001 From: fdbozzo Date: Sun, 30 Nov 2014 21:03:36 +0100 Subject: [PATCH] =?UTF-8?q?Changeset:=20539=20fdbozzo=20-=2030/11/2014=201?= =?UTF-8?q?8:55:29:=20-=20Agregado=20bot=C3=B3n=20Cancel=20en=20el=20form?= =?UTF-8?q?=20de=20progreso?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Convert_VFP9_BIN_2_PRG.vbs | 3 ++ Convert_VFP9_PRG_2_BIN.vbs | 3 ++ VFP9_FoxBin2Prg.vbs | 12 +++++++- foxbin2prg.exe | Bin 467912 -> 468467 bytes foxbin2prg.prg | 60 +++++++++++++++++++++++++++++-------- 5 files changed, 64 insertions(+), 14 deletions(-) diff --git a/Convert_VFP9_BIN_2_PRG.vbs b/Convert_VFP9_BIN_2_PRG.vbs index ecd0fe8..8a6bebf 100644 --- a/Convert_VFP9_BIN_2_PRG.vbs +++ b/Convert_VFP9_BIN_2_PRG.vbs @@ -60,6 +60,7 @@ Else oVFP9.DoCmd( "PUBLIC oFoxBin2prg" ) oVFP9.DoCmd( "oFoxBin2prg = CREATEOBJECT('c_foxbin2prg')" ) oVFP9.DoCmd( "oFoxBin2prg.cargar_frm_avance()" ) + oVFP9.DoCmd( "oFoxBin2prg.o_frm_avance.Caption = '" & FileSystemObject.GetBaseName( WScript.ScriptName ) & " - ' + oFoxBin2Prg.c_loc_process_progress" ) For i = 0 To WScript.Arguments.Count-1 scanDirs( WScript.Arguments(i) ) @@ -83,6 +84,8 @@ Else cFlagNoTimestamps = "'1'" End If + oVFP9.DoCmd( "oFoxBin2prg.o_frm_avance.Caption = '" & FileSystemObject.GetBaseName( WScript.ScriptName ) & " - ' + oFoxBin2Prg.c_loc_process_progress + ' (Press Esc to Cancel)'" ) + For i = 1 To nFile_Count oVFP9.DoCmd( "oFoxBin2Prg.AvanceDelProceso(oFoxBin2Prg.c_loc_processing_file + ' " & aFiles(i) & "...', " & i & ", " & nFile_Count & ", 0)" ) cFlagRecompile = "'" & FileSystemObject.GetParentFolderName( aFiles(i) ) & "'" diff --git a/Convert_VFP9_PRG_2_BIN.vbs b/Convert_VFP9_PRG_2_BIN.vbs index 1b7d8bd..1790852 100644 --- a/Convert_VFP9_PRG_2_BIN.vbs +++ b/Convert_VFP9_PRG_2_BIN.vbs @@ -60,6 +60,7 @@ Else oVFP9.DoCmd( "PUBLIC oFoxBin2prg" ) oVFP9.DoCmd( "oFoxBin2prg = CREATEOBJECT('c_foxbin2prg')" ) oVFP9.DoCmd( "oFoxBin2prg.cargar_frm_avance()" ) + oVFP9.DoCmd( "oFoxBin2prg.o_frm_avance.Caption = '" & FileSystemObject.GetBaseName( WScript.ScriptName ) & " - ' + oFoxBin2Prg.c_loc_process_progress" ) For i = 0 To WScript.Arguments.Count-1 scanDirs( WScript.Arguments(i) ) @@ -89,6 +90,8 @@ Else cFlagNoTimestamps = "'1'" End If + oVFP9.DoCmd( "oFoxBin2prg.o_frm_avance.Caption = '" & FileSystemObject.GetBaseName( WScript.ScriptName ) & " - ' + oFoxBin2Prg.c_loc_process_progress + ' (Press Esc to Cancel)'" ) + For i = 1 To nFile_Count oVFP9.DoCmd( "oFoxBin2Prg.AvanceDelProceso(oFoxBin2Prg.c_loc_processing_file + ' " & aFiles(i) & "...', " & i & ", " & nFile_Count & ", 0)" ) cFlagRecompile = "'" & FileSystemObject.GetParentFolderName( aFiles(i) ) & "'" diff --git a/VFP9_FoxBin2Prg.vbs b/VFP9_FoxBin2Prg.vbs index 73899ab..5ef8430 100644 --- a/VFP9_FoxBin2Prg.vbs +++ b/VFP9_FoxBin2Prg.vbs @@ -62,6 +62,7 @@ Else oVFP9.DoCmd( "PUBLIC oFoxBin2prg" ) oVFP9.DoCmd( "oFoxBin2prg = CREATEOBJECT('c_foxbin2prg')" ) oVFP9.DoCmd( "oFoxBin2prg.cargar_frm_avance()" ) + oVFP9.DoCmd( "oFoxBin2prg.o_frm_avance.Caption = '" & FileSystemObject.GetBaseName( WScript.ScriptName ) & " - ' + oFoxBin2Prg.c_loc_process_progress" ) cFlagGenerateLog = "'0'" cFlagDontShowErrMsg = "'0'" @@ -83,6 +84,8 @@ Else cFlagRecompile = "'" & FileSystemObject.GetParentFolderName( WScript.Arguments(0) ) & "'" + oVFP9.DoCmd( "oFoxBin2prg.o_frm_avance.Caption = '" & FileSystemObject.GetBaseName( WScript.ScriptName ) & " - ' + oFoxBin2Prg.c_loc_process_progress + ' (Press Esc to Cancel)'" ) + If nDebug = 0 Or nDebug = 2 Then cCMD = "oFoxBin2prg.ejecutar( '" & WScript.Arguments(0) & "' )" Else @@ -98,7 +101,14 @@ Else End If If GetBit(nDebug, 4) Then - If oVFP9.Eval("oFoxBin2prg.l_Error") Then + 'If oVFP9.Eval("oFoxBin2prg.l_Error") Then + If nExitCode = 1799 Then + MsgBox "Conversion Cancelled by User!", 48, WScript.ScriptName + cErrFile = oVFP9.Eval("FORCEPATH('FoxBin2Prg.LOG',GETENV('TEMP') )") + oVFP9.DoCmd("STRTOFILE( oFoxBin2prg.c_ErrorLog, '" & cErrFile & "' )") + WSHShell.run cErrFile + + ElseIf nExitCode > 0 Then MsgBox "End of Process! (with errors)", 48, WScript.ScriptName cErrFile = oVFP9.Eval("FORCEPATH('FoxBin2Prg.LOG',GETENV('TEMP') )") oVFP9.DoCmd("STRTOFILE( oFoxBin2prg.c_ErrorLog, '" & cErrFile & "' )") diff --git a/foxbin2prg.exe b/foxbin2prg.exe index 5e7e9b5fbccae202217612ccaa1ba4d656d401fe..bc0aabe3f03f11bd813ddb580aa320ab29c5b3fd 100644 GIT binary patch delta 17250 zcmZvj2YeJo8^+(;yV)!0A-xv@gwPUdfIvC~(oCU449NkJG?LH+JwZg83Pu=;fJm1j zML3bFf}$W`0Y0P`5s|8BsNs9&_HvwPbbtH&pLb??+gP)yrm;GS!E|hkcJxolJKe zDCvRp^l8m~mC8+z1VgCaKx-a9&}g+!aG;>to27vPTC(VR9qoL;-X-|EvF#C+(A9dC zb#ii`^n#>>%%qg`^pxbSnPpermX4^n+bUI~+8&Rao4!=lyNcS>sc4x22N_TG?%+%J zv{a`f;f$hs7s|65u8#|q<7vn&>QL`QK0P0>8T5edRn@zZH1c>a|-RyL;cHdS?Xc9E2;uwUA@&na6$s{Tk|LEhJnV1%)`FklJ;R z{W9`YN^<9aWOfmxvR)fowIoq3)KfWQYl$HaAQqDX+cs&`LL4VDPsytM;F!@i~DMouvbGkwMRixVbKUh{&E3R%IkNy&A|LL|f`**ZDW$k0RgST!qO7u{)M!mv zrEjP}X+dU1UP+m;x~8zKvf3Kf8I-UOvgTJClS&J#tFw(&sm}^n#xFaw7OFVz>cYZ9 zuQ)VR80S)IEUd~eFBvu3n3ilUZ!*twVU48#C;l?_s-1i(aaAW?e@qD2xYvSnVp(GEa+$1HilV3wXHHf>oVfTc05W6LOu-J9y>)n_S4{9sx zbk?)FAgrc_$vzF`)PBCqi(hbMTB)%we=H7lfcvU%sH~`}F%~42l*eRO4d2-NKck4mAjQ@UC8{IiOU9znHHB3dvJ^*8 zXv<@aRW&75`$s62yQLLp=VbNBNysSZnUav4lCx`ypAvKs!A#@0nu5fH-f7b;CJ**T zH7D`)jaZ~-rx{8@1LYXY3(Jh64ZgvzH)27in{$+qj;iq#rI(Z&FTJZcPBgZvq{f(1 zRaH@yUNO8)Z9_tf4QH;^aaIz-DM&3HT|GkoUPA#X3-Fut$& z|E@-x4|u#MYa*3>z(;tp5Ra!HDk<%5(JB7ECu=3WyMiC~WX+`7mHcm{l+2DgW? zM)WMXqGuVgS#eug8Uv5^WsUgJq0C!ay^Z^M;}{D*<=wqms8qCr5A{Y}XcwR5&B9ds z_{ZL?iErd?CBGAu;yxGR?v#!$DK0GD&u<}Y*s)&;dl0`<%sdPi4=C(IJl@EBx_Eu9 zusfAkRFxH$mb_e8)u*tuqN-m;`r>btm?Py>jI~vG{;MO8)&11J#>SIrl972A(^`grE&=Zld?By+YVvvkg-B|~TZ&CmO?a4*w+ zC2p|BQ*pu(54evX3r_WUq{PtUS`Lw86c7DgtJ{zx!&p9gu}ZXDH93&6tg>dj7(c3t z<1`j?UKsQAH!7OYY%QaMIQ^ImV_C&38ot4g`NZCql@icvi3AzOnh_PnN|LEMCFD*O zL&YiD$2L3idQ?@4bK$}MXmib7c{hI+5irS3$>WNiZWx+CaY1%MhUI`I?%d?he58f$ ze1Sg;@)_AkN$E%p1FA^sKyMEfVLXdioYWEQd@pLka_d6YNii;JzmM}NrmM~14}Hez#v%AGc7qe zCG&CuUyQW+w9KUR{N$8ri99lp1@PcNrc>SF%>r43v?7&fiM>xRvG?Y01u|!;UAo8@ zBt6U&$MVxAr6lL)qUz)T9|f~Oxu>zPc+^6nL#5os{JUTluG+)z2IDlNS8$&YWLdkKcMf6A{PgQA z#o8aKa-*=c;z-)s%@(bkV^=dbhu{u0{)|5fVcv$y(!!cyXy}o<1qXZnu-B5OoIbj);niwzgM<~{F z#TAQbpKj$Zym=UlP}TA5FtliwYkX7~^OeTl;IqO|clWz|a~Nx`y35aq-A=9zXCXda z9*J@s$Pt4^v9TOOt9YndKjGcOak;0ec%N|ACTgoBSyCA+U6AtpoYg3vBPkq{P*qhp z{ubXH&LX8KUw#I~OS6M`eK_vVz)&94nE3{6Z=z&!S9+|1PocZA&GOb(AfzHtE%^_}RwHU+UDFKWxkbq_%CjPXr5A)$>jf zC}n1QJ~#qL4(-5Si9j=*oXp>kz}30Tzd$(P&WlQ+uGWfVjjpL2T_Z;O{6em3!aPmo zMM?@c$|@R%aCJ$srH@Q5shU-+gd8caYIJ!KI?t?9V@zwK;@Y+BsTRx8{w_TpFH$+# zTh;Ff%h}#4TQxv09_SVKT!fGTY1{m32y})lbVP3w! zT@bDZnqO{S$THU{9$jTT@Qbj0&|s~0 zC3@BIWmgr~pcHKBV5k17csh$G=4(;cgyZ{sktg^I&6uapk>5nr&w80Yxh^OG=gemx zWS)T!t?VW)S9W1lwXry@d{~7jHuZPDsTm823%H?VaiK~PPd1JzDKd&gs+&r{Rm?^( z>OYIr+)*MJZ41A~V_ketVLgqmEJnLZPD~nnpLdO9zCNl4A{6-CiAO)+Ws#V^UgfhQ zS<^((Et-Uk76E?r7QotxGn31-@;ajhdjF#^Y&i8Mc6HE_SJ0`wwzE-+HNKI{0VK} zC;V2nOwINy{Cqm+uZ7>*md@#0{(CFTc8+kD)-2TZ@54%1X*!*c@c7ou%l)S#!fj*A zL_aEi&>7)J+x&&+`D~=`eEg#DV{HD{R}_A}GF`3Y$BtU*%{ zA!TI9HCAD@z|6O`Va=sN6~EX9D<{_c>x!qe#5XO}4NoM>O-@WLGu9Mhppy!B zaD6)#5H;#8k-8gZK8TC4BfD_8WenXkTM0BgvK~_pAV9QQD2s9KHH8R^llkKd02mTeSE5sbrmI~*jO4;sjQ=Pej=8n>-2~}k|-sYt9G+! zekYx!^0VJCrw)w}^g!?`7QifjPwIu``A^FMmKUs+mIdcJZ(f?g!khUhjtKfH(h1TJ z5--C~>V@wweEvlS>!2#+4>DMYswMZ!WFhHT8yE4W&x&XUX>}u?$>z_bT1hL85e130 z{wG+T&Z}#|CuFh!kCqk>#}x@$DZsa9vZkgOz!l|q8byjEZ6Pi76ws~#M1k!Es0qud z$^kkkjD=K%J1U&r%gUV;##*Wpk5w3}s1}Z@>#P{bR->+ql^Y7|sxa12`SdK7(OObY zA_=zTEJY2IEntnLhz#Nyi%6>Zeikc|R6Y2h95&m>i;@b`vyuuhy%Fo#V&4PbYI4mt za+s`fN|Hq$5~Zoj`O`iuzI8ebS(NBRsTJd_iQrWofR|SR58oTvCk}&hc?!Snakf*umwm zy~aFzUZ8oc>RjoCIyd^h&RtYg3V5QeYsB9kh|Z_w0H$>iE%v_T0@s;$AHX~tdH#3u zK$QnyKad5q6OA|NzWOP?x8VQlLqtxc#?>P#3zWsjC-sBHk-brr50321pA2L{X^kw0 zazqA8Ra81C@y+6adXUsmik?b`mKNj{Vm%0_Eei4bM}6Xv(60LJ?5Zy+fq5S)F|@GS zhz2uWWcUB?>m@n5II&kSTf`hb7b-t=7Ur568Dd&9HZ`FVL+nYNEfTU?tvSvo}XhQTb~g*%op zlLHFJO1k(2xP;FuW1D5m@rIg{%9+8{-1k+sTcudDx$A3ex&xNLMPg)oS23`#Z8hE# zhL<^W5{p*z=~GyNl5weGKb*owsrcxrtfgYFRP0ZtGEbG~DqA6|ZEB5@;NF{Tl;pYA zW`AT;>nsWQ>=|q~?>m#ZDCKT651q;Uoy~79U@6wBA5#*ZTgbHh?}e;V=Y*jfXYfDs z;6?17iVs}Oe3i^+%$19oqr|5!W#KNCG#AC;EFawFEy2m{U&@xMJulhnaM`A=n8z(= z#jgD7)`pt=YQDRbMQBvl%-)}}{>#p%uUU!FS2l@!C}$Ta@vNucV$nJ+`xBSWWyc2ZFzjm zQJ2`?QlPKR!D^zjv!+lUWbha5?%x;prUggl$=EU)XYB{G(H=EI2C{&&B25D)W@wQNcO(mLp zY2-Z`?yi>;l?5rSS5j2QB1Li&J}VXl_iV~{#vk z^CMkkf2k&c|K0@`#5spMc9jF9;5^=3?EmV|dv=urrNDuFcvm@0nmB^b>?#LIb4vKS zuClMZy+RbtD{Ivr{9ISrP5Pjk-|Z?lmUdQi?>Ouqj^}Z4DA@C5J|s?VDt-3~e=|-F zldrvE$@s#T>PEaK4jEsY#E&B&eLRUjh?AR3=O*)rZgLapm&rV%n;af?W3tF#sXW%4 z3i_m_^tFMw9NO3UyWMaA)hxcV8_Efo#m@`AJDcmegB|Da7Tr;ifLfl>T@I0&a9$xe zf%Dnj<s64N_T073S<9!047=9xwedJ|?+yIhc$}f%CjN)mvn|{&LH3uOw~2!09%CLn zD?!%z1n(AXxqV5gJ+RNu&CAM|e1KOZ$Q@K6d{u&+>z6=@cn6MFO{U2zcWD`hbCr}p zld(5z6J>+JbCVp6@DGxt3RT^OE&ls~`=!hI>UMO|T%Il$^ir#&KX{u(=#DSXlgDV| zRm&(uwTutp^3v9yYc^A%>U&cD+f1WWEh2o`OzqDsk}c9+XAjwOa#b&*k7yOP_U0z@ zb>|z9jkqoC9tPor4Vvu#^X$0=)to7DlNL z_$c%ud>FkA9t1uFz3Kqbeeh85|Dbn#g)f3?B7Cbi(KWz6d?_`+C`W=npnp6_)CgPy z*5OO(AJ_uGFN0(7jWq5MQ3Uuka1C_vVWL*xsbCI0;X9&^;920U(5sFR#e?ysp3Xxb zKT4Dao{!^`<1wPg*m7VjL4t_yiGIg65WE8H@dMG%*owho;-UVL=o@ThV0?C_KcGMT zi3qD;v>kjAdi8Of8h97@81%doL|Dk8FTi`D-@w=0IpBjhK5Ycl{13MP1}aAzp;wJybx{9WQe+S1xKg7WG0T^rL6osK{VYZ64gCBzrL3hqo(IKz~l`Md6 zKV3x^z=yyCq1W%iVx11xe;W>Z8n9=dibm*(J_lcgj@pki0RIRsf{y%JMRUPt!Dpbi z{-mOhz`=O>ru@JBwTO{~x@K}vR(OQY#0Ivlff{xQk zv>Ln-d>eY1heVse=fOvypI~!zMB(6#o)WDKkjNeU6r3L@(V`%U(!mb64WC0l43$h& z0K*MN*D#6NHkN1@xC44eyAx0a};y+mih z72tpl5`ErTA{Qr|Ah@&(e#g>PqW0ig@J8r;aVCipU@U-9&`qKb;w8!eF99Efu1S-q z2>dO0FZA?2I4kf)@aNDQ`b%^Td=q>by7y325-e%aP@#JjOVq|0k1MziI@2gocd!e1 z8gyIJIEj*B^nvjsbf@tW?Ev=&{|0TIfU^J_!9ynE7k{rxbOKxs-U?kXMWV~#DPYYT z5*>aMm)r%n5S%kjqJuLe3I)Fpeto7ykC#i-4g3(iY=uOo8`~wi3L{%btH@A53LGXR((HIC`0{;jO$FsT( zU%e)S&w%^hlIRM)bQ31It$ML-0!I%h*nU@v~N%=73Im ziG!NX!NBZ{;vLoW0!E%IU_bCZ==R=f3U5Rd2|fkgD^yLX;B4@1=rK*yG#xw)9D*-X z$@moY30VBx@dmUrzC3*go&??lorRI=I`|#%JriJM8?0MUEt_M5yQqwSOe}Pr# z8$5ce=~})Tk1A0#*fg(?nl6;6Dbo`j1B`cGQd8G)YB~nq1-=12zgA71yf8-KSxDx^ z^#2Ris%hf}HPym+4GCV{sHV8BYT5#R4}1-J{Z8C7@D_0YU23}hrJD3U7>2>`?^n~^ z18V9F{sH{qSE%q2TxRfNaF3&E8gyPw3&8&98yqg+HpOZvq@RZJ{fT_>?8jml zbiqP;ZUFjz@F&pCsx{SovRi#60V2$L0X38{J9fn@TG<-VVndXfNpg}Lmz=1(KnoiUUNc2x)2Pt;65ic zRE}XV6`Tq7Ij5oPmozj5{1W)R%Npv1!F@aUL-4P6H58ArJuDQB7W@nJa7RXYp}7D4 z=v+LU7#Teo{e=YGz+-$F9SvdBBMkQ&TocOZNn=Knz-8c%A{f2iiqRVIY;ezLMtwRl zdJJ9%eha!?0=96X@4!XSZzVGt13m{X%V!kRkJ0gP-2aO(N&zkfjIJQTeekEyZ;rt4 z@*Cq3LuV9K!f4|tMgzbZ;6YW$T+L`1I3GNthSAdrjJAQtg12G}j-Acu4p?+9QG5VOJ^7rHYI9_&gHGMj81>#z0GJ(9V3%} zGjtj-itaP2f5>PEcrJMTBSvlN8C8Q z5&Sv$DfEX1nRbDH0jFWmpWrOhP4Gi-go{kATxAnEM`E}{Z*3#4_XJyLd*qp>~+9@^*i>m!(nh4f`yF(uxDARXfAMmI_ zGO3DWx&@8^uYhhe+$58G6j5s!p2KC@j4c8j1HL{&rt6p~#DXt@gXhZBOJNhWbQ`=3ybk)SSG4pLyat^As+K-6Y00H6X4T-Y-_zm;eOmemybC-B z`a0LrXW#?in)zB2ty-X^gD}2>(QdJp{Fi9yF8H`euo9PSwU%17Lr(}k0exo;Dh0j< z_Wn#u1F`J~{|>$b-EF6q4uNlhk3t{WrKKOh_rb$lxhtOIrE@ zya?=eSxb4>wDbVH8T<}(#Coa^hum` z96BKkxox4{&gm!>+!cKI63+Izj@Ez+z{8;ZFx|Zjei@tveHznU=WaL{IO@KRMm@!S z2X6+y2c0JCsS^A@@LZjq99{LaA8dLAqcvcPhn}9oaKo6r1A48ep2E9hMgxxX(bKSC zEM9`+!PB8nMCj>t@Ca~x8$C6N){`L~9TWHkXuqy{@&tbfj)U&mTTjEm=fUOBr!w`l zFCO>*8Vu(wJ?$Q-r=O6(0ds)D!FpO=tS4;(x?*rwqn>V#L?Ph*;6F#<3*vY^Z2?aN zzXQEvvYu{%7lCg<$4%E$U?SQCc;pN{-J7GQ?%?BKZ%nnz=j+LoXu>2B#=}MU;J;i? zCy^j947ULKtJQjPNrDE~L;GU>-45IyoC#fum;YFBckuO(^|X1Do@&6!;4{#NF+YD5 zTmilf{W9j~2f${q#}Pd(KCY)sQ!-{GF!ljH`&m!#fa}4NFY9UAbv@k&2Z!TPgg$;( zPi;~#R)8P}H_N zjSOTegK-eXPk_$?4D>R%4xERji>o09`Vss9tPeHNgk}c10B(#~&HK>2xq(7@;1+>% zVhk8Z3^Wkj9vt1)Ku+xpG!)zo%%P98H&6vQ1zdrpkl2m}6PaM7!zk%!pm(uN2WNsq zI~nL$yn)^Uj|IP&V4y!!4fG9o0eE^31NG}|pa z;M?FWgAFwKB?IjNca1=22c1!h^_LcDs3DB^N)4o*V4(KkG2p$g8feJd2KorR8C(nf z(|h>mg}v~|f*s}>C~pxC2>u;B4f@h115E@EY=TC%*+4oou26532abYne8@og;IrU- z=+ma}40IF5RT$C{10{TKpvT}p!Bx;N{%j!MbTpWzC=`o3^|uUE4K4+T-Zs#=N4P5B zWnlIgCx9(216Kn)=c$1fIpQBvfUkp(L3fI9pzp!C&CnAa! z`B`X$;J(m54RD}O!5t$}!GZWO=LiRK%f>AMzYRSL+i383aJx|sGz8nn;0fUA(2J)! z&?n%Zz~4cCI?I7tynr`f@ReB(CNeI>0byifUN#N7#c~Ha0Uiq;2%WM4ze~@-1Osf` z?m)eEIM596cJN4!#)MU{-&N=Zqwul{y&sEM;|(}FaLpb3P7wI%{9~#EoESmnbQU> z9PEloW?qJt9)h=ly)nuBF&|Sr%qc$w&%+$EG3J<8!8^gGBY@kOG`7YZZa<90FKH=# zw3a4R;;Wrq=Eq?b#*OA}{=-)7$P6Iyye^{rZz8F56V02XDvKzE|GJ9h1 z0Xu=KyfCz4Ym3p)8Qj!cPZ8KUfnC6-ps!%Gj01asYn$ll5C*%iz_BJ6uMg7GBaCkN z-b3BM8%y=n8>80@a6VX#(Q6_`tJp-M0pQjPFqmNQ*#{mDZoUp<1qPS&Bur4ivES+G zAjXm&$waS!$DP*GWsDtPgXe+gV(iGnSTQ^W_kR%#4OWISF*sa@u^OC&W$c3(3x=iQ z5`)JF8fZEC`orK&;K@pl8&?w2(!EB;}Do+9}s4lHNfoy!Zdx0cW;qp zoqa@@F7uVZPWyl`$6!fc5N7CNC4et5wm(^zIau@;Id0eogt>Ydj}F64SiMZ9 z$`wi?Psx^6j0;B-}l0XX5!;&lzNr4oq*QE#oB7y-&dhgOM z%7P#Wh#*axA|OqQ(vf07DgQfr!n$((_j>NW&-;BdXHJ`$of94%4mx-sXj9$Zx>W6P zRY6qL>@AIZ|6q`}ZmW?_oji83mu75b|(`I7z`ugblJ-co0()D;Cg$t2Q4M5?wjp{V(mNk!MD zOEXoxTRn|urR8}{%So!2&g9qe8B3#QY`p5FJ2^eCQqxlvxxIMCKBt#%6!|=jRQ$|49@3t0(r? ze9@nEa8Zrrt6f-#DwH2^VWIw=wL~gh5*I4WO*Rjx7?hikl$4T{HIlz_VL>Vb4{}BF z65h&{1*%%|w?NWyJs;u9!c+zPQ&(13#rS?#7NPo#-*jc6s!m+*#%fB}oOlC#t0wSl zHx|(|!bRDQ6XoT0Pl~JF$sPwc%kFk_{X4g7r`Nex9NhMquiat%xEu3MQn~+KBsuYQ zaHgYcuRh%4@7%QX*SVW{Eq4~BO5hpzl78{zBivaeTE75jsOhZ~38u>a3w?O8JJYK6 z^VMBiPBc!<6c1E>$B%FJz}fteAN62Co;*aU zK}Y!|iKe_E6+^B3xd#hSRd8QV7Tos|o)~e3yeMV3sj$LSnp9FeuwYO{sVT3Zq_`+b ziF#A}fi&Wq12o*tin{7+}<%_hLTX zpMLy0Fru`e+}x#PP~S?$aiP~vZu`QDvcV^+eP>D;nP(naj#CnsRbJX-mXfZgoZ^CE z73SR3*rPr`v@wq;%mUMAB|Hg-fN$IQj4IdV2*ttq65lH;&0W45@yqeebWx6(>0`>}9o!#3W~4@cH{hpiM3tAYE)$p7QVqWsHuzTRyiuAm9mp|GML z-?VWb--)n6^NkYrBL2G%^HSC2Dt{IpV)|CGJ*c>(w8&IgFxphw-Bego+9R#YZwGlh zf954!{f>9{XAS!r4!_PVD=97ST3Rx+ETK3b*%jup-+xqMZj^;s)=+a^fvM1zV!WtC zboN^&`nKXYobq|M`Bi_`K)QRIdj;S?ci!dA@a=ctzDQN$F3Br3o660o5f4MTGankj zA_DRsDN&c|Xi_0=qQZg!XP)r&i2EGEz#&Q-s^jf(h(n+98v!h|Zr-0t3|*nE=1lWY zG~DplKTD*Uiz|L39vjF!3n#0^{i-GpGMD9*77QpTO(@M9Trj*Ov7mTUbp`e z9+ze=DmhpkaHEm|qUC=_TFOdw?n;p~bNS$s{4!gi6I#A0kOfH3jr>R;3za6j@VkMy z!zx_4QxJ;`I^w1jb)$UqKwRwn+^z{}wvwN_^Ryu5CtY{vgMwH{pRFEBrc-sVRc;ok zd0vX^Oa;Yd=tpuhY;8O4{klcfc0ysH5-Hp2uY`2;x{KHx%&!FDO1%o^nqU^Ls?DQ< zai{wAHr&C1G?LGZhK7hS9>Zg3F0O{=A$s=noapT=Lj7xEu7Eig<-0o z=exsLq~V=quXn;PO~k$PcqP|`vs$s)YZc$2(L2@)OZ%_KcySXqg|iyc`&;?MaNGeU z+xgmXTHzq{lD&U^H01O z#R3w}DLD?sCR`Af!FJ_iH(j>Dzt(a8suFW3``{XXS_89=L>>}>_V@agw~b)_(%##= zR|Jl$?*nd$U@@xJe69GB`415+tihx|MLkAx!nl=hF2-mrp8nC#71x;rr50xto5k>Y zf_TlEtYMv(D#=#JVCyuM9-x*+@tjaZ^aybYrKP4(Ex4s7t1S)p<7;bTC^{d^kJQ8z zaAg?3Q(4s81nmEAU8Rh3 zb(z%kq%JwhDG%%Mb&(j=Ce-H#BUzC2ZXCZ6i3w#Ym!nY2kBxbqDD1hg3GW<*F6n3z ze>(~%t3IEBa8RrMN~Lbqm1b0w53MK{bE3ul`S(%GJ9zs5CBvOE@Yv0bQmSFoE@!Q(}m^YXl+{|ELTUX`!~XJbF@Ys6_&eV z^-!i(SAG(nhhy5a^TP5(pOA`a$9I%+3qx{`w_@MQ|unmkeuJQ%7 znD3DK*F;$#oH`LgCz5B*uP8OUT^F_=?%-;BC`N`++p1lIQn78EIB`SC)Y&|7Ll6H| zIR0-|8O}p%Gw)9RH$^m{`n0{WQ4o$9LrGUtX_?v9k%`VqRF!f|BnRPQ*u$?wGjH*C zYvb-8bek`(&3uEp+)+~9#H=^7WCXgrf;_Xx-hH2+s?BP&-}p$$&{M_Gd`usb6O&fs zccO}dQGagru$P)#{rjNHQzi7zGw{w+-YNz^zG8W=7#5w_`-Mmf!TG~ZQJ)yl#feHy zP8^kviTy2&`d{NBmWZssT=~8jR;Si)0ZN{pk`p_mWMeSvdMfB|D@(DaM{u7yEUeWJ z5lV=Oy{0C=7p0(WzAvVcqI+56Xy#yC7v}aTJ`5FTzf*#IR|6K3f3`Z)S=6SC@M1oC zv)a~+Q!jo+q$by@{klo^6IfPlDfe$uU6By_KliVJ2h?Q&G5g|_u)_ry+gPz)-@4bD z+n67(%K|emw)yw!(%T6?4CAG8zgHzG{N}SaroHgP?Rnp)^22pmSn~nh6#vcq9XZ0U zVb8zcLt*9MzVFS))?+@AOZx~n!k%^1q_D$LEgHo8)x*8HbFi&Q%jQEwN=io|&eg9*{e|-_Y=L$QVhIz{r%TL@{iTq4m=2hFe{NJm4 zu~ztX?Ttv`Aq|+X@4d~!u4lJnzp%0G{)m~iQwhF#K&r2WU*BG+Y#*Q5fcbdz{8so4 z?0%2$`1S^v`uOt;4OqBa!Vx8`9QVYd+@&E3g&q@bLwljlCl$Zoyzpb~{`HHzAM#s< zT@ikq-S@br@SBaCbW`|^?0HA-@C~B;#{0r=Z19X* zzp357Y3G#UJai7@UMO+Q!NU!*cSH3n!Oi}yi_NGGDcyaRxfEle#3#hE80j{$f|mGI zrt~RkDd{;^efS4)EKYjq!*|CqA8C9bZ_^0#|9f#vFKw&ApT)5ns$d?}2#?s*Xb}r@ zr#MkhEBj$L;w6n(uy=>HitSjv2Va7a%9HO#rSaY=BBQmv;4f(kJC>-Ct$1%qPpZ;8V0;`YZvp7?Q=Xet#WbaBQ1hPs;aMQHFCCFHpO!{ZfC zxie3W=U+EwJ{>g^gxdyFkk@Mn$+q93wgs1+)0CjA*tr-Kx|#;rM#H~8QUb4^+i`Pw zND~&|ziP=p{njf4x1}@IZcSJXKYv%suF_#~^e>50vR+`JHruw)`c%dDY+)l^J;9y` z-@vLEK0GX)`MMcldc&+|TZ^so;l0vXL?d6t5kWsiipu;U@q7ElOW_Cnoe~IX;w#cw zQ&m0wb2MO5Kt3S%u);pPf= zNv!4;3S&7`iMOog*Y&kh7)zipoNUc(4dbaw;%|3lX*F;-qUlMBr$DkOAx@i!q*!ls zWqFdSJ@1soW;hurDYr{PdWW2Z4k?v0hWPNDGUjWolg*B*o!?`k0Ew#9`JDA&?Lu0? zkYSwlq=ez7;yiO$zPT`LsF)I#m9*sLJy>awFLInkj)4Z27Ui03c`si2N!e8{R_C5f zBk}grn5$nm`lNo9D|M@KqZ3u`VlPtI3vHDL|FjPaX(Voxr;;lSTV0se4j!62z*J^_ z@p7an==CoJZ}qV~vsZevATM!GB|TNY!kYp7cdMVMh`aZ}s(=ql`eK)UJQh0&^RVs6 z32~(jLSeT5{F%CsWGhtChxvH=|6_N_2q^6|I<%AT5t#x1lIhT}CjZtj?Cz}5c7)1V z#ij2j4l?i`O>OvQQyad~R8ftA3I`PCW@9ng6vyR$EC$odoFLw&ADhBY_hYj(|8w0=9Qg1JhqXb}(pL)Fa67qE>g%}+?+?G~|6 zYr!I>lQcgI9-w3-@l_|^wX3j%B{usZ$D;#J0Idu}aj_Cu!8c-OW&F?Lml7yZGGc-OTX^@OsW zs4uyjM)tAhS22r9Qy(_J@D%rf{EQt?d&k)eG_tG4{Fmo!nz4!9Xlfnxg7sp?W_G8! zRh&+hv4!1fX_YndXDVYWyVII~#pKL}@phw)P_`z8D|ao{NvkhwJG)A-ww2{w8ciY` zUS*IwSUVc!t!iT@dq!ug-c`=jcz3ZoX?B%v9qK6;Ntz5%`i!^S%^K$;?^b#DuxDUJ zw0fVt#8qi$ZSN;flQg|Wfg=HOywx*M{$17#5d1P+Zp43)@O-4zkgsV~gROBf@+jAU zgku`qua0AbhT3Ojrfq(}_qUKk<(w)Jul)VI7k}A8_LdG9`R10gAFtO^4v?<gEpn|kp0HmJW=Pu{1Ej3w29d~6#zM4CT{FK#3I%X^AM zrQChB+KZoRBfCrMhVdJ1@xo1KtY-7G<(Sz#l2R$Dn* z`e_V*r!DsIXbfN6R<0#|VBv=Ze`yiy&DHI2$!?D20qx`{>A_f@*iMd+s>bp`?a&;L zas2&usKjY1-_#C;qNnoHf}c<4F9iF3#KRNh(3I$zqBYJ+Yue|wPfh8PoTZ$lj4rn3 z#LjkTZ*|5$PGgtZd}4weF72AfSEEYl>^%OR;FAmZodh{dy1Rh8B%)~^3wa~)J#889 zk%+v$tN19v2iEX~g1fKdyAyFJksJ80;@fQ#cTJK5CI2nFZjv147qde&#C9c<+IPTr zPF8kC+K2miev;f&<;LeF$yqK}D1j33do5NqL8X$cx@6g4&_7_YFiuJ*cyzj)V;!3= z_v^$je=1MYcU3K+wX}j(@NskS49%D$8~EpQ#_jtzY_XqB#;#b2PIQ`m?Wzc7i*A&q6=nLv#|{1zc}0 zzOnrbP6xjWy$~A~5~(ZrJLuW_h_IYT-NE~z7vnYIeQ+P}N$4&6iLfk21Bfj23*bxf z!ca{#7zuZvj~>9&4=x5v2jOA!1eb&Ben-^o5E0h3Xf(JOx*uL5MuNwJXF^vTA*v6a z1YQrl_$bPNr-9Exe}9Y!i$C-+_D}NnM1NpQg@ISV6pFF_I<`#kLa@sTqSM%VgO`I} zK<_(Aln-7Dz61T=Q$$7JP2ls;OHLCF2X6%*f}ZgM4i${oskB{ayxE)#-i!UyYC!QB zv>XNwlvYD8!F*ya7!9TK(5KH5VHt!_7rC4x(w@g<0z*;)bW6-Pu%O0bI_+Q5gi9x9>Q?BjMIGurv}DTa0+z7FGRn9UxLR#mtQ5i4HgrJ z<PUxg!d6R?%26){dzW^kWQ99DENPi2-UBhNSi2KfwE; z8)vF$FZd<6Cv=0!Dmnw+k4EP}uiSyvHyzIZM(p$lz&5-~%GDF?0AGfV+=n9o9|iY? zj`&tZ)4*rIKSHlRrJ^NZe>~ltPUEHCk7%TUC>;D5wBJuyg9q0KZ-I6?ixntvtcXJg z;tf+{3yfwkwgTFo#|9R?`(^0iKdYz{I1wC-cTY_(swfNG0o(^V_L7SFfxCf!{8dG} zZ>i`YcqsTLbm?ssJp>O2S3+;Y_8dG4d=+}=9ThH<5swXwSe1n9D^VVJ9(bZgqAF|? z!HdCbm_)tZC7KS#pLfw@Xe+i`;8Wni9uk@TC3*n<9qbw)QBI&lF-~}5z+<3450NMy ztQMCE`fiwHp$r)AFk-?b>V{WNgTRf!lc2ZNl4v2gHF!X6iCpVQv;mv~{tCK&oJ2do zCh(8YW168-@PEKj%_Z7{&C?kN10LK$qR}lS3I%@v_HQLouXu|@bzsbZF+Ls@wwEXY zyc0YMIw?z{Dd1D!G0=m$OY|-H5_kbL%a!P7@MG`_XpKoC7Z;*e;LXsw0TKm+Ra#s| z=)2_-)c|({e^?>WLks?o!w`R~wQRUV!$wN92>cenJg7yz7M_tHsQU> z!e=`?Q`%0aH394 zJ+SQrKLr1&L#J$XQ`24;PI#6#K;Oqmqw*vQ1Xp^gNfV-`n&3q68t8@*Y8nLY0X_%) z5+l#Y;C%2(yzMwxOHJ#*W#Ex`uc5C44?GUM0Xnyynl6Fg18Xc8rp7l=(`^{jVbp7= zrg3p5-)@o`1-UUvIS5pk$PrM6$06qX6)mPk zpqFAKI}eV)v)?sKO>+mTsjfHC2(Tq}kedD|SJMU<8(^%gP*dg%HTn2p=*6@A3c8?D zP5Z!}V9!}<>OWge*T6ww<0sg`r)qizt_{wbqoxxJ@CPlvxZdFL3)Qq_g_=^q`69kj zO@pyWKMY)IME@VKPEA!C)ieXfBqS`|q^5z}aLvHW!JgaIv<55jzk+vwyYIp2-K!=) zKca8IefFWjht*UMd=IR`^1IK^Y8nA{MqjWWdg>jVa&S{{^Sf#~`-hs^`xE*e^#8M- z;wO`=p(!xlMZ$CFpePMp0j~$2h}O`@O*C{i0J9!&i>4YnhoP=fAdVi-{-d56`p%@G z*dTN|;Nk%q`lVPyh2XcqA7TA==(`%a37!ZJv}kDE6b+>W6Mb%hkv$d3(>26loB;b_ zX;nW~=gj5B$k$4Ncgfp*`R! z;HDViZhV1JD-@R)ynY)FV7G?S!Itk}SiaWKZ-+EA83z7*m1ZB-(124Y1P(@L;dWX> zwa#g%W*DYT;FHkHFChoq2b_LcLz+7pngyN(UUE-Ee?G@v;6p|i zDj9W;#EcmH&MZdB^BGM5KLuZdes>|GLlziL=zLl%V)S?^qnqGJ@XTe54z6Y79)&Xk zu2{#&|2QfH-vR#&J^w7Dw$Zq(=qoy$W7Pi=qYuE1!TQUL3T`v{FSrlb`3|Fzj~P7! zj{yfiVYICZ2h_S2(fcq4K4o<4PyDSmn1kp3#i++~oCWY=u#7=`<|{_S!J>B)Z>&63 zGED<-0dI%yqm^kc_zYOBlc|YOro-Sn;7icI;g7fPfFFZrJIl1*MYhmiFhp@J;C}sOI+`cb18_L_d*~tg7Mav_h{Rt3FE`7y91{Uw@M-YbnKC`uB~!Dy zm@uGsi}_lno;PKByB;b-XXJlNCZ|9x?W_+*=TakBOE2ncsbxc=ufcH*wWR5!rHf!M z^d&7Y#!tx9(tEMEMBr^%S~_j%t))XSdcf#}LH-i9nsFHK!3L9-bl4h#P2hUaBl5J= z7@QB@2t9A0mfC@bfzK3Zsqk$r6@y2CIrMC7qrs!WUqWk&wDd0cKj7BTmX<@cG!@2F z7=59i57W{T@HFtA5nB3rq?V3?E5YVbS{gfAOBcX%!LDPlvv;&~7rY8QZl;!Yf2^g+ zjnL76J6CFH`7AAc3buml&(>1^PqefWyc>LPj@Cjy%+=EOFb;@>rD)-DEjcwtPY9j? zy>^9`!ocUiC$?(I+p49d;0xfj&`+_g0bd4B*@m5O*U~2NEpXVES}NJ0rCs1B;Fr+r z_uzoQ9_Y^F_gb`c;GmWs!)OA-^qrRSk7}t#6HJ%D)4tbIkCR%;1LuP$L9f6z0z3%3 zOKLj6!cDb&lGvH<5ROn0irv=Z!cpF6?PjEmw9Sv`ax-foRumJ7_>d3Vj zZW0U-^@DWOH%v#Xz>(ky&{yi|=m5ABtgWx3K@D}(yg7c7f#*YSYO13Y@NDo&=v&xE zgE`ovnT~?7S-^9^DbQW9y$7BLwoC-fz%~WO0vHFOPhp!5UIcyteX^yFD#2U9PoX=s z($O~Xm*67khy)$&2A=>&wbzlVgN_1Q5d8$M3*94AM^Rt{2DC}gce?9nBseG-{lCXs zI{G?SM{{5#BcW%19o-(JqYL0-aM)lS<-V<>@RpcPfwhG=BV{^j1zrpuU9O{-qjdBx zcrSRwI2~!G=;$}_b#OFv?T^vOR_MeqBKCuxJ6A{Dz`-Ht|C`U(QLkla5ezY;K7xL} z21f{f8@zjij#h5eQ9x@vX5bUhIbZ5161)UF5;|m`j>^FY!O75@zSYrx!6(4ip?e+H z(YN5s;K@gHbm)|hu7R}{46%0shtKJ#W<0Jxc+w>uy||&HN#JhauwQj_`ks#VfD6I; z`#PHa2&WPJ4*2?G9o2cRBbPR~>A>mGYPFuy!H2*ZOi$lpcDodO7km@Cjk}&MfGui_ z*=2w{4?U^cVnze5^3qdSkeo$1~!3>_4RbRxt<<@ zXMwArrH*<^X@@fat_5A$Sx*bW=fDS{M_~H=-*&kEFJJ`r(oF#UBH;DK(8JLPa4|R)y3C@dBj69gtD&nV>gg}=VsPa9dfI^LbZ{d274Qk@TC=ea z@ICP7pX%w*B0YVPXhAQANyJ^i*yVb-+Lzkb?Q;`M60~oC@ z>nZV9J^cuFk3d%o{n0%=xujsQ0Do~`Pfz~PQ)h5*upi!<(+fR)0Jebrv05IA)rZUA z#o$EfKaB?RYmb8gpLI6S5H|yL27d{j4qfhVAWIJzH(|I08t^z7XfyaWcpr3=NCWKx z`(Ren9lBezfnI`Zf}I)|s28>t9dL%gx1kR-G*CNmLvXiP15J)IP#U-yxOO80J;K%( z+y)%c*g#zx8!R*kMmreiVN8uTP!YHQ9MHx<>yr$$3j6^$DcL|C9Sw8_{291!nt=kk z8K`DQqHn>Qpfj@#)CqhAT-eJ%tp^!sKDd4)X2#Ik0s|RR(LiuI^j9OW{^AK^FpN=S zaJoJ~tHH~_Y0%SW8t5MQYw&((mrt?7PUyG6iO}=c<1B#FqHvQz@7;nk1Re~&4t?=} z0gF|bY=B*{HZ%K>fewRz0`G+W%W~8}=U`liQTG^*=!}7?z;ZN^_c;UBY;fAUpw|MQ zhyL`bflh!c!MmZq!WNx|z8~Bfi#s`bEOCQ>22X{47;dDE;1tZVqH7rGt$6%-Upnq5 z@MvhuRs2Y6l!2QNhI2LN^u}>2nwbFuWHV>D3w| z-2%@Ahi);FW~-3~XW|(L58;@OW7P|bSJbu+DusR*t5`z~=$OFu@2cn$7BKJ^BeWX4 z2!Dcm6TkJ&xnV+zY1{_WS>UKD&g3ctm!Wozho0Im;=H8~o3jGs!OK{#Dt z>sI`!K7QFGhGKpIcD}2jdidq?1f5nqxRxiQ&iG;CgGV?8+`cZO9Q^P&0?q(;PGmGH zU#55PM9l!V#vF44=9uniTqSsz1(VEIm}JHRKEbwkw@i7MWaeX%IS0HM+9yy;TQSL; z4?YX6ZGbspLmVCW5VT7tE&T*u3O)h-VJ7Byu~?7-cf}<0Vs9;d16~cD+y}EI%o&|A zW!nt4yfsKma;cVj!T1u!7U*{{r~3?i7##H66lZ4X? zegr)pgGppECM@8%pY*fk;4fwIxD)K9~dr~&$WXy>&?>V=LZ z8k`F4fqtL~`hj-fMChgajWo`x{z`t8Z#j?Oet6>W=Zb%SWMO{xwoEumLPP8yS(ueY zN}#*lMxQIpL)C!-$AB=Kl`19PbqokoQ^Cj8(0W=l6*9FPsU)p&OcLgfQA*%z$AB=K zjZp%p9RtEVR~@+F7!aoSSfxajW59bXe#tJWj<}+GeEpGyseMl=Qrj^g%#g`Spp|1l zn478tog4$g%%8555bt?je`H}=7`ifXu7@~Agz5FM5*X(g5N2X^fI9|+xu{YpvCc6d z%xkli0AAPFKe8}8bM9Uf7ojs=3H>owNx~}?`$raL^n4|N5ySqGh561RCGg5IU^AC0 z0dL7(faDaI50)tbymYXC>pW} z&o(P1urP1`$im$8IbRZ~^=!N8bD4I3p(KT=?Kvb1vuvvpz{2+5p9u-o`rubG{U2@? B=l%cy diff --git a/foxbin2prg.prg b/foxbin2prg.prg index 5922edd..93ae46f 100644 --- a/foxbin2prg.prg +++ b/foxbin2prg.prg @@ -592,6 +592,7 @@ DEFINE CLASS c_foxbin2prg AS CUSTOM n_FB2PRG_Version = 1.19 *-- Localized properties c_loc_processing_file = C_PROCESSING_LOC + c_loc_process_progress = C_PROCESS_PROGRESS_LOC *-- c_Language = 'ES' c_FB2PRG_EXE_Version = 0 @@ -710,7 +711,6 @@ DEFINE CLASS c_foxbin2prg AS CUSTOM FINALLY ON ESCAPE - THIS.o_Frm_Avance = NULL THIS.o_FSO = NULL THIS.o_FNC = NULL ENDTRY @@ -722,10 +722,19 @@ DEFINE CLASS c_foxbin2prg AS CUSTOM PROCEDURE AvanceDelProceso LPARAMETERS tcTexto, tnValor, tnTotal, tnTipo - *-- Si o_Frm_Avance se habilitó de forma externa, l_ShowProgress podría ser .F. para controlarlo desde fuera. - IF VARTYPE(THIS.o_Frm_Avance) = "O" THEN - THIS.o_Frm_Avance.AvanceDelProceso( tcTexto, tnValor, tnTotal, tnTipo ) - ENDIF + TRY + *-- Si o_Frm_Avance se habilitó de forma externa, l_ShowProgress podría ser .F. para controlarlo desde fuera. + IF VARTYPE(THIS.o_Frm_Avance) = "O" THEN + *-- Cuando esta rutina se invoca desde el script, este método es el #1 y no puede cancelarse todavía + IF THIS.o_Frm_Avance.l_Cancelled AND PROGRAM(-1) > 1 THEN + ERROR 1799 + ENDIF + THIS.o_Frm_Avance.AvanceDelProceso( tcTexto, tnValor, tnTotal, tnTipo ) + ENDIF + + CATCH + THROW + ENDTRY ENDPROC @@ -2670,19 +2679,20 @@ ENDDEFINE ******************************************************************************************************************* DEFINE CLASS frm_avance AS FORM - Height = 100 + Height = 110 Width = 628 ShowWindow = 2 DoCreate = .T. AutoCenter = .T. BorderStyle = 2 - CAPTION = C_PROCESS_PROGRESS_LOC + ' (Press Esc to Cancel)' + CAPTION = 'FoxBin2Prg - ' + C_PROCESS_PROGRESS_LOC + ' (Press Esc to Cancel)' ControlBox = .F. BackColor = RGB(255,255,255) nmax_value = 100 nmax_value2 = 100 nvalue = 0 nvalue2 = 0 + l_Cancelled = .F. Name = "frm_avance" _memberdata = [] ; + [] ; @@ -2694,11 +2704,12 @@ DEFINE CLASS frm_avance AS FORM + [] ; + [] ; + [] ; + + [] ; + [] ADD OBJECT shp_base AS shape WITH ; - Top = 32, ; + Top = 28, ; Left = 12, ; Height = 13, ; Width = 604, ; @@ -2707,7 +2718,7 @@ DEFINE CLASS frm_avance AS FORM ADD OBJECT shp_avance AS shape WITH ; - Top = 32, ; + Top = 28, ; Left = 12, ; Height = 13, ; Width = 36, ; @@ -2722,13 +2733,13 @@ DEFINE CLASS frm_avance AS FORM Caption = ".", ; Height = 17, ; Left = 12, ; - Top = 12, ; + Top = 8, ; Width = 604, ; Name = "lbl_Tarea" ADD OBJECT shp_base2 AS shape WITH ; - Top = 68, ; + Top = 64, ; Left = 12, ; Height = 13, ; Width = 604, ; @@ -2737,7 +2748,7 @@ DEFINE CLASS frm_avance AS FORM ADD OBJECT shp_avance2 AS shape WITH ; - Top = 68, ; + Top = 64, ; Left = 12, ; Height = 13, ; Width = 36, ; @@ -2752,15 +2763,33 @@ DEFINE CLASS frm_avance AS FORM Caption = ".", ; Height = 17, ; Left = 12, ; - Top = 48, ; + Top = 44, ; Width = 604, ; Name = "lbl_Tarea2" + ADD OBJECT cmdcancel AS commandbutton WITH ; + Top = 84, ; + Left = 252, ; + Height = 21, ; + Width = 100, ; + Caption = "Cancel", ; + Enabled = .F., ; + Name = "cmdCancel" + + PROCEDURE AvanceDelProceso LPARAMETERS tcTexto, tnValor, tnTotal, tnTipo WITH THIS AS frm_avance OF foxbin2prg.prg + *-- Habilita el botón de cancelar una vez que se comienzan a pasar valores + IF NOT EMPTY(tnValor) THEN + IF NOT .cmdCancel.Enabled THEN + .cmdCancel.Enabled = .T. + ENDIF + DOEVENTS + ENDIF + DO CASE CASE tnTipo = 0 IF NOT EMPTY(tcTexto) THEN @@ -2825,6 +2854,11 @@ DEFINE CLASS frm_avance AS FORM ENDPROC + PROCEDURE cmdcancel.Click + THISFORM.l_Cancelled = .T. + ENDPROC + + ENDDEFINE