Changeset 219 for trunk/Core.pas

Timestamp:

Jan 17, 2025, 9:05:54 PM (4 days ago)

Author:

chronos

Message:

• Modified: Updated Common package.
• Modified: Remove U prefix from unit names.
• Modified: Use Gneeric.Collections instead of fgl.
• Modified: Do not use global form variables.

File:

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

trunk/Core.pas

@@ -1 @@
-unit UCore;
-
-{$mode delphi}
+unit Core;
 
 interface
 
 uses
-  Classes, SysUtils, FileUtil, UAcronym, UTranslator, UPersistentForm,
-  UJobProgressView, UScaleDPI, Forms, Controls, ExtCtrls, Menus, LazFileUtils,
-  URegistry, UApplicationInfo, Registry, UTheme;
+  Classes, SysUtils, FileUtil, Acronym, Translator, PersistentForm,
+  JobProgressView, ScaleDPI, Forms, Controls, ExtCtrls, Menus, LazFileUtils,
+  RegistryEx, ApplicationInfo, Registry, Theme, FormMain;
 
 type
@@ -43 +41 @@
     procedure WriteLnConsole(Text: string);
   public
+    FormMain: TFormMain;
     AcronymDb: TAcronymDb;
     StartOnLogon: Boolean;
@@ -54 +53 @@
     procedure SaveConfig;
     procedure ScaleDPI;
+    function CompareStrings(Strings1, Strings2: TStrings): Boolean;
     property AlwaysOnTop: Boolean read FAlwaysOnTop write SetAlwaysOnTop;
   end;
@@ -62 +62 @@
 
 implementation
-
-uses
-  UFormMain;
 
 const
@@ -87 +84 @@
   InitializeFinished := False;
   StoredDimension := TControlDimension.Create;
+  Application.CreateForm(TFormMain, FormMain);
 end;
 
@@ -95 +93 @@
 end;
 
+function TCore.CompareStrings(Strings1, Strings2: TStrings): Boolean;
+var
+  I: Integer;
+begin
+  Result := Strings1.Count = Strings2.Count;
+  if not Result then Exit;
+  for I := 0 to Strings1.Count - 1 do
+    if (Strings1[I] <> Strings2[I]) or (Strings1.Objects[I] <> Strings2.Objects[I]) then begin
+      Result := False;
+      Exit;
+    end;
+end;
+
 procedure TCore.TrayIcon1Click(Sender: TObject);
 begin
@@ -103 +114 @@
 procedure TCore.TranslatorTranslate(Sender: TObject);
 begin
-  UAcronym.Translate;
+  Acronym.Translate;
 end;
 
@@ -276 +287 @@
 end;
 
-
-
 end.