Changeset 77 for trunk

Timestamp:

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

Author:

chronos

Message:

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

Location:

trunk

Files:

• Forms/UFormContact.lfm (modified) (34 diffs)
• Forms/UFormContact.pas (modified) (5 diffs)
• Forms/UFormContacts.pas (modified) (5 diffs)
• Languages/vCardStudio.cs.po (modified) (1 diff)
• UContact.pas (modified) (4 diffs)

trunk/Forms/UFormContact.lfm

@@ -429 +429 @@
         Anchors = [akTop, akLeft, akRight]
         Caption = 'Address'
-        ClientHeight = 212
-        ClientWidth = 918
+        ClientHeight = 215
+        ClientWidth = 920
         TabOrder = 6
         object Label36: TLabel
@@ -573 +573 @@
     object TabSheetWork: TTabSheet
       Caption = 'Work'
-      ClientHeight = 630
-      ClientWidth = 961
+      ClientHeight = 628
+      ClientWidth = 959
       OnHide = TabSheetWorkHide
       OnShow = TabSheetWorkShow
       object EditOrganization: TEdit
         Left = 173
-        Height = 33
+        Height = 42
         Top = 64
         Width = 254
@@ -587 +587 @@
       object LabelOrganization: TLabel
         Left = 10
-        Height = 25
+        Height = 24
         Top = 70
-        Width = 106
+        Width = 114
         Caption = 'Organization:'
         ParentColor = False
@@ -596 +596 @@
       object LabelOrganization1: TLabel
         Left = 451
-        Height = 25
+        Height = 24
         Top = 24
-        Width = 99
+        Width = 106
         Caption = 'Department:'
         ParentColor = False
@@ -605 +605 @@
       object EditDepartment: TEdit
         Left = 608
-        Height = 33
+        Height = 42
         Top = 20
         Width = 254
@@ -613 +613 @@
       object Label18: TLabel
         Left = 10
-        Height = 25
+        Height = 24
         Top = 20
-        Width = 36
+        Width = 41
         Caption = 'Title:'
         ParentColor = False
@@ -622 +622 @@
       object EditTitle: TEdit
         Left = 173
-        Height = 33
+        Height = 42
         Top = 16
         Width = 254
@@ -630 +630 @@
       object EditWorkWeb: TEdit
         Left = 173
-        Height = 33
+        Height = 42
         Top = 256
         Width = 683
@@ -638 +638 @@
       object Label32: TLabel
         Left = 10
-        Height = 25
+        Height = 24
         Top = 264
-        Width = 107
+        Width = 114
         Caption = 'Web address:'
         ParentColor = False
@@ -651 +651 @@
         Width = 911
         Caption = 'Address'
-        ClientHeight = 217
-        ClientWidth = 907
+        ClientHeight = 220
+        ClientWidth = 909
         TabOrder = 4
         object Label31: TLabel
           Left = 10
-          Height = 25
+          Height = 24
           Top = 160
-          Width = 67
+          Width = 71
           Caption = 'Country:'
           ParentColor = False
@@ -665 +665 @@
         object EditAddressWorkCountry: TEdit
           Left = 173
-          Height = 33
+          Height = 42
           Top = 160
           Width = 254
@@ -673 +673 @@
         object EditAddressWorkRegion: TEdit
           Left = 173
-          Height = 33
+          Height = 42
           Top = 112
           Width = 254
@@ -681 +681 @@
         object Label30: TLabel
           Left = 10
-          Height = 25
+          Height = 24
           Top = 112
-          Width = 59
+          Width = 64
           Caption = 'Region:'
           ParentColor = False
@@ -690 +690 @@
         object Label35: TLabel
           Left = 10
-          Height = 25
+          Height = 24
           Top = 66
-          Width = 126
+          Width = 137
           Caption = 'Extended street:'
           ParentColor = False
@@ -699 +699 @@
         object EditAddressWorkStreetExtended: TEdit
           Left = 173
-          Height = 33
+          Height = 42
           Top = 64
           Width = 254
@@ -707 +707 @@
         object Label28: TLabel
           Left = 10
-          Height = 25
+          Height = 24
           Top = 18
-          Width = 49
+          Width = 54
           Caption = 'Street:'
           ParentColor = False
@@ -716 +716 @@
         object EditAddressWorkStreet: TEdit
           Left = 173
-          Height = 33
+          Height = 42
           Top = 8
           Width = 254
@@ -724 +724 @@
         object Label34: TLabel
           Left = 451
-          Height = 25
+          Height = 24
           Top = 18
-          Width = 122
+          Width = 131
           Caption = 'Post office box:'
           ParentColor = False
@@ -733 +733 @@
         object EditAddressWorkPostOfficeBox: TEdit
           Left = 608
-          Height = 33
+          Height = 42
           Top = 8
           Width = 254
@@ -741 +741 @@
         object EditAddressWorkCity: TEdit
           Left = 608
-          Height = 33
+          Height = 42
           Top = 56
           Width = 254
@@ -749 +749 @@
         object Label29: TLabel
           Left = 451
-          Height = 25
+          Height = 24
           Top = 64
-          Width = 34
+          Width = 36
           Caption = 'City:'
           ParentColor = False
@@ -758 +758 @@
         object EditAddressWorkPostalCode: TEdit
           Left = 608
-          Height = 33
+          Height = 42
           Top = 142
           Width = 254
@@ -766 +766 @@
         object Label33: TLabel
           Left = 451
-          Height = 25
+          Height = 24
           Top = 150
-          Width = 95
+          Width = 103
           Caption = 'Postal code:'
           ParentColor = False
