Build 135

MaxiDonkey · Jan 9, 2021 · 171b363 · 171b363
1 parent b334d2f
commit 171b363
Show file tree

Hide file tree

Showing 40 changed files with 660 additions and 126 deletions.
diff --git a/Install/Output/RaoulFumier.exe b/Install/Output/RaoulFumier.exe
diff --git a/Persephone/Share/uRegistry.pas b/Persephone/Share/uRegistry.pas
@@ -12,11 +12,13 @@ procedure KeyWrite(AKey: string; KeyName: string; Value: string); overload;
 procedure KeyWrite(AKey: string; KeyName: string; Value: Double); overload;
 procedure KeyWrite(AKey: string; KeyName: string; Value: Integer); overload;
 procedure KeyWrite(AKey: string; KeyName: string; Value: Boolean); overload;
+procedure KeyWrite(AKey: string; KeyName: string; Value: Cardinal); overload;
 
 function KeyReadInt(AKey: string; KeyName: string; Default: Integer = 0):Integer;
 function KeyReadFloat(AKey: string; KeyName: string; Default: Double = 0.0):Double;
 function KeyReadBoolean(AKey: string; KeyName: string; Default: Boolean = False):Boolean;
 function KeyReadString(AKey: string; KeyName: string; Default: string = ''):string;
+function KeyReadCard(AKey: string; KeyName: string; Default: Cardinal = 0):Cardinal;
 
 procedure KeyDeleteValue(AKey: string; KeyName: string);
 
@@ -161,17 +163,22 @@ procedure KeyWrite(AKey: string; KeyName: string; Value: string);
 
 procedure KeyWrite(AKey: string; KeyName: string; Value: Double);
 begin
-  KeyWrite(AKey, KeyName, FloatToStr(Value) );
+  KeyWrite(AKey, KeyName, FloatToStr(Value) )
 end;
 
 procedure KeyWrite(AKey: string; KeyName: string; Value: Integer);
 begin
-  KeyWrite(AKey, KeyName, IntToStr(Value) );
+  KeyWrite(AKey, KeyName, IntToStr(Value) )
+end;
+
+procedure KeyWrite(AKey: string; KeyName: string; Value: Cardinal);
+begin
+  KeyWrite(AKey, KeyName, IntToStr(Value) )
 end;
 
 procedure KeyWrite(AKey: string; KeyName: string; Value: Boolean);
 begin
-  KeyWrite(AKey, KeyName, Integer(Value) );
+  KeyWrite(AKey, KeyName, Integer(Value) )
 end;
 
 function KeyReadInt(AKey: string; KeyName: string; Default: Integer):Integer;
@@ -187,6 +194,19 @@ function KeyReadInt(AKey: string; KeyName: string; Default: Integer):Integer;
   end;
 end;
 
+function KeyReadCard(AKey: string; KeyName: string; Default: Cardinal = 0):Cardinal;
+var
+  Value : string;
+begin
+  KeyRead(AKey, KeyName, Value);
+  try
+    if Value = EmptyStr then Result := Default
+      else Result := StrToInt64( Value );
+  except
+    Result := Default;
+  end;
+end;
+
 function KeyReadFloat(AKey: string; KeyName: string; Default: Double):Double;
 var
   Value : string;

diff --git a/RaoulInterface/EliteBindingsTools.pas b/RaoulInterface/EliteBindingsTools.pas
@@ -1086,11 +1086,10 @@   TKeyMessageSender = class
     FTimems            : Cardinal;
     FDown              : TStringList;
     FClock             : Cardinal;
-    FSurveyor          : TKeySurveyor;
+    FSurveyor          : TKeySurveyor; //Thread de surveillance du clavier : à revoir
     FOnBeforeMouseDown : TNotifyEvent;
     FOnAfterMouseDown  : TNotifyEvent;
     FMouseFactory      : TMouseFactory;
-    FKeySurveyor       : TKeySurveyor;
     function MouseSignalToEvent(const Value: Word; UpSignal: Boolean;
       var Button: Word):Word;
     procedure DoBeforeMouseSignal;
@@ -1142,6 +1141,7 @@   TMouseFactory = class
   TKeySurveyor = class(TThread)
   private
     ThKeyMessageSender : TKeyMessageSender;
+    FStop              : Boolean;            
     procedure ThDelay(ms: Cardinal);
     procedure Process;
   protected
@@ -3501,7 +3501,7 @@ constructor TKeyMessageSender.Create;
   inherited Create;
   FDown         := TStringList.Create;
   FMouseFactory := TMouseFactory.Create;
-  FKeySurveyor  := nil
+  FSurveyor     := nil
 end;
 
 destructor TKeyMessageSender.Destroy;
@@ -3555,7 +3555,8 @@ procedure TKeyMessageSender.DoKeyUp;
       Delete(i)
     end;
     FClock := GetTickCount
