Merge branch 'albayan_beta' of https://github.com/tecwindow/albayan into albayan_beta

Author: MesterPerfect

core_functions/info.py

@@ -209,7 +209,7 @@ def text(self) -> str:
             (SELECT numberInSurah FROM quran q3 WHERE q3.juz = q1.juz ORDER BY number DESC LIMIT 1) AS end_ayah_number,
             (SELECT sura_name FROM quran q4 WHERE q4.juz = q1.juz ORDER BY number LIMIT 1) AS start_sura_name,
             (SELECT sura_name FROM quran q5 WHERE q5.juz = q1.juz ORDER BY number DESC LIMIT 1) AS end_sura_name,
-            (SELECT GROUP_CONCAT(sura_name, ' | ') FROM (SELECT DISTINCT sura_name FROM quran WHERE juz = q1.juz)) AS surah_names
+            (SELECT GROUP_CONCAT(REPLACE(sura_name, 'سورة ', ''), ', ') FROM (SELECT DISTINCT sura_name FROM quran WHERE juz = q1.juz)) AS surah_names
         FROM quran q1
         WHERE juz = ?
         GROUP BY juz;
@@ -269,7 +269,7 @@ def text(self) -> str:
             (SELECT numberInSurah FROM quran WHERE hizb = q1.hizb ORDER BY number DESC LIMIT 1) AS end_ayah_number,
             (SELECT sura_name FROM quran WHERE hizb = q1.hizb ORDER BY number LIMIT 1) AS start_sura_name,
             (SELECT sura_name FROM quran WHERE hizb = q1.hizb ORDER BY number DESC LIMIT 1) AS end_sura_name,
-            (SELECT GROUP_CONCAT(sura_name, ' | ') FROM (SELECT DISTINCT sura_name FROM quran WHERE hizb = q1.hizb)) AS surah_names
+            (SELECT GROUP_CONCAT(REPLACE(sura_name, 'سورة ', ''), ', ') FROM (SELECT DISTINCT sura_name FROM quran WHERE hizb = q1.hizb)) AS surah_names
         FROM quran q1
         WHERE hizb = ?
         GROUP BY hizb;
@@ -330,7 +330,7 @@ def text(self) -> str:
             (SELECT numberInSurah FROM quran WHERE hizbQuarter = q1.hizbQuarter ORDER BY number DESC LIMIT 1) AS end_ayah_number,
             (SELECT sura_name FROM quran WHERE hizbQuarter = q1.hizbQuarter ORDER BY number LIMIT 1) AS start_sura_name,
             (SELECT sura_name FROM quran WHERE hizbQuarter = q1.hizbQuarter ORDER BY number DESC LIMIT 1) AS end_sura_name,
-            (SELECT GROUP_CONCAT(sura_name, ' | ') FROM (SELECT DISTINCT sura_name FROM quran WHERE hizbQuarter = q1.hizbQuarter)) AS surah_names
+            (SELECT GROUP_CONCAT(REPLACE(sura_name, 'سورة ', ''), ', ') FROM (SELECT DISTINCT sura_name FROM quran WHERE hizbQuarter = q1.hizbQuarter)) AS surah_names
         FROM quran q1
         WHERE hizbQuarter = ?
         GROUP BY hizbQuarter;
@@ -383,7 +383,7 @@ def text(self) -> str:
             (SELECT numberInSurah FROM quran WHERE page = q1.page ORDER BY number DESC LIMIT 1) AS end_ayah_number,
             (SELECT sura_name FROM quran WHERE page = q1.page ORDER BY number LIMIT 1) AS start_sura_name,
             (SELECT sura_name FROM quran WHERE page = q1.page ORDER BY number DESC LIMIT 1) AS end_sura_name,
-            (SELECT GROUP_CONCAT(sura_name, ' | ') FROM (SELECT DISTINCT sura_name FROM quran WHERE page = q1.page)) AS surah_names
+            (SELECT GROUP_CONCAT(REPLACE(sura_name, 'سورة ', ''), ', ') FROM (SELECT DISTINCT sura_name FROM quran WHERE page = q1.page)) AS surah_names
         FROM quran q1
         WHERE page = ?
         GROUP BY page;

