Changeset: 121 MNX>MN2>MNX Perfecto!

Ahora a probar resto tipos de menus

foxbin2prg.prg

@@ -192,8 +192,8 @@ LPARAMETERS tc_InputFile, tcType_na, tcTextName_na, tlGenText_na, tcDontShowErro
 #DEFINE C_INDEX_F			'</INDEX>'
 #DEFINE C_INDEXES_I			'<INDEXES>'
 #DEFINE C_INDEXES_F			'</INDEXES>'
-#DEFINE C_MENU_I			'<MENU>'
+#DEFINE C_PROC_CODE_I		'*<Procedures>'
-#DEFINE C_MENU_F			'</MENU>'
+#DEFINE C_PROC_CODE_F		'*</Procedures>'
 #DEFINE C_SETUPCODE_I		'*<SetupCode>'
 #DEFINE C_SETUPCODE_F		'*</SetupCode>'
 #DEFINE C_CLEANUPCODE_I		'*<CleanupCode>'
@@ -916,6 +916,7 @@ DEFINE CLASS c_conversor_base AS SESSION
 		+ [<memberdata name="comprobarexpresionvalida" display="comprobarExpresionValida"/>] ;
 		+ [<memberdata name="convertir" display="Convertir"/>] ;
 		+ [<memberdata name="decode_specialcodes_1_31" display="decode_SpecialCodes_1_31"/>] ;
+		+ [<memberdata name="desindentarmemo" display="DesindentarMemo"/>] ;
 		+ [<memberdata name="desnormalizarasignacion" display="desnormalizarAsignacion"/>] ;
 		+ [<memberdata name="desnormalizarvalorpropiedad" display="desnormalizarValorPropiedad"/>] ;
 		+ [<memberdata name="desnormalizarvalorxml" display="desnormalizarValorXML"/>] ;
@@ -1171,8 +1172,11 @@ DEFINE CLASS c_conversor_base AS SESSION
 	ENDPROC
 
 
-	*******************************************************************************************************************
 	PROCEDURE decode_SpecialCodes_1_31
+		*---------------------------------------------------------------------------------------------------
+		* PAR<41>METROS:				(!=Obligatorio | ?=Opcional) (@=Pasar por referencia | v=Pasar por valor) (IN/OUT)
+		* tcText					(@! IN    ) Decodifica los primeros 31 caracteres ASCII de {nCode} a CHR(nCode)
+		*---------------------------------------------------------------------------------------------------
 		LPARAMETERS tcText
 		LOCAL I
 		FOR I = 0 TO 31
@@ -1182,6 +1186,26 @@ DEFINE CLASS c_conversor_base AS SESSION
 	ENDPROC
 
 
+	PROCEDURE DesindentarMemo
+		*---------------------------------------------------------------------------------------------------
+		* PAR<41>METROS:				(!=Obligatorio | ?=Opcional) (@=Pasar por referencia | v=Pasar por valor) (IN/OUT)
+		* tcMemo					(v! IN    ) Memo a desindentar
+		* tcIndentacion				(v! IN    ) Indentaci<63>n utilizada
+		* RETURN:					Memo desindentado
+		*---------------------------------------------------------------------------------------------------
+		LPARAMETERS tcMemo, tcIndentacion
+		
+		LOCAL lcMemo, laLines(1), I
+		lcMemo	= ''
+		
+		FOR I = 1 TO ALINES( laLines, tcMemo )
+			lcMemo	= lcMemo + SUBSTR( laLines(I), LEN(tcIndentacion) + 1 ) + CR_LF
+		ENDFOR
+		
+		RETURN lcMemo
+	ENDPROC
+
+
 	*******************************************************************************************************************
 	PROCEDURE desnormalizarAsignacion
 		LPARAMETERS tcAsignacion
@@ -6340,7 +6364,7 @@ DEFINE CLASS c_conversor_prg_a_mnx AS c_conversor_prg_a_bin
 			lnCodError	= 0
 			STORE '' TO lcIndex, lcFieldDef
 
-			toMenu.updateMENU( THIS.c_OutputFile )
+			toMenu.updateMENU( THIS )
 
 
 		CATCH TO loEx
@@ -12311,7 +12335,6 @@ DEFINE CLASS CL_DBC_VIEW AS CL_DBC_BASE
 			ENDTEXT
 
 			*-- ALGUNOS VALORES QUE EL DBGETPROP OFICIAL NO DEVUELVE
-			*fdb*
 			*-- Path
 			*-- OfflineRecordCount
 			IF NOT EMPTY(THIS._Offline) AND EVALUATE(THIS._Offline)
@@ -14024,6 +14047,7 @@ ENDDEFINE
 DEFINE CLASS CL_MENU_COL_BASE AS CL_COL_BASE
 	_MEMBERDATA	= [<VFPData>] ;
 		+ [<memberdata name="oreg" display="oReg"/>] ;
+		+ [<memberdata name="analizarsiexpresionescomandooprocedimiento" display="AnalizarSiExpresionEsComandoOProcedimiento"/>] ;
 		+ [<memberdata name="get_datafromtablabin" display="get_DataFromTablabin"/>] ;
 		+ [<memberdata name="updatemenu" display="updateMENU"/>] ;
 		+ [</VFPData>]
@@ -14141,8 +14165,98 @@ DEFINE CLASS CL_MENU_COL_BASE AS CL_COL_BASE
 	PROCEDURE updateMENU
 		*---------------------------------------------------------------------------------------------------
 		* PAR<41>METROS:				(!=Obligatorio | ?=Opcional) (@=Pasar por referencia | v=Pasar por valor) (IN/OUT)
-		* tc_InputFile				(v! IN    ) Nombre del archivo de salida
+		* toConversor				(v! IN    ) Referencia al conversor para poder usar sus m<>todos
 		*---------------------------------------------------------------------------------------------------
