Changeset 121 for trunk

Timestamp:

Oct 26, 2022, 3:12:02 PM (2 years ago)

Author:

chronos

Message:

• Modifed: Made TEngine class TComponent and to be independent from FormMain.

Location:

trunk

Files:

• BigMetro.lpi (modified) (1 diff)
• Forms/UFormMain.pas (modified) (7 diffs)
• Packages/Common/Languages/UDataFile.cs.po (modified) (1 diff)
• Packages/Common/Languages/UTestCase.cs.po (modified) (1 diff)
• UEngine.pas (modified) (10 diffs)
• UTestCases.pas (modified) (1 diff)

trunk/BigMetro.lpi

@@ -161 +161 @@
         <IsPartOfProject Value="True"/>
         <ComponentName Value="Core"/>
+        <HasResources Value="True"/>
         <ResourceBaseClass Value="DataModule"/>
       </Unit14>

trunk/Forms/UFormMain.pas

@@ -38 +38 @@
   private
     Initialized: Boolean;
+    procedure FullScreenChangeExecute(Sender: TObject; Active: Boolean);
+    procedure ExitExecute(Sender: TObject);
     procedure LoadConfig;
     procedure SaveConfig;
     procedure LoadGraphicAssets;
-    procedure DarkModeChange(Sender: TObject);
+    procedure DarkModeChangeExecute(Sender: TObject);
     procedure CopyImage(DestBmp: TBitmap; SourceBmp: TBitmap; Grayed: Boolean = False);
   public
-    FullScreen: Boolean;
     Engine: TEngine;
     procedure EraseBackground(DC: HDC); override;
@@ -81 +82 @@
   {$ENDIF}
 
-  Engine := TEngine.Create;
+  Engine := TEngine.Create(nil);
   Engine.RegistryContext := ApplicationInfo1.GetRegistryContext;
   Engine.Translator := Core.Translator1;
+  Engine.OnFullScreenChange := FullScreenChangeExecute;
+  Engine.OnExit := ExitExecute;
   LoadConfig;
   // Load cities after language core is loaded to have city names translated
@@ -92 +95 @@
 end;
 
-procedure TFormMain.FormClose(Sender: TObject; var CloseAction: TCloseAction);
-begin
-  Core.PersistentForm1.Save(Self);
-end;
-
 procedure TFormMain.FormDestroy(Sender: TObject);
 begin
   SaveConfig;
   FreeAndNil(Engine);
+end;
+
+procedure TFormMain.FormShow(Sender: TObject);
+begin
+  if not Initialized then begin
+    Initialized := True;
+    Core.PersistentForm1.RegistryContext := ApplicationInfo1.GetRegistryContext;
+    Core.PersistentForm1.Load(Self, False, True);
+    Engine.FullScreen := Core.PersistentForm1.FormFullScreen;
+    Engine.InitMenus;
+    Engine.OnDarkModeChange := DarkModeChangeExecute;
+    Engine.Map.Size := Point(PaintBox1.Width, PaintBox1.Height);
+    Engine.View.DestRect := Rect(0, 0, PaintBox1.Width, PaintBox1.Height);
+    Engine.MainMenu;
+    LoadGraphicAssets;
+  end;
+end;
+
+procedure TFormMain.FormClose(Sender: TObject; var CloseAction: TCloseAction);
+begin
+  Core.PersistentForm1.Save(Self);
 end;
 
@@ -120 +139 @@
 begin
   if Key = KeyF11 then begin
-    FullScreen := not FullScreen;
-    Core.PersistentForm1.SetFullScreen(FormMain.FullScreen);
+    Engine.FullScreen := not Engine.FullScreen;
   end else
 {$IFDEF DEBUG}
@@ -141 +159 @@
 end;
 
-procedure TFormMain.FormShow(Sender: TObject);
-begin
-  if not Initialized then begin
-    Initialized := True;
-    Core.PersistentForm1.RegistryContext := ApplicationInfo1.GetRegistryContext;
-    Core.PersistentForm1.Load(Self, False, True);
-    FullScreen := Core.PersistentForm1.FormFullScreen;
-    Engine.InitMenus;
-    Engine.OnDarkModeChange := DarkModeChange;
-    Engine.Map.Size := Point(PaintBox1.Width, PaintBox1.Height);
-    Engine.View.DestRect := Rect(0, 0, PaintBox1.Width, PaintBox1.Height);
-    Engine.MainMenu;
-    LoadGraphicAssets;
-  end;
-end;
-
 procedure TFormMain.PaintBox1MouseDown(Sender: TObject; Button: TMouseButton;
   Shift: TShiftState; X, Y: Integer);
