KenanZhu/AutoLibrary
1
1
Fork 0
mirror of https://github.com/KenanZhu/AutoLibrary.git synced 2026-06-18 07:23:03 +08:00
Code Issues Projects Activity

chore(ALMainWindow, ALMainWorkers): 修改统一部分函数和变量的命名

Browse Source
This commit is contained in:
KenanZhu
2026-02-21 23:18:17 +08:00
parent a1ff85256a
commit 4aeca08ce8
4 changed files with 42 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/ALMainWindow.py
+29 -29
View File
@@ -53,7 +53,7 @@ class ALMainWindow(MsgBase, QMainWindow, Ui_ALMainWindow):
"user": QDir.toNativeSeparators(exectuable_dir.absoluteFilePath("user.json")), "user": QDir.toNativeSeparators(exectuable_dir.absoluteFilePath("user.json")),
"timer_task": QDir.toNativeSeparators(exectuable_dir.absoluteFilePath("timer_task.json")), "timer_task": QDir.toNativeSeparators(exectuable_dir.absoluteFilePath("timer_task.json")),
} }
self.__alTimerTaskWidget = None self.__alTimerTaskManageWidget = None
self.__alConfigWidget = None self.__alConfigWidget = None
self.__auto_lib_thread = None self.__auto_lib_thread = None
self.__current_timer_task_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 # initialize timer task widget, but not show it
try: try:
self.__alTimerTaskWidget = ALTimerTaskManageWidget(self, self.__config_paths["timer_task"]) self.__alTimerTaskManageWidget = ALTimerTaskManageWidget(self, self.__config_paths["timer_task"])
except Exception as e: except Exception as e:
QMessageBox.critical( QMessageBox.critical(
self, self,
"错误 - AutoLibrary", "错误 - AutoLibrary",
f"初始化定时任务功能失败: \n{e}" f"初始化定时任务功能失败: \n{e}"
) )
self.__alTimerTaskWidget = None self.__alTimerTaskManageWidget = None
self.TimerTaskWidgetButton.setEnabled(False) self.TimerTaskManageWidgetButton.setEnabled(False)
self.TimerTaskWidgetButton.setToolTip("定时任务功能初始化失败, 请检查配置文件。") self.TimerTaskManageWidgetButton.setToolTip("定时任务功能初始化失败, 请检查配置文件。")
return return
self.timerTaskIsRunning.connect(self.__alTimerTaskWidget.onTimerTaskIsRunning) self.timerTaskIsRunning.connect(self.__alTimerTaskManageWidget.onTimerTaskIsRunning)
self.timerTaskIsExecuted.connect(self.__alTimerTaskWidget.onTimerTaskIsExecuted) self.timerTaskIsExecuted.connect(self.__alTimerTaskManageWidget.onTimerTaskIsExecuted)
self.timerTaskIsError.connect(self.__alTimerTaskWidget.onTimerTaskIsError) self.timerTaskIsError.connect(self.__alTimerTaskManageWidget.onTimerTaskIsError)
self.__alTimerTaskWidget.timerTaskIsReady.connect(self.onTimerTaskIsReady) self.__alTimerTaskManageWidget.timerTaskIsReady.connect(self.onTimerTaskIsReady)
self.__alTimerTaskWidget.timerTaskManageWidgetIsClosed.connect(self.onTimerTaskWidgetClosed) self.__alTimerTaskManageWidget.timerTaskManageWidgetIsClosed.connect(self.onTimerTaskManageWidgetClosed)
self.__alTimerTaskWidget.setWindowFlags(Qt.WindowType.Window|Qt.WindowType.WindowCloseButtonHint) self.__alTimerTaskManageWidget.setWindowFlags(Qt.WindowType.Window|Qt.WindowType.WindowCloseButtonHint)
def onAboutActionTriggered( def onAboutActionTriggered(
@@ -128,7 +128,7 @@ class ALMainWindow(MsgBase, QMainWindow, Ui_ALMainWindow):
self.TrayMenu = QMenu() self.TrayMenu = QMenu()
self.TrayMenu.addAction("显示主窗口", self.showNormal) self.TrayMenu.addAction("显示主窗口", self.showNormal)
self.TrayMenu.addAction("显示定时窗口", self.onTimerTaskWidgetButtonClicked) self.TrayMenu.addAction("显示定时窗口", self.onTimerTaskManageWidgetButtonClicked)
self.TrayMenu.addAction("最小化到托盘", self.hideToTray) self.TrayMenu.addAction("最小化到托盘", self.hideToTray)
self.TrayMenu.addSeparator() self.TrayMenu.addSeparator()
self.TrayMenu.addAction("退出", self.close) self.TrayMenu.addAction("退出", self.close)
@@ -166,7 +166,7 @@ class ALMainWindow(MsgBase, QMainWindow, Ui_ALMainWindow):
): ):
self.ConfigButton.clicked.connect(self.onConfigButtonClicked) 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.StartButton.clicked.connect(self.onStartButtonClicked)
self.StopButton.clicked.connect(self.onStopButtonClicked) self.StopButton.clicked.connect(self.onStopButtonClicked)
self.SendButton.clicked.connect(self.onSendButtonClicked) self.SendButton.clicked.connect(self.onSendButtonClicked)
@@ -185,9 +185,9 @@ class ALMainWindow(MsgBase, QMainWindow, Ui_ALMainWindow):
if self.__is_running_timer_task: if self.__is_running_timer_task:
self.__current_timer_task_thread.wait(2000) self.__current_timer_task_thread.wait(2000)
self.__current_timer_task_thread.deleteLater() self.__current_timer_task_thread.deleteLater()
if self.__alTimerTaskWidget: if self.__alTimerTaskManageWidget:
self.__alTimerTaskWidget.close() self.__alTimerTaskManageWidget.close()
self.__alTimerTaskWidget.deleteLater() self.__alTimerTaskManageWidget.deleteLater()
if self.__alConfigWidget: if self.__alConfigWidget:
self.__alConfigWidget.close() self.__alConfigWidget.close()
# the config widget is already deleted in the 'self.onConfigWidgetClosed' # the config widget is already deleted in the 'self.onConfigWidgetClosed'
@@ -253,7 +253,7 @@ class ALMainWindow(MsgBase, QMainWindow, Ui_ALMainWindow):
self._output_queue, self._output_queue,
self.__config_paths 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() self.__current_timer_task_thread.start()
except queue.Empty: except queue.Empty:
self.__is_running_timer_task = False self.__is_running_timer_task = False
@@ -288,11 +288,11 @@ class ALMainWindow(MsgBase, QMainWindow, Ui_ALMainWindow):
pass pass
@Slot() @Slot()
def onTimerTaskWidgetClosed( def onTimerTaskManageWidgetClosed(
self self
): ):
self.TimerTaskWidgetButton.setEnabled(True) self.TimerTaskManageWidgetButton.setEnabled(True)
@Slot(dict) @Slot(dict)
def onConfigWidgetClosed( def onConfigWidgetClosed(
@@ -323,7 +323,7 @@ class ALMainWindow(MsgBase, QMainWindow, Ui_ALMainWindow):
): ):
self.__current_timer_task_thread.wait(1000) 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.deleteLater()
self.__current_timer_task_thread = None self.__current_timer_task_thread = None
self.setControlButtons(None, False, True) self.setControlButtons(None, False, True)
@@ -345,14 +345,14 @@ class ALMainWindow(MsgBase, QMainWindow, Ui_ALMainWindow):
self.timerTaskIsError.emit(timer_task) self.timerTaskIsError.emit(timer_task)
@Slot() @Slot()
def onTimerTaskWidgetButtonClicked( def onTimerTaskManageWidgetButtonClicked(
self self
): ):
self.__alTimerTaskWidget.show() self.__alTimerTaskManageWidget.show()
self.__alTimerTaskWidget.raise_() self.__alTimerTaskManageWidget.raise_()
self.__alTimerTaskWidget.activateWindow() self.__alTimerTaskManageWidget.activateWindow()
self.TimerTaskWidgetButton.setEnabled(False) self.TimerTaskManageWidgetButton.setEnabled(False)
@Slot() @Slot()
def onConfigButtonClicked( def onConfigButtonClicked(
@@ -382,8 +382,8 @@ class ALMainWindow(MsgBase, QMainWindow, Ui_ALMainWindow):
self._output_queue, self._output_queue,
self.__config_paths self.__config_paths
) )
self.__auto_lib_thread.AutoLibWorkerIsFinished.connect(self.onStopButtonClicked) self.__auto_lib_thread.autoLibWorkerIsFinished.connect(self.onStopButtonClicked)
self.__auto_lib_thread.AutoLibWorkerFinishedWithError.connect(self.onStopButtonClicked) self.__auto_lib_thread.autoLibWorkerFinishedWithError.connect(self.onStopButtonClicked)
self.__auto_lib_thread.start() self.__auto_lib_thread.start()
@Slot() @Slot()
@@ -395,8 +395,8 @@ class ALMainWindow(MsgBase, QMainWindow, Ui_ALMainWindow):
self._showTrace("正在停止操作......") self._showTrace("正在停止操作......")
self.__auto_lib_thread.wait(2000) self.__auto_lib_thread.wait(2000)
self._showTrace("操作已停止") self._showTrace("操作已停止")
self.__auto_lib_thread.AutoLibWorkerIsFinished.disconnect(self.onStopButtonClicked) self.__auto_lib_thread.autoLibWorkerIsFinished.disconnect(self.onStopButtonClicked)
self.__auto_lib_thread.AutoLibWorkerFinishedWithError.disconnect(self.onStopButtonClicked) self.__auto_lib_thread.autoLibWorkerFinishedWithError.disconnect(self.onStopButtonClicked)
self.__auto_lib_thread.deleteLater() self.__auto_lib_thread.deleteLater()
self.__auto_lib_thread = None self.__auto_lib_thread = None
self.setControlButtons(None, False, True) self.setControlButtons(None, False, True)
src/gui/ALMainWorkers.py
+11 -11
View File
@@ -22,8 +22,8 @@ from utils.ConfigReader import ConfigReader
class AutoLibWorker(MsgBase, QThread): class AutoLibWorker(MsgBase, QThread):
AutoLibWorkerIsFinished = Signal() autoLibWorkerIsFinished = Signal()
AutoLibWorkerFinishedWithError = Signal() autoLibWorkerFinishedWithError = Signal()
def __init__( def __init__(
self, self,
@@ -116,17 +116,17 @@ class AutoLibWorker(MsgBase, QThread):
) )
except Exception as e: except Exception as e:
self._showTrace(f"AutoLibrary 运行时发生异常 : {e}") self._showTrace(f"AutoLibrary 运行时发生异常 : {e}")
self.AutoLibWorkerFinishedWithError.emit() self.autoLibWorkerFinishedWithError.emit()
return return
if auto_lib: if auto_lib:
auto_lib.close() auto_lib.close()
self._showTrace("AutoLibrary 运行结束") self._showTrace("AutoLibrary 运行结束")
self.AutoLibWorkerIsFinished.emit() self.autoLibWorkerIsFinished.emit()
class TimerTaskWorker(AutoLibWorker): class TimerTaskWorker(AutoLibWorker):
TimerTaskWorkerIsFinished = Signal(bool, dict) timerTaskWorkerIsFinished = Signal(bool, dict)
def __init__( def __init__(
self, self,
@@ -137,10 +137,10 @@ class TimerTaskWorker(AutoLibWorker):
): ):
super().__init__(input_queue, output_queue, config_paths) super().__init__(input_queue, output_queue, config_paths)
self.__timer_task = timer_task 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( def run(
self self
@@ -150,12 +150,12 @@ class TimerTaskWorker(AutoLibWorker):
super().run() super().run()
@Slot() @Slot()
def onTimerTaskIsError( def onTimerTaskFinishedWithError(
self self
): ):
self._showTrace(f"定时任务 {self.__timer_task['name']} 运行时发生异常") self._showTrace(f"定时任务 {self.__timer_task['name']} 运行时发生异常")
self.TimerTaskWorkerIsFinished.emit(True, self.__timer_task) self.timerTaskWorkerIsFinished.emit(True, self.__timer_task)
@Slot() @Slot()
def onTimerTaskIsFinished( def onTimerTaskIsFinished(
@@ -163,4 +163,4 @@ class TimerTaskWorker(AutoLibWorker):
): ):
self._showTrace(f"定时任务 {self.__timer_task['name']} 运行结束") self._showTrace(f"定时任务 {self.__timer_task['name']} 运行结束")
self.TimerTaskWorkerIsFinished.emit(False, self.__timer_task) self.timerTaskWorkerIsFinished.emit(False, self.__timer_task)
src/gui/resources/ui/ALMainWindow.ui
+1 -1
View File
@@ -51,7 +51,7 @@
<number>5</number> <number>5</number>
</property> </property>
<item> <item>
<widget class="QPushButton" name="TimerTaskWidgetButton"> <widget class="QPushButton" name="TimerTaskManageWidgetButton">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>25</width> <width>25</width>
src/gui/resources/ui/ALTimerTaskManageWidget.ui
+1 -1
View File
@@ -25,7 +25,7 @@
<property name="windowTitle"> <property name="windowTitle">
<string>定时任务管理 - AutoLibrary</string> <string>定时任务管理 - AutoLibrary</string>
</property> </property>
<layout class="QVBoxLayout" name="ALTimerTaskWidgetLayout"> <layout class="QVBoxLayout" name="ALTimerTaskManageWidgetLayout">
<property name="spacing"> <property name="spacing">
<number>5</number> <number>5</number>
</property> </property>