Changeset 84 for trunk

Timestamp:

Aug 4, 2021, 5:27:54 PM (3 years ago)

Author:

chronos

Message:

• Fixed: Use clear background color under score text instead of solid.
• Fixed: Missing snap package x11 plug.
• Fixed: Snap package was not able to use language files.
• Modified: Build snap using lxd instead of multipass.

Location:

trunk

Files:

• Install/snap/local/build.sh (modified) (1 diff)
• Install/snap/snapcraft.yaml (modified) (2 diffs)
• UCore.pas (modified) (1 diff)
• UGame.pas (modified) (1 diff)

trunk/Install/snap/local/build.sh

@@ -4 +4 @@
 
 pushd ../../..
-snapcraft --debug
+snapcraft --debug --use-lxd
 popd
 

trunk/Install/snap/snapcraft.yaml

@@ -53 +53 @@
       ROOT=/root/parts/2048x/install
       install -d -m 755 $ROOT/usr/bin
-      install -s -m 755 Game2048 $ROOT/usr/bin/2048
+      install -s -m 755 Game2048 $ROOT/usr/bin/Game2048
       install -d -m 755 $ROOT/usr/share/Game2048/languages
       install -m 755 Languages/Game2048.po $ROOT/usr/share/Game2048/languages
@@ -103 +103 @@
 apps:
   2048x:
-    command: usr/bin/2048
+    command: usr/bin/Game2048
     desktop: usr/share/applications/2048.desktop    
     plugs:
       - desktop
+      - x11
+
+layout:
+  /usr/share/Game2048:
+    bind: $SNAP/usr/share/Game2048

trunk/UCore.pas

@@ -73 +73 @@
 
 procedure TCore.DataModuleCreate(Sender: TObject);
+const
+  LinuxLanguagesDir = '/usr/share/Game2048/languages';
 begin
   {$IFDEF Linux}
   // If installed in Linux system then use installation directory for po files
-  if Application.ExeName = '/usr/bin/Game2048' then
-    Translator1.POFilesFolder := '/usr/share/Game2048/languages';
+  if not DirectoryExists(Translator1.POFilesFolder) and DirectoryExists(LinuxLanguagesDir) then
+    Translator1.POFilesFolder := LinuxLanguagesDir;
   {$ENDIF}
 

trunk/UGame.pas

@@ -631 +631 @@
 
   ValueStr := SScore + ': ' + IntToStr(Score);
+  MetaCanvas.Brush.Style := bsClear;
   MetaCanvas.Font.Color := Core.ThemeManager1.Theme.ColorControlText;
   MetaCanvas.Font.Height := Trunc(TopBarHeight * 0.7);