Changeset 73 for trunk/Forms/FormMain.pas

Timestamp:

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

Author:

chronos

Message:

• Modified: Removed U prefix from unit names.

File:

• trunk/Forms/FormMain.pas (moved) (moved from trunk/Forms/UFormMain.pas ) (9 diffs)

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;