Changeset 39 for trunk/UContact.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/UContact.pas (modified) (8 diffs)

trunk/UContact.pas

@@ -17 +17 @@
   TContactFieldIndex = (cfFirstName, cfMiddleName, cfLastName, cfTitleBefore,
     cfTitleAfter, cfFullName, cfTelCell, cfTelHome, cfTelHome2, cfTelWork, cfTelVoip,
-    cfTelMain, cfEmail, cfTel, cfUid, cfUrl,
+    cfTelMain, cfEmail, cfTel, cfUid, cfUrlHome, cfUrlWork,
     cfEmailHome, cfEmailInternet, cfNickName, cfNote, cfRole, cfTitle,
     cfCategories, cfOrganization, cfDepartment,
-    cfHomeAddress, cfHomeAddressStreet, cfHomeAddressCity, cfHomeAddressCountry,
-    cfWorkAddress, cfWorkAddressStreet, cfWorkAddressCity, cfWorkAddressCountry,
+    cfHomeAddressStreet, cfHomeAddressStreetExtended, cfHomeAddressCity, cfHomeAddressCountry,
+    cfHomeAddressPostalCode, cfHomeAddressRegion, cfHomeAddressPostOfficeBox,
+    cfWorkAddressStreet, cfWorkAddressStreetExtended, cfWorkAddressCity, cfWorkAddressCountry,
+    cfWorkAddressPostalCode, cfWorkAddressRegion, cfWorkAddressPostOfficeBox,
     cfXTimesContacted, cfXLastTimeContacted, cfPhoto, cfXJabber, cfDayOfBirth, cfRevision,
     cfVersion);
@@ -62 +64 @@
 
   TContactProperties = class(TFPGObjectList<TContactProperty>)
+    procedure AssignToList(List: TFPGObjectList<TObject>);
     function GetByName(Name: string): TContactProperty;
     function GetByNameGroups(Name: string; Groups: TStringArray): TContactProperty;
@@ -151 +154 @@
   SOrganization = 'Organization';
   SDepartement = 'Departement';
-  SHomeAddress = 'Home Address';
-  SHomeAddressStreet = 'Home Address Street';
-  SHomeAddressCity = 'Home Address City';
-  SHomeAddressCountry = 'Home Address Country';
-  SWorkAddress = 'Home Address';
-  SWorkAddressStreet = 'Work Address Street';
-  SWorkAddressCity = 'Work Address City';
-  SWorkAddressCountry = 'Work Address Country';
+  SHomeAddressPostOfficeBox = 'Home address post office box';
+  SHomeAddressStreetExtended = 'Home address extended street';
+  SHomeAddressStreet = 'Home address street';
+  SHomeAddressCity = 'Home address city';
+  SHomeAddressRegion = 'Home address region';
+  SHomeAddressPostalCode = 'Home address postal code';
+  SHomeAddressCountry = 'Home address country';
+  SWorkAddressPostOfficeBox = 'Work address post office box';
+  SWorkAddressStreetExtended = 'Work address extended street';
+  SWorkAddressStreet = 'Work address street';
+  SWorkAddressCity = 'Work address city';
+  SWorkAddressRegion = 'Work address region';
+  SWorkAddressPostalCode = 'Work address postal code';
+  SWorkAddressCountry = 'Work address country';
   STimesContacted = 'Times Contacted';
   SLastTimeContacted = 'Last Time Contacted';
@@ -166 +175 @@
   SRevision = 'Revision';
   SUniqueIdentifier = 'Unique identifier';
-  SWebAddress = 'Web address';
+  SWebAddressHome = 'Web address home';
+  SWebAddressWork = 'Web address work';
 
 function GetNext(var Text: string; Separator: string): string;
@@ -192 +202 @@
 
 { TContactProperties }
+
+procedure TContactProperties.AssignToList(List: TFPGObjectList<TObject>);
+var
+  I: Integer;
+begin
+  while List.Count > Count do List.Delete(List.Count - 1);
+  while List.Count < Count do List.Add(nil);
+  for I := 0 to Count - 1 do
+    List[I] := Items[I];
+end;
 
 function TContactProperties.GetByName(Name: string): TContactProperty;
