Changeset 372

Timestamp:

Jan 2, 2025, 10:15:48 PM (2 days ago)

Author:

chronos

Message:

• Added: Application icon with 128x128 resolution.

Location:

trunk

Files:

• Core.pas (modified) (1 diff)
• Images/128x128 (added)
• Images/128x128/xtactics.png (added)
• Install/deb/debian/rules (modified) (1 diff)
• Install/flatpak (modified) (1 prop)
• Install/flatpak/net.zdechov.app.xTactics.yml (modified) (2 diffs)
• Install/rpm/xtactics.spec (modified) (1 diff)
• Install/snap/snapcraft.yaml (modified) (1 diff)
• Install/win/xTactics.iss (modified) (1 diff)
• xtactics.ico (modified) ( previous)

trunk/Core.pas

@@ -520 +520 @@
 {$IFDEF UNIX}
 const
+  LanguagesDir = 'Languages';
   LinuxBaseDir = '/usr/share/xtactics';
-  LinuxLanguagesDir = LinuxBaseDir + '/Languages';
+  LinuxLanguagesDir = LinuxBaseDir + DirectorySeparator + LanguagesDir;
   LinuxBaseDir2 = '/app/share/xtactics';
-  LinuxLanguagesDir2 = LinuxBaseDir2 + '/Languages';
+  LinuxLanguagesDir2 = LinuxBaseDir2 + DirectorySeparator + LanguagesDir;
 {$ENDIF}
 begin
   BaseDir := ExtractFilePath(ParamStr(0));
-  Translator1.POFilesFolder := BaseDir + DirectorySeparator + 'Languages';
+  Translator1.POFilesFolder := BaseDir + DirectorySeparator + LanguagesDir;
 
   {$IFDEF UNIX}

trunk/Install/deb/debian/rules

@@ -28 +28 @@
         install -m 644 Install/deb/xtactics.xml $(ROOT)/usr/share/mime/packages
         install -d -m 755 $(ROOT)/usr/share/pixmaps
-        install -m 644 Images/64x64/xtactics.png $(ROOT)/usr/share/pixmaps
-        install -m 644 Images/64x64/xtactics.png $(ROOT)/usr/share/pixmaps/application-xtg.png
-        install -m 644 Images/64x64/xtactics.png $(ROOT)/usr/share/pixmaps/application-xts.png
+        install -m 644 Images/128x128/xtactics.png $(ROOT)/usr/share/pixmaps
+        install -m 644 Images/128x128/xtactics.png $(ROOT)/usr/share/pixmaps/application-xtg.png
+        install -m 644 Images/128x128/xtactics.png $(ROOT)/usr/share/pixmaps/application-xts.png
 
 %:

trunk/Install/flatpak

@@ -1 +1 @@
 .flatpak-builder
 build
+repo

@@ -1 +1 @@
 .flatpak-builder
 build
+repo

trunk/Install/flatpak/net.zdechov.app.xTactics.yml

@@ -27 +27 @@
       - type: svn
         url: https://svn.zdechov.net/xtactics/trunk
-        revision: r371
+        revision: r372
     buildsystem: simple
     build-commands:
@@ -42 +42 @@
       - install -d -m 755 $FLATPAK_DEST/share/xtactics/Images
       - cp -r Images/Maps $FLATPAK_DEST/share/xtactics/Images
-      - install -Dm644 Images/64x64/xtactics.png -t $FLATPAK_DEST/share/icons/hicolor/64x64/apps
+      - install -Dm644 Images/128x128/xtactics.png -t $FLATPAK_DEST/share/icons/hicolor/128x128/apps
       - install -Dm644 Install/flatpak/${FLATPAK_ID}.metainfo.xml -t $FLATPAK_DEST/share/metainfo

trunk/Install/rpm/xtactics.spec

@@ -28 +28 @@
 install -d -m 755 $RPM_BUILD_ROOT/usr/bin
 install -s -m 755 xtactics $RPM_BUILD_ROOT/usr/bin
