diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ae8003f..9194ad5 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -10,11 +10,15 @@ on:
jobs:
build:
- name: "Build"
- runs-on: windows-latest
+ name: "Build on ${{ matrix.os }}"
+ strategy:
+ fail-fast: false
+ matrix:
+ os: [ macos-latest, windows-latest ]
+ runs-on: ${{ matrix.os }}
steps:
- name: Checkout
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
- name: Build
uses: 4d/build4d-action@main
with:
@@ -22,4 +26,4 @@ jobs:
version: vcs
build: official
token: ${{ secrets.DLTK }}
-
+
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
new file mode 100644
index 0000000..5595be8
--- /dev/null
+++ b/.github/workflows/release.yml
@@ -0,0 +1,27 @@
+name: Release
+on:
+ release:
+ types: [published]
+jobs:
+ publish:
+ name: Publish
+ runs-on: macos-latest
+ env:
+ GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+ permissions:
+ contents: write # for asset upload
+ steps:
+ - name: Checkout
+ uses: actions/checkout@v4
+ - name: BuildAndPackage
+ uses: 4d/build4d-action@main
+ with:
+ product-line: vcs
+ version: vcs
+ build: official
+ token: ${{ secrets.DLTK }}
+ actions: "build,pack,sign,archive"
+ sign-certificate: "Vincent de Lachaux (DYRKW64QA9)"
+ - name: Upload
+ run: |
+ gh release upload ${{github.event.release.tag_name}} build/4DPop-XLIFF-Pro.zip
diff --git a/Build/4DPop-XLIFF-Pro.dmg b/Build/4DPop-XLIFF-Pro.dmg
index 68e9483..662c2fe 100644
Binary files a/Build/4DPop-XLIFF-Pro.dmg and b/Build/4DPop-XLIFF-Pro.dmg differ
diff --git a/Build/4DPop-XLIFF-Pro.zip b/Build/4DPop-XLIFF-Pro.zip
index c4754e1..f5c475b 100644
Binary files a/Build/4DPop-XLIFF-Pro.zip and b/Build/4DPop-XLIFF-Pro.zip differ
diff --git a/Build/Components/4DPop XLIFF Pro.4dbase/4DPop XLIFF Pro.4DZ b/Build/Components/4DPop XLIFF Pro.4dbase/4DPop XLIFF Pro.4DZ
index 4efcca3..0a7a94a 100644
Binary files a/Build/Components/4DPop XLIFF Pro.4dbase/4DPop XLIFF Pro.4DZ and b/Build/Components/4DPop XLIFF Pro.4dbase/4DPop XLIFF Pro.4DZ differ
diff --git a/Build/Components/4DPop XLIFF Pro.4dbase/Info.plist b/Build/Components/4DPop XLIFF Pro.4dbase/Info.plist
index a40e8ac..b953a5c 100755
--- a/Build/Components/4DPop XLIFF Pro.4dbase/Info.plist
+++ b/Build/Components/4DPop XLIFF Pro.4dbase/Info.plist
@@ -8,9 +8,9 @@
CFBundleIdentifier
com.4D.4DPop XLIFF Pro
CFBundleGetInfoString
- 20R6
+ 20R7
CFBundleLongVersionString
- 20R6 (102)
+ 20R7 (103)
CFBundleName
4DPop XLIFF Pro
CFBundleDevelopmentRegion
@@ -18,9 +18,9 @@
CFBundleDisplayName
4DPop XLIFF Pro
CFBundleVersion
- 103
+ 104
CFBundleShortVersionString
- 20R6
+ 20R7
CFBundleExecutable
4DPop XLIFF Pro
diff --git a/Build/Components/4DPop XLIFF Pro.4dbase/Libraries/lib4d-arm64.dylib b/Build/Components/4DPop XLIFF Pro.4dbase/Libraries/lib4d-arm64.dylib
index 781a76e..8772ddc 100755
Binary files a/Build/Components/4DPop XLIFF Pro.4dbase/Libraries/lib4d-arm64.dylib and b/Build/Components/4DPop XLIFF Pro.4dbase/Libraries/lib4d-arm64.dylib differ
diff --git a/Build/Components/4DPop XLIFF Pro.4dbase/Resources/InfoPlist.strings b/Build/Components/4DPop XLIFF Pro.4dbase/Resources/InfoPlist.strings
index 10f5e02..ae46e28 100755
Binary files a/Build/Components/4DPop XLIFF Pro.4dbase/Resources/InfoPlist.strings and b/Build/Components/4DPop XLIFF Pro.4dbase/Resources/InfoPlist.strings differ
diff --git a/Info.plist b/Info.plist
index a40e8ac..b953a5c 100755
--- a/Info.plist
+++ b/Info.plist
@@ -8,9 +8,9 @@
CFBundleIdentifier
com.4D.4DPop XLIFF Pro
CFBundleGetInfoString
- 20R6
+ 20R7
CFBundleLongVersionString
- 20R6 (102)
+ 20R7 (103)
CFBundleName
4DPop XLIFF Pro
CFBundleDevelopmentRegion
@@ -18,9 +18,9 @@
CFBundleDisplayName
4DPop XLIFF Pro
CFBundleVersion
- 103
+ 104
CFBundleShortVersionString
- 20R6
+ 20R7
CFBundleExecutable
4DPop XLIFF Pro
diff --git a/Project/4DPop XLIFF Pro.4DProject b/Project/4DPop XLIFF Pro.4DProject
index 325401a..5061701 100755
--- a/Project/4DPop XLIFF Pro.4DProject
+++ b/Project/4DPop XLIFF Pro.4DProject
@@ -1,5 +1,5 @@
{
"$comment": "The project file let you override the location for most folders",
"compatibilityVersion": 2000,
- "$4DPopAppMakerToolVersion": "20R6"
+ "$4DPopAppMakerToolVersion": "20R7"
}
\ No newline at end of file
diff --git a/Project/Sources/Classes/formDelegate.4dm b/Project/Sources/Classes/formDelegate.4dm
index a801682..c2e8986 100644
--- a/Project/Sources/Classes/formDelegate.4dm
+++ b/Project/Sources/Classes/formDelegate.4dm
@@ -47,8 +47,6 @@ Class constructor($param)
End for
- This:C1470._worker:=Null:C1517
- This:C1470._callback:=Null:C1517
This:C1470._darkExtension:="_dark"
This:C1470.entryOrder:=[]
@@ -491,7 +489,7 @@ Function callWorker($method; $param; $param1; $paramN)
// .callWorker ( process : Integer ; method : Text ; param1, param2, …, paramN )
// ---------------------------------------------------------------------------------
- C_VARIANT:C1683(${2})
+ _O_C_VARIANT:C1683(${2})
var $code : Text
var $i : Integer
@@ -692,7 +690,7 @@ Function callMe($method : Text; $param1; $paramN)
.callMe ( method : Text ; param1, param2, …, paramN )
*/
- C_VARIANT:C1683(${2})
+ _O_C_VARIANT:C1683(${2})
var $code : Text
var $i : Integer
@@ -744,7 +742,7 @@ Function callChild($subform; $method : Text; $param; $param1; $paramN)
// TODO:Returned value
- C_VARIANT:C1683(${3})
+ _O_C_VARIANT:C1683(${3})
var $code; $target : Text
var $i : Integer
diff --git a/Project/Sources/Classes/menu.4dm b/Project/Sources/Classes/menu.4dm
index 43dacf3..f30a1e1 100644
--- a/Project/Sources/Classes/menu.4dm
+++ b/Project/Sources/Classes/menu.4dm
@@ -8,7 +8,6 @@ Class constructor($options)
This:C1470.__CLASS__:=OB Class:C1730(This:C1470)
- This:C1470.ref:=Null:C1517
This:C1470.autoRelease:=True:C214
This:C1470.localize:=True:C214
This:C1470.metacharacters:=False:C215
@@ -110,7 +109,7 @@ Function release()
If (This:C1470._isMenu())
RELEASE MENU:C978(This:C1470.ref)
- This:C1470.ref:=Null:C1517
+ This:C1470.ref:=""
End if
@@ -177,7 +176,7 @@ Function append($item; $param; $mark; $afterItem : Integer) : cs:C1710.menu
//______________________________________________________
Else
- $t:=Get localized string:C991($item)
+ $t:=Localized string:C991($item)
//______________________________________________________
End case
@@ -1202,7 +1201,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((This:C1470.ref#Null:C1517) && (This:C1470.ref#""); Current method name:C684+": The menu reference is null"))
return True:C214
diff --git a/Project/Sources/Classes/windowDelegate.4dm b/Project/Sources/Classes/windowDelegate.4dm
index 7ffc10b..2141857 100644
--- a/Project/Sources/Classes/windowDelegate.4dm
+++ b/Project/Sources/Classes/windowDelegate.4dm
@@ -41,7 +41,7 @@ Class constructor($param)
//______________________________________________________
End case
- This:C1470.ready:=True:C214
+ This:C1470._.ready:=True:C214
// <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <==
Function get type() : Integer
@@ -233,7 +233,7 @@ Function set title($title : Text)
var $t : Text
- $t:=Get localized string:C991($title)
+ $t:=Localized string:C991($title)
SET WINDOW TITLE:C213($t ? $t : $title; This:C1470.ref)
// <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <== <==
diff --git a/Project/Sources/Methods/COMPILER_4DPop.4dm b/Project/Sources/Methods/COMPILER_4DPop.4dm
deleted file mode 100755
index 3fd5aa7..0000000
--- a/Project/Sources/Methods/COMPILER_4DPop.4dm
+++ /dev/null
@@ -1,3 +0,0 @@
-//%attributes = {"invisible":true}
-C_OBJECT:C1216(_4DPopXliff; $0)
-C_OBJECT:C1216(editor; $1)
\ No newline at end of file
diff --git a/Project/Sources/dependencies.json b/Project/Sources/dependencies.json
index 95b0bfe..9e213d9 100644
--- a/Project/Sources/dependencies.json
+++ b/Project/Sources/dependencies.json
@@ -2,35 +2,67 @@
"dependencies": {
"4DPop": {
"github": "vdelachaux/4DPop",
- "tag": "20.6.3"
+ "version": "latest"
},
"4DPop AppMaker": {
"github": "vdelachaux/4DPop-AppMaker",
- "tag": "20.6.0"
+ "version": "latest"
},
"4DPop Git": {
"github": "vdelachaux/4DPop-Git",
- "tag": "20.6.0"
+ "version": "latest"
},
"4DPop Macros": {
"github": "vdelachaux/4DPop-Macros",
- "tag": "20.6.2"
+ "version": "latest"
},
"4DPop QuickOpen": {
"github": "vdelachaux/4DPop-QuickOpen",
- "tag": "20.6.0"
- },
- "4DPop Bookmarks": {},
- "4DPop Clipboard": {},
- "4DPop ColorChart": {},
- "4DPop Commands": {},
- "4DPop Constants Editor": {},
- "4DPop Image Buddy": {},
- "4DPop KeepIt": {},
- "4DPop Pasteboard": {},
- "4DPop Rulers": {},
- "4DPop sqlSchemas": {},
- "4DPop Window": {},
- "4DPop XLIFF Pro": {}
+ "version": "latest"
+ },
+ "4DPop XLIFF Pro": {
+ "github": "vdelachaux/4DPop-XLIFF-Pro",
+ "version": "latest"
+ },
+ "4DPop Bookmarks": {
+ "github": "vdelachaux/4DPop-Bookmarks",
+ "version": "latest"
+ },
+ "4DPop ColorChart": {
+ "github": "vdelachaux/4DPop-ColorChart",
+ "version": "latest"
+ },
+ "4DPop Commands": {
+ "github": "vdelachaux/4DPop-Commands",
+ "version": "latest"
+ },
+ "4DPop Constants Editor": {
+ "github": "vdelachaux/4DPop-Constants-Editor",
+ "version": "latest"
+ },
+ "4DPop Image Buddy": {
+ "github": "vdelachaux/4DPop-Image-Buddy",
+ "version": "latest"
+ },
+ "4DPop KeepIt": {
+ "github": "vdelachaux/4DPop-KeepIt",
+ "version": "latest"
+ },
+ "4DPop Pasteboard": {
+ "github": "vdelachaux/4DPop-Pasteboard",
+ "version": "latest"
+ },
+ "4DPop Rulers": {
+ "github": "vdelachaux/4DPop-Rulers",
+ "version": "latest"
+ },
+ "4DPop sqlSchemas": {
+ "github": "vdelachaux/4DPop-sqlSchemas",
+ "version": "latest"
+ },
+ "4DPop Window": {
+ "github": "vdelachaux/4DPop-Window",
+ "version": "latest"
+ }
}
}
diff --git a/Project/Sources/folders.json b/Project/Sources/folders.json
index 8b57b6a..758fbed 100755
--- a/Project/Sources/folders.json
+++ b/Project/Sources/folders.json
@@ -92,7 +92,6 @@
"4️⃣ 4DPop": {
"methods": [
"_4DPopXliff",
- "COMPILER_4DPop",
"editor"
]
},
diff --git a/README.md b/README.md
index 723dff8..38aeb4f 100755
--- a/README.md
+++ b/README.md
@@ -1,23 +1,17 @@
-[code-shield]: https://img.shields.io/static/v1?label=language&message=4d&color=blue
-[code-url]: https://developer.4d.com/
-[license-url]: LICENSE
-[notarized]: https://img.shields.io/badge/notarized-blue
-
-[code-top]: https://img.shields.io/github/languages/top/vdelachaux/4DPop-XLIFF-Pro.svg
-[code-size]: https://img.shields.io/github/languages/code-size/vdelachaux/4DPop-XLIFF-Pro.svg
-[release-shield]: https://img.shields.io/github/v/release/vdelachaux/4DPop-XLIFF-Pro?include_prereleases
-[release-url]: https://github.com/vdelachaux/4DPop-XLIFF-Pro/releases/latest
-[license-shield]: https://img.shields.io/github/license/vdelachaux/4DPop-XLIFF-Pro
-[build-shield]: https://github.com/vdelachaux/4DPop-XLIFF-Pro/actions/workflows/build.yml/badge.svg
-[build-url]: https://github.com/vdelachaux/4DPop-XLIFF-Pro/actions/workflows/build.yml
-
-[![language][code-shield]][code-url]
-[![language-top][code-top]][code-url]
-![code-size][code-size]
-[![license][license-shield]][license-url]
+
+[release-shield]: https://img.shields.io/github/v/release/vdelachaux/4DPop-XLIFF-Pro.svg?include_prereleases
+[release-url]: https://github.com/vdelachaux/4DPop-XLIFF-Pro.svg/releases/latest
+
+[license-shield]: https://img.shields.io/github/license/vdelachaux/4DPop-XLIFF-Pro.svg
+
+
+
+
+
[![release][release-shield]][release-url]
-[![build][build-shield]][license-url]
-![notarized][notarized]
+[![license][license-shield]](LICENSE)
+
+
# 4DPop XLIFF Pro
diff --git a/Resources/InfoPlist.strings b/Resources/InfoPlist.strings
index 10f5e02..ae46e28 100755
Binary files a/Resources/InfoPlist.strings and b/Resources/InfoPlist.strings differ