Skip to content

Commit 228c562

Browse files
lzy98276lzy98276
committed
进行打包，release：v1.2.2.5
1 parent 9924d76 commit 228c562

File tree

4 files changed

+100
-26
lines changed

4 files changed

+100
-26
lines changed

‎.github/workflows/release.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,13 +89,13 @@ jobs:
8989
run: |
9090
cd release
9191
echo "" >> ../CHANGELOG.md
92-
echo "Full Changelog: [v1.2.0.0...${{ github.ref_name }}](https://github.com/SECTL/SecRandom/compare/v1.2.0.0...${{ github.ref_name }})" >> ../CHANGELOG.md
92+
echo "Full Changelog: [v1.2.2.3...${{ github.ref_name }}](https://github.com/SECTL/SecRandom/compare/v1.2.2.3...${{ github.ref_name }})" >> ../CHANGELOG.md
9393
echo "" >> ../CHANGELOG.md
9494
echo "**国内 下载链接**" >> ../CHANGELOG.md
9595
echo "| 平台/打包方式 | 支持架构 | 完整版 |" >> ../CHANGELOG.md
9696
echo "| --- | --- | --- |" >> ../CHANGELOG.md
9797
echo "| Windows | x86, x64 | [下载](https://www.123684.com/s/9529jv-U4Fxh) |" >> ../CHANGELOG.md
98-
echo "| Linux | x64 | [下载](https://www.123684.com/s/9529jv-U4Fxh) |" >> ../CHANGELOG.md
98+
# echo "| Linux | x64 | [下载](https://www.123684.com/s/9529jv-U4Fxh) |" >> ../CHANGELOG.md
9999
echo "" >> ../CHANGELOG.md
100100
echo "**Github 镜像 下载链接**" >> ../CHANGELOG.md
101101
echo "| 镜像源 | 平台/打包方式 | 支持架构 | 完整版 |" >> ../CHANGELOG.md

‎CHANGELOG.md‎

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,19 @@
11
### 🚀 主要更新
22

3-
- 新增 即抽功能(支持在浮窗进行调整抽取人数)
4-
- 新增 高级设置卡片组
5-
- 新增 单词PK界面(默认赠送"高考3500词汇表")
6-
- 新增 快捷键功能
3+
- 无
74

85
### 💡 功能优化
96

10-
- 优化 将 浮窗显隐条件 从基础设置移动到高级设置
11-
- 优化 将 导出诊断数据、导入设置、导出设置 从基础设置移动到高级设置
7+
- 无
128

139
### 🐛 修复问题
1410

15-
- 修复 手动检查更新时，因对象管理导致软件退出的问题
16-
- 修复 更新通知窗口的图片路径问题，导致软件退出的问题
17-
- 修复 更新通道设置无法保存的问题
18-
- 修复 名单界面(抽人名单&抽奖名单)中，导入导出按钮的启用&禁用问题
19-
- 修复 密码设置中，解绑完成所有U盘后没有将U盘认证开关关闭的显示问题
20-
- 修复 跟抽取有关的功能中，在抽取动画种调整人数后，开始/抽取按钮从禁用变为启用
21-
- 修复 系统TTS播报失效的问题
11+
- 修复 因为没有名单而导致软件无法启动的问题
12+
- 修复 单词PK界面中，设置界面背景颜色的问题
2213

2314
### 🔧 其它变更
2415

25-
- 修改 贡献者职责
16+
- 无
2617

2718
### 🙏 贡献者 (排名不分先后)
2819

‎app/view/levitation.py‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1634,6 +1634,12 @@ def _load_groups(self):
16341634
self.group_combo.currentIndexChanged.connect(self.update_total_count)
16351635

