Merge Version 6.0.0

-GoFish-.fpw

@@ -0,0 +1,3 @@
+RESOURCE = 'FOXUSER_9.dbf'
+COMMAND  = DO GoFish.prg
+*TEDIT    = /N "C:\Program Files\IDM Computer Solutions\UEStudio\UEStudio.exe"

-GoFish.prg

@@ -0,0 +1,40 @@
+LOCAL;
+ lcProg AS CHARACTER,;
+ lcBase AS CHARACTER
+
+*Bestimme Pfad
+lcProg = SYS(16)
+lcBase = JUSTPATH(m.lcProg)
+
+DO WHILE !EMPTY(m.lcBase)
+ IF DIRECTORY(m.lcBase+'\Tools') THEN
+*gefunden
+  EXIT
+ ENDIF &&DIRECTORY(m.lcBase+'\Tools')
+
+ lcBase = JUSTPATH(m.lcBase)
+ENDDO &&WHILE !EMPTY(m.lcBase)
+
+DO CASE
+ CASE !EMPTY(m.lcBase)
+*done
+ CASE DIRECTORY('E:\SE\Tools')
+  lcBase = 'E:\SE'
+ CASE DIRECTORY('E:\Tools')
+  lcBase = 'E:'
+ CASE DIRECTORY(JUSTDRIVE(m.lcProg)+'\SE\Tools')
+  lcBase = JUSTDRIVE(m.lcProg)+'\SE'
+ CASE DIRECTORY(JUSTDRIVE(m.lcProg)+'\Tools')
+  lcBase = JUSTDRIVE(m.lcProg)
+ENDCASE
+
+*Men� nach Path laden (.mpr ist im Pfad)
+IF !EMPTY(m.lcBase) THEN
+ DO lcBase+'\TOOLS\Start_Project.prg' WITH;
+  lcProg,;
+  '',;
+  RGB(236,94,236),;
+  RGB(000,000,000),;
+  'Source\Images\Fish13.ico',;
+  ' - Go! Fish!'
+ENDIF &&!EMPTY(m.lcBase)

.github/CONTRIBUTING.md

