diff --git a/UI/Project/Sources/Classes/coord.4dm b/UI/Project/Sources/Classes/coord.4dm index 5ddcdc8..3049d08 100644 --- a/UI/Project/Sources/Classes/coord.4dm +++ b/UI/Project/Sources/Classes/coord.4dm @@ -3,7 +3,7 @@ property left; top; right; bottom : Integer Class constructor($left; $top : Integer; $right : Integer; $bottom : Integer) - This:C1470.name:=Null:C1517 + This:C1470.name:="" Case of @@ -15,7 +15,7 @@ Class constructor($left; $top : Integer; $right : Integer; $bottom : Integer) If ($o#Null:C1517) // Widget - This:C1470.name:=$left.name + This:C1470.name:=String:C10($left.name) Else @@ -85,12 +85,12 @@ Function get screenCoordinates() : Object // <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== Function get width() : Integer - return This:C1470.right-This:C1470.left + return Try(This:C1470.right-This:C1470.left) // <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== Function get height() : Integer - return This:C1470.bottom-This:C1470.top + return Try(This:C1470.bottom-This:C1470.top) // <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== Function get dimensions() : Object @@ -104,6 +104,6 @@ Function get dimensions() : Object Function apply($name : Text) $name:=$name || This:C1470.name - ASSERT:C1129($name#Null:C1517; "Missing target name!") + ASSERT:C1129(Length:C16($name)>0; "Missing target name!") OBJECT SET COORDINATES:C1248(*; $name; This:C1470.left; This:C1470.top; This:C1470.right; This:C1470.bottom) \ No newline at end of file diff --git a/UI/Project/Sources/Classes/form.4dm b/UI/Project/Sources/Classes/form.4dm index d9f7218..2ee8bfc 100644 --- a/UI/Project/Sources/Classes/form.4dm +++ b/UI/Project/Sources/Classes/form.4dm @@ -4,7 +4,7 @@ property isSubform; isMatrix; toBeInitialized : Boolean property pages : Object property entryOrder : Collection -property _callback; _worker; _darkExtension : Text +property _callback; _darkExtension : Text property _definition; _cursorsHash : Object property _instantiableWidgets; _mapEvents : Collection @@ -26,7 +26,6 @@ Class constructor($param; $form : Object) This:C1470.isSubform:=False:C215 This:C1470.toBeInitialized:=True:C214 - This:C1470._worker:=Null:C1517 This:C1470._callback:=Formula:C1597(formCallBack).source This:C1470._darkExtension:="_dark" This:C1470.entryOrder:=[] @@ -542,7 +541,7 @@ Function callWorker($method; ... : Variant) Else - $code:="CALL WORKER:C1389(\""+This:C1470._worker+"\"; \""+$method+"\"" + $code:="CALL WORKER:C1389(\""+String:C10(This:C1470._worker)+"\"; \""+$method+"\"" If (Value type:C1509($2)=Is collection:K8:32) @@ -808,7 +807,7 @@ Function callMe($method : Text; ... : Variant) // === === === === === === === === === === === === === === === === === === === === === === === === === === /// Executes a project method in the context of a subform (without returned value) -Function callChild($subform; $method : Text; ... : Variant) +Function callChild($subform; $method : Variant; ... : Variant) // .executeInSubform ( subform : Object | Text ; method : Text ) // .executeInSubform ( subform : Object | Text ; method : Text ; param : Collection ) diff --git a/UI/Project/Sources/Classes/menu.4dm b/UI/Project/Sources/Classes/menu.4dm index 1063ade..ee833d2 100644 --- a/UI/Project/Sources/Classes/menu.4dm +++ b/UI/Project/Sources/Classes/menu.4dm @@ -9,7 +9,7 @@ Class constructor($data) This:C1470.__CLASS__:=OB Class:C1730(This:C1470) - This:C1470.ref:=Null:C1517 + This:C1470.ref:="" This:C1470.autoRelease:=True:C214 This:C1470.released:=False:C215 This:C1470.localize:=True:C214 @@ -1146,7 +1146,7 @@ Function _cleanup() // === === === === === === === === === === === === === === === === === === === === === === === === === === Function _isMenu() : Boolean - If (Asserted:C1132(This:C1470.ref#Null:C1517; Current method name:C684+": The menu reference is null")) + If (Asserted:C1132(Length:C16(This:C1470.ref)>0; Current method name:C684+": The menu reference is null")) return True:C214 @@ -1170,6 +1170,11 @@ Function _proxy($proxy : Text) : Text return "path:/RESOURCES/"+Delete string:C232($proxy; 1; 1) + //______________________________________________________ + : (Position:C15("ยง"; $proxy)=1) // Shortcut for current form folder + + return "path:/FORM/"+Delete string:C232($proxy; 1; 1) + //______________________________________________________ : ($proxy="|@") diff --git a/UI/Resources/en.lproj/syntaxEN.json b/UI/Resources/en.lproj/syntaxEN.json index 45bc2f9..d51c79e 100644 --- a/UI/Resources/en.lproj/syntaxEN.json +++ b/UI/Resources/en.lproj/syntaxEN.json @@ -2432,6 +2432,11 @@ ], "Summary": "" }, + "resetsAbout()": { + "Syntax": "**.resetsAbout**()", + "Params": [], + "Summary": "" + }, "set()": { "Syntax": "**.set**() : cs.ui.menuBar", "Params": [ @@ -5773,7 +5778,7 @@ "Summary": "" }, "callChild()": { - "Syntax": "**.callChild**( *subform* : Variant; *method* : Text; *...* : Variant )", + "Syntax": "**.callChild**( *subform* : Variant; *method* : Variant; *...* : Variant )", "Params": [ [ "subform", @@ -5782,7 +5787,7 @@ ], [ "method", - "Text", + "Variant", "->" ], [