Merge commit 'dab684dcceb9'

This commit is contained in:
Lutz
2023-08-05 12:09:48 +02:00
8 changed files with 599 additions and 582 deletions

View File

@@ -1,4 +1,4 @@
# FoxBin2Prg v1.19.78 # FoxBin2Prg v1.19.79
**Binary/Text Converting program for Microsoft Visual FoxPro** **Binary/Text Converting program for Microsoft Visual FoxPro**
## Lutz Scheffler ## Lutz Scheffler
@@ -148,4 +148,4 @@ See [issue #93](https://github.com/fdbozzo/foxbin2prg/issues/93).
## Usage ## Usage
For usage see [documentation](./docs/FoxBin2Prg.md) For usage see [documentation](./docs/FoxBin2Prg.md)
Last changed: _2023/03/20_ ![Picture](./docs/pictures/vfpxpoweredby_alternative.gif) Last changed: _2023/08/04_ ![Picture](./docs/pictures/vfpxpoweredby_alternative.gif)

View File

@@ -27,6 +27,7 @@ _**Note:** you can click on the version number for downloading this version from
| Rel.Date | Developer | Version | Details | | Rel.Date | Developer | Version | Details |
| - | - | - | - | | - | - | - | - |
| 2023/08/04 | LScheffler | [v1.19.79](https://github.com/fdbozzo/foxbin2prg/releases/tag/v1.19.79) | **Bug Fix**: Bin2Text: Forms with ole controls conversion error (also: any vcx) #95 (KestasL) |
| 2023/03/20 | LScheffler | [v1.19.78](https://github.com/fdbozzo/foxbin2prg/releases/tag/v1.19.78) | **Enhancement**: Text2Bin on PJX errors out for projects with an attach icon that has a drive letter on its path. #93 (ericbarte) | | 2023/03/20 | LScheffler | [v1.19.78](https://github.com/fdbozzo/foxbin2prg/releases/tag/v1.19.78) | **Enhancement**: Text2Bin on PJX errors out for projects with an attach icon that has a drive letter on its path. #93 (ericbarte) |
| | | | **Enhancement**: Documentation enhanced | | | | | **Enhancement**: Documentation enhanced |
| 2023/03/16 | LScheffler | [v1.19.77](https://github.com/fdbozzo/foxbin2prg/releases/tag/v1.19.77) | **Bug Fix**: Bin2Txt Operation on VCX loses leading spaces in Property Values #90 (JoergSchneider) | | 2023/03/16 | LScheffler | [v1.19.77](https://github.com/fdbozzo/foxbin2prg/releases/tag/v1.19.77) | **Bug Fix**: Bin2Txt Operation on VCX loses leading spaces in Property Values #90 (JoergSchneider) |
@@ -424,4 +425,4 @@ _**Note:** you can click on the version number for downloading this version from
This project is part of [VFPX](https://vfpx.github.io/). This project is part of [VFPX](https://vfpx.github.io/).
---- ----
Last changed: _2023/03/16_ ![Picture](./pictures/vfpxpoweredby_alternative.gif) Last changed: _2023/08/04_ ![Picture](./pictures/vfpxpoweredby_alternative.gif)

View File

@@ -1,6 +1,6 @@
*################################################################################################################ *################################################################################################################
*FOXBIN2PRG.CFG configuration options: (If no values given, these are the DEFAULTS) *FOXBIN2PRG.CFG configuration options: (If no values given, these are the DEFAULTS)
*Version: v1.19.78 *Version: v1.19.79
***************************************************************************************************************** *****************************************************************************************************************
* Note, configuration files will follow an inheritance. * Note, configuration files will follow an inheritance.

View File

@@ -1,6 +1,6 @@
*################################################################################################################ *################################################################################################################
*-- Individual DBF configuration file (syntax: filename.dbf.cfg) Defaults see FoxBin2prg.cfg *-- Individual DBF configuration file (syntax: filename.dbf.cfg) Defaults see FoxBin2prg.cfg
*Version: v1.19.77 *Version: v1.19.79
***************************************************************************************************************** *****************************************************************************************************************
*DBF_Conversion_Support: <0,1,2,4,8> && 0=No support, 1=Generate Header TXT only (Diff), 2=Generate Header TXT and BIN (Merge/Only Structure!), 4=Generate TXT with DATA (Diff), 8=Export and Import DATA (Merge/Structure & Data) *DBF_Conversion_Support: <0,1,2,4,8> && 0=No support, 1=Generate Header TXT only (Diff), 2=Generate Header TXT and BIN (Merge/Only Structure!), 4=Generate TXT with DATA (Diff), 8=Export and Import DATA (Merge/Structure & Data)

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@@ -1,5 +1,5 @@
#DEFINE DN_FB2PRG_VERSION 1.19 #DEFINE DN_FB2PRG_VERSION 1.19
#DEFINE DC_FB2PRG_VERSION_REAL '1.19.78' #DEFINE DC_FB2PRG_VERSION_REAL '1.19.79'
*--------------------------------------------------------------------------------------------------- *---------------------------------------------------------------------------------------------------
* Module.........: FOXBIN2PRG.PRG - FOR VISUAL FOXPRO 9.0 * Module.........: FOXBIN2PRG.PRG - FOR VISUAL FOXPRO 9.0
@@ -304,6 +304,7 @@
* 16/03/2023 LScheffler v1.19.77 Bug Fix: Bin2Txt Operation on VCX loses leading spaces in Property Values #90 (JoergSchneider) * 16/03/2023 LScheffler v1.19.77 Bug Fix: Bin2Txt Operation on VCX loses leading spaces in Property Values #90 (JoergSchneider)
* 16/03/2023 LScheffler v1.19.77 Bug Fix: Txt2Bin Operation on VCX looses double ampersand in Property Values #91 (LScheffler) * 16/03/2023 LScheffler v1.19.77 Bug Fix: Txt2Bin Operation on VCX looses double ampersand in Property Values #91 (LScheffler)
* 20/03/2023 LScheffler v1.19.78 Enhancement: Text2Bin on PJX errors out for projects with an attach icon that has a drive letter on its path. #93 (ericbarte) * 20/03/2023 LScheffler v1.19.78 Enhancement: Text2Bin on PJX errors out for projects with an attach icon that has a drive letter on its path. #93 (ericbarte)
* 04/08/2023 LScheffler v1.19.79 Bug Fix: Bin2Text: Forms with ole controls conversion error (also: any vcx)
* </HISTORIAL DE CAMBIOS Y NOTAS IMPORTANTES> * </HISTORIAL DE CAMBIOS Y NOTAS IMPORTANTES>
* *
*--------------------------------------------------------------------------------------------------- *---------------------------------------------------------------------------------------------------
@@ -479,6 +480,7 @@
* 16/03/2023 JoergSchneider Bug REPORT v1.19.76 Bin2Txt Operation on VCX loses leading spaces in Property Values #90 (JoergSchneider) * 16/03/2023 JoergSchneider Bug REPORT v1.19.76 Bin2Txt Operation on VCX loses leading spaces in Property Values #90 (JoergSchneider)
* 16/03/2023 LScheffler Bug REPORT v1.19.76 Txt2Bin Operation on VCX looses double ampersand in Property Values #91 (LScheffler) * 16/03/2023 LScheffler Bug REPORT v1.19.76 Txt2Bin Operation on VCX looses double ampersand in Property Values #91 (LScheffler)
* 17/03/2023 ericbarte Bug REPORT v1.19.76 Text2Bin on PJX errors out for projects with an attach icon that has a drive letter on its path. #93 (ericbarte) * 17/03/2023 ericbarte Bug REPORT v1.19.76 Text2Bin on PJX errors out for projects with an attach icon that has a drive letter on its path. #93 (ericbarte)
* 04/08/2023 KestasL Bug REPORT v1.19.78 Bin2Text: Forms with ole controls conversion error (also: any vcx)
* </TESTEO Y REPORTE DE BUGS (AGRADECIMIENTOS)> * </TESTEO Y REPORTE DE BUGS (AGRADECIMIENTOS)>
* *
*--------------------------------------------------------------------------------------------------- *---------------------------------------------------------------------------------------------------
@@ -16978,6 +16980,10 @@ Define Class c_conversor_vcx_a_prg As c_conversor_bin_a_prg
loLang = _Screen.o_FoxBin2Prg_Lang loLang = _Screen.o_FoxBin2Prg_Lang
With This As c_conversor_vcx_a_prg Of 'FOXBIN2PRG.PRG' With This As c_conversor_vcx_a_prg Of 'FOXBIN2PRG.PRG'
*SF 20230804
*issue #95, [Kestutis Laurinavicius] prevent change ole codepage
*set NOCPTRANS for the vcx
SET NOCPTRANS TO ole
Use (.c_InputFile) Shared Again Noupdate Alias _TABLAORIG Use (.c_InputFile) Shared Again Noupdate Alias _TABLAORIG
If toFoxBin2Prg.n_UseClassPerFile = 0 Or Empty(toFoxBin2Prg.c_ClassToConvert) Then If toFoxBin2Prg.n_UseClassPerFile = 0 Or Empty(toFoxBin2Prg.c_ClassToConvert) Then
@@ -16992,6 +16998,9 @@ Define Class c_conversor_vcx_a_prg As c_conversor_bin_a_prg
OR PLATFORM == 'COMMENT ' And Lower(OBJNAME) == toFoxBin2Prg.c_ClassToConvert OR PLATFORM == 'COMMENT ' And Lower(OBJNAME) == toFoxBin2Prg.c_ClassToConvert
Endif Endif
*set NOCPTRANS for the cursor
SET NOCPTRANS TO ole
*/SF 20230804
lnStepCount = 7 lnStepCount = 7
Use In (Select("_TABLAORIG")) Use In (Select("_TABLAORIG"))
@@ -17353,7 +17362,14 @@ Define Class c_conversor_scx_a_prg As c_conversor_bin_a_prg
With This As c_conversor_scx_a_prg Of 'FOXBIN2PRG.PRG' With This As c_conversor_scx_a_prg Of 'FOXBIN2PRG.PRG'
Use (.c_InputFile) Shared Again Noupdate Alias _TABLAORIG Use (.c_InputFile) Shared Again Noupdate Alias _TABLAORIG
*SF 20230804
*issue #95, [Kestutis Laurinavicius] prevent change ole codepage
*set NOCPTRANS for the scx
SET NOCPTRANS TO ole
Select _TABLAORIG.*,Recno() regnum From _TABLAORIG Into Cursor TABLABIN Readwrite Select _TABLAORIG.*,Recno() regnum From _TABLAORIG Into Cursor TABLABIN Readwrite
*set NOCPTRANS for the cursor
SET NOCPTRANS TO ole
*/SF 20230804
Use In (Select("_TABLAORIG")) Use In (Select("_TABLAORIG"))
* Issue#15: Ignorar objetos mal definidos * Issue#15: Ignorar objetos mal definidos
@@ -17455,7 +17471,7 @@ Define Class c_conversor_scx_a_prg As c_conversor_bin_a_prg
lnObjCount = 0 lnObjCount = 0
lnRecno = Recno() lnRecno = Recno()
Locate For Upper( TABLABIN.PLATFORM ) = "WINDOWS" And Lower( Alltrim( Getwordnum( TABLABIN.Parent, 1, '.' ) ) ) == Lower(lcObjName) Locate For Upper( TABLABIN.PLATFORM ) = "WINDOWS" And Lower( Alltrim( Getwordnum( TABLABIN.Parent, 1, '.' ) ) ) == Lower(lcObjName)
*SF 20230804
Scan Rest While Upper( TABLABIN.PLATFORM ) = "WINDOWS" And Lower( Alltrim( Getwordnum( TABLABIN.Parent, 1, '.' ) ) ) == Lower(lcObjName) Scan Rest While Upper( TABLABIN.PLATFORM ) = "WINDOWS" And Lower( Alltrim( Getwordnum( TABLABIN.Parent, 1, '.' ) ) ) == Lower(lcObjName)
lnObjCount = lnObjCount + 1 lnObjCount = lnObjCount + 1
loRegObj = Null loRegObj = Null