Changeset 317 for trunk/Forms/FormClient.pas

Timestamp:

Jun 21, 2024, 12:44:53 PM (2 weeks ago)

Author:

chronos

Message:

• Modified: Remove U prefix from unit names.
• Modified: Use TFormEx for all forms for code simplification.

File:

• trunk/Forms/FormClient.pas (moved) (moved from trunk/Forms/UFormClient.pas ) (16 diffs)

trunk/Forms/FormClient.pas

@@ -1 @@
-unit UFormClient;
+unit FormClient;
 
 interface
@@ -5 +5 @@
 uses
   Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, ExtCtrls,
-  UGame, LCLType, Menus, ActnList, ComCtrls, dateutils, XMLConf, DOM, Math,
-  UGeometry, UGameClient, UGameProtocol, Threading, UPlayer, UClientGUI, UFormMain;
+  Game, LCLType, Menus, ActnList, ComCtrls, dateutils, XMLConf, DOM, Math,
+  Geometry, GameClient, GameProtocol, Threading, Player, ClientGUI,
+  FormEx, Generics.Collections;
 
 const
@@ -18 +19 @@
   { TFormClient }
 
-  TFormClient = class(TForm)
+  TFormClient = class(TFormEx)
     ASurrender: TAction;
     AGameEndTurn: TAction;
@@ -93 +94 @@
     procedure DoClientDestroy(Sender: TObject);
   public
-    FormMain: TFormMain;
     procedure LoadConfig(Config: TXmlConfig; Path: string);
     procedure SaveConfig(Config: TXmlConfig; Path: string);
@@ -101 +101 @@
   end;
 
-var
-  FormClient: TFormClient;
+  TFormClients = class(TObjectList<TFormClient>)
+  end;
 
 const
@@ -111 +111 @@
 
 uses
-  UCore, UFormMove;
+  Core, FormMove;
 
 resourcestring
@@ -321 +321 @@
   if RedrawPending and not Drawing then begin
     Drawing := True;
-    if not Core.DevelMode then RedrawPending := False;
+    if not Core.Core.DevelMode then RedrawPending := False;
     TimerPeriod := (9 * TimerPeriod + (Now - LastTimerTime)) / 10;
     LastTimerTime := Now;
@@ -327 +327 @@
     StatusBar1.Panels[1].Text := IntToStr(Trunc(DrawDuration / OneMillisecond)) + ' / ' +
       IntToStr(Trunc(TimerPeriod / OneMillisecond)) + ' ms' +
-      ' ' + IntToStr(Core.Game.Map.CellLinks.Count);
+      ' ' + IntToStr(Core.Core.Game.Map.CellLinks.Count);
     NewCaption := 'xTactics';
-    if Assigned(Core.Game.CurrentPlayer) then
-      NewCaption := Core.Game.CurrentPlayer.Name + ' - ' + STurn + ' ' + IntToStr(Core.Game.TurnCounter) + ' - ' + NewCaption;
+    if Assigned(Core.Core.Game.CurrentPlayer) then
+      NewCaption := Core.Core.Game.CurrentPlayer.Name + ' - ' + STurn + ' ' + IntToStr(Core.Core.Game.TurnCounter) + ' - ' + NewCaption;
     Caption := NewCaption;
     Drawing := False;
@@ -350 +350 @@
     FClient.OnNextPlayer := DoNextPlayer;
     FClient.View.DestRect := TRect.CreateBounds(TPoint.Create(0, 0), TPoint.Create(PaintBox1.Width, PaintBox1.Height));
-    FClient.CellGridVisible := Core.CellGridVisible;
-    FClient.UnitShapeVisible := Core.UnitShapeVisible;
+    FClient.CellGridVisible := Core.Core.CellGridVisible;
+    FClient.UnitShapeVisible := Core.Core.UnitShapeVisible;
   end;
   Redraw;
@@ -399 +399 @@
 begin
   if AToolBarBigIcons.Checked then begin
