Changeset 317 for trunk/Core.pas

Timestamp:

Jun 21, 2024, 12:44:53 PM (5 months ago)

Author:

chronos

Message:

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

File:

• trunk/Core.pas (moved) (moved from trunk/UCore.pas ) (27 diffs)

trunk/Core.pas

@@ -1 @@
-unit UCore;
+unit Core;
 
 interface
@@ -5 +5 @@
 uses
   Classes, SysUtils, XMLConf, FileUtil, ActnList, Controls, Dialogs, Forms,
-  UGame, ApplicationInfo, PersistentForm, ScaleDPI, Translator, DOM,
-  RegistryEx, LastOpenedList, Theme, Registry, Menus,
-  UFormClient, UPlayer, UGameServer, UGameClient, Generics.Collections,
-  UServerList, UGameSystem, Graphics, UUnit;
+  Game, ApplicationInfo, PersistentForm, ScaleDPI, Translator, DOM,
+  RegistryEx, LastOpenedList, Theme, Registry, Menus, FormCharts, FormMain,
+  FormClient, Player, GameServer, GameClient, Generics.Collections,
+  ServerList, GameSystem, Graphics, &Unit;
 
 type
@@ -34 +34 @@
     AGameNew: TAction;
     AGameRestart: TAction;
-    CoolTranslator1: TTranslator;
+    Translator1: TTranslator;
     ImageListLarge: TImageList;
     ImageListSmall: TImageList;
     LastOpenedList1: TLastOpenedList;
     OpenDialog1: TOpenDialog;
-    PersistentForm: TPersistentForm;
+    PersistentForm1: TPersistentForm;
     SaveDialog1: TSaveDialog;
     ScaleDPI1: TScaleDPI;
@@ -61 +61 @@
     procedure AShowUnitMovesExecute(Sender: TObject);
     procedure AToggleFogOfWarExecute(Sender: TObject);
-    procedure CoolTranslator1Translate(Sender: TObject);
+    procedure Translator1Translate(Sender: TObject);
     procedure DataModuleCreate(Sender: TObject);
     procedure DataModuleDestroy(Sender: TObject);
@@ -99 +99 @@
     AutoSaveEnabled: Boolean;
     ReopenLastFile: Boolean;
-    FormClients: TObjectList<TFormClient>;
+    FormClients: TFormClients;
     LocalClients: TClients;
     ServerList: TServerList;
     GameSystems: TGameSystems;
+    FormMain: TFormMain;
     procedure ReopenGameOnInit;
     procedure LoadConfig;
@@ -128 +129 @@
 
 uses
-  UFormMain, UFormNew, UFormSettings, UClientAI, UFormKeyShortcuts, Common,
-  UFormHelp, UFormCharts, UFormUnitMoves, UFormPlayersStats, UClientGUI, FormAbout;
+  FormNew, FormSettings, ClientAI, FormKeyShortcuts, Common, FormEx,
+  FormHelp, FormUnitMoves, FormPlayersStats, ClientGUI, FormAbout;
 
 const
@@ -145 +146 @@
   SMissingServerClientForPlayer = 'Server client for current player not found.';
 
+procedure Translate;
+begin
+  Game.InitStrings;
+end;
 
 { TCore }
@@ -196 +201 @@
 begin
   RegistryContext := TRegistryContext.Create(HKEY_CURRENT_USER, DefaultRegKey);
-  PersistentForm.RegistryContext := RegistryContext;
+  PersistentForm1.RegistryContext := RegistryContext;
   XMLConfig1.Filename := GetAppConfigDir(False) + 'Config.xml';
 
@@ -205 +210 @@
   AutoSaveEnabled := XMLConfig1.GetValue('AutoSave', True);
   ReopenLastFile := XMLConfig1.GetValue('ReopenLastFile', True);
-  CoolTranslator1.Language := CoolTranslator1.Languages.SearchByCode(String(XMLConfig1.GetValue('Language', '')));
+  Translator1.Language := Translator1.Languages.SearchByCode(String(XMLConfig1.GetValue('Language', '')));
   ScaleDPI1.DPI := Point(XMLConfig1.GetValue('DPIX', 96), XMLConfig1.GetValue('DPIY', 96));
   ScaleDPI1.AutoDetect := XMLConfig1.GetValue('DPIAuto', True);
@@ -215 +220 @@
 procedure TCore.SaveConfig;
 begin
-  XMLConfig1.SetValue('Language', WideString(CoolTranslator1.Language.Code));
+  XMLConfig1.SetValue('Language', WideString(Translator1.Language.Code));
   XMLConfig1.SetValue('Theme', WideString(ThemeManager1.Theme.Name));
   LastOpenedList1.SaveToXMLConfig(XMLConfig1, 'RecentFiles');
@@ -277 +282 @@
 begin
   FirstHuman := Game.Players.GetFirstHuman;