@@ -214 +216 @@
   FormatSettings.ShortDayNames[6] := SFridayShort;
   FormatSettings.ShortDayNames[7] := SSaturdayShort;
+end;
+
+procedure TFormMain.FullScreenChangeExecute(Sender: TObject; Active: Boolean);
+begin
+  Core.PersistentForm1.SetFullScreen(Active);
+end;
+
+procedure TFormMain.ExitExecute(Sender: TObject);
+begin
+  Close;
 end;
 
@@ -306 +318 @@
 end;
 
-procedure TFormMain.DarkModeChange(Sender: TObject);
+procedure TFormMain.DarkModeChangeExecute(Sender: TObject);
 begin
   LoadGraphicAssets;

trunk/Packages/Common/Languages/UDataFile.cs.po

@@ -19 +19 @@
 msgid "Data file"
 msgstr "Datový soubor"
+

trunk/Packages/Common/Languages/UTestCase.cs.po

@@ -23 +23 @@
 msgid "Passed"
 msgstr "Prošlo"
+

trunk/UEngine.pas

@@ -157 +157 @@
     miFastTrain);
   TMetroImprovementSet = set of TMetroImprovement;
+  TFullScrenChangeEvent = procedure (Sender: TObject; Active: Boolean) of object;
 
   { TEngine }
 
-  TEngine = class
+  TEngine = class(TComponent)
   private
     FDarkMode: Boolean;
+    FFullScreen: Boolean;
     FOnDarkModeChange: TNotifyEvent;
+    FOnExit: TNotifyEvent;
+    FOnFullScreenChange: TFullScrenChangeEvent;
     FState: TGameState;
     FTranslator: TTranslator;
@@ -219 +223 @@
       UpdatedShape: TStationShape; Distance: Integer);
     procedure SetDarkMode(AValue: Boolean);
+    procedure SetFullScreen(AValue: Boolean);
     procedure SetState(AValue: TGameState);
     procedure TrainsMovement;
@@ -304 +309 @@
     procedure LoadFromRegistry;
     procedure SaveToRegistry;
-    constructor Create;
+    constructor Create(AOwner: TComponent); override;
     destructor Destroy; override;
     procedure Tick;
@@ -313 +318 @@
   published
     property DarkMode: Boolean read FDarkMode write SetDarkMode;
+    property FullScreen: Boolean read FFullScreen write SetFullScreen;
     property Translator: TTranslator read FTranslator write FTranslator;
     property OnDarkModeChange: TNotifyEvent read FOnDarkModeChange
       write FOnDarkModeChange;
+    property OnFullScreenChange: TFullScrenChangeEvent read FOnFullScreenChange
+      write FOnFullScreenChange;
+    property OnExit: TNotifyEvent read FOnExit write FOnExit;
   end;
 
@@ -349 +358 @@
 
 uses
-  UFormMain, ULanguages;
+  ULanguages;
 
 resourcestring
@@ -1404 +1413 @@
 end;
 
+procedure TEngine.SetFullScreen(AValue: Boolean);
+begin
+  if FFullScreen = AValue then Exit;
+  FFullScreen := AValue;
+  if Assigned(FOnFullScreenChange) then
+    FOnFullScreenChange(Self, FFullScreen);
+end;
+
 procedure TEngine.SetState(AValue: TGameState);
 begin
@@ -1660 +1677 @@
 procedure TEngine.MenuItemExit(Sender: TObject);
 begin
-  FormMain.Close;
+  if Assigned(FOnExit) then FOnExit(Self);
 end;
 
@@ -1739 +1756 @@
       BackgroundColor := Colors.MenuItemBackground;
       BackgroundSelectedColor := Colors.MenuItemBackgroundSelected;
-      Checked := FormMain.FullScreen;
+      Checked := FullScreen;
     end;
     with AddButton(SBack, MenuItemBack) do begin
@@ -1883 +1900 @@
 procedure TEngine.FullScreenChanged(Sender: TObject);
 begin
-  FormMain.FullScreen := TMenuItemCheckBox(Sender).Checked;
-  with TPersistentForm.Create(nil) do
-  try
-    Form := FormMain;
-    SetFullScreen(FormMain.FullScreen);
-  finally
-    Free;
-  end;
+  FullScreen := TMenuItemCheckBox(Sender).Checked;
 end;
 
@@ -3362 +3372 @@
 end;
 
-constructor TEngine.Create;
-begin
+constructor TEngine.Create(AOwner: TComponent);
+begin
+  inherited;
   ImprovementImageSize := ScaleX(64, 96);
   IconSize := ScaleX(32, 96);

trunk/UTestCases.pas

@@ -65 +65 @@
 begin
   inherited;
-  Engine := TEngine.Create;
+  Engine := TEngine.Create(nil);
 end;