+		LPARAMETERS toConversor
+	ENDPROC
+
+
+	PROCEDURE AnalizarSiExpresionEsComandoOProcedimiento
+		*---------------------------------------------------------------------------------------------------
+		* PAR<41>METROS:				(!=Obligatorio | ?=Opcional) (@=Pasar por referencia | v=Pasar por valor) (IN/OUT)
+		* tcExpr					(v! IN    ) Expresi<73>n a analizar (puede ser una l<>nea o un Procedure)
+		* tcProcName				(@!    OUT) Nombre del Procedimiento, si se encuentra uno
+		* tcProcCode				(@!    OUT) C<>digo del Procedimiento, si se encuentra uno
+		* tcSourceCode				(@? IN    ) Si se indica, se buscar<61> el nombre de Procedure para obtener su c<>digo
+		* tnIndentation				(v? IN    ) En caso de devolver c<>digo, indica si se debe indentar o quitar indentaci<63>n
+		* tlAddProcEndproc			(v? IN    ) En caso de devolver c<>digo, indica si se debe encerrar con PROCEDURE/ENDPROC
+		*---------------------------------------------------------------------------------------------------
+		* DETALLE: Los menus guardan en los primeros registros los Comandos o Procedimientos en el campo PROCEDURE,
+		*		y luego al generar el c<>digo lo muestran como Comando si es una sola l<>nea, y si no como Procedure.
+		*---------------------------------------------------------------------------------------------------
+		LPARAMETERS tcExpr, tcProcName, tcProcCode, tcSourceCode, tnIndentation, tlAddProcEndproc
+		
+		LOCAL laProcLines(1), lnLine_Count, I
+		tcProcName		= ''
+		tcProcCode		= ''
+		tnIndentation	= EVL(tnIndentation,0)
+		lnLine_Count	= ALINES( laProcLines, tcExpr )
+		
+		IF lnLine_Count > 1
+			*-- ES UN PROCEDIMIENTO
+			tcProcCode	= tcExpr
+
+			FOR I = 1 TO lnLine_Count
+				*-- Si existe el snippet #NAME, lo usa
+				IF EMPTY(tcProcName) AND UPPER( LEFT( ALLTRIM(laProcLines(I)), 6 ) ) == '#NAME '
+					tcProcName	= ALLTRIM( SUBSTR( ALLTRIM(laProcLines(I)), 7 ) )
+					EXIT
+				ENDIF
+			ENDFOR
+		ELSE
+			*-- ES UN COMANDO, PERO PODR<44>A REFERENCIAR A UN PROCEDURE DEL MENU, SE VERIFICA.
+			IF NOT EMPTY(tcSourceCode)
+				IF LEFT( tcExpr, 3 ) == 'DO '
+					*-- Parece un Procedimiento, vamos a confirmarlo.
+					tcProcName	= ALLTRIM( STREXTRACT( tcExpr, 'DO ', '&'+'&', 1, 2 ) )
+					tcProcCode	= STREXTRACT( tcSourceCode, 'PROCEDURE ' + tcProcName + CR_LF, CR_LF + 'ENDPROC &'+'& ' + tcProcName )
+					IF EMPTY(tcProcCode)
+						*-- Era un Command al final, o un Procedure externo,
+						*-- que para el caso es lo mismo porque no es del Menu.
+						tcProcName	= ''
+					ENDIF
+				ENDIF
+			ENDIF
+		ENDIF
+		
+		*-- Si se indic<69> indentaci<63>n, se reprocesa el c<>digo del procedimiento
+		IF NOT EMPTY(tcProcCode) AND (tnIndentation <> 0 OR tlAddProcEndproc)
+			lnLine_Count	= ALINES( laProcLines, tcProcCode )
+			tcProcCode		= ''
+
+			IF tlAddProcEndproc
+				tcProcCode	= '*' + REPLICATE('-',34) + CR_LF + 'PROCEDURE <<ProcName>>' + CR_LF
+			ENDIF
+
+			DO CASE
+			CASE tnIndentation = 0
+				FOR I = 1 TO lnLine_Count
+					*-- No Indentar
+					tcProcCode	= tcProcCode + laProcLines(I) + CR_LF
+				ENDFOR
+
+			CASE tnIndentation > 0
+				FOR I = 1 TO lnLine_Count
+					*-- Indentar
+					tcProcCode	= tcProcCode + C_TAB + laProcLines(I) + CR_LF
+				ENDFOR
+
+			OTHERWISE
+				FOR I = 1 TO lnLine_Count
+					*-- Quitar indentaci<63>n
+					IF INLIST( LEFT(laProcLines(I),1), SPACE(1), C_TAB )
+						tcProcCode	= tcProcCode + SUBSTR( laProcLines(I), 2 ) + CR_LF
+					ELSE
+						tcProcCode	= tcProcCode + laProcLines(I) + CR_LF
+					ENDIF
+				ENDFOR
+			ENDCASE
+
+			IF tlAddProcEndproc
+				tcProcCode	= tcProcCode + 'ENDPROC &' + '& <<ProcName>>' + CR_LF
+			ENDIF
+		ENDIF
+		
 	ENDPROC
 
 
@@ -14160,7 +14274,6 @@ DEFINE CLASS CL_MENU AS CL_MENU_COL_BASE
 		+ [<memberdata name="analizarbloque_menucode" display="analizarBloque_MenuCode"/>] ;
 		+ [<memberdata name="analizarbloque_procedure" display="analizarBloque_PROCEDURE"/>] ;
 		+ [<memberdata name="analizarbloque_setupcode" display="analizarBloque_SetupCode"/>] ;
-		+ [<memberdata name="updatemenu" display="updateMENU"/>] ;
 		+ [<memberdata name="updatemenu_recursivo" display="UpdateMenu_Recursivo"/>] ;
 		+ [<memberdata name="_sourcefile" display="_SourceFile"/>] ;
 		+ [<memberdata name="_version" display="_Version"/>] ;
@@ -14197,12 +14310,11 @@ DEFINE CLASS CL_MENU AS CL_MENU_COL_BASE
 		TRY
 			LOCAL loOptions AS CL_MENU_OPTION OF 'FOXBIN2PRG.PRG'
 			LOCAL loBarPop AS CL_MENU_BARPOP OF 'FOXBIN2PRG.PRG'
-			LOCAL llBloqueEncontrado, loReg, lcComment, loEx AS EXCEPTION ;
+			LOCAL llBloqueEncontrado, loReg, lcComment, lcExpr, lcProcName, lcProcCode, loEx AS EXCEPTION ;
 				, llBloque_SetupCode_Analizado, llBloque_CleanupCode_Analizado, llBloque_MenuCode_Analizado ;
-				, llBloque_MenuType_Analizado
+				, llBloque_MenuType_Analizado, llBloque_Procedure_Analizado
 			STORE '' TO lcComment
 
-			*IF LEFT(tcLine, LEN(C_MENU_I)) == C_MENU_I
 			llBloqueEncontrado	= .T.
 
 			*-- CABECERA DEL MENU
@@ -14217,6 +14329,20 @@ DEFINE CLASS CL_MENU AS CL_MENU_COL_BASE
 				.SETUPTYPE		= 1
 				.CLEANTYPE		= 1
 				.ITEMNUM		= STR(0,3)
+				lcExpr			= ALLTRIM( STREXTRACT( C_FB2PRG_CODE, 'ON SELECTION MENU _MSYSMENU ', CR_LF ) )
+
+				IF NOT EMPTY(lcExpr)
+					THIS.AnalizarSiExpresionEsComandoOProcedimiento( lcExpr, @lcProcName, @lcProcCode, @C_FB2PRG_CODE, -1, .F. )
+
+					IF EMPTY(lcProcCode)
+						*-- Comando
+						.PROCEDURE	= lcExpr
+					ELSE
+						*-- Procedure
+						lcProcCode	= STRTRAN( lcProcCode, '<<ProcName>>', lcProcName )
+						.PROCEDURE	= lcProcCode
+					ENDIF
+				ENDIF
 			ENDWITH
 
 			FOR I = I + 0 TO tnCodeLines
@@ -14234,9 +14360,6 @@ DEFINE CLASS CL_MENU AS CL_MENU_COL_BASE
 					loReg.OBJTYPE		= toConversor.n_MenuType
 					llBloque_MenuType_Analizado	= .T.
 
-					*CASE C_MENU_F $ tcLine	&& Fin
-					*	EXIT
-
 				CASE NOT llBloque_SetupCode_Analizado AND THIS.analizarBloque_SetupCode( @tcLine, @taCodeLines, @I, tnCodeLines, toConversor )
 					llBloque_SetupCode_Analizado	= .T.
 
@@ -14246,16 +14369,13 @@ DEFINE CLASS CL_MENU AS CL_MENU_COL_BASE
 				CASE NOT llBloque_CleanupCode_Analizado AND THIS.analizarBloque_CleanupCode( @tcLine, @taCodeLines, @I, tnCodeLines, toConversor )
 					llBloque_CleanupCode_Analizado	= .T.
 
