RT Error on new Source #10

vdelachaux · Aug 23, 2021 · 5567c39 · 5567c39
1 parent 9bdfef1
commit 5567c39
Show file tree

Hide file tree

Showing 7 changed files with 55 additions and 97 deletions.
diff --git a/Build/Components/4DPop Git.4dbase/4DPop Git.4DZ b/Build/Components/4DPop Git.4dbase/4DPop Git.4DZ
diff --git a/Build/Components/4DPop Git.4dbase/Info.plist b/Build/Components/4DPop Git.4dbase/Info.plist
@@ -1,22 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-
-  <dict>
-    <key>CFBundleName</key>
-    <string>4DPop Git</string>
-    <key>CFBundleShortVersionString</key>
-    <string>19</string>
-    <key>CFBundleLongVersionString</key>
-    <string>19</string>
-    <key>CFBundleGetInfoString</key>
-    <string>4DPop Git</string>
-    <key>CFBundleDisplayName</key>
-    <string>4DPop Git</string>
-    <key>CFBundleVersion</key>
-    <string>269311</string>
-    <key>NSHumanReadableCopyright</key>
-    <string>© 2020</string>
-  </dict>
-
-</plist>
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?><!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"><plist version="1.0">  <dict>    <key>CFBundleName</key>    <string>4DPop Git</string>    <key>CFBundleShortVersionString</key>    <string>19</string>    <key>CFBundleLongVersionString</key>    <string>19</string>    <key>CFBundleGetInfoString</key>    <string>4DPop Git</string>    <key>CFBundleDisplayName</key>    <string>4DPop Git</string>    <key>CFBundleVersion</key>    <string>269312</string>    <key>NSHumanReadableCopyright</key>    <string>© 2020</string>  </dict></plist>

diff --git a/Build/Components/4DPop Git.4dbase/Libraries/lib4d-arm64.dylib b/Build/Components/4DPop Git.4dbase/Libraries/lib4d-arm64.dylib
diff --git a/Build/Components/4DPop Git.4dbase/Resources/InfoPlist.strings b/Build/Components/4DPop Git.4dbase/Resources/InfoPlist.strings
diff --git a/Info.plist b/Info.plist
@@ -1,22 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-
-  <dict>
-    <key>CFBundleName</key>
-    <string>4DPop Git</string>
-    <key>CFBundleShortVersionString</key>
-    <string>19</string>
-    <key>CFBundleLongVersionString</key>
-    <string>19</string>
-    <key>CFBundleGetInfoString</key>
-    <string>4DPop Git</string>
-    <key>CFBundleDisplayName</key>
-    <string>4DPop Git</string>
-    <key>CFBundleVersion</key>
-    <string>269311</string>
-    <key>NSHumanReadableCopyright</key>
-    <string>© 2020</string>
-  </dict>
-
-</plist>
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?><!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"><plist version="1.0">  <dict>    <key>CFBundleName</key>    <string>4DPop Git</string>    <key>CFBundleShortVersionString</key>    <string>19</string>    <key>CFBundleLongVersionString</key>    <string>19</string>    <key>CFBundleGetInfoString</key>    <string>4DPop Git</string>    <key>CFBundleDisplayName</key>    <string>4DPop Git</string>    <key>CFBundleVersion</key>    <string>269312</string>    <key>NSHumanReadableCopyright</key>    <string>© 2020</string>  </dict></plist>

diff --git a/Project/Sources/Methods/GIT.4dm b/Project/Sources/Methods/GIT.4dm
@@ -1,27 +1,27 @@
 //%attributes = {"invisible":true}
-  // ----------------------------------------------------
-  // Project method : GIT
-  // ID[DBC17A31DBA047DEBC0BEA1F2BADF817]
-  // Created 6-3-2020 by Vincent de Lachaux
-  // ----------------------------------------------------
-  // Description:
-  //
-  // ----------------------------------------------------
-  // Declarations
+// ----------------------------------------------------
+// Project method : GIT
+// ID[DBC17A31DBA047DEBC0BEA1F2BADF817]
+// Created 6-3-2020 by Vincent de Lachaux
+// ----------------------------------------------------
+// Description:
+//
+// ----------------------------------------------------
+// Declarations
 C_VARIANT:C1683($1)
 
 C_TEXT:C284($t_action)
-C_OBJECT:C1216($git;$o;$o_IN)
+C_OBJECT:C1216($git; $o; $o_IN)
 C_VARIANT:C1683($v)
 
 If (False:C215)
-	C_VARIANT:C1683(GIT ;$1)
+	C_VARIANT:C1683(GIT; $1)
 End if 
 
-  // ----------------------------------------------------
-  // Initialisations
+// ----------------------------------------------------
+// Initialisations
 
-  // <NO PARAMETERS REQUIRED>
+// <NO PARAMETERS REQUIRED>
 
 If (Value type:C1509($1)=Is object:K8:27)
 
@@ -36,71 +36,71 @@ End if
 
 $git:=Form:C1466.git
 
-  // ----------------------------------------------------
+// ----------------------------------------------------
 
 Case of 
 
-		  //______________________________________________________
+		//______________________________________________________
 	: ($t_action="switch")
 
-		$o:=Form:C1466.$.selector.getParameter("data";Null:C1517;Is object:K8:27)
+		$o:=Form:C1466.$.selector.getParameter("data"; Null:C1517; Is object:K8:27)
 
