diff --git a/Build/4DPop Git.4dbase.zip b/Build/4DPop Git.4dbase.zip index d5d885b..3eb6e0d 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 f36c5ca..a91e8de 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 807cb1c..d686d3e 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 (168) + 20R4 (170) CFBundleGetInfoString 20R4 CFBundleDisplayName 4DPop Git CFBundleVersion - 169 + 171 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 a92b2bb..fb2f543 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/InfoPlist.strings b/Build/Components/4DPop Git.4dbase/Resources/InfoPlist.strings index 9eaa284..8adfdb0 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/Info.plist b/Info.plist index 807cb1c..d686d3e 100755 --- a/Info.plist +++ b/Info.plist @@ -8,13 +8,13 @@ CFBundleShortVersionString 20R4 CFBundleLongVersionString - 20R4 (168) + 20R4 (170) CFBundleGetInfoString 20R4 CFBundleDisplayName 4DPop Git CFBundleVersion - 169 + 171 NSHumanReadableCopyright ©vdl 2020-2023 diff --git a/Project/Sources/Classes/_GIT_Controller.4dm b/Project/Sources/Classes/_GIT_Controller.4dm index 1926b96..338c95f 100644 --- a/Project/Sources/Classes/_GIT_Controller.4dm +++ b/Project/Sources/Classes/_GIT_Controller.4dm @@ -1641,17 +1641,19 @@ Function updateCommitList() $c:=Split string:C1554($line; "|") + //ASSERT($c[0]#"wip on labelTags") + + CLEAR VARIABLE:C89($style) + + $tags:=[Null:C1517; Null:C1517; Null:C1517] + $i+=1 If ($i<=$notPushed) - - $c[0]:="↑ "+$c[0] - + //$c[0]:="↑ "+$c[0] + $tags[0]:=This:C1470.getLabelTag("title"; "•") End if - CLEAR VARIABLE:C89($style) - - $tags:=[Null:C1517; Null:C1517; Null:C1517] $metas:=Split string:C1554($c[9]; ","; sk ignore empty strings:K86:1+sk trim spaces:K86:2) @@ -1675,8 +1677,7 @@ Function updateCommitList() Else - // Not synchronized - $tags[0]:=This:C1470.getLabelTag("origin") + //$tags[0]:=This.getLabelTag("title"; "•") End if @@ -1696,7 +1697,7 @@ Function updateCommitList() $commit._current:=True:C214 - If ($metas.includes("HEAD -> @")) + If ($metas.includes("HEAD -> @")) | ($tags[0]#Null:C1517) continue @@ -1715,7 +1716,8 @@ Function updateCommitList() End if - $tags[0]:=This:C1470.getLabelTag("origin synchronized") +/*$tags[0]:=This.getLabelTag("origin synchronized")*/ + $tags[0]:=This:C1470.getLabelTag("origin"; Replace string:C233($tag; "origin/"; "")) //______________________________________________________ Else // Branch @@ -1840,8 +1842,8 @@ Function getLabelTag($what : Text; $text : Text; $style : Object) : Picture //______________________________________________________ : ($what="origin") - $text:="origin/ "+$text - $svg.rect($svg.getTextWidth($text)*1.1; 20).radius(4).stroke("green").fill("palegreen").position(0.5; 0.5).opacity(0.5) + $text:="origin/"+$text + $svg.rect($svg.getTextWidth($text)+28; 20).radius(4).stroke("green").fill("palegreen").position(0.5; 0.5).opacity(0.5) READ PICTURE FILE:C678(Folder:C1567(fk resources folder:K87:11).file("Images/Menus/gitHub.png").platformPath; $icon) $svg.image($icon).position(2.5; 2.5) $svg.line(21; 0; 21; 20).stroke("green") diff --git a/Resources/InfoPlist.strings b/Resources/InfoPlist.strings index 9eaa284..8adfdb0 100755 Binary files a/Resources/InfoPlist.strings and b/Resources/InfoPlist.strings differ