Changeset 731

Timestamp:

Jan 17, 2026, 9:14:41 AM (6 hours ago)

Author:

chronos

Message:

• Modified: Initialize Log dialog later from Term and NoTerm forms.

Location:

trunk

Files:

• Integrated.lpr (modified) (1 diff)
• LocalPlayer/Term.pas (modified) (7 diffs)
• Log.pas (modified) (1 diff)
• NoTerm.lfm (modified) (1 diff)
• NoTerm.pas (modified) (7 diffs)

trunk/Integrated.lpr

@@ -38 +38 @@
   Application.CreateForm(TStartDlg, StartDlg);
   Application.CreateForm(TBackground, Background);
-  Application.CreateForm(TLogDlg, LogDlg);
   Application.Run;
   ScreenTools.UnitDone;

trunk/LocalPlayer/Term.pas

@@ -13 +13 @@
   Protocol, Tribes, PVSB, ClientTools, ScreenTools, BaseWin, Messg, ButtonBase,
   LCLIntf, LCLType, Menus, SysUtils, Classes, DrawDlg, Types, Math,
-  DateUtils, Platform, ButtonB, ButtonC, EOTButton, Area, Help,
+  DateUtils, Platform, ButtonB, ButtonC, EOTButton, Area, Help, Log,
   GraphicSet, MiniMap, IsoEngine, Wonders, TechTree, Enhance, Nego, CityType,
   Diagram, CityScreen, Rates, Battle, NatStat, UnitStat, Draft, Select, MessgEx,
@@ -357 +357 @@
     FMessgExDlg: TMessgExDlg;
     FHelpDlg: THelpDlg;
+    FLogDlg: TLogDlg;
     procedure ProcessMessagesWithDisabledKeyboard;
     procedure ResizeControls;
@@ -363 +364 @@
     function ChooseUnusedTribe: Integer;
     function DoJob(j0: Integer): Integer;
+    function GetLogDlg: TLogDlg;
     function GetBattleDlg: TBattleDlg;
     function GetCityDlg: TCityDlg;
@@ -470 +472 @@
     property MessgExDlg: TMessgExDlg read GetMessgExDlg;
     property HelpDlg: THelpDlg read GetHelpDlg;
+    property LogDlg: TLogDlg read GetLogDlg;
   end;
 
@@ -661 +664 @@
 
 uses
-  Directories, Log, Sound, Registry, Global, KeyBindings, CmdList, Music;
+  Directories, Sound, Registry, Global, KeyBindings, CmdList, Music;
 
 {$R *.lfm}
@@ -3642 +3645 @@
   if Assigned(FMessgExDlg) then FreeAndNil(FMessgExDlg);
   if Assigned(FHelpDlg) then FreeAndNil(FHelpDlg);
+  if Assigned(FLogDlg) then FreeAndNil(FLogDlg);
 
   MainFormKeyDown := nil;
@@ -6566 +6570 @@
   end;
   {$ENDIF}
+end;
+
+function TMainScreen.GetLogDlg: TLogDlg;
+begin
+  if not Assigned(FLogDlg) then FLogDlg := TLogDlg.Create(nil);
+  Result := FLogDlg;
 end;
 

trunk/Log.pas

@@ -33 +33 @@
       Shift: TShiftState; X, Y: Integer);
     procedure FormKeyUp(Sender: TObject; var Key: Word; Shift: TShiftState);
+  private
+    MaxLevel: Integer;
   public
     Host: TForm;
     procedure Add(Level, Turn: Integer; Text: PChar);
-  private
-    MaxLevel: Integer;
   end;
-
-var
-  LogDlg: TLogDlg;
 
 

trunk/NoTerm.lfm

@@ -13 +13 @@
   Font.Name = 'MS Sans Serif'
   OnCreate = FormCreate
+  OnDestroy = FormDestroy
   OnKeyDown = FormKeyDown
   OnPaint = FormPaint

trunk/NoTerm.pas

@@ -6 +6 @@
 uses
   ScreenTools, Protocol, Messg, LCLIntf, LCLType, DateUtils, Platform,
-  SysUtils, Classes, ButtonB, DrawDlg,
+  SysUtils, Classes, ButtonB, DrawDlg, Log,
   {$IFDEF DPI}Dpi.Graphics, Dpi.Controls, Dpi.Forms, Dpi.Common, System.UITypes{$ELSE}
   Graphics, Controls, Forms{$ENDIF};
@@ -12 +12 @@
 type
   TRunMode = (rmStop, rmStopped, rmRunning, rmQuit);
+
+  { TNoTermDlg }
 
   TNoTermDlg = class(TDrawDlg)
@@ -20 +22 @@
     procedure FormPaint(Sender: TObject);
     procedure FormCreate(Sender: TObject);
+    procedure FormDestroy(Sender: TObject);
     procedure FormKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
+  private
+    function GetLogDlg: TLogDlg;
   public
     procedure Client(Command, Player: Integer; var Data);
@@ -43 +48 @@
     TimeStat: array [0 .. nPl - 1] of Extended;
     Mode: TRunMode;
+    FLogDlg: TLogDlg;
     procedure NewStat;
     procedure EndPlaying;
     procedure ShowActive(P: Integer; Active: Boolean);
     procedure ShowYear;
+    property LogDlg: TLogDlg read GetLogDlg;
   end;
 
@@ -58 +65 @@
 
 uses
-  GameServer, Log;
+  GameServer;
 
 {$R *.lfm}
@@ -95 +102 @@
   InitButtons;
   LastShowYearTime := 0;
+end;
+
+procedure TNoTermDlg.FormDestroy(Sender: TObject);
+begin
+  if Assigned(FLogDlg) then FreeAndNil(FLogDlg);
 end;
 
@@ -397 +409 @@
 end;
 
+function TNoTermDlg.GetLogDlg: TLogDlg;
+begin
+  if not Assigned(FLogDlg) then FLogDlg := TLogDlg.Create(nil);
+  Result := FLogDlg;
+end;
+
 initialization