Changeset 209 for trunk/Forms

Timestamp:

Sep 20, 2021, 12:25:22 PM (3 years ago)

Author:

chronos

Message:

• Fixed: Correctly detect data application directories for Linux installation.
• Modified: Use registry key and root from application info component.

Location:

trunk/Forms

Files:

• UFormCheck.pas (modified) (2 diffs)
• UFormMain.pas (modified) (4 diffs)

trunk/Forms/UFormCheck.pas

@@ -724 +724 @@
   with TRegistryEx.Create do
   try
-    RootKey := HKEY_CURRENT_USER;
-    OpenKey(DefaultRegKey, True);
+    RootKey := RegistryRootHKEY[Core.ApplicationInfo1.RegistryRoot];
+    OpenKey(Core.ApplicationInfo1.RegistryKey, True);
     EditSummaryStart.Text := ReadStringWithDefault('SummaryStart', 'ACRONYMS AND ABBREVIATIONS');
     EditSummaryEnd.Text := ReadStringWithDefault('SummaryEnd', 'Appendix');
@@ -739 +739 @@
   with TRegistryEx.Create do
   try
-    RootKey := HKEY_CURRENT_USER;
-    OpenKey(DefaultRegKey, True);
+    RootKey := RegistryRootHKEY[Core.ApplicationInfo1.RegistryRoot];
+    OpenKey(Core.ApplicationInfo1.RegistryKey, True);
     WriteString('SummaryStart', EditSummaryStart.Text);
     WriteString('SummaryEnd', EditSummaryEnd.Text);

trunk/Forms/UFormMain.pas

@@ -735 +735 @@
   if Title <> '' then Title := Title + ' - ';
   Title := Title + Core.ApplicationInfo1.AppName;
+  {$IFDEF WINDOWS}
+  // Under Linux title would affect reg.xml path for storing registry settings
   Application.Title := Title;
+  {$ENDIF}
   Caption := Title;
   if Assigned(Core.AcronymDb) then begin
@@ -750 +753 @@
 procedure TFormMain.LoadConfig;
 begin
-  RegistryContext := TRegistryContext.Create(HKEY_CURRENT_USER, DefaultRegKey);
-  Core.PersistentForm1.RegistryContext := RegistryContext;
-  RegistryContext := TRegistryContext.Create(HKEY_CURRENT_USER, DefaultRegKey + '\RecentFiles');
+  Core.PersistentForm1.RegistryContext := Core.ApplicationInfo1.GetRegistryContext;
+  RegistryContext := TRegistryContext.Create(Core.ApplicationInfo1.RegistryRoot,
+    Core.ApplicationInfo1.RegistryKey + '\RecentFiles');
   LastOpenedList1.LoadFromRegistry(RegistryContext);
 
@@ -763 +766 @@
   with TRegistryEx.Create do
   try
-    RootKey := HKEY_CURRENT_USER;
-    OpenKey(DefaultRegKey, True);
+    RootKey := RegistryRootHKEY[Core.ApplicationInfo1.RegistryRoot];
+    OpenKey(Core.ApplicationInfo1.RegistryKey, True);
     AFilterSameLength.Checked := ReadBoolWithDefault('SameLength', False);
     AFilterSameLetterCase.Checked := ReadBoolWithDefault('SameLetterCase', False);
@@ -789 +792 @@
 procedure TFormMain.SaveConfig;
 begin
-  RegistryContext := TRegistryContext.Create(HKEY_CURRENT_USER, DefaultRegKey + '\RecentFiles');
+  RegistryContext := TRegistryContext.Create(Core.ApplicationInfo1.RegistryRoot,
+    Core.ApplicationInfo1.RegistryKey + '\RecentFiles');
   LastOpenedList1.SaveToRegistry(RegistryContext);
 
   with TRegistryEx.Create do
   try
-    RootKey := HKEY_CURRENT_USER;
-    OpenKey(DefaultRegKey, True);
+    RootKey := RegistryRootHKEY[Core.ApplicationInfo1.RegistryRoot];
+    OpenKey(Core.ApplicationInfo1.RegistryKey, True);
     WriteBool('SameLength', AFilterSameLength.Checked);
     WriteBool('SameLetterCase', AFilterSameLetterCase.Checked);