made many changes.

Author: QaisAlrefai

ui/dialogs/settings_dialog.py

@@ -23,7 +23,7 @@
 from core_functions.Reciters import AyahReciter
 from utils.const import data_folder, program_english_name
 from utils.settings import SettingsManager
-from utils.audio_player import AthkarPlayer, AyahPlayer, SoundEffectPlayer
+from utils.audio_player import AthkarPlayer, AyahPlayer, SurahPlayer, SoundEffectPlayer
 from utils.Startup import StartupManager
 
 
@@ -103,6 +103,12 @@ def init_ui(self):
         self.ayah_volume.valueChanged.connect(self.OnAyahVolume)
         self.ayah_volume.setAccessibleName(self.ayah_volume_label.text())
         self.ayah_volume.setLayoutDirection(Qt.LayoutDirection.LeftToRight)
+        self.surah_volume_label = QLabel("مستوى صوت السور")
+        self.surah_volume = QSlider(Qt.Orientation.Horizontal)
+        self.surah_volume.setRange(0, 100)
+        self.surah_volume.valueChanged.connect(self.OnSurahVolume)
+        self.surah_volume.setAccessibleName(self.surah_volume_label.text())
+        self.surah_volume.setLayoutDirection(Qt.LayoutDirection.LeftToRight)
         self.athkar_volume_label = QLabel("مستوى صوت الأذكار")
         self.athkar_volume = QSlider(Qt.Orientation.Horizontal)
         self.athkar_volume.setRange(0, 100)
@@ -117,6 +123,8 @@ def init_ui(self):
         self.group_audio_layout.addWidget(self.volume)
         self.group_audio_layout.addWidget(self.ayah_volume_label)
         self.group_audio_layout.addWidget(self.ayah_volume)
+        self.group_audio_layout.addWidget(self.surah_volume_label)
+        self.group_audio_layout.addWidget(self.surah_volume)
         self.group_audio_layout.addWidget(self.athkar_volume_label)
         self.group_audio_layout.addWidget(self.athkar_volume)
         self.group_audio_layout.addWidget(self.sound_checkbox)
@@ -228,6 +236,11 @@ def init_ui(self):
         main_layout.addLayout(buttons_layout)
         self.setLayout(main_layout)
 
+
+    def OnSurahVolume(self) -> None:
+        for instance in SurahPlayer.instances:
+            instance.set_volume(self.surah_volume.value())
+
     def OnAyahVolume(self) -> None:
         for instance in AyahPlayer.instances:
             instance.set_volume(self.ayah_volume.value())
@@ -277,6 +290,7 @@ def save_settings(self):
             "speak_actions_enabled": self.speech_checkbox.isChecked(),
             "volume_level": self.volume.value(),
             "ayah_volume_level": self.ayah_volume.value(),
+            "surah_volume_level": self.surah_volume.value(),
             "athkar_volume_level": self.athkar_volume.value()
         }
 
@@ -328,6 +342,7 @@ def set_current_settings(self):
         self.volume.setValue(current_settings["audio"]["volume_level"])
         self.athkar_volume.setValue(current_settings["audio"]["athkar_volume_level"])
         self.ayah_volume.setValue(current_settings["audio"]["ayah_volume_level"])
+        self.surah_volume.setValue(current_settings["audio"]["surah_volume_level"])
         self.run_in_background_checkbox.setChecked(current_settings["general"]["run_in_background_enabled"])
         self.turn_pages_checkbox.setChecked(current_settings["reading"]["auto_page_turn"])
         self.start_on_system_start_checkbox.setChecked(current_settings["general"]["auto_start_enabled"])

ui/sura_player_ui/menubar.py

@@ -18,17 +18,27 @@ def __init__(self, parent=None):
         self.play_pause_action = QAction("تشغيل", self)  # "Play"
         self.stop_action = QAction("إيقاف", self)  # "Stop"
         self.forward_action = QAction("تقديم", self)  # "Forward"
-        self.rewind_action = QAction("إرجاع", self)  # "Rewind"
+        self.rewind_action = QAction("ترجيع", self)  # "Rewind"
+        self.replay_action = QAction("إعادة", self)  # "Replay"
         self.up_volume_action = QAction("رفع الصوت", self)
         self.down_volume_action = QAction("خفض الصوت", self)
+        self.next_surah_action = QAction("السورة التالية", self)
+        self.previous_surah_action = QAction("السورة السابقة", self)
+        self.next_reciter_action = QAction("القارئ التالي", self)
+        self.previous_reciter_action = QAction("القارئ السابق", self)
 
         # Add Actions to Menu
         player_menu.addAction(self.play_pause_action)
         player_menu.addAction(self.stop_action)
         player_menu.addAction(self.forward_action)
         player_menu.addAction(self.rewind_action)
+        player_menu.addAction(self.replay_action)
         player_menu.addAction(self.up_volume_action)
         player_menu.addAction(self.down_volume_action)
+        player_menu.addAction(self.next_surah_action)
+        player_menu.addAction(self.previous_surah_action)
+        player_menu.addAction(self.next_reciter_action)
+        player_menu.addAction(self.previous_reciter_action)
 
         # Create Actions for Main Menu
         self.close_window_action = QAction("إغلاق النافذة", self) 
@@ -42,7 +52,7 @@ def __init__(self, parent=None):
         self.installEventFilter(self)
 
     def get_player_actions(self) -> List[QAction]:
