Changeset 95 for trunk

Timestamp:

May 19, 2024, 6:15:22 PM (7 months ago)

Author:

chronos

Message:

• Fixed: Hide main menu with Qt5 widgetset.
• Fixed: Pack audio files and detect alternative Unix location.

Location:

trunk

Files:

• Engine.pas (modified) (3 diffs)
• Forms/FormMain.pas (modified) (1 diff)
• Install/deb/debian/rules (modified) (1 diff)
• Install/flatpak (modified) (1 prop)
• Install/rpm/tunneler.spec (modified) (1 diff)
• Install/snap/snapcraft.yaml (modified) (2 diffs)

trunk/Engine.pas

@@ -250 +250 @@
     function TextOutWordWrap(Canvas: TCanvas; X, Y: Integer; Text: string; Width: Integer): Integer;
     function GetMenuWidth: Integer;
+    function GetAudioDir: string;
   public
     ThreadErrorMessage: string;
@@ -1641 +1642 @@
 end;
 
+function TEngine.GetAudioDir: string;
+{$IFDEF UNIX}
+const
+  UnixDataDir = '/usr/share/Tunneler';
+  UnixAudioDir = UnixDataDir + '/Audio';
+{$ENDIF}
+begin
+  Result := GetCurrentDir + DirectorySeparator + 'Audio';
+  {$IFDEF UNIX}
+  if not DirectoryExists(Result) and DirectoryExists(UnixAudioDir) then begin
+    Result := UnixAudioDir;
+    Exit;
+  end;
+  {$ENDIF}
+end;
+
 function TEngine.Scale(Value: Integer): Integer;
 begin
@@ -2120 +2137 @@
   //DefaultAudioSystem := TAudioSystemMPlayer.Create(nil);
   AudioShot := TSound.Create(nil);
-  AudioShot.FileName := GetCurrentDir + '/Audio/GE_KF7_Soviet.wav';
+  AudioShot.FileName := GetAudioDir + DirectorySeparator + 'GE_KF7_Soviet.wav';
   AudioExplode := TSound.Create(nil);
-  AudioExplode.FileName := GetCurrentDir + '/Audio/bomb.wav';
+  AudioExplode.FileName := GetAudioDir + DirectorySeparator + 'bomb.wav';
   InitPlayerPool;
   DigMasks := TObjectList<TMatrixByte>.Create;

trunk/Forms/FormMain.pas

@@ -145 +145 @@
 procedure TFormMain.UpdateInterface;
 begin
-  if FullScreenEnabled then Menu := nil
-    else Menu := MainMenu1;
+  MenuItem1.Visible := not FullScreenEnabled;
+  MenuItem4.Visible := not FullScreenEnabled;
+  MenuItem7.Visible := not FullScreenEnabled;
   {$IFDEF DEBUG}
   StatusBar1.Visible := not FullScreenEnabled;

trunk/Install/deb/debian/rules

@@ -23 +23 @@
         install -D -m 755 Languages/*.pot $(ROOT)/usr/share/Tunneler/Languages
         install -D -m 755 Languages/*.po $(ROOT)/usr/share/Tunneler/Languages
-        
+        install -d -m 755 $(ROOT)/usr/share/Tunneler/Audio
+        install -D -m 755 Audio/*.wav $(ROOT)/usr/share/Tunneler/Audio
+
 %:
         dh $@

trunk/Install/rpm/tunneler.spec

@@ -36 +36 @@
 install -D -m 755 Languages/*.pot $RPM_BUILD_ROOT/usr/share/Tunneler/Languages
 install -D -m 755 Languages/*.po $RPM_BUILD_ROOT/usr/share/Tunneler/Languages
+install -d -m 755 $RPM_BUILD_ROOT/usr/share/Tunneler/Audio
+install -D -m 755 Languages/*.wav $RPM_BUILD_ROOT/usr/share/Tunneler/Audio
 
 %clean

trunk/Install/snap/snapcraft.yaml

@@ -17 +17 @@
     source: .
     source-type: local
-    build-packages: 
+    build-packages:
     - fpc
     - lazarus
@@ -34 +34 @@
       install -D -m 755 Languages/*.pot $SNAPCRAFT_PART_INSTALL/usr/share/Tunneler/Languages
       install -D -m 755 Languages/*.po $SNAPCRAFT_PART_INSTALL/usr/share/Tunneler/Languages
+      install -d -m 755 $SNAPCRAFT_PART_INSTALL/usr/share/Tunneler/Audio
+      install -D -m 755 Audio/*.wav $SNAPCRAFT_PART_INSTALL/usr/share/Tunneler/Audio
     stage:
     - usr