Changeset 82 for trunk/Forms/UFormContacts.pas

Timestamp:

Dec 21, 2021, 5:16:41 PM (3 years ago)

Author:

chronos

Message:

• Fixed: Settings option to load previously opened file wasn't working for disabled state.
• Fixed: Disable Find action if no file is opened.
• Modified: Move fields initialization method to TContact class and made it static so it is initialized only once.
• Added: Allow to set default vCard version in settings dialog.
• Modified: Add GTK2 theming support to snap package.

File:

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

trunk/Forms/UFormContacts.pas

@@ -203 +203 @@
         for J := 0 to FilterItems.Count - 1 do begin
           if FilterItems[J].FieldIndex = cfNone then begin
-            for K := 0 to TContact(List.Items[I]).Parent.Fields.Count - 1 do begin
+            for K := 0 to TContact(List.Items[I]).GetFields.Count - 1 do begin
               if Pos(UTF8LowerCase(FilterItems[J].Value),
-                UTF8LowerCase(TContact(List.Items[I]).Fields[TContact(List.Items[I]).Parent.Fields[K].Index])) > 0 then begin
+                UTF8LowerCase(TContact(List.Items[I]).Fields[TContact(List.Items[I]).GetFields[K].Index])) > 0 then begin
                   Inc(FoundCount);
                   Break;
@@ -286 +286 @@
   for I := 0 to ListView1.Columns.Count - 1 do begin
     if Assigned(Contacts) and Assigned(Contacts.ContactsFile) then begin
-      Field := Contacts.ContactsFile.Fields.GetByIndex(ListViewColumns[I]);
+      Field := TContact.GetFields.GetByIndex(ListViewColumns[I]);
       if Assigned(Field) then
         ListView1.Columns[I].Caption := Field.Title;
@@ -312 +312 @@
     Contact := TContact.Create;
     try
-      Contact.Parent := Contacts.ContactsFile;
+      Contact.ContactsFile := Contacts.ContactsFile;
       FormContact.Contact := Contact;
       FormContact.OnGetPrevious := GetPreviousContact;
       FormContact.OnGetNext := GetNextContact;
+      Contact.Properties.AddNew('VERSION', Core.DefaultVcardVersion);
       if FormContact.ShowModal = mrOK then begin
         Contacts.Add(Contact);
@@ -341 +342 @@
     Contact := TContact.Create;
     try
-      Contact.Parent := Contacts.ContactsFile;
+      Contact.ContactsFile := Contacts.ContactsFile;
       Contact.Assign(TContact(ListView1.Selected.Data));
       FormContact.Contact := Contact;
@@ -442 +443 @@
     Contact := TContact.Create;
     try
-      Contact.Parent := Contacts.ContactsFile;
+      Contact.ContactsFile := Contacts.ContactsFile;
       Contact.Assign(TContact(ListView1.Selected.Data));
       FormContact.Contact := Contact;