Adapt to new component architecture

Build/Components/4DPop.4dbase/Info.plist

@@ -6,15 +6,15 @@
     <key>NSHumanReadableCopyright</key>
     <string>©vdl 2007-2024</string>
     <key>CFBundleVersion</key>
-    <string>269</string>
+    <string>271</string>
     <key>CFBundleDisplayName</key>
     <string>4DPop</string>
     <key>CFBundleShortVersionString</key>
     <string>20R7</string>
     <key>CFBundleGetInfoString</key>
     <string>20R7</string>
     <key>CFBundleLongVersionString</key>
-    <string>20R7 (268)</string>
+    <string>20R7 (270)</string>
     <key>CFBundleName</key>
     <string>4DPop</string>
   </dict>

Build/Components/4DPop.4dbase/Resources/en.lproj/syntaxEN.json

@@ -495,6 +495,15 @@
 			],
 			"Summary": ""
 		},
+		"formName": {
+			"Syntax": "formName : Text"
+		},
+		"windowType": {
+			"Syntax": "windowType : Integer"
+		},
+		"motor": {
+			"Syntax": "motor : cs.pop.motor"
+		},
 		"properties": {
 			"Syntax": "properties : Object"
 		},
@@ -506,9 +515,6 @@
 		},
 		"database": {
 			"Syntax": "database : cs.pop.database"
-		},
-		"motor": {
-			"Syntax": "motor : cs.pop.motor"
 		}
 	},
 	"motor": {
@@ -862,6 +868,18 @@
 				]
 			],
 			"Summary": ""
+		},
+		"bottom": {
+			"Syntax": "bottom : Integer"
+		},
+		"right": {
+			"Syntax": "right : Integer"
+		},
+		"top": {
+			"Syntax": "top : Integer"
+		},
+		"left": {
+			"Syntax": "left : Integer"
 		}
 	},
 	"_widget": {
@@ -890,6 +908,69 @@
 				]
 			],
 			"Summary": ""
+		},
+		"width": {
+			"Syntax": "width : Integer"
+		},
+		"handler": {
+			"Syntax": "handler : 4D.Function"
+		},
+		"tools": {
+			"Syntax": "tools : Collection"
+		},
+		"popup": {
+			"Syntax": "popup : Boolean"
+		},
+		"plist": {
+			"Syntax": "plist : 4D.File"
+		},
+		"order": {
+			"Syntax": "order : Integer"
+		},
+		"help": {
+			"Syntax": "help : 4D.File"
+		},
+		"infos": {
+			"Syntax": "infos : Text"
+		},
+		"helptip": {
+			"Syntax": "helptip : Text"
+		},
+		"index": {
+			"Syntax": "index : Integer"
+		},
+		"name": {
+			"Syntax": "name : Text"
+		},
+		"visible": {
+			"Syntax": "visible : Boolean"
+		},
+		"default": {
+			"Syntax": "default : Text"
+		},
+		"form": {
+			"Syntax": "form : Text"
+		},
+		"picture": {
+			"Syntax": "picture : Picture"
+		},
+		"manifest": {
+			"Syntax": "manifest : Object"
+		},
+		"file": {
+			"Syntax": "file : Object"
+		},
+		"ondrop": {
+			"Syntax": "ondrop : Text"
+		},
+		"icon": {
+			"Syntax": "icon : Picture"
+		},
+		"copyright": {
+			"Syntax": "copyright : Text"
+		},
+		"tool": {
+			"Syntax": "tool : Text"
 		}
 	},
 	"menuBar": {
@@ -942,6 +1023,9 @@
 			],
 			"Summary": ""
 		},
+		"parameters": {
+			"Syntax": "parameters : Collection"
+		},
 		"_inheritedFrom_": "menu"
 	},
 	"svg": {
@@ -3793,6 +3877,12 @@
 			],
 			"Summary": ""
 		},
+		"latest": {
+			"Syntax": "latest : Text"
+		},
+		"graphic": {
+			"Syntax": "graphic : Picture"
+		},
 		"store": {
 			"Syntax": "store : Collection"
 		},
@@ -5136,6 +5226,24 @@
 				]
 			],
 			"Summary": ""