@@ -776 +776 @@
       object Label15: TLabel
         Left = 10
-        Height = 25
+        Height = 24
         Top = 116
-        Width = 54
+        Width = 59
         Caption = 'Phone:'
         ParentColor = False
@@ -785 +785 @@
       object EditWorkPhone: TEdit
         Left = 173
-        Height = 33
+        Height = 42
         Top = 112
         Width = 254
@@ -793 +793 @@
       object Label16: TLabel
         Left = 451
-        Height = 25
+        Height = 24
         Top = 112
-        Width = 29
+        Width = 34
         Caption = 'Fax:'
         ParentColor = False
@@ -802 +802 @@
       object EditWorkFax: TEdit
         Left = 608
-        Height = 33
+        Height = 42
         Top = 112
         Width = 254
@@ -810 +810 @@
       object EditWorkPager: TEdit
         Left = 608
-        Height = 33
+        Height = 42
         Top = 156
         Width = 254
@@ -818 +818 @@
       object Label17: TLabel
         Left = 448
-        Height = 25
+        Height = 24
         Top = 160
-        Width = 48
+        Width = 54
         Caption = 'Pager:'
         ParentColor = False
@@ -827 +827 @@
       object EditWorkMobile: TEdit
         Left = 173
-        Height = 33
+        Height = 42
         Top = 160
         Width = 254
@@ -835 +835 @@
       object Label19: TLabel
         Left = 10
-        Height = 25
+        Height = 24
         Top = 160
-        Width = 59
+        Width = 63
         Caption = 'Mobile:'
         ParentColor = False
@@ -844 +844 @@
       object Label8: TLabel
         Left = 10
-        Height = 25
+        Height = 24
         Top = 210
-        Width = 53
+        Width = 58
         Caption = 'E-mail:'
         ParentColor = False
@@ -853 +853 @@
       object EditWorkEmail: TEdit
         Left = 173
-        Height = 33
+        Height = 42
         Top = 210
         Width = 254
@@ -1335 +1335 @@
     Left = 144
     Height = 37
-    Top = 686
+    Top = 688
     Width = 115
     Anchors = [akLeft, akBottom]

trunk/Forms/UFormContact.pas

@@ -206 +206 @@
   private
     FContact: TContact;
-    FOnNext: TNotifyEvent;
-    FOnPrevious: TNotifyEvent;
+    FOnGetNext: TGetContactEvent;
+    FOnGetPrevious: TGetContactEvent;
     FormProperties: TFormProperties;
     procedure SetContact(AValue: TContact);
@@ -216 +216 @@
     procedure UpdateInterface;
     property Contact: TContact read FContact write SetContact;
-    property OnPrevious: TNotifyEvent read FOnPrevious write FOnPrevious;
-    property OnNext: TNotifyEvent read FOnNext write FOnNext;
+    property OnGetPrevious: TGetContactEvent read FOnGetPrevious write FOnGetPrevious;
+    property OnGetNext: TGetContactEvent read FOnGetNext write FOnGetNext;
   end;
 
@@ -654 +654 @@
 procedure TFormContact.ButtonNextClick(Sender: TObject);
 begin
-  if Assigned(FOnNext) then FOnNext(Self);
+  if Assigned(FOnGetNext) then
+     Contact := FOnGetNext(Contact);
 end;
 
@@ -679 +680 @@
 procedure TFormContact.ButtonPreviousClick(Sender: TObject);
 begin
-  if Assigned(FOnPrevious) then FOnPrevious(Self);
+  if Assigned(FOnGetPrevious) then
+    Contact := FOnGetPrevious(Contact);
 end;
 
@@ -699 +701 @@
   APhotoSave.Enabled := ProfilePhotoActive;
   APhotoClear.Enabled := ProfilePhotoActive;
+  //ButtonNext.Enabled := Assigned(FOnGetNext) and Assigned(FOnGetNext(Contact));
+  //ButtonPrevious.Enabled := Assigned(FOnGetPrevious) and Assigned(FOnGetPrevious(Contact));
 end;
 

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);

trunk/Languages/vCardStudio.cs.po

@@ -1249 +1249 @@
 msgid "Invalid line length for encoded text"
 msgstr "Neplatná délka řádky kódovaného textu"
+

trunk/UContact.pas

@@ -119 +119 @@
   TContact = class
   private
+    FModified: Boolean;
+    FOnModify: TNotifyEvent;
     function GetField(Index: TContactFieldIndex): string;
     procedure SetField(Index: TContactFieldIndex; AValue: string);
+    procedure SetModified(AValue: Boolean);
+    procedure DoOnModify;
   public
     Properties: TContactProperties;
@@ -137 +141 @@
     procedure LoadFromFile(FileName: string);
     property Fields[Index: TContactFieldIndex]: string read GetField write SetField;
-  end;
+    property Modified: Boolean read FModified write SetModified;
+    property OnModify: TNotifyEvent read FOnModify write FOnModify;
+  end;
+
+  TGetContactEvent = function (Contact: TContact): TContact of object;
 
   { TContacts }
@@ -850 +858 @@
       end;
     end;
+    Modified := True;
   end else raise Exception.Create(SFieldIndexNotDefined);
+end;
+
+procedure TContact.SetModified(AValue: Boolean);
+begin
+  if FModified = AValue then Exit;
+  FModified := AValue;
+  DoOnModify;
+end;
+
+procedure TContact.DoOnModify;
+begin
+  if Assigned(FOnModify) then FOnModify(Self);
 end;
 
@@ -903 +924 @@
 begin
   Properties.Assign(Source.Properties);
+  FModified := Source.FModified;
 end;