Skip to content

Commit

Permalink
enhanced UI
Browse files Browse the repository at this point in the history
  • Loading branch information
vdelachaux committed Oct 31, 2023
1 parent c9fab36 commit f1d35b8
Show file tree
Hide file tree
Showing 63 changed files with 323 additions and 121 deletions.
Binary file modified Build/4DPop Git.4dbase.zip
Binary file not shown.
Binary file modified Build/Components/4DPop Git.4dbase/4DPop Git.4DZ
Binary file not shown.
4 changes: 2 additions & 2 deletions Build/Components/4DPop Git.4dbase/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@
<key>CFBundleShortVersionString</key>
<string>20R4</string>
<key>CFBundleLongVersionString</key>
<string>20R4 (170)</string>
<string>20R4 (171)</string>
<key>CFBundleGetInfoString</key>
<string>20R4</string>
<key>CFBundleDisplayName</key>
<string>4DPop Git</string>
<key>CFBundleVersion</key>
<string>171</string>
<string>172</string>
<key>NSHumanReadableCopyright</key>
<string>©vdl 2020-2023</string>
</dict>
Expand Down
Binary file modified Build/Components/4DPop Git.4dbase/Libraries/lib4d-arm64.dylib
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Binary file modified Build/Components/4DPop Git.4dbase/Resources/InfoPlist.strings
Binary file not shown.
16 changes: 16 additions & 0 deletions Build/Components/4DPop Git.4dbase/Resources/en.lproj/gitlab.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,10 @@ Do you want to download the installer?</target>
<source>Name (optional)</source>
<target>Name (optional)</target>
</trans-unit>
<trans-unit id="TnqtftaBecYGx68P3zexgQ" resname="local">
<source>Local</source>
<target>Local</target>
</trans-unit>
</group>
<group resname="pattern">
<trans-unit id="RxY9OfmekBpp22bMfG8PUQ" resname="addPatternToGitignore">
Expand Down Expand Up @@ -293,6 +297,16 @@ with 4D "{version}"</target>
• To: {dest}</target>
</trans-unit>
</group>
<group resname="Common">
<trans-unit id="_QV+y3JxwqeVyIptkO6CTw" resname="today">
<source>Today</source>
<target>Today</target>
</trans-unit>
<trans-unit id="cv5Ce93eSnhanKPcvz7pOA" resname="yesterday">
<source>Yesterday</source>
<target>Yesterday</target>
</trans-unit>
</group>
</body>
</file>

Expand All @@ -304,4 +318,6 @@ with 4D "{version}"</target>





</xliff>
16 changes: 16 additions & 0 deletions Build/Components/4DPop Git.4dbase/Resources/fr.lproj/gitlab.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,10 @@ Voulez-vous télécharger l'installateur ?</target>
<source>Name (optional)</source>
<target>Nom (facultatif)</target>
</trans-unit>
<trans-unit id="TnqtftaBecYGx68P3zexgQ" resname="local">
<source>Local</source>
<target>Local</target>
</trans-unit>
</group>
<group resname="pattern">
<trans-unit id="RxY9OfmekBpp22bMfG8PUQ" resname="addPatternToGitignore">
Expand Down Expand Up @@ -292,6 +296,16 @@ avec 4D "{version}"</target>
• Ves : {dest}</target>
</trans-unit>
</group>
<group resname="Common">
<trans-unit id="_QV+y3JxwqeVyIptkO6CTw" resname="today">
<source>Today</source>
<target>Aujourd'hui</target>
</trans-unit>
<trans-unit id="cv5Ce93eSnhanKPcvz7pOA" resname="yesterday">
<source>Yesterday</source>
<target>Hier</target>
</trans-unit>
</group>
</body>
</file>

Expand All @@ -303,4 +317,6 @@ avec 4D "{version}"</target>





</xliff>
5 changes: 5 additions & 0 deletions Build/Components/4DPop Git.4dbase/Resources/onTerminate.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"commandLine": "/usr/local/Cellar/gh/2.33.0/bin/gh auth login -h github.com -p HTTPS -s repo",
"response": "",
"responseError": "\n! First copy your one-time code: F757-6638\nOpen this URL to continue in your web browser: https://github.com/login/device\nfailed to authenticate via web browser: The authorization request was denied. (access_denied)\n"
}
4 changes: 2 additions & 2 deletions Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@
<key>CFBundleShortVersionString</key>
<string>20R4</string>
<key>CFBundleLongVersionString</key>
<string>20R4 (170)</string>
<string>20R4 (171)</string>
<key>CFBundleGetInfoString</key>
<string>20R4</string>
<key>CFBundleDisplayName</key>
<string>4DPop Git</string>
<key>CFBundleVersion</key>
<string>171</string>
<string>172</string>
<key>NSHumanReadableCopyright</key>
<string>©vdl 2020-2023</string>
</dict>
Expand Down
3 changes: 2 additions & 1 deletion Project/Sources/Classes/Git.4dm
Original file line number Diff line number Diff line change
Expand Up @@ -742,7 +742,8 @@ Function branchPushNumber($branch : Text) : Integer

If (Length:C16($branch)>0)

This:C1470.execute("rev-list origin/"+$branch+"..HEAD --single-worktree")
// This.execute("rev-list origin/"+$branch+"..HEAD --first-parent --single-worktree")
This:C1470.execute("rev-list origin/"+$branch+".."+$branch+" --single-worktree")

Else

Expand Down
Loading

0 comments on commit f1d35b8

Please sign in to comment.