diff --git a/.gitignore b/.gitignore
index f6c338a..b2bdc3c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -77,4 +77,5 @@ DEV/
#--------------------------------
# Added by user
-#--------------------------------
\ No newline at end of file
+#--------------------------------
+Project/Sources/dependencies.json
diff --git a/Project/Sources/Methods/Compiler_Methods.4dm b/Project/Sources/Methods/Compiler_Methods.4dm
index 7a53290..c016da1 100644
--- a/Project/Sources/Methods/Compiler_Methods.4dm
+++ b/Project/Sources/Methods/Compiler_Methods.4dm
@@ -1,94 +1,93 @@
//%attributes = {"invisible":true}
-C_LONGINT:C283(Progress SET PROGRESS ;$1)
-C_REAL:C285(Progress SET PROGRESS ;$2)
-C_TEXT:C284(Progress SET PROGRESS ;$3)
-C_BOOLEAN:C305(Progress SET PROGRESS ;$4)
+C_LONGINT:C283(Progress SET PROGRESS; $1)
+C_REAL:C285(Progress SET PROGRESS; $2)
+C_TEXT:C284(Progress SET PROGRESS; $3)
+C_BOOLEAN:C305(Progress SET PROGRESS; $4)
-C_LONGINT:C283(Progress SET ICON ;$1)
-C_PICTURE:C286(Progress SET ICON ;$2)
-C_BOOLEAN:C305(Progress SET ICON ;$3)
+C_LONGINT:C283(Progress SET ICON; $1)
+C_PICTURE:C286(Progress SET ICON; $2)
+C_BOOLEAN:C305(Progress SET ICON; $3)
-C_LONGINT:C283(Progress SET ON STOP METHOD ;$1)
-C_TEXT:C284(Progress SET ON STOP METHOD ;$2)
-C_BOOLEAN:C305(Progress SET ON STOP METHOD ;$3)
+C_LONGINT:C283(Progress SET ON STOP METHOD; $1)
+C_TEXT:C284(Progress SET ON STOP METHOD; $2)
+C_BOOLEAN:C305(Progress SET ON STOP METHOD; $3)
-C_TEXT:C284(Progress Get On Stop Method ;$0)
-C_LONGINT:C283(Progress Get On Stop Method ;$1)
+C_TEXT:C284(Progress Get On Stop Method; $0)
+C_LONGINT:C283(Progress Get On Stop Method; $1)
-C_LONGINT:C283(Progress QUIT ;$1)
+C_LONGINT:C283(Progress QUIT; $1)
-C_PICTURE:C286(Progress Get Icon ;$0)
-C_LONGINT:C283(Progress Get Icon ;$1)
+C_PICTURE:C286(Progress Get Icon; $0)
+C_LONGINT:C283(Progress Get Icon; $1)
-C_LONGINT:C283(Progress New ;$0)
-C_BOOLEAN:C305(Progress New ;$1)
+C_LONGINT:C283(Progress New; $0)
+C_BOOLEAN:C305(Progress New; $1)
-C_LONGINT:C283(Progress SET TITLE ;$1)
-C_TEXT:C284(Progress SET TITLE ;$2)
-C_REAL:C285(Progress SET TITLE ;$3)
-C_TEXT:C284(Progress SET TITLE ;$4)
-C_BOOLEAN:C305(Progress SET TITLE ;$5)
+C_LONGINT:C283(Progress SET TITLE; $1)
+C_TEXT:C284(Progress SET TITLE; $2)
+C_REAL:C285(Progress SET TITLE; $3)
+C_TEXT:C284(Progress SET TITLE; $4)
+C_BOOLEAN:C305(Progress SET TITLE; $5)
-C_LONGINT:C283(Progress SET MESSAGE ;$1)
-C_TEXT:C284(Progress SET MESSAGE ;$2)
-C_BOOLEAN:C305(Progress SET MESSAGE ;$3)
+C_LONGINT:C283(Progress SET MESSAGE; $1)
+C_TEXT:C284(Progress SET MESSAGE; $2)
+C_BOOLEAN:C305(Progress SET MESSAGE; $3)
-C_TEXT:C284(Progress Get On Error Method ;$0)
+C_TEXT:C284(Progress Get On Error Method; $0)
-C_TEXT:C284(Progress SET ON ERROR METHOD ;$1)
+C_TEXT:C284(Progress SET ON ERROR METHOD; $1)
-C_LONGINT:C283(Progress__ManageMethodsError ;$1)
-C_LONGINT:C283(Progress__ManageMethodsError ;$2)
+C_LONGINT:C283(Progress__ManageMethodsError; $1)
+C_LONGINT:C283(Progress__ManageMethodsError; $2)
-C_LONGINT:C283(Progress__UpdateDynVar ;$1)
+C_LONGINT:C283(Progress__UpdateDynVar; $1)
-C_LONGINT:C283(Progress__Launch ;$0)
-C_LONGINT:C283(Progress__Launch ;$1)
+C_LONGINT:C283(Progress__Launch; $1)
-C_TEXT:C284(Progress Get Title ;$0)
-C_LONGINT:C283(Progress Get Title ;$1)
+C_TEXT:C284(Progress Get Title; $0)
+C_LONGINT:C283(Progress Get Title; $1)
-C_TEXT:C284(Progress Get Message ;$0)
-C_LONGINT:C283(Progress Get Message ;$1)
+C_TEXT:C284(Progress Get Message; $0)
+C_LONGINT:C283(Progress Get Message; $1)
-C_REAL:C285(Progress Get Progress ;$0)
-C_LONGINT:C283(Progress Get Progress ;$1)
+C_REAL:C285(Progress Get Progress; $0)
+C_LONGINT:C283(Progress Get Progress; $1)
-C_LONGINT:C283(Progress__OnExternalCall ;$1)
-C_LONGINT:C283(Progress__OnExternalCall ;$2)
+C_LONGINT:C283(Progress__OnExternalCall; $1)
+C_LONGINT:C283(Progress__OnExternalCall; $2)
-C_TEXT:C284(Progress__CallCallBack ;$1)
-C_LONGINT:C283(Progress__CallCallBack ;$2)
+C_TEXT:C284(Progress__CallCallBack; $1)
+C_LONGINT:C283(Progress__CallCallBack; $2)
-C_BOOLEAN:C305(Progress Stopped ;$0)
-C_LONGINT:C283(Progress Stopped ;$1)
+C_BOOLEAN:C305(Progress Stopped; $0)
+C_LONGINT:C283(Progress Stopped; $1)
-C_LONGINT:C283(Progress SET BUTTON ENABLED ;$1)
-C_BOOLEAN:C305(Progress SET BUTTON ENABLED ;$2)
-C_BOOLEAN:C305(Progress SET BUTTON ENABLED ;$3)
+C_LONGINT:C283(Progress SET BUTTON ENABLED; $1)
+C_BOOLEAN:C305(Progress SET BUTTON ENABLED; $2)
+C_BOOLEAN:C305(Progress SET BUTTON ENABLED; $3)
-C_LONGINT:C283(Progress Get Button Enabled ;$1)
-C_BOOLEAN:C305(Progress Get Button Enabled ;$0)
+C_LONGINT:C283(Progress Get Button Enabled; $1)
+C_BOOLEAN:C305(Progress Get Button Enabled; $0)
-C_TEXT:C284(Progress SET FONTS ;$1)
-C_TEXT:C284(Progress SET FONTS ;$2)
-C_TEXT:C284(Progress SET FONTS ;$3)
+C_TEXT:C284(Progress SET FONTS; $1)
+C_TEXT:C284(Progress SET FONTS; $2)
+C_TEXT:C284(Progress SET FONTS; $3)
-C_LONGINT:C283(Progress SET FONT SIZES ;$1)
-C_LONGINT:C283(Progress SET FONT SIZES ;$2)
-C_LONGINT:C283(Progress SET FONT SIZES ;$3)
+C_LONGINT:C283(Progress SET FONT SIZES; $1)
+C_LONGINT:C283(Progress SET FONT SIZES; $2)
+C_LONGINT:C283(Progress SET FONT SIZES; $3)
-C_LONGINT:C283(Progress SET BUTTON TITLE ;$1)
-C_TEXT:C284(Progress SET BUTTON TITLE ;$2)
-C_BOOLEAN:C305(Progress SET BUTTON TITLE ;$3)
+C_LONGINT:C283(Progress SET BUTTON TITLE; $1)
+C_TEXT:C284(Progress SET BUTTON TITLE; $2)
+C_BOOLEAN:C305(Progress SET BUTTON TITLE; $3)
-C_LONGINT:C283(Progress Get Button Title ;$1)
-C_TEXT:C284(Progress Get Button Title ;$0)
+C_LONGINT:C283(Progress Get Button Title; $1)
+C_TEXT:C284(Progress Get Button Title; $0)
- //PROGRESS SET WINDOW VISIBLE
-C_BOOLEAN:C305(Progress SET WINDOW VISIBLE ;$1)
-C_LONGINT:C283(Progress SET WINDOW VISIBLE ;$2)
-C_LONGINT:C283(Progress SET WINDOW VISIBLE ;$3)
-C_BOOLEAN:C305(Progress SET WINDOW VISIBLE ;$4)
\ No newline at end of file
+//PROGRESS SET WINDOW VISIBLE
+C_BOOLEAN:C305(Progress SET WINDOW VISIBLE; $1)
+C_LONGINT:C283(Progress SET WINDOW VISIBLE; $2)
+C_LONGINT:C283(Progress SET WINDOW VISIBLE; $3)
+C_BOOLEAN:C305(Progress SET WINDOW VISIBLE; $4)
\ No newline at end of file
diff --git a/Project/Sources/Methods/Compiler_Variables_Inter.4dm b/Project/Sources/Methods/Compiler_Variables_Inter.4dm
index e9201e5..3948b41 100644
--- a/Project/Sources/Methods/Compiler_Variables_Inter.4dm
+++ b/Project/Sources/Methods/Compiler_Variables_Inter.4dm
@@ -10,8 +10,6 @@ C_LONGINT:C283(<>NbVisibleObjects)
C_LONGINT:C283(<>ProgressError)
C_LONGINT:C283(<>ProgressWindow)
C_LONGINT:C283(<>PS_Progress)
-C_LONGINT:C283(<>STOPBUTTON)
-C_LONGINT:C283(<>THERMOPROGRESS)
C_LONGINT:C283(<>VerticalCenter)
C_LONGINT:C283(<>ErrorRange)
C_LONGINT:C283(<>SizeMessage1)
@@ -23,15 +21,3 @@ C_LONGINT:C283(<>SIZEMESSAGE2)
C_BOOLEAN:C305(<>ProgressInited)
C_BOOLEAN:C305(<>UpdateFonts)
C_BOOLEAN:C305(<>UpdateSizes)
-
-// FIXME:Unused ?
-C_PICTURE:C286(<>ICONE)
-C_REAL:C285(<>MEMOPROGRESS)
-C_REAL:C285(<>PROGRESS)
-C_LONGINT:C283(<>MEMOWINPOSX)
-C_LONGINT:C283(<>MEMOWINPOSY)
-C_TEXT:C284(<>ERRORMESSAGE)
-C_TEXT:C284(<>MESSAGE1)
-C_TEXT:C284(<>MESSAGE2)
-C_LONGINT:C283(<>WINPOSX)
-C_LONGINT:C283(<>WINPOSY)
\ No newline at end of file
diff --git a/Project/Sources/Methods/Progress__Launch.4dm b/Project/Sources/Methods/Progress__Launch.4dm
index 1fbe391..e84cd6d 100644
--- a/Project/Sources/Methods/Progress__Launch.4dm
+++ b/Project/Sources/Methods/Progress__Launch.4dm
@@ -1,70 +1,53 @@
//%attributes = {"invisible":true}
-// modifiée le 24 nov 2010 par RL
-// fenetre centrée verticalement sur windows
-// type de fenetre modifiée (avec case de reduction)
+// Modifiée le 24 nov 2010 par RL
+// Fenetre centrée verticalement sur windows
+// Type de fenetre modifiée (avec case de reduction)
+#DECLARE($runnerFlag : Integer)
-C_LONGINT:C283($0) //recursive call
-C_LONGINT:C283($1) //recursive indicator
-
-C_PICTURE:C286($Image)
-C_LONGINT:C283($PS_Progress; $ProgressWindow)
-
-C_LONGINT:C283($SubformWidth; $SubformHeight)
-C_LONGINT:C283($x1; $y1; $x2; $y2)
-C_LONGINT:C283($Width; $Height; $WinPosX; $WinPosY)
-
-C_LONGINT:C283(<>PS_Progress)
-C_LONGINT:C283(<>VerticalCenter)
+var $form : Text
+var $height; $width; $left; $right; $top; $bottom : Integer
If (Count parameters:C259=0)
If (<>PS_Progress=0)
- <>PS_Progress:=New process:C317("Progress__Launch"; 128000; "$ProgressBar"; 0) //ACI0100926 (128000 instead of 64000)
+
+ <>PS_Progress:=New process:C317(Formula:C1597(Progress__Launch).source; 0; "$ProgressBar"; 0) // ACI0100926 (128000 instead of 64000)
DELAY PROCESS:C323(Current process:C322; 15) // 1/4 de seconde
+
End if
+ return
+
+End if
+
+// ACI0098693
+If (Is Windows:C1573)
+
+ $form:="D_Multiprogress_Win"
+ FORM GET PROPERTIES:C674($form; $width; $height)
+
+ $left:=(Screen width:C187\2)-($width\2)
+ $top:=(Screen height:C188-$height)\2
+ $bottom:=$top+$height
+
+ <>ProgressWindow:=Open form window:C675($form; Plain fixed size window:K34:6+Form has no menu bar:K39:18; $left; $top)
+ <>VerticalCenter:=($top+$bottom)\2
+
Else
- //ACI0098693
- If (Is Windows:C1573)
-
- $SubformWidth:=400
- $SubformHeight:=120
-
- $x1:=(Screen width:C187/2)-($SubformWidth/2)
- $y1:=(Screen height:C188-$SubformHeight)/2
- $x2:=$x1+$SubformWidth
- $y2:=$y1+$SubformHeight
-
- <>ProgressWindow:=Open window:C153($x1; $y1; $x2; $y2; Plain fixed size window:K34:6+Form has no menu bar:K39:18)
- <>VerticalCenter:=($y1+$y2)/2
-
- DIALOG:C40("D_Multiprogress_Win")
-
- Else
-
-
-
- $SubformWidth:=400
- $SubformHeight:=68
-
- $x1:=(Screen width:C187/2)-($SubformWidth/2)
- $y1:=80+Tool bar height:C1016
- $x2:=$x1+$SubformWidth
- $y2:=$y1+$SubformHeight
-
- //<>ProgressWindow:=Open window($x1;$y1;$x2;$y2;Plain fixed size window) // ACI0098693 +_ o _ Compositing mode)
-
- //<>ProgressWindow:=Open window($x1;$y1;$x2;$y2;Palette window*(-1))
- <>ProgressWindow:=Open window:C153($x1; $y1; $x2; $y2; Plain fixed size window:K34:6*(-1))
- <>VerticalCenter:=$x1
-
- DIALOG:C40("D_Multiprogress_Mac")
-
- End if
+ $form:="D_Multiprogress_Mac"
+ FORM GET PROPERTIES:C674($form; $width; $height)
- CLOSE WINDOW:C154
+ $left:=(Screen width:C187\2)-($width\2)
+ $top:=80+Tool bar height:C1016
+ $bottom:=$top+$height
- <>PS_Progress:=0
+ <>ProgressWindow:=Open form window:C675($form; Plain fixed size window:K34:6*(-1); $left; $top)
+ <>VerticalCenter:=$left
End if
+
+DIALOG:C40($form)
+CLOSE WINDOW:C154
+
+<>PS_Progress:=0
diff --git a/Project/Sources/catalog.4DCatalog b/Project/Sources/catalog.4DCatalog
index 2e80a0f..de94aba 100644
--- a/Project/Sources/catalog.4DCatalog
+++ b/Project/Sources/catalog.4DCatalog
@@ -2,7 +2,7 @@
-
+
diff --git a/Project/Sources/settings.4DSettings b/Project/Sources/settings.4DSettings
index 3e27338..d5a84f3 100644
--- a/Project/Sources/settings.4DSettings
+++ b/Project/Sources/settings.4DSettings
@@ -1,66 +1,48 @@
-
+
-
-
-
-
+
+
-
-
-
+
-
-
+
-
-
-
-
+
+
-
-
+
-
-
-
-
+
-
-
+
-
-
+
-
-
-
-
+
+
-
-
+
-
-
-
\ No newline at end of file
+
\ No newline at end of file