From ffb449e1703bd0a501c68e5ab26c858b85051be7 Mon Sep 17 00:00:00 2001 From: fdbozzo Date: Thu, 5 Jun 2014 20:52:55 +0200 Subject: [PATCH] Changeset: 277 fdbozzo - 05/06/2014 20:00:58: --- TESTS/DATOS_READONLY/f_form_aa.sc2 | 95 ++++++++++++++++++++----- TESTS/DATOS_READONLY/f_form_aa.sct | Bin 73900 -> 74891 bytes TESTS/DATOS_READONLY/f_form_aa.scx | Bin 4085 -> 4303 bytes TESTS/DATOS_READONLY/lib_controles.vc2 | 56 ++++++++++++--- TESTS/DATOS_READONLY/lib_controles.vct | Bin 607661 -> 754993 bytes foxbin2prg.prg | 2 + 6 files changed, 128 insertions(+), 25 deletions(-) diff --git a/TESTS/DATOS_READONLY/f_form_aa.sc2 b/TESTS/DATOS_READONLY/f_form_aa.sc2 index a5275d3..c3d92c6 100644 --- a/TESTS/DATOS_READONLY/f_form_aa.sc2 +++ b/TESTS/DATOS_READONLY/f_form_aa.sc2 @@ -19,6 +19,7 @@ DEFINE CLASS f_form_aa AS f_base OF "lib_controles.vcx" *< CLASSDATA: Baseclass="form" Timestamp="" Scale="" Uniqueid="" /> *-- OBJECTDATA items order determines ZOrder / El orden de los items OBJECTDATA determina el ZOrder + *< OBJECTDATA: ObjPath="Cl_image1" UniqueID="" Timestamp="" /> *< OBJECTDATA: ObjPath="Cl_grid1" UniqueID="" Timestamp="" /> *< OBJECTDATA: ObjPath="Cl_grid1.Column6.Header1" UniqueID="" Timestamp="" /> *< OBJECTDATA: ObjPath="Cl_grid1.Column6.Text1" UniqueID="" Timestamp="" /> @@ -41,8 +42,9 @@ DEFINE CLASS f_form_aa AS f_base OF "lib_controles.vcx" *< OBJECTDATA: ObjPath="pgf.Page1.spinner" UniqueID="" Timestamp="" /> *< OBJECTDATA: ObjPath="pgf.Page1.textbox" UniqueID="" Timestamp="" /> *< OBJECTDATA: ObjPath="pgf.Page1.timer" UniqueID="" Timestamp="" /> - *< OBJECTDATA: ObjPath="pgf.Page1.Pageframe1" UniqueID="" Timestamp="" /> *< OBJECTDATA: ObjPath="pgf.Page1.Cl_optiongroup1" UniqueID="" Timestamp="" /> + *< OBJECTDATA: ObjPath="pgf.Page1.Pageframe1" UniqueID="" Timestamp="" /> + *< OBJECTDATA: ObjPath="Image1" UniqueID="" Timestamp="" /> * *m: add_control @@ -156,7 +158,7 @@ DEFINE CLASS f_form_aa AS f_base OF "lib_controles.vcx" cmdCapturar.RightToLeft = .F. cmdCapturar.Top = 392 cmdCapturar.Width = 212 - Edit1.Height = 356 + Edit1.Height = 144 Edit1.Left = 764 Edit1.Name = "Edit1" Edit1.RightToLeft = .F. @@ -687,6 +689,50 @@ DEFINE CLASS f_form_aa AS f_base OF "lib_controles.vcx" Visible = .T. *< END OBJECT: BaseClass="textbox" /> + ADD OBJECT 'Cl_image1' AS cl_image WITH ; + Anchor = 0, ; + BackStyle = 1, ; + BorderColor = 100,100,100, ; + BorderStyle = 0, ; + ColorSource = 4, ; + Comment = "", ; + DragIcon = ..\..\, ; + DragMode = 0, ; + Enabled = .T., ; + Height = 104, ; + HelpContextID = 0, ; + Left = 764, ; + MouseIcon = ..\..\, ; + MousePointer = 0, ; + Name = "Cl_image1", ; + OLEDragMode = 0, ; + OLEDragPicture = ..\..\, ; + OLEDropEffects = 3, ; + OLEDropMode = 0, ; + Picture = bmps\vfpxlogo.bmp, ; + RotateFlip = 0, ; + StatusBarText = "", ; + Stretch = 0, ; + Tag = "", ; + test_aa = .F., ; + Themes = .T., ; + ToolTipText = "", ; + Top = 284, ; + Visible = .T., ; + WhatsThisHelpID = -1, ; + Width = 212, ; + ZOrderSet = 0 + *< END OBJECT: ClassLib="lib_controles.vcx" BaseClass="image" /> + + ADD OBJECT 'Image1' AS image WITH ; + Height = 100, ; + Left = 764, ; + Name = "Image1", ; + Picture = bmps\vfpxlogo.bmp, ; + Top = 184, ; + Width = 212 + *< END OBJECT: BaseClass="image" /> + ADD OBJECT 'pgf' AS cl_pageframe WITH ; ActivePage = 2, ; Anchor = 0, ; @@ -827,7 +873,8 @@ DEFINE CLASS f_form_aa AS f_base OF "lib_controles.vcx" Visible = .T., ; WhatsThisHelpID = -1, ; Width = (199), ; - WordWrap = .F. + WordWrap = .F., ; + ZOrderSet = 1 *< END OBJECT: ClassLib="lib_controles.vcx" BaseClass="checkbox" /> ADD OBJECT 'pgf.Page1.Cl_optiongroup1' AS cl_optiongroup WITH ; @@ -869,6 +916,7 @@ DEFINE CLASS f_form_aa AS f_base OF "lib_controles.vcx" Visible = .T., ; WhatsThisHelpID = -1, ; Width = (112), ; + ZOrderSet = 20, ; Option1.Alignment = 0, ; Option1.Anchor = 0, ; Option1.AutoSize = .F., ; @@ -972,7 +1020,7 @@ DEFINE CLASS f_form_aa AS f_base OF "lib_controles.vcx" DisabledItemBackColor = 255,255,255, ; DisabledItemForeColor = 109,109,109, ; DisplayCount = 0, ; - DisplayValue = combobox, ; + DisplayValue = , ; DragIcon = ..\..\, ; DragMode = 0, ; Enabled = .T., ; @@ -1037,7 +1085,8 @@ DEFINE CLASS f_form_aa AS f_base OF "lib_controles.vcx" Value = , ; Visible = .T., ; WhatsThisHelpID = -1, ; - Width = (196) + Width = (196), ; + ZOrderSet = 3 *< END OBJECT: ClassLib="lib_controles.vcx" BaseClass="combobox" /> ADD OBJECT 'pgf.Page1.commandbutton' AS cl_commandbutton WITH ; @@ -1060,7 +1109,8 @@ DEFINE CLASS f_form_aa AS f_base OF "lib_controles.vcx" Visible = .T., ; WhatsThisHelpID = -1, ; Width = (80), ; - WordWrap = .F. + WordWrap = .F., ; + ZOrderSet = 5 *< END OBJECT: ClassLib="lib_controles.vcx" BaseClass="commandbutton" /> ADD OBJECT 'pgf.Page1.commandgroup' AS cl_commandgroup WITH ; @@ -1104,6 +1154,7 @@ DEFINE CLASS f_form_aa AS f_base OF "lib_controles.vcx" Visible = .T., ; WhatsThisHelpID = -1, ; Width = (93), ; + ZOrderSet = 4, ; Command1.Alignment = 2, ; Command1.Anchor = 0, ; Command1.AutoSize = .F., ; @@ -1213,7 +1264,8 @@ DEFINE CLASS f_form_aa AS f_base OF "lib_controles.vcx" Top = (127), ; Visible = .T., ; WhatsThisHelpID = -1, ; - Width = (20) + Width = (20), ; + ZOrderSet = 6 *< END OBJECT: ClassLib="lib_controles.vcx" BaseClass="container" /> ADD OBJECT 'pgf.Page1.control' AS cl_control WITH ; @@ -1254,7 +1306,8 @@ DEFINE CLASS f_form_aa AS f_base OF "lib_controles.vcx" Top = (127), ; Visible = .T., ; WhatsThisHelpID = -1, ; - Width = (20) + Width = (20), ; + ZOrderSet = 7 *< END OBJECT: ClassLib="lib_controles.vcx" BaseClass="control" /> ADD OBJECT 'pgf.Page1.editbox' AS cl_editbox WITH ; @@ -1330,7 +1383,8 @@ DEFINE CLASS f_form_aa AS f_base OF "lib_controles.vcx" Value = , ; Visible = .T., ; WhatsThisHelpID = -1, ; - Width = (68) + Width = (68), ; + ZOrderSet = 8 *< END OBJECT: ClassLib="lib_controles.vcx" BaseClass="editbox" /> ADD OBJECT 'pgf.Page1.hyperlink' AS cl_hyperlink WITH ; @@ -1373,7 +1427,8 @@ DEFINE CLASS f_form_aa AS f_base OF "lib_controles.vcx" Top = 107, ; Visible = .T., ; WhatsThisHelpID = -1, ; - Width = 16 + Width = 16, ; + ZOrderSet = 10 *< END OBJECT: ClassLib="lib_controles.vcx" BaseClass="image" /> ADD OBJECT 'pgf.Page1.label' AS cl_label WITH ; @@ -1419,7 +1474,8 @@ DEFINE CLASS f_form_aa AS f_base OF "lib_controles.vcx" Visible = .T., ; WhatsThisHelpID = -1, ; Width = (104), ; - WordWrap = .F. + WordWrap = .F., ; + ZOrderSet = 11 *< END OBJECT: ClassLib="lib_controles.vcx" BaseClass="label" /> ADD OBJECT 'pgf.Page1.line' AS cl_line WITH ; @@ -1457,7 +1513,8 @@ DEFINE CLASS f_form_aa AS f_base OF "lib_controles.vcx" Top = (136), ; Visible = .T., ; WhatsThisHelpID = -1, ; - Width = (50) + Width = (50), ; + ZOrderSet = 12 *< END OBJECT: ClassLib="lib_controles.vcx" BaseClass="line" /> ADD OBJECT 'pgf.Page1.listbox' AS cl_listbox WITH ; @@ -1534,7 +1591,8 @@ DEFINE CLASS f_form_aa AS f_base OF "lib_controles.vcx" Value = , ; Visible = .T., ; WhatsThisHelpID = -1, ; - Width = (224) + Width = (224), ; + ZOrderSet = 13 *< END OBJECT: ClassLib="lib_controles.vcx" BaseClass="listbox" /> ADD OBJECT 'pgf.Page1.option' AS cl_option WITH ; @@ -1547,7 +1605,8 @@ DEFINE CLASS f_form_aa AS f_base OF "lib_controles.vcx" Left = 11, ; Name = "option", ; Top = 283, ; - Width = (110) + Width = (110), ; + ZOrderSet = 15 *< END OBJECT: ClassLib="lib_controles.vcx" BaseClass="optionbutton" /> ADD OBJECT 'pgf.Page1.optiongroup' AS cl_optiongroup WITH ; @@ -1591,6 +1650,7 @@ DEFINE CLASS f_form_aa AS f_base OF "lib_controles.vcx" Visible = .T., ; WhatsThisHelpID = -1, ; Width = (112), ; + ZOrderSet = 14, ; Option1.Alignment = 0, ; Option1.Anchor = 0, ; Option1.AutoSize = .F., ; @@ -1680,6 +1740,7 @@ DEFINE CLASS f_form_aa AS f_base OF "lib_controles.vcx" Themes = .F., ; Top = (284), ; Width = (117), ; + ZOrderSet = 19, ; Cl_page1.Caption = "Pg1", ; Cl_page1.Name = "Cl_page1", ; Cl_page2.BackColor = 255,193,132, ; @@ -1755,7 +1816,8 @@ DEFINE CLASS f_form_aa AS f_base OF "lib_controles.vcx" Value = 0, ; Visible = .T., ; WhatsThisHelpID = -1, ; - Width = (108) + Width = (108), ; + ZOrderSet = 16 *< END OBJECT: ClassLib="lib_controles.vcx" BaseClass="spinner" /> ADD OBJECT 'pgf.Page1.textbox' AS cl_textbox WITH ; @@ -1838,7 +1900,8 @@ DEFINE CLASS f_form_aa AS f_base OF "lib_controles.vcx" Value = , ; Visible = .T., ; WhatsThisHelpID = -1, ; - Width = (108) + Width = (108), ; + ZOrderSet = 17 *< END OBJECT: ClassLib="lib_controles.vcx" BaseClass="textbox" /> ADD OBJECT 'pgf.Page1.timer' AS cl_timer WITH ; diff --git a/TESTS/DATOS_READONLY/f_form_aa.sct b/TESTS/DATOS_READONLY/f_form_aa.sct index c237bf2a4e98e836737f77ef78a1e674ec852a9e..eeda09984fff0e6e61b228037ba962b4acf8d874 100644 GIT binary patch delta 3321 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 diff --git a/TESTS/DATOS_READONLY/f_form_aa.scx b/TESTS/DATOS_READONLY/f_form_aa.scx index 5e3db05a82f6bc1092fb4f6dff706170b024c022..f117a3deaebab62368d18b71bbce2dc45d177fdd 100644 GIT binary patch literal 4303 zcmeH~YiJx*7>2)Xn~Uj1u^{ypS8ac&RA+W}H{<}&TeB0t+cX*sA)l4 zL6Xu)@fIvz5UWTpD%M-8HVSIgXl+bGv=@T~B}J$dY%r9@ORU%Wo;?$1c4x9q_O~BA z-}#t#&UyFDoHH{kEvT%hC8Fv%9ms_-Yc^3!GLmW3(+o<~hg4m73T0D?YU?CTsX_>el%g>P2yXg3RQ9UMp z-_3cw@CxY3yat6>#I1i)3vdyUpJichqO@jc=@nWGznvv;(sVioVf-dfrz_Bxm(YXI zvn6y~8`f4r4?|y7La&3qri89S&$;MXOdp4Nuy&;4`OVKu|0jP`XAC>RZ`^)&F1Oxa z5Hq?wv;O;Re`_KY(_0PyZ9ydAIWSGw%=pZr^*Xc6deQMyFbYnC z-$2dO?ww}9QipA3m|0d)n)8>jE*uC2B^f*N7SINAU=w%{lpBR+QAXV> z`v}_YU=J8FkCkIsWM;(Ub-0YCS^u44$irw)fH5%lu5xTdpF*={)yUXZV|xeDX7Dt4 z8T5jKfJetYM2~G0wbxu^7L7?+bAg1y@}_%<9tO{Y{onvN0eC#rNz|}e)LygGjL$3( zl+<9oGO>lIvYY5CAcH7a4R}1>jhWt`FFhxxS*ta(XSNc(4hFzi;1oCycntIqy|GQy zUbEBeR?BSt6GRVyouC&Cf|G#9spp7x?GUxs>@;h$%u>6F)`2bHDex*706Z4IfP49( zsJ&*V*-Fdo+)G6B_7E)rVbBED0v2Q${p+7A%j2c87Gz+P|&@EAWx)c%>My=I#kp8Czvm>jgs zJ~>2m42*$EFnfro7V!9cn5gp$QG3l!vyf#ras>Md{0=IQ;)My80v=so;{7%vYOmR8 z7PibN;?a1KimX`25~|tr%<{+CDG@zA=yGr#Hj&?;ne) Uf1>t(7H(rj7SC)p_AxH|2c`S(1ONa4 literal 4085 zcmeH~Z)_7~9LK+{-PjhKe@GOS#cCuf2G;hvw!Bd3+8e9u(;K~Zb0mu~xQI-ro4!EA zKSW}tFNwF2B60C5NomAmjLa_Xr{$T3pz0uOHJ`1$fgqOvU(ye{aTi~ z5&$Jrx+zQ3&GCn_F%!sSc zcYDq+J_ANF=h1FM(p zX+fvQ{qIM6I}@q6(P?_`32FhK9x#F#zrRTfhcv$yUYehvk=vGh-(6wSk-RrL&oKpI z0o|8at92Sy*cbW?~NY$n^PiF{tnEe;;^iywRNblKvU2+!hv6s zAIJnbM;6U}d*_+3((dB0xs?U{P5w|oo4sERt=kAJB{!1&TCh}r_pK=yfi^JL?W+s0c$Jk^wgC+!L|RA(=_gW+&jZ)Ipn9j(9(K1Cc482iCbcgyl=w-KNUa$H&hJpY z(`pavvcmT61P+puWSUgH3V4ZB|7*NSUeC3Ti#=?;6{ZgZU1WefOI{)G5h>prz&pED z@3h*&{5~tpvlqCEG?F`rARCF)nYV%a-c`NRY7g^UVWaziugL`YgLvKtt|wCF0igaP z)jO^Buz(fz>Bqo#WQv?8i%0pBMWnWIJN$|2omP98W`%A43>YFKYY}5Siv>xn+2XBLu3#6kc<IkuZ@u&Fztz{}N`TlL?`&nS3o+U#BMP<#sC>ByZ;T zH7|A{Re$keyc^esBL$C`zAIdKj_f4+$YFAtNbSGQh5m*GhRwZx&;7qv`2L-nwWN5x K3kxV5e(gUKiOxg- diff --git a/TESTS/DATOS_READONLY/lib_controles.vc2 b/TESTS/DATOS_READONLY/lib_controles.vc2 index 5ea57be..a27d282 100644 --- a/TESTS/DATOS_READONLY/lib_controles.vc2 +++ b/TESTS/DATOS_READONLY/lib_controles.vc2 @@ -4895,6 +4895,7 @@ DEFINE CLASS f_form_aa AS f_base OF "lib_controles.vcx" *< CLASSDATA: Baseclass="form" Timestamp="" Scale="Pixels" Uniqueid="" /> *-- OBJECTDATA items order determines ZOrder / El orden de los items OBJECTDATA determina el ZOrder + *< OBJECTDATA: ObjPath="Cl_image1" UniqueID="" Timestamp="" /> *< OBJECTDATA: ObjPath="Cl_grid1" UniqueID="" Timestamp="" /> *< OBJECTDATA: ObjPath="Cl_grid1.Column6.Header1" UniqueID="" Timestamp="" /> *< OBJECTDATA: ObjPath="Cl_grid1.Column6.Text1" UniqueID="" Timestamp="" /> @@ -4919,6 +4920,7 @@ DEFINE CLASS f_form_aa AS f_base OF "lib_controles.vcx" *< OBJECTDATA: ObjPath="pgf.Page1.timer" UniqueID="" Timestamp="" /> *< OBJECTDATA: ObjPath="pgf.Page1.Pageframe1" UniqueID="" Timestamp="" /> *< OBJECTDATA: ObjPath="pgf.Page1.Cl_optiongroup1" UniqueID="" Timestamp="" /> + *< OBJECTDATA: ObjPath="Image1" UniqueID="" Timestamp="" /> * *m: add_control @@ -5032,7 +5034,7 @@ DEFINE CLASS f_form_aa AS f_base OF "lib_controles.vcx" cmdCapturar.RightToLeft = .F. cmdCapturar.Top = 392 cmdCapturar.Width = 212 - Edit1.Height = 356 + Edit1.Height = 144 Edit1.Left = 764 Edit1.Name = "Edit1" Edit1.RightToLeft = .F. @@ -5563,6 +5565,50 @@ DEFINE CLASS f_form_aa AS f_base OF "lib_controles.vcx" Visible = .T. *< END OBJECT: BaseClass="textbox" /> + ADD OBJECT 'Cl_image1' AS cl_image WITH ; + Anchor = 0, ; + BackStyle = 1, ; + BorderColor = 100,100,100, ; + BorderStyle = 0, ; + ColorSource = 4, ; + Comment = "", ; + DragIcon = ..\..\, ; + DragMode = 0, ; + Enabled = .T., ; + Height = 104, ; + HelpContextID = 0, ; + Left = 764, ; + MouseIcon = ..\..\, ; + MousePointer = 0, ; + Name = "Cl_image1", ; + OLEDragMode = 0, ; + OLEDragPicture = ..\..\, ; + OLEDropEffects = 3, ; + OLEDropMode = 0, ; + Picture = bmps\vfpxlogo.bmp, ; + RotateFlip = 0, ; + StatusBarText = "", ; + Stretch = 0, ; + Tag = "", ; + test_aa = .F., ; + Themes = .T., ; + ToolTipText = "", ; + Top = 284, ; + Visible = .T., ; + WhatsThisHelpID = -1, ; + Width = 212, ; + ZOrderSet = 0 + *< END OBJECT: ClassLib="lib_controles.vcx" BaseClass="image" /> + + ADD OBJECT 'Image1' AS image WITH ; + Height = 100, ; + Left = 764, ; + Name = "Image1", ; + Picture = bmps\vfpxlogo.bmp, ; + Top = 184, ; + Width = 212 + *< END OBJECT: BaseClass="image" /> + ADD OBJECT 'pgf' AS cl_pageframe WITH ; ActivePage = 2, ; Anchor = 0, ; @@ -6854,14 +6900,6 @@ DEFINE CLASS f_form_aa AS f_base OF "lib_controles.vcx" ENDIF loCtl.ControlSource = '' - CASE loCtl.Baseclass == 'Optionbutton' - .valor = 2 - loCtl.ControlSource = 'THISFORM.valor' - IF loCtl.Value = .valor - REPLACE c_Value WITH "S" - ENDIF - loCtl.ControlSource = '' - CASE loCtl.Baseclass == 'Spinner' .valor = 123 loCtl.ControlSource = 'THISFORM.valor' diff --git a/TESTS/DATOS_READONLY/lib_controles.vct b/TESTS/DATOS_READONLY/lib_controles.vct index 5ccbc4d3e82eafa42c1939858d177468715344a7..9a2d516838f298dd6ad3369d0f49dc7a7ced85ea 100644 GIT binary patch delta 730 zcmZ46t-7&GkDY!Rt1(;1=dytwpIo9Rt1i&3Y@*J zlO6cjCv$M~O+UcN{&#!-1r|d#Wi$Wtg{bI?I|QG`;%)>$2(h_Azr!w{zvl zoqpgj8{78KeXOQD+s}%zc`}M{@c`{&`2U}S!7;fcvn;VB^$gE+EeW<&)Ae_=ESlaT z$!0M<`z$MuWSS5I!*3wI3RJ!fh^2%X7>a=S*7ONyS(Uc?hjAQd+P<%o^|A5xwE=9U zlH2o^aU5jZ{M_F1yMNWQt z{&YWmR&ORlgXxV6m~ * *--------------------------------------------------------------------------------------------------- @@ -113,6 +114,7 @@ * 07/05/2014 Fidel Charny REPORTE BUG vcx/scx v1.19.21: La propiedad Picture de una clase form se pierde y no muestra la imagen. No ocurre con la propiedad Picture de los controles (Arreglado en v1.19.22) * 09/05/2014 Miguel Durán REPORTE BUG vcx/scx v1.19.21: Algunas opciones del optiongroup pierden el width cuando se subclasan de una clase con autosize=.T. (Arreglado en v1.19.22) * 13/05/2014 Andrés Mendoza REPORTE BUG vcx/scx v1.19.21: Los métodos que contengan líneas o variables que comiencen con TEXT, provocan que los siguientes métodos queden mal indentados y se dupliquen vacíos (Arreglado en v1.19.22) +* 27/05/2014 Kenny Vermassen REPORTE DE BUG img v1.19.22: La propiedad Stretch no estaba incluida en la lista de propiedades props_image.txt, lo que provocaba un mal redimensionamiento de las imagenes en ciertas situaciones (Arreglado en v1.19.23) * * *---------------------------------------------------------------------------------------------------