Skip to content

Commit

Permalink
barber window type
Browse files Browse the repository at this point in the history
  • Loading branch information
vdelachaux committed Jun 4, 2024
1 parent 8c643ea commit 19de2bd
Show file tree
Hide file tree
Showing 13 changed files with 53 additions and 27 deletions.
Binary file modified Build/4DPop-AppMaker.dmg
Binary file not shown.
Binary file modified Build/4DPop-AppMaker.zip
Binary file not shown.
Binary file modified Build/Components/4DPop AppMaker.4dbase/4DPop AppMaker.4DZ
Binary file not shown.
4 changes: 2 additions & 2 deletions Build/Components/4DPop AppMaker.4dbase/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@
<key>NSHumanReadableCopyright</key>
<string>©vdl 2009-2024</string>
<key>CFBundleVersion</key>
<string>590</string>
<string>591</string>
<key>CFBundleDisplayName</key>
<string>4DPop AppMaker</string>
<key>CFBundleShortVersionString</key>
<string>20R6</string>
<key>CFBundleGetInfoString</key>
<string>20R6</string>
<key>CFBundleLongVersionString</key>
<string>20R6 (589)</string>
<string>20R6 (590)</string>
<key>CFBundleName</key>
<string>4DPop AppMaker</string>
</dict>
Expand Down
Binary file modified Build/Components/4DPop AppMaker.4dbase/Libraries/lib4d-arm64.dylib
Binary file not shown.
Binary file not shown.
4 changes: 2 additions & 2 deletions Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@
<key>NSHumanReadableCopyright</key>
<string>©vdl 2009-2024</string>
<key>CFBundleVersion</key>
<string>590</string>
<string>591</string>
<key>CFBundleDisplayName</key>
<string>4DPop AppMaker</string>
<key>CFBundleShortVersionString</key>
<string>20R6</string>
<key>CFBundleGetInfoString</key>
<string>20R6</string>
<key>CFBundleLongVersionString</key>
<string>20R6 (589)</string>
<string>20R6 (590)</string>
<key>CFBundleName</key>
<string>4DPop AppMaker</string>
</dict>
Expand Down
1 change: 1 addition & 0 deletions Project/Sources/Forms/Barber/ObjectMethods/Button.4dm
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
DRAG WINDOW:C452
16 changes: 14 additions & 2 deletions Project/Sources/Forms/Barber/form.4DForm
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
"markerFooter": 120,
"events": [
"onLoad",
"onCloseBox",
"onTimer"
],
"method": "method.4dm",
Expand Down Expand Up @@ -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"
}
}
}
Expand All @@ -107,7 +119,7 @@
"version": "1",
"kind": "form"
},
"geometryStamp": 16,
"geometryStamp": 22,
"editor": {
"activeView": "View 1",
"defaultView": "View 1",
Expand Down
19 changes: 7 additions & 12 deletions Project/Sources/Forms/Barber/method.4dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions Project/Sources/Methods/_barber.4dm
Original file line number Diff line number Diff line change
@@ -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")
$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")
32 changes: 25 additions & 7 deletions Project/Sources/dependencies.json
Original file line number Diff line number Diff line change
@@ -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": {}
}
}
Binary file modified Resources/InfoPlist.strings
Binary file not shown.

0 comments on commit 19de2bd

Please sign in to comment.