Changeset 154 for tags/1.4.0

Timestamp:

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

Author:

chronos

Message:

Merged revision(s) 152-153 from trunk:

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

Location:

tags/1.4.0

Files:

• . (modified) (1 prop)
• Forms/UFormMain.lfm (modified) (1 diff)
• Forms/UFormMain.pas (modified) (1 diff)
• Install/deb/TransLines.desktop (modified) (1 diff)
• Install/deb/debian/rules (modified) (1 diff)
• Install/flatpak/build.sh (modified) (1 diff)
• Install/flatpak/net.zdechov.app.TransLines.appdata.xml (deleted)
• Install/flatpak/net.zdechov.app.TransLines.desktop (deleted)
• Install/flatpak/net.zdechov.app.TransLines.metainfo.xml (copied) (copied from trunk/Install/flatpak/net.zdechov.app.TransLines.metainfo.xml )
• Install/flatpak/net.zdechov.app.TransLines.yml (modified) (3 diffs)
• Packages/Common/UTranslator.pas (modified) (6 diffs)
• UMenu.pas (modified) (1 diff)

tags/1.4.0/Forms/UFormMain.lfm

@@ -15 +15 @@
   OnKeyUp = FormKeyUp
   OnShow = FormShow
-  LCLVersion = '2.2.6.0'
+  LCLVersion = '3.6.0.0'
   object PaintBox1: TPaintBox
     Left = 0

tags/1.4.0/Forms/UFormMain.pas

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

tags/1.4.0/Install/deb/TransLines.desktop

@@ -7 +7 @@
 Terminal=false
 Type=Application
-Categories=GNOME;Application;Game;
+Categories=Game;Simulation
 StartupNotify=true
+Keywords=metro;subway;transport;map;transit;simulation;passengers

tags/1.4.0/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
 
 %:

tags/1.4.0/Install/flatpak/build.sh

@@ -7 +7 @@
 
 # Install dependencies
-flatpak install --system flathub org.kde.Sdk//5.15-23.08
-flatpak install --system flathub org.kde.Platform//5.15-23.08
-flatpak install --system flathub org.freedesktop.Sdk.Extension.freepascal//23.08
+flatpak install --system flathub org.kde.Sdk//5.15-24.08
+flatpak install --system flathub org.kde.Platform//5.15-24.08
+flatpak install --system flathub org.freedesktop.Sdk.Extension.freepascal//24.08
 flatpak install --system flathub org.flatpak.Builder
 

tags/1.4.0/Install/flatpak/net.zdechov.app.TransLines.yml

@@ -1 +1 @@
 app-id: net.zdechov.app.TransLines
 runtime: org.kde.Platform
-runtime-version: '5.15-23.08'
+runtime-version: '5.15-24.08'
 sdk: org.kde.Sdk
 sdk-extensions:
   - org.freedesktop.Sdk.Extension.freepascal
 command: TransLines
+rename-icon: TransLines
+rename-desktop-file: TransLines.desktop
 finish-args:
   - --share=ipc
@@ -26 +28 @@
       - type: svn
         url: https://svn.zdechov.net/translines/tags/1.4.0
-        revision: r149
+        revision: r154
     buildsystem: simple
     build-commands:
@@ -32 +34 @@
         . /usr/lib/sdk/freepascal/enable.sh
         lazbuild --build-mode=Release --ws=qt5 TransLines.lpi