-  if Assigned(FirstHuman) then FormClient.Client := TClientGUI(LocalClients.SearchPlayer(FirstHuman))
+  if Assigned(FirstHuman) then FormMain.FormClient.Client := TClientGUI(LocalClients.SearchPlayer(FirstHuman))
     else begin
-      FormClient.Client := TClientGUI(LocalClients.New(SSpectator));
-      FormClient.Client.LocalServer := Server;
-      FormClient.Client.ConnectType := ctLocal;
-      FormClient.Client.Active := True;
-      FormClient.AZoomAll.Execute;
+      FormMain.FormClient.Client := TClientGUI(LocalClients.New(SSpectator));
+      FormMain.FormClient.Client.LocalServer := Server;
+      FormMain.FormClient.Client.ConnectType := ctLocal;
+      FormMain.FormClient.Client.Active := True;
+      FormMain.FormClient.AZoomAll.Execute;
     end;
 end;
@@ -339 +344 @@
 var
   NewServer: TServer;
+  FormNew: TFormNew;
 begin
   FormNew := TFormNew.Create(nil);
@@ -394 +400 @@
 
 procedure TCore.AHelpExecute(Sender: TObject);
+var
+  FormHelp: TFormHelp;
 begin
   FormHelp := TFormHelp.Create(Self);
@@ -410 +418 @@
 procedure TCore.APlayersStatsExecute(Sender: TObject);
 begin
-  if not Assigned(FormPlayersStats) then
-    FormPlayersStats := TFormPlayersStats.Create(nil);
-  FormPlayersStats.Show;
+  if not Assigned(FormMain.FormPlayersStats) then
+    FormMain.FormPlayersStats := TFormPlayersStats.Create(nil);
+  FormMain.FormPlayersStats.Show;
 end;
 
 procedure TCore.ASettingsExecute(Sender: TObject);
+var
+  FormSettings: TFormSettings;
 begin
   FormSettings := TFormSettings.Create(nil);
@@ -434 +444 @@
 procedure TCore.AShowChartsExecute(Sender: TObject);
 begin
-  if not Assigned(FormCharts) then FormCharts := TFormCharts.Create(nil);
-  FormCharts.Show;
+  if not Assigned(FormMain.FormCharts) then
+    FormMain.FormCharts := TFormCharts.Create(nil);
+  FormMain.FormCharts.Show;
 end;
 
 procedure TCore.AShowKeyShortcutsExecute(Sender: TObject);
 begin
-  if not Assigned(FormKeyShortcuts) then FormKeyShortcuts := TFormKeyShortcuts.Create(nil);
-  FormKeyShortcuts.Show;
+  if not Assigned(FormMain.FormKeyShortcuts) then FormMain.FormKeyShortcuts := TFormKeyShortcuts.Create(nil);
+  FormMain.FormKeyShortcuts.Show;
 end;
 
 procedure TCore.AShowUnitMovesExecute(Sender: TObject);
 begin
-  if not Assigned(FormUnitMoves) then FormUnitMoves := TFormUnitMoves.Create(nil);
-  FormUnitMoves.Show;
+  if not Assigned(FormMain.FormUnitMoves) then
+    FormMain.FormUnitMoves := TFormUnitMoves.Create(nil);
+  FormMain.FormUnitMoves.Show;
 end;
 
@@ -456 +468 @@
 end;
 
-procedure TCore.CoolTranslator1Translate(Sender: TObject);
-begin
-  UGame.InitStrings;
-  CoolTranslator1.TranslateComponentRecursive(FormClient);
+procedure TCore.Translator1Translate(Sender: TObject);
+begin
+  Translate;
+  if Assigned(FormMain) then
+    Translator1.TranslateComponentRecursive(FormMain.FormClient);
 end;
 
@@ -473 +486 @@
     GameFilesDir := LinuxGameFilesDir;
   // If installed in Linux system then use installation directory for po files
-  if not DirectoryExists(CoolTranslator1.POFilesFolder) and DirectoryExists(LinuxLanguagesDir) then
-    CoolTranslator1.POFilesFolder := LinuxLanguagesDir;
+  if not DirectoryExists(Translator1.POFilesFolder) and DirectoryExists(LinuxLanguagesDir) then
+    Translator1.POFilesFolder := LinuxLanguagesDir;
   {$ENDIF}
 
@@ -493 +506 @@
   XMLConfig1.Filename := GetAppConfigDir(False) + 'Config.xml';
   ForceDirectories(GetAppConfigDir(False));
-  FormClients := TObjectList<TFormClient>.Create;
+  FormClients := TFormClients.Create;
   ServerList := TServerList.Create;
+
+  LoadConfig;
+
+  TFormEx.ScaleDPI := ScaleDPI1;
+  TFormEx.Translator := Translator1;
+  TFormEx.ThemeManager := ThemeManager1;
+  TFormEx.PersistentForm := PersistentForm1;
+
+  FormMain := TFormMain.Create(nil);
+  FormMain.Show;
 end;
 
