Skip to content

Commit e583caf

Browse files
Merge branch 'albayan_beta' of https://github.com/tecwindow/albayan into albayan_beta
2 parents 9d31927 + 8d48093 commit e583caf

File tree

4 files changed

+20
-10
lines changed

4 files changed

+20
-10
lines changed

ui/sura_player_ui/audio_looper.py

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,33 +36,33 @@ def set_loop_start(self):
3636
self.loop_start = self.player.get_position()
3737
if self.loop_start > self.loop_end:
3838
self.loop_end = self.player.get_length()
39-
UniversalSpeech.say(f"Start point set at {self.parent.format_time(self.loop_start)} seconds.")
39+
UniversalSpeech.say(f"تم تحديد البداية عند: {self.parent.format_time(self.loop_start)}.")
4040

4141
def set_loop_end(self):
4242
"""Set the end point (B) for the repeat loop."""
4343
self.loop_end = self.player.get_position()
4444
if self.loop_end < self.loop_start:
4545
self.loop_start = 0
46-
UniversalSpeech.say(f"End point set at {self.loop_end} seconds.")
46+
UniversalSpeech.say(f"تم تحديد النهاية عند: {self.parent.format_time(self.loop_end)}.")
4747

4848
def toggle_loop(self):
4949
"""
5050
Toggle loop playback between start (A) and end (B).
5151
If loop points are not set, informs the user.
5252
"""
5353
if not self.loop_start and not self.loop_end:
54-
UniversalSpeech.say("Loop points not set.")
54+
UniversalSpeech.say("لم يتم تحديد البداية والنهاية.")
5555
return
5656

5757
self.loop_active = not self.loop_active
5858
if self.loop_active:
59-
UniversalSpeech.say(f"Looping from {self.loop_start} to {self.loop_end} seconds.")
59+
UniversalSpeech.say(f"بدأ التكرار من {self.parent.format_time(self.loop_start)} إلى {self.parent.format_time(self.loop_end)}.")
6060
# Start playback from the loop start and start the monitor timer.
6161
self.player.set_position(self.loop_start)
6262
self.player.play()
6363
self.monitor_timer.start()
6464
else:
65-
UniversalSpeech.say("Loop stopped.")
65+
UniversalSpeech.say("تم إيقاف التكرار.")
6666
self.monitor_timer.stop()
6767

6868
return self.loop_active
@@ -102,11 +102,11 @@ def resume(self):
102102
def return_to_start(self):
103103
"""Return playback to the loop start point."""
104104
if self.loop_start == 0:
105-
UniversalSpeech.say("Loop start point not set.")
105+
UniversalSpeech.say("لم يتم تحديد البداية.")
106106
return
107107

108108
self.player.set_position(self.loop_start)
109-
UniversalSpeech.say(f"Returned to start point: {self.loop_start} seconds.")
109+
UniversalSpeech.say(f"يتم التشغيل من: {self.parent.format_time(self.loop_start)}.")
110110

111111
def clear_loop(self):
112112
"""Clear the loop points and stop the loop."""
@@ -115,6 +115,8 @@ def clear_loop(self):
115115
self.loop_active = False
116116
if self.monitor_timer.isActive():
117117
self.monitor_timer.stop()
118+
#UniversalSpeech.say(F"تم مسح البداية والنهاية وإيقاف التكرار.")
119+
118120

119121
def set_loop_delay(self, delay: int):
120122
"""

ui/sura_player_ui/key_handler.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ def __init__(self, parent):
3636
ord("E"): lambda: UniversalSpeech.say(parent.elapsed_time_label.text()),
3737
ord("R"): lambda: UniversalSpeech.say(parent.remaining_time_label.text()),
3838
ord("T"): lambda: UniversalSpeech.say(parent.total_time.text()),
39-
ord("C"): lambda: UniversalSpeech.say(parent.reciter_combo.currentText()),
39+
ord("C"): lambda: UniversalSpeech.say(parent.reciter_combo.currentText().split(' - ')[0]),
4040
ord("V"): lambda: UniversalSpeech.say(parent.surah_combo.currentText()),
4141
ord("I"): lambda: UniversalSpeech.say(
4242
f"{parent.surah_combo.currentText()}, {parent.reciter_combo.currentText()}"

ui/sura_player_ui/menubar.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ def __init__(self, parent=None):
6565
self.installEventFilter(self)
6666

6767
def get_player_actions(self) -> List[QAction]:
68-
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]
68+
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, self.set_start_action, self.set_end_action, self.return_to_start_action, self.clear_loop_action, self.toggle_loop_action]
6969

7070
def eventFilter(self, obj, event: QEvent):
7171
if obj == self:

ui/sura_player_ui/sura_player_ui.py

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ def __init__(self, parent=None) -> None:
3939
self.key_handler = KeyHandler(self)
4040
self.audio_looper = AudioLooper(self, self.player)
4141

42+
4243
central_widget = QWidget()
4344
layout = QVBoxLayout(central_widget)
4445
self.setCentralWidget(central_widget)
@@ -196,6 +197,9 @@ def connect_signals(self):
196197
self.filter_manager.itemeSelected.connect(self.play_current_surah)
197198
self.filter_manager.searchQueryUpdated.connect(self.OnSearchQueryUpdated)
198199

200+
201+
202+
199203
def disable_focus(self):
200204

201205
widgets = [
@@ -422,11 +426,15 @@ def keyPressEvent(self, event: QKeyEvent):
422426

423427
return super().keyPressEvent(event)
424428

429+
def show(self):
430+
super().show()
431+
UniversalSpeech.say(f"مرحبا بك في مشغل القرآن. أنت تستمع إلى سورة {self.surah_combo.currentText()}، للقارئ {self.reciter_combo.currentText().split(' - ')[0]}، اضغط Space للتشغيل.", interrupt=False)
432+
425433
def OnClose(self):
426434
self.player.stop()
427435
self.audio_player_thread.quit()
428436
self.close()
429437

430438
def closeEvent(self, a0):
431439
self.OnClose()
432-
440+

0 commit comments

Comments
 (0)