Changeset 149 for trunk/Core.pas

Timestamp:

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

Author:

chronos

Message:

• Modified: Remove U prefix from unit names.

File:

• trunk/Core.pas (moved) (moved from trunk/UCore.pas ) (18 diffs)

trunk/Core.pas

@@ -1 @@
-unit UCore;
+unit Core;
 
 interface
@@ -69 +69 @@
     procedure TranslatorTranslate(Sender: TObject);
   private
+    FOnDataFileChange: TNotifyEvent;
+    FOnLastOpenedListChange: TNotifyEvent;
     InitializeStarted: Boolean;
     InitializeFinished: Boolean;
@@ -76 +78 @@
     ProfilePhotoFileName: string;
     RecentFileRegistryContext: TRegistryContext;
+    FormMain: TForm;
     procedure FileModified(Sender: TObject);
     function FindFirstNonOption: string;
@@ -83 +86 @@
     procedure DoError(Text: string; Line: Integer);
     procedure AddItemToLastOpenedList(FileName: string);
+    procedure DoDataFileChange;
   public
     DefaultDataFileClass: TDataFileClass;
@@ -104 +108 @@
     procedure Initialize;
     procedure UpdateInterface;
+    property OnDataFileChange: TNotifyEvent read FOnDataFileChange
+      write FOnDataFileChange;
+    property OnLastOpenedListChange: TNotifyEvent read FOnLastOpenedListChange
+      write FOnLastOpenedListChange;
   end;
 
@@ -115 +123 @@
 
 uses
-  UFormMain, UFormSettings, UFormContacts, UFormFindDuplicity, TestCase,
-  UFormGenerate, UFormError, UFormFind, UFormTest, UFormSource, UFormCompare,
-  UTestCases, UVCardFile;
+  FormMain, FormSettings, FormFindDuplicity, TestCase,
+  FormGenerate, FormError, FormFind, FormTest, FormSource, FormCompare,
+  TestCases, VCardFile;
 
 resourcestring
@@ -133 +141 @@
 procedure TCore.AExitExecute(Sender: TObject);
 begin
-  FormMain.Close;
+  Application.Terminate;
 end;
 
@@ -257 +265 @@
     Contacts := TVCardFile(DataFile).VCard.Contacts;
     ShowModal;
-    FormContacts.ReloadList;
-    FormMain.UpdateInterface;
+    DoDataFileChange;
   finally
     Free;
@@ -270 +277 @@
     Contacts := TVCardFile(DataFile).VCard.Contacts;
     ShowModal;
-    FormContacts.ReloadList;
-    FormMain.UpdateInterface;
+    DoDataFileChange;
   finally
     Free;
@@ -283 +289 @@
     Contacts := TVCardFile(DataFile).VCard.Contacts;
     if ShowModal = mrOk then begin
-      FormContacts.ReloadList;
-      FormContacts.UpdateInterface;
       DataFile.Modified := True;
-      FormMain.UpdateInterface;
+      DoDataFileChange;
     end;
   finally
@@ -317 +321 @@
     if ShowModal = mrOK then begin
       SaveData;
-      ThemeManager1.UseTheme(FormMain);
-      ThemeManager1.UseTheme(FormContacts);
+      //ThemeManager1.UseTheme(FormMain);
+      //ThemeManager1.UseTheme(FormContacts);
     end;
   finally
@@ -435 +439 @@
   RecentFileRegistryContext := TRegistryContext.Create(ApplicationInfo1.RegistryRoot,
     ApplicationInfo1.RegistryKey + '\RecentFiles');
+
+  FormMain := TFormMain.Create(nil);
+  FormMain.Show;
 end;
 
@@ -443 +450 @@
   if Assigned(ProfileImage) then
     FreeAndNil(ProfileImage);
+  FreeAndNil(FormMain);
 end;
 
 procedure TCore.LastOpenedList1Change(Sender: TObject);
 begin
-  LastOpenedList1.LoadToMenuItem(FormMain.MenuItemFileOpenRecent, AFileOpenRecentExecute);
-  LastOpenedList1.LoadToMenuItem(FormMain.PopupMenuOpenRecent.Items, AFileOpenRecentExecute);
+  if Assigned(FOnLastOpenedListChange) then
+    FOnLastOpenedListChange(Self);
 end;
 
@@ -462 +470 @@
 
 procedure TCore.FileOpen(FileName: string);
+var
+  FormError: TFormError;
 begin
   if FileExists(FileName) then begin
@@ -519 +529 @@
 begin
   UpdateInterface;
-  FormMain.UpdateInterface;
-  if Assigned(FormContacts) then begin
-    if Assigned(DataFile) then
-      FormContacts.Contacts := TVCardFile(DataFile).VCard.Contacts
-      else FormContacts.Contacts := nil;
-    FormContacts.ReloadList;
-    FormContacts.UpdateInterface;
-  end;
+  DoDataFileChange;
 end;
 
@@ -543 +546 @@
       ThemeManager1.Theme := ThemeManager1.Themes.FindByName(ReadStringWithDefault('Theme', 'System'))
       else ThemeManager1.Theme := ThemeManager1.Themes.FindByName('System');
-    FormMain.MenuItemToolbar.Checked := ReadBoolWithDefault('ToolBarVisible', True);
     ReopenLastFileOnStart := ReadBoolWithDefault('ReopenLastFileOnStart', True);
     LastContactTabIndex := ReadIntegerWithDefault('LastContactTabIndex', 0);
@@ -571 +573 @@
       WriteString('Theme', ThemeManager1.Theme.Name)
       else DeleteValue('Theme');
-    WriteBool('ToolBarVisible', FormMain.MenuItemToolbar.Checked);
     WriteBool('ReopenLastFileOnStart', ReopenLastFileOnStart);
     WriteInteger('LastContactTabIndex', LastContactTabIndex);
@@ -600 +601 @@
     SaveToRegistry(RecentFileRegistryContext);
   end;
+end;
+
+procedure TCore.DoDataFileChange;
+begin
+  if Assigned(FOnDataFileChange) then
+    FOnDataFileChange(Self);
 end;