Changeset 129 for trunk/UCore.pas

Timestamp:

Apr 9, 2022, 11:52:13 AM (2 years ago)

Author:

chronos

Message:

• Added: TVCard as TComponent descendant.
• Modified: TContactsFile renamed to TVCardFile and moved into separate file.

File:

• trunk/UCore.pas (modified) (13 diffs)

trunk/UCore.pas

@@ -114 +114 @@
 
 uses
-  UFormMain, UFormSettings, UContact, UFormContacts, UFormFindDuplicity, UTest,
+  UFormMain, UFormSettings, UVCard, UFormContacts, UFormFindDuplicity, UTest,
   UFormGenerate, UFormError, UFormFind, UFormTest, UFormSource, UFormCompare,
-  UTestCases;
+  UTestCases, UVCardFile;
 
 resourcestring
@@ -156 +156 @@
     for I := 0 to OpenDialog1.Files.Count - 1 do begin
       if FileExists(OpenDialog1.Files[I]) then begin
-        TempFile := TContactsFile.Create;
+        TempFile := TVCardFile.Create;
         try
           TempFile.LoadFromFile(OpenDialog1.Files[I]);
-          TContactsFile(DataFile).Contacts.AddContacts(TContactsFile(TempFile).Contacts);
+          TVCardFile(DataFile).VCard.Contacts.AddContacts(TVCardFile(TempFile).VCard.Contacts);
           Inc(LoadedFiles);
         finally
@@ -166 +166 @@
       end;
     end;
-    if LoadedFiles > 0 then TContactsFile(DataFile).Modified := True;
+    if LoadedFiles > 0 then TVCardFile(DataFile).Modified := True;
     ShowMessage(Format(SCombinedContacts, [LoadedFiles]));
     UpdateFile;
@@ -193 +193 @@
         DirectorySeparator + 'Compare' + VCardFileExt;
       ForceDirectories(ExtractFileDir(TempFileName));
-      TContactsFile(DataFile).SaveToFile(TempFileName);
+      TVCardFile(DataFile).SaveToFile(TempFileName);
       LoadFileLeft(TempFileName);
       LoadFileRight(OpenDialog1.FileName);
@@ -226 +226 @@
   if SelectDirectoryDialog1.Execute then begin
     LastSplitDir := SelectDirectoryDialog1.FileName;
-    with TContactsFile(DataFile).Contacts do
+    with TVCardFile(DataFile).VCard.Contacts do
     for I := 0 to Count - 1 do begin
       if Items[I].Fields[cfFullName] <> '' then begin
@@ -253 +253 @@
   with TFormFindDuplicity.Create(nil) do
   try
-    Contacts := TContactsFile(DataFile).Contacts;
+    Contacts := TVCardFile(DataFile).VCard.Contacts;
     ShowModal;
     FormContacts.ReloadList;
@@ -266 +266 @@
   with TFormFind.Create(nil) do
   try
-    Contacts := TContactsFile(DataFile).Contacts;
+    Contacts := TVCardFile(DataFile).VCard.Contacts;
     ShowModal;
     FormContacts.ReloadList;
@@ -279 +279 @@
   with TFormGenerate.Create(nil) do
   try
-    Contacts := TContactsFile(DataFile).Contacts;
+    Contacts := TVCardFile(DataFile).VCard.Contacts;
     if ShowModal = mrOk then begin
       FormContacts.ReloadList;
@@ -298 +298 @@
 procedure TCore.ARemoveExactDuplicatesExecute(Sender: TObject);
 begin
-  TContactsFile(DataFile).Contacts.RemoveExactDuplicates;
+  TVCardFile(DataFile).VCard.Contacts.RemoveExactDuplicates;
   UpdateFile;
 end;
@@ -336 +336 @@
   with TFormSource.Create(nil) do
   try
-    Source := TContactsFile(DataFile).AsString;
+    Source := TVCardFile(DataFile).VCard.AsString;
     if ShowModal = mrOk then begin
-      TContactsFile(DataFile).AsString := Source;
+      TVCardFile(DataFile).VCard.AsString := Source;
       UpdateFile;
     end;
@@ -423 +423 @@
 
   DataFile := nil;
-  DefaultDataFileClass := TContactsFile;
+  DefaultDataFileClass := TVCardFile;
   FileClosed := True;
   RecentFileRegistryContext := TRegistryContext.Create(ApplicationInfo1.RegistryRoot,
@@ -504 +504 @@
     DataFile := DefaultDataFileClass.Create;
     DataFile.OnModify := FileModified;
-    TContactsFile(DataFile).OnError := DoError;
+    TVCardFile(DataFile).VCard.OnError := DoError;
   end;
 end;
@@ -514 +514 @@
   if Assigned(FormContacts) then begin
     if Assigned(DataFile) then
-      FormContacts.Contacts := TContactsFile(DataFile).Contacts
+      FormContacts.Contacts := TVCardFile(DataFile).VCard.Contacts
       else FormContacts.Contacts := nil;
     FormContacts.ReloadList;