Changeset 117

Timestamp:

Feb 18, 2022, 10:29:49 AM (2 years ago)

Author:

chronos

Message:

• Modified: Update recent opened files list directly into registry to better support multiple opened app instances at the same time.

File:

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

trunk/UCore.pas

@@ -71 +71 @@
     LastSplitDir: string;
     ProfilePhotoFileName: string;
+    RecentFileRegistryContext: TRegistryContext;
     procedure FileModified(Sender: TObject);
     function FindFirstNonOption: string;
@@ -77 +78 @@
     procedure SaveConfig;
     procedure DoError(Text: string; Line: Integer);
+    procedure AddItemToLastOpenedList(FileName: string);
   public
     DefaultDataFileClass: TDataFileClass;
@@ -202 +204 @@
       ExecuteProgram('explorer.exe', ['"' + SelectDirectoryDialog1.FileName + '"']);
       {$ENDIF}
-      {$IFDEF LINUX}
+      {$IFDEF UNIX}
       ExecuteProgram('/usr/bin/xdg-open', [SelectDirectoryDialog1.FileName]);
       {$ENDIF}
@@ -337 +339 @@
   if SaveDialog1.Execute then begin
     DataFile.SaveToFile(SaveDialog1.FileName);
-    LastOpenedList1.AddItem(SaveDialog1.FileName);
+    AddItemToLastOpenedList(SaveDialog1.FileName);
     UpdateFile;
   end;
@@ -346 +348 @@
   if FileExists(DataFile.FileName) then begin
     DataFile.SaveToFile(DataFile.FileName);
-    LastOpenedList1.AddItem(DataFile.FileName);
+    AddItemToLastOpenedList(DataFile.FileName);
     UpdateFile;
   end else AFileSaveAs.Execute;
@@ -352 +354 @@
 
 procedure TCore.DataModuleCreate(Sender: TObject);
-{$IFDEF Linux}
+{$IFDEF UNIX}
 const
   LinuxDataFilesDir = '/usr/share/vCardStudio';
@@ -360 +362 @@
 begin
   ProfilePhotoFileName := 'Images/Profile.png';
-  {$IFDEF Linux}
+  {$IFDEF UNIX}
   // If installed in Linux system then use installation directory for po files
   if not DirectoryExists(Translator.POFilesFolder) and DirectoryExists(LinuxLanguagesDir) then begin
@@ -374 +376 @@
   DefaultDataFileClass := TContactsFile;
   FileClosed := True;
+  RecentFileRegistryContext := TRegistryContext.Create(ApplicationInfo1.RegistryRoot,
+    ApplicationInfo1.RegistryKey + '\RecentFiles');
 end;
 
@@ -403 +407 @@
       LoadErrors := '';
       DataFile.LoadFromFile(FileName);
-      LastOpenedList1.AddItem(FileName);
+      AddItemToLastOpenedList(FileName);
       if LoadErrors <> '' then begin
         FormError := TFormError.Create(nil);
@@ -466 +470 @@
 begin
   PersistentForm1.RegistryContext := ApplicationInfo1.GetRegistryContext;
-  LastOpenedList1.LoadFromRegistry(TRegistryContext.Create(ApplicationInfo1.RegistryRoot,
-    ApplicationInfo1.RegistryKey + '\RecentFiles'));
+  LastOpenedList1.LoadFromRegistry(RecentFileRegistryContext);
 
   with TRegistryEx.Create do
@@ -495 +498 @@
 procedure TCore.SaveConfig;
 begin
-  LastOpenedList1.SaveToRegistry(TRegistryContext.Create(ApplicationInfo1.RegistryRoot,
-    ApplicationInfo1.RegistryKey + '\RecentFiles'));
-
   with TRegistryEx.Create do
   try
@@ -527 +527 @@
 end;
 
+procedure TCore.AddItemToLastOpenedList(FileName: string);
+begin
+  with LastOpenedList1 do begin
+    LoadFromRegistry(RecentFileRegistryContext);
+    AddItem(FileName);
+    SaveToRegistry(RecentFileRegistryContext);
+  end;
+end;
+
 function TCore.GetProfileImage: TImage;
 begin
@@ -569 +578 @@
       AFileNew.Execute;
       DataFile.LoadFromFile(FileNameOption);
-      LastOpenedList1.AddItem(FileNameOption);
+      AddItemToLastOpenedList(FileNameOption);
     end else
     if ReopenLastFileOnStart and (LastOpenedList1.Items.Count > 0) and FileExists(LastOpenedList1.Items[0]) then begin