Changeset 66 for trunk/UCore.pas

Timestamp:

Dec 10, 2021, 12:17:46 AM (2 years ago)

Author:

chronos

Message:

• Fixed: Missing Version field definition causing error in contacts generation form.
• Fixed: Default profile image location detection under Linux.
• Fixed: Languages were not loaded in snap and deb Linux packages.

File:

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

trunk/UCore.pas

@@ -74 +74 @@
     ProfileImage: TImage;
     LastSplitDir: string;
+    ProfilePhotoFileName: string;
     procedure FileModified(Sender: TObject);
     function FindFirstNonOption: string;
@@ -322 +323 @@
 {$IFDEF Linux}
 const
-  LinuxLanguagesDir = '/usr/share/vCardStudio/Languages';
+  LinuxDataFilesDir = '/usr/share/vCardStudio';
+  LinuxLanguagesDir = LinuxDataFilesDir + '/Languages';
+  LinuxImagesDir = LinuxDataFilesDir + '/Images';
 {$ENDIF}
 begin
+  ProfilePhotoFileName := 'Images/Profile.png';
   {$IFDEF Linux}
   // If installed in Linux system then use installation directory for po files
-  if not DirectoryExists(Translator.POFilesFolder) and DirectoryExists(LinuxLanguagesDir) then
+  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}
 
@@ -510 +519 @@
 
 function TCore.GetProfileImage: TImage;
-const
-  ProfilePhotoFileName = 'Images/Profile.png';
 begin
   if not Assigned(ProfileImage) then begin