Skip to content

Commit

Permalink
No more menu bar in progress dialog
Browse files Browse the repository at this point in the history
  • Loading branch information
@vdelachaux
vdelachaux committed Jun 21, 2024
1 parent 2ab01e5 commit b191639
Show file tree
Hide file tree
Showing 6 changed files with 120 additions and 169 deletions.
3 changes: 2 additions & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,4 +77,5 @@ DEV/

#--------------------------------
# Added by user
#--------------------------------
#--------------------------------
Project/Sources/dependencies.json
129 changes: 64 additions & 65 deletions Project/Sources/Methods/Compiler_Methods.4dm
View file
Original file line number Diff line number Diff line change
@@ -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)
//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)
14 changes: 0 additions & 14 deletions Project/Sources/Methods/Compiler_Variables_Inter.4dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
93 changes: 38 additions & 55 deletions Project/Sources/Methods/Progress__Launch.4dm
View file
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion Project/Sources/catalog.4DCatalog
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<!DOCTYPE base SYSTEM "http://www.4d.com/dtd/2007/base.dtd" >
<base name="4D Progress" uuid="68BD2462373848CCA1544E8228A86C23" collation_locale="fr">
<schema name="DEFAULT_SCHEMA"/>
<base_extra package_name="4D Progress" structure_file_name="4D Progress" data_file_path=":4D Progress.4DD" ppc_code_stamp="302" __stringCompHash="icu:68.1.0" __keywordBuildingHash="icu:68.1.0">
<base_extra package_name="4D Progress" structure_file_name="4D Progress" data_file_path=":4D Progress.4DD" ppc_code_stamp="302">
<temp_folder folder_selector="data"/>
<journal_file journal_file_enabled="false"/>
</base_extra>
Expand Down
48 changes: 15 additions & 33 deletions Project/Sources/settings.4DSettings
View file
Original file line number Diff line number Diff line change
@@ -1,66 +1,48 @@
<?xml version="1.0" encoding="UTF-8"?><preferences stamp="16">
<?xml version="1.0" encoding="UTF-8"?><preferences stamp="17">
<com.4d>
<interface>
<user can_change_password="true" default_user="0" print_progress="false"/>
<shortcuts>
<add_subform command="false" key_code="0" shift="false"/>
<cancel_input_form key_code="0"/>
<accept_input_form key_code="0"/>
</shortcuts>
<developper design_acces="0"/>
</interface>
<accept_input_form key_code="0"/> </shortcuts>
<developper design_acces="0"/> </interface>
<web>
<standalone_server>
<configuration ip_address="0" listening_address="::" port_number="8080">
<hosts>
<host home_page="index.html" html_root="./DossierWeb/" id="0" name="Default"/>
</hosts>
</configuration>
<host home_page="index.html" html_root="./DossierWeb/" id="0" name="Default"/> </hosts> </configuration>
<options>
<web_processes timeout_for_inactives="18000"/>
<cache cache_max_size="524288" use_4d_web_cache="false"/>
<web_passwords generic_web_user="1"/>
</options>
<web_passwords generic_web_user="1"/> </options>
<log tokens="">
<backup daily="" hourly="" mode="0" monthly="" size="0" weekly=""/>
</log>
<misc/>
</standalone_server>
<backup daily="" hourly="" mode="0" monthly="" size="0" weekly=""/> </log>
<misc/> </standalone_server>
<remote>
<misc/>
<options>
<web_processes timeout_for_inactives="18000"/>
<cache cache_max_size="524288" use_4d_web_cache="false"/>
<web_passwords generic_web_user="1"/>
</options>
<web_passwords generic_web_user="1"/> </options>
<configuration allow_ssl="false" ip_address="0"/>
<webservices>
<server allow_requests="false"/>
</webservices>
</remote>
</web>
<server allow_requests="false"/> </webservices> </remote> </web>
<compiler>
<typage default_for_button="1" default_for_numeric="1"/>
<options AMD64_support="true" compilation_path="3" fat_binary="true"/>
</compiler>
<options AMD64_support="true" compilation_path="3" fat_binary="true"/> </compiler>
<sql>
<access data_read_only="0" data_read_write="0" full="1"/>
</sql>
<access data_read_only="0" data_read_write="0" full="1"/> </sql>
<server>
<network>
<options publication_name="4D Progress" use_legacy_network_layer="true"/>
</network>
</server>
<general startup_environnement="0">
<options publication_name="4D Progress" use_legacy_network_layer="true"/> </network> </server>
<general execute_host_database_event="true" startup_environnement="0">
<font font_name="Lucida Grande"/>
<mover always_display_dialog="2"/>
</general>
<mover always_display_dialog="2"/> </general>
<database>
<cache size_fixed="32" size_maximum="100" size_reserved="128"/>
<misc use_ast_interpreter="false"/>
</database>
<deployment>
<options/>
</deployment>
</com.4d>
</preferences>
</deployment> </com.4d> </preferences>

0 comments on commit b191639

Please sign in to comment.