Changeset 681

Timestamp:

Jul 26, 2025, 6:31:47 PM (12 hours ago)

Author:

chronos

Message:

• Added: Separate music enable and volume controls in Settings dialog.

Location:

trunk

Files:

• Language.txt (modified) (1 diff)
• Localization/cs/Language.txt (modified) (1 diff)
• Localization/de/Language.txt (modified) (1 diff)
• Localization/fr/Language.txt (modified) (1 diff)
• Localization/it/Language.txt (modified) (1 diff)
• Localization/ru/Language.txt (modified) (1 diff)
• Localization/zh-Hans/Language.txt (modified) (1 diff)
• Localization/zh-Hant/Language.txt (modified) (1 diff)
• Settings.lfm (modified) (5 diffs)
• Settings.pas (modified) (12 diffs)

trunk/Language.txt

@@ -968 +968 @@
 DPI
 Music
+Volume

trunk/Localization/cs/Language.txt

@@ -968 +968 @@
 DPI
 Hudba
+Hlasitost

trunk/Localization/de/Language.txt

@@ -986 +986 @@
 DPI
 Musik
+Volume

trunk/Localization/fr/Language.txt

@@ -968 +968 @@
 DPI
 Musique
+Volume

trunk/Localization/it/Language.txt

@@ -958 +958 @@
 DPI
 Musica
+Volume

trunk/Localization/ru/Language.txt

@@ -993 +993 @@
 DPI
 Музыка
+Volume

trunk/Localization/zh-Hans/Language.txt

@@ -985 +985 @@
 DPI
 Music
+Volume

trunk/Localization/zh-Hant/Language.txt

@@ -985 +985 @@
 DPI
 Music
+Volume

trunk/Settings.lfm

@@ -15 +15 @@
   FormStyle = fsStayOnTop
   Position = poScreenCenter
-  LCLVersion = '4.0.0.4'
+  LCLVersion = '4.2.0.0'
   Scaled = False
   OnClose = FormClose
@@ -63 +63 @@
   end
   object ButtonFullscreen: TButtonC
-    Left = 16
+    Left = 176
     Height = 18
-    Top = 368
+    Top = 366
     Width = 18
     Down = False
@@ -161 +161 @@
   object ButtonMusicVolumeDown: TButtonC
     Tag = 6912
-    Left = 136
-    Height = 12
-    Top = 340
+    Left = 144
+    Height = 12
+    Top = 372
     Width = 12
     Down = False
@@ -172 +172 @@
   object ButtonMusicVolumeUp: TButtonC
     Tag = 6912
-    Left = 136
-    Height = 12
-    Top = 328
+    Left = 144
+    Height = 12
+    Top = 360
     Width = 12
     Down = False
@@ -180 +180 @@
     OnClick = ButtonMusicVolumeUpClick
     ButtonIndex = 1
+  end
+  object ButtonMusic: TButtonC
+    Left = 16
+    Height = 18
+    Top = 334
+    Width = 18
+    Down = False
+    Permanent = False
+    OnClick = ButtonMusicClick
+    ButtonIndex = 0
   end
   object EditShortCutPrimary: TEdit

trunk/Settings.pas

@@ -13 +13 @@
 
   TSettingsDlg = class(TDrawDlg)
+    ButtonMusic: TButtonC;
     ButtonMusicVolumeDown: TButtonC;
     ButtonMusicVolumeUp: TButtonC;
@@ -33 +34 @@
     procedure ButtonFullscreenClick(Sender: TObject);
     procedure ButtonCancelClick(Sender: TObject);
+    procedure ButtonMusicClick(Sender: TObject);
     procedure ButtonMusicVolumeDownClick(Sender: TObject);
     procedure ButtonMusicVolumeUpClick(Sender: TObject);
@@ -54 +56 @@
     LocalGamma: Integer;
     LocalKeyBindings: TKeyBindings;
+    LocalMusicEnabled: Integer;
     LocalMusicVolume: Integer;
     CurrentKeyBinding: TKeyBinding;
