Changeset 86 for trunk/Core.pas

Timestamp:

Jun 7, 2024, 12:47:11 PM (5 months ago)

Author:

chronos

Message:

• Modified: Remove U prefix from unit names.
• Modified: Used TFormEx for all forms for code simplification.
• Fixed: Fullscreen mode switching error.

File:

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

trunk/Core.pas

@@ -1 @@
-unit UCore;
-
-{$mode delphi}
+unit Core;
 
 interface
@@ -7 +5 @@
 uses
   Classes, SysUtils, Theme, PersistentForm, ApplicationInfo, Translator,
-  RegistryEx, UGame, ActnList, Forms, Controls, Dialogs;
+  RegistryEx, ScaleDPI, Game, ActnList, Forms, Controls, Dialogs;
 
 type
@@ -25 +23 @@
     ApplicationInfo1: TApplicationInfo;
     PersistentForm1: TPersistentForm;
+    ScaleDPI1: TScaleDPI;
     ThemeManager1: TThemeManager;
     Translator1: TTranslator;
@@ -61 +60 @@
 
 uses
-  UFormMain, UFormSettings, UFormNew, UFormHelp, UFormComputer, FormAbout,
-  UFormHistory;
+  FormMain, FormSettings, FormNew, FormHelp, FormComputer, FormAbout, FormEx,
+  FormHistory;
 
 resourcestring
@@ -69 +68 @@
   SWinCaption = 'Win';
   SWinMessage = 'You reached %s and won! You can continue to play to get higher score.';
+
+procedure Translate;
+begin
+  Game.Translate;
+end;
 
 { TCore }
@@ -90 +94 @@
   Game.OnGameOver := GameOver;
   LoadConfig;
+
+  TFormEx.ScaleDPI := ScaleDPI1;
+  TFormEx.Translator := Translator1;
+  TFormEx.ThemeManager := ThemeManager1;
+  TFormEx.PersistentForm := PersistentForm1;
 end;
 
 procedure TCore.ASettingsExecute(Sender: TObject);
+var
+  FormSettings: TFormSettings;
 begin
   FormSettings := TFormSettings.Create(nil);
   try
     if FormSettings.ShowModal = mrOk then begin
-      FormMain.Redraw;
-      FormMain.UpdateInterface;
+      FormMain.FormMain.Redraw;
+      FormMain.FormMain.UpdateInterface;
       UpdateInterface;
     end;
@@ -125 +136 @@
 
 procedure TCore.AComputerExecute(Sender: TObject);
+var
+  FormComputer: TFormComputer;
 begin
   FormComputer := TFormComputer.Create(nil);
@@ -136 +149 @@
 procedure TCore.AExitExecute(Sender: TObject);
 begin
-  FormMain.Close;
+  FormMain.FormMain.Close;
 end;
 
 procedure TCore.AHelpExecute(Sender: TObject);
+var
+  FormHelp: TFormHelp;
 begin
   FormHelp := TFormHelp.Create(nil);
@@ -150 +165 @@
 
 procedure TCore.AHistoryExecute(Sender: TObject);
+var
+  FormHistory: TFormHistory;
 begin
   FormHistory := TFormHistory.Create(nil);
@@ -160 +177 @@
 
 procedure TCore.ANewExecute(Sender: TObject);
+var
+  FormNew: TFormNew;
 begin
   FormNew := TFormNew.Create(nil);
@@ -168 +187 @@
       Game.New;
       UpdateInterface;
-      FormMain.UpdateInterface;
+      FormMain.FormMain.UpdateInterface;
     end;
   finally
@@ -183 +202 @@
 procedure TCore.Translator1Translate(Sender: TObject);
 begin
-  UGame.Translate;
+  Translate;
 end;
 
@@ -193 +212 @@
 procedure TCore.GamePaint(Sender: TObject);
 begin
-  if Assigned(FormMain) then FormMain.Redraw;
+  if Assigned(FormMain.FormMain) then FormMain.FormMain.Redraw;
 end;
 
 procedure TCore.GameWin(Sender: TObject);
 begin
-  TThread.Synchronize(FormMain.MoveThread, GameWinSync);
+  TThread.Synchronize(FormMain.FormMain.MoveThread, GameWinSync);
 end;
 
@@ -208 +227 @@
 procedure TCore.GameOver(Sender: TObject);
 begin
-  TThread.Synchronize(FormMain.MoveThread, GameOverSync);
+  TThread.Synchronize(FormMain.FormMain.MoveThread, GameOverSync);
 end;