Changeset 39 for trunk/Forms/UFormContacts.pas

Timestamp:

Nov 29, 2021, 2:17:26 PM (3 years ago)

Author:

chronos

Message:

• Added: New more general contact properties list and item form.
• Modified: Show Private and Work addresses in separate tab.

File:

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

trunk/Forms/UFormContacts.pas

@@ -197 +197 @@
   FormContact := TFormContact.Create(nil);
   try
-  if FormContact.ShowModal = mrOK then begin
     Contact := TContact.Create;
-    Contact.Parent := Contacts.ContactsFile;
-    FormContact.SaveData(Contact);
-    Contacts.Add(Contact);
-    Core.DataFile.Modified := True;
-    ReloadList;
-    UpdateInterface;
-  end;
+    try
+      Contact.Parent := Contacts.ContactsFile;
+      FormContact.Contact := Contact;
+      if FormContact.ShowModal = mrOK then begin
+        Contacts.Add(Contact);
+        Contact := nil;
+        Core.DataFile.Modified := True;
+        ReloadList;
+        UpdateInterface;
+      end;
+    finally
+      if Assigned(Contact) then
+        Contact.Free;
+    end;
   finally
     FormContact.Free;
@@ -214 +220 @@
 var
   FormContact: TFormContact;
+  Contact: TContact;
 begin
   FormContact := TFormContact.Create(nil);
   try
-    FormContact.LoadData(TContact(ListView1.Selected.Data));
-    if FormContact.ShowModal = mrOK then begin
-      FormContact.SaveData(TContact(ListView1.Selected.Data));
-      Core.DataFile.Modified := True;
-      ReloadList;
-      UpdateInterface;
+    Contact := TContact.Create;
+    Contact.Assign(TContact(ListView1.Selected.Data));
+    FormContact.Contact := Contact;
+    try
+      if FormContact.ShowModal = mrOK then begin
+        TContact(ListView1.Selected.Data).Assign(Contact);
+        Core.DataFile.Modified := True;
+        ReloadList;
+        UpdateInterface;
+      end;
+    finally
+      Contact.Free;
     end;
   finally