-        return [self.play_pause_action, self.stop_action, self.forward_action, self.rewind_action, self.up_volume_action, self.down_volume_action]
+        return [self.play_pause_action, self.stop_action, self.forward_action, self.rewind_action, self.replay_action, self.up_volume_action, self.down_volume_action, self.next_surah_action, self.previous_surah_action, self.next_reciter_action, self.previous_reciter_action]
 
     def eventFilter(self, obj, event: QEvent):
         if obj == self:

ui/sura_player_ui/sura_player_ui.py

@@ -162,12 +162,17 @@ 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.menubar.replay_action.triggered.connect(self.replay)
         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.menubar.next_surah_action.triggered.connect(self.next_surah)
+        self.menubar.previous_surah_action.triggered.connect(self.previous_surah)
+        self.menubar.next_reciter_action.triggered.connect(self.next_reciter)
+        self.menubar.previous_reciter_action.triggered.connect(self.previous_reciter)
         self.close_button.clicked.connect(self.OnClose)
         self.volume_slider.valueChanged.connect(self.update_volume)
         self.time_slider.valueChanged.connect(self.update_time)
@@ -193,31 +198,29 @@ def disable_focus(self):
         for widget in widgets:
             widget.setFocusPolicy(Qt.FocusPolicy.NoFocus)
 
-    def setup_shortcuts(self, disable=False, first_time=True):
+    def setup_shortcuts(self, disable=False,):
 
         shortcuts = {
-            self.menubar.play_pause_action: "Space",
-            self.menubar.forward_action: "Right",
-            self.menubar.rewind_action: "Left",
+            self.menubar.play_pause_action: ["Space", "K"],
+            self.menubar.forward_action: ["Right", "L"],
+            self.menubar.rewind_action: ["Left", "J"],
+            self.menubar.replay_action: "Home",
             self.menubar.up_volume_action: "Up",
             self.menubar.down_volume_action: "Down",
+            self.menubar.previous_surah_action: "Ctrl+Left",
+            self.menubar.next_surah_action: "Ctrl+Right",
+            self.menubar.next_reciter_action: "Ctrl+Down",
+            self.menubar.previous_reciter_action: "Ctrl+Up",
             self.menubar.stop_action: "S",
-            self.close_button: "Ctrl+Q",
-            self.next_surah_button: "Ctrl+Right",
-            self.previous_surah_button: "Ctrl+Left",
-    }
+            self.menubar.close_window_action: ["Ctrl+W", "Ctrl+F4"],
+            self.menubar.close_program_action: "Ctrl+X",
+}
 
         for widget, key_sequence in shortcuts.items():
-            widget.setShortcut(QKeySequence(key_sequence))
+            key_sequence = [key_sequence] if isinstance(key_sequence, str) else key_sequence
+            widget.setShortcuts([QKeySequence(key) for key in key_sequence])
 
-        shortcuts = {
-    "Ctrl+Down": self.next_reciter,
-    "Ctrl+Up": self.previous_reciter
-}
 
-        if first_time:
-            for key_sequence, function in shortcuts.items():                
-                QShortcut(QKeySequence(key_sequence), self).activated.connect(function)
 
     def update_current_reciter(self):
         reciter_id = self.reciter_combo.currentData()
@@ -236,6 +239,7 @@ def update_current_reciter(self):
         self.filter_manager.change_category_items(2, sura_items)
         self.statusBar().showMessage(f"القارئ الحالي: {self.reciter_combo.currentText()}")
         saved_sura = self.surah_combo.findData(self.preferences_manager.get_int("sura_number"))
+        saved_sura = 0 if saved_sura == -1 else saved_sura
         self.surah_combo.setCurrentIndex(saved_sura)
 
     def update_current_surah(self):
@@ -265,6 +269,10 @@ def forward(self):
     def rewind(self):
         self.player.rewind(10)
 
+    def replay(self):
+        self.player.set_position(0)
+
+
     def next_surah(self):
         current_index = self.surah_combo.currentIndex()
         if current_index < self.surah_combo.count() - 1:
@@ -382,15 +390,22 @@ def OnFilteredItemsUpdated(self, widget: QComboBox, items: List[Item], selected_
 
     def keyPressEvent(self, event: QKeyEvent):
 
+
+
+
         if self.filter_manager.handle_key_press(event):
             return
-    
+
+        if event.modifiers() & (Qt.ControlModifier | Qt.ShiftModifier | Qt.AltModifier):
+            return
+
         shortcuts = {
             ord("E"): lambda: UniversalSpeech.say(self.elapsed_time_label.text()),
             ord("R"): lambda: UniversalSpeech.say(self.remaining_time_label.text()),
             ord("T"): lambda: UniversalSpeech.say(self.total_time.text()),
             ord("C"): lambda: UniversalSpeech.say(self.reciter_combo.currentText()),
             ord("V"): lambda: UniversalSpeech.say(self.surah_combo.currentText()),
+            ord("I"): lambda: UniversalSpeech.say(F"{self.surah_combo.currentText()}, {self.reciter_combo.currentText()}"),
         }
 
         key_native = event.nativeVirtualKey()

utils/settings.py

@@ -10,7 +10,6 @@ class SettingsManager:
     default_settings = {
         "general": {
             "language": "Arabic",
-            "ltr_direction": False,
             "run_in_background_enabled": False,
             "auto_start_enabled": False,
             "auto_save_position_enabled": False,