@@ -59 +62 @@
     procedure UpdateShortCutItem;
     function GetLocalCustomDpiEnabled: Boolean;
+    function GetLocalMusicEnabled: Boolean;
     procedure UpdateInterface;
   public
@@ -86 +90 @@
 var
   SFullScreen, SGamma, SRestartMsg, SShortCutPrimary, SShortCutSecondary,
-  SLanguages, SKeyBindings, SCustomDpi, SDpi, SMusic: string;
+  SLanguages, SKeyBindings, SCustomDpi, SDpi, SMusic, SMusicVolume: string;
 
 procedure ReloadLanguages;
@@ -100 +104 @@
   SDpi := Phrases.Lookup('SETTINGS', 8);
   SMusic := Phrases.Lookup('SETTINGS', 9);
+  SMusicVolume := Phrases.Lookup('SETTINGS', 10);
 end;
 
@@ -123 +128 @@
 end;
 
+procedure TSettingsDlg.ButtonMusicClick(Sender: TObject);
+begin
+  ButtonMusic.ButtonIndex := ButtonMusic.ButtonIndex xor 1;
+  UpdateInterface;
+end;
+
 procedure TSettingsDlg.ButtonMusicVolumeDownClick(Sender: TObject);
 begin
@@ -142 +153 @@
   ListLanguages.ItemIndex := 0;
   ButtonFullscreen.ButtonIndex := 3;
+  ButtonMusic.ButtonIndex := 3;
   LocalMusicVolume := 50;
   ButtonCustomDpi.ButtonIndex := 2;
@@ -258 +270 @@
   {$ENDIF}
 
-  UnderlinedTitleValue(Canvas, SMusic, IntToStr(LocalMusicVolume) + '%',
+  RFrame(Canvas, ButtonMusic.Left - 1, ButtonMusic.Top - 1,
+    ButtonMusic.Left + 12, ButtonMusic.Top + 12, MainTexture.ColorBevelShade,
+    MainTexture.ColorBevelLight);
+  LoweredTextOut(Canvas, -2, MainTexture, ButtonMusic.Left + TextDistanceX,
+    ButtonMusic.Top - 4, SMusic);
+  UnderlinedTitleValue(Canvas, SMusicVolume, IntToStr(LocalMusicVolume) + '%',
     ButtonMusicVolumeUp.Left - UpDownTextWidth - 4, ButtonMusicVolumeUp.Top + 2, UpDownTextWidth);
 
@@ -367 +384 @@
 end;
 
+function TSettingsDlg.GetLocalMusicEnabled: Boolean;
+begin
+  Result := (ButtonMusic.ButtonIndex and 1) = 1;
+end;
+
 procedure TSettingsDlg.UpdateInterface;
 begin
   ButtonDpiUp.Enabled := GetLocalCustomDpiEnabled;
   ButtonDpiDown.Enabled := GetLocalCustomDpiEnabled;
+  ButtonMusicVolumeDown.Enabled := GetLocalMusicEnabled;
+  ButtonMusicVolumeUp.Enabled := GetLocalMusicEnabled;
 end;
 
@@ -381 +405 @@
   if FullScreen then ButtonFullscreen.ButtonIndex := 3
     else ButtonFullscreen.ButtonIndex := 2;
-  if MusicEnabled then LocalMusicVolume := Round(MusicVolume * 100)
-    else LocalMusicVolume := 0;
+  if MusicEnabled then ButtonMusic.ButtonIndex := 3
+    else ButtonMusic.ButtonIndex := 2;
+  LocalMusicVolume := Round(MusicVolume * 100);
   LocalGamma := Gamma;
   LocalKeyBindings.Assign(KeyBindings.KeyBindings);
@@ -406 +431 @@
   end;
   FullScreen := (ButtonFullscreen.ButtonIndex and 1) = 1;
-  MusicEnabled := LocalMusicVolume > 0;
+  MusicEnabled := GetLocalMusicEnabled;
   MusicVolume := LocalMusicVolume / 100;
   Gamma := LocalGamma;