Changeset 73 for trunk/Forms

Timestamp:

Mar 26, 2024, 6:13:44 PM (8 months ago)

Author:

chronos

Message:

• Modified: Removed U prefix from unit names.

Location:

trunk/Forms

Files:

• FormDebug.lfm (moved) (moved from trunk/Forms/UFormDebug.lfm )
• FormDebug.lrj (moved) (moved from trunk/Forms/UFormDebug.lrj )
• FormDebug.pas (moved) (moved from trunk/Forms/UFormDebug.pas ) (2 diffs)
• FormGameResult.lfm (moved) (moved from trunk/Forms/UFormGameResult.lfm )
• FormGameResult.lrj (moved) (moved from trunk/Forms/UFormGameResult.lrj )
• FormGameResult.pas (moved) (moved from trunk/Forms/UFormGameResult.pas ) (2 diffs)
• FormMain.lfm (moved) (moved from trunk/Forms/UFormMain.lfm )
• FormMain.lrj (moved) (moved from trunk/Forms/UFormMain.lrj )
• FormMain.pas (moved) (moved from trunk/Forms/UFormMain.pas ) (9 diffs)
• FormMap.lfm (moved) (moved from trunk/Forms/UFormMap.lfm )
• FormMap.lrj (moved) (moved from trunk/Forms/UFormMap.lrj )
• FormMap.pas (moved) (moved from trunk/Forms/UFormMap.pas ) (4 diffs)
• FormNewGame.lfm (moved) (moved from trunk/Forms/UFormNewGame.lfm )
• FormNewGame.lrj (moved) (moved from trunk/Forms/UFormNewGame.lrj )
• FormNewGame.pas (moved) (moved from trunk/Forms/UFormNewGame.pas ) (5 diffs)

trunk/Forms/FormDebug.pas

@@ -1 @@
-unit UFormDebug;
+unit FormDebug;
 
 interface
@@ -10 +10 @@
   end;
 
-var
-  FormDebug: TFormDebug;
 
 implementation

trunk/Forms/FormGameResult.pas

@@ -1 @@
-unit UFormGameResult;
+unit FormGameResult;
 
 interface
@@ -10 +10 @@
   end;
 
-var
-  FormGameResult: TFormGameResult;
-
 
 implementation

trunk/Forms/FormMain.pas

@@ -1 @@
-unit UFormMain;
+unit FormMain;
 
 interface
@@ -5 +5 @@
 uses
   Classes, SysUtils, FileUtil, Forms, Controls, Graphics, LCLType,
-  Dialogs, ExtCtrls, ComCtrls, Menus, ActnList, UEngine, UPlatform, Math,
+  Dialogs, ExtCtrls, ComCtrls, Menus, ActnList, Engine, Platform, Math,
   DateUtils, GraphType, UPersistentForm, UApplicationInfo, UTranslator,
-  URegistry, UAboutDialog;
+  URegistry, UAboutDialog, FormNewGame, FormMap;
 
 type
@@ -61 +61 @@
     PersistentForm: TPersistentForm;
     Engine: TEngine;
+    FormNewGame: TFormNewGame;
+    FormMap: TFormMap;
     procedure EraseBackground(DC: HDC); override;
   end;
@@ -73 +75 @@
 
 uses
-  UCore, UFormMap, UFormNewGame;
+  Core;
 
 resourcestring
@@ -115 +117 @@
   with TRegistryEx.Create do
   try
-    CurrentContext := Core.ApplicationInfo.GetRegistryContext;
+    CurrentContext := Core.Core.ApplicationInfo.GetRegistryContext;
 
     if ValueExists('LanguageCode') then begin
       LangCode := ReadStringWithDefault('LanguageCode', '');
-      Core.Translator1.Language := Core.Translator1.Languages.SearchByCode(LangCode);
-    end else Core.Translator1.Language := Core.Translator1.Languages.SearchByCode('');
+      Core.Core.Translator1.Language := Core.Core.Translator1.Languages.SearchByCode(LangCode);
+    end else Core.Core.Translator1.Language := Core.Core.Translator1.Languages.SearchByCode('');
     Engine.LoadFromRegistry(CurrentContext);
   finally
