Changeset 73 for trunk/Forms/UFormFindDuplicity.pas

Timestamp:

Dec 13, 2021, 11:33:11 PM (2 years ago)

Author:

chronos

Message:

• Added: Copy, cut and paste context menu action in contacts list.
• Modified: Merge multiple files action replaced by Combine action. During Combine action files are simply added into final contacts list even with duplicate contacts.
• Modified: Added Merge button into Find duplicate window to merge contacts by selected contact field.
• Modified: Show only used contact fields in Find duplicates window.
• Fixed: Wrong items were removed if contacts and properties lists were in filtered state.

File:

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

trunk/Forms/UFormFindDuplicity.pas

@@ -31 +31 @@
     AShowContacts: TAction;
     ActionList1: TActionList;
+    ButtonMerge: TButton;
     ComboBoxField: TComboBox;
     Label1: TLabel;
@@ -38 +39 @@
     PopupMenu1: TPopupMenu;
     procedure AShowContactsExecute(Sender: TObject);
+    procedure ButtonMergeClick(Sender: TObject);
     procedure ComboBoxFieldChange(Sender: TObject);
     procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
@@ -109 +111 @@
 var
   ContactField: TContactField;
+  Items: TStringList;
+  I: Integer;
 begin
   if FContacts = AValue then Exit;
   FContacts := AValue;
   if Assigned(FContacts) then begin
-    Contacts.ContactsFile.Fields.LoadToStrings(ComboBoxField.Items);
+    Items := TStringList.Create;
+    try
+      Contacts.ContactsFile.Fields.LoadToStrings(Items);
+
+      // Remove fields which are not used in contacts
+      for I := Items.Count - 1 downto 0 do
+        if Contacts.CountByField(TContactField(Items.Objects[I]).Index) = 0 then
+          Items.Delete(I);
+
+      ComboBoxField.Items.Assign(Items);
+    finally
+      Items.Free;
+    end;
     ContactField := Contacts.ContactsFile.Fields.GetByIndex(ContactFieldIndex);
     ComboBoxField.ItemIndex := ComboBoxField.Items.IndexOfObject(ContactField);
@@ -156 +172 @@
   Core.Translator.TranslateComponentRecursive(Self);
   Core.ThemeManager1.UseTheme(Self);
-  ContactFieldIndex := cfTelCell;
+  ContactFieldIndex := cfFullName;
 end;
 
@@ -203 +219 @@
 end;
 
+procedure TFormFindDuplicity.ButtonMergeClick(Sender: TObject);
+var
+  TempContacts: TContactsFile;
+  I: Integer;
+begin
+  TempContacts := TContactsFile.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);
+    Find;
+  finally
+    TempContacts.Free;
+  end;
+end;
+
 procedure TFormFindDuplicity.FormClose(Sender: TObject;
   var CloseAction: TCloseAction);