Changeset 84 for trunk


Ignore:
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:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/Install/snap/local/build.sh

    r82 r84  
    44
    55pushd ../../..
    6 snapcraft --debug
     6snapcraft --debug --use-lxd
    77popd
    88
  • trunk/Install/snap/snapcraft.yaml

    r82 r84  
    5353      ROOT=/root/parts/2048x/install
    5454      install -d -m 755 $ROOT/usr/bin
    55       install -s -m 755 Game2048 $ROOT/usr/bin/2048
     55      install -s -m 755 Game2048 $ROOT/usr/bin/Game2048
    5656      install -d -m 755 $ROOT/usr/share/Game2048/languages
    5757      install -m 755 Languages/Game2048.po $ROOT/usr/share/Game2048/languages
     
    103103apps:
    104104  2048x:
    105     command: usr/bin/2048
     105    command: usr/bin/Game2048
    106106    desktop: usr/share/applications/2048.desktop   
    107107    plugs:
    108108      - desktop
     109      - x11
     110
     111layout:
     112  /usr/share/Game2048:
     113    bind: $SNAP/usr/share/Game2048
  • trunk/UCore.pas

    r80 r84  
    7373
    7474procedure TCore.DataModuleCreate(Sender: TObject);
     75const
     76  LinuxLanguagesDir = '/usr/share/Game2048/languages';
    7577begin
    7678  {$IFDEF Linux}
    7779  // If installed in Linux system then use installation directory for po files
    78   if Application.ExeName = '/usr/bin/Game2048' then
    79     Translator1.POFilesFolder := '/usr/share/Game2048/languages';
     80  if not DirectoryExists(Translator1.POFilesFolder) and DirectoryExists(LinuxLanguagesDir) then
     81    Translator1.POFilesFolder := LinuxLanguagesDir;
    8082  {$ENDIF}
    8183
  • trunk/UGame.pas

    r79 r84  
    631631
    632632  ValueStr := SScore + ': ' + IntToStr(Score);
     633  MetaCanvas.Brush.Style := bsClear;
    633634  MetaCanvas.Font.Color := Core.ThemeManager1.Theme.ColorControlText;
    634635  MetaCanvas.Font.Height := Trunc(TopBarHeight * 0.7);
Note: See TracChangeset for help on using the changeset viewer.