Changeset 76 for trunk/UCore.pas

Timestamp:

Dec 15, 2021, 8:56:06 PM (2 years ago)

Author:

chronos

Message:

• Added: Find dialog to search text value by given contact field or by any field.

File:

• trunk/UCore.pas (modified) (6 diffs)

trunk/UCore.pas

@@ -17 +17 @@
     AAbout: TAction;
     AboutDialog1: TAboutDialog;
+    AFind: TAction;
     AFileSplit: TAction;
     AGenerate: TAction;
@@ -52 +53 @@
     procedure AFileSplitExecute(Sender: TObject);
     procedure AFindDuplicateExecute(Sender: TObject);
+    procedure AFindExecute(Sender: TObject);
     procedure AGenerateExecute(Sender: TObject);
     procedure AHomePageExecute(Sender: TObject);
@@ -99 +101 @@
 uses
   UFormMain, UFormSettings, UContact, UFormContacts, UFormFindDuplicity,
-  UFormGenerate, UFormError;
+  UFormGenerate, UFormError, UFormFind;
 
 resourcestring
@@ -202 +204 @@
 procedure TCore.AFindDuplicateExecute(Sender: TObject);
 begin
-  FormFindDuplicity := TFormFindDuplicity.Create(nil);
-  with FormFindDuplicity do begin
+  with TFormFindDuplicity.Create(nil) do
+  try
     Contacts := TContactsFile(DataFile).Contacts;
     ShowModal;
     FormContacts.ReloadList;
     FormMain.UpdateInterface;
+  finally
     Free;
   end;
 end;
 
+procedure TCore.AFindExecute(Sender: TObject);
+begin
+  with TFormFind.Create(nil) do
+  try
+    Contacts := TContactsFile(DataFile).Contacts;
+    ShowModal;
+    FormContacts.ReloadList;
+    FormMain.UpdateInterface;
+  finally
+    Free;
+  end;
+end;
+
 procedure TCore.AGenerateExecute(Sender: TObject);
 begin
-  FormGenerate := TFormGenerate.Create(nil);
-  with FormGenerate do begin
+  with TFormGenerate.Create(nil) do
+  try
     Contacts := TContactsFile(DataFile).Contacts;
     ShowModal;
@@ -222 +238 @@
     DataFile.Modified := True;
     FormMain.UpdateInterface;
+  finally
     Free;
   end;
@@ -233 +250 @@
 procedure TCore.ASettingsExecute(Sender: TObject);
 begin
-  FormSettings := TFormSettings.Create(nil);
-  try
-    FormSettings.LoadData;
-    if FormSettings.ShowModal = mrOK then begin
-      FormSettings.SaveData;
+  with TFormSettings.Create(nil) do
+  try
+    LoadData;
+    if ShowModal = mrOK then begin
+      SaveData;
       ThemeManager1.UseTheme(FormMain);
       ThemeManager1.UseTheme(FormContacts);
     end;
   finally
-    FormSettings.Free;
+    Free;
   end;
 end;