Changeset 129 for trunk/Forms

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.

Location:

trunk/Forms

Files:

• UFormCompare.pas (modified) (3 diffs)
• UFormContact.pas (modified) (1 diff)
• UFormContacts.pas (modified) (9 diffs)
• UFormFind.pas (modified) (1 diff)
• UFormFindDuplicity.pas (modified) (6 diffs)
• UFormGenerate.pas (modified) (1 diff)
• UFormMain.pas (modified) (2 diffs)
• UFormProperties.pas (modified) (1 diff)
• UFormProperty.pas (modified) (1 diff)
• UFormSource.pas (modified) (1 diff)
• UFormTest.pas (modified) (1 diff)

trunk/Forms/UFormCompare.pas

@@ -5 +5 @@
 uses
   Classes, SysUtils, Forms, Controls, Graphics, Dialogs, ExtCtrls, StdCtrls,
-  UContact, Diff, LCLType, LCLIntf, ComCtrls, Buttons, Menus, ActnList, SynEdit,
+  UVCard, Diff, LCLType, LCLIntf, ComCtrls, Buttons, Menus, ActnList, SynEdit,
   SynEditMiscClasses, SynHighlighterPosition, SynEditHighlighter, UCommon,
   USynEditEx;
@@ -83 +83 @@
 
 uses
-  UCore;
+  UCore, UVCardFile;
 
 { TFormCompare }
@@ -334 +334 @@
   Ext := ExtractFileExt(AFileName);
   if Ext = VCardFileExt then begin
-    with TContactsFile.Create do
+    with TVCardFile.Create do
     try
       LoadFromFile(AFileName);
-      Result := AsString;
+      Result := VCard.AsString;
     finally
       Free;

trunk/Forms/UFormContact.pas

@@ -5 +5 @@
 uses
   Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, StdCtrls,
-  ComCtrls, ActnList, Menus, ExtCtrls, ExtDlgs, Buttons, UContact, LCLIntf,
+  ComCtrls, ActnList, Menus, ExtCtrls, ExtDlgs, Buttons, UVCard, LCLIntf,
   UFormProperties, DateUtils, {$IFDEF LCLGTK2}Gtk2Globals, {$ENDIF}UContactImage,
   ubarcodes;

trunk/Forms/UFormContacts.pas

@@ -5 +5 @@
 uses
   Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, ComCtrls,
-  Menus, ActnList, UContact, UListViewSort, LazUTF8, Clipbrd,
+  Menus, ActnList, UVCard, UListViewSort, LazUTF8, Clipbrd,
   Generics.Collections;
 
@@ -102 +102 @@
 
 uses
-  UFormContact, UCore;
+  UFormContact, UCore, UVCardFile;
 
 resourcestring
@@ -304 +304 @@
       ListView1.Columns.Delete(ListView1.Columns.Count - 1);
     for I := 0 to ListView1.Columns.Count - 1 do begin
-      if Assigned(Contacts) and Assigned(Contacts.ContactsFile) then begin
+      if Assigned(Contacts) and Assigned(Contacts.ParentVCard) then begin
         Field := TContact.GetFields.GetByIndex(ListViewColumns[I]);
         if Assigned(Field) then
@@ -334 +334 @@
     Contact := TContact.Create;
     try
-      Contact.ContactsFile := Contacts.ContactsFile;
+      Contact.ParentVCard := Contacts.ParentVCard;
       FormContact.Contact := Contact;
       FormContact.OnGetPrevious := GetPreviousContact;
@@ -364 +364 @@
     Contact := TContact.Create;
     try
-      Contact.ContactsFile := Contacts.ContactsFile;
+      Contact.ParentVCard := Contacts.ParentVCard;
       Contact.Assign(TContact(ListView1.Selected.Data));
       FormContact.Contact := Contact;
@@ -436 +436 @@
 procedure TFormContacts.ALoadFromFileExecute(Sender: TObject);
 var
-  TempFile: TContactsFile;
+  TempFile: TVCardFile;
 begin
   if Assigned(ListView1.Selected) then begin
-    TempFile := TContactsFile.Create;
+    TempFile := TVCardFile.Create;
     try
       OpenDialog1.Filter := TempFile.GetFileFilter;
@@ -465 +465 @@
     Contact := TContact.Create;
     try
-      Contact.ContactsFile := Contacts.ContactsFile;
+      Contact.ParentVCard := Contacts.ParentVCard;
       Contact.Assign(TContact(ListView1.Selected.Data));
       FormContact.Contact := Contact;
@@ -486 +486 @@
 procedure TFormContacts.APasteExecute(Sender: TObject);
 var
-  PasteContacts: TContactsFile;
+  PasteContacts: TVCardFile;
   Lines: TStringList;
 begin
-  PasteContacts := TContactsFile.Create;
+  PasteContacts := TVCardFile.Create;
   Lines := TStringList.Create;
   try
     Lines.Text := Clipboard.AsText;
-    PasteContacts.LoadFromStrings(Lines);
-    if PasteContacts.Contacts.Count > 0 then begin
+    PasteContacts.VCard.LoadFromStrings(Lines);
+    if PasteContacts.VCard.Contacts.Count > 0 then begin
       if Assigned(ListView1.Selected) then begin
         Contacts.InsertContacts(Contacts.IndexOf(ListView1.Selected.Data),
-          PasteContacts.Contacts);
-      end else Contacts.AddContacts(PasteContacts.Contacts);
+          PasteContacts.VCard.Contacts);
+      end else Contacts.AddContacts(PasteContacts.VCard.Contacts);
       Core.DataFile.Modified := True;
       ReloadList;
