diff --git a/Build/4DPop-AppMaker.dmg b/Build/4DPop-AppMaker.dmg
index 99c5231..8508c1e 100644
Binary files a/Build/4DPop-AppMaker.dmg and b/Build/4DPop-AppMaker.dmg differ
diff --git a/Build/4DPop-AppMaker.zip b/Build/4DPop-AppMaker.zip
index 180cd78..ae10a41 100644
Binary files a/Build/4DPop-AppMaker.zip and b/Build/4DPop-AppMaker.zip differ
diff --git a/Build/Components/4DPop AppMaker.4dbase/4DPop AppMaker.4DZ b/Build/Components/4DPop AppMaker.4dbase/4DPop AppMaker.4DZ
index fbf0677..78cf8f4 100644
Binary files a/Build/Components/4DPop AppMaker.4dbase/4DPop AppMaker.4DZ and b/Build/Components/4DPop AppMaker.4dbase/4DPop AppMaker.4DZ differ
diff --git a/Build/Components/4DPop AppMaker.4dbase/Info.plist b/Build/Components/4DPop AppMaker.4dbase/Info.plist
index fb96ebc..9382706 100755
--- a/Build/Components/4DPop AppMaker.4dbase/Info.plist
+++ b/Build/Components/4DPop AppMaker.4dbase/Info.plist
@@ -6,7 +6,7 @@
NSHumanReadableCopyright
©vdl 2009-2024
CFBundleVersion
- 590
+ 591
CFBundleDisplayName
4DPop AppMaker
CFBundleShortVersionString
@@ -14,7 +14,7 @@
CFBundleGetInfoString
20R6
CFBundleLongVersionString
- 20R6 (589)
+ 20R6 (590)
CFBundleName
4DPop AppMaker
diff --git a/Build/Components/4DPop AppMaker.4dbase/Libraries/lib4d-arm64.dylib b/Build/Components/4DPop AppMaker.4dbase/Libraries/lib4d-arm64.dylib
index 011648c..b94216c 100755
Binary files a/Build/Components/4DPop AppMaker.4dbase/Libraries/lib4d-arm64.dylib and b/Build/Components/4DPop AppMaker.4dbase/Libraries/lib4d-arm64.dylib differ
diff --git a/Build/Components/4DPop AppMaker.4dbase/Resources/InfoPlist.strings b/Build/Components/4DPop AppMaker.4dbase/Resources/InfoPlist.strings
index 0830763..4198940 100755
Binary files a/Build/Components/4DPop AppMaker.4dbase/Resources/InfoPlist.strings and b/Build/Components/4DPop AppMaker.4dbase/Resources/InfoPlist.strings differ
diff --git a/Info.plist b/Info.plist
index fb96ebc..9382706 100755
--- a/Info.plist
+++ b/Info.plist
@@ -6,7 +6,7 @@
NSHumanReadableCopyright
©vdl 2009-2024
CFBundleVersion
- 590
+ 591
CFBundleDisplayName
4DPop AppMaker
CFBundleShortVersionString
@@ -14,7 +14,7 @@
CFBundleGetInfoString
20R6
CFBundleLongVersionString
- 20R6 (589)
+ 20R6 (590)
CFBundleName
4DPop AppMaker
diff --git a/Project/Sources/Forms/Barber/ObjectMethods/Button.4dm b/Project/Sources/Forms/Barber/ObjectMethods/Button.4dm
new file mode 100644
index 0000000..019b846
--- /dev/null
+++ b/Project/Sources/Forms/Barber/ObjectMethods/Button.4dm
@@ -0,0 +1 @@
+DRAG WINDOW:C452
\ No newline at end of file
diff --git a/Project/Sources/Forms/Barber/form.4DForm b/Project/Sources/Forms/Barber/form.4DForm
index 9534cf2..5ee3e86 100755
--- a/Project/Sources/Forms/Barber/form.4DForm
+++ b/Project/Sources/Forms/Barber/form.4DForm
@@ -10,7 +10,6 @@
"markerFooter": 120,
"events": [
"onLoad",
- "onCloseBox",
"onTimer"
],
"method": "method.4dm",
@@ -99,6 +98,19 @@
"fontFamily": "Lucida Grande",
"fontSize": 13,
"visibility": "hidden"
+ },
+ "Button": {
+ "type": "button",
+ "text": "Button",
+ "top": 0,
+ "left": 0,
+ "width": 400,
+ "height": 120,
+ "events": [
+ "onClick"
+ ],
+ "display": false,
+ "method": "ObjectMethods/Button.4dm"
}
}
}
@@ -107,7 +119,7 @@
"version": "1",
"kind": "form"
},
- "geometryStamp": 16,
+ "geometryStamp": 22,
"editor": {
"activeView": "View 1",
"defaultView": "View 1",
diff --git a/Project/Sources/Forms/Barber/method.4dm b/Project/Sources/Forms/Barber/method.4dm
index 6c8d90a..5548302 100755
--- a/Project/Sources/Forms/Barber/method.4dm
+++ b/Project/Sources/Forms/Barber/method.4dm
@@ -56,18 +56,13 @@ Case of
End use
//______________________________________________________
- : (Form event code:C388=On Close Box:K2:21)
-
- If (Macintosh option down:C545 | Windows Alt down:C563) // Force close
-
- SET TIMER:C645(0)
- CANCEL:C270
-
- Else
-
- REJECT:C38
-
- End if
+ //: (Form event code=On Close Box)
+ //If (Macintosh option down | Windows Alt down) // Force close
+ //SET TIMER(0)
+ //CANCEL
+ //Else
+ //REJECT
+ //End if
//______________________________________________________
End case
\ No newline at end of file
diff --git a/Project/Sources/Methods/_barber.4dm b/Project/Sources/Methods/_barber.4dm
index 36d23a4..88af788 100644
--- a/Project/Sources/Methods/_barber.4dm
+++ b/Project/Sources/Methods/_barber.4dm
@@ -1,5 +1,5 @@
//%attributes = {"preemptive":"incapable"}
var $winRef : Integer
-$winRef:=Open form window:C675("Barber"; Controller form window:K39:17+Form has no menu bar:K39:18; Horizontally centered:K39:1; At the top:K39:5)
-DIALOG:C40("Barber")
\ No newline at end of file
+$winRef:=Open form window:C675("Barber"; Controller form window:K39:17+0x00080000+Form has no menu bar:K39:18; Horizontally centered:K39:1; At the top:K39:5; *)
+DIALOG:C40("Barber")
diff --git a/Project/Sources/dependencies.json b/Project/Sources/dependencies.json
index 23f5280..1e986b9 100644
--- a/Project/Sources/dependencies.json
+++ b/Project/Sources/dependencies.json
@@ -1,21 +1,39 @@
{
"dependencies": {
- "4DPop": {},
- "4DPop AppMaker": {},
+ "4DPop": {
+ "github": "vdelachaux/4DPop",
+ "tag": "20.6.3"
+ },
+ "4DPop AppMaker": {
+ "github": "vdelachaux/4DPop-AppMaker",
+ "tag": "20.6.0"
+ },
+ "4DPop Git": {
+ "github": "vdelachaux/4DPop-Git",
+ "tag": "20.6.0"
+ },
+ "4DPop Macros": {
+ "github": "vdelachaux/4DPop-Macros",
+ "tag": "20.6.2"
+ },
+ "4DPop QuickOpen": {
+ "github": "vdelachaux/4DPop-QuickOpen",
+ "tag": "20.6.0"
+ },
+ "4DPop XLIFF Pro": {
+ "github": "vdelachaux/4DPop-XLIFF-Pro",
+ "tag": "20.6.0"
+ },
"4DPop Bookmarks": {},
"4DPop Clipboard": {},
"4DPop ColorChart": {},
"4DPop Commands": {},
"4DPop Constants Editor": {},
- "4DPop Git": {},
"4DPop Image Buddy": {},
"4DPop KeepIt": {},
- "4DPop Macros": {},
"4DPop Pasteboard": {},
- "4DPop QuickOpen": {},
"4DPop Rulers": {},
"4DPop sqlSchemas": {},
- "4DPop Window": {},
- "4DPop XLIFF Pro": {}
+ "4DPop Window": {}
}
}
diff --git a/Resources/InfoPlist.strings b/Resources/InfoPlist.strings
index 0830763..4198940 100755
Binary files a/Resources/InfoPlist.strings and b/Resources/InfoPlist.strings differ