-					*CASE C_BARPOP_I $ tcLine
+				CASE NOT llBloque_Procedure_Analizado AND THIS.analizarBloque_PROCEDURE( @tcLine, @taCodeLines, @I, tnCodeLines, toConversor )
-					*	loOption = CREATEOBJECT("CL_MENU_OPTION")
+					llBloque_Procedure_Analizado	= .T.
-					*	loOption.analizarBloque( @tcLine, @taCodeLines, @I, tnCodeLines )
-					*	THIS.ADD( loOption, loOption._Name )
 
 				OTHERWISE	&& Otro valor
 					*-- No hay otros valores que reconocer
 				ENDCASE
 			ENDFOR
-			*ENDIF
 
 		CATCH TO loEx
 			IF THIS.l_Debug AND _VFP.STARTMODE = 0
@@ -14301,12 +14421,12 @@ DEFINE CLASS CL_MENU AS CL_MENU_COL_BASE
 						EXIT
 
 					OTHERWISE	&& L<>neas de procedure
-						lcText	= lcText + taCodeLines(I) + CR_LF
+						lcText	= lcText + CR_LF + taCodeLines(I)
 					ENDCASE
 				ENDFOR
 
 				I = I - 1
-				THIS.oReg.Setup = lcText
+				THIS.oReg.Setup = SUBSTR( lcText, 3 )	&& Quito el primer CR_LF
 			ENDIF
 
 		CATCH TO loEx
@@ -14353,12 +14473,12 @@ DEFINE CLASS CL_MENU AS CL_MENU_COL_BASE
 						EXIT
 
 					OTHERWISE	&& L<>neas de procedure
-						lcText	= lcText + taCodeLines(I) + CR_LF
+						lcText	= lcText + CR_LF + taCodeLines(I)
 					ENDCASE
 				ENDFOR
 
 				I = I - 1
-				THIS.oReg.Cleanup = lcText
+				THIS.oReg.Cleanup = SUBSTR( lcText, 3 )	&& Quito el primer CR_LF
 			ENDIF
 
 		CATCH TO loEx
@@ -14408,10 +14528,6 @@ DEFINE CLASS CL_MENU AS CL_MENU_COL_BASE
 			ENDIF
 
 		CATCH TO loEx
-			IF loEx.ERRORNO = 1470	&& Incorrect property name.
-				loEx.USERVALUE	= 'I=' + TRANSFORM(I) + ', PropName=[' + TRANSFORM(lcPropName) + '], Value=[' + TRANSFORM(lcValue) + ']'
-			ENDIF
-
 			IF THIS.l_Debug AND _VFP.STARTMODE = 0
 				SET STEP ON
 			ENDIF
@@ -14443,24 +14559,23 @@ DEFINE CLASS CL_MENU AS CL_MENU_COL_BASE
 			LOCAL llBloqueEncontrado, lcText, lcComment, lcProcName, loEx AS EXCEPTION
 			STORE '' TO lcText, lcComment
 
-			IF LEFT(tcLine, LEN(C_PROCEDURE)) == C_PROCEDURE
+			IF LEFT(tcLine, LEN(C_PROC_CODE_I)) == C_PROC_CODE_I
 				llBloqueEncontrado	= .T.
 
 				FOR I = I + 1 TO tnCodeLines
 					THIS.set_Line( @tcLine, @taCodeLines, I )
 
 					DO CASE
-					CASE C_ENDPROC $ tcLine	&& Fin
+					CASE C_PROC_CODE_F $ tcLine	&& Fin
 						I = I + 1
 						EXIT
 
 					OTHERWISE	&& L<>neas de procedure
-						lcText	= lcText + taCodeLines(I) + CR_LF
+						*-- Las saltea
 					ENDCASE
 				ENDFOR
 
 				I = I - 1
-				THIS.oReg.Cleanup = lcText
 			ENDIF
 
 		CATCH TO loEx
@@ -14482,7 +14597,7 @@ DEFINE CLASS CL_MENU AS CL_MENU_COL_BASE
 		*---------------------------------------------------------------------------------------------------
 
 		TRY
-			LOCAL lcText, loReg, loHeader, lnNivel, lcEndProcedures ;
+			LOCAL lcText, loReg, loHeader, lnNivel, lcEndProcedures, lcExpr, lcProcName, lcProcCode ;
 				, loEx AS EXCEPTION ;
 				, loCol_LastLevelName AS COLLECTION ;
 				, loBarPop AS CL_MENU_BARPOP OF 'FOXBIN2PRG.PRG' ;
@@ -14524,41 +14639,92 @@ DEFINE CLASS CL_MENU AS CL_MENU_COL_BASE
 			DO CASE
 			CASE loHeader.ObjType = 1 OR loHeader.ObjType = 5
 				*-- Propecimiento principal de _MSYSMENU (ObjType:1, ObjCode:22)
-				IF NOT EMPTY(loReg.PROCEDURE)
+				IF NOT EMPTY(loHeader.PROCEDURE)
-					TEXT TO lcText ADDITIVE TEXTMERGE NOSHOW FLAGS 1+2 PRETEXT 1+2
+					lcExpr		= loHeader.PROCEDURE
-						ON SELECTION MENU <<loBarPop.Name>> <<loReg.Procedure>>
+					THIS.AnalizarSiExpresionEsComandoOProcedimiento( lcExpr, @lcProcName, @lcProcCode, '', 1, .T. )
-					ENDTEXT
+
+					IF EMPTY(lcProcCode)
+						*-- Comando
+						lcText	= lcText + 'ON SELECTION MENU ' + loBarPop.Name + ' ' + lcExpr + CR_LF
+						*TEXT TO lcText ADDITIVE TEXTMERGE NOSHOW FLAGS 1+2 PRETEXT 1+2
+						*	ON SELECTION MENU <<loBarPop.Name>> <<lcExpr>>
+						*ENDTEXT
+					ELSE
+						*-- Procedure
+						lcProcName	= EVL( lcProcName, CHRTRAN('SELECTION MENU ' + loBarPop.Name, ' ', '_') )
+						lcText	= lcText + 'ON SELECTION MENU ' + loBarPop.Name + ' DO ' + lcProcName + CR_LF
+						*	ON SELECTION MENU <<loBarPop.Name>> DO <<lcProcName>> && <MenuProc/>
+						*TEXT TO lcText ADDITIVE TEXTMERGE NOSHOW FLAGS 1+2 PRETEXT 1+2
+						*	ON SELECTION MENU <<loBarPop.Name>> DO <<lcProcName>>
+						*ENDTEXT
+						lcProcCode		= STRTRAN( lcProcCode, '<<ProcName>>', lcProcName )
+						lcEndProcedures	= lcEndProcedures + lcProcCode + CR_LF
+					ENDIF
 				ENDIF
 
-				*-- Procedimiento del Menu Bar (ObjType:2, ObjCode:1)
+*!*					*-- Procedimiento del Menu Bar (ObjType:2, ObjCode:1)
-				IF NOT EMPTY(loBarPop.PROCEDURE)
+*!*					IF NOT EMPTY(loBarPop.PROCEDURE)
-					TEXT TO lcText ADDITIVE TEXTMERGE NOSHOW FLAGS 1+2 PRETEXT 1+2
+*!*						lcExpr		= loBarPop.PROCEDURE
-						ON SELECTION POPUP ALL <<loBarPop.Procedure>>
+*!*						THIS.AnalizarSiExpresionEsComandoOProcedimiento( lcExpr, @lcProcName, @lcProcCode, '', 1, .T. )
-					ENDTEXT
+
-				ENDIF
+*!*						IF EMPTY(lcProcCode)
+*!*							*-- Comando
+*!*							TEXT TO lcText ADDITIVE TEXTMERGE NOSHOW FLAGS 1+2 PRETEXT 1+2
+*!*								ON SELECTION POPUP ALL <<lcExpr>>
+*!*							ENDTEXT
+*!*						ELSE
+*!*							*-- Procedure
+*!*							lcProcName	= EVL( lcProcName, CHRTRAN('SELECTION POPUP ALL', ' ', '_') )
+*!*							*	ON SELECTION POPUP ALL DO <<lcProcName>> && <MenuProc/>
+*!*							TEXT TO lcText ADDITIVE TEXTMERGE NOSHOW FLAGS 1+2 PRETEXT 1+2
+*!*								ON SELECTION POPUP ALL DO <<lcProcName>>
+*!*							ENDTEXT
+*!*							lcProcCode		= STRTRAN( lcProcCode, '<<ProcName>>', lcProcName )
+*!*							lcEndProcedures	= lcEndProcedures + lcProcCode + CR_LF
+*!*						ENDIF
+*!*					ENDIF
 				
 			CASE loHeader.ObjType = 4
 				*-- Propecimiento principal de _MSYSMENU (ObjType:1, ObjCode:22)
-				IF NOT EMPTY(loReg.PROCEDURE)
+*!*					IF NOT EMPTY(loReg.PROCEDURE)
-					TEXT TO lcText ADDITIVE TEXTMERGE NOSHOW FLAGS 1+2 PRETEXT 1+2
+*!*						lcExpr		= loReg.PROCEDURE
-						ON SELECTION POPUP <<THIS.Item(1).Item(1).Item(1).oReg.Name>> <<loReg.Procedure>>
+*!*						THIS.AnalizarSiExpresionEsComandoOProcedimiento( lcExpr, @lcProcName, @lcProcCode, '', 1, .T. )
-					ENDTEXT
-				ENDIF
 
-				TEXT TO lcText ADDITIVE TEXTMERGE NOSHOW FLAGS 1+2 PRETEXT 1+2
+*!*						IF EMPTY(lcProcCode)
-					ACTIVATE POPUP <<THIS.Item(1).Item(1).Item(1).oReg.Name>>
+*!*							*-- Comando
-				ENDTEXT
+*!*							TEXT TO lcText ADDITIVE TEXTMERGE NOSHOW FLAGS 1+2 PRETEXT 1+2
+*!*								ON SELECTION POPUP <<THIS.Item(1).Item(1).Item(1).oReg.Name>> <<loReg.Procedure>>
+*!*							ENDTEXT
+*!*						ELSE
+*!*							*-- Procedure
+*!*							lcProcName	= EVL( lcProcName, CHRTRAN('SELECTION POPUP ' + THIS.Item(1).Item(1).Item(1).oReg.Name, ' ', '_') )
+*!*							*	ON SELECTION POPUP <<THIS.Item(1).Item(1).Item(1).oReg.Name>> DO <<lcProcName>> && <MenuProc/>
+*!*							TEXT TO lcText ADDITIVE TEXTMERGE NOSHOW FLAGS 1+2 PRETEXT 1+2
+*!*								ON SELECTION POPUP <<THIS.Item(1).Item(1).Item(1).oReg.Name>> DO <<lcProcName>>
+*!*							ENDTEXT
+*!*							lcProcCode		= STRTRAN( lcProcCode, '<<ProcName>>', lcProcName )
+*!*							lcEndProcedures	= lcEndProcedures + lcProcCode + CR_LF
+*!*						ENDIF
+*!*					ENDIF
+
+				lcText	= lcText + 'ACTIVATE POPUP ' + THIS.Item(1).Item(1).Item(1).oReg.Name + CR_LF
+				*TEXT TO lcText ADDITIVE TEXTMERGE NOSHOW FLAGS 1+2 PRETEXT 1+2
+				*	ACTIVATE POPUP <<THIS.Item(1).Item(1).Item(1).oReg.Name>>
+				*ENDTEXT
 			ENDCASE
 			
-			*-- Procedimientos finales
-			IF NOT EMPTY(lcEndProcedures)
-				lcText	= lcText + CR_LF + CR_LF + lcEndProcedures
-			ENDIF
-			
 			TEXT TO lcText ADDITIVE TEXTMERGE NOSHOW FLAGS 1+2 PRETEXT 1+2
 				<<C_MENUCODE_F>>
 			ENDTEXT
 
+			*-- Procedimientos finales
+			IF NOT EMPTY(lcEndProcedures)
+				lcText	= lcText + CR_LF + CR_LF ;
+					+ C_PROC_CODE_I + CR_LF ;
+					+ lcEndProcedures ;
+					+ C_PROC_CODE_F + CR_LF
+			ENDIF
+			
 			IF NOT EMPTY(loReg.Cleanup)
 				TEXT TO lcText ADDITIVE TEXTMERGE NOSHOW FLAGS 1+2 PRETEXT 1+2
 					<<>>
@@ -14583,6 +14749,9 @@ DEFINE CLASS CL_MENU AS CL_MENU_COL_BASE
 
 
 	PROCEDURE get_DataFromTablabin
+		*---------------------------------------------------------------------------------------------------
+		* PAR<41>METROS:				(!=Obligatorio | ?=Opcional) (@=Pasar por referencia | v=Pasar por valor) (IN/OUT)
+		*---------------------------------------------------------------------------------------------------
 		LOCAL loReg, loCol_LastLevelName AS COLLECTION
 		GO TOP
 		SCATTER MEMO NAME loReg
@@ -14595,33 +14764,51 @@ DEFINE CLASS CL_MENU AS CL_MENU_COL_BASE
 	PROCEDURE updateMENU
 		*---------------------------------------------------------------------------------------------------
 		* PAR<41>METROS:				(!=Obligatorio | ?=Opcional) (@=Pasar por referencia | v=Pasar por valor) (IN/OUT)
-		* tcOutputFile				(@! IN/OUT) Contenido de la l<>nea en an<61>lisis
+		* toConversor				(v! IN    ) Referencia al conversor para poder usar sus m<>todos
 		*---------------------------------------------------------------------------------------------------
-		LPARAMETERS tcOutputFile
+		LPARAMETERS toConversor
+
+		#IF .F.
+			LOCAL toConversor AS c_conversor_prg_a_mnx OF 'FOXBIN2PRG.PRG'
+		#ENDIF
 
 		SELECT TABLABIN
 		
 		IF THIS.l_Debug
-			STRTOFILE( '', 'Opciones.txt' )
+			toConversor.writeLog( '' )
+			toConversor.writeLog( REPLICATE('-',80) )
+		ENDIF
+
+		THIS.UpdateMenu_Recursivo( THIS, 0, @toConversor )
+
+		IF THIS.l_Debug
+			toConversor.writeLog( REPLICATE('-',80) )
 		ENDIF
 
-		THIS.UpdateMenu_Recursivo( THIS, 0 )
 	ENDPROC
 
 
 	PROCEDURE UpdateMenu_Recursivo