@@ -528 +528 @@
 procedure TFormContacts.ASaveToFileExecute(Sender: TObject);
 var
-  TempFile: TContactsFile;
+  TempFile: TVCardFile;
 begin
   if Assigned(ListView1.Selected) then begin
-    TempFile := TContactsFile.Create;
+    TempFile := TVCardFile.Create;
     try
       SaveDialog1.Filter := TempFile.GetFileFilter;

trunk/Forms/UFormFind.pas

@@ -5 +5 @@
 uses
   Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, ComCtrls,
-  ExtCtrls, StdCtrls, ActnList, Menus, UContact, UFormContacts;
+  ExtCtrls, StdCtrls, ActnList, Menus, UVCard, UFormContacts;
 
 type

trunk/Forms/UFormFindDuplicity.pas

@@ -5 +5 @@
 uses
   Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, ComCtrls,
-  ExtCtrls, StdCtrls, ActnList, Menus, UContact, Generics.Collections,
+  ExtCtrls, StdCtrls, ActnList, Menus, UVCard, Generics.Collections,
   Generics.Defaults;
 
@@ -65 +65 @@
 
 uses
-  UCore, UFormContacts;
+  UCore, UFormContacts, UVCardFile;
 
 { TFoundItems }
@@ -191 +191 @@
     Form := TFormContacts.Create(nil);
     Form.Contacts := TContacts.Create(False);
-    Form.Contacts.ContactsFile := Contacts.ContactsFile;
+    Form.Contacts.ParentVCard := Contacts.ParentVCard;
     with TFoundItem(ListView1.Selected.Data) do
       for I := 0 to Contacts.Count - 1 do
@@ -202 +202 @@
           Form.Contacts.Remove(Contacts[I]);
           Self.Contacts.Remove(Contacts[I]);
-          Self.Contacts.ContactsFile.Modified := True;
+          Self.Contacts.ParentVCard.Modified := True;
         end;
 
@@ -210 +210 @@
           Form.Contacts.Add(Form.Contacts[I]);
           Self.Contacts.Add(Form.Contacts[I]);
-          Self.Contacts.ContactsFile.Modified := True;
+          Self.Contacts.ParentVCard.Modified := True;
         end;
     end;
@@ -221 +221 @@
 procedure TFormFindDuplicity.ButtonMergeClick(Sender: TObject);
 var
-  TempContacts: TContactsFile;
-  I: Integer;
-begin
-  TempContacts := TContactsFile.Create;
+  TempContacts: TVCardFile;
+  I: Integer;
+begin
+  TempContacts := TVCardFile.Create;
   try
     for I := 0 to Contacts.Count - 1 do
-      TempContacts.Contacts.Merge(Contacts[I], TContactField(ComboBoxField.Items.Objects[ComboBoxField.ItemIndex]).Index);
-    Contacts.Assign(TempContacts.Contacts);
+      TempContacts.VCard.Contacts.Merge(Contacts[I], TContactField(ComboBoxField.Items.Objects[ComboBoxField.ItemIndex]).Index);
+    Contacts.Assign(TempContacts.VCard.Contacts);
     Find;
   finally

trunk/Forms/UFormGenerate.pas

@@ -5 +5 @@
 uses
   Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, StdCtrls,
-  Spin, UContact;
+  Spin, UVCard;
 
 type

trunk/Forms/UFormMain.pas

@@ -76 +76 @@
 
 uses
-  UCore, UFormContacts, UContact;
+  UCore, UFormContacts, UVCard, UVCardFile;
 
 resourcestring
@@ -121 +121 @@
     CoolBar1.AutosizeBands;
 
-    FormContacts.Contacts := TContactsFile(Core.DataFile).Contacts;
+    FormContacts.Contacts := TVCardFile(Core.DataFile).VCard.Contacts;
     FormContacts.ManualDock(Self, nil, alClient);
     FormContacts.Align := alClient;

trunk/Forms/UFormProperties.pas

@@ -5 +5 @@
 uses
   Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, ComCtrls,
-  Menus, ActnList, UContact, UDataFile, UListViewSort, LazUTF8,
+  Menus, ActnList, UVCard, UDataFile, UListViewSort, LazUTF8,
   Generics.Collections;
 

trunk/Forms/UFormProperty.pas

@@ -4 +4 @@
 
 uses
-  Classes, SysUtils, Forms, Controls, Graphics, Dialogs, StdCtrls, UContact;
+  Classes, SysUtils, Forms, Controls, Graphics, Dialogs, StdCtrls, UVCard;
 
 type

trunk/Forms/UFormSource.pas

@@ -51 +51 @@
 
 uses
-  UCore, UTheme, UContact;
+  UCore, UTheme, UVCard;
 
 { TFormSource }

trunk/Forms/UFormTest.pas

@@ -49 +49 @@
 
 uses
-  UCore, UFormTestCase, UContact;
+  UCore, UFormTestCase, UVCard;
 
 { TFormTest }