Changeset 317 for trunk/Forms/FormNew.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/FormNew.pas (moved) (moved from trunk/Forms/UFormNew.pas ) (15 diffs)

trunk/Forms/FormNew.pas

@@ -1 @@
-unit UFormNew;
+unit FormNew;
 
 interface
@@ -5 +5 @@
 uses
   Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, StdCtrls,
-  ComCtrls, Spin, ExtCtrls, ActnList, ExtDlgs, Menus, UGame, UGeometry, UPlayer,
-  UGameServer, UServerList, UMap, UGameSystem, UFormList;
+  ComCtrls, Spin, ExtCtrls, ActnList, ExtDlgs, Menus, Game, Geometry, Player,
+  GameServer, ServerList, Map, GameSystem, FormList, FormEx, FormChat;
 
 type
@@ -12 +12 @@
   { TFormNew }
 
-  TFormNew = class(TForm)
+  TFormNew = class(TFormEx)
     ActionList1: TActionList;
     AServerAdd: TAction;
@@ -115 +115 @@
     procedure ComboBoxWinObjectiveChange(Sender: TObject);
     procedure EditImageFileChange(Sender: TObject);
-    procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
     procedure FormCreate(Sender: TObject);
     procedure FormDestroy(Sender: TObject);
@@ -143 +142 @@
     NewRandSeed: Cardinal;
     FormPlayers: TFormList;
+    FormChat: TFormChat;
     procedure LoadGame(Game: TGame);
     procedure SaveGame(Game: TGame);
@@ -158 +158 @@
   end;
 
-var
-  FormNew: TFormNew;
-
 
 implementation
@@ -167 +164 @@
 
 uses
-  UFormChat, UCore, UFormServer, UClientGUI, UFormClient,
-  UFormGameSystems, UMapType;
+  Core, FormServer, ClientGUI, FormClient, FormGameSystems, MapType;
 
 resourcestring
@@ -350 +346 @@
   ComboBoxGameSystem.Items.BeginUpdate;
   try
-    while ComboBoxGameSystem.Items.Count > Core.GameSystems.Count do
+    while ComboBoxGameSystem.Items.Count > Core.Core.GameSystems.Count do
       ComboBoxGameSystem.Items.Delete(ComboBoxGameSystem.Items.Count - 1);
-    while ComboBoxGameSystem.Items.Count < Core.GameSystems.Count do
+    while ComboBoxGameSystem.Items.Count < Core.Core.GameSystems.Count do
       ComboBoxGameSystem.Items.Add('');
-    for I := 0 to Core.GameSystems.Count - 1 do begin
-      ComboBoxGameSystem.Items[I] := Core.GameSystems[I].GetName;
-      ComboBoxGameSystem.Items.Objects[I] := Core.GameSystems[I];
+    for I := 0 to Core.Core.GameSystems.Count - 1 do begin
+      ComboBoxGameSystem.Items[I] := Core.Core.GameSystems[I].GetName;
+      ComboBoxGameSystem.Items.Objects[I] := Core.Core.GameSystems[I];
     end;
     if Assigned(LastSystem) then
@@ -457 +453 @@
     ItemIndex := LastIndex;
   end;
-  Core.CoolTranslator1.TranslateComponentRecursive(Self);
+  Core.Core.Translator1.TranslateComponentRecursive(Self);
 end;
 
@@ -500 +496 @@
   Randomize;
   NewRandSeed := RandSeed;
-  Core.PersistentForm.Load(Self);
-  Core.ThemeManager1.UseTheme(Self);
   ReloadView;
   //Height := Trunc(1.5 * Height);
@@ -583 +577 @@
 end;
 
-procedure TFormNew.FormClose(Sender: TObject; var CloseAction: TCloseAction);
-begin
-  Core.PersistentForm.Save(Self);
-end;
-
 procedure TFormNew.AServerAddExecute(Sender: TObject);
 var
   NewServerInfo: TServerInfo;
+  FormServer: TFormServer;
 begin
   FormServer := TFormServer.Create(nil);
-  NewServerInfo := TServerInfo.Create;
-  FormServer.ServerInfo := NewServerInfo;
-  if FormServer.ShowModal = mrOK then begin
-    ServerList.Items.Add(NewServerInfo);
-    ReloadView;
-  end else NewServerInfo.Free;
-  FormServer.Free;
+  try
+    NewServerInfo := TServerInfo.Create;
+    FormServer.ServerInfo := NewServerInfo;
+    if FormServer.ShowModal = mrOK then begin
+      ServerList.Items.Add(NewServerInfo);
+      ReloadView;
+    end else NewServerInfo.Free;
+  finally
+    FormServer.Free;
+  end;
 end;
 
@@ -605 +598 @@
 var
   ServerInfo: TServerInfo;
+  FormServer: TFormServer;
 begin
   FormServer := TFormServer.Create(nil);
-  ServerInfo := TServerInfo(ListViewServers.Selected.Data);
-  FormServer.ServerInfo := ServerInfo;
-  if FormServer.ShowModal = mrOK then begin
-    ReloadView;
-  end;
-  FormServer.Free;
+  try
+    ServerInfo := TServerInfo(ListViewServers.Selected.Data);
+    FormServer.ServerInfo := ServerInfo;
+    if FormServer.ShowModal = mrOK then begin
+      ReloadView;
+    end;
+  finally
+    FormServer.Free;
+  end;
 end;
 
@@ -629 +626 @@
 
 procedure TFormNew.ButtonGameSystemsClick(Sender: TObject);
+var
+  FormGameSystems: TFormGameSystems;
 begin
   FormGameSystems := TFormGameSystems.Create(nil);
   try
-    FormGameSystems.GameSystems := Core.GameSystems;
+    FormGameSystems.GameSystems := Core.Core.GameSystems;
     FormGameSystems.ShowModal;
     ReloadGameSystemsMenu;
@@ -683 +682 @@
     SpinEditServerPort.Value := LocalNetworkPort;
   end;
-  ServerList.Assign(Core.ServerList);
+  ServerList.Assign(Core.Core.ServerList);
   LoadGame(Server.Game);
 end;
@@ -703 +702 @@
     end;
   end;
-  Core.ServerList.Assign(ServerList);
+  Core.Core.ServerList.Assign(ServerList);
   SaveGame(Server.Game);
 end;