-		LPARAMETERS toObj as Collection, tnNivel
+		*---------------------------------------------------------------------------------------------------
+		* PAR<41>METROS:				(!=Obligatorio | ?=Opcional) (@=Pasar por referencia | v=Pasar por valor) (IN/OUT)
+		* toObj						(v! IN    ) Referencia del objeto CL_MENU_BARPOP o CL_MENU_OPTION
+		* tnNivel					(v! IN    ) Nivel de indentaci<63>n (solo para debug)
+		* toConversor				(v! IN    ) Referencia al conversor para poder usar sus m<>todos
+		*---------------------------------------------------------------------------------------------------
+		LPARAMETERS toObj as Collection, tnNivel, toConversor
 		LOCAL loReg, loEx as Exception
 
+		#IF .F.
+			LOCAL toConversor AS c_conversor_prg_a_mnx OF 'FOXBIN2PRG.PRG'
+		#ENDIF
+
 		TRY
 			IF VARTYPE( toObj.oReg ) = 'O'
 				loReg	= toObj.oReg
 				INSERT INTO TABLABIN FROM NAME loReg
-				*APPEND BLANK
-				*GATHER NAME loReg MEMO
 
 				IF THIS.l_Debug
-					STRTOFILE( REPLICATE(C_TAB,tnNivel) ;
+					toConversor.writeLog( REPLICATE(C_TAB,tnNivel) ;
 						+ 'ObjType=' + TRANSFORM(loReg.ObjType) ;
 						+ ', ObjCode=' + TRANSFORM(loReg.ObjCode) ;
 						+ ', Name=' + TRANSFORM(loReg.NAME) ;
@@ -14633,24 +14820,20 @@ DEFINE CLASS CL_MENU AS CL_MENU_COL_BASE
 						+ ', KeyName=' + TRANSFORM(loReg.KEYNAME) ;
 						+ ', KeyLabel=' + TRANSFORM(loReg.KeyLabel) ;
 						+ ', Comment=' + TRANSFORM(loReg.Comment) ;
-						+ ', SkipFor=' + TRANSFORM(loReg.SkipFor) ;
+						+ ', SkipFor=' + TRANSFORM(loReg.SkipFor) )
-						+ CR_LF ;
-						, 'Opciones.txt', 1 )
 				ENDIF
 				
 			ELSE
 				IF THIS.l_Debug
-					STRTOFILE( REPLICATE(C_TAB,tnNivel) ;
+					toConversor.writeLog( REPLICATE(C_TAB,tnNivel) ;
-						+ 'Objeto [' + toObj.Class + '] sin registro oReg (nivel ' + TRANSFORM(tnNivel) + ')' ;
+						+ 'Objeto [' + toObj.Class + '] sin registro oReg (nivel ' + TRANSFORM(tnNivel) + ')' )
-						+ CR_LF ;
-						, 'Opciones.txt', 1 )
 				ENDIF
 				
 			ENDIF
 			
 			IF toObj.Count > 0 THEN
 				FOR EACH loReg IN toObj FOXOBJECT
-					THIS.UpdateMenu_Recursivo( loReg, tnNivel + 1 )
+					THIS.UpdateMenu_Recursivo( loReg, tnNivel + 1, @toConversor )
 				ENDFOR
 			ENDIF
 		
@@ -14675,7 +14858,6 @@ DEFINE CLASS CL_MENU_BARPOP AS CL_MENU_COL_BASE
 		+ [<memberdata name="updatemenu" display="updateMENU"/>] ;
 		+ [<memberdata name="c_parentname" display="c_ParentName"/>] ;
 		+ [<memberdata name="n_parentcode" display="n_ParentCode"/>] ;
-		+ [<memberdata name="n_parentcount" display="n_ParentCount"/>] ;
 		+ [</VFPData>]
 
 	#IF .F.
@@ -14684,7 +14866,6 @@ DEFINE CLASS CL_MENU_BARPOP AS CL_MENU_COL_BASE
 
 	c_ParentName	= ''
 	n_ParentCode	= 0
-	n_ParentCount	= 0
 
 
 	PROCEDURE analizarBloque
@@ -14704,18 +14885,21 @@ DEFINE CLASS CL_MENU_BARPOP AS CL_MENU_COL_BASE
 
 		TRY
 			LOCAL loOption AS CL_MENU_OPTION OF 'FOXBIN2PRG.PRG'
-			LOCAL llBloqueEncontrado, lcSubName, lcComment, lnLast_I, loReg, loEx AS EXCEPTION
+			LOCAL llBloqueEncontrado, lcSubName, lcComment, lnLast_I, loReg, lcExpr, lcProcName, lcProcCode ;
-			STORE '' TO lcSubName, lcComment
+				, loEx AS EXCEPTION
+			STORE '' TO lcSubName, lcComment, lcExpr, lcProcName, lcProcCode
 			
 			THIS.oReg		= toConversor.emptyRecord()
 			loReg			= THIS.oReg
 			loReg.OBJTYPE	= 2
+			loReg.PROCTYPE	= 1
 			loReg.ITEMNUM	= STR(0,3)
 
 			*LEFT( tcLine, 13 ) == 'DEFINE POPUP '
 				llBloqueEncontrado	= .T.
 
 				FOR I = I + 0 TO tnCodeLines
+					STORE '' TO lcExpr, lcProcName, lcProcCode
 					THIS.set_Line( @tcLine, @taCodeLines, I )
 
 					DO CASE
@@ -14732,18 +14916,24 @@ DEFINE CLASS CL_MENU_BARPOP AS CL_MENU_COL_BASE
 						loReg.OBJCODE	= 1
 						loReg.NAME		= '_MSYSMENU'
 						loReg.LEVELNAME	= loReg.NAME
+						lcExpr			= STREXTRACT( C_FB2PRG_CODE, 'ON SELECTION POPUP ALL ', CR_LF )
+						THIS.AnalizarSiExpresionEsComandoOProcedimiento( lcExpr, @lcProcName, @lcProcCode, @C_FB2PRG_CODE, -1 )
+						loReg.PROCEDURE	= EVL(lcProcCode, lcExpr)
 						
 					CASE LEFT( tcLine, 13 ) == 'DEFINE POPUP '
 						loReg.OBJCODE	= 0
 						loReg.NAME		= ALLTRIM( GETWORDNUM( tcLine, 3 ) )
 						loReg.LEVELNAME	= loReg.NAME
+						lcExpr			= ALLTRIM( STREXTRACT( C_FB2PRG_CODE, 'ON SELECTION POPUP ' + loReg.NAME + ' ', CR_LF ) )
+						THIS.AnalizarSiExpresionEsComandoOProcedimiento( lcExpr, @lcProcName, @lcProcCode, @C_FB2PRG_CODE, -1 )
+						loReg.PROCEDURE	= EVL(lcProcCode, lcExpr)
+
 
 					CASE LEFT( tcLine, 11 ) == 'DEFINE PAD ' OR LEFT( tcLine, 11 ) == 'DEFINE BAR '
 						loOption	= CREATEOBJECT("CL_MENU_OPTION")
 						lnLast_I	= I
 						loOption.c_ParentName	= loReg.LEVELNAME
 						loOption.n_ParentCode	= loReg.OBJCODE
-						loOption.n_ParentCount	= THIS.Count
 						IF NOT loOption.analizarBloque( @tcLine, @taCodeLines, @I, tnCodeLines, toConversor )
 							I = lnLast_I
 							llBloqueEncontrado	= .F.
@@ -14752,6 +14942,7 @@ DEFINE CLASS CL_MENU_BARPOP AS CL_MENU_COL_BASE
 						THIS.ADD( loOption )
 						loOption.oReg.ITEMNUM	= STR(THIS.Count,3)
 						loReg.NUMITEMS			= THIS.Count
