Fixed a bug related to setting current item after cleaning filter.

Author: MahmoudAtef999

ui/sura_player_ui/FilterManager.py

@@ -18,6 +18,7 @@ class Category:
     label: str
     items: List[Item]
     widget : QComboBox
+    selected_item_text: str = ""
 
 
 class FilterManager(QObject):
@@ -26,6 +27,7 @@ class FilterManager(QObject):
     itemSelectionChanged = pyqtSignal(QComboBox, int)
     itemeSelected = pyqtSignal()
     filteredItemsUpdated = pyqtSignal(QComboBox, list)
+    filterCleaned = pyqtSignal(QComboBox, str)
     searchQueryUpdated = pyqtSignal(str)
 
     def __init__(self):
@@ -43,7 +45,7 @@ def change_category_items(self, id: int, new_items: List[Item]) -> None:
         for category in self.categories:
             if category.id == id:
                 category.items = new_items
-
+                
     def toggle_filter_mode(self) -> None:
         """Toggle filter mode."""
         self.active = not self.active
@@ -66,6 +68,7 @@ def navigate_items(self, direction: int) -> None:
         current_index = combo_box.currentIndex()
         new_index = max(0, min(combo_box.count() - 1, current_index + direction))
         self.itemSelectionChanged.emit(combo_box, new_index)
+        active_category.selected_item_text = combo_box.currentText()
 
     def filter_items(self, char: str):
         """Filter items in the active category based on the search query."""
@@ -94,14 +97,14 @@ def clear_filters(self):
         for category in self.categories:
             combo_box = category.widget
             self.filteredItemsUpdated.emit(combo_box, category.items)
+            self.filterCleaned.emit(combo_box, category.selected_item_text)
 
     def handle_key_press(self, event: QKeyEvent) -> bool:
         """Handle key press events."""
         if event.modifiers() == Qt.ControlModifier and event.key() == Qt.Key_F:
             self.toggle_filter_mode()
             return True
         elif self.active:
-            print(event.key() == Qt.Key.Key_Up)
             if event.key() == Qt.Key.Key_Left:
                 self.switch_category(-1)
                 return True
@@ -132,6 +135,7 @@ def handle_key_press(self, event: QKeyEvent) -> bool:
             elif event.key() in (Qt.Key.Key_Return, Qt.Key.Key_Enter):
                 self.itemeSelected.emit()
                 self.toggle_filter_mode()
+                return True
             elif event.key() == Qt.Key.Key_Escape:
                 self.toggle_filter_mode()
                 return True

ui/sura_player_ui/sura_player_ui.py

@@ -159,6 +159,7 @@ def connect_signals(self):
         self.filter_manager.activeCategoryChanged.connect(self.OnActiveCategoryChanged)
         self.filter_manager.itemSelectionChanged.connect(self.OnItemSelectionChanged)
         self.filter_manager.filteredItemsUpdated.connect(self.OnFilteredItemsUpdated)
+        self.filter_manager.filterCleaned.connect(self.OnFilterCleaned)
         self.filter_manager.itemeSelected.connect(self.play_current_surah)
         self.filter_manager.searchQueryUpdated.connect(self.OnSearchQueryUpdated)
 
@@ -326,12 +327,12 @@ def OnItemSelectionChanged(self, widget: QComboBox, index: int) -> None:
         UniversalSpeech.say(widget.currentText())
 
     def OnFilteredItemsUpdated(self, widget: QComboBox, items: List[Item]) -> None:
-        current_item = widget.currentText()
         widget.clear()
         for item in items:
             widget.addItem(item.text, item.id)
 
-        widget.setCurrentText(current_item)
+    def OnFilterCleaned(self, widget: QComboBox, selected_item_text: str) -> None:
+        widget.setCurrentText(selected_item_text)
 
     def keyPressEvent(self, event: QKeyEvent):