@@ -131 +133 @@
   with TRegistryEx.Create do
   try
-    CurrentContext := Core.ApplicationInfo.GetRegistryContext;
-
-    if Assigned(Core.Translator1.Language) and (Core.Translator1.Language.Code <> '') then
-      WriteString('LanguageCode', Core.Translator1.Language.Code)
+    CurrentContext := Core.Core.ApplicationInfo.GetRegistryContext;
+
+    if Assigned(Core.Core.Translator1.Language) and (Core.Core.Translator1.Language.Code <> '') then
+      WriteString('LanguageCode', Core.Core.Translator1.Language.Code)
       else DeleteValue('LanguageCode');
     Engine.SaveToRegistry(CurrentContext);
@@ -167 +169 @@
   {$IFDEF UNIX}
   // If installed in UNIX system then use installation directory for po files
-  if not DirectoryExists(Core.Translator1.POFilesFolder) and DirectoryExists(UnixLanguagesDir) then
-    Core.Translator1.POFilesFolder := UnixLanguagesDir;
+  if not DirectoryExists(Core.Core.Translator1.POFilesFolder) and DirectoryExists(UnixLanguagesDir) then
+    Core.Core.Translator1.POFilesFolder := UnixLanguagesDir;
   {$ENDIF}
 
@@ -175 +177 @@
 
   PersistentForm := TPersistentForm.Create(nil);
-  PersistentForm.RegistryContext := TRegistryContext.Create(Core.ApplicationInfo.RegistryRoot,
-    Core.ApplicationInfo.RegistryKey);
+  PersistentForm.RegistryContext := TRegistryContext.Create(Core.Core.ApplicationInfo.RegistryRoot,
+    Core.Core.ApplicationInfo.RegistryKey);
 
   Application.OnDeactivate := FormDeactivate;
@@ -265 +267 @@
 procedure TFormMain.FormShow(Sender: TObject);
 begin
-  PersistentForm.RegistryContext := Core.ApplicationInfo.GetRegistryContext;
+  PersistentForm.RegistryContext := Core.Core.ApplicationInfo.GetRegistryContext;
   PersistentForm.Load(Self, False, True);
   FullScreenEnabled := PersistentForm.FormFullScreen;

trunk/Forms/FormMap.pas

@@ -1 @@
-unit UFormMap;
+unit FormMap;
 
 interface
@@ -16 +16 @@
   end;
 
-var
-  FormMap: TFormMap;
-
 
 implementation
@@ -25 +22 @@
 
 uses
-  UFormMain;
+  FormMain;
 
 { TFormMap }
@@ -32 +29 @@
 begin
   Image1.Picture.Bitmap.SetSize(Image1.Width, Image1.Height);
-  FormMain.Engine.World.DrawToBitmap(Image1.Picture.Bitmap);
+  FormMain.FormMain.Engine.World.DrawToBitmap(Image1.Picture.Bitmap);
 end;
 

trunk/Forms/FormNewGame.pas

@@ -1 @@
-unit UFormNewGame;
+unit FormNewGame;
 
 interface
@@ -5 +5 @@
 uses
   Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, StdCtrls,
-  ComCtrls, UEngine;
+  ComCtrls, Engine;
 
 type
@@ -72 +72 @@
   end; 
 
-var
-  FormNewGame: TFormNewGame;
-
 
 implementation
@@ -81 +78 @@
 
 uses
-  UCore;
+  Core;
 
 { TFormNewGame }
@@ -286 +283 @@
 procedure TFormNewGame.FormCreate(Sender: TObject);
 begin
-  Core.Translator1.TranslateComponentRecursive(Self);
+  Core.Core.Translator1.TranslateComponentRecursive(Self);
   Players := TPlayers.Create;
 end;