Changeset 143 for trunk/Forms

Timestamp:

May 29, 2023, 7:30:31 PM (12 months ago)

Author:

chronos

Message:

Removed U prefix from all units.

Location:

trunk/Forms

Files:

• FormImages.lfm (moved) (moved from trunk/Forms/UFormImages.lfm )
• FormImages.lrj (moved) (moved from trunk/Forms/UFormImages.lrj )
• FormImages.pas (moved) (moved from trunk/Forms/UFormImages.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 ) (13 diffs)
• FormTest.lfm (moved) (moved from trunk/Forms/UFormTest.lfm )
• FormTest.lrj (moved) (moved from trunk/Forms/UFormTest.lrj )
• FormTest.pas (moved) (moved from trunk/Forms/UFormTest.pas ) (6 diffs)
• FormTestCase.lfm (moved) (moved from trunk/Forms/UFormTestCase.lfm )
• FormTestCase.lrj (moved) (moved from trunk/Forms/UFormTestCase.lrj )
• FormTestCase.pas (moved) (moved from trunk/Forms/UFormTestCase.pas ) (4 diffs)

trunk/Forms/FormImages.pas

@@ -1 @@
-unit UFormImages;
+unit FormImages;
 
 interface
@@ -25 +25 @@
   end;
 
-var
-  FormImages: TFormImages;
-
 
 implementation

trunk/Forms/FormMain.pas

@@ -1 @@
-unit UFormMain;
+unit FormMain;
 
 interface
@@ -5 +5 @@
 uses
   Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, Menus,
-  ExtCtrls, UEngine, LCLType, Types, UTranslator, UApplicationInfo,
-  URegistry, UPersistentForm;
+  ExtCtrls, Engine, LCLType, Types, Translator, ApplicationInfo,
+  RegistryEx, PersistentForm, FormImages;
 
 type
@@ -49 +49 @@
   end;
 
-var
-  FormMain: TFormMain;
-
 
 implementation
@@ -58 +55 @@
 
 uses
-  UFormImages, UPixelPointer, UCore, UFormTest, UTestCases;
+  PixelPointer, Core, FormTest, TestCases;
 
 { TFormMain }
 
 procedure TFormMain.FormCreate(Sender: TObject);
+{$IFDEF UNIX}
 const
   UnixLanguagesDir = '/usr/share/TransLines/languages';
+  {$ENDIF}
 begin
   {$IFDEF UNIX}
@@ -74 +73 @@
   Engine := TEngine.Create(nil);
   Engine.RegistryContext := ApplicationInfo1.GetRegistryContext;
-  Engine.Translator := Core.Translator1;
+  Engine.Translator := Core.Core.Translator1;
   Engine.OnFullScreenChange := FullScreenChangeExecute;
   Engine.OnExit := ExitExecute;
@@ -95 +94 @@
   if not Initialized then begin
     Initialized := True;
-    Core.PersistentForm1.RegistryContext := ApplicationInfo1.GetRegistryContext;
-    Core.PersistentForm1.Load(Self, False, True);
-    Engine.FullScreen := Core.PersistentForm1.FormFullScreen;
+    Core.Core.PersistentForm1.RegistryContext := ApplicationInfo1.GetRegistryContext;
+    Core.Core.PersistentForm1.Load(Self, False, True);
+    Engine.FullScreen := Core.Core.PersistentForm1.FormFullScreen;
     Engine.InitMenus;
     Engine.OnDarkModeChange := DarkModeChangeExecute;
@@ -109 +108 @@
 procedure TFormMain.FormClose(Sender: TObject; var CloseAction: TCloseAction);
 begin
-  Core.PersistentForm1.Save(Self);
+  Core.Core.PersistentForm1.Save(Self);
+  Application.Terminate;
 end;
 
@@ -127 +127 @@
   KeyF12 = 123;
 {$ENDIF}
+var
+  FormTest: TFormTest;
 begin
   if Key = KeyF11 then begin