-		If (Not:C34($o.current))
+		If (Not:C34(Bool:C1537($o.current)))
 
 			$git.branch()
 
 		End if 
 
-		  //______________________________________________________
+		//______________________________________________________
 	: ($t_action="stage")
 
-		For each ($o;Form:C1466.selectedUnstaged)
+		For each ($o; Form:C1466.selectedUnstaged)
 
 			$git.add($o.path)
 
 		End for each 
 
-		  //______________________________________________________
+		//______________________________________________________
 	: ($t_action="stageAll")
 
 		$git.add("all")
 
-		  //______________________________________________________
+		//______________________________________________________
 	: ($t_action="unstage")
 
-		For each ($o;Form:C1466.selectedStaged)
+		For each ($o; Form:C1466.selectedStaged)
 
 			$git.unstage($o.path)
 
 		End for each 
 
-		  //______________________________________________________
+		//______________________________________________________
 	: ($t_action="discard")
 
-		CONFIRM:C162(Get localized string:C991("doYouWantToDiscardAllChangesInTheSelectedFiles");Get localized string:C991("discard"))
+		CONFIRM:C162(Get localized string:C991("doYouWantToDiscardAllChangesInTheSelectedFiles"); Get localized string:C991("discard"))
 
 		If (Bool:C1537(OK))
 
-			For each ($o;Form:C1466.selectedUnstaged)
+			For each ($o; Form:C1466.selectedUnstaged)
 
 				If ($o.status="??")
 
 					$v:=Form:C1466.ƒ.path($o.path)
 
 					Case of 
 
-							  //——————————————————————————————————
+							//——————————————————————————————————
 						: (Value type:C1509($v)=Is text:K8:3)  // Method
 
-							  // Warning: No update if 4D App don't be unactivated/activated
+							// Warning: No update if 4D App don't be unactivated/activated
 							$v:=File:C1566(Form:C1466.project.parent.parent.path+$o.path)
 
-							  //——————————————————————————————————
+							//——————————————————————————————————
 						: (Value type:C1509($v)=Is object:K8:27)  // File
 
-							  // <NOTHING MORE TO DO>
+							// <NOTHING MORE TO DO>
 
-							  //——————————————————————————————————
+							//——————————————————————————————————
 					End case 
 
 					If (Bool:C1537($v.exists))
@@ -124,43 +124,43 @@ Case of
 
 		End if 
 
-		  //______________________________________________________
+		//______________________________________________________
 	: ($t_action="commit")
 
-		$git.commit($o_IN.message;Form:C1466.amend)
+		$git.commit($o_IN.message; Form:C1466.amend)
 
-		  //______________________________________________________
+		//______________________________________________________
 	: ($t_action="fetch")
 
-		$o:=progress ("Fetching data").setIcon(Form:C1466.logo).setProgress(-1)
+		$o:=progress("Fetching data").setIcon(Form:C1466.logo).setProgress(-1)
 
 		If ($git.fetch())
 
-			GIT COMMIT LIST 
+			GIT COMMIT LIST
 
 		End if 
 
 		$o.close()
 
-		  //______________________________________________________
+		//______________________________________________________
 	: ($t_action="pull")
 
-		$o:=progress ("Pulling data").setIcon(Form:C1466.logo).setProgress(-1)
+		$o:=progress("Pulling data").setIcon(Form:C1466.logo).setProgress(-1)
 
 		If ($git.pull())
 
-			GIT COMMIT LIST 
+			GIT COMMIT LIST
 
 			RELOAD PROJECT:C1739
 
 		End if 
 
 		$o.close()
 
-		  //______________________________________________________
+		//______________________________________________________
 	: ($t_action="push")
 
-		$o:=progress ("Pushing data").setIcon(Form:C1466.logo).setProgress(-1)
+		$o:=progress("Pushing data").setIcon(Form:C1466.logo).setProgress(-1)
 
 		If (Not:C34($git.push()))
 
@@ -170,28 +170,28 @@ Case of
 
 		$o.close()
 
-		  //______________________________________________________
+		//______________________________________________________
 	Else 
 
-		  // A "Case of" statement should never omit "Else"
-		  //______________________________________________________
+		// A "Case of" statement should never omit "Else"
+		//______________________________________________________
 End case 
 
-  // Get status
+// Get status
 $git.status()
 
-Form:C1466.menu[0].label:=Choose:C955($git.changes.length>0;Get localized string:C991("changes")+" ("+String:C10($git.changes.length)+")";Get localized string:C991("changes"))
+Form:C1466.menu[0].label:=Choose:C955($git.changes.length>0; Get localized string:C991("changes")+" ("+String:C10($git.changes.length)+")"; Get localized string:C991("changes"))
 
-  // Touch
+// Touch
 Form:C1466.menu:=Form:C1466.menu
 
 Form:C1466.ƒ.updateUI()
 
-  // Update UI
+// Update UI
 Form:C1466.ƒ.refresh()
 
-  // ----------------------------------------------------
-  // Return
-  // <NONE>
-  // ----------------------------------------------------
-  // End
+// ----------------------------------------------------
+// Return
+// <NONE>
+// ----------------------------------------------------
+// End
diff --git a/Resources/InfoPlist.strings b/Resources/InfoPlist.strings