Changeset 118 for trunk/Forms/UFormMain.pas

Timestamp:

Oct 23, 2022, 10:55:55 PM (19 months ago)

Author:

chronos

Message:

• Added: UCore main data module.
• Added: Test cases support for better future testing.

File:

• trunk/Forms/UFormMain.pas (modified) (8 diffs)

trunk/Forms/UFormMain.pas

@@ -15 +15 @@
     ApplicationInfo1: TApplicationInfo;
     PaintBox1: TPaintBox;
-    PersistentForm1: TPersistentForm;
     Timer1: TTimer;
-    Translator1: TTranslator;
     procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
     procedure FormCreate(Sender: TObject);
@@ -60 +58 @@
 
 uses
-  UFormImages, UPixelPointer;
+  UFormImages, UPixelPointer, UCore, UFormTest, UTestCases;
 
 resourcestring
@@ -79 +77 @@
   {$IFDEF UNIX}
   // If installed in UNIX system then use installation directory for po files
-  if not DirectoryExists(Translator1.POFilesFolder) and DirectoryExists(UnixLanguagesDir) then
-    Translator1.POFilesFolder := UnixLanguagesDir;
+  if not DirectoryExists(Core.Translator1.POFilesFolder) and DirectoryExists(UnixLanguagesDir) then
+    Core.Translator1.POFilesFolder := UnixLanguagesDir;
   {$ENDIF}
 
   Engine := TEngine.Create;
   Engine.RegistryContext := ApplicationInfo1.GetRegistryContext;
+  Engine.Translator := Core.Translator1;
   LoadConfig;
   // Load cities after language core is loaded to have city names translated
@@ -95 +94 @@
 procedure TFormMain.FormClose(Sender: TObject; var CloseAction: TCloseAction);
 begin
-  PersistentForm1.Save(Self);
+  Core.PersistentForm1.Save(Self);
 end;
 
@@ -116 +115 @@
 const
   KeyF11 = 122;
+{$IFDEF DEBUG}
+  KeyF12 = 123;
+{$ENDIF}
 begin
   if Key = KeyF11 then begin
     FullScreen := not FullScreen;
-    PersistentForm1.SetFullScreen(FormMain.FullScreen);
+    Core.PersistentForm1.SetFullScreen(FormMain.FullScreen);
   end else
+{$IFDEF DEBUG}
+  if Key = KeyF12 then begin
+    FormTest := TFormTest.Create(nil);
+    try
+      FormTest.TestCases := InitTestCases;
+      try
+        FormTest.ShowModal;
+      finally
+        FormTest.TestCases.Free;
+      end;
+    finally
+      FormTest.Free;
+    end;
+  end else
+{$ENDIF}
     Engine.KeyUp(Key);
 end;
@@ -128 +145 @@
   if not Initialized then begin
     Initialized := True;
-    PersistentForm1.RegistryContext := ApplicationInfo1.GetRegistryContext;
-    PersistentForm1.Load(Self, False, True);
-    FullScreen := PersistentForm1.FormFullScreen;
+    Core.PersistentForm1.RegistryContext := ApplicationInfo1.GetRegistryContext;
+    Core.PersistentForm1.Load(Self, False, True);
+    FullScreen := Core.PersistentForm1.FormFullScreen;
     Engine.InitMenus;
     Engine.OnDarkModeChange := DarkModeChange;
@@ -214 +231 @@
     if ValueExists('LanguageCode') then begin
       LangCode := ReadStringWithDefault('LanguageCode', '');
-      Translator1.Language := Translator1.Languages.SearchByCode(LangCode);
-    end else Translator1.Language := Translator1.Languages.SearchByCode('');
+      Core.Translator1.Language := Core.Translator1.Languages.SearchByCode(LangCode);
+    end else Core.Translator1.Language := Core.Translator1.Languages.SearchByCode('');
     Engine.LoadFromRegistry;
   finally
@@ -228 +245 @@
     CurrentContext := ApplicationInfo1.GetRegistryContext;
 
-    if Assigned(Translator1.Language) and (Translator1.Language.Code <> '') then
-      WriteString('LanguageCode', Translator1.Language.Code)
+    if Assigned(Core.Translator1.Language) and (Core.Translator1.Language.Code <> '') then
+      WriteString('LanguageCode', Core.Translator1.Language.Code)
       else DeleteValue('LanguageCode');
     Engine.SaveToRegistry;