diff --git a/FoxBin2PRGVersionFile.txt b/FoxBin2PRGVersionFile.txt index ef4c0b4..2a37c76 100644 --- a/FoxBin2PRGVersionFile.txt +++ b/FoxBin2PRGVersionFile.txt @@ -2,8 +2,8 @@ Lparameters toUpdateInfo Local lcNote With toUpdateInfo - .VersionNumber = 'v1.19.74' - .VersionDate = Date(2022,05,13) + .VersionNumber = 'v1.19.75' + .VersionDate = Date(2022,06,08) .SourceFileUrl = 'http://vfpxrepository.com/dl/thorupdate/Projects/FoxBin2Prg/FoxBin2Prg.Zip' .Link = 'https://github.com/fdbozzo/foxbin2prg/wiki' @@ -21,6 +21,10 @@ Demo video using FoxBin2Prg with PlasticSCM: http://youtu.be/sE4wQ50Itqg +++++++++++++++++++++++ Change History +++++++++++++++++++++++ +2022-06-08 v1.19.75 +- Bug Fix: Multiple text2bin and bin2text conversion on MNX causes space grow (JoergSchneider) +- Enhancement: Typo in German (JoergSchneider) + 2022-05-13 v1.19.74 - Bug Fix: Fix menu bars with shortcuts keys like KEY F6, "F6"; are lost. (DanLauer) diff --git a/README.md b/README.md index 9b4c1a3..ebad2e0 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# FoxBin2Prg v1.19.74 +# FoxBin2Prg v1.19.75 **Binary/Text Converting program for Microsoft Visual FoxPro** ## Lutz Scheffler @@ -143,4 +143,4 @@ For usage see [documentation](./docs/FoxBin2Prg.md) ## Contribution See [contribution](./.github/CONTRIBUTING.md) -Last changed: _2022/05/13_ ![Picture](./docs/pictures/vfpxpoweredby_alternative.gif) \ No newline at end of file +Last changed: _2022/06/08_ ![Picture](./docs/pictures/vfpxpoweredby_alternative.gif) \ No newline at end of file diff --git a/ThorUpdater/FoxBin2Prg.zip b/ThorUpdater/FoxBin2Prg.zip index 79694f8..19ce21d 100644 Binary files a/ThorUpdater/FoxBin2Prg.zip and b/ThorUpdater/FoxBin2Prg.zip differ diff --git a/ThorUpdater/FoxBin2PrgVersion.txt b/ThorUpdater/FoxBin2PrgVersion.txt index 65a7ff8..7ff772f 100644 --- a/ThorUpdater/FoxBin2PrgVersion.txt +++ b/ThorUpdater/FoxBin2PrgVersion.txt @@ -10,8 +10,8 @@ local; lcappName = "FoxBin2Prg" *Set following two numbers on version -ldDate = date(2022,05,13) -lcmajorVersion = "1.19.74" +ldDate = date(2022,06,08) +lcmajorVersion = "1.19.75" *lnJulian = val(sys(11, m.ldDate)) - val(sys(11, {^2000-01-01})) *lcJulian = padl(transform(lnJulian), 4, '0') @@ -39,6 +39,10 @@ Demo video using FoxBin2Prg with PlasticSCM: http://youtu.be/sE4wQ50Itqg +++++++++++++++++++++++ Change History +++++++++++++++++++++++ +2022-06-08 v1.19.75 +- Bug Fix: Multiple text2bin and bin2text conversion on MNX causes space grow (JoergSchneider) +- Enhancement: Typo in German (JoergSchneider) + 2022-05-13 v1.19.74 - Bug Fix: Fix menu bars with shortcuts keys like KEY F6, "F6"; are lost. (DanLauer) diff --git a/docs/FoxBin2Prg_Changes.md b/docs/FoxBin2Prg_Changes.md index 8019d61..83934fd 100644 --- a/docs/FoxBin2Prg_Changes.md +++ b/docs/FoxBin2Prg_Changes.md @@ -27,6 +27,8 @@ _**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) | | 2022/04/07 | LScheffler | [v1.19.72](https://github.com/fdbozzo/foxbin2prg/releases/tag/v1.19.72) | **Bug Fix**: Problem converting trailing spaces on line end in memo (bjornhoeksel) | @@ -416,4 +418,4 @@ _**Note:** you can click on the version number for downloading this version from This project is part of [VFPX](https://vfpx.github.io/). ---- -Last changed: _2022/05/13_ ![Picture](./pictures/vfpxpoweredby_alternative.gif) \ No newline at end of file +Last changed: _2022/06/08_ ![Picture](./pictures/vfpxpoweredby_alternative.gif) \ No newline at end of file diff --git a/foxbin2prg.cfg.txt b/foxbin2prg.cfg.txt index f06faf5..57efba4 100644 --- a/foxbin2prg.cfg.txt +++ b/foxbin2prg.cfg.txt @@ -1,6 +1,6 @@ *################################################################################################################ *FOXBIN2PRG.CFG configuration options: (If no values given, these are the DEFAULTS) -*Version: v1.19.74 +*Version: v1.19.75 ***************************************************************************************************************** * Note, configuration files will follow an inheritance. diff --git a/foxbin2prg.dbf.cfg.txt b/foxbin2prg.dbf.cfg.txt index 933432d..9dc3029 100644 --- a/foxbin2prg.dbf.cfg.txt +++ b/foxbin2prg.dbf.cfg.txt @@ -1,6 +1,6 @@ *################################################################################################################ *-- Individual DBF configuration file (syntax: filename.dbf.cfg) Defaults see FoxBin2prg.cfg -*Version: v1.19.74 +*Version: v1.19.75 ***************************************************************************************************************** *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) diff --git a/foxbin2prg.exe b/foxbin2prg.exe index 0d29a01..a4ce3bc 100644 Binary files a/foxbin2prg.exe and b/foxbin2prg.exe differ diff --git a/foxbin2prg.pj2 b/foxbin2prg.pj2 index 8299db7..ba70157 100644 --- a/foxbin2prg.pj2 +++ b/foxbin2prg.pj2 @@ -26,7 +26,7 @@ _LegalTrademark = "MIT License" _ProductName = "FOXBIN2PRG" _MajorVer = "1" _MinorVer = "19" -_Revision = "74" +_Revision = "75" _LanguageID = "1034" _AutoIncrement = "0" * diff --git a/foxbin2prg.pjt b/foxbin2prg.pjt index 508b496..5f4bae0 100644 Binary files a/foxbin2prg.pjt and b/foxbin2prg.pjt differ diff --git a/foxbin2prg.pjx b/foxbin2prg.pjx index 7661d34..a59c1df 100644 Binary files a/foxbin2prg.pjx and b/foxbin2prg.pjx differ diff --git a/foxbin2prg.prg b/foxbin2prg.prg index 0584e08..f1e6ba5 100644 --- a/foxbin2prg.prg +++ b/foxbin2prg.prg @@ -295,6 +295,8 @@ * 07/04/2022 LScheffler v1.19.72 Enhancement: Added parameter "?" to show interactive help ("interactive" still works) * 08/04/2022 LScheffler v1.19.73 Bug Fix: Problem converting trailing spaces on line end in memo again (bjornhoeksel) * 13/05/2022 bjornhoeksel v1.19.74 Bug Fix: Fix menu bars with shortcuts keys like KEY F6, "F6"; are lost. (DanLauer) +* 08/06/2022 LScheffler v1.19.75 Enhancement: Typo in German (JoergSchneider) +* 08/06/2022 LScheffler v1.19.75 Bug Fix: Multiple text2bin and bin2text conversion on MNX causes space grow (JoergSchneider) * * *--------------------------------------------------------------------------------------------------- @@ -464,6 +466,8 @@ * 06/04/2022 bjornhoeksel Bug REPORT v1.19.71 Problem converting trailing spaces on line end in memo (bjornhoeksel) * 08/04/2022 bjornhoeksel Bug REPORT v1.19.72 Problem converting trailing spaces on line end in memo (again) (bjornhoeksel) * 13/05/2022 DanLauer Bug REPORT v1.19.73 Fix menu bars with shortcuts keys like KEY F6, "F6"; are lost. +* 08/06/2022 JoergSchneider Bug REPORT v1.19.74 Typo in German (JoergSchneider) +* 08/06/2022 JoergSchneider Bug REPORT v1.19.74 Multiple text2bin and bin2text conversion on MNX causes space grow (JoergSchneider) * * @@ -980,7 +984,7 @@ Define Class c_foxbin2prg As Session Protected n_CFG_Actual, l_Main_CFG_Loaded, o_Configuration, l_CFG_CachedAccess *-- n_FB2PRG_Version = 1.19 - c_FB2PRG_Version_Real = '1.19.74' + c_FB2PRG_Version_Real = '1.19.75' *-- c_Language = '' && EN, FR, ES, DE c_Language_In = '(auto)' @@ -28767,6 +28771,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 ) ) @@ -28789,7 +28800,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 @@ -28803,7 +28815,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 @@ -28812,6 +28825,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 @@ -31030,7 +31044,7 @@ Define Class CL_LANG As Custom .C_DUPLICATED_OBJECT_LOC = "Doppelte Objekt" .C_ENDDEFINE_MARKER_NOT_FOUND_LOC = "Kann keinen Ende Marker [ENDDEFINE] in Zeile <> für die ID [<>] finden" .C_END_MARKER_NOT_FOUND_LOC = "Kann keinen Ende Marker [<>] welcher den Start Marker [<>] in Zeile <> schließt" - .C_END_OF_PROCESS_LOC = "Ende desr Prozesses" + .C_END_OF_PROCESS_LOC = "Ende des Prozesses" .C_ERROR_LOC = "FEHLER" .C_ERRORS_FOUND_IN_FILE_LOC = "FEHLER IN FILE GEFUNDEN" .C_EXTENSION_RECONFIGURATION_LOC = "Neukonfiguration der Erweiterungen:" &&wir wollen es mal nicht übertreiben, mit den zusammengesetzten Substantiven