+		},
+		"errors": {
+			"Syntax": "errors : Collection"
+		},
+		"autoClose": {
+			"Syntax": "autoClose : Boolean"
+		},
+		"xml": {
+			"Syntax": "xml : Text"
+		},
+		"file": {
+			"Syntax": "file : 4D.File"
+		},
+		"success": {
+			"Syntax": "success : Boolean"
+		},
+		"root": {
+			"Syntax": "root : Text"
 		}
 	},
 	"env": {

Info.plist

@@ -6,15 +6,15 @@
     <key>NSHumanReadableCopyright</key>
     <string>©vdl 2007-2024</string>
     <key>CFBundleVersion</key>
-    <string>269</string>
+    <string>271</string>
     <key>CFBundleDisplayName</key>
     <string>4DPop</string>
     <key>CFBundleShortVersionString</key>
     <string>20R7</string>
     <key>CFBundleGetInfoString</key>
     <string>20R7</string>
     <key>CFBundleLongVersionString</key>
-    <string>20R7 (268)</string>
+    <string>20R7 (270)</string>
     <key>CFBundleName</key>
     <string>4DPop</string>
   </dict>

Project/Sources/Classes/_4DPop.4dm

@@ -7,6 +7,12 @@ property preferences : cs:C1710.Preferences
 property env : cs:C1710.env
 property properties : Object
 
+property formName : Text
+property windowType : Integer
+
+property _setPosition : Text
+property _modifiedOrder : Boolean
+
 // Mark:-
 Class constructor
 
@@ -86,6 +92,14 @@ Function load() : Object
 
 			$component:=$component.parent.parent
 
+		Else 
+
+			//MARK:New component architecture
+			If ($component.folder("Contents").exists)
+
+				$component:=$component.folder("Contents")
+
+			End if 
 		End if 
 
 		// Get the definition file
@@ -563,13 +577,13 @@ Function doSettings()
 
 		End if 
 
-		If (This:C1470.$setPosition#Null:C1517)
+		If (This:C1470._setPosition#Null:C1517)
 
-			This:C1470.position(This:C1470.$setPosition)
+			This:C1470.position(This:C1470._setPosition)
 
 		End if 
 
-		If (Bool:C1537(This:C1470.$modifiedOrder))
+		If (Bool:C1537(This:C1470._modifiedOrder))
 
 			$order:={}
 

Project/Sources/Classes/_classCore.4dm

@@ -94,9 +94,11 @@ Function get singleton() : Boolean  // Return True if it's a refernce to the cla
 	return This:C1470.__CLASS__#Null:C1517
 
 	// <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <==
-Function get matrix() : Boolean  // Return True if it's the fisrt inastance of the class
+Function get matrix() : Boolean  // Return True if it's the fisrt instance of the class
 
+	//%W-550.26
 	return This:C1470.__LockerID=Null:C1517
+	//%W+550.26
 
 	// Mark:-
 	// === === === === === === === === === === === === === === === === === === === === === === === === === ===
@@ -230,7 +232,7 @@ Function _pushError($message : Text)
 
 	var $current; $o : Object
 	var $c : Collection
-	$c:=Get call chain:C1662
+	$c:=Call chain:C1662
 
 	For each ($o; $c)
 

Project/Sources/Classes/_widget.4dm

@@ -1,3 +1,14 @@
+property file; manifest : Object
+property name; default; ondrop; helptip; tool; form; infos; copyright : Text
+property help; plist : 4D:C1709.File
+property icon; picture : Picture
+property popup; visible : Boolean
+property handler : 4D:C1709.Function
+property tools : Collection
+property order : Integer
+property index : Integer
+property width : Integer
+
 Class constructor($component : Object; $manifest : Object)
 
 	var $item; $key : Text
@@ -22,9 +33,7 @@ Class constructor($component : Object; $manifest : Object)
 	This:C1470.handler:=Null:C1517
 	This:C1470.tools:=[]
 	This:C1470.order:=0
-	This:C1470.tool:=""
 	This:C1470.index:=0
-	This:C1470.form:=Null:C1517
 	This:C1470.width:=70
 
 	If ($manifest.handler#Null:C1517)

Project/Sources/Classes/coord.4dm

@@ -1,3 +1,5 @@
+property left; top; right; bottom : Integer
+
 Class constructor($left : Integer; $top : Integer; $right : Integer; $bottom : Integer)
 
 	This:C1470.left:=$left

Project/Sources/Classes/menuBar.4dm

@@ -1,5 +1,7 @@
 Class extends menu
 
+property parameters : Collection
+
 Class constructor($menus : Collection)
 
 	var $parameter : Text

Project/Sources/Classes/svg.4dm

@@ -1,13 +1,15 @@
+Class extends xml
+
 property store : Collection
 property _containers; _shapes; _descriptive; _notContainer; _aspectRatioValues; _textRenderingValue; _reservedNames : Collection
-
-Class extends xml
+property graphic : Picture
+property latest; _current : Text
 
 Class constructor($content)
 
 	Super:C1705($content)
 
-	This:C1470.latest:=Null:C1517
+	This:C1470.latest:=""
 	This:C1470.graphic:=Null:C1517
 	This:C1470.store:=New collection:C1472
 
@@ -4141,7 +4143,7 @@ Function _reset
 
 	Super:C1706._reset()
 
-	This:C1470.latest:=Null:C1517
+	This:C1470.latest:=""
 	This:C1470.graphic:=Null:C1517
 	This:C1470.store:=New collection:C1472
 
@@ -4181,7 +4183,7 @@ Function _getContainer($param) : Text
 
 	End if 
 
-	$name:=Split string:C1554(Get call chain:C1662[1].name; ".")[1]
+	$name:=Split string:C1554(Call chain:C1662[1].name; ".")[1]
 
 	If (This:C1470._notContainer.includes($name))
 
@@ -4230,7 +4232,7 @@ Function _getTarget($param) : Text
 			//_______________________________
 		: ($param="parent")
 
-			If (This:C1470.latest=Null:C1517)
+			If (This:C1470.latest="")
 
 				return This:C1470.root
 
@@ -4261,7 +4263,7 @@ Function _getTarget($param) : Text
 			//_______________________________
 	End case 
 
-	return This:C1470.latest#Null:C1517 ? This:C1470.latest : This:C1470.root
+	return This:C1470.latest#"" ? This:C1470.latest : This:C1470.root
 
 	//*** *** *** *** *** *** *** *** *** *** *** *** *** *** ***
 	// Looks for element "defs", create if not exists