+						loReg.SCHEME			= IIF( loReg.OBJCODE = 1, 3, 4 )
 						loOption	= NULL
 
 					OTHERWISE	&& Otro valor
@@ -14787,10 +14978,11 @@ DEFINE CLASS CL_MENU_BARPOP AS CL_MENU_COL_BASE
 		LPARAMETERS toParentReg, tnNivel, tcEndProcedures, toHeader
 
 		TRY
-			LOCAL loReg, I, lcText, lcTab, loEx AS EXCEPTION ;
+			LOCAL loReg, I, lcText, lcTab, lcExpr, lcProcName, lcProcCode, loEx AS EXCEPTION ;
 				, loBarPop AS CL_MENU_BARPOP OF 'FOXBIN2PRG.PRG' ;
 				, loOption AS CL_MENU_OPTION OF 'FOXBIN2PRG.PRG'
-			lcText	= ''
+
+			STORE '' TO lcText, lcExpr, lcProcName, lcProcCode
 			loReg	= THIS.oReg
 			lcTab	= REPLICATE(CHR(9),tnNivel)
 
@@ -14811,7 +15003,7 @@ DEFINE CLASS CL_MENU_BARPOP AS CL_MENU_COL_BASE
 							<<lcTab>>DEFINE POPUP <<loReg.Name>> SHORTCUT RELATIVE
 						ENDTEXT
 					ENDIF
-				ELSE
+				ELSE	&& ObjType = 1 <20> 5
 					*-- Menu
 					TEXT TO lcText ADDITIVE TEXTMERGE NOSHOW FLAGS 1+2 PRETEXT 1+2
 						<<lcTab>>*----------------------------------
@@ -14827,6 +15019,20 @@ DEFINE CLASS CL_MENU_BARPOP AS CL_MENU_COL_BASE
 				ENDFOR
 			ENDIF
 			
+			*-- Procedure del POPUP o MENU
+			IF NOT EMPTY(loReg.PROCEDURE)
+				lcExpr		= loReg.PROCEDURE
+				THIS.AnalizarSiExpresionEsComandoOProcedimiento( lcExpr, @lcProcName, @lcProcCode, '', 1, .T. )
+
+				IF EMPTY(lcProcName)
+					lcText			= lcText + lcTab + 'ON SELECTION POPUP ' + IIF( loReg.OBJCODE = 0, loReg.Name, 'ALL' ) + ' ' + lcExpr + CR_LF
+				ELSE
+					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
+				ENDIF
+
+			ENDIF
+
 
 		CATCH TO loEx
 			IF THIS.l_Debug AND _VFP.STARTMODE = 0
@@ -14857,7 +15063,6 @@ DEFINE CLASS CL_MENU_OPTION AS CL_MENU_COL_BASE
 		+ [<memberdata name="get_procnamefromsnippet" display="get_ProcNameFromSnippet"/>] ;
 		+ [<memberdata name="c_parentname" display="c_ParentName"/>] ;
 		+ [<memberdata name="n_parentcode" display="n_ParentCode"/>] ;
-		+ [<memberdata name="n_parentcount" display="n_ParentCount"/>] ;
 		+ [</VFPData>]
 
 	#IF .F.
@@ -14866,7 +15071,6 @@ DEFINE CLASS CL_MENU_OPTION AS CL_MENU_COL_BASE
 
 	c_ParentName	= ''
 	n_ParentCode	= 0
-	n_ParentCount	= 0
 
 
 	PROCEDURE analizarBloque
@@ -14894,7 +15098,6 @@ DEFINE CLASS CL_MENU_OPTION AS CL_MENU_COL_BASE
 			loReg			= THIS.oReg
 			loReg.ITEMNUM	= STR(0,3)
 
-			*IF LEFT( tcLine, 11 ) == 'DEFINE PAD ' OR LEFT( tcLine, 11 ) == 'DEFINE BAR '
 			llBloqueEncontrado	= .T.
 
 			FOR I = I + 0 TO tnCodeLines
@@ -14911,12 +15114,7 @@ DEFINE CLASS CL_MENU_OPTION AS CL_MENU_COL_BASE
 					loReg.OBJTYPE = 2
 					loReg.OBJCODE = 1
 					
-					*CASE LEFT( tcLine, 11 ) == 'DEFINE PAD ' OR LEFT( tcLine, 11 ) == 'DEFINE BAR '
-						*lcSubname	= ALLTRIM( STREXTRACT( tcLine, ' OF ', ' PROMPT ' ) )
-						*IF UPPER(lcSubname) 
-
 				CASE THIS.analizarBloque_DefinePAD( @tcLine, @taCodeLines, @I, tnCodeLines, toConversor )
-						*llPadOBar_Analizado	= .T.
 					IF EMPTY(loReg.PROMPT)
 						*-- Esta opci<63>n no corresponde a este nivel. Debe subir.
 						llBloqueEncontrado = .F.
@@ -14927,7 +15125,6 @@ DEFINE CLASS CL_MENU_OPTION AS CL_MENU_COL_BASE
 					ENDIF
 				
 				CASE THIS.analizarBloque_DefineBAR( @tcLine, @taCodeLines, @I, tnCodeLines, toConversor )
-						*llPadOBar_Analizado	= .T.
 					IF EMPTY(loReg.PROMPT)
 						*-- Esta opci<63>n no corresponde a este nivel. Debe subir.
 						llBloqueEncontrado = .F.
@@ -14942,7 +15139,6 @@ DEFINE CLASS CL_MENU_OPTION AS CL_MENU_COL_BASE
 					lnLast_I	= I
 					loBarPop.c_ParentName	= loReg.LEVELNAME
 					loBarPop.n_ParentCode	= loReg.OBJCODE
-						loBarPop.n_ParentCount	= THIS.Count
 					THIS.ADD( loBarPop )
 					IF NOT loBarPop.analizarBloque( @tcLine, @taCodeLines, @I, tnCodeLines, toConversor )
 						I	= I - 1
@@ -14954,7 +15150,6 @@ DEFINE CLASS CL_MENU_OPTION AS CL_MENU_COL_BASE
 					*-- No
 				ENDCASE
 			ENDFOR
-			*ENDIF
 
 		CATCH TO loEx WHEN loEx.Message = 'Nivel_Anterior'
 			*-- OK. Volver a evaluar en el nivel anterior
@@ -14991,7 +15186,7 @@ DEFINE CLASS CL_MENU_OPTION AS CL_MENU_COL_BASE
 		#ENDIF
 
 		TRY
-			LOCAL llBloqueEncontrado, lcText, loReg, lnPos, lcPadName, lcExpr, lcComment, lcProcName, loEx AS EXCEPTION ;
+			LOCAL llBloqueEncontrado, lcText, loReg, lnPos, lcPadName, lcExpr, lcComment, lcProcName, lcProcCode, loEx AS EXCEPTION ;
 				, lnNegContainer, lnNegObject
 			STORE '' TO lcText, lcComment, lcPadName
 
@@ -15021,8 +15216,7 @@ DEFINE CLASS CL_MENU_OPTION AS CL_MENU_COL_BASE
 					EXIT
 				ENDIF
 