-    ToolBar1.Images := Core.ImageListLarge;
-    ToolBar1.ButtonWidth := Core.ImageListLarge.Width + 7;
-    ToolBar1.ButtonHeight := Core.ImageListLarge.Height + 6;
-    ToolBar1.Width := Core.ImageListLarge.Width + 10;
-    ToolBar1.Height := Core.ImageListLarge.Height + 10;
+    ToolBar1.Images := Core.Core.ImageListLarge;
+    ToolBar1.ButtonWidth := Core.Core.ImageListLarge.Width + 7;
+    ToolBar1.ButtonHeight := Core.Core.ImageListLarge.Height + 6;
+    ToolBar1.Width := Core.Core.ImageListLarge.Width + 10;
+    ToolBar1.Height := Core.Core.ImageListLarge.Height + 10;
   end else begin
-    ToolBar1.Images := Core.ImageListSmall;
-    ToolBar1.ButtonWidth := Core.ImageListSmall.Width + 7;
-    ToolBar1.ButtonHeight := Core.ImageListSmall.Height + 6;
-    ToolBar1.Width := Core.ImageListSmall.Width + 10;
-    ToolBar1.Height := Core.ImageListSmall.Height + 10;
+    ToolBar1.Images := Core.Core.ImageListSmall;
+    ToolBar1.ButtonWidth := Core.Core.ImageListSmall.Width + 7;
+    ToolBar1.ButtonHeight := Core.Core.ImageListSmall.Height + 6;
+    ToolBar1.Width := Core.Core.ImageListSmall.Width + 10;
+    ToolBar1.Height := Core.Core.ImageListSmall.Height + 10;
   end;
   ToolBar1.Visible := AToolBarVisible.Checked;
@@ -433 +433 @@
   TimerPeriod := 0;
   LastTimerTime := Now;
-  Core.CoolTranslator1.TranslateComponentRecursive(Self);
 end;
 
 procedure TFormClient.AZoomAllExecute(Sender: TObject);
 begin
-  with Core, Game, Client, View do begin
+  with Core.Core, Game, Client, View do begin
     ZoomAll;
   end;
@@ -512 +511 @@
 procedure TFormClient.FormClose(Sender: TObject; var CloseAction: TCloseAction);
 begin
-  SaveConfig(Core.XMLConfig1, 'FormClient');
-  Core.PersistentForm.Save(Self);
+  SaveConfig(Core.Core.XMLConfig1, 'FormClient');
 end;
 
@@ -529 +527 @@
 begin
   if (Key = EscapeKey) or (Key = ControlKey) then
-  if Assigned(Core.Game.CurrentPlayer) then begin
+  if Assigned(Core.Core.Game.CurrentPlayer) then begin
     Client.View.SelectedCell := nil;
     Redraw;
@@ -538 +536 @@
 begin
   SetToolbarHints;
-  LoadConfig(Core.XMLConfig1, 'FormClient');
-  Core.PersistentForm.Load(Self);
-  Core.ThemeManager1.UseTheme(Self);
+  LoadConfig(Core.Core.XMLConfig1, 'FormClient');
   UpdateInterface;
   Redraw;
@@ -585 +581 @@
     Cell := nil;
     OldCell := Client.View.FocusedCell;
-    with Core.Game do
+    with Core.Core.Game do
       if Assigned(Client.ControlPlayer) then begin
         if Map.Cyclic then begin
@@ -619 +615 @@
   if (Abs(StartMousePoint.X - X) < Trunc(Screen.PixelsPerInch * MouseMinDiff)) and
   (Abs(StartMousePoint.Y - Y) < Trunc(Screen.PixelsPerInch * MouseMinDiff)) then begin
-    if Core.Game.Running and (Core.Game.CurrentPlayer.Mode = pmHuman) and
-    (Core.Game.CurrentPlayer = Client.ControlPlayer) then begin
+    if Core.Core.Game.Running and (Core.Core.Game.CurrentPlayer.Mode = pmHuman) and
+    (Core.Core.Game.CurrentPlayer = Client.ControlPlayer) then begin
       Client.View.SelectCell(TPoint.Create(X, Y), Client.ControlPlayer, Shift);
       Redraw;