Merge pull request #75 from lscheffler/fork_mod

Mergrequest for Padname issue
This commit is contained in:
Doug Hennig
2022-01-28 13:59:09 -06:00
committed by GitHub
13 changed files with 36 additions and 11 deletions

View File

@@ -62,4 +62,4 @@ In special:
Thanks Thanks
---- ----
Last changed: _2021/08/30_ ![Picture](./pictures/vfpxpoweredby_alternative.gif) Last changed: _2021/08/30_ ![Picture](../docs/pictures/vfpxpoweredby_alternative.gif)

View File

@@ -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 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) For usage see [documentation](./docs/FoxBin2Prg.md)
---- ----
## Usage ## Contribution
Last changed: _2021/08/30_ ![Picture](./pictures/vfpxpoweredby_alternative.gif) See [contribution](./.github/CONTRIBUTING.md)
Last changed: _2022/01/18_ ![Picture](./docs/pictures/vfpxpoweredby_alternative.gif)

Binary file not shown.

View File

@@ -10,8 +10,8 @@ local;
lcappName = "FoxBin2Prg" lcappName = "FoxBin2Prg"
*Set following two numbers on version *Set following two numbers on version
ldDate = date(2021,12,07) ldDate = date(2022,01,18)
lcmajorVersion = "1.19.67" lcmajorVersion = "1.19.68"
*lnJulian = val(sys(11, m.ldDate)) - val(sys(11, {^2000-01-01})) *lnJulian = val(sys(11, m.ldDate)) - val(sys(11, {^2000-01-01}))
*lcJulian = padl(transform(lnJulian), 4, '0') *lcJulian = padl(transform(lnJulian), 4, '0')
@@ -39,6 +39,10 @@ Demo video using FoxBin2Prg with PlasticSCM: http://youtu.be/sE4wQ50Itqg
+++++++++++++++++++++++ Change History +++++++++++++++++++++++ +++++++++++++++++++++++ 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 2021-12-07 v1.19.67
- Bug Fix: Double classes in VCX (LScheffler) - Bug Fix: Double classes in VCX (LScheffler)

View File

@@ -1,5 +1,5 @@
appName = FoxBin2Prg appName = FoxBin2Prg
appID = 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* 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* excludeFolders = *.plastic*,*ThorUpdater*,*Documentacion*,*foxunit*,*foxunit_*,*pruebas varias*,*versiones*,*datos_test*

View File

@@ -27,6 +27,8 @@ _**Note:** you can click on the version number for downloading this version from
| Rel.Date | Developer | Version | Details | | 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) | | 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 | | | | | **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) | | 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/). This project is part of [VFPX](https://vfpx.github.io/).
---- ----
Last changed: _2021/08/30_ ![Picture](./pictures/vfpxpoweredby_alternative.gif) Last changed: _2022/01/17_ ![Picture](./pictures/vfpxpoweredby_alternative.gif)

View File

@@ -1,6 +1,6 @@
*################################################################################################################ *################################################################################################################
*FOXBIN2PRG.CFG Konfigurations-Optionen: (Wird die Option nicht aufgef<65>hrt, ist der Wert im Beispiel der Default) *FOXBIN2PRG.CFG Konfigurations-Optionen: (Wird die Option nicht aufgef<65>hrt, ist der Wert im Beispiel der Default)
*Version: v1.19.67 *Version: v1.19.68
***************************************************************************************************************** *****************************************************************************************************************
* Achtung, die Konfigurationsdateien werden vererbt. * Achtung, die Konfigurationsdateien werden vererbt.

View File

@@ -1,6 +1,6 @@
*################################################################################################################ *################################################################################################################
*-- Individual DBF configuration file (Syntax: <Tabellenname>.dbf.cfg im Verzeichnis der Tabelle) Defaults siehe FoxBin2prg.cfg *-- Individual DBF configuration file (Syntax: <Tabellenname>.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 *DBF_Conversion_Support: <1,2,4,8> && 0=Aus

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@@ -278,10 +278,13 @@
* This creates wrong version in generated config files too * This creates wrong version in generated config files too
* 07/12/2021 LScheffler v1.19.67 Bug Fix: Double classes in VCX * 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 * 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
* </HISTORIAL DE CAMBIOS Y NOTAS IMPORTANTES> * </HISTORIAL DE CAMBIOS Y NOTAS IMPORTANTES>
* *
*--------------------------------------------------------------------------------------------------- *---------------------------------------------------------------------------------------------------
* <TESTEO, REPORTE DE BUGS Y MEJORAS (AGRADECIMIENTOS)> * <TESTEO, REPORTE DE BUGS Y MEJORAS (AGRADECIMIENTOS)>
* 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/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 Incorrect version number shown.
* 05/08/2021 siara-cc BUG REPORT v1.19.65 Tags missing on github. * 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 Protected n_CFG_Actual, l_Main_CFG_Loaded, o_Configuration, l_CFG_CachedAccess
*-- *--
n_FB2PRG_Version = 1.19 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 = '' && EN, FR, ES, DE
c_Language_In = '(auto)' 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 22.4.2021
*!* <pdm> *!* <pdm>
*!* <change date="{^2021-04-22,15:56:00}">Changd By: SF<br /> *!* <change date="{^2021-04-22,15:56:00}">Changd By: SF<br />
*!* 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 *!* New style wraps it in ", so anything in " is set name
*!* </change> *!* </change>
*!* </pdm> *!* </pdm>
@@ -28769,6 +28772,18 @@ Define Class CL_MENU_OPTION As CL_MENU_COL_BASE
IF LEFT ( m.lcPadName, 1 ) = '"' THEN IF LEFT ( m.lcPadName, 1 ) = '"' THEN
lcPadName = Substr( m.lcPadName, 2, Len( m.lcPadName ) - 2 ) lcPadName = Substr( m.lcPadName, 2, Len( m.lcPadName ) - 2 )
loReg.Name = m.lcPadName loReg.Name = m.lcPadName
*!* Changed By: SF 18.1.2022
*!* <pdm>
*!* <change date="{^2022-01-18,19:34:00}">Changed Bby SF<br />
*!* <a href"https://github.com/fdbozzo/foxbin2prg/issues/74">Issue 74</a>, by Jimrnelson
*!* Does not work for padname without '"'.
*!* </change>
*!* </pdm>
ELSE &&LEFT ( m.lcPadName, 1 ) = '"'
loReg.Name = m.lcPadName
*!* /Changed Bby SF 18.1.2022
ENDIF &&LEFT ( m.lcPadName, 1 ) = '"' ENDIF &&LEFT ( m.lcPadName, 1 ) = '"'
*!* /Changd By: SF 22.4.2021 *!* /Changd By: SF 22.4.2021