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

trunk/Forms/FormImportSource.pas

@@ -1 @@
-unit UFormImportSource;
-
-{$mode delphi}
+unit FormImportSource;
 
 interface
@@ -7 +5 @@
 uses
   Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, StdCtrls,
-  ActnList, Menus, ExtCtrls, UAcronym, LCLIntf;
+  ActnList, Menus, ExtCtrls, Acronym, LCLIntf;
 
 type
@@ -44 +42 @@
     procedure ButtonOpenURLClick(Sender: TObject);
     procedure ButtonShowFormatClick(Sender: TObject);
-    procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
-    procedure FormCreate(Sender: TObject);
     procedure FormShow(Sender: TObject);
-  private
-    { private declarations }
   public
     procedure UpdateInterface;
@@ -55 +49 @@
   end;
 
-var
-  FormImportSource: TFormImportSource;
 
 implementation
@@ -63 +55 @@
 
 uses
-  UCore, UFormImportFormat, UFormCategorySelect;
+  Core, FormImportFormat, FormCategorySelect;
 
 { TFormImportSource }
@@ -70 +62 @@
 var
   NewImportFormat: TImportFormat;
+  FormImportFormat: TFormImportFormat;
 begin
   if ComboBox1.ItemIndex <> -1 then begin
@@ -80 +73 @@
         FormImportFormat.Save(NewImportFormat);
         TImportFormat(ComboBox1.Items.Objects[ComboBox1.ItemIndex]).Assign(NewImportFormat);
-        Core.AcronymDb.Modified := True;
+        Core.Core.AcronymDb.Modified := True;
         ComboBox1.Items.Strings[ComboBox1.ItemIndex] := NewImportFormat.Name;
       end;
@@ -90 +83 @@
 end;
 
-procedure TFormImportSource.FormClose(Sender: TObject;
-  var CloseAction: TCloseAction);
-begin
-  Core.PersistentForm1.Save(Self);
-end;
-
-procedure TFormImportSource.FormCreate(Sender: TObject);
-begin
-  Core.Translator.TranslateComponentRecursive(Self);
-  Core.ThemeManager.UseTheme(Self);
-end;
-
 procedure TFormImportSource.FormShow(Sender: TObject);
 begin
-  Core.PersistentForm1.Load(Self);
   UpdateInterface;
 end;
@@ -116 +96 @@
 var
   I: Integer;
+  FormCategorySelect: TFormCategorySelect;
 begin
   FormCategorySelect := TFormCategorySelect.Create(Self);
@@ -155 +136 @@
   EditName.Text := ImportSource.Name;
   EditURL.Text := ImportSource.URL;
-  while ComboBox1.Items.Count > Core.AcronymDb.ImportFormats.Count do
+  while ComboBox1.Items.Count > Core.Core.AcronymDb.ImportFormats.Count do
     ComboBox1.Items.Delete(ComboBox1.Items.Count - 1);
-  while ComboBox1.Items.Count < Core.AcronymDb.ImportFormats.Count do
+  while ComboBox1.Items.Count < Core.Core.AcronymDb.ImportFormats.Count do
     ComboBox1.Items.Add('');
-  for I := 0 to Core.AcronymDb.ImportFormats.Count - 1 do begin
-    ComboBox1.Items[I] := TImportFormat(Core.AcronymDb.ImportFormats[I]).Name;
-    ComboBox1.Items.Objects[I] := Core.AcronymDb.ImportFormats[I];
+  for I := 0 to Core.Core.AcronymDb.ImportFormats.Count - 1 do begin
+    ComboBox1.Items[I] := TImportFormat(Core.Core.AcronymDb.ImportFormats[I]).Name;
+    ComboBox1.Items.Objects[I] := Core.Core.AcronymDb.ImportFormats[I];
   end;
   ComboBox1.ItemIndex := ComboBox1.Items.IndexOfObject(ImportSource.Format);