From f193ba15fcb8817b9d750315055c0109aa576136 Mon Sep 17 00:00:00 2001 From: Lutz Date: Wed, 8 Jun 2022 16:49:36 +0200 Subject: [PATCH] SKIP, PICTRES Formatting space from mn2 was kept in mnx creation. --- docs/FoxBin2Prg_Changes.md | 1 + foxbin2prg.prg | 18 ++++++++++++------ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/docs/FoxBin2Prg_Changes.md b/docs/FoxBin2Prg_Changes.md index 16d08e9..83934fd 100644 --- a/docs/FoxBin2Prg_Changes.md +++ b/docs/FoxBin2Prg_Changes.md @@ -27,6 +27,7 @@ _**Note:** you can click on the version number for downloading this version from | Rel.Date | Developer | Version | Details | | - | - | - | - | +| 2022/06/08 | LScheffler | [v1.19.75](https://github.com/fdbozzo/foxbin2prg/releases/tag/v1.19.75) | **Bug Fix**: Multiple text2bin and bin2text conversion on MNX causes space grow (JoergSchneider) | | 2022/06/08 | LScheffler | [v1.19.75](https://github.com/fdbozzo/foxbin2prg/releases/tag/v1.19.75) | **Enhancement**: Typo in German (JoergSchneider) | | 2022/05/13 | bjornhoeksel | [v1.19.74](https://github.com/fdbozzo/foxbin2prg/releases/tag/v1.19.74) | **Bug Fix**: Fix menu bars with shortcuts keys like KEY F6, "F6"; are lost. (DanLauer) | | 2022/04/08 | LScheffler | [v1.19.73](https://github.com/fdbozzo/foxbin2prg/releases/tag/v1.19.73) | **Bug Fix**: Problem converting trailing spaces on line end in memo (again) (bjornhoeksel) | diff --git a/foxbin2prg.prg b/foxbin2prg.prg index f2b469a..74f2ccf 100644 --- a/foxbin2prg.prg +++ b/foxbin2prg.prg @@ -28770,6 +28770,13 @@ Define Class CL_MENU_OPTION As CL_MENU_COL_BASE lnLineEnd = 0 Endif +*!* Changed by: SF 8.6.2022 +*!* +*!* Changed by: SF
+*!* https://github.com/fdbozzo/foxbin2prg/issues/84 / Multiple text2bin and bin2text conversion on MNX causes space grow +*!* Bin2Text is formated like "xxx ;", trailing space must be removed, TRIM() added for SKIP FOR and PICTRES +*!* +*!* Do Case Case Left( tcLine, 10 ) == 'NEGOTIATE ' lcExpr = Alltrim( Strextract( tcLine, 'NEGOTIATE ', ';', 1, 2 ) ) @@ -28792,7 +28799,8 @@ Define Class CL_MENU_OPTION As CL_MENU_COL_BASE Case Left( tcLine, 9 ) == 'SKIP FOR ' loReg.SkipFor = Alltrim( Strextract( tcLine, 'SKIP FOR ') ) IF lnLineEnd > 0 - loReg.SkipFor = SUBSTR(loReg.SkipFor, 1, ATC(';', loReg.SkipFor, lnLineEnd)-1) +*!* Changed by: SF 8.6.2022 + loReg.SkipFor = Trim( Substr( loReg.SkipFor, 1, ATC(';', loReg.SkipFor, lnLineEnd)-1) ) ENDIF @@ -28806,7 +28814,8 @@ Define Class CL_MENU_OPTION As CL_MENU_COL_BASE loReg.RESNAME = Alltrim( Strextract( tcLine, 'PICTRES ') ) IF lnLineEnd > 0 - loReg.RESNAME = SUBSTR(loReg.RESNAME, 1, ATC(';', loReg.RESNAME, lnLineEnd)-1) +*!* Changed by: SF 8.6.2022 + loReg.RESNAME = Trim( Substr( loReg.RESNAME, 1, ATC(';', loReg.RESNAME, lnLineEnd)-1) ) ELSE ENDIF @@ -28815,6 +28824,7 @@ Define Class CL_MENU_OPTION As CL_MENU_COL_BASE Otherwise * Nada ENDCASE +*!* /Changed by: SF 8.6.2022 *!* /Changd By: BH 30.3.2022 @@ -29291,8 +29301,6 @@ Define Class CL_MENU_OPTION As CL_MENU_COL_BASE Endif If Not Empty(toReg.RESNAME) -*sf 20220608 -*SET STEP ON If toReg.SYSRES = 1 lcText = lcText + ' ;' + CR_LF + lcTab + ' PICTRES ' + toReg.RESNAME Else @@ -29409,8 +29417,6 @@ Define Class CL_MENU_OPTION As CL_MENU_COL_BASE Endif If Not Empty(toReg.RESNAME) -*sf 20220608 -*SET STEP ON If toReg.SYSRES = 1 lcText = lcText + ' ;' + CR_LF + lcTab + ' PICTRES ' + toReg.RESNAME Else