romfast/foxbin2prg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Enhancement: Make FoxBin2Prg more COM friendly when using ESC key (Tracy Pearson)

Browse Source
This commit is contained in:
fdbozzo
2019-02-24 21:01:25 +01:00
parent d71238bf89 625d31a5ec
commit 8f765199b1
1 changed files with 28 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
foxbin2prg.prg
View File

@@ -219,6 +219,7 @@
* 20/06/2018 FDBOZZO v1.19.51.2 Bug Fix: Cuando se exporta un DBF que pertenece a un DBC sin eventos, falla (Jairo Argüelles/Juan C.Perdomo)
* 09/07/2018 FDBOZZO v1.19.51.3 Bug Fix: Error 1098, Cannot find ... [ENDT] that closes ... [TEXT] Issue#26 when there is a field named TEXT as first line-word (KIRIDES)
* 10/07/2018 FDBOZZO v1.19.51.4 Bug Fix: El ordenamiento alfabético de los objetos de los ADD OBJECT puede causar que algunos objetos se creen en el orden erróneo, provocando comportamientos inesperados (Jochen Kauz)
* 14/02/2019 TRACY_P v1.19.51.5 Enhancement: Make FoxBin2Prg more COM friendly when using ESC key (Tracy Pearson)
* </HISTORIAL DE CAMBIOS Y NOTAS IMPORTANTES>
*
*---------------------------------------------------------------------------------------------------
@@ -2888,6 +2889,7 @@ DEFINE CLASS c_foxbin2prg AS Session
lcInputFile_Type = ''
.l_Error = .F.
tcType = UPPER( EVL(tcType,'') )
llEscKeyRestored = .T.
.declareDLL()
IF THIS.l_CancelWithEscKey THEN
@@ -2895,6 +2897,7 @@ DEFINE CLASS c_foxbin2prg AS Session
lcOldOnEscape = ON("Escape")
ON ESCAPE ERROR 1799
SET ESCAPE ON
llEscKeyRestored = .F.
ENDIF
DO CASE
@@ -3441,7 +3444,7 @@ DEFINE CLASS c_foxbin2prg AS Session
ENDWITH && THIS
CATCH TO toEx
IF THIS.l_CancelWithEscKey THEN
IF NOT llEscKeyRestored AND THIS.l_CancelWithEscKey THEN
IF EMPTY(lcOldOnEscape)
ON ESCAPE
ELSE
@@ -3504,6 +3507,7 @@ DEFINE CLASS c_foxbin2prg AS Session
ELSE
SET ESCAPE &lcOldSetEscape.
ENDIF
llEscKeyRestored = .T.
ENDIF
IF VARTYPE(loLang) <> 'O' THEN
@@ -7575,8 +7579,8 @@ DEFINE CLASS c_conversor_base AS Custom
* VER: https://github.com/fdbozzo/foxbin2prg/issues/28
*
* PASO 1: Obtener los nombres únicos y asignarles un código de orden
CREATE CURSOR C_OBJ (objName C(50), iOrder I AUTOINC)
INDEX ON objname TAG objname
CREATE CURSOR C_OBJ (OBJNAME C(50), IORDER I AUTOINC)
INDEX ON OBJNAME TAG OBJNAME
* PASO 2: Configurar las prioridades de ordenamiento (primero props, luego objs)
FOR I = 1 TO m.tnPropsAndValues_Count
@@ -7586,10 +7590,10 @@ DEFINE CLASS c_conversor_base AS Custom
lcObjName = GETWORDNUM(laPropsAndValues(m.I,1), 1, '.')
IF NOT SEEK(LOWER(lcObjName), "C_OBJ")
INSERT INTO C_OBJ (objName) VALUES (LOWER(lcObjName))
INSERT INTO C_OBJ (OBJNAME) VALUES (LOWER(lcObjName))
ENDIF
laPropsAndValues(m.I,1) = 'B' + PADL(C_OBJ.iOrder,3,'0') ;
laPropsAndValues(m.I,1) = 'B' + PADL(C_OBJ.IORDER,3,'0') ;
+ JUSTSTEM(laPropsAndValues(m.I,1)) + '.' ;
+ .sortPropsAndValues_SetAndGetSCXPropNames( 'SETNAME', JUSTEXT(laPropsAndValues(m.I,1)) )
@@ -7600,10 +7604,10 @@ DEFINE CLASS c_conversor_base AS Custom
lcObjName = GETWORDNUM(laPropsAndValues(m.I,1), 1, '.')
IF NOT SEEK(LOWER(lcObjName), "C_OBJ")
INSERT INTO C_OBJ (objName) VALUES (LOWER(lcObjName))
INSERT INTO C_OBJ (OBJNAME) VALUES (LOWER(lcObjName))
ENDIF
laPropsAndValues(m.I,1) = 'B' + PADL(C_OBJ.iOrder,3,'0') ;
laPropsAndValues(m.I,1) = 'B' + PADL(C_OBJ.IORDER,3,'0') ;
+ JUSTSTEM(laPropsAndValues(m.I,1)) + '.' ;
+ JUSTEXT(laPropsAndValues(m.I,1))
@@ -22701,7 +22705,7 @@ DEFINE CLASS CL_DBC_VIEWS AS CL_DBC_COL_BASE
*LG lnView_Count = ADBOBJECTS( laViews, "VIEW" )
SELECT CAST(ALLTRIM(ObjectName) as varchar(128)) ;
FROM TablaBin ;
FROM TABLABIN ;
WHERE UPPER(ObjectType) = 'VIEW' ;
ORDER BY 1 ;
INTO ARRAY laViews