Changeset 219 for trunk/Forms/FormCheck.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/Forms/FormCheck.pas (moved) (moved from trunk/Forms/UFormCheck.pas ) (11 diffs)

trunk/Forms/FormCheck.pas

@@ -1 @@
-unit UFormCheck;
-
-{$mode delphi}
+unit FormCheck;
 
 interface
@@ -7 +5 @@
 uses
   Classes, SysUtils, LazFileUtils, Forms, Controls, Graphics, Dialogs, StdCtrls,
-  ExtCtrls, ComCtrls, Menus, ActnList, UAcronym, URegistry, Registry, UCommon,
-  fgl;
+  ExtCtrls, ComCtrls, Menus, ActnList, Acronym, RegistryEx, Registry, Common,
+  Generics.Collections;
 
 type
@@ -21 +19 @@
   { TReportItems }
 
-  TReportItems = class(TFPGObjectList<TReportItem>)
+  TReportItems = class(TObjectList<TReportItem>)
     function AddNew(Message: string; Position: TPoint;
       Kind: TReportType = rtNone): TReportItem;
@@ -65 +63 @@
     procedure ButtonCheckClick(Sender: TObject);
     procedure ButtonLoadFromFileClick(Sender: TObject);
-    procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
     procedure FormCreate(Sender: TObject);
     procedure FormDestroy(Sender: TObject);
@@ -98 +95 @@
   end;
 
-var
-  FormCheck: TFormCheck;
-
 const
   ReportTypeString: array[TReportType] of string = ('', 'Note', 'Warning', 'Error');
@@ -110 +104 @@
 
 uses
-  UFormAcronyms, UCore;
+  FormAcronyms, Core;
 
 resourcestring
@@ -198 +192 @@
 end;
 
-procedure TFormCheck.FormClose(Sender: TObject; var CloseAction: TCloseAction);
-begin
-  Core.PersistentForm1.Save(Self);
-end;
-
 procedure TFormCheck.FormCreate(Sender: TObject);
 begin
   AcronymDbSummary := TAcronymDb.Create;
   AcronymDbContent := TAcronymDb.Create;
-  Core.Translator.TranslateComponentRecursive(Self);
-  Core.ThemeManager.UseTheme(Self);
   ReportItems := TReportItems.Create;
 end;
@@ -214 +201 @@
 procedure TFormCheck.FormDestroy(Sender: TObject);
 begin
-  ReportItems.Free;
-  AcronymDbSummary.Free;
-  AcronymDbContent.Free;
+  FreeAndNil(ReportItems);
+  FreeAndNil(AcronymDbSummary);
+  FreeAndNil(AcronymDbContent);
 end;
 
@@ -222 +209 @@
 begin
   PageControl1.TabIndex := 0;
-  Core.PersistentForm1.Load(Self);
   if FileExists(LastDocumentFileName) then
     MemoDocument.Lines.LoadFromFile(LastDocumentFileName);
@@ -724 +710 @@
   with TRegistryEx.Create do
   try
-    RootKey := RegistryRootHKEY[Core.ApplicationInfo1.RegistryRoot];
-    OpenKey(Core.ApplicationInfo1.RegistryKey, True);
+    RootKey := RegistryRootHKEY[Core.Core.ApplicationInfo1.RegistryRoot];
+    OpenKey(Core.Core.ApplicationInfo1.RegistryKey, True);
     EditSummaryStart.Text := ReadStringWithDefault('SummaryStart', 'ACRONYMS AND ABBREVIATIONS');
     EditSummaryEnd.Text := ReadStringWithDefault('SummaryEnd', 'Appendix');
@@ -739 +725 @@
   with TRegistryEx.Create do
   try
-    RootKey := RegistryRootHKEY[Core.ApplicationInfo1.RegistryRoot];
-    OpenKey(Core.ApplicationInfo1.RegistryKey, True);
+    RootKey := RegistryRootHKEY[Core.Core.ApplicationInfo1.RegistryRoot];
+    OpenKey(Core.Core.ApplicationInfo1.RegistryKey, True);
     WriteString('SummaryStart', EditSummaryStart.Text);
     WriteString('SummaryEnd', EditSummaryEnd.Text);