diff --git a/Build/4DPop Git.4dbase.zip b/Build/4DPop Git.4dbase.zip
index 4a1f400..77d9c98 100644
Binary files a/Build/4DPop Git.4dbase.zip and b/Build/4DPop Git.4dbase.zip differ
diff --git a/Build/Components/4DPop Git.4dbase/4DPop Git.4DZ b/Build/Components/4DPop Git.4dbase/4DPop Git.4DZ
index 4a03745..4213d76 100755
Binary files a/Build/Components/4DPop Git.4dbase/4DPop Git.4DZ and b/Build/Components/4DPop Git.4dbase/4DPop Git.4DZ differ
diff --git a/Build/Components/4DPop Git.4dbase/Info.plist b/Build/Components/4DPop Git.4dbase/Info.plist
index 26f5288..b75deec 100644
--- a/Build/Components/4DPop Git.4dbase/Info.plist
+++ b/Build/Components/4DPop Git.4dbase/Info.plist
@@ -8,13 +8,13 @@
CFBundleShortVersionString
20R4
CFBundleLongVersionString
- 20R4 (161)
+ 20R4 (162)
CFBundleGetInfoString
20R4
CFBundleDisplayName
4DPop Git
CFBundleVersion
- 162
+ 163
NSHumanReadableCopyright
©vdl 2020-2023
diff --git a/Build/Components/4DPop Git.4dbase/Libraries/lib4d-arm64.dylib b/Build/Components/4DPop Git.4dbase/Libraries/lib4d-arm64.dylib
index c8d7cb1..3162afe 100644
Binary files a/Build/Components/4DPop Git.4dbase/Libraries/lib4d-arm64.dylib and b/Build/Components/4DPop Git.4dbase/Libraries/lib4d-arm64.dylib differ
diff --git a/Build/Components/4DPop Git.4dbase/Resources/Images/Menus/githubDesktop.png b/Build/Components/4DPop Git.4dbase/Resources/Images/Menus/githubDesktop.png
new file mode 100644
index 0000000..2d68f7d
Binary files /dev/null and b/Build/Components/4DPop Git.4dbase/Resources/Images/Menus/githubDesktop.png differ
diff --git a/Build/Components/4DPop Git.4dbase/Resources/Images/Menus/stash.png b/Build/Components/4DPop Git.4dbase/Resources/Images/Menus/stash.png
new file mode 100644
index 0000000..de939a9
Binary files /dev/null and b/Build/Components/4DPop Git.4dbase/Resources/Images/Menus/stash.png differ
diff --git a/Build/Components/4DPop Git.4dbase/Resources/Images/Menus/stash_dark.png b/Build/Components/4DPop Git.4dbase/Resources/Images/Menus/stash_dark.png
new file mode 100644
index 0000000..b422bef
Binary files /dev/null and b/Build/Components/4DPop Git.4dbase/Resources/Images/Menus/stash_dark.png differ
diff --git a/Build/Components/4DPop Git.4dbase/Resources/InfoPlist.strings b/Build/Components/4DPop Git.4dbase/Resources/InfoPlist.strings
index c0f6ba3..37d46ad 100755
Binary files a/Build/Components/4DPop Git.4dbase/Resources/InfoPlist.strings and b/Build/Components/4DPop Git.4dbase/Resources/InfoPlist.strings differ
diff --git a/Build/Components/4DPop Git.4dbase/Resources/en.lproj/gitlab.xlf b/Build/Components/4DPop Git.4dbase/Resources/en.lproj/gitlab.xlf
index 999fe7e..0fe9287 100755
--- a/Build/Components/4DPop Git.4dbase/Resources/en.lproj/gitlab.xlf
+++ b/Build/Components/4DPop Git.4dbase/Resources/en.lproj/gitlab.xlf
@@ -144,6 +144,10 @@ Do you want to download the installer?
Do you want to download the installer?
+
+ Name (optional)
+ Name (optional)
+
@@ -254,9 +258,13 @@ with 4D "{version}"
Refresh
Refresh
-
-
-
+
+ Save Snapshot
+ Save Snapshot
+
+
+ Open with {app}
+ Open with {app}
@@ -294,4 +302,6 @@ with 4D "{version}"
+
+
diff --git a/Build/Components/4DPop Git.4dbase/Resources/fr.lproj/gitlab.xlf b/Build/Components/4DPop Git.4dbase/Resources/fr.lproj/gitlab.xlf
index f5d14c3..6acabe6 100755
--- a/Build/Components/4DPop Git.4dbase/Resources/fr.lproj/gitlab.xlf
+++ b/Build/Components/4DPop Git.4dbase/Resources/fr.lproj/gitlab.xlf
@@ -144,6 +144,10 @@ Do you want to download the installer?
Voulez-vous télécharger l'installateur ?
+
+ Name (optional)
+ Nom (facultatif)
+
@@ -254,9 +258,13 @@ avec 4D "{version}"
Refresh
Actualiser
-
-
-
+
+ Save Snapshot
+ Enregistrer l'instantané
+
+
+ Open with {app}
+ Ouvrir avec {app}
@@ -293,4 +301,6 @@ avec 4D "{version}"
+
+
diff --git a/Info.plist b/Info.plist
index 26f5288..b75deec 100755
--- a/Info.plist
+++ b/Info.plist
@@ -8,13 +8,13 @@
CFBundleShortVersionString
20R4
CFBundleLongVersionString
- 20R4 (161)
+ 20R4 (162)
CFBundleGetInfoString
20R4
CFBundleDisplayName
4DPop Git
CFBundleVersion
- 162
+ 163
NSHumanReadableCopyright
©vdl 2020-2023
diff --git a/Project/Sources/Classes/_GIT_Controller.4dm b/Project/Sources/Classes/_GIT_Controller.4dm
index 4a3253c..7097c01 100644
--- a/Project/Sources/Classes/_GIT_Controller.4dm
+++ b/Project/Sources/Classes/_GIT_Controller.4dm
@@ -781,10 +781,10 @@ Function _openManager()
.line()\
.append(":xliff:viewOnGithub"; "github").icon("/RESOURCES/Images/Menus/gitHub.png").enable(This:C1470.Git.execute("config --get remote.origin.url"))
+ $menu.line()
+
If (Is macOS:C1572)
- $menu.line()
-
If (File:C1566("/usr/local/bin/fork").exists)
$menu.append(Replace string:C233(Get localized string:C991("openWith"); "{app}"; "Fork"); "fork").icon("/RESOURCES/Images/Menus/fork.png")
@@ -799,8 +799,17 @@ Function _openManager()
Else
- // TODO:On Windows
+ If (Folder:C1567(fk home folder:K87:24).file("AppData/Local/Fork/Fork.exe").exists)
+
+ $menu.append(Replace string:C233(Get localized string:C991("openWith"); "{app}"; "Fork"); "fork").icon("/RESOURCES/Images/Menus/fork.png")
+
+ End if
+ If (Folder:C1567(fk home folder:K87:24).file("AppData/Local/GitHubDesktop/GitHubDesktop.exe").exists)
+
+ $menu.append(Replace string:C233(Get localized string:C991("openWith"); "{app}"; "Github Desktop"); "githubDesktop").icon("/RESOURCES/Images/Menus/githubDesktop.png")
+
+ End if
End if
Case of
@@ -828,18 +837,36 @@ Function _openManager()
//———————————————————————————————————————
: ($menu.choice="fork")
- SET ENVIRONMENT VARIABLE:C812("_4D_OPTION_CURRENT_DIRECTORY"; Folder:C1567(Folder:C1567(fk database folder:K87:14).platformPath; fk platform path:K87:2).platformPath)
- LAUNCH EXTERNAL PROCESS:C811("/usr/local/bin/fork open")
+ SET ENVIRONMENT VARIABLE:C812("_4D_OPTION_CURRENT_DIRECTORY"; This:C1470.Git.cwd.platformPath)
+
+ If (Is macOS:C1572)
+
+ LAUNCH EXTERNAL PROCESS:C811("/usr/local/bin/fork open")
+
+ Else
+
+ LAUNCH EXTERNAL PROCESS:C811(Folder:C1567(fk home folder:K87:24).file("AppData/Local/Fork/Fork.exe").platformPath)
+
+ End if
//———————————————————————————————————————
: ($menu.choice="githubDesktop")
- LAUNCH EXTERNAL PROCESS:C811("/usr/local/bin/github \""+Folder:C1567(Folder:C1567(fk database folder:K87:14).platformPath; fk platform path:K87:2).path+"\"")
+ SET ENVIRONMENT VARIABLE:C812("_4D_OPTION_CURRENT_DIRECTORY"; This:C1470.Git.cwd.platformPath)
+
+ If (Is macOS:C1572)
+
+ LAUNCH EXTERNAL PROCESS:C811("/usr/local/bin/github \""+This:C1470.Git.cwd.path+"\"")
+
+ Else
+
+ LAUNCH EXTERNAL PROCESS:C811(Folder:C1567(fk home folder:K87:24).file("AppData/Local/GitHubDesktop/GitHubDesktop.exe").platformPath+" "+This:C1470.Git.cwd.platformPath)
+
+ End if
//———————————————————————————————————————
End case
-
// === === === === === === === === === === === === === === === === === === === === === === === === === ===
Function _stageUnstageManager($e : cs:C1710.evt)
@@ -1521,10 +1548,11 @@ Function CreateGithubRepository($token : Text)
//// Try creating the repository
//$GithubAPI.method:="POST"
//$GithubAPI.body:={\
- accept: "application/vnd.github+json"; \
- name: $GithubAPI.CommpliantRepositoryName(Form.project); \
- private: True\
- }
+ accept: "application/vnd.github+json"; \
+ name: $GithubAPI.CommpliantRepositoryName(Form.project); \
+ private: True\
+ }
+
//$request:=4D.HTTPRequest.new($GithubAPI.URL+"/user/repos"; $GithubAPI)
//$request.wait()
//If ($request.response.status#201)
diff --git a/Resources/InfoPlist.strings b/Resources/InfoPlist.strings
index c0f6ba3..37d46ad 100755
Binary files a/Resources/InfoPlist.strings and b/Resources/InfoPlist.strings differ