-  end
+  end;
+  if Assigned(FSurveyor) then FSurveyor.Terminate
 end; {DoKeyUp}
 
 class procedure TKeyMessageSender.Finalize;
@@ -3576,8 +3577,7 @@ class procedure TKeyMessageSender.Initialize;
 
 class procedure TKeyMessageSender.KeyUp;
 begin
-  if Assigned(KeyMessageSender) then with KeyMessageSender do
-    DoKeyUp
+  if Assigned(KeyMessageSender) then with KeyMessageSender do DoKeyUp
 end;
 
 function TKeyMessageSender.MouseSignalToEvent(const Value: Word;
@@ -3823,7 +3823,8 @@ constructor TKeySurveyor.Create(const AKeyMessager: TKeyMessageSender);
 
 procedure TKeySurveyor.Execute;
 begin
-  while not Terminated and not Application.Terminated do begin
+  FStop := False;
+  while not Terminated and not Application.Terminated and not Fstop do begin
     Synchronize( Process );
     ThDelay( 2000 )
   end
@@ -3832,7 +3833,10 @@ procedure TKeySurveyor.Execute;
 procedure TKeySurveyor.Process;
 begin
   { --- 60 seconds for key down before automatic key up }
-  with ThKeyMessageSender do if GetTickCount - Clock > 60000 then DoKeyUp
+  with ThKeyMessageSender do if GetTickCount - Clock > 60000 then begin
+    DoKeyUp;
+    FStop := True
+  end
 end;
 
 procedure TKeySurveyor.ThDelay(ms: Cardinal);

diff --git a/RaoulInterface/RaoulFumier.bdsproj b/RaoulInterface/RaoulFumier.bdsproj
@@ -148,7 +148,7 @@
 			<VersionInfo Name="MajorVer">0</VersionInfo>
 			<VersionInfo Name="MinorVer">9</VersionInfo>
 			<VersionInfo Name="Release">1</VersionInfo>
-			<VersionInfo Name="Build">129</VersionInfo>
+			<VersionInfo Name="Build">135</VersionInfo>
 			<VersionInfo Name="Debug">False</VersionInfo>
 			<VersionInfo Name="PreRelease">False</VersionInfo>
 			<VersionInfo Name="Special">False</VersionInfo>
@@ -158,7 +158,7 @@
 			<VersionInfo Name="CodePage">1252</VersionInfo>
 		</VersionInfo>
 		<VersionInfoKeys>
-			<VersionInfoKeys Name="FileVersion">0.9.1.129</VersionInfoKeys>
+			<VersionInfoKeys Name="FileVersion">0.9.1.135</VersionInfoKeys>
 			<VersionInfoKeys Name="ProductVersion">0.9</VersionInfoKeys>
 			<VersionInfoKeys Name="CompanyName">MaxiDonkey</VersionInfoKeys>
 			<VersionInfoKeys Name="FileDescription">Assistance vocale</VersionInfoKeys>
@@ -167,7 +167,8 @@
 			<VersionInfoKeys Name="LegalTrademarks">MaxiDonkey</VersionInfoKeys>
 			<VersionInfoKeys Name="OriginalFilename">Persephone</VersionInfoKeys>
 			<VersionInfoKeys Name="ProductName">Raoul Fumieer</VersionInfoKeys>
-		</VersionInfoKeys>  <Excluded_Packages>
+		</VersionInfoKeys>  
+    <Excluded_Packages>
       <Excluded_Packages Name="C:\Users\JANKOWSKI\Documents\Projets Borland Studio\Bpl\SynEdit_D2005.bpl">SynEdit component suite</Excluded_Packages>
     </Excluded_Packages>
   </Delphi.Personality>

diff --git a/RaoulInterface/RaoulFumier.bdsproj.local b/RaoulInterface/RaoulFumier.bdsproj.local
@@ -48,5 +48,6 @@
     <Transaction>2020/12/11 04:10:53.975.pas,H:\2020 Developpement\RaoulFumier\RaoulInterface\Unit1.pas=H:\2020 Developpement\RaoulFumier\RaoulInterface\uGauss.pas</Transaction>
     <Transaction>2020/12/11 13:23:12.677.pas,H:\2020 Developpement\RaoulFumier\RaoulInterface\Unit1.pas=H:\2020 Developpement\RaoulFumier\RaoulInterface\uGaussDisplay.pas</Transaction>
     <Transaction>2020/12/11 13:23:12.677.dfm,H:\2020 Developpement\RaoulFumier\RaoulInterface\Unit1.dfm=H:\2020 Developpement\RaoulFumier\RaoulInterface\uGaussDisplay.dfm</Transaction>
+    <Transaction>2021/01/09 00:51:18.687.pas,H:\2020 Developpement\RaoulFumier\RaoulInterface\Unit1.pas=H:\2020 Developpement\RaoulFumier\RaoulInterface\uStrComment.pas</Transaction>
   </Transactions>
 </BorlandProject>
diff --git a/RaoulInterface/RaoulFumier.dpr b/RaoulInterface/RaoulFumier.dpr
@@ -23,7 +23,8 @@ uses
   uEliteHelp in 'uEliteHelp.pas',
   uSplashWaitForm in 'uSplashWaitForm.pas' {SplashWaitForm},
   uGauss in 'uGauss.pas',
-  uGaussDisplay in 'uGaussDisplay.pas' {GaussDisplayForm};
+  uGaussDisplay in 'uGaussDisplay.pas' {GaussDisplayForm},
+  uStrComment in 'uStrComment.pas';
 
 {$R *.res}
 

diff --git a/RaoulInterface/RaoulFumier.res b/RaoulInterface/RaoulFumier.res
diff --git a/RaoulInterface/dcu/DisplayTextForm.dcu b/RaoulInterface/dcu/DisplayTextForm.dcu
diff --git a/RaoulInterface/dcu/EliteBindingsTools.dcu b/RaoulInterface/dcu/EliteBindingsTools.dcu
diff --git a/RaoulInterface/dcu/KeysDef.dcu b/RaoulInterface/dcu/KeysDef.dcu
diff --git a/RaoulInterface/dcu/ScreenDlg.dcu b/RaoulInterface/dcu/ScreenDlg.dcu
diff --git a/RaoulInterface/dcu/SendKey32.dcu b/RaoulInterface/dcu/SendKey32.dcu
diff --git a/RaoulInterface/dcu/StrCopyUtils.dcu b/RaoulInterface/dcu/StrCopyUtils.dcu
diff --git a/RaoulInterface/dcu/main.dcu b/RaoulInterface/dcu/main.dcu
diff --git a/RaoulInterface/dcu/uEliteHelp.dcu b/RaoulInterface/dcu/uEliteHelp.dcu
diff --git a/RaoulInterface/dcu/uEliteManager.dcu b/RaoulInterface/dcu/uEliteManager.dcu
diff --git a/RaoulInterface/dcu/uEmbendedAncestor.dcu b/RaoulInterface/dcu/uEmbendedAncestor.dcu
diff --git a/RaoulInterface/dcu/uEmbendedSensibility.dcu b/RaoulInterface/dcu/uEmbendedSensibility.dcu
diff --git a/RaoulInterface/dcu/uGauss.dcu b/RaoulInterface/dcu/uGauss.dcu
diff --git a/RaoulInterface/dcu/uGaussDisplay.dcu b/RaoulInterface/dcu/uGaussDisplay.dcu
diff --git a/RaoulInterface/dcu/uHelpDlg.dcu b/RaoulInterface/dcu/uHelpDlg.dcu
diff --git a/RaoulInterface/dcu/uNewRecorder.dcu b/RaoulInterface/dcu/uNewRecorder.dcu
diff --git a/RaoulInterface/dcu/uRaoulDB.dcu b/RaoulInterface/dcu/uRaoulDB.dcu
diff --git a/RaoulInterface/dcu/uRaoulDisplay.dcu b/RaoulInterface/dcu/uRaoulDisplay.dcu
diff --git a/RaoulInterface/dcu/uRaoulParameters.dcu b/RaoulInterface/dcu/uRaoulParameters.dcu
diff --git a/RaoulInterface/dcu/uRaoulRecorder.dcu b/RaoulInterface/dcu/uRaoulRecorder.dcu
diff --git a/RaoulInterface/dcu/uRaoulUpdater.dcu b/RaoulInterface/dcu/uRaoulUpdater.dcu
diff --git a/RaoulInterface/dcu/uRecorderTools.dcu b/RaoulInterface/dcu/uRecorderTools.dcu
diff --git a/RaoulInterface/dcu/uRegistry.dcu b/RaoulInterface/dcu/uRegistry.dcu
diff --git a/RaoulInterface/dcu/uScreenTools.dcu b/RaoulInterface/dcu/uScreenTools.dcu
diff --git a/RaoulInterface/dcu/uStrComment.dcu b/RaoulInterface/dcu/uStrComment.dcu
diff --git a/RaoulInterface/dcu/uWinKeyShortCut.dcu b/RaoulInterface/dcu/uWinKeyShortCut.dcu
diff --git a/RaoulInterface/main.pas b/RaoulInterface/main.pas
@@ -55,6 +55,7 @@   TMainForm = class(TForm)
   private
     FStarter: Boolean;
     procedure StarterProc;
+    procedure MonitorChanged(Sender: TObject);
 
   public
     procedure AssignKeyFun;
@@ -134,6 +135,8 @@ procedure TMainForm.FormShow(Sender: TObject);
   with TalkativeFacade do
     TalkativeView := KeyReadBoolean(BufferKey, 'TalkativeDialogBoxView', False);
   if FStarter then StarterProc;
+  { --- Events initialization }
+  ToolsDisplay.OnMonitorChanged := MonitorChanged
 end;
 
 procedure TMainForm.KeyBack(Sender: TObject);
@@ -185,6 +188,7 @@ procedure TMainForm.DelayedStartTimer(Sender: TObject);
 procedure TMainForm.FormDestroy(Sender: TObject);
 begin
   TFunctionment.Finalize;
+  TVoiceEntries.Finalize;
 end;
 
 procedure TMainForm.StarterProc;
@@ -260,4 +264,9 @@ procedure TMainForm.BootFinalizeTimer(Sender: TObject);
   KeyWrite(AppKey, 'BootState', False)
 end;
 
+procedure TMainForm.MonitorChanged(Sender: TObject);
+begin
+  GaussDisplayForm.DisplayUpdate
+end;
+
 end.
diff --git a/RaoulInterface/uEmbendedAncestor.dfm b/RaoulInterface/uEmbendedAncestor.dfm
@@ -48,8 +48,8 @@ object AncestorEmbendedForm: TAncestorEmbendedForm
       object Label2: TLabel
         Left = 1
         Top = 1
-        Width = 183
-        Height = 39
+        Width = 35
+        Height = 25
         Align = alClient
         Alignment = taCenter
         Caption = 'Oui'
@@ -74,8 +74,8 @@ object AncestorEmbendedForm: TAncestorEmbendedForm
       object Label3: TLabel
         Left = 1
         Top = 1
-        Width = 183
-        Height = 39
+        Width = 29
+        Height = 25
         Align = alClient
         Alignment = taCenter
         Caption = 'Ok'
@@ -100,8 +100,8 @@ object AncestorEmbendedForm: TAncestorEmbendedForm
       object Label4: TLabel
         Left = 1
         Top = 1
-        Width = 183
-        Height = 39
+        Width = 42
+        Height = 25
         Align = alClient
         Alignment = taCenter
         Caption = 'Non'

diff --git a/RaoulInterface/uGaussDisplay.pas b/RaoulInterface/uGaussDisplay.pas
@@ -40,15 +40,22 @@   TGaussDisplayForm = class(TForm)
     FClearIndic : Boolean;
     function GetCalcFormVisible: Boolean;
     procedure SetCalcFormVisible(const Value: Boolean);
+    procedure SetCalcPosition;
   public
+    procedure DisplayUpdate;
     procedure UpdateCadenas;
     procedure Clear;
     procedure Restore;
     property  CalcFormVisible: Boolean read GetCalcFormVisible write SetCalcFormVisible;
   end;
 
 var
-  GaussDisplayForm: TGaussDisplayForm;
+  GaussDisplayForm : TGaussDisplayForm;
+  CalcWidth        : Integer = 620;
+  CalcHeight       : Integer = 725;
+  CalcBorderRight  : Integer = 20;
+  CalcBorderBottom : Integer = 70;
+
 
 implementation
 
@@ -75,14 +82,11 @@ procedure TGaussDisplayForm.FormCreate(Sender: TObject);
     Style := [fsBold];
   end;
   Position := poDesigned;
-  Left    := 1260;
-  Height  := 725;
-  Top     := 250;
-  Width   := 621;
 end;
 
 procedure TGaussDisplayForm.FormShow(Sender: TObject);
 begin
+  SetCalcPosition;
   if IsEliteRunningUTLS then AlphaBlendValue := 120 else AlphaBlendValue := 180;
   FClearIndic := False;
   XVarCont := Label4;
@@ -142,6 +146,24 @@ procedure TGaussDisplayForm.SetCalcFormVisible(const Value: Boolean);
   KeyWrite(BufferKey, 'CalcFormVisible', Value)
 end;
 
+procedure TGaussDisplayForm.SetCalcPosition;
+var
+  IndexMonitor : Integer;
+begin
+  IndexMonitor := KeyReadInt(BufferKey, 'IndexMonitor');
+  with Screen.Monitors[IndexMonitor] do begin
+    Self.Width  := CalcWidth;
+    Self.Height := CalcHeight;
+    Self.Left   := Left + Width  - Self.Width  - CalcBorderRight;
+    Self.Top    := Top  + Height - Self.Height - CalcBorderBottom
+  end
+end;
+
+procedure TGaussDisplayForm.DisplayUpdate;
+begin
+  SetCalcPosition
+end;
+
 initialization
   KeyWrite(BufferKey, 'CalcFormVisible', False);
   KeyWrite(BufferKey, 'MetierBeforeGauss', 0);