v20

vdelachaux · Jul 6, 2023 · fa89b1b · fa89b1b
1 parent f30c4f0
commit fa89b1b
Show file tree

Hide file tree

Showing 24 changed files with 26 additions and 13 deletions.
diff --git a/Build/4DPop Rulers.4dbase.zip b/Build/4DPop Rulers.4dbase.zip
diff --git a/Build/Components/4DPop Rulers.4dbase/4DPop Rulers.4DZ b/Build/Components/4DPop Rulers.4dbase/4DPop Rulers.4DZ
diff --git a/Build/Components/4DPop Rulers.4dbase/Info.plist b/Build/Components/4DPop Rulers.4dbase/Info.plist
@@ -4,17 +4,17 @@
 
   <dict>
     <key>CFBundleShortVersionString</key>
-    <string>20R2</string>
+    <string>20</string>
     <key>CFBundleLongVersionString</key>
-    <string>20R2 (293)</string>
+    <string>20 (294)</string>
     <key>NSHumanReadableCopyright</key>
     <string>©vdl 2007-2023</string>
     <key>CFBundleVersion</key>
-    <string>294</string>
+    <string>295</string>
     <key>CFBundleName</key>
     <string>4DPop Rulers</string>
     <key>CFBundleGetInfoString</key>
-    <string>20R2</string>
+    <string>20</string>
     <key>CFBundleDisplayName</key>
     <string>4DPop Rulers</string>
   </dict>

diff --git a/Build/Components/4DPop Rulers.4dbase/Libraries/lib4d-arm64.dylib b/Build/Components/4DPop Rulers.4dbase/Libraries/lib4d-arm64.dylib
diff --git a/Build/Components/4DPop Rulers.4dbase/Resources/InfoPlist.strings b/Build/Components/4DPop Rulers.4dbase/Resources/InfoPlist.strings
diff --git a/Build/Components/4DPop Rulers.dmg b/Build/Components/4DPop Rulers.dmg
diff --git a/Info.plist b/Info.plist
@@ -4,17 +4,17 @@
 
   <dict>
     <key>CFBundleShortVersionString</key>
-    <string>20R2</string>
+    <string>20</string>
     <key>CFBundleLongVersionString</key>
-    <string>20R2 (293)</string>
+    <string>20 (294)</string>
     <key>NSHumanReadableCopyright</key>
     <string>©vdl 2007-2023</string>
     <key>CFBundleVersion</key>
-    <string>294</string>
+    <string>295</string>
     <key>CFBundleName</key>
     <string>4DPop Rulers</string>
     <key>CFBundleGetInfoString</key>
-    <string>20R2</string>
+    <string>20</string>
     <key>CFBundleDisplayName</key>
     <string>4DPop Rulers</string>
   </dict>