@@ -199 +201 @@
 procedure TFormMain.FullScreenChangeExecute(Sender: TObject; Active: Boolean);
 begin
-  Core.PersistentForm1.SetFullScreen(Active);
+  Core.Core.PersistentForm1.SetFullScreen(Active);
 end;
 
@@ -222 +224 @@
     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;
   finally
@@ -236 +238 @@
     CurrentContext := ApplicationInfo1.GetRegistryContext;
 
-    if Assigned(Core.Translator1.Language) and (Core.Translator1.Language.Code <> '') then
-      WriteString('LanguageCode', Core.Translator1.Language.Code)
+    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;
@@ -246 +248 @@
 
 procedure TFormMain.LoadGraphicAssets;
-begin
+var
+  FormImages: TFormImages;
+begin
+  FormImages := TFormImages.Create(nil);
+
   CopyImage(Engine.ImagePassenger.Bitmap, FormImages.ImagePassenger.Picture.Bitmap);
   CopyImage(Engine.ImagePassenger.BitmapDisabled, FormImages.ImagePassenger.Picture.Bitmap, True);
@@ -295 +301 @@
   Engine.ImageNewTrain.Bitmap.Assign(Engine.ImageLocomotive.Bitmap);
   Engine.ImageNewTrain.BitmapDisabled.Assign(Engine.ImageLocomotive.BitmapDisabled);
+
+  FreeAndNil(FormImages);
 end;
 

trunk/Forms/FormTest.pas

@@ -1 @@
-unit UFormTest;
+unit FormTest;
 
 interface
@@ -5 +5 @@
 uses
   Classes, SysUtils, Forms, Controls, Graphics, Dialogs, ComCtrls, StdCtrls,
-  ActnList, Menus, UTestCase;
+  ActnList, Menus, TestCase;
 
 type
@@ -39 +39 @@
   end;
 
-var
-  FormTest: TFormTest;
-
 
 implementation
@@ -48 +45 @@
 
 uses
-  UCore, UFormTestCase;
+  Core, FormTestCase;
 
 { TFormTest }
@@ -112 +109 @@
 procedure TFormTest.FormClose(Sender: TObject; var CloseAction: TCloseAction);
 begin
-  Core.PersistentForm1.Save(Self);
+  Core.Core.PersistentForm1.Save(Self);
 end;
 
@@ -148 +145 @@
 procedure TFormTest.FormCreate(Sender: TObject);
 begin
-  Core.Translator1.TranslateComponentRecursive(Self);
-  Core.ThemeManager1.UseTheme(Self);
+  Core.Core.Translator1.TranslateComponentRecursive(Self);
+  Core.Core.ThemeManager1.UseTheme(Self);
 end;
 
 procedure TFormTest.FormShow(Sender: TObject);
 begin
-  Core.PersistentForm1.Load(Self);
+  Core.Core.PersistentForm1.Load(Self);
   ReloadList;
   UpdateInterface;

trunk/Forms/FormTestCase.pas

@@ -1 @@
-unit UFormTestCase;
+unit FormTestCase;
 
 interface
@@ -16 +16 @@
     procedure FormShow(Sender: TObject);
   private
-
   public
-
   end;
-
-var
-  FormTestCase: TFormTestCase;
 
 
@@ -30 +25 @@
 
 uses
-  UCore;
+  Core;
 
 { TFormTestCase }
@@ -37 +32 @@
   );
 begin
-  Core.PersistentForm1.Save(Self);
+  Core.Core.PersistentForm1.Save(Self);
 end;
 
 procedure TFormTestCase.FormCreate(Sender: TObject);
 begin
-  Core.Translator1.TranslateComponentRecursive(Self);
-  Core.ThemeManager1.UseTheme(Self);
+  Core.Core.Translator1.TranslateComponentRecursive(Self);
+  Core.Core.ThemeManager1.UseTheme(Self);
 end;
 
 procedure TFormTestCase.FormShow(Sender: TObject);
 begin
-  Core.PersistentForm1.Load(Self);
+  Core.Core.PersistentForm1.Load(Self);
 end;