16361636
class_name = self.class_combo.currentText()
1637+
1638+
# 检查是否选择了有效的班级
1639+
if class_name == "你暂未添加班级" or class_name == "加载班级列表失败":
1640+
self.group_combo.addItem("你暂未添加小组")
1641+
return
1642+
16371643
pumping_people_file = path_manager.get_resource_path("list", f"{class_name}.json")
16381644
try:
16391645
if path_manager.file_exists(pumping_people_file):
@@ -1671,6 +1677,12 @@ def _load_genders(self):
16711677
self.gender_combo.currentIndexChanged.connect(self.update_total_count)
16721678

16731679
class_name = self.class_combo.currentText()
1680+
1681+
# 检查是否选择了有效的班级
1682+
if class_name == "你暂未添加班级" or class_name == "加载班级列表失败":
1683+
self.gender_combo.addItem("你暂未添加性别")
1684+
return
1685+
16741686
pumping_people_file = path_manager.get_resource_path("list", f"{class_name}.json")
16751687
try:
16761688
if path_manager.file_exists(pumping_people_file):
@@ -1729,8 +1741,18 @@ def update_total_count(self):
17291741
group_name = self.group_combo.currentText()
17301742
gender_name = self.gender_combo.currentText()
17311743

1744+
# 检查是否选择了有效的班级
1745+
if class_name == "你暂未添加班级" or class_name == "加载班级列表失败":
1746+
self.max_count = 0
1747+
return
1748+
17321749
student_file = path_manager.get_resource_path("list", f"{class_name}.json")
17331750

1751+
# 检查文件是否存在
1752+
if not path_manager.file_exists(student_file):
1753+
self.max_count = 0
1754+
return
1755+
17341756
cleaned_data = self._get_cleaned_data(student_file, group_name, gender_name)
17351757

17361758
self.max_count = len(cleaned_data)

‎app/view/main_page/vocabulary_pk_settings.py‎

Lines changed: 71 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@ class VocabularyPKSettingsDialog(QDialog):
1212
def __init__(self, parent=None, settings=None):
1313
super().__init__(parent)
1414
self.settings = settings or {}
15+
16+
self.update_theme_style()
17+
qconfig.themeChanged.connect(self.update_theme_style)
18+
1519
self.initUI()
1620

1721
def initUI(self):
@@ -135,14 +139,14 @@ def initUI(self):
135139
settings_card_layout.addWidget(basic_group)
136140

137141
# 高级设置区域
138-
advanced_group = QGroupBox("高级设置")
139-
advanced_group.setFont(QFont(load_custom_font(), 12))
140-
advanced_layout = QFormLayout(advanced_group)
142+
self.advanced_group = QGroupBox("高级设置")
143+
self.advanced_group.setFont(QFont(load_custom_font(), 12))
144+
advanced_layout = QFormLayout(self.advanced_group)
141145
advanced_layout.setLabelAlignment(Qt.AlignRight)
142146
advanced_layout.setFormAlignment(Qt.AlignLeft)
143147
advanced_layout.setSpacing(15)
144148

145-
advanced_group.setStyleSheet("QGroupBox { border: 1px solid #cccccc; border-radius: 6px; margin-top: 12px; } "
149+
self.advanced_group.setStyleSheet("QGroupBox { border: 1px solid #cccccc; border-radius: 6px; margin-top: 12px; } "
146150
"QGroupBox::title { subcontrol-origin: margin; left: 10px; padding: 0 3px 0 3px; }")
147151

148152
# 练习模式选择
@@ -221,7 +225,7 @@ def initUI(self):
221225

222226
advanced_layout.addRow(countdown_label, self.countdown_widget)
223227

224-
settings_card_layout.addWidget(advanced_group)
228+
settings_card_layout.addWidget(self.advanced_group)
225229

226230
main_layout.addWidget(settings_card)
227231

@@ -260,7 +264,7 @@ def on_delete_vocabulary_clicked(self):
260264
content="没有选择可删除的词汇表",
261265
duration=3000,
262266
parent=self
263-
).show()
267+
)
264268
return
265269

