Changeset 149 for trunk/Forms/FormContacts.pas

Timestamp:

Jun 5, 2023, 8:45:38 PM (18 months ago)

Author:

chronos

Message:

• Modified: Remove U prefix from unit names.

File:

• trunk/Forms/FormContacts.pas (moved) (moved from trunk/Forms/UFormContacts.pas ) (12 diffs)

trunk/Forms/FormContacts.pas

@@ -1 @@
-unit UFormContacts;
+unit FormContacts;
 
 interface
@@ -100 +100 @@
   end;
 
-var
-  FormContacts: TFormContacts;
-
 
 implementation
@@ -109 +106 @@
 
 uses
-  UFormContact, UCore, UVCardFile, UFormColumns;
+  FormContact, Core, VCardFile, FormColumns;
 
 resourcestring
@@ -386 +383 @@
 procedure TFormContacts.FormShow(Sender: TObject);
 begin
-  Core.Translator.TranslateComponentRecursive(Self);
-  Core.ThemeManager1.UseTheme(Self);
-  Core.PersistentForm1.Load(Self);
+  Core.Core.Translator.TranslateComponentRecursive(Self);
+  Core.Core.ThemeManager1.UseTheme(Self);
+  Core.Core.PersistentForm1.Load(Self);
   LoadFromRegistry(Context);
   ReloadList;
@@ -408 +405 @@
       FormContact.OnGetPrevious := GetPreviousContact;
       FormContact.OnGetNext := GetNextContact;
-      Contact.Properties.AddNew('VERSION', Core.DefaultVcardVersion);
+      Contact.Properties.AddNew('VERSION', Core.Core.DefaultVcardVersion);
       if FormContact.ShowModal = mrOK then begin
         Contacts.Add(Contact);
-        Core.DataFile.Modified := True;
+        Core.Core.DataFile.Modified := True;
         ReloadList;
         UpdateInterface;
@@ -442 +439 @@
         Contacts.Add(Contact);
         Contact := nil;
-        Core.DataFile.Modified := True;
+        Core.Core.DataFile.Modified := True;
         ReloadList;
         UpdateInterface;
@@ -548 +545 @@
       TempFile.Free;
     end;
-    OpenDialog1.InitialDir := ExtractFileDir(Core.LastContactFileName);
-    OpenDialog1.FileName := ExtractFileName(Core.LastContactFileName);
+    OpenDialog1.InitialDir := ExtractFileDir(Core.Core.LastContactFileName);
+    OpenDialog1.FileName := ExtractFileName(Core.Core.LastContactFileName);
     if OpenDialog1.Execute then begin
       TContact(ListView1.Selected.Data).LoadFromFile(OpenDialog1.FileName);
-      Core.LastContactFileName := OpenDialog1.FileName;
+      Core.Core.LastContactFileName := OpenDialog1.FileName;
       ReloadList;
     end;
@@ -574 +571 @@
       if FormContact.ShowModal = mrOK then begin
         if not TContact(ListView1.Selected.Data).CompareTo(Contact) then
-          Core.DataFile.Modified := True;
+          Core.Core.DataFile.Modified := True;
         TContact(ListView1.Selected.Data).Assign(Contact);
         ReloadList;
@@ -602 +599 @@
           PasteContacts.VCard.Contacts);
       end else Contacts.AddContacts(PasteContacts.VCard.Contacts);
-      Core.DataFile.Modified := True;
+      Core.Core.DataFile.Modified := True;
       ReloadList;
       UpdateInterface;
@@ -623 +620 @@
         Contacts.Delete(Contacts.IndexOf(ListView1.Items[I].Data));
       end;
-    Core.DataFile.Modified := True;
+    Core.Core.DataFile.Modified := True;
     ReloadList;
     UpdateInterface;
@@ -641 +638 @@
       TempFile.Free;
     end;
-    SaveDialog1.InitialDir := ExtractFileDir(Core.LastContactFileName);
+    SaveDialog1.InitialDir := ExtractFileDir(Core.Core.LastContactFileName);
     SaveDialog1.FileName := TContact(ListView1.Selected.Data).FullNameToFileName +
       VCardFileExt;
     if SaveDialog1.Execute then begin
       TContact(ListView1.Selected.Data).SaveToFile(SaveDialog1.FileName);
-      Core.LastContactFileName := SaveDialog1.FileName;
+      Core.Core.LastContactFileName := SaveDialog1.FileName;
     end;
   end;
@@ -674 +671 @@
 begin
   SaveToRegistry(Context);
-  Core.PersistentForm1.Save(Self);
+  Core.Core.PersistentForm1.Save(Self);
 end;