Changeset 219 for trunk/Forms/FormImportSources.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/FormImportSources.pas (moved) (moved from trunk/Forms/UFormImportSources.pas ) (17 diffs)

trunk/Forms/FormImportSources.pas

@@ -1 @@
-unit UFormImportSources;
-
-{$mode delphi}
+unit FormImportSources;
 
 interface
@@ -7 +5 @@
 uses
   Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, ComCtrls,
-  ActnList, Menus, UAcronym, UJobProgressView, UListViewSort, LazUTF8, fgl;
+  ActnList, Menus, Acronym, JobProgressView, ListViewSort, LazUTF8,
+  Generics.Collections;
 
 type
@@ -44 +43 @@
     procedure AProcessExecute(Sender: TObject);
     procedure ARemoveExecute(Sender: TObject);
-    procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
     procedure FormCreate(Sender: TObject);
     procedure FormShow(Sender: TObject);
     procedure ListView1Change(Sender: TObject; Item: TListItem;
       Change: TItemChange);
-    procedure ListView1Click(Sender: TObject);
     procedure ListView1Data(Sender: TObject; Item: TListItem);
     procedure ListView1DblClick(Sender: TObject);
@@ -62 +59 @@
   private
     procedure ProcessImportJob(Job: TJob);
-    procedure FilterList(List: TFPGObjectList<TObject>);
+    procedure FilterList(List: TObjectList<TObject>);
   public
     ImportSources: TImportSources;
@@ -69 +66 @@
   end;
 
-var
-  FormImportSources: TFormImportSources;
 
 implementation
@@ -77 +72 @@
 
 uses
-  UCore, UFormMain, UFormImportSource;
+  Core, FormMain, FormImportSource;
 
 resourcestring
@@ -172 +167 @@
 procedure TFormImportSources.FormShow(Sender: TObject);
 begin
-  Core.PersistentForm1.Load(Self);
   UpdateList;
-  Core.ScaleDPI1.ScaleControl(ToolBar1, Core.ScaleDPI1.DesignDPI);
+  Core.Core.ScaleDPI1.ScaleControl(ToolBar1, Core.Core.ScaleDPI1.DesignDPI);
 end;
 
@@ -182 +176 @@
   if Assigned(Item) and (Change = ctState) then begin
     TImportSource(Item.Data).Enabled := Item.Checked;
-    Core.AcronymDb.Modified := True;
-  end;
-end;
-
-procedure TFormImportSources.ListView1Click(Sender: TObject);
-begin
-
+    Core.Core.AcronymDb.Modified := True;
+  end;
 end;
 
@@ -194 +183 @@
 var
   NewImportSource: TImportSource;
+  FormImportSource: TFormImportSource;
   I: Integer;
 begin
@@ -212 +202 @@
 
         NewImportSource := nil;
-        Core.AcronymDb.Modified := True;
+        Core.Core.AcronymDb.Modified := True;
         UpdateList;
       end else ShowMessage(Format(SImportSourceAlreadyExists, [NewImportSource.Name]));
@@ -229 +219 @@
   if ListView1.Items[I].Selected then begin
     TImportSource(ListView1.Items[I].Data).Enabled := False;
-    Core.AcronymDb.Modified := True;
+    Core.Core.AcronymDb.Modified := True;
   end;
   UpdateList;
@@ -241 +231 @@
   if ListView1.Items[I].Selected then begin
     TImportSource(ListView1.Items[I].Data).Enabled := True;
-    Core.AcronymDb.Modified := True;
+    Core.Core.AcronymDb.Modified := True;
   end;
   UpdateList;
@@ -249 +239 @@
 var
   NewImportSource: TImportSource;
+  FormImportSource: TFormImportSource;
 begin
   if Assigned(ListView1.Selected) then begin
@@ -261 +252 @@
           if not Assigned(ImportSources.SearchByName(NewImportSource.Name)) then begin;
             TImportSource(ListView1.Selected.Data).Assign(NewImportSource);
-            Core.AcronymDb.Modified := True;
+            Core.Core.AcronymDb.Modified := True;
           end else ShowMessage(Format(SImportSourceAlreadyExists, [NewImportSource.Name]));
         end else begin
           TImportSource(ListView1.Selected.Data).Assign(NewImportSource);
-          Core.AcronymDb.Modified := True;
+          Core.Core.AcronymDb.Modified := True;
         end;
 
@@ -283 +274 @@
 begin
   if Assigned(ListView1.Selected) then begin
-    Core.AcronymDb.AddedCount := 0;
+    Core.Core.AcronymDb.AddedCount := 0;
     JobProgressView1.AddJob(SProcessSelectedSource, ProcessImportJob);
     JobProgressView1.Start;
     ShowMessage(Format(SAddedCount, [TImportSource(ListView1.Selected.Data).ItemCount,
-      Core.AcronymDb.AddedCount]));
+      Core.Core.AcronymDb.AddedCount]));
   end;
 end;
@@ -296 +287 @@
 end;
 
-procedure TFormImportSources.FilterList(List: TFPGObjectList<TObject>);
+procedure TFormImportSources.FilterList(List: TObjectList<TObject>);
 var
   I: Integer;
@@ -344 +335 @@
 end;
 
-procedure TFormImportSources.FormClose(Sender: TObject;
-  var CloseAction: TCloseAction);
-begin
-  Core.PersistentForm1.Save(Self);
-end;
-
 procedure TFormImportSources.FormCreate(Sender: TObject);
 var
   I: Integer;
 begin
-  Core.Translator.TranslateComponentRecursive(Self);
-  Core.ThemeManager.UseTheme(Self);
   for I := 0 to ToolBar1.ButtonCount - 1 do
     ToolBar1.Buttons[I].Hint := ToolBar1.Buttons[I].Caption;