ui/dialogs/settings_dialog.py

@@ -38,18 +38,18 @@ def __init__(self, parent):
         self.reciters_manager = AyahReciter(data_folder / "quran" / "reciters.db")
         self.init_ui()
         self.set_current_settings()
-
+        self.open_listening_tab_and_focus_reciter()
 
 
     def init_ui(self):
         main_layout = QVBoxLayout()
         taps_layout = QHBoxLayout()
 
         # Tree widget for navigation
-        tree_widget = QTreeWidget()
-        tree_widget.setHeaderHidden(True)
-        tree_widget.setMinimumWidth(200)
-        tree_widget.setStyleSheet("QTreeWidget { font-size: 14px; }")
+        self.tree_widget = QTreeWidget()
+        self.tree_widget.setHeaderHidden(True)
+        self.tree_widget.setMinimumWidth(200)
+        self.tree_widget.setStyleSheet("QTreeWidget { font-size: 14px; }")
 
         # Adding items to the tree with icons
         general_item = QTreeWidgetItem(["الإعدادات العامة"])
@@ -58,8 +58,8 @@ def init_ui(self):
         audio_item = QTreeWidgetItem(["الصوت"])
         audio_item.setIcon(0, qta.icon("fa.volume-up"))
 
-        listening_item = QTreeWidgetItem(["الاستماع"])
-        listening_item.setIcon(0, qta.icon("fa.headphones"))
+        self.listening_item = QTreeWidgetItem(["الاستماع"])
+        self.listening_item.setIcon(0, qta.icon("fa.headphones"))
 
 
         reading_item = QTreeWidgetItem(["القراءة"])
@@ -70,11 +70,11 @@ def init_ui(self):
 
 
         # Adding top-level items
-        tree_widget.addTopLevelItem(general_item)
-        tree_widget.addTopLevelItem(audio_item)
-        tree_widget.addTopLevelItem(listening_item)
-        tree_widget.addTopLevelItem(reading_item)
-        tree_widget.addTopLevelItem(search_item)
+        self.tree_widget.addTopLevelItem(general_item)
+        self.tree_widget.addTopLevelItem(audio_item)
+        self.tree_widget.addTopLevelItem(self.listening_item)
+        self.tree_widget.addTopLevelItem(reading_item)
+        self.tree_widget.addTopLevelItem(search_item)
 
         # Stacked widget to switch views
         self.stacked_widget = QStackedWidget()
@@ -248,18 +248,18 @@ def init_ui(self):
         self.stacked_widget.addWidget(self.group_reading)
         self.stacked_widget.addWidget(self.group_search)
 
-#        tree_widget.currentItemChanged.connect(lambda current, previous: self.stacked_widget.setCurrentIndex(tree_widget.indexOfTopLevelItem(current)))
+#        self.tree_widget.currentItemChanged.connect(lambda current, previous: self.stacked_widget.setCurrentIndex(self.tree_widget.indexOfTopLevelItem(current)))
 
         # Linking tree widget with stacked widget
-        tree_widget.currentItemChanged.connect(
+        self.tree_widget.currentItemChanged.connect(
             lambda current, previous: self.stacked_widget.setCurrentIndex(
-                tree_widget.indexOfTopLevelItem(current)
+                self.tree_widget.indexOfTopLevelItem(current)
             )
         )
 
 
         # Layout adjustments
-        taps_layout.addWidget(tree_widget, stretch=1)
+        taps_layout.addWidget(self.tree_widget, stretch=1)
         taps_layout.addWidget(self.stacked_widget, stretch=2)
 
         main_layout.addLayout(taps_layout)
@@ -418,6 +418,10 @@ def set_current_settings(self):
         if index != -1:
             self.font_type_combo.setCurrentIndex(index)
 
+    def open_listening_tab_and_focus_reciter(self):
+        self.tree_widget.setCurrentItem(self.listening_item)
+        self.reciters_combo.setFocus()
+
     def reject(self):
         self.deleteLater()