@@ -441 +461 @@
   I: Integer;
 begin
+  Parent := Source.Parent;
   while Properties.Count < Source.Properties.Count do
     Properties.Add(TContactProperty.Create);
@@ -503 +524 @@
     AddNew('ORG', [], SOrganization, cfOrganization, dtString, 0);
     AddNew('ORG', [], SDepartement, cfDepartment, dtString, 1);
-    AddNew('ADR', ['HOME'], SHomeAddress, cfHomeAddress, dtString);
-    AddNew('ADR', ['HOME'], SHomeAddressStreet, cfHomeAddressStreet, dtString, 1);
-    AddNew('ADR', ['HOME'], SHomeAddressCity, cfHomeAddressCity, dtString, 2);
-    AddNew('ADR', ['HOME'], SHomeAddressCountry, cfHomeAddressCountry, dtString, 3);
-    AddNew('ADR', ['WORK'], SWorkAddress, cfWorkAddress, dtString);
-    AddNew('ADR', ['WORK'], SWorkAddressStreet, cfWorkAddressStreet, dtString, 1);
-    AddNew('ADR', ['WORK'], SWorkAddressCity, cfWorkAddressCity, dtString, 2);
-    AddNew('ADR', ['WORK'], SWorkAddressCountry, cfWorkAddressCountry, dtString, 3);
+    AddNew('ADR', ['HOME'], SHomeAddressPostOfficeBox, cfHomeAddressPostOfficeBox, dtString, 0);
+    AddNew('ADR', ['HOME'], SHomeAddressStreetExtended, cfHomeAddressStreetExtended, dtString, 1);
+    AddNew('ADR', ['HOME'], SHomeAddressStreet, cfHomeAddressStreet, dtString, 2);
+    AddNew('ADR', ['HOME'], SHomeAddressCity, cfHomeAddressCity, dtString, 3);
+    AddNew('ADR', ['HOME'], SHomeAddressRegion, cfHomeAddressRegion, dtString, 4);
+    AddNew('ADR', ['HOME'], SHomeAddressPostalCode, cfHomeAddressPostalCode, dtString, 5);
+    AddNew('ADR', ['HOME'], SHomeAddressCountry, cfHomeAddressCountry, dtString, 6);
+    AddNew('ADR', ['WORK'], SWorkAddressPostOfficeBox, cfWorkAddressPostOfficeBox, dtString, 0);
+    AddNew('ADR', ['WORK'], SWorkAddressStreetExtended, cfWorkAddressStreetExtended, dtString, 1);
+    AddNew('ADR', ['WORK'], SWorkAddressStreet, cfWorkAddressStreet, dtString, 2);
+    AddNew('ADR', ['WORK'], SWorkAddressCity, cfWorkAddressCity, dtString, 3);
+    AddNew('ADR', ['WORK'], SWorkAddressRegion, cfWorkAddressRegion, dtString, 4);
+    AddNew('ADR', ['WORK'], SWorkAddressPostalCode, cfWorkAddressPostalCode, dtString, 5);
+    AddNew('ADR', ['WORK'], SWorkAddressCountry, cfWorkAddressCountry, dtString, 6);
     AddNew('X-TIMES_CONTACTED', [], STimesContacted, cfXTimesContacted, dtString);
     AddNew('X-LAST_TIME_CONTACTED', [], SLastTimeContacted, cfXLastTimeContacted, dtString);
@@ -518 +545 @@
     AddNew('REV', [], SRevision, cfRevision, dtString);
     AddNew('UID', [], SUniqueIdentifier, cfUid, dtString);
-    AddNew('URL', [], SWebAddress, cfUrl, dtString);
+    AddNew('URL', ['HOME'], SWebAddressHome, cfUrlHome, dtString);
+    AddNew('URL', ['WORK'], SWebAddressWork, cfUrlWork, dtString);
   end;
 end;