Skip to content

Commit 616594d

Browse files
lzy98276lzy98276
committed
去除过程_结果音乐
1 parent ddda06c commit 616594d

10 files changed

Lines changed: 31 additions & 1261 deletions

File tree

‎app/Language/modules/extraction_settings.py‎

Lines changed: 4 additions & 172 deletions
Original file line numberDiff line numberDiff line change
@@ -90,49 +90,7 @@
9090
"open_student_image_folder": {
9191
"name": "学生图片文件夹",
9292
"description": "管理学生图片文件,图片文件名需与学生姓名一致",
93-
},
94-
"animation_music": {
95-
"name": "动画音乐",
96-
"description": "设置是否播放动画音乐",
97-
"switchbutton_name": {"enable": "播放", "disable": "关闭"},
98-
},
99-
"result_music": {
100-
"name": "结果音乐",
101-
"description": "设置是否播放结果音乐",
102-
"switchbutton_name": {"enable": "播放", "disable": "关闭"},
103-
},
104-
"open_animation_music_folder": {
105-
"name": "打开动画音乐文件夹",
106-
"description": "管理动画音乐文件并支持随机播放功能",
107-
},
108-
"open_result_music_folder": {
109-
"name": "打开结果音乐文件夹",
110-
"description": "管理结果音乐文件并支持随机播放功能",
111-
},
112-
"animation_music_volume": {
113-
"name": "动画音乐音量",
114-
"description": "设置动画音乐的音量",
115-
},
116-
"result_music_volume": {
117-
"name": "结果音乐音量",
118-
"description": "设置结果音乐的音量",
119-
},
120-
"animation_music_fade_in": {
121-
"name": "动画音乐淡入时间",
122-
"description": "设置动画音乐淡入的时间",
123-
},
124-
"result_music_fade_in": {
125-
"name": "结果音乐淡入时间",
126-
"description": "设置结果音乐淡入的时间",
127-
},
128-
"animation_music_fade_out": {
129-
"name": "动画音乐淡出时间",
130-
"description": "设置动画音乐淡出的时间",
131-
},
132-
"result_music_fade_out": {
133-
"name": "结果音乐淡出时间",
134-
"description": "设置结果音乐淡出的时间",
135-
},
93+
}
13694
}
13795
}
13896

@@ -232,49 +190,7 @@
232190
"open_student_image_folder": {
233191
"name": "学生图片文件夹",
234192
"description": "管理学生图片文件,图片文件名需与学生姓名一致",
235-
},
236-
"animation_music": {
237-
"name": "动画音乐",
238-
"description": "设置是否播放动画音乐",
239-
"switchbutton_name": {"enable": "播放", "disable": "关闭"},
240-
},
241-
"result_music": {
242-
"name": "结果音乐",
243-
"description": "设置是否播放结果音乐",
244-
"switchbutton_name": {"enable": "播放", "disable": "关闭"},
245-
},
246-
"open_animation_music_folder": {
247-
"name": "打开动画音乐文件夹",
248-
"description": "管理动画音乐文件并支持随机播放功能",
249-
},
250-
"open_result_music_folder": {
251-
"name": "打开结果音乐文件夹",
252-
"description": "管理结果音乐文件并支持随机播放功能",
253-
},
254-
"animation_music_volume": {
255-
"name": "动画音乐音量",
256-
"description": "设置动画音乐的音量",
257-
},
258-
"result_music_volume": {
259-
"name": "结果音乐音量",
260-
"description": "设置结果音乐的音量",
261-
},
262-
"animation_music_fade_in": {
263-
"name": "动画音乐淡入时间",
264-
"description": "设置动画音乐淡入的时间",
265-
},
266-
"result_music_fade_in": {
267-
"name": "结果音乐淡入时间",
268-
"description": "设置结果音乐淡入的时间",
269-
},
270-
"animation_music_fade_out": {
271-
"name": "动画音乐淡出时间",
272-
"description": "设置动画音乐淡出的时间",
273-
},
274-
"result_music_fade_out": {
275-
"name": "结果音乐淡出时间",
276-
"description": "设置结果音乐淡出的时间",
277-
},
193+
}
278194
}
279195
}
280196

