Linked the shortcuts with menu item in SuraPlayer.

Author: MahmoudAtef999

ui/sura_player_ui/menubar.py

@@ -1,5 +1,5 @@
 from PyQt6.QtWidgets import QMenuBar, QApplication
-from PyQt6.QtGui import QAction, QKeyEvent
+from PyQt6.QtGui import QAction, QKeyEvent, QKeySequence
 from PyQt6.QtCore import Qt, QEvent
 
 
@@ -14,26 +14,30 @@ def __init__(self, parent=None):
         player_menu = self.addMenu("مشغل القرآن(&P)")
 
         # Create Actions for Player Menu
-        play_action = QAction("تشغيل", self)  # "Play"
-        stop_action = QAction("إيقاف", self)  # "Stop"
-        forward_action = QAction("تقديم", self)  # "Forward"
-        rewind_action = QAction("إرجاع", self)  # "Rewind"
+        self.play_action = QAction("تشغيل", self)  # "Play"
+        self.stop_action = QAction("إيقاف", self)  # "Stop"
+        self.forward_action = QAction("تقديم", self)  # "Forward"
+        self.rewind_action = QAction("إرجاع", self)  # "Rewind"
+        self.up_volume_action = QAction("رفع الصوت", self)
+        self.down_volume_action = QAction("خفض الصوت", self)
 
         # Add Actions to Menu
-        player_menu.addAction(play_action)
-        player_menu.addAction(stop_action)
-        player_menu.addAction(forward_action)
-        player_menu.addAction(rewind_action)
-
+        player_menu.addAction(self.play_action)
+        player_menu.addAction(self.stop_action)
+        player_menu.addAction(self.forward_action)
+        player_menu.addAction(self.rewind_action)
+        player_menu.addAction(self.up_volume_action)
+        player_menu.addAction(self.down_volume_action)
+        
         # Create Actions for Main Menu
-        close_window_action = QAction("إغلاق النافذة", self) 
-        close_window_action .triggered.connect(self.parent.OnClose)
-        close_program_action = QAction("إغلاق البرنامج", self)
-        close_program_action.triggered.connect(QApplication.exit)
+        self.close_window_action = QAction("إغلاق النافذة", self) 
+        self.close_window_action .triggered.connect(self.parent.OnClose)
+        self.close_program_action = QAction("إغلاق البرنامج", self)
+        self.close_program_action.triggered.connect(QApplication.exit)
 
         # Add Actions to Menu    
-        main_menu.addAction(close_window_action)
-        main_menu.addAction(close_program_action)
+        main_menu.addAction(self.close_window_action)
+        main_menu.addAction(self.close_program_action)
         self.installEventFilter(self)
 
     def eventFilter(self, obj, event: QEvent):

ui/sura_player_ui/sura_player_ui.py

@@ -25,6 +25,8 @@ def __init__(self, parent=None) -> None:
         self.setWindowTitle("مشغل القرآن")
         self.resize(600, 400)
         self.preferences_manager = PreferencesManager(user_db_path)
+        self.menubar = MenuBar(self)
+        self.setMenuBar(self.menubar)
 
         self.reciters = SurahReciter(data_folder / "quran" / "reciters.db")
         self.player = SurahPlayer()
@@ -44,7 +46,6 @@ def __init__(self, parent=None) -> None:
         self.connect_signals()
         self.disable_focus()
         self.setup_shortcuts()
-        self.setMenuBar(MenuBar(self))
         self.setFocus()
 
         layout.addWidget(self.selection_group)
@@ -150,11 +151,17 @@ def connect_signals(self):
         self.reciter_combo.currentIndexChanged.connect(self.update_current_reciter)
         self.surah_combo.currentIndexChanged.connect(self.update_current_surah)
         self.play_pause_button.clicked.connect(self.toggle_play_pause)
+        self.menubar.play_action.triggered.connect(self.toggle_play_pause)
         self.stop_button.clicked.connect(self.stop)
+        self.menubar.stop_action.triggered.connect(self.stop)
         self.forward_button.clicked.connect(self.forward)
+        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.next_surah_button.clicked.connect(self.next_surah)
         self.previous_surah_button.clicked.connect(self.previous_surah)
         self.close_button.clicked.connect(self.OnClose)
@@ -186,19 +193,19 @@ def disable_focus(self):
     def setup_shortcuts(self, disable=False, first_time=True):
 
         shortcuts = {
-            self.play_pause_button: "Space",
-            self.forward_button: "Right",
-            self.rewind_button: "Left",
-            self.volume_up_button: "Up",
-            self.volume_down_button: "Down",
-            self.stop_button: "S",
+            self.menubar.play_action: "Space",
+            self.menubar.forward_action: "Right",
+            self.menubar.rewind_action: "Left",
+            self.menubar.up_volume_action: "Up",
+            self.menubar.down_volume_action: "Down",
+            self.menubar.stop_action: "S",
             self.close_button: "Ctrl+Q",
             self.next_surah_button: "Ctrl+Right",
             self.previous_surah_button: "Ctrl+Left",
     }
 
         for button, key_sequence in shortcuts.items():
-            button.setShortcut(QKeySequence(key_sequence) if not disable else None)
+            button.setShortcut(QKeySequence(key_sequence))
 
         if first_time:
             QShortcut(QKeySequence("Ctrl+Down"), self).activated.connect(self.next_reciter)
@@ -326,8 +333,11 @@ def update_ui_status(self):
             self.statusBar().showMessage("إيقاف مؤقت")
 
     def OnFilterModeChange(self, active: bool) -> None:
-        for button in self.buttons:
-            button.setEnabled(not active)
+        widgets = self.buttons + [self.menubar.play_action, self.menubar.forward_action,
+                                  self.menubar.rewind_action, self.menubar.stop_action,
+                                  self.menubar.up_volume_action, self.menubar.down_volume_action]
+        for widget in widgets:
+            widget.setEnabled(not active)
         UniversalSpeech.say("وضع الفلترة مفعَّل. استخدم الأسهم اليمين و اليسار للتنقل بين القرائ و السور, واستخدم الأسهم للأعلى والأسفل لتصفح المحدد, اكتب لتصفية القُرَّاء." if active else "وضع الفلترة معطَّل.")
 
     def OnActiveCategoryChanged(self, label: str) -> None: