Changeset: 277 fdbozzo - 05/06/2014 20:00:58:

2014-06-05 20:52:55 +02:00
parent 47cdc0c7d7
commit ffb449e170
6 changed files with 128 additions and 25 deletions
--- 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="" />

 	*<DefinedPropArrayMethod>
 		*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 ;
--- a/TESTS/DATOS_READONLY/f_form_aa.sct
+++ b/TESTS/DATOS_READONLY/f_form_aa.sct
--- a/TESTS/DATOS_READONLY/f_form_aa.scx
+++ b/TESTS/DATOS_READONLY/f_form_aa.scx
--- 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="" />

 	*<DefinedPropArrayMethod>
 		*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'
--- a/TESTS/DATOS_READONLY/lib_controles.vct
+++ b/TESTS/DATOS_READONLY/lib_controles.vct
--- a/foxbin2prg.prg
+++ b/foxbin2prg.prg
@@ -84,6 +84,7 @@
 * 17/04/2014	FDBOZZO		v1.19.20 Relativizaci<63>n de directorios de CDX dentro de los DB2 para minimizar diferencias
 * 29/04/2014	FDBOZZO		v1.19.21 Agregada posibilidad de convertir un proyecto entero a tx2 // Optimizaciones en generaci<63>n seg<65>n timestamps // AGAIN en aperturas // Simplificaci<63>n secci<63>n PAM
 * 08/05/2014	FDBOZZO		v1.19.22 Arreglo bug vcx/scx: La propiedad Picture de una clase form se pierde y no muestra la imagen
+* 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)
 * </HISTORIAL DE CAMBIOS Y NOTAS IMPORTANTES>
 *
 *---------------------------------------------------------------------------------------------------
@@ -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<75>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<64>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<61>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)
 * </TESTEO Y REPORTE DE BUGS (AGRADECIMIENTOS)>
 *
 *---------------------------------------------------------------------------------------------------