Changeset 219 for trunk/Forms/FormImport.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/FormImport.pas (moved) (moved from trunk/Forms/UFormImport.pas ) (10 diffs)

trunk/Forms/FormImport.pas

@@ -1 @@
-unit UFormImport;
-
-{$mode delphi}{$H+}
+unit FormImport;
 
 interface
@@ -7 +5 @@
 uses
   Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, StdCtrls,
-  UAcronym;
+  Acronym, FormEx;
 
 type
@@ -13 +11 @@
   { TFormImport }
 
-  TFormImport = class(TForm)
+  TFormImport = class(TFormEx)
     ButtonLoadFromFile: TButton;
     ButtonProcess: TButton;
@@ -22 +20 @@
     procedure ButtonProcessClick(Sender: TObject);
     procedure ButtonLoadFromFileClick(Sender: TObject);
-    procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
-    procedure FormCreate(Sender: TObject);
-    procedure FormShow(Sender: TObject);
   private
     procedure ImportMediaWiki;
     procedure ImportCSV;
-  public
-    { public declarations }
   end;
 
-var
-  FormImport: TFormImport;
 
 implementation
@@ -40 +31 @@
 
 uses
-  UCore;
+  Core;
 
 resourcestring
   SImportedNewAcronyms = 'Imported %d new acronyms.';
-
 
 { TFormImport }
@@ -60 +50 @@
   if OpenDialog1.Execute then
     Memo1.Lines.LoadFromFile(OpenDialog1.FileName);
-end;
-
-procedure TFormImport.FormClose(Sender: TObject; var CloseAction: TCloseAction);
-begin
-  Core.PersistentForm1.Save(Self);
-end;
-
-procedure TFormImport.FormCreate(Sender: TObject);
-begin
-  Core.Translator.TranslateComponentRecursive(Self);
-  Core.ThemeManager.UseTheme(Self);
-end;
-
-procedure TFormImport.FormShow(Sender: TObject);
-begin
-  Core.PersistentForm1.Load(Self);
 end;
 
@@ -101 +75 @@
       AcronymMeaning := Trim(Copy(Line, 2, Length(Line)));
       if (AcronymName <> '') and (AcronymMeaning <> '') then begin
-        Acronym := Core.AcronymDb.Acronyms.SearchByName(AcronymName);
+        Acronym := Core.Core.AcronymDb.Acronyms.SearchByName(AcronymName);
         if not Assigned(Acronym) then begin
           Acronym := TAcronym.Create;
           Acronym.Name := AcronymName;
-          Core.AcronymDb.Acronyms.Add(Acronym);
+          Core.Core.AcronymDb.Acronyms.Add(Acronym);
         end;
         Meaning := Acronym.Meanings.SearchByName(AcronymMeaning);
@@ -118 +92 @@
     end;
   end;
-  if AddedCount > 0 then Core.AcronymDb.Modified := True;
+  if AddedCount > 0 then Core.Core.AcronymDb.Modified := True;
   ShowMessage(Format(SImportedNewAcronyms, [AddedCount]));
 end;
@@ -147 +121 @@
       else AcronymDescription := '';
     if (AcronymName <> '') and (AcronymDescription <> '') then begin
-      Acronym := Core.AcronymDb.Acronyms.SearchByName(AcronymName);
+      Acronym := Core.Core.AcronymDb.Acronyms.SearchByName(AcronymName);
       if not Assigned(Acronym) then begin
         Acronym := TAcronym.Create;
         Acronym.Name := AcronymName;
-        Core.AcronymDb.Acronyms.Add(Acronym);
+        Core.Core.AcronymDb.Acronyms.Add(Acronym);
       end;
       Meaning := Acronym.Meanings.SearchByName(AcronymDescription);
@@ -165 +139 @@
   end;
   Columns.Free;
-  if AddedCount > 0 then Core.AcronymDb.Modified := True;
+  if AddedCount > 0 then Core.Core.AcronymDb.Modified := True;
   ShowMessage(Format(SImportedNewAcronyms, [AddedCount]));
 end;