Changeset 153

Timestamp:

Jan 14, 2025, 12:18:07 PM (7 days ago)

Author:

chronos

Message:

• Fixed: Detection of languages directory on Linux.
• Fixed: Top left menu alignment.
• Modified: Improved debian control script.

Location:

trunk

Files:

• Forms/FormMain.pas (modified) (1 diff)
• Install/deb/debian/rules (modified) (1 diff)
• Menu.pas (modified) (1 diff)

trunk/Forms/FormMain.pas

@@ -62 +62 @@
 {$IFDEF UNIX}
 const
-  UnixLanguagesDir = '/usr/share/TransLines/languages';
-  {$ENDIF}
-begin
+  UnixLanguagesDir = '../share/TransLines';
+  LanguagesDirName = 'Languages';
+var
+  NewDir: string;
+  BaseDir: string;
+{$ENDIF}
+begin
+  BaseDir := ExcludeTrailingPathDelimiter(ExtractFilePath(ParamStr(0)));
+  Core.Core.Translator1.POFilesFolder := BaseDir + DirectorySeparator + LanguagesDirName;
+
   {$IFDEF UNIX}
   // If installed in UNIX system then use installation directory for po files
-  if not DirectoryExists(Core.Core.Translator1.POFilesFolder) and DirectoryExists(UnixLanguagesDir) then
-    Core.Core.Translator1.POFilesFolder := UnixLanguagesDir;
+  NewDir := BaseDir + DirectorySeparator + UnixLanguagesDir + DirectorySeparator +
+    LanguagesDirName;
+  if not DirectoryExists(Core.Core.Translator1.POFilesFolder) and DirectoryExists(NewDir) then
+    Core.Core.Translator1.POFilesFolder := NewDir;
   {$ENDIF}
 

trunk/Install/deb/debian/rules

@@ -14 +14 @@
 
 override_dh_auto_install:
-        install -d -m 755 $(ROOT)/usr/bin
-        install -s -m 755 TransLines $(ROOT)/usr/bin
-        install -d -m 755 $(ROOT)/usr/share/applications
-        install -m 755 Install/deb/TransLines.desktop $(ROOT)/usr/share/applications
-        install -d -m 755 $(ROOT)/usr/share/pixmaps
-        install -m 644 Images/64x64/TransLines.png $(ROOT)/usr/share/pixmaps
-        install -d -m 755 $(ROOT)/usr/share/TransLines/languages
-        install -m 755 Languages/*.pot $(ROOT)/usr/share/TransLines/languages
-        install -m 755 Languages/*.po $(ROOT)/usr/share/TransLines/languages
+        install -Dm755 TransLines -t $(ROOT)/usr/bin
+        install -Dm644 Install/deb/TransLines.desktop -t $(ROOT)/usr/share/applications
+        install -Dm644 Images/64x64/TransLines.png -t $(ROOT)/usr/share/pixmaps
+        install -Dm644 Languages/*.po -t $(ROOT)/usr/share/TransLines/Languages
+        install -Dm644 Packages/Common/Languages/*.po -t $(ROOT)/usr/share/TransLines/Languages
 
 %:

trunk/Menu.pas

@@ -224 +224 @@
 
     X := (CanvasSize.X - TotalWidth) div 2;
+    if X < 5 then X := 5;
     Y := (CanvasSize.Y - TotalHeight) div 2;
+    if Y < 5 then Y := 5;
 
     // Menu items