Changeset 77 for trunk/Forms/UFormContacts.pas

Timestamp:

Dec 15, 2021, 9:03:17 PM (2 years ago)

Author:

chronos

Message:

• Modified: More preparation for future Previous and Next buttons in Contact window.

File:

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

trunk/Forms/UFormContacts.pas

@@ -80 +80 @@
     procedure FilterList(List: TFPGObjectList<TObject>);
     procedure SetContacts(AValue: TContacts);
-    procedure FormContactPrevious(Sender: TObject);
-    procedure FormContactNext(Sender: TObject);
+    function GetPreviousContact(Contact: TContact): TContact;
+    function GetNextContact(Contact: TContact): TContact;
     procedure DoUpdateInterface;
     procedure UpdateColumns;
@@ -234 +234 @@
 end;
 
-procedure TFormContacts.FormContactPrevious(Sender: TObject);
-var
-  I: Integer;
-begin
-  I := ListViewSort1.List.IndexOf(TFormContact(Sender).Contact);
+function TFormContacts.GetPreviousContact(Contact: TContact): TContact;
+var
+  I: Integer;
+begin
+  I := ListViewSort1.List.IndexOf(Contact);
   if (I <> -1) and (I > 0) then
-    TFormContact(Sender).Contact := TContact(ListViewSort1.List[I - 1]);
-end;
-
-procedure TFormContacts.FormContactNext(Sender: TObject);
-var
-  I: Integer;
-begin
-  I := ListViewSort1.List.IndexOf(TFormContact(Sender).Contact);
+    Result := TContact(ListViewSort1.List[I - 1])
+    else Result := nil;
+end;
+
+function TFormContacts.GetNextContact(Contact: TContact): TContact;
+var
+  I: Integer;
+begin
+  I := ListViewSort1.List.IndexOf(Contact);
   if (I <> -1) and (I < ListViewSort1.List.Count - 1) then
-    TFormContact(Sender).Contact := TContact(ListViewSort1.List[I + 1]);
+    Result := TContact(ListViewSort1.List[I + 1])
+    else Result := nil;
 end;
 
@@ -312 +314 @@
       Contact.Parent := Contacts.ContactsFile;
       FormContact.Contact := Contact;
-      FormContact.OnPrevious := FormContactPrevious;
-      FormContact.OnNext := FormContactNext;
+      FormContact.OnGetPrevious := GetPreviousContact;
+      FormContact.OnGetNext := GetNextContact;
       if FormContact.ShowModal = mrOK then begin
         Contacts.Add(Contact);
@@ -342 +344 @@
       Contact.Assign(TContact(ListView1.Selected.Data));
       FormContact.Contact := Contact;
-      FormContact.OnPrevious := FormContactPrevious;
-      FormContact.OnNext := FormContactNext;
+      FormContact.OnGetPrevious := GetPreviousContact;
+      FormContact.OnGetNext := GetNextContact;
       if FormContact.ShowModal = mrOK then begin
         Contacts.Add(Contact);
@@ -443 +445 @@
       Contact.Assign(TContact(ListView1.Selected.Data));
       FormContact.Contact := Contact;
-      FormContact.OnPrevious := FormContactPrevious;
-      FormContact.OnNext := FormContactNext;
+      FormContact.OnGetPrevious := GetPreviousContact;
+      FormContact.OnGetNext := GetNextContact;
       if FormContact.ShowModal = mrOK then begin
         TContact(ListView1.Selected.Data).Assign(Contact);