From 54cb0d4a9bd03364fc36978af3029e20c2885455 Mon Sep 17 00:00:00 2001 From: fernando Date: Sun, 23 Feb 2014 16:42:45 +0100 Subject: [PATCH] =?UTF-8?q?Changeset:=20173=20fernando=20-=2023/02/2014=20?= =?UTF-8?q?16:41:18:=20-=20Mejora=20est=C3=A9tica=20presentaci=C3=B3n=20TX?= =?UTF-8?q?2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- foxbin2prg.pj2 | 2 +- foxbin2prg.pjt | Bin 359296 -> 359744 bytes foxbin2prg.pjx | Bin 1583 -> 1583 bytes foxbin2prg.prg | 36 ++++++++++++++++++++++++++---------- 4 files changed, 27 insertions(+), 11 deletions(-) diff --git a/foxbin2prg.pj2 b/foxbin2prg.pj2 index 30a3909..1b87742 100644 --- a/foxbin2prg.pj2 +++ b/foxbin2prg.pj2 @@ -26,7 +26,7 @@ _LegalTrademark = "Open Source" _ProductName = " FOXBIN2PRG" _MajorVer = "1" _MinorVer = "19" -_Revision = " 270" +_Revision = " 277" _LanguageID = "1034" _AutoIncrement = "1" * diff --git a/foxbin2prg.pjt b/foxbin2prg.pjt index b68d64f19bc4af0a4c991ace4f60995b7d7d3ad5..30551859772290e684450947cd12d19d96980b77 100644 GIT binary patch delta 8009 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 YFyTEnars3y-l+XCT>Iz0#3A&50Ff}u`v3p{ delta 7599 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 diff --git a/foxbin2prg.pjx b/foxbin2prg.pjx index 94fefc1215201dfef367e24955f39fb563b87517..d90ca09874ef5fd3da1f9c370c22d4dd9cf25ee9 100644 GIT binary patch delta 29 hcmZ3_vz}+e9u_uJLlXm2i^+#r{y~`LlaH}x0sxS|34Q> <> ENDTEXT + C_FB2PRG_CODE = C_FB2PRG_CODE + CR_LF + ENDIF ENDPROC @@ -7965,7 +7967,9 @@ DEFINE CLASS c_conversor_bin_a_prg AS c_conversor_base TEXT TO C_FB2PRG_CODE ADDITIVE TEXTMERGE NOSHOW FLAGS 1+2 PRETEXT 1+2+4+8 <> ENDTEXT - + + C_FB2PRG_CODE = C_FB2PRG_CODE + CR_LF + ENDPROC @@ -7981,10 +7985,10 @@ DEFINE CLASS c_conversor_bin_a_prg AS c_conversor_base IF '.' $ toRegObj.PARENT *-- Este caso: clase.objeto.objeto ==> se quita clase - lcNombre = SUBSTR(toRegObj.Parent, AT('.', toRegObj.Parent)+1) + '.' + toRegObj.objName + lcNombre = SUBSTR(toRegObj.PARENT, AT('.', toRegObj.PARENT)+1) + '.' + toRegObj.OBJNAME ELSE *-- Este caso: objeto - lcNombre = toRegObj.objName + lcNombre = toRegObj.OBJNAME ENDIF TEXT TO C_FB2PRG_CODE ADDITIVE TEXTMERGE NOSHOW FLAGS 1 PRETEXT 1+2+4+8 @@ -7997,7 +8001,7 @@ DEFINE CLASS c_conversor_bin_a_prg AS c_conversor_base TEXT TO C_FB2PRG_CODE ADDITIVE TEXTMERGE NOSHOW FLAGS 1+2 PRETEXT 1+2+4+8 <> ENDTEXT - + ENDPROC @@ -8595,9 +8599,15 @@ DEFINE CLASS c_conversor_vcx_a_prg AS c_conversor_bin_a_prg GOTO RECORD (lnRecno) ASORT(laObjs, 2, -1, 0, 0) && Orden por ZOrder - FOR I = 1 TO lnObjCount - .write_OBJECTMETADATA( laObjs(I,1) ) - ENDFOR + IF lnObjCount > 0 + C_FB2PRG_CODE = C_FB2PRG_CODE + CR_LF + ' *-- OBJECTDATA items order determines ZOrder / El orden de los items OBJECTDATA determina el ZOrder ' + + FOR I = 1 TO lnObjCount + .write_OBJECTMETADATA( laObjs(I,1) ) + ENDFOR + + C_FB2PRG_CODE = C_FB2PRG_CODE + CR_LF + ENDIF .write_INCLUDE( @loRegClass ) @@ -8806,9 +8816,15 @@ DEFINE CLASS c_conversor_scx_a_prg AS c_conversor_bin_a_prg GOTO RECORD (lnRecno) ASORT(laObjs, 2, -1, 0, 0) && Orden por ZOrder - FOR I = 1 TO lnObjCount - .write_OBJECTMETADATA( laObjs(I,1) ) - ENDFOR + IF lnObjCount > 0 + C_FB2PRG_CODE = C_FB2PRG_CODE + CR_LF + ' *-- OBJECTDATA items order determines ZOrder / El orden de los items OBJECTDATA determina el ZOrder ' + + FOR I = 1 TO lnObjCount + .write_OBJECTMETADATA( laObjs(I,1) ) + ENDFOR + + C_FB2PRG_CODE = C_FB2PRG_CODE + CR_LF + ENDIF .write_INCLUDE( @loRegClass )