Changeset 317 for trunk/Forms/FormMain.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/FormMain.pas (moved) (moved from trunk/Forms/UFormMain.pas ) (10 diffs)

trunk/Forms/FormMain.pas

@@ -1 @@
-unit UFormMain;
+unit FormMain;
 
 interface
@@ -5 +5 @@
 uses
   Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, ExtCtrls,
-  UGame, LCLType, Menus, ActnList, ComCtrls, dateutils, XMLConf, DOM;
+  Game, LCLType, Menus, ActnList, ComCtrls, DateUtils, XMLConf, DOM, FormClient,
+  FormKeyShortcuts, FormPlayersStats, FormUnitMoves, FormCharts, FormEx;
 
 const
@@ -15 +16 @@
   { TFormMain }
 
-  TFormMain = class(TForm)
+  TFormMain = class(TFormEx)
     AUnitShapeVisible: TAction;
     AMapGridVisible: TAction;
@@ -93 +94 @@
     procedure UpdateClientForms;
   public
+    FormClient: TFormClient;
+    FormKeyShortcuts: TFormKeyShortcuts;
+    FormPlayersStats: TFormPlayersStats;
+    FormUnitMoves: TFormUnitMoves;
+    FormCharts: TFormCharts;
     procedure LoadConfig(Config: TXmlConfig; Path: string);
     procedure SaveConfig(Config: TXmlConfig; Path: string);
@@ -98 +104 @@
   end;
 
-var
-  FormMain: TFormMain;
-
 
 implementation
 
 uses
-  UCore, UFormClient;
+  Core;
 
 resourcestring
@@ -124 +127 @@
 begin
   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;
 end;
@@ -150 +154 @@
 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;
@@ -227 +231 @@
 procedure TFormMain.FormClose(Sender: TObject; var CloseAction: TCloseAction);
 begin
-  Core.Game.Running := False;
-  Core.PersistentForm.Save(Self);
-  SaveConfig(Core.XMLConfig1, 'FormMain');
-  Core.CellGridVisible := AMapGridVisible.Checked;
-  Core.UnitShapeVisible := AUnitShapeVisible.Checked;
-  Core.Done;
+  Core.Core.Game.Running := False;
+  SaveConfig(Core.Core.XMLConfig1, 'FormMain');
+  Core.Core.CellGridVisible := AMapGridVisible.Checked;
+  Core.Core.UnitShapeVisible := AUnitShapeVisible.Checked;
+  Core.Core.Done;
 end;
 
 procedure TFormMain.FormDestroy(Sender: TObject);
 begin
-  FormClient.Free;
+  FreeAndNil(FormClient);
 end;
 
 procedure TFormMain.ApplicationStart(Ptr: IntPtr);
 begin
-  Core.ReopenGameOnInit;
+  Core.Core.ReopenGameOnInit;
 end;
 
@@ -255 +258 @@
   FormClient.AStatusBarVisible.Checked := AStatusBarVisible.Checked;
   FormClient.AStatusBarVisible.Update;
-  Core.CellGridVisible := AMapGridVisible.Checked;
-  Core.UnitShapeVisible := AUnitShapeVisible.Checked;
+  Core.Core.CellGridVisible := AMapGridVisible.Checked;
+  Core.Core.UnitShapeVisible := AUnitShapeVisible.Checked;
   if Assigned(FormClient.Client) then begin
-    FormClient.Client.CellGridVisible := Core.CellGridVisible;
-    FormClient.Client.UnitShapeVisible := Core.UnitShapeVisible;
+    FormClient.Client.CellGridVisible := Core.Core.CellGridVisible;
+    FormClient.Client.UnitShapeVisible := Core.Core.UnitShapeVisible;
   end;
   FormClient.Redraw;
-  for I := 0 to Core.FormClients.Count - 1 do begin
-    Core.FormClients[I].AToolBarBigIcons.Checked := AToolBarBigIcons.Checked;
-    Core.FormClients[I].AToolBarBigIcons.Update;
-    Core.FormClients[I].AToolBarVisible.Checked := AToolBarVisible.Checked;
-    Core.FormClients[I].AToolBarVisible.Update;
-    Core.FormClients[I].AStatusBarVisible.Checked := AStatusBarVisible.Checked;
-    Core.FormClients[I].AStatusBarVisible.Update;
-    if Assigned(Core.FormClients[I].Client) then begin
-      Core.FormClients[I].Client.CellGridVisible := Core.CellGridVisible;
-      Core.FormClients[I].Client.UnitShapeVisible := Core.UnitShapeVisible;
+  for I := 0 to Core.Core.FormClients.Count - 1 do begin
+    Core.Core.FormClients[I].AToolBarBigIcons.Checked := AToolBarBigIcons.Checked;
+    Core.Core.FormClients[I].AToolBarBigIcons.Update;
+    Core.Core.FormClients[I].AToolBarVisible.Checked := AToolBarVisible.Checked;
+    Core.Core.FormClients[I].AToolBarVisible.Update;
+    Core.Core.FormClients[I].AStatusBarVisible.Checked := AStatusBarVisible.Checked;
+    Core.Core.FormClients[I].AStatusBarVisible.Update;
+    if Assigned(Core.Core.FormClients[I].Client) then begin
+      Core.Core.FormClients[I].Client.CellGridVisible := Core.Core.CellGridVisible;
+      Core.Core.FormClients[I].Client.UnitShapeVisible := Core.Core.UnitShapeVisible;
     end;
-    Core.FormClients[I].Redraw;
+    Core.Core.FormClients[I].Redraw;
   end;
 end;
@@ -280 +283 @@
 begin
   if not FormShown then begin
-    Core.LoadConfig;
-    AMapGridVisible.Checked := Core.CellGridVisible;
-    AUnitShapeVisible.Checked := Core.UnitShapeVisible;
-    Core.ScaleDPI;
-    Core.PersistentForm.Load(Self);
-    FullScreen := Core.PersistentForm.FormFullScreen;
-    Core.ThemeManager1.UseTheme(Self);
-    Core.Init;
-    LoadConfig(Core.XMLConfig1, 'FormMain');
+    AMapGridVisible.Checked := Core.Core.CellGridVisible;
+    AUnitShapeVisible.Checked := Core.Core.UnitShapeVisible;
+    Core.Core.ScaleDPI;
+    FullScreen := Core.Core.PersistentForm1.FormFullScreen;
+    Core.Core.Init;
+    LoadConfig(Core.Core.XMLConfig1, 'FormMain');
     ReloadView;
     FormClient.Show;