From 20b1264446e4cef34803d2268f4fdd450afda410 Mon Sep 17 00:00:00 2001 From: AquamarineCyan <1057424730@qq.com> Date: Sun, 9 Feb 2025 15:02:36 +0800 Subject: [PATCH] =?UTF-8?q?:sparkles:=20`=E7=B3=BB=E7=BB=9F=E9=80=9A?= =?UTF-8?q?=E7=9F=A5`=E6=94=AF=E6=8C=81=E5=90=AF=E7=94=A8=E5=92=8C?= =?UTF-8?q?=E5=85=B3=E9=97=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.MD | 6 ++ src/package/daoguantupo.py | 5 +- src/package/jiejietupo.py | 1 - src/package/liudaozhimen.py | 2 - src/package/qiling.py | 2 +- src/package/utils.py | 8 +- src/package/zhaohuan.py | 1 - src/ui/mainui.py | 71 ++++++++++-------- src/ui/mainui.ui | 141 ++++++++++++++++++++++++------------ src/utils/config.py | 10 +-- src/utils/gui.py | 26 +++++-- src/utils/log.py | 8 +- src/utils/mysignal.py | 8 +- src/utils/toast.py | 20 ++--- 14 files changed, 194 insertions(+), 115 deletions(-) diff --git a/CHANGELOG.MD b/CHANGELOG.MD index 32f6713..18ebcc7 100644 --- a/CHANGELOG.MD +++ b/CHANGELOG.MD @@ -1,5 +1,11 @@ # Change Log +## 最近更新 + +### 新功能 + +- `系统通知`支持启用和关闭 + ## v2.0.0 - 2025-02-05 ### 破坏性更新 diff --git a/src/package/daoguantupo.py b/src/package/daoguantupo.py index 3cf717a..4c50660 100644 --- a/src/package/daoguantupo.py +++ b/src/package/daoguantupo.py @@ -70,7 +70,7 @@ def check_title(self) -> None: sleep() result = RuleOcr().get_raw_result() for item in result: - if self.OCR_TITLE.keyword == item.text: + if self.OCR_TITLE.keyword == item.text: logger.scene(self.scene_name) if self.OCR_DAOJISHI.keyword in item.text: @@ -147,11 +147,10 @@ def guanzhan(self): def done(self): self.n += 1 - logger.num(str(self.n)) + logger.progress(self.n) def run(self): self.check_title() - logger.num(0) sleep(2) if self.state == self.STATE_WAIT_START: self.check_click(self.IMAGE_TIAOZHAN, timeout=3) diff --git a/src/package/jiejietupo.py b/src/package/jiejietupo.py index 6412fbc..88964e6 100644 --- a/src/package/jiejietupo.py +++ b/src/package/jiejietupo.py @@ -393,7 +393,6 @@ def run(self): logger.ui_error("当前等级低于目标等级") return self.check_title() - logger.num(f"0/{self.max}") while self.n < self.max: if bool(event_thread): diff --git a/src/package/liudaozhimen.py b/src/package/liudaozhimen.py index d050b16..40c5705 100644 --- a/src/package/liudaozhimen.py +++ b/src/package/liudaozhimen.py @@ -380,7 +380,6 @@ def fight(self): self.state = self.STATE_START def run(self): - logger.num(f"0/{self.max}") self.check_current_scene() while self.n < self.max: @@ -389,7 +388,6 @@ def run(self): if self.state == self.STATE_START: self.check_title() - # self.check_title_jiaotu() #TODO sleep() self.choose_initial_buff(1) self.map_node_numbers = 0 # 地图上节点的个数 diff --git a/src/package/qiling.py b/src/package/qiling.py index 274e984..764e236 100644 --- a/src/package/qiling.py +++ b/src/package/qiling.py @@ -73,7 +73,7 @@ def load_asset(self): def done(self): self.stone_count += 1 logger.ui(f"已使用鸣契石数量: {self.stone_count}") - logger.num(f"{self.stone_count}/{self.stone_numbers}") + logger.progress(f"{self.stone_count}/{self.stone_numbers}") @log_function_call def fight_tancha(self): diff --git a/src/package/utils.py b/src/package/utils.py index d9034d9..6d43a41 100644 --- a/src/package/utils.py +++ b/src/package/utils.py @@ -315,9 +315,9 @@ def screenshot(self) -> None: logger.info(f"screenshot: {screenshot_file}") def done(self) -> None: - """更新一次完成次数""" + """更新一次完成情况""" self.n += 1 - logger.num(f"{self.n}/{self.max}") + logger.progress(f"{self.n}/{self.max}") @log_function_call def check_result(self) -> bool: @@ -399,7 +399,9 @@ def task_start(self): ms.main.is_fighting_update.emit(True) _start = time.perf_counter() if self.max: - logger.num(f"0/{self.max}") + logger.progress(f"0/{self.max}") + else: + logger.progress(0) xuanshangfengyin_count.reset() diff --git a/src/package/zhaohuan.py b/src/package/zhaohuan.py index 88fc9bb..01647e7 100644 --- a/src/package/zhaohuan.py +++ b/src/package/zhaohuan.py @@ -48,7 +48,6 @@ def check_first_times(self): def run(self) -> None: self.check_title() - logger.num(f"0/{self.max}") self.check_first_times() self.done() sleep(4, 6) diff --git a/src/ui/mainui.py b/src/ui/mainui.py index b08776e..bb293a3 100644 --- a/src/ui/mainui.py +++ b/src/ui/mainui.py @@ -3,7 +3,7 @@ ################################################################################ ## Form generated from reading UI file 'mainui.ui' ## -## Created by: Qt User Interface Compiler version 6.8.1 +## Created by: Qt User Interface Compiler version 6.8.2 ## ## WARNING! All changes made in this file will be lost when recompiling UI file! ################################################################################ @@ -63,29 +63,27 @@ def setupUi(self, MainWindow): self.gridLayout_groupBox_info.addItem(self.horizontalSpacer_groupBox_info_left, 0, 1, 1, 1) - self.text_completion_times = QLineEdit(self.groupBox_info) - self.text_completion_times.setObjectName(u"text_completion_times") - self.text_completion_times.setEnabled(True) + self.text_progress = QLineEdit(self.groupBox_info) + self.text_progress.setObjectName(u"text_progress") + self.text_progress.setEnabled(True) font1 = QFont() font1.setFamilies([u"\u5b8b\u4f53"]) font1.setPointSize(9) - self.text_completion_times.setFont(font1) - self.text_completion_times.setMaxLength(32764) + self.text_progress.setFont(font1) + self.text_progress.setMaxLength(32764) - self.gridLayout_groupBox_info.addWidget(self.text_completion_times, 0, 3, 1, 1) + self.gridLayout_groupBox_info.addWidget(self.text_progress, 0, 3, 1, 1) self.text_info = QTextBrowser(self.groupBox_info) self.text_info.setObjectName(u"text_info") self.gridLayout_groupBox_info.addWidget(self.text_info, 1, 0, 1, 6) - self.label_completion_times = QLabel(self.groupBox_info) - self.label_completion_times.setObjectName(u"label_completion_times") - self.label_completion_times.setFont(font) - self.label_completion_times.setLayoutDirection(Qt.LayoutDirection.LeftToRight) - self.label_completion_times.setAlignment(Qt.AlignmentFlag.AlignCenter) + self.label_progress = QLabel(self.groupBox_info) + self.label_progress.setObjectName(u"label_progress") + self.label_progress.setAlignment(Qt.AlignmentFlag.AlignCenter) - self.gridLayout_groupBox_info.addWidget(self.label_completion_times, 0, 2, 1, 1) + self.gridLayout_groupBox_info.addWidget(self.label_progress, 0, 2, 1, 1) self.gridLayout_tab_home.addWidget(self.groupBox_info, 0, 1, 13, 1) @@ -397,12 +395,6 @@ def setupUi(self, MainWindow): self.scrollAreaWidgetContents.setGeometry(QRect(0, 0, 542, 423)) self.verticalLayout_setting = QVBoxLayout(self.scrollAreaWidgetContents) self.verticalLayout_setting.setObjectName(u"verticalLayout_setting") - self.label_tip_setting_restart = QLabel(self.scrollAreaWidgetContents) - self.label_tip_setting_restart.setObjectName(u"label_tip_setting_restart") - self.label_tip_setting_restart.setAlignment(Qt.AlignmentFlag.AlignCenter) - - self.verticalLayout_setting.addWidget(self.label_tip_setting_restart) - self.groupBox_config = QGroupBox(self.scrollAreaWidgetContents) self.groupBox_config.setObjectName(u"groupBox_config") self.vboxLayout = QVBoxLayout(self.groupBox_config) @@ -415,7 +407,7 @@ def setupUi(self, MainWindow): self.setting_update_label = QLabel(self.groupBox_config) self.setting_update_label.setObjectName(u"setting_update_label") - self.setting_update_label.setAlignment(Qt.AlignmentFlag.AlignCenter) + self.setting_update_label.setMinimumSize(QSize(120, 0)) self.horizontalLayout_setting_update.addWidget(self.setting_update_label) @@ -448,7 +440,7 @@ def setupUi(self, MainWindow): self.setting_update_download_label = QLabel(self.groupBox_config) self.setting_update_download_label.setObjectName(u"setting_update_download_label") - self.setting_update_download_label.setAlignment(Qt.AlignmentFlag.AlignCenter) + self.setting_update_download_label.setMinimumSize(QSize(120, 0)) self.horizontalLayout_setting_update_download.addWidget(self.setting_update_download_label) @@ -481,7 +473,7 @@ def setupUi(self, MainWindow): self.setting_xuanshangfengyin_label = QLabel(self.groupBox_config) self.setting_xuanshangfengyin_label.setObjectName(u"setting_xuanshangfengyin_label") - self.setting_xuanshangfengyin_label.setAlignment(Qt.AlignmentFlag.AlignCenter) + self.setting_xuanshangfengyin_label.setMinimumSize(QSize(120, 0)) self.horizontalLayout_setting_xuanshangfengyin.addWidget(self.setting_xuanshangfengyin_label) @@ -514,7 +506,7 @@ def setupUi(self, MainWindow): self.setting_window_style_label = QLabel(self.groupBox_config) self.setting_window_style_label.setObjectName(u"setting_window_style_label") - self.setting_window_style_label.setAlignment(Qt.AlignmentFlag.AlignCenter) + self.setting_window_style_label.setMinimumSize(QSize(120, 0)) self.horizontalLayout_setting_window_style.addWidget(self.setting_window_style_label) @@ -547,7 +539,7 @@ def setupUi(self, MainWindow): self.setting_shortcut_start_stop_label = QLabel(self.groupBox_config) self.setting_shortcut_start_stop_label.setObjectName(u"setting_shortcut_start_stop_label") - self.setting_shortcut_start_stop_label.setAlignment(Qt.AlignmentFlag.AlignCenter) + self.setting_shortcut_start_stop_label.setMinimumSize(QSize(120, 0)) self.horizontalLayout_setting_shortcut_start_stop.addWidget(self.setting_shortcut_start_stop_label) @@ -580,6 +572,7 @@ def setupUi(self, MainWindow): self.setting_remember_last_choice_button = QCheckBox(self.groupBox_config) self.setting_remember_last_choice_button.setObjectName(u"setting_remember_last_choice_button") + self.setting_remember_last_choice_button.setMinimumSize(QSize(160, 0)) self.horizontalLayout_setting_remember_last_choice.addWidget(self.setting_remember_last_choice_button) @@ -598,6 +591,7 @@ def setupUi(self, MainWindow): self.setting_backend_interaction_button = QCheckBox(self.groupBox_config) self.setting_backend_interaction_button.setObjectName(u"setting_backend_interaction_button") + self.setting_backend_interaction_button.setMinimumSize(QSize(160, 0)) self.horizontalLayout_setting_backend_interaction.addWidget(self.setting_backend_interaction_button) @@ -608,6 +602,25 @@ def setupUi(self, MainWindow): self.vboxLayout.addLayout(self.horizontalLayout_setting_backend_interaction) + self.horizontalLayout_setting_win_toast = QHBoxLayout() + self.horizontalLayout_setting_win_toast.setObjectName(u"horizontalLayout_setting_win_toast") + self.horizontalSpacer_setting_win_toast_left = QSpacerItem(40, 20, QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Minimum) + + self.horizontalLayout_setting_win_toast.addItem(self.horizontalSpacer_setting_win_toast_left) + + self.setting_win_toast_button = QCheckBox(self.groupBox_config) + self.setting_win_toast_button.setObjectName(u"setting_win_toast_button") + self.setting_win_toast_button.setMinimumSize(QSize(160, 0)) + + self.horizontalLayout_setting_win_toast.addWidget(self.setting_win_toast_button) + + self.horizontalSpacer_setting_win_toast_right = QSpacerItem(40, 20, QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Minimum) + + self.horizontalLayout_setting_win_toast.addItem(self.horizontalSpacer_setting_win_toast_right) + + + self.vboxLayout.addLayout(self.horizontalLayout_setting_win_toast) + self.verticalLayout_setting.addWidget(self.groupBox_config) @@ -665,8 +678,7 @@ def setupUi(self, MainWindow): self.verticalLayout_setting.addLayout(self.horizontalLayout_restart_update_record) - self.verticalLayout_setting.setStretch(1, 4) - self.verticalLayout_setting.setStretch(2, 1) + self.verticalLayout_setting.setStretch(0, 1) self.scrollArea.setWidget(self.scrollAreaWidgetContents) self.gridLayout_6.addWidget(self.scrollArea, 0, 0, 1, 1) @@ -689,8 +701,8 @@ def setupUi(self, MainWindow): def retranslateUi(self, MainWindow): MainWindow.setWindowTitle(QCoreApplication.translate("MainWindow", u"MainWindow", None)) self.groupBox_info.setTitle(QCoreApplication.translate("MainWindow", u"\u4fe1\u606f", None)) - self.text_completion_times.setPlaceholderText("") - self.label_completion_times.setText(QCoreApplication.translate("MainWindow", u"\u5b8c\u6210\u6b21\u6570", None)) + self.text_progress.setPlaceholderText("") + self.label_progress.setText(QCoreApplication.translate("MainWindow", u"\u5b8c\u6210\u60c5\u51b5", None)) self.button_start.setText(QCoreApplication.translate("MainWindow", u"\u5f00\u59cb", None)) self.groupBox_advanced.setTitle(QCoreApplication.translate("MainWindow", u"\u9ad8\u7ea7\u8bbe\u7f6e", None)) self.label_driver.setText(QCoreApplication.translate("MainWindow", u"\u662f\u5426\u53f8\u673a", None)) @@ -729,8 +741,6 @@ def retranslateUi(self, MainWindow): self.label_numbers.setText(QCoreApplication.translate("MainWindow", u"\u6b21\u6570", None)) self.button_game_handle.setText(QCoreApplication.translate("MainWindow", u"\u6e38\u620f\u68c0\u6d4b", None)) self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab_home), QCoreApplication.translate("MainWindow", u"\u9996\u9875", None)) - self.label_tip_setting_restart.setText(QCoreApplication.translate("MainWindow", u"\u90e8\u5206\u8bbe\u7f6e\u9700\u8981\u91cd\u542f\u751f\u6548", None)) - self.groupBox_config.setTitle(QCoreApplication.translate("MainWindow", u"\u914d\u7f6e", None)) self.setting_update_label.setText(QCoreApplication.translate("MainWindow", u"\u66f4\u65b0\u6a21\u5f0f", None)) self.setting_update_download_label.setText(QCoreApplication.translate("MainWindow", u"\u4e0b\u8f7d\u7ebf\u8def", None)) self.setting_xuanshangfengyin_label.setText(QCoreApplication.translate("MainWindow", u"\u60ac\u8d4f\u5c01\u5370", None)) @@ -738,6 +748,7 @@ def retranslateUi(self, MainWindow): self.setting_shortcut_start_stop_label.setText(QCoreApplication.translate("MainWindow", u"\u5feb\u6377\u952e\uff1a\u5f00\u59cb/\u505c\u6b62", None)) self.setting_remember_last_choice_button.setText(QCoreApplication.translate("MainWindow", u"\u8bb0\u5fc6\u4e0a\u6b21\u6240\u9009\u529f\u80fd", None)) self.setting_backend_interaction_button.setText(QCoreApplication.translate("MainWindow", u"\u540e\u53f0\u4ea4\u4e92\uff08\u4ec5\u672c\u6b21\u751f\u6548\uff09", None)) + self.setting_win_toast_button.setText(QCoreApplication.translate("MainWindow", u"\u7cfb\u7edf\u901a\u77e5", None)) self.pushButton_homepage.setText(QCoreApplication.translate("MainWindow", u"\u9879\u76ee\u4e3b\u9875", None)) self.pushButton_helpdoc.setText(QCoreApplication.translate("MainWindow", u"\u4f7f\u7528\u6587\u6863", None)) self.button_restart.setText(QCoreApplication.translate("MainWindow", u"\u91cd\u542f", None)) diff --git a/src/ui/mainui.ui b/src/ui/mainui.ui index 084bf6a..1c6d05f 100644 --- a/src/ui/mainui.ui +++ b/src/ui/mainui.ui @@ -136,7 +136,7 @@ - + true @@ -158,17 +158,9 @@ - - - - 宋体 - - - - Qt::LayoutDirection::LeftToRight - + - 完成次数 + 完成情况 Qt::AlignmentFlag::AlignCenter @@ -972,22 +964,9 @@ 423 - - - - - 部分设置需要重启生效 - - - Qt::AlignmentFlag::AlignCenter - - - + - - 配置 - @@ -1006,12 +985,15 @@ + + + 120 + 0 + + 更新模式 - - Qt::AlignmentFlag::AlignCenter - @@ -1069,12 +1051,15 @@ + + + 120 + 0 + + 下载线路 - - Qt::AlignmentFlag::AlignCenter - @@ -1132,12 +1117,15 @@ + + + 120 + 0 + + 悬赏封印 - - Qt::AlignmentFlag::AlignCenter - @@ -1195,12 +1183,15 @@ + + + 120 + 0 + + 界面风格 - - Qt::AlignmentFlag::AlignCenter - @@ -1258,12 +1249,15 @@ + + + 120 + 0 + + 快捷键：开始/停止 - - Qt::AlignmentFlag::AlignCenter - @@ -1321,6 +1315,12 @@ + + + 160 + 0 + + 记忆上次所选功能 @@ -1358,6 +1358,12 @@ + + + 160 + 0 + + 后台交互（仅本次生效） @@ -1378,6 +1384,49 @@ + + + + + + Qt::Orientation::Horizontal + + + + 40 + 20 + + + + + + + + + 160 + 0 + + + + 系统通知 + + + + + + + Qt::Orientation::Horizontal + + + + 40 + 20 + + + + + + @@ -1492,13 +1541,13 @@ - - - - + - - + + + + + diff --git a/src/utils/config.py b/src/utils/config.py index 556cc9f..32c6ff6 100644 --- a/src/utils/config.py +++ b/src/utils/config.py @@ -10,8 +10,6 @@ """下载线路""" _xuanshangfengyin_list = ["接受", "拒绝", "忽略", "关闭"] """悬赏封印""" -_fight_theme_list = ["自动", "怀旧", "简约"] -"""战斗主题""" _window_style_list = ["Windows", "Fusion"] """界面风格""" _shortcut_start_stop_list = [ @@ -38,10 +36,10 @@ class DefaultConfig(BaseModel): update: list = _update_list update_download: list = _update_download_list xuanshangfengyin: list = _xuanshangfengyin_list - fight_theme: list = _fight_theme_list window_style: list = _window_style_list remember_last_choice: int = -1 shortcut_start_stop: list = _shortcut_start_stop_list + win_toast: bool = True class UserConfig(BaseModel): @@ -53,14 +51,14 @@ class UserConfig(BaseModel): """下载线路""" xuanshangfengyin: str = _xuanshangfengyin_list[0] """悬赏封印""" - fight_theme: str = _fight_theme_list[0] - """战斗主题""" window_style: str = _window_style_list[0] """界面风格""" remember_last_choice: int = -1 - """记忆上次所选功能 -1:关闭 0:开启 1-12:各项功能""" + """记忆上次所选功能 -1:关闭 0:开启 其他:各项功能""" shortcut_start_stop: str = _shortcut_start_stop_list[0] """快捷键-开始/停止""" + win_toast: bool = True + """系统通知""" class Config: diff --git a/src/utils/gui.py b/src/utils/gui.py index ebd4afa..ff640e7 100644 --- a/src/utils/gui.py +++ b/src/utils/gui.py @@ -162,6 +162,9 @@ def _init_settings(self): _status = config.user.model_dump().get("remember_last_choice") self.ui.setting_remember_last_choice_button.setChecked(_status != -1) + _status = config.user.model_dump().get("win_toast") + self.ui.setting_win_toast_button.setChecked(_status) + _restart_msg = "重启生效" self.ui.setting_update_comboBox.setToolTip(_restart_msg) self.ui.setting_update_download_comboBox.setToolTip(_restart_msg) @@ -176,7 +179,7 @@ def _init_signals(self): ms.main.qmessagbox_update.connect(self.qmessagbox_update_func) ms.main.ui_text_info_update.connect(self.ui_text_info_update_func) ms.main.is_fighting_update.connect(self.is_fighting) - ms.main.ui_text_completion_times_update.connect(self.ui_text_completion_times_update_func) + ms.main.ui_text_progress_update.connect(self.ui_text_progress_update_func) ms.main.sys_exit.connect(self.exit_func) ms.upgrade_new_version.show_ui.connect(self.show_upgrade_new_version_window) @@ -206,6 +209,7 @@ def _init_events(self): ) self.ui.setting_remember_last_choice_button.clicked.connect(self.setting_remember_last_choice_handle) self.ui.setting_backend_interaction_button.clicked.connect(self.setting_backend_interaction_handle) + self.ui.setting_win_toast_button.clicked.connect(self.setting_win_toast_handle) self.ui.button_restart.clicked.connect(self.app_restart_handle) self.ui.button_update_record.clicked.connect(self.show_update_record_window) @@ -304,13 +308,13 @@ def ui_text_info_update_func(self, msg: str, color: str) -> None: widget.moveCursor(QTextCursor.MoveOperation.End) widget.setTextColor("black") - def ui_text_completion_times_update_func(self, msg: str) -> None: - """输出内容至文本框`完成次数` + def ui_text_progress_update_func(self, msg: str) -> None: + """输出内容至文本框`完成情况` 参数: msg (str): 文本 """ - self.ui.text_completion_times.setText(msg) + self.ui.text_progress.setText(msg) def ui_spin_times_set_value_func(self, current: int = 1, min: int = 0, max: int = 99): widget = self.ui.spin_times @@ -469,6 +473,18 @@ def setting_backend_interaction_handle(self) -> None: logger.info(f"设置项：后台交互已更改为 {_text}") config.backend = _status + def setting_win_toast_handle(self) -> None: + """设置-系统通知-更改""" + flag = self.ui.setting_win_toast_button.isChecked() + if flag: + _text = "开启" + _status = True + else: + _text = "关闭" + _status = False + logger.info(f"设置项：系统通知已更改为 {_text}") + config.update("win_toast", _status) + def check_game_handle(self): return window.check_game_handle() @@ -593,7 +609,7 @@ def _app_start(self) -> None: return n = self.ui.spin_times.value() - self.ui.text_completion_times.clear() + self.ui.text_progress.clear() self.is_fighting(True) match self.game_function_choice: diff --git a/src/utils/log.py b/src/utils/log.py index 974e59f..4e316af 100644 --- a/src/utils/log.py +++ b/src/utils/log.py @@ -41,8 +41,8 @@ def scene(self, msg, *args, **kwargs): send_gui_msg(msg, "green") super()._log(logging.INFO, f"current scene: {msg}", args, **kwargs) - def num(self, msg, *args, **kwargs): # TODO remove and used in printbox - ms.main.ui_text_completion_times_update.emit(msg) # 输出至完成次数UI界面 + def progress(self, msg, *args, **kwargs): + ms.main.ui_text_progress_update.emit(str(msg)) # 输出至完成情况UI界面 super()._log(logging.INFO, f"done number: {msg}", args, **kwargs) @@ -83,9 +83,7 @@ def log_clean_up() -> bool: logger.error("Not found log dir.") return False for item in LOG_DIR_PATH.iterdir(): - log_date = date( - int(item.stem[-8:-4]), int(item.stem[-4:-2]), int(item.stem[-2:]) - ) + log_date = date(int(item.stem[-8:-4]), int(item.stem[-4:-2]), int(item.stem[-2:])) # 自动清理 if (today - log_date).days > 30: try: diff --git a/src/utils/mysignal.py b/src/utils/mysignal.py index 08d73f6..8484316 100644 --- a/src/utils/mysignal.py +++ b/src/utils/mysignal.py @@ -1,4 +1,3 @@ -"""自定义信号""" from PySide6.QtCore import QObject, Signal @@ -18,6 +17,7 @@ def __init__(self) -> None: class Main(QObject): """主界面""" + qmessagbox_update = Signal(str, str) """弹窗更新 @@ -40,8 +40,8 @@ class Main(QObject): """ is_fighting_update = Signal(bool) """运行状态更新""" - ui_text_completion_times_update = Signal(str) - """完成次数更新""" + ui_text_progress_update = Signal(str) + """完成情况更新""" key_pressed = Signal(str) """按键按下""" sys_exit = Signal() @@ -49,6 +49,7 @@ class Main(QObject): class UpdateRecord(QObject): """更新记录""" + text_update = Signal(str) """更新文本""" text_markdown_update = Signal(str) @@ -56,6 +57,7 @@ class UpdateRecord(QObject): class UpgradeNewVersion(QObject): """更新新版本""" + text_update = Signal(str) """更新文本""" text_insert = Signal(str) diff --git a/src/utils/toast.py b/src/utils/toast.py index 9b21de9..61c3ab9 100644 --- a/src/utils/toast.py +++ b/src/utils/toast.py @@ -1,14 +1,16 @@ -"""系统通知""" from threading import Thread + from win11toast import toast as win_toast +from .application import APP_NAME +from .config import config +from .log import logger + def toast(*args, **kwargs): - kwargs.setdefault("app_id", "Onmyoji_Python") - Thread( - target=win_toast, - name="thread_toast", - args=args, - kwargs=kwargs, - daemon=True - ).start() + if config.user.win_toast: + logger.info("Toast is enabled.") + kwargs.setdefault("app_id", APP_NAME) + Thread(target=win_toast, name="thread_toast", args=args, kwargs=kwargs, daemon=True).start() + else: + logger.info("Toast is disabled.")