Changeset 194 for trunk/Core.pas

Timestamp:

Feb 17, 2025, 11:00:39 PM (5 days ago)

Author:

chronos

Message:

• Added: AppImage packaging files.
• Fixed: Better shared directory detection.

File:

• trunk/Core.pas (modified) (3 diffs)

trunk/Core.pas

@@ -7 +7 @@
   LastOpenedList, ApplicationInfo, PersistentForm, ScaleDPI, Common,
   Translator, DataFile, VCard, Menus, RegistryEx, Theme, FormMain,
-  Registry, VCardFile, FormKeyShortcuts;
+  Registry, VCardFile, FormKeyShortcuts, LazFileUtils;
 
 type
@@ -91 +91 @@
     procedure FileModified(Sender: TObject);
     function FindFirstNonOption: string;
+    function GetAppShareDir(Dir: string): string;
     procedure LoadConfig;
     procedure SaveConfig;
@@ -468 +469 @@
 end;
 
+function TCore.GetAppShareDir(Dir: string): string;
+{$IFDEF UNIX}
+var
+  NewDir: string;
+{$ENDIF}
+begin
+  Result := ExtractFileDir(Application.ExeName) + DirectorySeparator + Dir;
+  {$IFDEF UNIX}
+  // If installed in Linux system then try to use different installation directory
+  if not DirectoryExists(Result) then begin
+    NewDir := ExtractFileDir(Application.ExeName) + DirectorySeparator + '..' +
+      DirectorySeparator + 'share' + DirectorySeparator +
+      ExtractFileNameOnly(Application.ExeName) + DirectorySeparator + Dir;
+    if DirectoryExists(NewDir) then Result := NewDir;
+  end;
+  {$ENDIF}
+end;
+
 procedure TCore.DataModuleCreate(Sender: TObject);
-{$IFDEF UNIX}
-const
-  LinuxDataFilesDir = '/usr/share/vCardStudio';
-  LinuxLanguagesDir = LinuxDataFilesDir + '/Languages';
-  LinuxImagesDir = LinuxDataFilesDir + '/Images';
-{$ENDIF}
-begin
-  ProfilePhotoFileName := ExtractFilePath(ParamStr(0)) + DirectorySeparator +
-    'Images' + DirectorySeparator + 'Profile.png';
-  {$IFDEF UNIX}
-  // If installed in Linux system then use installation directory for po files
-  if not DirectoryExists(Translator.POFilesFolder) and DirectoryExists(LinuxLanguagesDir) then begin
-    Translator.POFilesFolder := LinuxLanguagesDir;
-  end;
-  // If installed in Linux system then use installation directory for images files
-  if not DirectoryExists('Images') and DirectoryExists(LinuxImagesDir) then begin
-    ProfilePhotoFileName := LinuxImagesDir + DirectorySeparator + 'Profile.png';
-  end;
-  {$ENDIF}
+begin
+  ProfilePhotoFileName := GetAppShareDir('Images') + DirectorySeparator + 'Profile.png';
+  Translator.POFilesFolder := GetAppShareDir('Languages');
 
   DataFile := nil;