diff --git a/...orms/4DPop_ScreenRuler/Images/Image43.tif → ...ces/Forms/SCREEN_RULER/Images/Image43.tif b/...orms/4DPop_ScreenRuler/Images/Image43.tif → ...ces/Forms/SCREEN_RULER/Images/Image43.tif
diff --git a/...orms/4DPop_ScreenRuler/Images/Image44.tif → ...ces/Forms/SCREEN_RULER/Images/Image44.tif b/...orms/4DPop_ScreenRuler/Images/Image44.tif → ...ces/Forms/SCREEN_RULER/Images/Image44.tif
diff --git a/...4DPop_ScreenRuler/ObjectMethods/About.4dm → ...orms/SCREEN_RULER/ObjectMethods/About.4dm b/...4DPop_ScreenRuler/ObjectMethods/About.4dm → ...orms/SCREEN_RULER/ObjectMethods/About.4dm
diff --git a/...DPop_ScreenRuler/ObjectMethods/About1.4dm → ...rms/SCREEN_RULER/ObjectMethods/About1.4dm b/...DPop_ScreenRuler/ObjectMethods/About1.4dm → ...rms/SCREEN_RULER/ObjectMethods/About1.4dm
diff --git a/...op_ScreenRuler/ObjectMethods/AboutBox.4dm → ...s/SCREEN_RULER/ObjectMethods/AboutBox.4dm b/...op_ScreenRuler/ObjectMethods/AboutBox.4dm → ...s/SCREEN_RULER/ObjectMethods/AboutBox.4dm
diff --git a/...p_ScreenRuler/ObjectMethods/AboutBox1.4dm → .../SCREEN_RULER/ObjectMethods/AboutBox1.4dm b/...p_ScreenRuler/ObjectMethods/AboutBox1.4dm → .../SCREEN_RULER/ObjectMethods/AboutBox1.4dm
diff --git a/...Ruler/ObjectMethods/Deplacer_Fenetre1.4dm → ...RULER/ObjectMethods/Deplacer_Fenetre1.4dm b/...Ruler/ObjectMethods/Deplacer_Fenetre1.4dm → ...RULER/ObjectMethods/Deplacer_Fenetre1.4dm
diff --git a/...reenRuler/ObjectMethods/Move_Window_H.4dm → ...EEN_RULER/ObjectMethods/Move_Window_H.4dm b/...reenRuler/ObjectMethods/Move_Window_H.4dm → ...EEN_RULER/ObjectMethods/Move_Window_H.4dm
diff --git a/...r/ObjectMethods/Resize_Button_Movable.4dm → ...R/ObjectMethods/Resize_Button_Movable.4dm b/...r/ObjectMethods/Resize_Button_Movable.4dm → ...R/ObjectMethods/Resize_Button_Movable.4dm
diff --git a/...p_ScreenRuler/ObjectMethods/SwitchBox.4dm → .../SCREEN_RULER/ObjectMethods/SwitchBox.4dm b/...p_ScreenRuler/ObjectMethods/SwitchBox.4dm → .../SCREEN_RULER/ObjectMethods/SwitchBox.4dm
diff --git a/..._ScreenRuler/ObjectMethods/SwitchBox1.4dm → ...SCREEN_RULER/ObjectMethods/SwitchBox1.4dm b/..._ScreenRuler/ObjectMethods/SwitchBox1.4dm → ...SCREEN_RULER/ObjectMethods/SwitchBox1.4dm
diff --git a/...urces/Forms/4DPop_ScreenRuler/form.4DForm → ...ct/Sources/Forms/SCREEN_RULER/form.4DForm b/...urces/Forms/4DPop_ScreenRuler/form.4DForm → ...ct/Sources/Forms/SCREEN_RULER/form.4DForm
diff --git a/...ources/Forms/4DPop_ScreenRuler/method.4dm → ...ect/Sources/Forms/SCREEN_RULER/method.4dm b/...ources/Forms/4DPop_ScreenRuler/method.4dm → ...ect/Sources/Forms/SCREEN_RULER/method.4dm
diff --git a/Project/Sources/Methods/main.4dm b/Project/Sources/Methods/main.4dm
@@ -5,7 +5,7 @@ var $form; $name; $task : Text
 var $height; $offset; $process; $state; $time; $width : Integer
 var $winRef : Integer
 
-$task:="$4DPop_ScreenRuler"
+$task:="$4DPop_Ruler"
 
 PROCESS PROPERTIES:C336(Current process:C322; $name; $state; $time)
 
@@ -17,10 +17,10 @@ Else
 
 	Compiler_Variables
 
-	$form:="4DPop_ScreenRuler"
+	$form:="SCREEN_RULER"
 
 	FORM GET PROPERTIES:C674($form; $width; $height)
-	$offset:=Menu bar height:C440+60  //Hauteur barre outils
+	$offset:=Menu bar height:C440+Tool bar height:C1016
 	$winRef:=Open window:C153(1; $offset; $width+1; $height+$offset; -Plain dialog box:K34:4)
 	DIALOG:C40($form)
 	CLOSE WINDOW:C154

diff --git a/Project/Sources/folders.json b/Project/Sources/folders.json
@@ -5,7 +5,20 @@
 	"# 🚧 DEV": {},
 	"♻️ LIBRAIRIES": {},
 	"⚙️ MACROS": {},
-	"📦 COMPONENT": {},
+	"📦 COMPONENT": {
+		"methods": [
+			"Compiler_Methods",
+			"Compiler_Variables",
+			"ContextualMenu",
+			"DeleteGuidelines",
+			"Splitter"
+		],
+		"forms": [
+			"About",
+			"SCREEN_RULER",
+			"Splitter"
+		]
+	},
 	"🛠️ Tools": {},
 	"4️⃣ 4DPop": {
 		"methods": [

diff --git a/Resources/InfoPlist.strings b/Resources/InfoPlist.strings
diff --git a/lastbuild b/lastbuild
@@ -1 +1 @@
-20R2
+20