diff --git a/Source/BuildGoFish.PRG b/Source/BuildGoFish.PRG index 0a41d92..a74dbe4 100644 --- a/Source/BuildGoFish.PRG +++ b/Source/BuildGoFish.PRG @@ -17,7 +17,7 @@ Cd (lcSourceLoc) *== Most of these local variables will make their way into BuildGoFish.h lcVersion = '5.1' -lcBuild = '006' && <---- Set your desired version level of the tool here +lcBuild = '007' && <---- Set your desired version level of the tool here && This will be used on the GoFish form and will live on the && the _GoFish object that gets attached to _Screen at run time. diff --git a/Source/BuildGoFish.h b/Source/BuildGoFish.h index cea1780..ac925cc 100644 --- a/Source/BuildGoFish.h +++ b/Source/BuildGoFish.h @@ -1,10 +1,10 @@ #DEFINE GOFISH_APP_NAME 'GoFish5' #DEFINE GOFISH_APP_FILE 'GoFish5.app' - #DEFINE GOFISH_VERSION '5.1.006' - #DEFINE GOFISH_BUILDDATE '11. November 2022, ' - #DEFINE GOFISH_DBUILDDATE Date(2022,11, 11) + #DEFINE GOFISH_VERSION '5.1.007' + #DEFINE GOFISH_BUILDDATE '22. November 2022, ' + #DEFINE GOFISH_DBUILDDATE Date(2022,11, 22) #DEFINE GOFISH_DOWNLOAD_URL 'https://raw.githubusercontent.com/VFPX/GoFish/master/Source/Source.zip' - #DEFINE GOFISH_VERSION_STRING_FOR_VERSION_FILE 'GoFish5 - 5.1.006 - 11. November 2022, - 20221111' + #DEFINE GOFISH_VERSION_STRING_FOR_VERSION_FILE 'GoFish5 - 5.1.007 - 22. November 2022, - 20221122' #DEFINE THOR_TOOL_NAME 'Thor_Tool_GoFish5' #DEFINE VERSON_FILE_URL 'https://github.com/VFPX/GoFish/_GoFishVersionFile.txt' #DEFINE VERSION_LOCAL_FILE 'GoFishVersionFile.txt' diff --git a/Source/Forms/gf_collection_explorer.SCT b/Source/Forms/gf_collection_explorer.SCT index 3b97139..00f3c87 100644 Binary files a/Source/Forms/gf_collection_explorer.SCT and b/Source/Forms/gf_collection_explorer.SCT differ diff --git a/Source/Forms/gf_collection_explorer.scx b/Source/Forms/gf_collection_explorer.scx index 9fca28e..830f42a 100644 Binary files a/Source/Forms/gf_collection_explorer.scx and b/Source/Forms/gf_collection_explorer.scx differ diff --git a/Source/Forms/gofish_about.SCT b/Source/Forms/gofish_about.SCT index 8da5842..70362c2 100644 Binary files a/Source/Forms/gofish_about.SCT and b/Source/Forms/gofish_about.SCT differ diff --git a/Source/Forms/gofish_about.scx b/Source/Forms/gofish_about.scx index bac6cf6..7eb5b21 100644 Binary files a/Source/Forms/gofish_about.scx and b/Source/Forms/gofish_about.scx differ diff --git a/Source/Forms/gofish_advaccedreplacehelp.SCT b/Source/Forms/gofish_advaccedreplacehelp.SCT index 62a6d8d..be31411 100644 Binary files a/Source/Forms/gofish_advaccedreplacehelp.SCT and b/Source/Forms/gofish_advaccedreplacehelp.SCT differ diff --git a/Source/Forms/gofish_advaccedreplacehelp.scx b/Source/Forms/gofish_advaccedreplacehelp.scx index 9dab504..ba6a0d2 100644 Binary files a/Source/Forms/gofish_advaccedreplacehelp.scx and b/Source/Forms/gofish_advaccedreplacehelp.scx differ diff --git a/Source/Forms/gofish_advanced.SCT b/Source/Forms/gofish_advanced.SCT index 2c7389f..7c56353 100644 Binary files a/Source/Forms/gofish_advanced.SCT and b/Source/Forms/gofish_advanced.SCT differ diff --git a/Source/Forms/gofish_advanced.scx b/Source/Forms/gofish_advanced.scx index a9309c6..8ccb489 100644 Binary files a/Source/Forms/gofish_advanced.scx and b/Source/Forms/gofish_advanced.scx differ diff --git a/Source/Forms/gofish_extendsearch.SCT b/Source/Forms/gofish_extendsearch.SCT index 21b9faa..3b02b0c 100644 Binary files a/Source/Forms/gofish_extendsearch.SCT and b/Source/Forms/gofish_extendsearch.SCT differ diff --git a/Source/Forms/gofish_extendsearch.scx b/Source/Forms/gofish_extendsearch.scx index acbd807..d8df0d4 100644 Binary files a/Source/Forms/gofish_extendsearch.scx and b/Source/Forms/gofish_extendsearch.scx differ diff --git a/Source/Forms/gofish_filter.scx b/Source/Forms/gofish_filter.scx index 125225a..58723d3 100644 Binary files a/Source/Forms/gofish_filter.scx and b/Source/Forms/gofish_filter.scx differ diff --git a/Source/Forms/gofish_filterpf.SCT b/Source/Forms/gofish_filterpf.SCT index 1f8f25f..3e65d24 100644 Binary files a/Source/Forms/gofish_filterpf.SCT and b/Source/Forms/gofish_filterpf.SCT differ diff --git a/Source/Forms/gofish_filterpf.sc2 b/Source/Forms/gofish_filterpf.sc2 index 4b45461..eebe24c 100644 --- a/Source/Forms/gofish_filterpf.sc2 +++ b/Source/Forms/gofish_filterpf.sc2 @@ -1954,6 +1954,8 @@ DEFINE CLASS gf_filter AS gf_baseform OF "..\lib\gofishui.vcx" ENDPROC PROCEDURE loadformsettings + RETURN DODEFAULT() + Local loMy As 'My' Of 'My.vcx' Local lcSettingsFile, loSettings @@ -2031,6 +2033,8 @@ DEFINE CLASS gf_filter AS gf_baseform OF "..\lib\gofishui.vcx" ENDPROC PROCEDURE saveformsettings + Return DoDefault() + Local loMy As 'My' Of 'My.vcx' Local lcSettingsFile, loSettings @@ -2041,7 +2045,7 @@ DEFINE CLASS gf_filter AS gf_baseform OF "..\lib\gofishui.vcx" m.loSettings.Load(m.lcSettingsFile) With m.loSettings - *-- Form Size and Position ----------------------------- + *-- Form Size and Position ----------------------------- .Add('FormTop', This.Top) .Add('FormLeft', This.Left) .Add('FormWidth', This.Width) diff --git a/Source/Forms/gofish_filterpf.scx b/Source/Forms/gofish_filterpf.scx index d52f8e0..b90fcd2 100644 Binary files a/Source/Forms/gofish_filterpf.scx and b/Source/Forms/gofish_filterpf.scx differ diff --git a/Source/Forms/gofish_options.SCT b/Source/Forms/gofish_options.SCT index 57f3441..ade0791 100644 Binary files a/Source/Forms/gofish_options.SCT and b/Source/Forms/gofish_options.SCT differ diff --git a/Source/Forms/gofish_options.scx b/Source/Forms/gofish_options.scx index dd4f8bb..b201cc8 100644 Binary files a/Source/Forms/gofish_options.scx and b/Source/Forms/gofish_options.scx differ diff --git a/Source/Forms/gofish_results.scx b/Source/Forms/gofish_results.scx index f3d116e..074506c 100644 Binary files a/Source/Forms/gofish_results.scx and b/Source/Forms/gofish_results.scx differ diff --git a/Source/Forms/gofish_results_desktop.scx b/Source/Forms/gofish_results_desktop.scx index eee0343..201f1e9 100644 Binary files a/Source/Forms/gofish_results_desktop.scx and b/Source/Forms/gofish_results_desktop.scx differ diff --git a/Source/Forms/gofish_searchhistory.SCT b/Source/Forms/gofish_searchhistory.SCT index a8f7b21..21011fd 100644 Binary files a/Source/Forms/gofish_searchhistory.SCT and b/Source/Forms/gofish_searchhistory.SCT differ diff --git a/Source/Forms/gofish_searchhistory.scx b/Source/Forms/gofish_searchhistory.scx index 3123449..bf3fb31 100644 Binary files a/Source/Forms/gofish_searchhistory.scx and b/Source/Forms/gofish_searchhistory.scx differ diff --git a/Source/GoFish5.APP b/Source/GoFish5.APP index ccabb04..800d75b 100644 Binary files a/Source/GoFish5.APP and b/Source/GoFish5.APP differ diff --git a/Source/GoFish5.PJT b/Source/GoFish5.PJT index 00b70c4..2719821 100644 Binary files a/Source/GoFish5.PJT and b/Source/GoFish5.PJT differ diff --git a/Source/GoFish5.pjx b/Source/GoFish5.pjx index d7c2f0e..ede3128 100644 Binary files a/Source/GoFish5.pjx and b/Source/GoFish5.pjx differ diff --git a/Source/Lib/VFP/FFC/_base.vct b/Source/Lib/VFP/FFC/_base.vct index a85361c..68d9fdb 100644 Binary files a/Source/Lib/VFP/FFC/_base.vct and b/Source/Lib/VFP/FFC/_base.vct differ diff --git a/Source/Lib/VFP/FFC/_base.vcx b/Source/Lib/VFP/FFC/_base.vcx index a98afa4..d4d06e9 100644 Binary files a/Source/Lib/VFP/FFC/_base.vcx and b/Source/Lib/VFP/FFC/_base.vcx differ diff --git a/Source/Lib/VFP/FFC/_environ.vcx b/Source/Lib/VFP/FFC/_environ.vcx index 3091292..fa87bde 100644 Binary files a/Source/Lib/VFP/FFC/_environ.vcx and b/Source/Lib/VFP/FFC/_environ.vcx differ diff --git a/Source/Lib/VFP/FFC/_frxcursor.vct b/Source/Lib/VFP/FFC/_frxcursor.vct index 6650f7d..43c90f5 100644 Binary files a/Source/Lib/VFP/FFC/_frxcursor.vct and b/Source/Lib/VFP/FFC/_frxcursor.vct differ diff --git a/Source/Lib/VFP/FFC/_frxcursor.vcx b/Source/Lib/VFP/FFC/_frxcursor.vcx index 9daca67..188c690 100644 Binary files a/Source/Lib/VFP/FFC/_frxcursor.vcx and b/Source/Lib/VFP/FFC/_frxcursor.vcx differ diff --git a/Source/Lib/VFP/My/my.VCT b/Source/Lib/VFP/My/my.VCT index db38605..096977d 100644 Binary files a/Source/Lib/VFP/My/my.VCT and b/Source/Lib/VFP/My/my.VCT differ diff --git a/Source/Lib/VFP/My/my.vcx b/Source/Lib/VFP/My/my.vcx index 983387f..80fb25e 100644 Binary files a/Source/Lib/VFP/My/my.vcx and b/Source/Lib/VFP/My/my.vcx differ diff --git a/Source/Lib/gofishui.VCT b/Source/Lib/gofishui.VCT index 1b6ce1d..17074f4 100644 Binary files a/Source/Lib/gofishui.VCT and b/Source/Lib/gofishui.VCT differ diff --git a/Source/Lib/gofishui.vcx b/Source/Lib/gofishui.vcx index fa894cf..40ad90d 100644 Binary files a/Source/Lib/gofishui.vcx and b/Source/Lib/gofishui.vcx differ diff --git a/Source/Lib/gofishwebtools.vcx b/Source/Lib/gofishwebtools.vcx index e626f92..a6331fa 100644 Binary files a/Source/Lib/gofishwebtools.vcx and b/Source/Lib/gofishwebtools.vcx differ diff --git a/Source/Lib/sfsplitter.vct b/Source/Lib/sfsplitter.vct index 91b8621..59723d8 100644 Binary files a/Source/Lib/sfsplitter.vct and b/Source/Lib/sfsplitter.vct differ diff --git a/Source/Lib/sfsplitter.vcx b/Source/Lib/sfsplitter.vcx index 36e5f24..2eba828 100644 Binary files a/Source/Lib/sfsplitter.vcx and b/Source/Lib/sfsplitter.vcx differ diff --git a/Source/Source.zip b/Source/Source.zip index a1964bb..e1a35e1 100644 Binary files a/Source/Source.zip and b/Source/Source.zip differ diff --git a/Source/changelog_ver_5.txt b/Source/changelog_ver_5.txt index 8d9d34e..39a1999 100644 --- a/Source/changelog_ver_5.txt +++ b/Source/changelog_ver_5.txt @@ -1,6 +1,9 @@ GoFish Change Log -**Ver 5.1.005 ** Released 2022-11-11 +**Ver 5.1.007 ** Released 2022-11-22 +* Fixed: Problem with Filter form issue #36 + +**Ver 5.1.006 ** Released 2022-11-11 * Fixed: Problem with Collate and expression length issue #34 **Ver 5.1.005 ** Released 2022-11-09 diff --git a/_GoFishVersionFile.txt b/_GoFishVersionFile.txt index 3e872ff..adb1008 100644 --- a/_GoFishVersionFile.txt +++ b/_GoFishVersionFile.txt @@ -3,7 +3,10 @@ Lparameters toUpdateInfo Text to lcNote NoShow GoFish Change Log -**Ver 5.1.005 ** Released 2022-11-11 +**Ver 5.1.007 ** Released 2022-11-22 +* Fixed: Problem with Filter form issue #36 + +**Ver 5.1.006 ** Released 2022-11-11 * Fixed: Problem with Collate and expression length issue #34 **Ver 5.1.005 ** Released 2022-11-09 @@ -89,7 +92,7 @@ GoFish Change Log EndText -AddProperty(toUpdateInfo, 'AvailableVersion', 'GoFish5 - 5.1.006 - 11. November 2022, - 20221111') +AddProperty(toUpdateInfo, 'AvailableVersion', 'GoFish5 - 5.1.007 - 22. November 2022, - 20221122') AddProperty(toUpdateInfo, 'SourceFileUrl', 'https://raw.githubusercontent.com/VFPX/GoFish/master/Source/Source.zip') AddProperty(toUpdateInfo, 'LinkPrompt', 'GoFish Home Page') AddProperty(toUpdateInfo, 'Link', 'https://github.com/VFPX/GoFish') diff --git a/readme.md b/readme.md index 6ffbe2a..4a5e6e9 100644 --- a/readme.md +++ b/readme.md @@ -1,5 +1,5 @@ # GoFish 5.1 -_ver 5.1.006 released 2022-11-11_ +_ver 5.1.007 released 2022-11-22 ## GoFish is an advanced code search tool for fast searching and replacing of Visual FoxPro source code. @@ -9,6 +9,7 @@ _ver 5.1.006 released 2022-11-11_ ### What's new #### What's new in version 5.1: +* Fixed: Problem with Filter form issue #36 * Fixed: Problem with Collate and expression length issue #34 * Fixed: Highlighted match not visible in code view for SCX/VCX issue #27 * Fixed: Due to unlucky git settings, some text files wher line end with LF instead of CRLF