Changeset 68 for trunk

Timestamp:

Dec 10, 2021, 11:15:41 AM (3 years ago)

Author:

chronos

Message:

• Fixed: Wrong field selected for duplicates find from field combobox selection in Find duplicates window.
• Added: Sort list of contact fields in Find duplicates and Field windows.

Location:

trunk

Files:

• Forms/UFormFindDuplicity.pas (modified) (5 diffs)
• Forms/UFormProperty.lfm (modified) (1 diff)
• Forms/UFormProperty.pas (modified) (2 diffs)
• Images/Screenshots/Contact - All fields.png (added)
• Images/Screenshots/Contact - Chat.png (added)
• Images/Screenshots/Contact - General.png (added)
• Images/Screenshots/Contact - Home.png (added)
• Images/Screenshots/Contact - Social.png (added)
• Images/Screenshots/Contact - Work.png (added)
• Images/Screenshots/vCard Studio.png (modified) ( previous)
• Packages/Common/UCommon.pas (modified) (2 diffs)
• UContact.pas (modified) (2 diffs)

trunk/Forms/UFormFindDuplicity.pas

@@ -49 +49 @@
   public
     FoundItems: TFoundItems;
-    ContactField: TContactFieldIndex;
+    ContactFieldIndex: TContactFieldIndex;
     procedure Find;
     procedure ReloadList;
@@ -107 +107 @@
 
 procedure TFormFindDuplicity.SetContacts(AValue: TContacts);
+var
+  ContactField: TContactField;
 begin
   if FContacts = AValue then Exit;
@@ -112 +114 @@
   if Assigned(FContacts) then begin
     Contacts.ContactsFile.Fields.LoadToStrings(ComboBoxField.Items);
-    ComboBoxField.ItemIndex := Integer(ContactField);
+    ContactField := Contacts.ContactsFile.Fields.GetByIndex(ContactFieldIndex);
+    ComboBoxField.ItemIndex := ComboBoxField.Items.IndexOfObject(ContactField);
     if (ComboBoxField.Items.Count > 0) and (ComboBoxField.ItemIndex = -1) then
       ComboBoxField.ItemIndex := 0;
@@ -133 +136 @@
   FoundItems.Clear;
   for I := 0 to Contacts.Count - 1 do begin
-    FieldName := TContact(Contacts[I]).Fields[ContactField];
+    FieldName := Contacts[I].Fields[ContactFieldIndex];
     if FieldName <> '' then begin
       Item := FoundItems.SearchByField(FieldName);
@@ -153 +156 @@
   Core.Translator.TranslateComponentRecursive(Self);
   Core.ThemeManager1.UseTheme(Self);
-  ContactField := cfTelCell;
+  ContactFieldIndex := cfTelCell;
 end;
 
 procedure TFormFindDuplicity.ComboBoxFieldChange(Sender: TObject);
 begin
-  ContactField := TContactFieldIndex(ComboBoxField.ItemIndex);
+  if ComboBoxField.ItemIndex <> -1 then
+    ContactFieldIndex := TContactField(ComboBoxField.Items.Objects[ComboBoxField.ItemIndex]).Index
+    else ContactFieldIndex := cfTelCell;
   Find;
 end;

trunk/Forms/UFormProperty.lfm

@@ -95 +95 @@
   object ComboBoxField: TComboBox
     Left = 168
-    Height = 42
+    Height = 41
     Top = 24
     Width = 532

trunk/Forms/UFormProperty.pas

@@ -64 +64 @@
 begin
   if ComboBoxField.ItemIndex <> -1 then begin
-    Field := TContactsFile(Core.DataFile).Fields[ComboBoxField.ItemIndex];
+    Field := TContactField(ComboBoxField.Items.Objects[ComboBoxField.ItemIndex]);
     if Assigned(Field) then begin
       EditName.Text := Field.SysName;
@@ -132 +132 @@
     GroupsArray);
   if Assigned(Field) then
-    ComboBoxField.ItemIndex := TContactsFile(Core.DataFile).Fields.IndexOf(Field);
+    ComboBoxField.ItemIndex := ComboBoxField.Items.IndexOfObject(Field);
 end;
 

trunk/Packages/Common/UCommon.pas

@@ -85 +85 @@
 function TryHexToInt(Data: string; var Value: Integer): Boolean;
 function TryBinToInt(Data: string; var Value: Integer): Boolean;
+procedure SortStrings(Strings: TStrings);
 
 
@@ -677 +678 @@
 end;
 
+procedure SortStrings(Strings: TStrings);
+var
+  Tmp: TStringList;
+begin
+  Strings.BeginUpdate;
+  try
+    if Strings is TStringList then begin
+      TStringList(Strings).Sort;
+    end else begin
+      Tmp := TStringList.Create;
+      try
+        Tmp.Assign(Strings);
+        Tmp.Sort;
+        Strings.Assign(Tmp);
+      finally
+        Tmp.Free;
+      end;
+    end;
+  finally
+    Strings.EndUpdate;
+  end;
+end;
+
 
 initialization

trunk/UContact.pas

@@ -162 +162 @@
 
 uses
-  UQuotedPrintable;
+  UQuotedPrintable, UCommon;
 
 const
@@ -674 +674 @@
   I: Integer;
 begin
-  while AItems.Count < Count do AItems.Add('');
-  while AItems.Count > Count do AItems.Delete(AItems.Count - 1);
-  for I := 0 to Count - 1 do
-    AItems[I] := Items[I].Title;
+  AItems.BeginUpdate;
+  try
+    while AItems.Count < Count do AItems.Add('');
+    while AItems.Count > Count do AItems.Delete(AItems.Count - 1);
+    for I := 0 to Count - 1 do begin
+      AItems.Objects[I] := Items[I];
+      AItems[I] := Items[I].Title;
+    end;
+    SortStrings(AItems);
+  finally
+    AItems.EndUpdate;
+  end;
 end;