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

SKIP, PICTRES

Browse Source 
Formatting space from mn2 was kept in mnx creation.
This commit is contained in:
Lutz
2022-06-08 16:49:36 +02:00
parent 9a20b7da03
commit f193ba15fc
2 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
docs/FoxBin2Prg_Changes.md
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 |
| - | - | - | - | | - | - | - | - |
| 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/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/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) | | 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) |

18
foxbin2prg.prg
View File

@@ -28770,6 +28770,13 @@ Define Class CL_MENU_OPTION As CL_MENU_COL_BASE
lnLineEnd = 0 lnLineEnd = 0
Endif Endif
*!* Changed by: SF 8.6.2022
*!* <pdm>
*!* <change date="{^2022-06-08,16:16:00}">Changed by: SF<br />
*!* 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
*!* </change>
*!* </pdm>
Do Case Do Case
Case Left( tcLine, 10 ) == 'NEGOTIATE ' Case Left( tcLine, 10 ) == 'NEGOTIATE '
lcExpr = Alltrim( Strextract( tcLine, 'NEGOTIATE ', ';', 1, 2 ) ) 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 ' Case Left( tcLine, 9 ) == 'SKIP FOR '
loReg.SkipFor = Alltrim( Strextract( tcLine, 'SKIP FOR ') ) loReg.SkipFor = Alltrim( Strextract( tcLine, 'SKIP FOR ') )
IF lnLineEnd > 0 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 ENDIF
@@ -28806,7 +28814,8 @@ Define Class CL_MENU_OPTION As CL_MENU_COL_BASE
loReg.RESNAME = Alltrim( Strextract( tcLine, 'PICTRES ') ) loReg.RESNAME = Alltrim( Strextract( tcLine, 'PICTRES ') )
IF lnLineEnd > 0 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 ELSE
ENDIF ENDIF
@@ -28815,6 +28824,7 @@ Define Class CL_MENU_OPTION As CL_MENU_COL_BASE
Otherwise Otherwise
* Nada * Nada
ENDCASE ENDCASE
*!* /Changed by: SF 8.6.2022
*!* /Changd By: BH 30.3.2022 *!* /Changd By: BH 30.3.2022
@@ -29291,8 +29301,6 @@ Define Class CL_MENU_OPTION As CL_MENU_COL_BASE
Endif Endif
If Not Empty(toReg.RESNAME) If Not Empty(toReg.RESNAME)
*sf 20220608
*SET STEP ON
If toReg.SYSRES = 1 If toReg.SYSRES = 1
lcText = lcText + ' ;' + CR_LF + lcTab + ' PICTRES ' + toReg.RESNAME lcText = lcText + ' ;' + CR_LF + lcTab + ' PICTRES ' + toReg.RESNAME
Else Else
@@ -29409,8 +29417,6 @@ Define Class CL_MENU_OPTION As CL_MENU_COL_BASE
Endif Endif
If Not Empty(toReg.RESNAME) If Not Empty(toReg.RESNAME)
*sf 20220608
*SET STEP ON
If toReg.SYSRES = 1 If toReg.SYSRES = 1
lcText = lcText + ' ;' + CR_LF + lcTab + ' PICTRES ' + toReg.RESNAME lcText = lcText + ' ;' + CR_LF + lcTab + ' PICTRES ' + toReg.RESNAME
Else Else