Changeset 129 for trunk/Forms/UFormFindDuplicity.pas

Timestamp:

Apr 9, 2022, 11:52:13 AM (3 years ago)

Author:

chronos

Message:

• Added: TVCard as TComponent descendant.
• Modified: TContactsFile renamed to TVCardFile and moved into separate file.

File:

• trunk/Forms/UFormFindDuplicity.pas (modified) (6 diffs)

trunk/Forms/UFormFindDuplicity.pas

@@ -5 +5 @@
 uses
   Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, ComCtrls,
-  ExtCtrls, StdCtrls, ActnList, Menus, UContact, Generics.Collections,
+  ExtCtrls, StdCtrls, ActnList, Menus, UVCard, Generics.Collections,
   Generics.Defaults;
 
@@ -65 +65 @@
 
 uses
-  UCore, UFormContacts;
+  UCore, UFormContacts, UVCardFile;
 
 { TFoundItems }
@@ -191 +191 @@
     Form := TFormContacts.Create(nil);
     Form.Contacts := TContacts.Create(False);
-    Form.Contacts.ContactsFile := Contacts.ContactsFile;
+    Form.Contacts.ParentVCard := Contacts.ParentVCard;
     with TFoundItem(ListView1.Selected.Data) do
       for I := 0 to Contacts.Count - 1 do
@@ -202 +202 @@
           Form.Contacts.Remove(Contacts[I]);
           Self.Contacts.Remove(Contacts[I]);
-          Self.Contacts.ContactsFile.Modified := True;
+          Self.Contacts.ParentVCard.Modified := True;
         end;
 
@@ -210 +210 @@
           Form.Contacts.Add(Form.Contacts[I]);
           Self.Contacts.Add(Form.Contacts[I]);
-          Self.Contacts.ContactsFile.Modified := True;
+          Self.Contacts.ParentVCard.Modified := True;
         end;
     end;
@@ -221 +221 @@
 procedure TFormFindDuplicity.ButtonMergeClick(Sender: TObject);
 var
-  TempContacts: TContactsFile;
-  I: Integer;
-begin
-  TempContacts := TContactsFile.Create;
+  TempContacts: TVCardFile;
+  I: Integer;
+begin
+  TempContacts := TVCardFile.Create;
   try
     for I := 0 to Contacts.Count - 1 do
-      TempContacts.Contacts.Merge(Contacts[I], TContactField(ComboBoxField.Items.Objects[ComboBoxField.ItemIndex]).Index);
-    Contacts.Assign(TempContacts.Contacts);
+      TempContacts.VCard.Contacts.Merge(Contacts[I], TContactField(ComboBoxField.Items.Objects[ComboBoxField.ItemIndex]).Index);
+    Contacts.Assign(TempContacts.VCard.Contacts);
     Find;
   finally