266270
# 确认删除
@@ -306,23 +310,80 @@ def on_delete_vocabulary_clicked(self):
306310
content=f"已成功删除词汇表: {current_vocabulary}",
307311
duration=3000,
308312
parent=self
309-
).show()
313+
)
310314
else:
311315
# 显示删除失败的提示
312316
InfoBar.error(
313317
title="删除失败",
314318
content=f"删除词汇表 '{current_vocabulary}' 失败，请重试",
315319
duration=3000,
316320
parent=self
317-
).show()
321+
)
318322
else:
319323
# 如果父窗口不存在或没有删除词汇表方法，显示错误提示
320324
InfoBar.error(
321325
title="错误",
322326
content="无法删除词汇表，请重试",
323327
duration=3000,
324328
parent=self
325-
).show()
329+
)
330+
331+
def update_theme_style(self):
332+
"""根据当前主题更新样式"""
333+
if qconfig.theme == Theme.AUTO:
334+
lightness = QApplication.palette().color(QPalette.Window).lightness()
335+
is_dark = lightness <= 127
336+
else:
337+
is_dark = qconfig.theme == Theme.DARK
338+
339+
colors = {'text': '#F5F5F5', 'bg': '#111116', 'title_bg': '#2D2D2D'} if is_dark else {'text': '#111116', 'bg': '#F5F5F5', 'title_bg': '#E0E0E0'}
340+
self.setStyleSheet(f"""
341+
QDialog {{ background-color: {colors['bg']}; border-radius: 5px; }}
342+
#CustomTitleBar {{ background-color: {colors['title_bg']}; }}
343+
#TitleLabel {{ color: {colors['text']}; font-weight: bold; padding: 5px; }}
344+
#CloseButton {{
345+
background-color: transparent;
346+
color: {colors['text']};
347+
border-radius: 4px;
348+
font-weight: bold;
349+
border: none;
350+
}}
351+
#CloseButton:hover {{
352+
background-color: #ff4d4d;
353+
color: white;
354+
border: none;
355+
}}
356+
QLabel, QPushButton, QTextEdit {{ color: {colors['text']}; }}
357+
QLineEdit {{
358+
background-color: {colors['bg']};
359+
color: {colors['text']};
360+
border: 1px solid #555555;
361+
border-radius: 4px;
362+
padding: 5px;
363+
}}
364+
QPushButton {{
365+
background-color: {colors['bg']};
366+
color: {colors['text']};
367+
border: 1px solid #555555;
368+
border-radius: 4px;
369+
padding: 5px;
370+
}}
371+
QPushButton:hover {{ background-color: #606060; }}
372+
QComboBox {{
373+
background-color: {colors['bg']};
374+
color: {colors['text']};
375+
border: 1px solid #555555;
376+
border-radius: 4px;
377+
padding: 5px;
378+
}}
379+
QGroupBox {{ color: {colors['text']}; }}
380+
QGroupBox::title {{ color: {colors['text']}; }}
381+
""")
382+
383+
# 更新高级设置QGroupBox的字体颜色
384+
if hasattr(self, 'advanced_group'):
385+
self.advanced_group.setStyleSheet(f"QGroupBox {{ color: {colors['text']}; border: 1px solid #cccccc; border-radius: 6px; margin-top: 12px; }} "
386+
f"QGroupBox::title {{ subcontrol-origin: margin; left: 10px; padding: 0 3px 0 3px; color: {colors['text']}; }}")
326387

327388
def on_import_vocabulary_clicked(self):
328389
"""导入词汇表按钮点击事件处理函数"""
@@ -365,7 +426,7 @@ def on_import_vocabulary_clicked(self):
365426
content="无法导入词汇表，请重试",
366427
duration=3000,
367428
parent=self
368-
).show()
429+
)
369430

370431
def get_settings(self):
371432
"""获取设置值"""

0 commit comments

Comments
 (0)