diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 7800513..d974614 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -62,4 +62,4 @@ In special: Thanks ---- -Last changed: _2021/08/30_ ![Picture](./pictures/vfpxpoweredby_alternative.gif) \ No newline at end of file +Last changed: _2021/08/30_ ![Picture](../docs/pictures/vfpxpoweredby_alternative.gif) \ No newline at end of file diff --git a/README.md b/README.md index c8a2225..61ec0ea 100644 --- a/README.md +++ b/README.md @@ -131,8 +131,12 @@ DO FOXBIN2PRG.PRG WITH "-C","template.cfg" ==> Generates a template for Fox DO FOXBIN2PRG.PRG WITH "-t","template.dbf.cfg" ==> Generates a template for table.dbf.cfg per table config file with newest settings ``` +---- +## Usage For usage see [documentation](./docs/FoxBin2Prg.md) ---- -## Usage -Last changed: _2021/08/30_ ![Picture](./pictures/vfpxpoweredby_alternative.gif) \ No newline at end of file +## Contribution +See [contribution](./.github/CONTRIBUTING.md) + +Last changed: _2022/01/18_ ![Picture](./docs/pictures/vfpxpoweredby_alternative.gif) \ No newline at end of file diff --git a/ThorUpdater/FoxBin2Prg.zip b/ThorUpdater/FoxBin2Prg.zip index f35d177..722cadf 100644 Binary files a/ThorUpdater/FoxBin2Prg.zip and b/ThorUpdater/FoxBin2Prg.zip differ diff --git a/ThorUpdater/FoxBin2PrgVersion.txt b/ThorUpdater/FoxBin2PrgVersion.txt index 92255b8..872375a 100644 --- a/ThorUpdater/FoxBin2PrgVersion.txt +++ b/ThorUpdater/FoxBin2PrgVersion.txt @@ -10,8 +10,8 @@ local; lcappName = "FoxBin2Prg" *Set following two numbers on version -ldDate = date(2021,12,07) -lcmajorVersion = "1.19.67" +ldDate = date(2022,01,18) +lcmajorVersion = "1.19.68" *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-01-18 v1.19.68 +- Docu: Minor links in readme.html +- Bug Fix: Converting MN2 to MNX ignores the programmer-defined "Pad Name" found in "Prompt Options" screen + 2021-12-07 v1.19.67 - Bug Fix: Double classes in VCX (LScheffler) diff --git a/ThorUpdater/Project.txt b/ThorUpdater/Project.txt index 307afb5..bfbf79d 100644 --- a/ThorUpdater/Project.txt +++ b/ThorUpdater/Project.txt @@ -1,5 +1,5 @@ appName = FoxBin2Prg appID = FoxBin2Prg -majorVersion = 1.19.67 +majorVersion = 1.19.68 excludeFiles = *.bak,*.bat,*.fxp,*.tbk,*.tmp,*.dat,*.log,*.cvp,README.md,.gitignore,*.zip*,*.7z*,*- copia.*,*.private.*,test_*.*,xx*.*,*.lnk,vfp_init.*,tmp*.*,*.err, *.conflict.*, *.private., .gitignore, *.pui. *.prj* excludeFolders = *.plastic*,*ThorUpdater*,*Documentacion*,*foxunit*,*foxunit_*,*pruebas varias*,*versiones*,*datos_test* diff --git a/docs/FoxBin2prg.md b/docs/FoxBin2Prg.md similarity index 100% rename from docs/FoxBin2prg.md rename to docs/FoxBin2Prg.md diff --git a/docs/FoxBin2Prg_Changes.md b/docs/FoxBin2Prg_Changes.md index 106ca7b..e85d472 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/01/18 | LScheffler | [v1.19.68](https://github.com/fdbozzo/foxbin2prg/releases/tag/v1.19.68) | **Bug Fix**: Converting MN2 to MNX ignores the programmer-defined "Pad Name" found in "Prompt Options" screen (Jimrnelson) | +| | | | **Enhancement**: Minor links in readme.html | | 2021/08/20 | LScheffler | [v1.19.67](https://github.com/fdbozzo/foxbin2prg/releases/tag/v1.19.67) | **Bug Fix**: Double classes in VCX (LScheffler) | | | | | **Enhancement**: Templates and documentation for config files reworked | | 2021/08/20 | LScheffler | [v1.19.66](https://github.com/fdbozzo/foxbin2prg/releases/tag/v1.19.66) | **Bug Fix**: Incorrect version showing for v1.19.65 (siara-cc) | @@ -397,4 +399,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: _2021/08/30_ ![Picture](./pictures/vfpxpoweredby_alternative.gif) \ No newline at end of file +Last changed: _2022/01/17_ ![Picture](./pictures/vfpxpoweredby_alternative.gif) \ No newline at end of file diff --git a/foxbin2prg.cfg.txt b/foxbin2prg.cfg.txt index 29ab6d6..540ac6e 100644 --- a/foxbin2prg.cfg.txt +++ b/foxbin2prg.cfg.txt @@ -1,6 +1,6 @@ *################################################################################################################ *FOXBIN2PRG.CFG Konfigurations-Optionen: (Wird die Option nicht aufgeführt, ist der Wert im Beispiel der Default) -*Version: v1.19.67 +*Version: v1.19.68 ***************************************************************************************************************** * Achtung, die Konfigurationsdateien werden vererbt. diff --git a/foxbin2prg.dbf.cfg.txt b/foxbin2prg.dbf.cfg.txt index 0406eb3..6a0bf4e 100644 --- a/foxbin2prg.dbf.cfg.txt +++ b/foxbin2prg.dbf.cfg.txt @@ -1,6 +1,6 @@ *################################################################################################################ *-- Individual DBF configuration file (Syntax: .dbf.cfg im Verzeichnis der Tabelle) Defaults siehe FoxBin2prg.cfg -*Version: v1.19.67 +*Version: v1.19.68 ***************************************************************************************************************** *DBF_Conversion_Support: <1,2,4,8> && 0=Aus diff --git a/foxbin2prg.exe b/foxbin2prg.exe index 6a0549f..0dc432e 100644 Binary files a/foxbin2prg.exe and b/foxbin2prg.exe differ diff --git a/foxbin2prg.pjt b/foxbin2prg.pjt index 02d34ec..e71313f 100644 Binary files a/foxbin2prg.pjt and b/foxbin2prg.pjt differ diff --git a/foxbin2prg.pjx b/foxbin2prg.pjx index 9adf2ee..8fe2347 100644 Binary files a/foxbin2prg.pjx and b/foxbin2prg.pjx differ diff --git a/foxbin2prg.prg b/foxbin2prg.prg index 4f3e963..a29d32a 100644 --- a/foxbin2prg.prg +++ b/foxbin2prg.prg @@ -278,10 +278,13 @@ * This creates wrong version in generated config files too * 07/12/2021 LScheffler v1.19.67 Bug Fix: Double classes in VCX * 12/04/2021 LScheffler v1.19.67 Docu: examples and template for config files reworked +* 18/01/2022 LScheffler v1.19.68 Docu: Minor links in readme.html +* 18/01/2022 LScheffler v1.19.68 Bug Fix: Converting MN2 to MNX ignores the programmer-defined "Pad Name" found in "Prompt Options" screen * * *--------------------------------------------------------------------------------------------------- * +* 18/01/2022 Jimrnelson BUG REPORT v1.19.67 Converting MN2 to MNX ignores the programmer-defined "Pad Name" found in "Prompt Options" screen * 05/11/2021 LScheffler BUG REPORT v1.19.66 Double classes in VCX * 05/08/2021 siara-cc BUG REPORT v1.19.65 Incorrect version number shown. * 05/08/2021 siara-cc BUG REPORT v1.19.65 Tags missing on github. @@ -950,7 +953,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.67' + c_FB2PRG_Version_Real = '1.19.68' *-- c_Language = '' && EN, FR, ES, DE c_Language_In = '(auto)' @@ -28760,7 +28763,7 @@ Define Class CL_MENU_OPTION As CL_MENU_COL_BASE *!* Changd By: SF 22.4.2021 *!* *!* Changd By: SF
-*!* Old style determeines generic name from set name by testing as digit. It could be only digit. :( +*!* Old style determines generic name from set name by testing as digit. It could be only digit. :( *!* New style wraps it in ", so anything in " is set name *!* *!* @@ -28769,6 +28772,18 @@ Define Class CL_MENU_OPTION As CL_MENU_COL_BASE IF LEFT ( m.lcPadName, 1 ) = '"' THEN lcPadName = Substr( m.lcPadName, 2, Len( m.lcPadName ) - 2 ) loReg.Name = m.lcPadName + +*!* Changed By: SF 18.1.2022 +*!* +*!* Changed Bby SF
+*!* Issue 74, by Jimrnelson +*!* Does not work for padname without '"'. +*!* +*!* + ELSE &&LEFT ( m.lcPadName, 1 ) = '"' + loReg.Name = m.lcPadName +*!* /Changed Bby SF 18.1.2022 + ENDIF &&LEFT ( m.lcPadName, 1 ) = '"' *!* /Changd By: SF 22.4.2021