-install -d -m 755 $RPM_BUILD_ROOT/usr/share/xtactics/Languages
-install -m 644 Languages/*.po $RPM_BUILD_ROOT/usr/share/xtactics/Languages
-install -m 644 Packages/Common/Languages/*.po $(ROOT)/usr/share/xtactics/Languages
-install -m 644 Packages/CoolStreaming/Languages/*.po $(ROOT)/usr/share/xtactics/Languages
+install -Dm644 Languages/*.po -t $RPM_BUILD_ROOT/usr/share/xtactics/Languages
+install -Dm644 Packages/Common/Languages/*.po -t $(ROOT)/usr/share/xtactics/Languages
+install -Dm644 Packages/CoolStreaming/Languages/*.po -t $(ROOT)/usr/share/xtactics/Languages
 install -d -m 755 $RPM_BUILD_ROOT/usr/share/xtactics/images/maps
-install -m 644 Images/Maps/Europe.png $RPM_BUILD_ROOT/usr/share/xtactics/images/maps
-install -m 644 Images/Maps/WorldMap.png $RPM_BUILD_ROOT/usr/share/xtactics/images/maps
-install -d -m 755 $RPM_BUILD_ROOT/usr/share/applications
-install -m 644 Install/deb/xtactics.desktop $RPM_BUILD_ROOT/usr/share/applications
-install -d -m 755 $RPM_BUILD_ROOT/usr/share/pixmaps
-install -m 644 Images/64x64/xtactics.png $RPM_BUILD_ROOT/usr/share/pixmaps
+install -Dm644 Images/Maps/Europe.png -t $RPM_BUILD_ROOT/usr/share/xtactics/Images/Maps
+install -Dm644 Images/Maps/WorldMap.png -t $RPM_BUILD_ROOT/usr/share/xtactics/Images/Maps
+install -Dm644 Install/deb/xtactics.desktop -t $RPM_BUILD_ROOT/usr/share/applications
+install -Dm644 Images/128x128/xtactics.png -t $RPM_BUILD_ROOT/usr/share/pixmaps
 
 %clean

trunk/Install/snap/snapcraft.yaml

@@ -58 +58 @@
       install -Dm644 Install/deb/xtactics.desktop -t $SNAPCRAFT_PART_INSTALL/usr/share/applications
       install -Dm644 Install/deb/xtactics.xml -t $SNAPCRAFT_PART_INSTALL/usr/share/mime/packages
-      install -Dm644 Images/64x64/xtactics.png -t $SNAPCRAFT_PART_INSTALL/usr/share/pixmaps
-      install -Dm644 Images/64x64/xtactics.png -t $SNAPCRAFT_PART_INSTALL/usr/share/pixmaps/application-xtg.png
-      install -Dm644 Images/64x64/xtactics.png -t $SNAPCRAFT_PART_INSTALL/usr/share/pixmaps/application-xts.png
+      install -Dm644 Images/128x128/xtactics.png -t $SNAPCRAFT_PART_INSTALL/usr/share/pixmaps
+      install -Dm644 Images/128x128/xtactics.png -t $SNAPCRAFT_PART_INSTALL/usr/share/pixmaps/application-xtg.png
+      install -Dm644 Images/128x128/xtactics.png -t $SNAPCRAFT_PART_INSTALL/usr/share/pixmaps/application-xts.png
       cp -r Systems $SNAPCRAFT_PART_INSTALL/usr/share/xtactics
       install -d -m 755 $SNAPCRAFT_PART_INSTALL/usr/share/xtactics/Images

trunk/Install/win/xTactics.iss

@@ -73 +73 @@
 Source: "{#MyAppSubDir}\lib\i386-win32-Release\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion; Check: not Is64BitInstallMode
 Source: "{#MyAppSubDir}\Languages\*.po"; DestDir: "{app}\Languages"; Flags: ignoreversion
+Source: "{#MyAppSubDir}\Packages\Common\Languages\*.po"; DestDir: "{app}\Languages"; Flags: ignoreversion
+Source: "{#MyAppSubDir}\Packages\CoolStreaming\Languages\*.po"; DestDir: "{app}\Languages"; Flags: ignoreversion
 Source: "{#MyAppSubDir}\Images\Maps\*.*"; DestDir: "{app}\Images\Maps"; Flags: ignoreversion
 Source: "{#MyAppSubDir}\Systems\*.*"; DestDir: "{app}\Systems"; Flags: ignoreversion

@@ -1 +1 @@
 .flatpak-builder
 build
+repo