From 4aeca08ce8daeae5102d258b675043397d48f7c7 Mon Sep 17 00:00:00 2001 From: KenanZhu <3471685733@qq.com> Date: Sat, 21 Feb 2026 23:18:17 +0800 Subject: [PATCH] =?UTF-8?q?chore(ALMainWindow,=20ALMainWorkers):=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=9F=E4=B8=80=E9=83=A8=E5=88=86=E5=87=BD?= =?UTF-8?q?=E6=95=B0=E5=92=8C=E5=8F=98=E9=87=8F=E7=9A=84=E5=91=BD=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/gui/ALMainWindow.py | 58 +++++++++---------- src/gui/ALMainWorkers.py | 22 +++---- src/gui/resources/ui/ALMainWindow.ui | 2 +- .../resources/ui/ALTimerTaskManageWidget.ui | 2 +- 4 files changed, 42 insertions(+), 42 deletions(-) diff --git a/src/gui/ALMainWindow.py b/src/gui/ALMainWindow.py index de70943..07920d1 100644 --- a/src/gui/ALMainWindow.py +++ b/src/gui/ALMainWindow.py @@ -53,7 +53,7 @@ class ALMainWindow(MsgBase, QMainWindow, Ui_ALMainWindow): "user": QDir.toNativeSeparators(exectuable_dir.absoluteFilePath("user.json")), "timer_task": QDir.toNativeSeparators(exectuable_dir.absoluteFilePath("timer_task.json")), } - self.__alTimerTaskWidget = None + self.__alTimerTaskManageWidget = None self.__alConfigWidget = None self.__auto_lib_thread = None self.__current_timer_task_thread = None @@ -79,23 +79,23 @@ class ALMainWindow(MsgBase, QMainWindow, Ui_ALMainWindow): # initialize timer task widget, but not show it try: - self.__alTimerTaskWidget = ALTimerTaskManageWidget(self, self.__config_paths["timer_task"]) + self.__alTimerTaskManageWidget = ALTimerTaskManageWidget(self, self.__config_paths["timer_task"]) except Exception as e: QMessageBox.critical( self, "错误 - AutoLibrary", f"初始化定时任务功能失败: \n{e}" ) - self.__alTimerTaskWidget = None - self.TimerTaskWidgetButton.setEnabled(False) - self.TimerTaskWidgetButton.setToolTip("定时任务功能初始化失败, 请检查配置文件。") + self.__alTimerTaskManageWidget = None + self.TimerTaskManageWidgetButton.setEnabled(False) + self.TimerTaskManageWidgetButton.setToolTip("定时任务功能初始化失败, 请检查配置文件。") return - self.timerTaskIsRunning.connect(self.__alTimerTaskWidget.onTimerTaskIsRunning) - self.timerTaskIsExecuted.connect(self.__alTimerTaskWidget.onTimerTaskIsExecuted) - self.timerTaskIsError.connect(self.__alTimerTaskWidget.onTimerTaskIsError) - self.__alTimerTaskWidget.timerTaskIsReady.connect(self.onTimerTaskIsReady) - self.__alTimerTaskWidget.timerTaskManageWidgetIsClosed.connect(self.onTimerTaskWidgetClosed) - self.__alTimerTaskWidget.setWindowFlags(Qt.WindowType.Window|Qt.WindowType.WindowCloseButtonHint) + self.timerTaskIsRunning.connect(self.__alTimerTaskManageWidget.onTimerTaskIsRunning) + self.timerTaskIsExecuted.connect(self.__alTimerTaskManageWidget.onTimerTaskIsExecuted) + self.timerTaskIsError.connect(self.__alTimerTaskManageWidget.onTimerTaskIsError) + self.__alTimerTaskManageWidget.timerTaskIsReady.connect(self.onTimerTaskIsReady) + self.__alTimerTaskManageWidget.timerTaskManageWidgetIsClosed.connect(self.onTimerTaskManageWidgetClosed) + self.__alTimerTaskManageWidget.setWindowFlags(Qt.WindowType.Window|Qt.WindowType.WindowCloseButtonHint) def onAboutActionTriggered( @@ -128,7 +128,7 @@ class ALMainWindow(MsgBase, QMainWindow, Ui_ALMainWindow): self.TrayMenu = QMenu() self.TrayMenu.addAction("显示主窗口", self.showNormal) - self.TrayMenu.addAction("显示定时窗口", self.onTimerTaskWidgetButtonClicked) + self.TrayMenu.addAction("显示定时窗口", self.onTimerTaskManageWidgetButtonClicked) self.TrayMenu.addAction("最小化到托盘", self.hideToTray) self.TrayMenu.addSeparator() self.TrayMenu.addAction("退出", self.close) @@ -166,7 +166,7 @@ class ALMainWindow(MsgBase, QMainWindow, Ui_ALMainWindow): ): self.ConfigButton.clicked.connect(self.onConfigButtonClicked) - self.TimerTaskWidgetButton.clicked.connect(self.onTimerTaskWidgetButtonClicked) + self.TimerTaskManageWidgetButton.clicked.connect(self.onTimerTaskManageWidgetButtonClicked) self.StartButton.clicked.connect(self.onStartButtonClicked) self.StopButton.clicked.connect(self.onStopButtonClicked) self.SendButton.clicked.connect(self.onSendButtonClicked) @@ -185,9 +185,9 @@ class ALMainWindow(MsgBase, QMainWindow, Ui_ALMainWindow): if self.__is_running_timer_task: self.__current_timer_task_thread.wait(2000) self.__current_timer_task_thread.deleteLater() - if self.__alTimerTaskWidget: - self.__alTimerTaskWidget.close() - self.__alTimerTaskWidget.deleteLater() + if self.__alTimerTaskManageWidget: + self.__alTimerTaskManageWidget.close() + self.__alTimerTaskManageWidget.deleteLater() if self.__alConfigWidget: self.__alConfigWidget.close() # the config widget is already deleted in the 'self.onConfigWidgetClosed' @@ -253,7 +253,7 @@ class ALMainWindow(MsgBase, QMainWindow, Ui_ALMainWindow): self._output_queue, self.__config_paths ) - self.__current_timer_task_thread.TimerTaskWorkerIsFinished.connect(self.onTimerTaskFinished) + self.__current_timer_task_thread.timerTaskWorkerIsFinished.connect(self.onTimerTaskFinished) self.__current_timer_task_thread.start() except queue.Empty: self.__is_running_timer_task = False @@ -288,11 +288,11 @@ class ALMainWindow(MsgBase, QMainWindow, Ui_ALMainWindow): pass @Slot() - def onTimerTaskWidgetClosed( + def onTimerTaskManageWidgetClosed( self ): - self.TimerTaskWidgetButton.setEnabled(True) + self.TimerTaskManageWidgetButton.setEnabled(True) @Slot(dict) def onConfigWidgetClosed( @@ -323,7 +323,7 @@ class ALMainWindow(MsgBase, QMainWindow, Ui_ALMainWindow): ): self.__current_timer_task_thread.wait(1000) - self.__current_timer_task_thread.TimerTaskWorkerIsFinished.disconnect(self.onTimerTaskFinished) + self.__current_timer_task_thread.timerTaskWorkerIsFinished.disconnect(self.onTimerTaskFinished) self.__current_timer_task_thread.deleteLater() self.__current_timer_task_thread = None self.setControlButtons(None, False, True) @@ -345,14 +345,14 @@ class ALMainWindow(MsgBase, QMainWindow, Ui_ALMainWindow): self.timerTaskIsError.emit(timer_task) @Slot() - def onTimerTaskWidgetButtonClicked( + def onTimerTaskManageWidgetButtonClicked( self ): - self.__alTimerTaskWidget.show() - self.__alTimerTaskWidget.raise_() - self.__alTimerTaskWidget.activateWindow() - self.TimerTaskWidgetButton.setEnabled(False) + self.__alTimerTaskManageWidget.show() + self.__alTimerTaskManageWidget.raise_() + self.__alTimerTaskManageWidget.activateWindow() + self.TimerTaskManageWidgetButton.setEnabled(False) @Slot() def onConfigButtonClicked( @@ -382,8 +382,8 @@ class ALMainWindow(MsgBase, QMainWindow, Ui_ALMainWindow): self._output_queue, self.__config_paths ) - self.__auto_lib_thread.AutoLibWorkerIsFinished.connect(self.onStopButtonClicked) - self.__auto_lib_thread.AutoLibWorkerFinishedWithError.connect(self.onStopButtonClicked) + self.__auto_lib_thread.autoLibWorkerIsFinished.connect(self.onStopButtonClicked) + self.__auto_lib_thread.autoLibWorkerFinishedWithError.connect(self.onStopButtonClicked) self.__auto_lib_thread.start() @Slot() @@ -395,8 +395,8 @@ class ALMainWindow(MsgBase, QMainWindow, Ui_ALMainWindow): self._showTrace("正在停止操作......") self.__auto_lib_thread.wait(2000) self._showTrace("操作已停止") - self.__auto_lib_thread.AutoLibWorkerIsFinished.disconnect(self.onStopButtonClicked) - self.__auto_lib_thread.AutoLibWorkerFinishedWithError.disconnect(self.onStopButtonClicked) + self.__auto_lib_thread.autoLibWorkerIsFinished.disconnect(self.onStopButtonClicked) + self.__auto_lib_thread.autoLibWorkerFinishedWithError.disconnect(self.onStopButtonClicked) self.__auto_lib_thread.deleteLater() self.__auto_lib_thread = None self.setControlButtons(None, False, True) diff --git a/src/gui/ALMainWorkers.py b/src/gui/ALMainWorkers.py index 1b9af6f..3913407 100644 --- a/src/gui/ALMainWorkers.py +++ b/src/gui/ALMainWorkers.py @@ -22,8 +22,8 @@ from utils.ConfigReader import ConfigReader class AutoLibWorker(MsgBase, QThread): - AutoLibWorkerIsFinished = Signal() - AutoLibWorkerFinishedWithError = Signal() + autoLibWorkerIsFinished = Signal() + autoLibWorkerFinishedWithError = Signal() def __init__( self, @@ -116,17 +116,17 @@ class AutoLibWorker(MsgBase, QThread): ) except Exception as e: self._showTrace(f"AutoLibrary 运行时发生异常 : {e}") - self.AutoLibWorkerFinishedWithError.emit() + self.autoLibWorkerFinishedWithError.emit() return if auto_lib: auto_lib.close() self._showTrace("AutoLibrary 运行结束") - self.AutoLibWorkerIsFinished.emit() + self.autoLibWorkerIsFinished.emit() class TimerTaskWorker(AutoLibWorker): - TimerTaskWorkerIsFinished = Signal(bool, dict) + timerTaskWorkerIsFinished = Signal(bool, dict) def __init__( self, @@ -137,10 +137,10 @@ class TimerTaskWorker(AutoLibWorker): ): super().__init__(input_queue, output_queue, config_paths) - self.__timer_task = timer_task - self.AutoLibWorkerIsFinished.connect(self.onTimerTaskIsFinished) - self.AutoLibWorkerFinishedWithError.connect(self.onTimerTaskIsError) + + self.autoLibWorkerIsFinished.connect(self.onTimerTaskIsFinished) + self.autoLibWorkerFinishedWithError.connect(self.onTimerTaskFinishedWithError) def run( self @@ -150,12 +150,12 @@ class TimerTaskWorker(AutoLibWorker): super().run() @Slot() - def onTimerTaskIsError( + def onTimerTaskFinishedWithError( self ): self._showTrace(f"定时任务 {self.__timer_task['name']} 运行时发生异常") - self.TimerTaskWorkerIsFinished.emit(True, self.__timer_task) + self.timerTaskWorkerIsFinished.emit(True, self.__timer_task) @Slot() def onTimerTaskIsFinished( @@ -163,4 +163,4 @@ class TimerTaskWorker(AutoLibWorker): ): self._showTrace(f"定时任务 {self.__timer_task['name']} 运行结束") - self.TimerTaskWorkerIsFinished.emit(False, self.__timer_task) + self.timerTaskWorkerIsFinished.emit(False, self.__timer_task) diff --git a/src/gui/resources/ui/ALMainWindow.ui b/src/gui/resources/ui/ALMainWindow.ui index 316f08a..c210a8b 100644 --- a/src/gui/resources/ui/ALMainWindow.ui +++ b/src/gui/resources/ui/ALMainWindow.ui @@ -51,7 +51,7 @@ 5 - + 25 diff --git a/src/gui/resources/ui/ALTimerTaskManageWidget.ui b/src/gui/resources/ui/ALTimerTaskManageWidget.ui index 4ab632b..85daedf 100644 --- a/src/gui/resources/ui/ALTimerTaskManageWidget.ui +++ b/src/gui/resources/ui/ALTimerTaskManageWidget.ui @@ -25,7 +25,7 @@ 定时任务管理 - AutoLibrary - + 5