Added surah_volume_level to VolumeController.

Author: MahmoudAtef999

ui/sura_player_ui/sura_player_ui.py

@@ -17,6 +17,7 @@
 from utils.audio_player import SurahPlayer
 from utils.universal_speech import UniversalSpeech
 from utils.user_data import PreferencesManager
+from utils.settings import SettingsManager
 from.menubar import MenuBar
 
 
@@ -161,10 +162,10 @@ def connect_signals(self):
         self.menubar.forward_action.triggered.connect(self.forward)
         self.rewind_button.clicked.connect(self.rewind)
         self.menubar.rewind_action.triggered.connect(self.rewind)
-        self.volume_up_button.clicked.connect(lambda: self.player.increase_volume())
-        self.menubar.up_volume_action.triggered.connect(lambda: self.player.increase_volume())
-        self.volume_down_button.clicked.connect(lambda: self.player.decrease_volume())
-        self.menubar.down_volume_action.triggered.connect(lambda: self.player.decrease_volume())
+        self.volume_up_button.clicked.connect(self.increase_volume)
+        self.menubar.up_volume_action.triggered.connect(self.increase_volume)
+        self.volume_down_button.clicked.connect(self.decrease_volume)
+        self.menubar.down_volume_action.triggered.connect(self.decrease_volume)
         self.next_surah_button.clicked.connect(self.next_surah)
         self.previous_surah_button.clicked.connect(self.previous_surah)
         self.close_button.clicked.connect(self.OnClose)
@@ -211,12 +212,7 @@ def setup_shortcuts(self, disable=False, first_time=True):
 
         shortcuts = {
     "Ctrl+Down": self.next_reciter,
-    "Ctrl+Up": self.previous_reciter,
-    # "E": lambda: UniversalSpeech.say(self.elapsed_time_label.text()),
-    # "R": lambda: UniversalSpeech.say(self.remaining_time_label.text()),
-    # "T": lambda: UniversalSpeech.say(self.total_time.text()),
-    # "C": lambda: UniversalSpeech.say(self.reciter_combo.currentText()),
-    # "V": lambda: UniversalSpeech.say(self.surah_combo.currentText()),
+    "Ctrl+Up": self.previous_reciter
 }
 
         if first_time:
@@ -297,6 +293,16 @@ def previous_reciter(self):
             self.play_current_surah()
         UniversalSpeech.say(self.reciter_combo.currentText())
 
+    def increase_volume(self):
+        self.player.increase_volume()
+        volume = int(self.player.volume * 100)
+        SettingsManager.write_settings({"audio": {"surah_volume_level": volume}})
+
+    def decrease_volume(self):
+        self.player.decrease_volume()
+        volume = int(self.player.volume * 100)
+        SettingsManager.write_settings({"audio": {"surah_volume_level": volume}})
+
     def update_volume(self):
         self.player.set_volume(self.volume_slider.value())
 

utils/audio_player/sura_player.py

@@ -6,5 +6,5 @@
 class SurahPlayer(AudioPlayer):
     instances = []
     def __init__(self) -> None:
-        super().__init__(SettingsManager.current_settings["audio"]["ayah_volume_level"])    
+        super().__init__(SettingsManager.current_settings["audio"]["surah_volume_level"])    
         SurahPlayer.instances.append(self)

utils/audio_player/volume_controller.py

@@ -1,6 +1,6 @@
 from utils.settings import SettingsManager
 from utils.universal_speech import UniversalSpeech
-from utils.audio_player import AyahPlayer, SoundEffectPlayer, AthkarPlayer
+from utils.audio_player import AyahPlayer, SoundEffectPlayer, AthkarPlayer, SurahPlayer
 
 
 class VolumeController:
@@ -15,6 +15,7 @@ def _load_categories(self) -> dict:
         return {
             "athkar_volume_level": {"label": "مستوى صوت الأذكار", "custom_volume_handler": None, "instances": AthkarPlayer.instances},
             "ayah_volume_level": {"label": "مستوى صوت استماع الآيات", "custom_volume_handler": None, "instances": AyahPlayer.instances},
+            "surah_volume_level": {"label": "مستوى صوت استماع السور", "custom_volume_handler": None, "instances": SurahPlayer.instances},
             "volume_level": {"label": "مستوى  صوت البرنامج", "custom_volume_handler": None, "instances": SoundEffectPlayer.instances},
         }
 

utils/settings.py

@@ -23,6 +23,7 @@ class SettingsManager:
             "speak_actions_enabled": True,
             "volume_level": 75,
             "ayah_volume_level": 100,
+            "surah_volume_level": 100,
             "athkar_volume_level": 50,
             "current_volume_category": 0
         },