Changeset 209 for trunk/UCore.pas

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.

File:

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

trunk/UCore.pas

@@ -49 +49 @@
     InitializeStarted: Boolean;
     InitializeFinished: Boolean;
+    function GetAppShareDir(Dir: string): string;
     procedure Initialize;
     procedure LoadConfig;
@@ -59 +60 @@
   Core: TCore;
 
-const
-  DefaultRegKey = '\Software\Chronosoft\Acronym Decoder';
-
 
 implementation
@@ -82 +80 @@
 
 procedure TCore.DataModuleCreate(Sender: TObject);
-const
-  LinuxLanguagesDir = '/usr/share/AcronymDecoder/Languages';
-begin
-  {$IFDEF Linux}
-  // If installed in Linux system then use installation directory for po files
-  if not DirectoryExists(Translator.POFilesFolder) and DirectoryExists(LinuxLanguagesDir) then
-    Translator.POFilesFolder := LinuxLanguagesDir;
-  {$ENDIF}
+begin
+  Translator.POFilesFolder := GetAppShareDir('Languages');
 
   AcronymDb := nil;
@@ -131 +123 @@
   {$ENDIF}
   WriteLn(Text);
+end;
+
+function TCore.GetAppShareDir(Dir: string): string;
+var
+  NewDir: string;
+begin
+  Result := ExtractFileDir(Application.ExeName) + DirectorySeparator + Dir;
+  {$IFDEF Linux}
+  // If installed in Linux system then try to use different installation directory
+  if not DirectoryExists(Result) then begin
+    NewDir := '/usr/share/' + ExtractFileNameOnly(Application.ExeName) + DirectorySeparator + Dir;
+    if DirectoryExists(NewDir) then Result := NewDir;
+  end;
+  {$ENDIF}
 end;
 
@@ -159 +165 @@
     end;
 
-    ExamplesDir := ExtractFileDir(Application.ExeName) + DirectorySeparator +
-      'Examples';
-    {$IFDEF Linux}
-    // If installed in Linux system then use installation directory for po files
-    if Application.ExeName = '/usr/bin/' + ExtractFileNameOnly(Application.ExeName) then
-      ExamplesDir := '/usr/share/' + ExtractFileNameOnly(Application.ExeName) +
-        DirectorySeparator + 'Examples';
-    {$ENDIF}
+    ExamplesDir := GetAppShareDir('Examples');
     ExampleFileName := ExamplesDir + DirectorySeparator + ExampleFile;
 
@@ -212 +211 @@
   with TRegistryEx.Create do
   try
-    RootKey := HKEY_CURRENT_USER;
-    OpenKey(DefaultRegKey, True);
+    RootKey := RegistryRootHKEY[ApplicationInfo1.RegistryRoot];
+    OpenKey(ApplicationInfo1.RegistryKey, True);
     ScaleDPI1.DPI := Point(ReadIntegerWithDefault('DPIX', 96), ReadIntegerWithDefault('DPIY', 96));
     ScaleDPI1.AutoDetect := ReadBoolWithDefault('DPIAuto', True);
@@ -234 +233 @@
   with TRegistryEx.Create do
   try
-    RootKey := HKEY_CURRENT_USER;
-    OpenKey(DefaultRegKey, True);
+    RootKey := RegistryRootHKEY[ApplicationInfo1.RegistryRoot];
+    OpenKey(ApplicationInfo1.RegistryKey, True);
     WriteInteger('DPIX', ScaleDPI1.DPI.X);
     WriteInteger('DPIY', ScaleDPI1.DPI.Y);