Changeset 79 for trunk/Forms

Timestamp:

Aug 2, 2016, 10:06:50 PM (8 years ago)

Author:

chronos

Message:

• Fixed: Use correct path for language files under Linux.

File:

• trunk/Forms/UFormMain.pas (modified) (6 diffs)

trunk/Forms/UFormMain.pas

@@ -9 +9 @@
   ComCtrls, StdCtrls, ExtCtrls, ActnList, UAcronym, UPersistentForm, URegistry,
   ULastOpenedList, UListViewSort, UJobProgressView, UCoolTranslator, Registry,
-  SpecializedList, LazUTF8;
+  SpecializedList, LazUTF8, LazFileUtils;
 
 type
@@ -167 +167 @@
   ProjectExt = '.adp';
   DefaultFileName = 'Acronyms' + ProjectExt;
-  DefaultRegKey = '\Software\Acronym Decoder';
+  DefaultRegKey = '\Software\Chronosoft\Acronym Decoder';
   RegistryRunKey = '\Software\Microsoft\Windows\CurrentVersion\Run';
   ExampleFile = 'Example acronyms.adp';
@@ -480 +480 @@
     LoadConfig;
 
-{$IFDEF 0}
+    {$IFDEF 0}
     if Application.HasOption('h', 'help') then begin
       WriteLn('AcronymDecoder <project file>');
@@ -488 +488 @@
       Exit;
     end;
-{$ENDIF}
+    {$ENDIF}
+
     if Application.HasOption('t', 'tray') then begin
       Visible := False;
@@ -504 +505 @@
     end else begin
       // Open default database with examples if no item is in recent openned history
-      ProjectOpen(ExtractFileDir(Application.ExeName) + DirectorySeparator + ExampleFile);
+      FileNameOption := ExtractFileDir(Application.ExeName) + DirectorySeparator + ExampleFile;
+      {$IFDEF Linux}
+      // If installed in Linux system then use installation directory for po files
+      if Application.ExeName = '/usr/bin/' + ExtractFileNameOnly(Application.ExeName) then
+        FileNameOption := '/usr/share/' + ExtractFileNameOnly(Application.ExeName) + '/Examples/' + ExampleFile;
+      {$ENDIF}
+      ProjectOpen(FileNameOption);
     end;
     UpdateAcronymsList;
@@ -620 +627 @@
   LastOpenedList1.LoadFromRegistry(RegistryContext);
 
+  {$IFDEF Linux}
+  // If installed in Linux system then use installation directory for po files
+  if Application.ExeName = '/usr/bin/' + ExtractFileNameOnly(Application.ExeName) then
+    CoolTranslator1.POFilesFolder := '/usr/share/' + ExtractFileNameOnly(Application.ExeName) + '/languages';
+  {$ENDIF}
+
   with TRegistryEx.Create do
   try