Changeset: 206 fdbozzo - 12/03/2014 23:52:40:
- Arreglo bug mnx: Al usar comentarios multilínea en las opciones, se corrompe el MN2 y el MNX regenerado desde él (Ryan Harris) - Arreglo bug mnx: Algunos procedimientos no se generan correctamente (Ryan Harris) - Correcciones al archivo de traducción al Inglés foxbin2prg_en.h (Ryan Harris)
This commit is contained in:
@@ -2,7 +2,7 @@
|
|||||||
* (ES) AUTOGENERADO - <20><>ATENCI<43>N!! - <20><>NO PENSADO PARA EJECUTAR!! USAR SOLAMENTE PARA INTEGRAR CAMBIOS Y ALMACENAR CON HERRAMIENTAS SCM!!
|
* (ES) AUTOGENERADO - <20><>ATENCI<43>N!! - <20><>NO PENSADO PARA EJECUTAR!! USAR SOLAMENTE PARA INTEGRAR CAMBIOS Y ALMACENAR CON HERRAMIENTAS SCM!!
|
||||||
* (EN) AUTOGENERATED - ATTENTION!! - NOT INTENDED FOR EXECUTION!! USE ONLY FOR MERGING CHANGES AND STORING WITH SCM TOOLS!!
|
* (EN) AUTOGENERATED - ATTENTION!! - NOT INTENDED FOR EXECUTION!! USE ONLY FOR MERGING CHANGES AND STORING WITH SCM TOOLS!!
|
||||||
*--------------------------------------------------------------------------------------------------------------------------------------------------------
|
*--------------------------------------------------------------------------------------------------------------------------------------------------------
|
||||||
*< FOXBIN2PRG: Version="1.19" SourceFile="C:\DESA\foxbin2prg\TESTS\DATOS_READONLY\menu2.mnx" /> (Solo para binarios VFP 9 / Only for VFP 9 binaries)
|
*< FOXBIN2PRG: Version="1.19" SourceFile="menu2.mnx" /> (Solo para binarios VFP 9 / Only for VFP 9 binaries)
|
||||||
*
|
*
|
||||||
*<MenuType>5</MenuType>
|
*<MenuType>5</MenuType>
|
||||||
*<MenuLocation>APPEND</MenuLocation>
|
*<MenuLocation>APPEND</MenuLocation>
|
||||||
@@ -14,24 +14,24 @@
|
|||||||
|
|
||||||
*<MenuCode>
|
*<MenuCode>
|
||||||
DEFINE MENU _MSYSMENU BAR
|
DEFINE MENU _MSYSMENU BAR
|
||||||
DEFINE PAD _3Z80ZOKYJ OF _MSYSMENU PROMPT "Opci<63>n A con submen<65>" COLOR SCHEME 3 ;
|
DEFINE PAD _40Q0H1MMN OF _MSYSMENU PROMPT "Opci<63>n A con submen<65>" COLOR SCHEME 3 ;
|
||||||
NEGOTIATE NONE, LEFT ;
|
NEGOTIATE NONE, LEFT ;
|
||||||
KEY DEL, "Pulsar <DEL>" ;
|
KEY DEL, "Pulsar <DEL>" ;
|
||||||
SKIP FOR SKIP_FOR() ;
|
SKIP FOR SKIP_FOR() ;
|
||||||
MESSAGE "Mensaje para Opci<63>n A con submen<65>" && Comentario
|
MESSAGE "Mensaje para Opci<63>n A con submen<65>" && Comentario<CR>multil<69>nea<CR>rompetodo
|
||||||
|
|
||||||
ON PAD _3Z80ZOKYJ OF _MSYSMENU ACTIVATE POPUP Opci<63>nA_CS
|
ON PAD _40Q0H1MMN OF _MSYSMENU ACTIVATE POPUP Opci<63>nA_CS
|
||||||
|
|
||||||
*----------------------------------
|
*----------------------------------
|
||||||
DEFINE POPUP Opci<63>nA_CS MARGIN RELATIVE SHADOW COLOR SCHEME 4
|
DEFINE POPUP Opci<63>nA_CS MARGIN RELATIVE SHADOW COLOR SCHEME 4
|
||||||
DEFINE BAR 1 OF Opci<63>nA_CS PROMPT "Opci<63>n A-1" ;
|
DEFINE BAR 1 OF Opci<63>nA_CS PROMPT "Opci<63>n A-1" ;
|
||||||
PICTURE "..\..\foxunit\fxuacknowledgements.bmp"
|
PICTURE "..\..\foxunit\fxuacknowledgements.bmp" && Comentario<CR>multil<69>nea<CR>rompetodo
|
||||||
ON BAR 1 OF Opci<63>nA_CS ACTIVATE POPUP Opci<63>nA1
|
ON BAR 1 OF Opci<63>nA_CS ACTIVATE POPUP Opci<63>nA1
|
||||||
|
|
||||||
*----------------------------------
|
*----------------------------------
|
||||||
DEFINE POPUP Opci<63>nA1 MARGIN RELATIVE SHADOW COLOR SCHEME 4
|
DEFINE POPUP Opci<63>nA1 MARGIN RELATIVE SHADOW COLOR SCHEME 4
|
||||||
DEFINE BAR Shortcut_Menu_Title OF Opci<63>nA1 PROMPT "Opci<63>nA-1-Sub" ;
|
DEFINE BAR Shortcut_Menu_Title OF Opci<63>nA1 PROMPT "Opci<63>nA-1-Sub" ;
|
||||||
PICTURE "..\..\foxunit\fxuacknowledgements.bmp"
|
PICTURE "..\..\foxunit\fxuacknowledgements.bmp" && Comentario<CR>multil<69>nea<CR>rompetodo
|
||||||
ON SELECTION BAR Shortcut_Menu_Title OF Opci<63>nA1 wait window "Ejecuta Comando o funci<63>n para Opci<63>n A-1"
|
ON SELECTION BAR Shortcut_Menu_Title OF Opci<63>nA1 wait window "Ejecuta Comando o funci<63>n para Opci<63>n A-1"
|
||||||
|
|
||||||
DEFINE BAR 2 OF Opci<63>nA_CS PROMPT "Opci<63>n A-2"
|
DEFINE BAR 2 OF Opci<63>nA_CS PROMPT "Opci<63>n A-2"
|
||||||
@@ -65,6 +65,11 @@ ON PAD _3Z80ZOKYJ OF _MSYSMENU ACTIVATE POPUP Opci
|
|||||||
SKIP FOR NOT glEnabled_Opc_A_2_Sub_3 ;
|
SKIP FOR NOT glEnabled_Opc_A_2_Sub_3 ;
|
||||||
PICTRES _mfi_sysprint ;
|
PICTRES _mfi_sysprint ;
|
||||||
MESSAGE "Message para Opci<63>n A-2-Sub.3 (Tipo Bar#)" && Comentarios para Opci<63>n A-2-Sub.3
|
MESSAGE "Message para Opci<63>n A-2-Sub.3 (Tipo Bar#)" && Comentarios para Opci<63>n A-2-Sub.3
|
||||||
|
|
||||||
|
DEFINE BAR 3 OF Opci<63>nA_CS PROMPT "Opci<63>n A-3" ;
|
||||||
|
SKIP FOR valor de skip() ;
|
||||||
|
MESSAGE "un mensaje de texto" && Y este es<CR>el nuevo comando<CR>dentro de un PROC!
|
||||||
|
ON SELECTION BAR 3 OF Opci<63>nA_CS ON ERROR ****
|
||||||
ON SELECTION POPUP Opci<63>nA_CS *-- PROCEDURE Le cambi<62> el nombre!
|
ON SELECTION POPUP Opci<63>nA_CS *-- PROCEDURE Le cambi<62> el nombre!
|
||||||
|
|
||||||
DEFINE PAD opc_b OF _MSYSMENU PROMPT "Opci<63>n B con comando" COLOR SCHEME 3 ;
|
DEFINE PAD opc_b OF _MSYSMENU PROMPT "Opci<63>n B con comando" COLOR SCHEME 3 ;
|
||||||
@@ -73,8 +78,8 @@ DEFINE PAD opc_b OF _MSYSMENU PROMPT "Opci
|
|||||||
MESSAGE "Mensaje para Opci<63>n B con Command" && Comentario de la Opci<63>n b
|
MESSAGE "Mensaje para Opci<63>n B con Command" && Comentario de la Opci<63>n b
|
||||||
|
|
||||||
ON SELECTION PAD opc_b OF _MSYSMENU WAIT WINDOW "Opci<63>n B"
|
ON SELECTION PAD opc_b OF _MSYSMENU WAIT WINDOW "Opci<63>n B"
|
||||||
ON SELECTION POPUP ALL *- Menu bar procedure
|
ON SELECTION POPUP ALL DO ALL_FB2P
|
||||||
ON SELECTION MENU _MSYSMENU *-- Menu Procedure
|
ON SELECTION MENU _MSYSMENU DO SELECTION_MENU__MSYSMENU_FB2P
|
||||||
|
|
||||||
*</MenuCode>
|
*</MenuCode>
|
||||||
|
|
||||||
@@ -86,6 +91,20 @@ PROCEDURE Menu1_Opci
|
|||||||
*ENDPROC
|
*ENDPROC
|
||||||
ENDPROC && Menu1_Opci<63>n_A_2_Sub_SNIPPET
|
ENDPROC && Menu1_Opci<63>n_A_2_Sub_SNIPPET
|
||||||
|
|
||||||
|
PROCEDURE ALL_FB2P
|
||||||
|
*- Menu bar procedure
|
||||||
|
multil<69>nea
|
||||||
|
rompetodo
|
||||||
|
<Menu Options>
|
||||||
|
ENDPROC && ALL_FB2P
|
||||||
|
|
||||||
|
PROCEDURE SELECTION_MENU__MSYSMENU_FB2P
|
||||||
|
*-- Menu Procedure
|
||||||
|
multil<69>nea
|
||||||
|
rompetodo
|
||||||
|
<General Options>
|
||||||
|
ENDPROC && SELECTION_MENU__MSYSMENU_FB2P
|
||||||
|
|
||||||
*</Procedures>
|
*</Procedures>
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
121
foxbin2prg.prg
121
foxbin2prg.prg
@@ -2074,15 +2074,15 @@ DEFINE CLASS c_conversor_base AS SESSION
|
|||||||
LPARAMETERS tcLine, tcComment
|
LPARAMETERS tcLine, tcComment
|
||||||
LOCAL ln_AT_Cmt
|
LOCAL ln_AT_Cmt
|
||||||
tcComment = ''
|
tcComment = ''
|
||||||
|
ln_AT_Cmt = AT( '&'+'&', tcLine)
|
||||||
|
|
||||||
IF '&'+'&' $ tcLine
|
IF ln_AT_Cmt > 0
|
||||||
ln_AT_Cmt = AT( '&'+'&', tcLine)
|
|
||||||
tcComment = LTRIM( SUBSTR( tcLine, ln_AT_Cmt + 2 ) )
|
tcComment = LTRIM( SUBSTR( tcLine, ln_AT_Cmt + 2 ) )
|
||||||
*tcLine = RTRIM( LEFT( tcLine, ln_AT_Cmt - 1 ), 0, ' ', CHR(9) ) && Quito espacios y TABS
|
*tcLine = RTRIM( LEFT( tcLine, ln_AT_Cmt - 1 ), 0, ' ', CHR(9) ) && Quito espacios y TABS
|
||||||
tcLine = RTRIM( LEFT( tcLine, ln_AT_Cmt - 1 ), 0, CHR(9) ) && Quito TABS
|
tcLine = RTRIM( LEFT( tcLine, ln_AT_Cmt - 1 ), 0, CHR(9) ) && Quito TABS
|
||||||
ENDIF
|
ENDIF
|
||||||
|
|
||||||
RETURN
|
RETURN (ln_AT_Cmt > 0)
|
||||||
ENDPROC
|
ENDPROC
|
||||||
|
|
||||||
|
|
||||||
@@ -10305,9 +10305,11 @@ DEFINE CLASS CL_CUS_BASE AS CUSTOM
|
|||||||
+ [<memberdata name="set_line" display="set_Line"/>] ;
|
+ [<memberdata name="set_line" display="set_Line"/>] ;
|
||||||
+ [<memberdata name="analizarbloque" display="analizarBloque"/>] ;
|
+ [<memberdata name="analizarbloque" display="analizarBloque"/>] ;
|
||||||
+ [<memberdata name="filetypedescription" display="fileTypeDescription"/>] ;
|
+ [<memberdata name="filetypedescription" display="fileTypeDescription"/>] ;
|
||||||
|
+ [<memberdata name="get_separatedlineandcomment" display="get_SeparatedLineAndComment"/>] ;
|
||||||
+ [<memberdata name="totext" display="toText"/>] ;
|
+ [<memberdata name="totext" display="toText"/>] ;
|
||||||
+ [</VFPData>]
|
+ [</VFPData>]
|
||||||
|
|
||||||
|
|
||||||
l_Debug = .F.
|
l_Debug = .F.
|
||||||
|
|
||||||
|
|
||||||
@@ -10339,6 +10341,27 @@ DEFINE CLASS CL_CUS_BASE AS CUSTOM
|
|||||||
ENDPROC
|
ENDPROC
|
||||||
|
|
||||||
|
|
||||||
|
PROCEDURE get_SeparatedLineAndComment
|
||||||
|
*---------------------------------------------------------------------------------------------------
|
||||||
|
* PAR<41>METROS: (!=Obligatorio | ?=Opcional) (@=Pasar por referencia | v=Pasar por valor) (IN/OUT)
|
||||||
|
* tcLine (@! IN/OUT) L<>nea a separar del comentario
|
||||||
|
* tcComment (@? OUT) Comentario
|
||||||
|
*---------------------------------------------------------------------------------------------------
|
||||||
|
LPARAMETERS tcLine, tcComment
|
||||||
|
LOCAL ln_AT_Cmt
|
||||||
|
tcComment = ''
|
||||||
|
ln_AT_Cmt = AT( '&'+'&', tcLine)
|
||||||
|
|
||||||
|
IF ln_AT_Cmt > 0
|
||||||
|
tcComment = LTRIM( SUBSTR( tcLine, ln_AT_Cmt + 2 ) )
|
||||||
|
*tcLine = RTRIM( LEFT( tcLine, ln_AT_Cmt - 1 ), 0, ' ', CHR(9) ) && Quito espacios y TABS
|
||||||
|
tcLine = RTRIM( LEFT( tcLine, ln_AT_Cmt - 1 ), 0, CHR(9) ) && Quito TABS
|
||||||
|
ENDIF
|
||||||
|
|
||||||
|
RETURN (ln_AT_Cmt > 0)
|
||||||
|
ENDPROC
|
||||||
|
|
||||||
|
|
||||||
ENDDEFINE
|
ENDDEFINE
|
||||||
|
|
||||||
|
|
||||||
@@ -10355,6 +10378,7 @@ DEFINE CLASS CL_COL_BASE AS COLLECTION
|
|||||||
_MEMBERDATA = [<VFPData>] ;
|
_MEMBERDATA = [<VFPData>] ;
|
||||||
+ [<memberdata name="l_debug" display="l_Debug"/>] ;
|
+ [<memberdata name="l_debug" display="l_Debug"/>] ;
|
||||||
+ [<memberdata name="analizarbloque" display="analizarBloque"/>] ;
|
+ [<memberdata name="analizarbloque" display="analizarBloque"/>] ;
|
||||||
|
+ [<memberdata name="get_separatedlineandcomment" display="get_SeparatedLineAndComment"/>] ;
|
||||||
+ [<memberdata name="set_line" display="set_Line"/>] ;
|
+ [<memberdata name="set_line" display="set_Line"/>] ;
|
||||||
+ [<memberdata name="totext" display="toText"/>] ;
|
+ [<memberdata name="totext" display="toText"/>] ;
|
||||||
+ [</VFPData>]
|
+ [</VFPData>]
|
||||||
@@ -10390,6 +10414,27 @@ DEFINE CLASS CL_COL_BASE AS COLLECTION
|
|||||||
ENDPROC
|
ENDPROC
|
||||||
|
|
||||||
|
|
||||||
|
PROCEDURE get_SeparatedLineAndComment
|
||||||
|
*---------------------------------------------------------------------------------------------------
|
||||||
|
* PAR<41>METROS: (!=Obligatorio | ?=Opcional) (@=Pasar por referencia | v=Pasar por valor) (IN/OUT)
|
||||||
|
* tcLine (@! IN/OUT) L<>nea a separar del comentario
|
||||||
|
* tcComment (@? OUT) Comentario
|
||||||
|
*---------------------------------------------------------------------------------------------------
|
||||||
|
LPARAMETERS tcLine, tcComment
|
||||||
|
LOCAL ln_AT_Cmt
|
||||||
|
tcComment = ''
|
||||||
|
ln_AT_Cmt = AT( '&'+'&', tcLine)
|
||||||
|
|
||||||
|
IF ln_AT_Cmt > 0
|
||||||
|
tcComment = LTRIM( SUBSTR( tcLine, ln_AT_Cmt + 2 ) )
|
||||||
|
*tcLine = RTRIM( LEFT( tcLine, ln_AT_Cmt - 1 ), 0, ' ', CHR(9) ) && Quito espacios y TABS
|
||||||
|
tcLine = RTRIM( LEFT( tcLine, ln_AT_Cmt - 1 ), 0, CHR(9) ) && Quito TABS
|
||||||
|
ENDIF
|
||||||
|
|
||||||
|
RETURN (ln_AT_Cmt > 0)
|
||||||
|
ENDPROC
|
||||||
|
|
||||||
|
|
||||||
PROCEDURE toText
|
PROCEDURE toText
|
||||||
*---------------------------------------------------------------------------------------------------
|
*---------------------------------------------------------------------------------------------------
|
||||||
* PAR<41>METROS: (!=Obligatorio | ?=Opcional) (@=Pasar por referencia | v=Pasar por valor) (IN/OUT)
|
* PAR<41>METROS: (!=Obligatorio | ?=Opcional) (@=Pasar por referencia | v=Pasar por valor) (IN/OUT)
|
||||||
@@ -16672,9 +16717,14 @@ DEFINE CLASS CL_MENU_BARPOP AS CL_MENU_COL_BASE
|
|||||||
lcExpr = loReg.PROCEDURE
|
lcExpr = loReg.PROCEDURE
|
||||||
THIS.AnalizarSiExpresionEsComandoOProcedimiento( lcExpr, @lcProcName, @lcProcCode, '', 1, .T. )
|
THIS.AnalizarSiExpresionEsComandoOProcedimiento( lcExpr, @lcProcName, @lcProcCode, '', 1, .T. )
|
||||||
|
|
||||||
IF EMPTY(lcProcName)
|
IF EMPTY(lcProcCode)
|
||||||
|
*-- Comando
|
||||||
lcText = lcText + lcTab + 'ON SELECTION POPUP ' + IIF( loReg.OBJCODE = 0, loReg.NAME, 'ALL' ) + ' ' + lcExpr + CR_LF
|
lcText = lcText + lcTab + 'ON SELECTION POPUP ' + IIF( loReg.OBJCODE = 0, loReg.NAME, 'ALL' ) + ' ' + lcExpr + CR_LF
|
||||||
ELSE
|
ELSE
|
||||||
|
*-- Procedure
|
||||||
|
IF EMPTY(lcProcName)
|
||||||
|
lcProcName = CHRTRAN( ALLTRIM( IIF( loReg.OBJCODE = 0, loReg.NAME, 'ALL' ) ), ' ', '_' ) + '_FB2P'
|
||||||
|
ENDIF
|
||||||
lcText = lcText + lcTab + 'ON SELECTION POPUP ' + IIF( loReg.OBJCODE = 0, loReg.NAME, 'ALL' ) + ' DO ' + lcProcName + CR_LF
|
lcText = lcText + lcTab + 'ON SELECTION POPUP ' + IIF( loReg.OBJCODE = 0, loReg.NAME, 'ALL' ) + ' DO ' + lcProcName + CR_LF
|
||||||
tcEndProcedures = tcEndProcedures + STRTRAN( lcProcCode, '<<ProcName>>', lcProcName ) + CR_LF
|
tcEndProcedures = tcEndProcedures + STRTRAN( lcProcCode, '<<ProcName>>', lcProcName ) + CR_LF
|
||||||
ENDIF
|
ENDIF
|
||||||
@@ -16876,17 +16926,15 @@ DEFINE CLASS CL_MENU_OPTION AS CL_MENU_COL_BASE
|
|||||||
loReg.PROMPT = CHRTRAN( ALLTRIM( STREXTRACT( tcLine, ' PROMPT ', ' COLOR ' ) ), '"', '' )
|
loReg.PROMPT = CHRTRAN( ALLTRIM( STREXTRACT( tcLine, ' PROMPT ', ' COLOR ' ) ), '"', '' )
|
||||||
|
|
||||||
*-- ANALISIS DEL "DEFINE PAD"
|
*-- ANALISIS DEL "DEFINE PAD"
|
||||||
IF ';' $ tcLine
|
DO CASE
|
||||||
|
CASE ';' $ tcLine
|
||||||
FOR I = I + 1 TO tnCodeLines
|
FOR I = I + 1 TO tnCodeLines
|
||||||
.set_Line( @tcLine, @taCodeLines, I )
|
.set_Line( @tcLine, @taCodeLines, I )
|
||||||
|
|
||||||
IF EMPTY(loReg.COMMENT) && No volver a buscar el comentario si ya existe
|
IF EMPTY(loReg.COMMENT) && No volver a buscar el comentario si ya existe
|
||||||
lnPos = AT( '&'+'&', tcLine )
|
*-- Busco si tiene comentario
|
||||||
IF lnPos > 0
|
IF .get_SeparatedLineAndComment( @tcLine, @lcComment )
|
||||||
*-- Busco si tiene comentario
|
loReg.COMMENT = STRTRAN( STRTRAN( lcComment, '<CR>', CHR(13) ), '<LF>', CHR(10) )
|
||||||
loReg.COMMENT = SUBSTR( tcLine, lnPos + 3 )
|
|
||||||
tcLine = LEFT( tcLine, lnPos - 1 )
|
|
||||||
lnPos = 0
|
|
||||||
ENDIF
|
ENDIF
|
||||||
ENDIF
|
ENDIF
|
||||||
|
|
||||||
@@ -16926,7 +16974,12 @@ DEFINE CLASS CL_MENU_OPTION AS CL_MENU_COL_BASE
|
|||||||
EXIT
|
EXIT
|
||||||
ENDIF
|
ENDIF
|
||||||
ENDFOR
|
ENDFOR
|
||||||
ENDIF && ';' $ tcLine
|
|
||||||
|
CASE .set_Line( @tcLine, @taCodeLines, I ) AND .get_SeparatedLineAndComment( @tcLine, @lcComment )
|
||||||
|
*-- Es un Bar de una sola l<>nea y con comentarios
|
||||||
|
loReg.COMMENT = STRTRAN( STRTRAN( lcComment, '<CR>', CHR(13) ), '<LF>', CHR(10) )
|
||||||
|
|
||||||
|
ENDCASE
|
||||||
|
|
||||||
|
|
||||||
* Estructuras ejemplo a analizar:
|
* Estructuras ejemplo a analizar:
|
||||||
@@ -17063,17 +17116,15 @@ DEFINE CLASS CL_MENU_OPTION AS CL_MENU_COL_BASE
|
|||||||
loReg.PROMPT = CHRTRAN( ALLTRIM( STREXTRACT( tcLine, ' PROMPT ', ';', 1, 2 ) ), '"', '' )
|
loReg.PROMPT = CHRTRAN( ALLTRIM( STREXTRACT( tcLine, ' PROMPT ', ';', 1, 2 ) ), '"', '' )
|
||||||
|
|
||||||
*-- ANALISIS DEL "DEFINE BAR"
|
*-- ANALISIS DEL "DEFINE BAR"
|
||||||
IF ';' $ tcLine
|
DO CASE
|
||||||
|
CASE ';' $ tcLine
|
||||||
FOR I = I + 1 TO tnCodeLines
|
FOR I = I + 1 TO tnCodeLines
|
||||||
.set_Line( @tcLine, @taCodeLines, I )
|
.set_Line( @tcLine, @taCodeLines, I )
|
||||||
|
|
||||||
IF EMPTY(loReg.COMMENT) && No volver a buscar el comentario si ya existe
|
IF EMPTY(loReg.COMMENT) && No volver a buscar el comentario si ya existe
|
||||||
lnPos = AT( '&'+'&', tcLine )
|
*-- Busco si tiene comentario
|
||||||
IF lnPos > 0
|
IF .get_SeparatedLineAndComment( @tcLine, @lcComment )
|
||||||
*-- Busco si tiene comentario
|
loReg.COMMENT = STRTRAN( STRTRAN( lcComment, '<CR>', CHR(13) ), '<LF>', CHR(10) )
|
||||||
loReg.COMMENT = SUBSTR( tcLine, lnPos + 3 )
|
|
||||||
tcLine = LEFT( tcLine, lnPos - 1 )
|
|
||||||
lnPos = 0
|
|
||||||
ENDIF
|
ENDIF
|
||||||
ENDIF
|
ENDIF
|
||||||
|
|
||||||
@@ -17113,7 +17164,12 @@ DEFINE CLASS CL_MENU_OPTION AS CL_MENU_COL_BASE
|
|||||||
EXIT
|
EXIT
|
||||||
ENDIF
|
ENDIF
|
||||||
ENDFOR
|
ENDFOR
|
||||||
ENDIF && ';' $ tcLine
|
|
||||||
|
CASE .set_Line( @tcLine, @taCodeLines, I ) AND .get_SeparatedLineAndComment( @tcLine, @lcComment )
|
||||||
|
*-- Es un Bar de una sola l<>nea y con comentarios
|
||||||
|
loReg.COMMENT = STRTRAN( STRTRAN( lcComment, '<CR>', CHR(13) ), '<LF>', CHR(10) )
|
||||||
|
|
||||||
|
ENDCASE
|
||||||
|
|
||||||
IF LEFT(lcBarName,1) == '_'
|
IF LEFT(lcBarName,1) == '_'
|
||||||
*-- Es un BAR del Sistema, as<61> que no tiene ON BAR ni nada m<>s.
|
*-- Es un BAR del Sistema, as<61> que no tiene ON BAR ni nada m<>s.
|
||||||
@@ -17240,12 +17296,23 @@ DEFINE CLASS CL_MENU_OPTION AS CL_MENU_COL_BASE
|
|||||||
lcExpr = loReg.PROCEDURE
|
lcExpr = loReg.PROCEDURE
|
||||||
.AnalizarSiExpresionEsComandoOProcedimiento( lcExpr, @lcProcName, @lcProcCode, '', 1, .T. )
|
.AnalizarSiExpresionEsComandoOProcedimiento( lcExpr, @lcProcName, @lcProcCode, '', 1, .T. )
|
||||||
|
|
||||||
IF EMPTY(lcProcName)
|
IF EMPTY(lcProcCode)
|
||||||
lcProcName = CHRTRAN( ALLTRIM( STREXTRACT( lcText, 'DEFINE ', 'PROMPT ' ) ), ' ', '_' ) + '_FB2P'
|
*-- Comando
|
||||||
ENDIF
|
IF EMPTY(lcExpr)
|
||||||
|
lcText = STRTRAN( lcText, 'DO <<ProcName>>', '' )
|
||||||
|
ELSE
|
||||||
|
lcText = STRTRAN( lcText, 'DO <<ProcName>>', lcExpr )
|
||||||
|
ENDIF
|
||||||
|
ELSE
|
||||||
|
|
||||||
lcText = STRTRAN( lcText, '<<ProcName>>', lcProcName )
|
*-- Procedure
|
||||||
tcEndProcedures = tcEndProcedures + STRTRAN( lcProcCode, '<<ProcName>>', lcProcName ) + CR_LF
|
IF EMPTY(lcProcName)
|
||||||
|
lcProcName = CHRTRAN( ALLTRIM( STREXTRACT( lcText, 'DEFINE ', 'PROMPT ' ) ), ' ', '_' ) + '_FB2P'
|
||||||
|
ENDIF
|
||||||
|
lcProcCode = STRTRAN( lcProcCode, '<<ProcName>>', lcProcName )
|
||||||
|
lcText = STRTRAN( lcText, '<<ProcName>>', lcProcName )
|
||||||
|
tcEndProcedures = tcEndProcedures + lcProcCode + CR_LF
|
||||||
|
ENDIF
|
||||||
ENDIF
|
ENDIF
|
||||||
|
|
||||||
|
|
||||||
@@ -17319,7 +17386,7 @@ DEFINE CLASS CL_MENU_OPTION AS CL_MENU_COL_BASE
|
|||||||
ENDIF
|
ENDIF
|
||||||
|
|
||||||
IF NOT EMPTY(toReg.COMMENT)
|
IF NOT EMPTY(toReg.COMMENT)
|
||||||
lcText = lcText + ' &' + '& ' + toReg.COMMENT
|
lcText = lcText + ' &' + '& ' + STRTRAN( STRTRAN( toReg.COMMENT, CHR(13), '<CR>' ), CHR(10), '<LF>' )
|
||||||
ENDIF
|
ENDIF
|
||||||
|
|
||||||
*-- ON BAR
|
*-- ON BAR
|
||||||
@@ -17412,7 +17479,7 @@ DEFINE CLASS CL_MENU_OPTION AS CL_MENU_COL_BASE
|
|||||||
ENDIF
|
ENDIF
|
||||||
|
|
||||||
IF NOT EMPTY(toReg.COMMENT)
|
IF NOT EMPTY(toReg.COMMENT)
|
||||||
lcText = lcText + ' &' + '& ' + toReg.COMMENT
|
lcText = lcText + ' &' + '& ' + STRTRAN( STRTRAN( toReg.COMMENT, CHR(13), '<CR>' ), CHR(10), '<LF>' )
|
||||||
ENDIF
|
ENDIF
|
||||||
|
|
||||||
lcText = lcText + CR_LF
|
lcText = lcText + CR_LF
|
||||||
|
|||||||
@@ -2,38 +2,38 @@
|
|||||||
*-- ENGLISH TRANSLATION => RENAME OR COPY TO [foxbin2prg.h] TO USE, AND RECOMPILE FOXBIN2PRG.PRG - Feel free to change or adapt the strings.
|
*-- ENGLISH TRANSLATION => RENAME OR COPY TO [foxbin2prg.h] TO USE, AND RECOMPILE FOXBIN2PRG.PRG - Feel free to change or adapt the strings.
|
||||||
*-- NOTE: MUST USE DOUBLE QUOTES, OR SYNTAX ERRORS HAPPEN WHEN COMPILING. STRANGE :(
|
*-- NOTE: MUST USE DOUBLE QUOTES, OR SYNTAX ERRORS HAPPEN WHEN COMPILING. STRANGE :(
|
||||||
*-------------------------------------------------------------------------------------------------------------------------------------------
|
*-------------------------------------------------------------------------------------------------------------------------------------------
|
||||||
#DEFINE C_ASTERISK_EXT_NOT_ALLOWED_LOC "* and ? extensions are not allowed because is dangerous (binaries can be overwriten with xx2 empty files)"
|
#DEFINE C_ASTERISK_EXT_NOT_ALLOWED_LOC "* and ? extensions are not allowed because it's dangerous (binaries can be overwritten with xx2 empty files)"
|
||||||
#DEFINE C_BACKLINK_CANT_UPDATE_BL_LOC "Could not update backlink"
|
#DEFINE C_BACKLINK_CANT_UPDATE_BL_LOC "Could not update backlink"
|
||||||
#DEFINE C_BACKLINK_OF_TABLE_LOC "of table"
|
#DEFINE C_BACKLINK_OF_TABLE_LOC "of table"
|
||||||
#DEFINE C_BACKUP_OF_LOC "Doing Backup of: "
|
#DEFINE C_BACKUP_OF_LOC "Doing Backup of: "
|
||||||
#DEFINE C_CANT_GENERATE_FILE_BECAUSE_IT_IS_READONLY_LOC "Can not generate file [<<THIS.c_OutputFile>>] because it is ReadOnly"
|
#DEFINE C_CANT_GENERATE_FILE_BECAUSE_IT_IS_READONLY_LOC "Cannot generate file [<<THIS.c_OutputFile>>] because it is ReadOnly"
|
||||||
#DEFINE C_CONFIGFILE_LOC "Using configuration file:"
|
#DEFINE C_CONFIGFILE_LOC "Using configuration file:"
|
||||||
#DEFINE C_CONVERTER_UNLOAD_LOC "Converter unload"
|
#DEFINE C_CONVERTER_UNLOAD_LOC "Converter unload"
|
||||||
#DEFINE C_CONVERTING_FILE_LOC "Converting file"
|
#DEFINE C_CONVERTING_FILE_LOC "Converting file"
|
||||||
#DEFINE C_DATA_ERROR_CANT_PARSE_UNPAIRING_DOUBLE_QUOTES_LOC "Data Error: Cant't parse because unpairing double-quotes on line <<lcMetadatos>>"
|
#DEFINE C_DATA_ERROR_CANT_PARSE_UNPAIRING_DOUBLE_QUOTES_LOC "Data Error: Can't parse because of unpaired double-quotes on line <<lcMetadatos>>"
|
||||||
#DEFINE C_DUPLICATED_FILE_LOC "Duplicated file"
|
#DEFINE C_DUPLICATED_FILE_LOC "Duplicated file"
|
||||||
#DEFINE C_ENDDEFINE_MARKER_NOT_FOUND_LOC "No se ha encontrado el marcador de fin [ENDDEFINE] de la l<EFBFBD>nea <<TRANSFORM( toClase._Inicio )>> para el identificador [<<toClase._Nombre>>]"
|
#DEFINE C_ENDDEFINE_MARKER_NOT_FOUND_LOC "Cannot find end marker [ENDDEFINE] of line <<TRANSFORM( toClase._Inicio )>> for ID [<<toClase._Nombre>>]"
|
||||||
#DEFINE C_END_MARKER_NOT_FOUND_LOC "Can not found end marker [<<ta_ID_Bloques(lnPrimerID,2)>>] that closes start marker [<<ta_ID_Bloques(lnPrimerID,1)>>] on line <<TRANSFORM(taBloquesExclusion(tnBloquesExclusion,1))>>"
|
#DEFINE C_END_MARKER_NOT_FOUND_LOC "Cannot find end marker [<<ta_ID_Bloques(lnPrimerID,2)>>] that closes start marker [<<ta_ID_Bloques(lnPrimerID,1)>>] on line <<TRANSFORM(taBloquesExclusion(tnBloquesExclusion,1))>>"
|
||||||
#DEFINE C_FIELD_NOT_FOUND_ON_FILE_STRUCTURE_LOC "Field [<<laProps(I)>>] not found on structure of file <<DBF('TABLABIN')>>"
|
#DEFINE C_FIELD_NOT_FOUND_ON_FILE_STRUCTURE_LOC "Field [<<laProps(I)>>] not found in structure of file <<DBF('TABLABIN')>>"
|
||||||
#DEFINE C_FILE_DOESNT_EXIST_LOC 'File does not exist:'
|
#DEFINE C_FILE_DOESNT_EXIST_LOC 'File does not exist:'
|
||||||
#DEFINE C_FILE_NAME_IS_NOT_SUPPORTED_LOC "File [<<.c_InputFile>>] is not supported"
|
#DEFINE C_FILE_NAME_IS_NOT_SUPPORTED_LOC "File [<<.c_InputFile>>] is not supported"
|
||||||
#DEFINE C_FILE_NOT_FOUND_LOC "File not found"
|
#DEFINE C_FILE_NOT_FOUND_LOC "File not found"
|
||||||
#DEFINE C_EXTENSION_RECONFIGURATION_LOC "Extension Reconfiguration:"
|
#DEFINE C_EXTENSION_RECONFIGURATION_LOC "Extension Reconfiguration:"
|
||||||
#DEFINE C_FOXBIN2PRG_ERROR_CAPTION_LOC "FOXBIN2PRG: ERROR!!"
|
#DEFINE C_FOXBIN2PRG_ERROR_CAPTION_LOC "FOXBIN2PRG: ERROR!!"
|
||||||
#DEFINE C_FOXBIN2PRG_INFO_SINTAX_LOC "FOXBIN2PRG: SYNTAX INFO"
|
#DEFINE C_FOXBIN2PRG_INFO_SINTAX_LOC "FOXBIN2PRG: SYNTAX INFO"
|
||||||
#DEFINE C_FOXBIN2PRG_INFO_SINTAX_EXAMPLE_LOC "FOXBIN2PRG <cFileSpec.Ext> [,cType ,cTextName ,cGenText ,cNoMostrarErrores ,cDebug, cDontShowProgress, cOriginalFileName, cRecompile, cNoTimestamps]" + CR_LF + CR_LF ;
|
#DEFINE C_FOXBIN2PRG_INFO_SINTAX_EXAMPLE_LOC "FOXBIN2PRG <cFileSpec.Ext> [,cType ,cTextName ,cGenText ,cDontShowErrors ,cDebug, cDontShowProgress, cOriginalFileName, cRecompile, cNoTimestamps]" + CR_LF + CR_LF ;
|
||||||
+ "Example to generate TXT of all VCX of 'c:\desa\clases', without showing error window and generating LOG file: " + CR_LF ;
|
+ "Example of generating TXT from all VCX in 'c:\development\classes', without showing error window and generating LOG file: " + CR_LF ;
|
||||||
+ " FOXBIN2PRG 'c:\desa\clases\*.vcx' '0' '0' '0' '1' '1'" + CR_LF + CR_LF ;
|
+ " FOXBIN2PRG 'c:\development\classes\*.vcx' '0' '0' '0' '1' '1'" + CR_LF + CR_LF ;
|
||||||
+ "Example to generate TXT of all VCX of 'c:\desa\clases', without showing error window and without LOG file: " + CR_LF ;
|
+ "Example of generating TXT from all VCX is 'c:\development\classes', without showing error window and without LOG file: " + CR_LF ;
|
||||||
+ " FOXBIN2PRG 'c:\desa\clases\*.vc2' '0' '0' '0' '1' '0'"
|
+ " FOXBIN2PRG 'c:\development\classes\*.vc2' '0' '0' '0' '1' '0'"
|
||||||
#DEFINE C_FOXBIN2PRG_JUST_VFP_9_LOC "FOXBIN2PRG is only for Visual FoxPro 9.0!"
|
#DEFINE C_FOXBIN2PRG_JUST_VFP_9_LOC "FOXBIN2PRG is only for Visual FoxPro 9.0!"
|
||||||
#DEFINE C_FOXBIN2PRG_WARN_CAPTION_LOC "FOXBIN2PRG: WARNING!"
|
#DEFINE C_FOXBIN2PRG_WARN_CAPTION_LOC "FOXBIN2PRG: WARNING!"
|
||||||
#DEFINE C_MENU_NOT_IN_VFP9_FORMAT_LOC "Menu [<<THIS.c_InputFile>>] is NOT VFP 9 Format! - Please convert to VFP 9 with MODIFY MENU <<JUSTFNAME((THIS.c_InputFile))>>"
|
#DEFINE C_MENU_NOT_IN_VFP9_FORMAT_LOC "Menu [<<THIS.c_InputFile>>] is NOT in VFP 9 Format! - Please convert to VFP 9 with MODIFY MENU <<JUSTFNAME((THIS.c_InputFile))>>"
|
||||||
#DEFINE C_OBJECT_NAME_WITHOUT_OBJECT_OREG_LOC "Object [<<toObj.CLASS>>] does not contain oReg object (level <<TRANSFORM(tnNivel)>>)"
|
#DEFINE C_OBJECT_NAME_WITHOUT_OBJECT_OREG_LOC "Object [<<toObj.CLASS>>] does not contain oReg object (level <<TRANSFORM(tnNivel)>>)"
|
||||||
#DEFINE C_NAMES_CAPITALIZATION_PROGRAM_FOUND_LOC "* Names capitalization program [<<lcEXE_CAPS>>] found"
|
#DEFINE C_NAMES_CAPITALIZATION_PROGRAM_FOUND_LOC "* Names capitalization program [<<lcEXE_CAPS>>] found"
|
||||||
#DEFINE C_NAMES_CAPITALIZATION_PROGRAM_NOT_FOUND_LOC "* Names capitalization program [<<lcEXE_CAPS>>] not found"
|
#DEFINE C_NAMES_CAPITALIZATION_PROGRAM_NOT_FOUND_LOC "* Names capitalization program [<<lcEXE_CAPS>>] not found"
|
||||||
#DEFINE C_ONLY_SETNAME_AND_GETNAME_RECOGNIZED_LOC "Operation not recognized. Only SETNAME and GETNAME allowed."
|
#DEFINE C_ONLY_SETNAME_AND_GETNAME_RECOGNIZED_LOC "Operation not recognized. Only SETNAME and GETNAME allowed."
|
||||||
#DEFINE C_OUTPUT_FILE_IS_NOT_OVERWRITEN_LOC "Optimization: Output file [<<THIS.c_OutputFile>>] is not overwriten because it is the same as the genereted."
|
#DEFINE C_OUTPUT_FILE_IS_NOT_OVERWRITEN_LOC "Optimization: Output file [<<THIS.c_OutputFile>>] was not overwritten because it is the same as was generated."
|
||||||
#DEFINE C_PROCEDURE_NOT_CLOSED_ON_LINE_LOC "Procedure not closed. Last line of code must be ENDPROC. [<<laLineas(1)>>]"
|
#DEFINE C_PROCEDURE_NOT_CLOSED_ON_LINE_LOC "Procedure not closed. Last line of code must be ENDPROC. [<<laLineas(1)>>]"
|
||||||
#DEFINE C_PROCESSING_LOC "Processing file"
|
#DEFINE C_PROCESSING_LOC "Processing file"
|
||||||
#DEFINE C_PROCESS_PROGRESS_LOC "Process Progress:"
|
#DEFINE C_PROCESS_PROGRESS_LOC "Process Progress:"
|
||||||
|
|||||||
Reference in New Issue
Block a user