-				loReg.PROMPT		= ALLTRIM( STREXTRACT( tcLine, ' PROMPT ', ' COLOR ' ) )
+				loReg.PROMPT		= CHRTRAN( ALLTRIM( STREXTRACT( tcLine, ' PROMPT ', ' COLOR ' ) ), '"', '' )
-				loReg.SCHEME		= INT( VAL( ALLTRIM( STREXTRACT( tcLine, ' COLOR SCHEME ', ';', 1, 2 ) ) ) )
 
 				*-- ANALISIS DEL "DEFINE PAD"
 				IF ';' $ tcLine
@@ -15061,10 +15255,10 @@ DEFINE CLASS CL_MENU_OPTION AS CL_MENU_COL_BASE
 							loReg.MESSAGE	= ALLTRIM( STREXTRACT( tcLine, '"', '"', 1, 4 ) )
 
 						CASE LEFT( tcLine, 8 ) == 'PICTURE '
-							loReg.RESNAME	= ALLTRIM( STREXTRACT( tcLine, '"', '"', 1, 4 ) )
+							loReg.RESNAME	= ALLTRIM( STREXTRACT( tcLine, '"', '"' ) )
 
 						CASE LEFT( tcLine, 8 ) == 'PICTRES '
-							loReg.RESNAME	= ALLTRIM( STREXTRACT( tcLine, '"', '"', 1, 4 ) )
+							loReg.RESNAME	= ALLTRIM( STREXTRACT( tcLine, 'PICTRES ', ';', 1, 2 ) )
 							loReg.SYSRES	= 1
 
 						OTHERWISE
@@ -15100,14 +15294,26 @@ DEFINE CLASS CL_MENU_OPTION AS CL_MENU_COL_BASE
 						EXIT
 
 					CASE LEFT( tcLine, 17 ) == 'ON SELECTION PAD '
-						lcExpr	= ALLTRIM( STREXTRACT( tcLine, ' OF ' + lcPadName + ' ', '', 1, 2 ) )
+						lcExpr	= ALLTRIM( STREXTRACT( tcLine, ' OF ' + loReg.LEVELNAME + ' ', '', 1, 2 ) )
+						THIS.AnalizarSiExpresionEsComandoOProcedimiento( lcExpr, @lcProcName, @lcProcCode, @C_FB2PRG_CODE, -1, .F. )
 						
 						DO CASE
-						CASE ' &'+'& <MenuProc/>' $ lcExpr
+						*CASE ' &'+'& <MenuProc/>' $ lcExpr
+						CASE NOT EMPTY(lcProcCode)
+							*lcProcName	= ALLTRIM( STREXTRACT( lcExpr, 'DO ', '&'+'&', 1, 2 ) )
+							loReg.PROCEDURE	= STRTRAN( lcProcCode, '<<ProcName>>', lcProcName )
+
+							IF EMPTY( loReg.PROCEDURE )
+								loReg.OBJCODE	= 67
+								loReg.COMMAND	= lcExpr
+							ELSE
 								loReg.OBJCODE	= 80
+								loReg.PROCTYPE	= 1
+							ENDIF
 
 						OTHERWISE
 							loReg.OBJCODE	= 67
+							loReg.COMMAND	= lcExpr
 
 						ENDCASE
 
@@ -15156,7 +15362,7 @@ DEFINE CLASS CL_MENU_OPTION AS CL_MENU_COL_BASE
 		#ENDIF
 
 		TRY
-			LOCAL llBloqueEncontrado, lcText, loReg, lnPos, lcBarName, lcExpr, lcComment, lcProcName, loEx AS EXCEPTION ;
+			LOCAL llBloqueEncontrado, lcText, loReg, lnPos, lcBarName, lcExpr, lcComment, lcProcName, lcProcCode, loEx AS EXCEPTION ;
 				, lnNegContainer, lnNegObject
 			STORE '' TO lcText, lcComment, lcBarName
 
@@ -15183,7 +15389,8 @@ DEFINE CLASS CL_MENU_OPTION AS CL_MENU_COL_BASE
 				loReg	= THIS.oReg
 				loReg.OBJTYPE	= 3
 				lcBarName		= ALLTRIM( STREXTRACT( tcLine, 'BAR ' , ' OF' ) )
-				IF LEFT(lcBarName,1) == '_'
+				*IF LEFT(lcBarName,1) == '_'
+				IF NOT ISDIGIT(lcBarName)
 					*-- Es un BAR del sistema
 					loReg.NAME	= lcBarName
 				ENDIF
@@ -15193,8 +15400,7 @@ DEFINE CLASS CL_MENU_OPTION AS CL_MENU_COL_BASE
 					EXIT
 				ENDIF
 
-				loReg.PROMPT		= ALLTRIM( STREXTRACT( tcLine, ' PROMPT ', ';', 1, 2 ) )
+				loReg.PROMPT		= CHRTRAN( ALLTRIM( STREXTRACT( tcLine, ' PROMPT ', ';', 1, 2 ) ), '"', '' )
-				*loReg.ItemNum		= STR(THIS.n_ParentCount + 1,3)
 
 				*-- ANALISIS DEL "DEFINE BAR"
 				IF ';' $ tcLine
@@ -15233,10 +15439,10 @@ DEFINE CLASS CL_MENU_OPTION AS CL_MENU_COL_BASE
 							loReg.MESSAGE	= ALLTRIM( STREXTRACT( tcLine, '"', '"', 1, 4 ) )
 
 						CASE LEFT( tcLine, 8 ) == 'PICTURE '
-							loReg.RESNAME	= ALLTRIM( STREXTRACT( tcLine, '"', '"', 1, 4 ) )
+							loReg.RESNAME	= ALLTRIM( STREXTRACT( tcLine, '"', '"' ) )
 
 						CASE LEFT( tcLine, 8 ) == 'PICTRES '
-							loReg.RESNAME	= ALLTRIM( STREXTRACT( tcLine, '"', '"', 1, 4 ) )
+							loReg.RESNAME	= ALLTRIM( STREXTRACT( tcLine, 'PICTRES ', ';', 1, 2 ) )
 							loReg.SYSRES	= 1
 
 						OTHERWISE
@@ -15278,14 +15484,26 @@ DEFINE CLASS CL_MENU_OPTION AS CL_MENU_COL_BASE
 						EXIT
 
 					CASE LEFT( tcLine, 17 ) == 'ON SELECTION BAR '
-						lcExpr	= ALLTRIM( STREXTRACT( tcLine, ' OF ' + lcBarName + ' ', '', 1, 2 ) )
+						lcExpr	= ALLTRIM( STREXTRACT( tcLine, ' OF ' + loReg.LEVELNAME + ' ', '', 1, 2 ) )
+						THIS.AnalizarSiExpresionEsComandoOProcedimiento( lcExpr, @lcProcName, @lcProcCode, @C_FB2PRG_CODE, -1, .F. )
 						
 						DO CASE
-						CASE ' &'+'& <MenuProc/>' $ lcExpr
+						*CASE ' &'+'& <MenuProc/>' $ lcExpr
-							loReg.OBJCODE	= 80	&& Procedure
+						CASE NOT EMPTY(lcProcCode)
+							*lcProcName	= ALLTRIM( STREXTRACT( lcExpr, 'DO ', '&'+'&', 1, 2 ) )
+							loReg.PROCEDURE	= STRTRAN( lcProcCode, '<<ProcName>>', lcProcName )
+
+							IF EMPTY( loReg.PROCEDURE )
+								loReg.OBJCODE	= 67
+								loReg.COMMAND	= lcExpr
+							ELSE
+								loReg.OBJCODE	= 80
+								loReg.PROCTYPE	= 1
+							ENDIF
 
 						OTHERWISE
 							loReg.OBJCODE	= 67	&& Command