@@ -374,49 +290,7 @@
374290
"open_student_image_folder": {
375291
"name": "学生图片文件夹",
376292
"description": "管理学生图片文件,图片文件名需与学生姓名一致",
377-
},
378-
"animation_music": {
379-
"name": "动画音乐",
380-
"description": "设置是否播放动画音乐",
381-
"switchbutton_name": {"enable": "播放", "disable": "关闭"},
382-
},
383-
"result_music": {
384-
"name": "结果音乐",
385-
"description": "设置是否播放结果音乐",
386-
"switchbutton_name": {"enable": "播放", "disable": "关闭"},
387-
},
388-
"open_animation_music_folder": {
389-
"name": "打开动画音乐文件夹",
390-
"description": "管理动画音乐文件并支持随机播放功能",
391-
},
392-
"open_result_music_folder": {
393-
"name": "打开结果音乐文件夹",
394-
"description": "管理结果音乐文件并支持随机播放功能",
395-
},
396-
"animation_music_volume": {
397-
"name": "动画音乐音量",
398-
"description": "设置动画音乐的音量",
399-
},
400-
"result_music_volume": {
401-
"name": "结果音乐音量",
402-
"description": "设置结果音乐的音量",
403-
},
404-
"animation_music_fade_in": {
405-
"name": "动画音乐淡入时间",
406-
"description": "设置动画音乐淡入的时间",
407-
},
408-
"result_music_fade_in": {
409-
"name": "结果音乐淡入时间",
410-
"description": "设置结果音乐淡入的时间",
411-
},
412-
"animation_music_fade_out": {
413-
"name": "动画音乐淡出时间",
414-
"description": "设置动画音乐淡出的时间",
415-
},
416-
"result_music_fade_out": {
417-
"name": "结果音乐淡出时间",
418-
"description": "设置结果音乐淡出的时间",
419-
},
293+
}
420294
}
421295
}
422296

@@ -516,48 +390,6 @@
516390
"open_lottery_image_folder": {
517391
"name": "奖品图片文件夹",
518392
"description": "管理奖品图片文件,图片文件名需与奖品名称一致",
519-
},
520-
"animation_music": {
521-
"name": "动画音乐",
522-
"description": "设置是否播放动画音乐",
523-
"switchbutton_name": {"enable": "播放", "disable": "关闭"},
524-
},
525-
"result_music": {
526-
"name": "结果音乐",
527-
"description": "设置是否播放结果音乐",
528-
"switchbutton_name": {"enable": "播放", "disable": "关闭"},
529-
},
530-
"open_animation_music_folder": {
531-
"name": "打开动画音乐文件夹",
532-
"description": "管理动画音乐文件并支持随机播放功能",
533-
},
534-
"open_result_music_folder": {
535-
"name": "打开结果音乐文件夹",
536-
"description": "管理结果音乐文件并支持随机播放功能",
537-
},
538-
"animation_music_volume": {
539-
"name": "动画音乐音量",
540-
"description": "设置动画音乐的音量",
541-
},
542-
"result_music_volume": {
543-
"name": "结果音乐音量",
544-
"description": "设置结果音乐的音量",
545-
},
546-
"animation_music_fade_in": {
547-
"name": "动画音乐淡入时间",
548-
"description": "设置动画音乐淡入的时间",
549-
},
550-
"result_music_fade_in": {
551-
"name": "结果音乐淡入时间",
552-
"description": "设置结果音乐淡入的时间",
553-
},
554-
"animation_music_fade_out": {
555-
"name": "动画音乐淡出时间",
556-
"description": "设置动画音乐淡出的时间",
557-
},
558-
"result_music_fade_out": {
559-
"name": "结果音乐淡出时间",
560-
"description": "设置结果音乐淡出的时间",
561-
},
393+
}
562394
}
563395
}

‎app/page_building/another_window.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141
class contributor_window_template(PageTemplate):
4242
"""贡献者窗口类
4343
使用PageTemplate创建贡献者页面"""
44-
4544
def __init__(self, parent=None):
4645
super().__init__(content_widget_class=contributor_page, parent=parent)
4746

‎app/view/main/window.py‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,9 @@ def __init__(self):
3535
# 设置窗口对象名称，方便其他组件查找
3636
self.setObjectName("MainWindow")
3737

38+
self.roll_call_page = None
39+
self.settingsInterface = None
40+
3841
# resize_timer的初始化
3942
self.resize_timer = QTimer(self)
4043
self.resize_timer.setSingleShot(True)
@@ -129,7 +132,7 @@ def initNavigation(self):
129132
)
130133
settings_item.clicked.connect(self.showSettingsRequested.emit)
131134
settings_item.clicked.connect(
132-
lambda: self.stackWidget.setCurrentWidget(self.roll_call_page)
135+
lambda: self.switchTo(self.roll_call_page)
133136
)
134137

135138
def closeEvent(self, event):

‎app/view/settings/extraction_settings/custom_draw_settings.py‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# ==================================================
22
# 导入库
33
# ==================================================
4-
54
from PyQt6.QtWidgets import *
65
from PyQt6.QtGui import *
76
from PyQt6.QtCore import *
@@ -15,7 +14,6 @@
1514
from app.tools.settings_access import *
1615
from app.Language.obtain_language import *
1716

18-
1917
# ==================================================
2018
# 自定义抽设置
2119
# ==================================================

0 commit comments

Comments
 (0)