@@ -500 +523 @@
 begin
   FreeAndNil(ServerList);
-  if Assigned(FormPlayersStats) then FreeAndNil(FormPlayersStats);
-  if Assigned(FormUnitMoves) then FreeAndNil(FormUnitMoves);
-  if Assigned(FormCharts) then FreeAndNil(FormCharts);
-  if Assigned(FormKeyShortcuts) then FreeAndNil(FormKeyShortcuts);
+  if Assigned(FormMain.FormPlayersStats) then FreeAndNil(FormMain.FormPlayersStats);
+  if Assigned(FormMain.FormUnitMoves) then FreeAndNil(FormMain.FormUnitMoves);
+  if Assigned(FormMain.FormCharts) then FreeAndNil(FormMain.FormCharts);
+  if Assigned(FormMain.FormKeyShortcuts) then FreeAndNil(FormMain.FormKeyShortcuts);
   FreeAndNil(FormClients);
   FreeAndNil(StoredDimension);
@@ -511 +534 @@
   FreeAndNil(GameSettings);
   FreeAndNil(GameSystems);
+  FreeAndNil(FormMain);
 end;
 
 procedure TCore.LastOpenedList1Change(Sender: TObject);
 begin
-  LastOpenedList1.LoadToMenuItem(FormMain.MenuItemLoadRecent, LoadRecentExecute);
+  if Assigned(FormMain) then
+    LastOpenedList1.LoadToMenuItem(FormMain.MenuItemLoadRecent, LoadRecentExecute);
 end;
 
@@ -538 +563 @@
   // Create local LocalClients for human players
   LocalClients.Clear;
-  FormClient.Client := nil;
+  FormMain.FormClient.Client := nil;
   for I := 0 to Game.Players.Count - 1 do begin
     Player := TPlayer(Game.Players[I]);
@@ -573 +598 @@
   if Assigned(ServerClient) then ServerClient.TurnStart
     else raise Exception.Create(SMissingServerClientForPlayer);
-  FormClient.AZoomAll.Execute;
+  FormMain.FormClient.AZoomAll.Execute;
 end;
 
 procedure TCore.UpdateOtherForms;
 begin
-  if Assigned(FormCharts) and FormCharts.Visible then FormCharts.Redraw;
-  if Assigned(FormUnitMoves) and FormUnitMoves.Visible then FormUnitMoves.ReloadList;
-  if Assigned(FormPlayersStats) and FormPlayersStats.Visible then FormPlayersStats.ReloadList;
+  if Assigned(FormMain.FormCharts) and FormMain.FormCharts.Visible then FormMain.FormCharts.Redraw;
+  if Assigned(FormMain.FormUnitMoves) and FormMain.FormUnitMoves.Visible then FormMain.FormUnitMoves.ReloadList;
+  if Assigned(FormMain.FormPlayersStats) and FormMain.FormPlayersStats.Visible then FormMain.FormPlayersStats.ReloadList;
 end;
 
@@ -589 +614 @@
 begin
   // Copy all actions from docked form to main form so keyboard shortcuts will be active
-  for I := 0 to FormClient.ActionList1.ActionCount - 1 do begin
+  for I := 0 to FormMain.FormClient.ActionList1.ActionCount - 1 do begin
     Action := TAction.Create(FormMain);
-    Action.Assign(TAction(FormClient.ActionList1.Actions[I]));
+    Action.Assign(TAction(FormMain.FormClient.ActionList1.Actions[I]));
     Action.ActionList := FormMain.ActionList1;
   end;
@@ -625 +650 @@
 begin
   FullScreen := not FullScreen;
-  PersistentForm.Form := FormMain;
-  PersistentForm.SetFullScreen(FullScreen);
+  PersistentForm1.Form := FormMain;
+  PersistentForm1.SetFullScreen(FullScreen);
   UpdateInterface;
 end;
@@ -673 +698 @@
   // Create local LocalClients for human players
   LocalClients.Clear;
-  FormClient.Client := nil;
+  FormMain.FormClient.Client := nil;
   for I := 0 to Game.Players.Count - 1 do begin
     Player := TPlayer(Game.Players[I]);
@@ -722 +747 @@
     if Game.CurrentPlayer.Mode = pmHuman then begin
       PlayerClient := LocalClients.SearchPlayer(Game.CurrentPlayer);
-      if Assigned(PlayerClient) then FormClient.Client := TClientGUI(PlayerClient);
+      if Assigned(PlayerClient) then FormMain.FormClient.Client := TClientGUI(PlayerClient);
     end;
 
@@ -733 +758 @@
 procedure TCore.DoMoveUpdated(UnitMove: TUnitMove);
 begin
-  if Assigned(FormUnitMoves) and FormUnitMoves.Visible then
-    FormUnitMoves.ReloadList;
+  if Assigned(FormMain.FormUnitMoves) and FormMain.FormUnitMoves.Visible then
+    FormMain.FormUnitMoves.ReloadList;
 end;