-      - install -Dm755 TransLines -t $FLATPAK_DEST/share/TransLines
-      - install -d $FLATPAK_DEST/bin
-      - ln -s $FLATPAK_DEST/share/TransLines/TransLines $FLATPAK_DEST/bin/TransLines
-      - install -Dm644 Install/flatpak/${FLATPAK_ID}.desktop -t $FLATPAK_DEST/share/applications
-      - install -Dm644 Images/256x256/TransLines.png $FLATPAK_DEST/share/icons/hicolor/256x256/apps/${FLATPAK_ID}.png
+      - install -Dm755 TransLines -t $FLATPAK_DEST/bin
+      - install -Dm644 Install/deb/TransLines.desktop -t $FLATPAK_DEST/share/applications
+      - install -Dm644 Images/256x256/TransLines.png -t $FLATPAK_DEST/share/icons/hicolor/256x256/apps
       - install -Dm644 Languages/*.po -t $FLATPAK_DEST/share/TransLines/Languages
-      - install -Dm644 Install/flatpak/${FLATPAK_ID}.appdata.xml $FLATPAK_DEST/share/metainfo/${FLATPAK_ID}.metainfo.xml
+      - install -Dm644 Packages/Common/Languages/*.po -t $FLATPAK_DEST/share/TransLines/Languages
+      - install -Dm644 Install/flatpak/${FLATPAK_ID}.metainfo.xml -t $FLATPAK_DEST/share/metainfo

tags/1.4.0/Packages/Common/UTranslator.pas

@@ -48 +48 @@
     procedure TranslateProperty(Component: TPersistent; PropInfo: PPropInfo);
     function IsExcluded(Component: TPersistent; PropertyName: string): Boolean;
-    function GetLangFileDir: string;
+    function GetLangFileDirs: TStrings;
   public
     ComponentExcludes: TComponentExcludesList;
@@ -71 +71 @@
   end;
 
+const
+  PoExt = '.po';
+
 procedure Register;
 
 
 implementation
+
+uses
+  Common;
 
 procedure Register;
@@ -161 +167 @@
   FileList: TStringList;
   I: Integer;
+  J: Integer;
   LocaleShort: string;
   SearchMask: string;
+  LangDirs: TStrings;
 begin
   FPoFiles.Clear;
-  if Assigned(FLanguage) then
-  try
+  if Assigned(FLanguage) then begin
     LocaleShort := GetLocaleShort;
-    //ShowMessage(ExtractFileDir(Application.ExeName) +
-    //  DirectorySeparator + 'Languages' + ' ' + '*.' + LocaleShort + '.po');
     SearchMask := '*';
     if LocaleShort <> '' then SearchMask := SearchMask + '.' + LocaleShort;
-    SearchMask := SearchMask + '.po';
-    FileList := FindAllFiles(GetLangFileDir, SearchMask);
-    for I := 0 to FileList.Count - 1 do begin
-      FileName := FileList[I];
-      //FileName := FindLocaleFileName('.po');
-      if FileExists(FileName) and (
-      ((LocaleShort = '') and (Pos('.', FileName) = Pos('.po', FileName))) or
-      (LocaleShort <> '')) then FPoFiles.Add(TPOFile.Create(FileName));
-    end;
-  finally
-    FileList.Free;
+    SearchMask := SearchMask + PoExt;
+    LangDirs := GetLangFileDirs;
+    for J := 0 to LangDirs.Count - 1 do begin
+      FileList := FindAllFiles(LangDirs[J], SearchMask);
+      try
+        for I := 0 to FileList.Count - 1 do begin
+          FileName := FileList[I];
+          //FileName := FindLocaleFileName('.po');
+           if FileExists(FileName) and (
+          ((LocaleShort = '') and (Pos('.', FileName) = Pos(PoExt, FileName))) or
+          (LocaleShort <> '')) then FPoFiles.Add(TPOFile.Create(FileName));
+        end;
+      finally
+        FileList.Free;
+      end;
+    end;
+    LangDirs.Free;
   end;
 end;
@@ -299 +310 @@
 end;
 
-function TTranslator.GetLangFileDir: string;
-begin
-  Result := FPoFilesFolder;
-  if Copy(Result, 1, 1) <> DirectorySeparator then
-    Result := ExtractFileDir(Application.ExeName) +
-      DirectorySeparator + Result;
+function TTranslator.GetLangFileDirs: TStrings;
+var
+  I: Integer;
+begin
+  Result := TStringList.Create;
+  Result.Delimiter := ';';
+  Result.StrictDelimiter := True;
+  Result.DelimitedText := FPoFilesFolder;
+
+  for I := 0 to Result.Count - 1 do begin
+    Result[I] := StringReplace(Result[I], '/', DirectorySeparator, [rfReplaceAll]);
+    Result[I] := StringReplace(Result[I], '\', DirectorySeparator, [rfReplaceAll]);
+    if (Copy(Result[I], 1, 1) <> DirectorySeparator) and (Copy(Result[I], 2, 2) <> ':\') then
+      Result[I] := ExtractFileDir(Application.ExeName) +
+        DirectorySeparator + Result[I];
+  end;
 end;
 
@@ -371 +392 @@
 var
   I: Integer;
-  LangDir: string;
-begin
-  LangDir := GetLangFileDir;
+  J: Integer;
+  LangDirs: TStrings;
+begin
+  LangDirs := GetLangFileDirs;
   Languages.SearchByCode('').Available := True; // Automatic
 
   for I := 1 to Languages.Count - 1 do
   with Languages[I] do begin
-    Available := FileExists(LangDir + DirectorySeparator + ExtractFileNameOnly(Application.ExeName) +
-      '.' + Code + ExtensionSeparator + 'po') or (Code = 'en');
-  end;
+    for J := 0 to LangDirs.Count - 1 do begin
+      if FileExists(LangDirs[J] + DirectorySeparator + ExtractFileNameOnly(Application.ExeName) +
+        '.' + Code + PoExt) or (Code = 'en') then begin
+          Available := True;
+          Continue;
+        end;
+    end;
+  end;
+  LangDirs.Free;
 end;
 
@@ -569 +597 @@
 end;
 
-
 end.
-

tags/1.4.0/UMenu.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