+							loReg.COMMAND	= lcExpr
 
 						ENDCASE
 
@@ -15330,7 +15548,7 @@ DEFINE CLASS CL_MENU_OPTION AS CL_MENU_COL_BASE
 		LPARAMETERS toParentReg, tnNivel, tcEndProcedures, toHeader
 
 		TRY
-			LOCAL loReg, I, lcText, lcTab, lcProcName, loEx AS EXCEPTION ;
+			LOCAL loReg, I, lcText, lcTab, lcExpr, lcProcName, lcProcCode, loEx AS EXCEPTION ;
 				, loBarPop AS CL_MENU_BARPOP OF 'FOXBIN2PRG.PRG' ;
 				, loOption AS CL_MENU_OPTION OF 'FOXBIN2PRG.PRG'
 
@@ -15341,7 +15559,7 @@ DEFINE CLASS CL_MENU_OPTION AS CL_MENU_COL_BASE
 			loBarPop	= toParentReg
 
 			*-- Actualizaci<63>n de procedimientos
-			lcProcName	= THIS.get_ProcNameFromSnippet(loReg)
+			*lcProcName	= THIS.get_ProcNameFromSnippet(loReg)
 
 			*-- Options (ObjType:3)
 			DO CASE
@@ -15359,17 +15577,17 @@ DEFINE CLASS CL_MENU_OPTION AS CL_MENU_COL_BASE
 
 			ENDCASE
 			
-			IF loReg.OBJCODE = 80	&& Procedure
+			IF loReg.OBJCODE = 80	&& Procedure de BAR o PAD
 				*-- Reemplazo el nombre definitivo
+				lcExpr		= loReg.PROCEDURE
+				THIS.AnalizarSiExpresionEsComandoOProcedimiento( lcExpr, @lcProcName, @lcProcCode, '', 1, .T. )
+
 				IF EMPTY(lcProcName)
 					lcProcName	= CHRTRAN( ALLTRIM( STREXTRACT( lcText, 'DEFINE ', 'PROMPT ' ) ), ' ', '_' )
 				ENDIF
 
 				lcText			= STRTRAN( lcText, '<<ProcName>>', lcProcName )
-				tcEndProcedures	= tcEndProcedures ;
+				tcEndProcedures	= tcEndProcedures + STRTRAN( lcProcCode, '<<ProcName>>', lcProcName ) + CR_LF
-					+ 'PROCEDURE ' + lcProcName + CR_LF ;
-					+ ALLTRIM(loReg.Procedure) + CR_LF ;
-					+ 'ENDPROC &' + '& ' + lcProcName + CR_LF + CR_LF
 			ENDIF
 			
 			
@@ -15400,52 +15618,6 @@ DEFINE CLASS CL_MENU_OPTION AS CL_MENU_COL_BASE
 	ENDPROC
 	
 	
-	PROCEDURE get_ProcNameFromSnippet
-		*---------------------------------------------------------------------------------------------------
-		* PAR<41>METROS:				(!=Obligatorio | ?=Opcional) (@=Pasar por referencia | v=Pasar por valor) (IN/OUT)
-		* toReg						(v? IN    ) Objeto registro
-		*---------------------------------------------------------------------------------------------------
-		LPARAMETERS toReg
-
-		LOCAL lcProcName, lcProcCode, laProcLines(1), lnProcLines
-		
-		*-- Actualizaci<63>n de procedimientos
-		IF toReg.OBJCODE = 80	&& Procedure
-			lcProcName	= ''
-
-			IF NOT EMPTY(toReg.Procedure)
-				lnProcLines	= ALINES(laProcLines, toReg.Procedure)
-
-				FOR I = 1 TO lnProcLines
-					*-- Si existe el snippet #NAME, lo usa
-					IF EMPTY(lcProcName) AND UPPER( LEFT( ALLTRIM(laProcLines(I)), 6 ) ) == '#NAME '
-						lcProcName	= ALLTRIM( SUBSTR( ALLTRIM(laProcLines(I)), 7 ) )
-						*ADEL(laProcLines,I)
-						*lnProcLines	= lnProcLines - 1
-						*DIMENSION laProcLines(lnProcLines)
-						*EXIT
-					ENDIF
-					
-					*-- Indento el c<>digo
-					laProcLines(I)	= C_TAB + laProcLines(I)
-				ENDFOR
-				
-				IF NOT EMPTY(lcProcName)
-					*-- Rearmo el Procedure
-					WITH toReg
-						.Procedure	= ''
-						FOR I = 1 TO lnProcLines
-							.Procedure	= .Procedure + laProcLines(I) + CR_LF
-						ENDFOR
-					ENDWITH
-				ENDIF
-			ENDIF
-		ENDIF
-
-		RETURN lcProcName
-	ENDPROC
-
-
 	PROCEDURE get_DefineBarText
 		*---------------------------------------------------------------------------------------------------
 		* PAR<41>METROS:				(!=Obligatorio | ?=Opcional) (@=Pasar por referencia | v=Pasar por valor) (IN/OUT)
@@ -15497,16 +15669,17 @@ DEFINE CLASS CL_MENU_OPTION AS CL_MENU_COL_BASE
 
 				IF toReg.OBJCODE = 77	&& Submenu
 					loBarPop	= THIS.Item(1).oReg
-					lcText	= lcText + lcTab + 'ON BAR ' + ALLTRIM(toReg.ItemNum) + ' OF ' + ALLTRIM(toReg.LevelName) ;
+					lcText	= lcText + lcTab + 'ON BAR ' + ALLTRIM( EVL( toReg.Name, toReg.ItemNum ) ) + ' OF ' + ALLTRIM(toReg.LevelName) ;
 						+ ' ACTIVATE POPUP ' + ALLTRIM(loBarPop.Name)
 				ELSE
-					lcText	= lcText + lcTab + 'ON SELECTION BAR ' + ALLTRIM(toReg.ItemNum) + ' OF ' + ALLTRIM(toReg.LevelName)
+					lcText	= lcText + lcTab + 'ON SELECTION BAR ' + ALLTRIM( EVL( toReg.Name, toReg.ItemNum ) ) + ' OF ' + ALLTRIM(toReg.LevelName)
 					
 					DO CASE
 					CASE toReg.OBJCODE = 67	&& Command
 						lcText	= lcText + ' ' + ALLTRIM(toReg.Command)
 					CASE toReg.OBJCODE = 80	&& Procedure
-						lcText	= lcText + ' DO <<ProcName>>' + ' &'+'& <MenuProc/>'
+						*lcText	= lcText + ' DO <<ProcName>>' + ' &'+'& <MenuProc/>'
+						lcText	= lcText + ' DO <<ProcName>>'
 					ENDCASE
 				ENDIF
 			ENDIF
@@ -15597,7 +15770,8 @@ DEFINE CLASS CL_MENU_OPTION AS CL_MENU_COL_BASE
 					CASE toReg.OBJCODE = 67	&& Command
 						lcText	= lcText + ' ' + ALLTRIM(toReg.Command)
 					CASE toReg.OBJCODE = 80	&& Procedure
-						lcText	= lcText + ' DO <<ProcName>>' + ' &'+'& <MenuProc/>'
+						*lcText	= lcText + ' DO <<ProcName>>' + ' &'+'& <MenuProc/>'
+						lcText	= lcText + ' DO <<ProcName>>'
 					ENDCASE
 				ENDIF
 			ENDIF