@@ -6,29 +6,31 @@
 
 ## Fix a bug or add an enhancement
 - Fork the project: see this [guide](https://www.dataschool.io/how-to-contribute-on-github/) for setting up and using a fork.
-- If you have already forked the project: **Remember yourself to pull first.**
+  - If allready forked, pull the recent state, or get most recent version otherwise.
 - Make whatever changes are necessary.
-- Add a description of the changes to `Source\changelog_ver_5.txt`. This is:
-   - *Version number* and *Release date*
-   - Changes for the Version
-- Copy the added text *Changes for the Version* from `Source\changelog_ver_5.txt` to the *Release History section* of `readme.md` and change, at the top of the document, the
+- Add a description of the changes to **[docs\Changes.md](/docs/Changes.md)**. See previous changes.
+- on top of **[readme.md](/readme.md)**, change:
   - version number and
-  - date .
-- In `Source\BuildGoFish.prg`, change at top the 
-  - *lcVersion* and 
-  - *lcBuild* variables   
+  - date
+- Copy the changes of the recent (and only the recent) version to **Source\Changelog_Thor.txt**, available in the project.
+- If there is more documentation, alter appropriate files
+- In the footer of any file changed, alter date.
 
-- run `Source\BuildGoFish.prg` **in VFP 9 SP2** to
+- In **Source\BuildGoFish.prg**, available in the project, change at top the 
+  - `lcVersion` and 
+  - `lcBuild` variables   
+
+- run **Source\BuildGoFish.prg** to
   - update several files
   - build GoFish5.app,
    - and generate the text equivalents for all VFP binary files (SCX, VCX, DBF, etc.) using FoxBin2PRG.
    > **Note: use VFP 9 SP2 rather than VFP Advanced to run BuildGoFish.prg since GoFish5.app must be built in VFP rather than VFPA for compatibility for all users.**
 
 - **close the project**
-- In File Explorer, right-click `Source\BuildCloudZip.ps1` and choose *Run with PowerShell* to create Source.zip.
+- In File Explorer, right-click **Source\BuildCloudZip.ps1** and choose *Run with PowerShell* to create Source.zip.
 - Commit the changes.
 - Push to your fork.
 - Create a pull request; ensure the description clearly describes the problem and solution or the enhancement.
 
 ----
-Last changed: 2022-10-16
+Last changed: 2023-03-08

GoFish.prg

@@ -0,0 +1,40 @@
+LOCAL;
+ lcProg AS CHARACTER,;
+ lcBase AS CHARACTER
+
+*Bestimme Pfad
+lcProg = SYS(16)
+lcBase = JUSTPATH(m.lcProg)
+
+DO WHILE !EMPTY(m.lcBase)
+ IF DIRECTORY(m.lcBase+'\Tools') THEN
+*gefunden
+  EXIT
+ ENDIF &&DIRECTORY(m.lcBase+'\Tools')
+
+ lcBase = JUSTPATH(m.lcBase)
+ENDDO &&WHILE !EMPTY(m.lcBase)
+
+DO CASE
+ CASE !EMPTY(m.lcBase)
+*done
+ CASE DIRECTORY('E:\SE\Tools')
+  lcBase = 'E:\SE'
+ CASE DIRECTORY('E:\Tools')
+  lcBase = 'E:'
+ CASE DIRECTORY(JUSTDRIVE(m.lcProg)+'\SE\Tools')
+  lcBase = JUSTDRIVE(m.lcProg)+'\SE'
+ CASE DIRECTORY(JUSTDRIVE(m.lcProg)+'\Tools')
+  lcBase = JUSTDRIVE(m.lcProg)
+ENDCASE
+
+*Men� nach Path laden (.mpr ist im Pfad)
+IF !EMPTY(m.lcBase) THEN
+ DO lcBase+'\TOOLS\Start_Project.prg' WITH;
+  lcProg,;
+  '',;
+  RGB(255,183,255),;
+  RGB(000,000,000),;
+  'Source\Images\Fish13.ico',;
+  ' - Go! Fish!'
+ENDIF &&!EMPTY(m.lcBase)

Source/BuildGoFish.PRG

@@ -16,8 +16,8 @@ lcSourceLoc =  Addbs(Justpath(Sys(16))) && Change this to location of source fil
 Cd (lcSourceLoc)
 
 *== Most of these local variables will make their way into BuildGoFish.h
-lcVersion = '5.1'
-lcBuild = '011' && <---- Set your desired version level of the tool here
+lcVersion = '6.0'
+lcBuild = '000' && <---- 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.
 
@@ -75,7 +75,7 @@ TEXT to lcCloudVersionFileContents NoShow TextMerge PRETEXT 3
 	Lparameters toUpdateInfo
 
 		###Text to lcNote NoShow
-			<<FileToStr('Changelog_ver_5.txt')>>
+			<<FileToStr('Changelog_Thor.txt')>>
 		###EndText
 
 		AddProperty(toUpdateInfo, 'AvailableVersion', '<<lcVersionStringForVersionFile>>')

Source/BuildGoFish.h

@@ -1,10 +1,10 @@
 	#DEFINE GOFISH_APP_NAME 'GoFish5'
 	#DEFINE GOFISH_APP_FILE  'GoFish5.app'
-	#DEFINE GOFISH_VERSION '5.1.011'
-	#DEFINE GOFISH_BUILDDATE '23. Februar 2023, '
-	#DEFINE GOFISH_DBUILDDATE Date(2023,2, 23)
+	#DEFINE GOFISH_VERSION '6.0.000'
+	#DEFINE GOFISH_BUILDDATE '8. M�rz 2023, '
+	#DEFINE GOFISH_DBUILDDATE Date(2023,3, 8)
 	#DEFINE GOFISH_DOWNLOAD_URL 'https://raw.githubusercontent.com/VFPX/GoFish/master/Source/Source.zip'
-	#DEFINE GOFISH_VERSION_STRING_FOR_VERSION_FILE 'GoFish5 - 5.1.011 - 23. Februar 2023,  - 20230223'
+	#DEFINE GOFISH_VERSION_STRING_FOR_VERSION_FILE 'GoFish5 - 6.0.000 - 8. M�rz 2023,  - 20230308'
 	#DEFINE THOR_TOOL_NAME	'Thor_Tool_GoFish5'
 	#DEFINE VERSON_FILE_URL	'https://github.com/VFPX/GoFish/_GoFishVersionFile.txt'
 	#DEFINE VERSION_LOCAL_FILE 'GoFishVersionFile.txt'

Source/Changelog_Thor.txt

@@ -0,0 +1,16 @@
+GoFish Change Log
+
+## Ver 6.0.000  **Released 2023-03-08**
+For more details check https://github.com/VFPX/GoFish/docs/Changes.md
+- New: Mode to display history in tree
+- New: Modified structure to store history to speed up display of history in tree while keeeping common history table small.
+- New: Option to swap buttons in search history. Send OK / Cancel buttom left.
+- New: Option to show search history by active scope
+- New: Option to set scope to Active Project / Active Path as default
+- New: Additional parameters for active scope
+- New: Additional parameters to clear settings / storage
+- Improved: Alternative button layout for *Load History Form*
+- Improved: Load history faster
+- Improved: Storage of replace history
+- Improved: Display of replace history
+- Improved: Sort per filepath rather then filename

Source/Forms/gf_collection_explorer.dataenvironment.sc2

@@ -0,0 +1,17 @@
+*--------------------------------------------------------------------------------------------------------------------------------------------------------
+* (ES) AUTOGENERADO - ��ATENCI�N!! - ��NO PENSADO PARA EJECUTAR!! USAR SOLAMENTE PARA INTEGRAR CAMBIOS Y ALMACENAR CON HERRAMIENTAS SCM!!
+* (EN) AUTOGENERATED - ATTENTION!! - NOT INTENDED FOR EXECUTION!! USE ONLY FOR MERGING CHANGES AND STORING WITH SCM TOOLS!!
+*--------------------------------------------------------------------------------------------------------------------------------------------------------
+*< FOXBIN2PRG: Version="1.19" SourceFile="gf_collection_explorer.scx" /> (Solo para binarios VFP 9 / Only for VFP 9 binaries)
+*
+DEFINE CLASS dataenvironment AS dataenvironment 
+ 	*< CLASSDATA: Baseclass="dataenvironment" Timestamp="" Scale="" Uniqueid="" ClassIcon="1" />
+
+	DataSource = .NULL.
+	Height = 0
+	Left = 0
+	Name = "Dataenvironment"
+	Top = 0
+	Width = 0
+
+ENDDEFINE