chore(*): 更改一些界面类方法，局部变量和信号的命名：

(ALConfigWidget):
def initlizeDefaultConfigPaths() 中 script_path 和 script_dir 分别改为 executable_path 和 executable_dir
def fillUserTree() 更改为 def setUsersToTreeWidget()
def collectUserFromUserInfoWidget() 更改为 def collectUserFromWidget()
def collectUserConfigFromUserTreeWidget 更改为 def collectUsersFromTreeWidget()
交换了一些方法的位置

(ALSeatMapSelectDialog):
信号 seatMapSelectDialogClosed 改为 seatMapSelectDialogIsClosed

(ALTimerTaskManageWidget):
信号 timerTaskManageWidgetClosed 改为 timerTaskManageWidgetIsClosed

(ALMainWindow):
def __init__() 中 script_path 和 script_dir 分别改为 executable_path 和 executable_dir
更改 ALSeatMapSelectDialog 和 ALTimerTaskManageWidget 中相关的信号命名

src/gui/ALConfigWidget.py

@@ -166,11 +166,11 @@ class ALConfigWidget(QWidget, Ui_ALConfigWidget):
         self
     ):
 
-        script_path = sys.executable
+        executable_path = sys.executable
-        script_dir = QFileInfo(script_path).absoluteDir()
+        executable_dir = QFileInfo(executable_path).absoluteDir()
         self.__default_config_paths = {
-            "user": QDir.toNativeSeparators(script_dir.absoluteFilePath("user.json")),
+            "user": QDir.toNativeSeparators(executable_dir.absoluteFilePath("user.json")),
-            "run": QDir.toNativeSeparators(script_dir.absoluteFilePath("run.json"))
+            "run": QDir.toNativeSeparators(executable_dir.absoluteFilePath("run.json"))
         }
 
 
@@ -185,7 +185,7 @@ class ALConfigWidget(QWidget, Ui_ALConfigWidget):
             self.CurrentRunConfigEdit.setText(self.__config_paths["run"])
         elif which == "user":
             self.initilizeUserInfoWidget()
-            self.fillUserTree(config_data)
+            self.setUsersToTreeWidget(config_data)
             self.CurrentUserConfigEdit.setText(self.__config_paths["user"])
 
 
@@ -362,7 +362,7 @@ class ALConfigWidget(QWidget, Ui_ALConfigWidget):
         self.PreferLateRenewTimeCheckBox.setChecked(False)
 
 
-    def collectUserFromUserInfoWidget(
+    def collectUserFromWidget(
         self
     ) -> dict:
 
@@ -395,7 +395,7 @@ class ALConfigWidget(QWidget, Ui_ALConfigWidget):
         return user
 
 
-    def collectUserConfigFromUserTreeWidget(
+    def collectUsersFromTreeWidget(
         self
     ) -> dict:
 
@@ -451,6 +451,32 @@ class ALConfigWidget(QWidget, Ui_ALConfigWidget):
             )
 
 
+    def setUsersToTreeWidget(
+        self,
+        users: dict
+    ):
+
+        self.UserTreeWidget.clear()
+        self.UserTreeWidget.itemChanged.disconnect(self.onUserTreeWidgetItemChanged)
+        try:
+            if "groups" in users:
+                for group_config in users["groups"]:
+                    group_item = QTreeWidgetItem(self.UserTreeWidget, ALUserTreeItemType.GROUP.value)
+                    group_item.setText(0, group_config["name"])
+                    group_item.setFlags(group_item.flags() | Qt.ItemIsEditable)
+                    group_item.setCheckState(1, Qt.Checked if group_config.get("enabled", True) else Qt.Unchecked)
+                    for user_config in group_config["users"]:
+                        user_item = QTreeWidgetItem(group_item, ALUserTreeItemType.USER.value)
+                        user_item.setText(0, user_config["username"])
+                        user_item.setText(1, "" if user_config.get("enabled", True) else "跳过")
+                        user_item.setData(0, Qt.UserRole, user_config)
+                        user_item.setCheckState(1, Qt.Checked if user_config.get("enabled", True) else Qt.Unchecked)
+                        user_item.setDisabled(not group_config.get("enabled", True))
+                    group_item.setExpanded(True)
+        finally:
+            self.UserTreeWidget.itemChanged.connect(self.onUserTreeWidgetItemChanged)
+
+
     def loadRunConfig(
         self,
         run_config_path: str
@@ -562,7 +588,7 @@ class ALConfigWidget(QWidget, Ui_ALConfigWidget):
     ) -> bool:
 
         if user_config_path:
-            self.__config_data["user"] = self.collectUserConfigFromUserTreeWidget()
+            self.__config_data["user"] = self.collectUsersFromTreeWidget()
             if not self.saveUserConfig(
                 user_config_path,
                 self.__config_data["user"]
@@ -601,38 +627,12 @@ class ALConfigWidget(QWidget, Ui_ALConfigWidget):
                 return True
             if user_config is not None:
                 self.__config_data["user"].update(user_config)
-                self.fillUserTree(self.__config_data["user"])
+                self.setUsersToTreeWidget(self.__config_data["user"])
                 return True
         except:
             return False
 
 
-    def fillUserTree(
-        self,
-        user_config_data: dict
-    ):
-
-        self.UserTreeWidget.clear()
-        self.UserTreeWidget.itemChanged.disconnect(self.onUserTreeWidgetItemChanged)
-        try:
-            if "groups" in user_config_data:
-                for group_config in user_config_data["groups"]:
-                    group_item = QTreeWidgetItem(self.UserTreeWidget, ALUserTreeItemType.GROUP.value)
-                    group_item.setText(0, group_config["name"])
-                    group_item.setFlags(group_item.flags() | Qt.ItemIsEditable)
-                    group_item.setCheckState(1, Qt.Checked if group_config.get("enabled", True) else Qt.Unchecked)
-                    for user_config in group_config["users"]:
-                        user_item = QTreeWidgetItem(group_item, ALUserTreeItemType.USER.value)
-                        user_item.setText(0, user_config["username"])
-                        user_item.setText(1, "" if user_config.get("enabled", True) else "跳过")
-                        user_item.setData(0, Qt.UserRole, user_config)
-                        user_item.setCheckState(1, Qt.Checked if user_config.get("enabled", True) else Qt.Unchecked)
-                        user_item.setDisabled(not group_config.get("enabled", True))
-                    group_item.setExpanded(True)
-        finally:
-            self.UserTreeWidget.itemChanged.connect(self.onUserTreeWidgetItemChanged)
-
-
     def addGroup(
         self,
         group_name: str = ""
@@ -650,6 +650,19 @@ class ALConfigWidget(QWidget, Ui_ALConfigWidget):
         return group_item
 
 
+    def delGroup(
+        self,
+        group_item: QTreeWidgetItem = None
+    ):
+
+        if group_item is None:
+            return
+        if group_item.type() != ALUserTreeItemType.GROUP.value:
+            return
+        index = self.UserTreeWidget.indexOfTopLevelItem(group_item)
+        self.UserTreeWidget.takeTopLevelItem(index)
+
+
     def addUser(
         self,
         group_item: QTreeWidgetItem = None
@@ -721,19 +734,6 @@ class ALConfigWidget(QWidget, Ui_ALConfigWidget):
             self.UserTreeWidget.setCurrentItem(None)
 
 
-    def delGroup(
-        self,
-        group_item: QTreeWidgetItem = None
-    ):
-
-        if group_item is None:
-            return
-        if group_item.type() != ALUserTreeItemType.GROUP.value:
-            return
-        index = self.UserTreeWidget.indexOfTopLevelItem(group_item)
-        self.UserTreeWidget.takeTopLevelItem(index)
-
-
     def renameItem(
         self,
         item: QTreeWidgetItem,
@@ -762,7 +762,6 @@ class ALConfigWidget(QWidget, Ui_ALConfigWidget):
             item.setData(0, Qt.UserRole, user)
             self.setUserToWidget(user)
 
-
     @Slot()
     def onShowPasswordCheckBoxChecked(
         self,
@@ -818,7 +817,7 @@ class ALConfigWidget(QWidget, Ui_ALConfigWidget):
         # possiblity of frequency edit. we just let the QListWidget
         # help us.
         if previous and previous.type() == ALUserTreeItemType.USER.value:
-            user = self.collectUserFromUserInfoWidget()
+            user = self.collectUserFromWidget()
             if user:
                 self.UsernameEdit.textEdited.disconnect()
                 user["enabled"] = previous.checkState(1) == Qt.Checked

src/gui/ALMainWindow.py

@@ -34,6 +34,7 @@ from gui.resources import ALResource
 
 class ALMainWindow(MsgBase, QMainWindow, Ui_ALMainWindow):
 
+    # signal : timer task
     timerTaskIsRunning = Signal(dict)
     timerTaskIsExecuted = Signal(dict)
     timerTaskIsError = Signal(dict)
@@ -45,12 +46,12 @@ class ALMainWindow(MsgBase, QMainWindow, Ui_ALMainWindow):
         MsgBase.__init__(self, queue.Queue(), queue.Queue())
         QMainWindow.__init__(self)
         self.__timer_task_queue = queue.Queue()
-        script_path = sys.executable
+        executable_path = sys.executable
-        script_dir = QFileInfo(script_path).absoluteDir()
+        exectuable_dir = QFileInfo(executable_path).absoluteDir()
         self.__config_paths = {
-            "run":   QDir.toNativeSeparators(script_dir.absoluteFilePath("run.json")),
+            "run":   QDir.toNativeSeparators(exectuable_dir.absoluteFilePath("run.json")),
-            "user": QDir.toNativeSeparators(script_dir.absoluteFilePath("user.json")),
+            "user": QDir.toNativeSeparators(exectuable_dir.absoluteFilePath("user.json")),
-            "timer_task": QDir.toNativeSeparators(script_dir.absoluteFilePath("timer_task.json")),
+            "timer_task": QDir.toNativeSeparators(exectuable_dir.absoluteFilePath("timer_task.json")),
         }
         self.__alTimerTaskWidget = None
         self.__alConfigWidget = None
@@ -82,7 +83,7 @@ class ALMainWindow(MsgBase, QMainWindow, Ui_ALMainWindow):
         self.timerTaskIsExecuted.connect(self.__alTimerTaskWidget.onTimerTaskIsExecuted)
         self.timerTaskIsError.connect(self.__alTimerTaskWidget.onTimerTaskIsError)
         self.__alTimerTaskWidget.timerTaskIsReady.connect(self.onTimerTaskIsReady)
-        self.__alTimerTaskWidget.timerTaskManageWidgetClosed.connect(self.onTimerTaskWidgetClosed)
+        self.__alTimerTaskWidget.timerTaskManageWidgetIsClosed.connect(self.onTimerTaskWidgetClosed)
         self.__alTimerTaskWidget.setWindowFlags(Qt.WindowType.Window|Qt.WindowType.WindowCloseButtonHint)
 
 

src/gui/ALSeatMapSelectDialog.py

@@ -22,7 +22,7 @@ from gui.ALSeatMapView import ALSeatMapView
 
 class ALSeatMapSelectDialog(QDialog):
 
-    seatMapSelectDialogClosed = Signal(list)
+    seatMapSelectDialogIsClosed = Signal(list)
 
     def __init__(
         self,
@@ -127,7 +127,7 @@ class ALSeatMapSelectDialog(QDialog):
             self.reject()
         else:
             self.accept()
-        self.seatMapSelectDialogClosed.emit(self.getSelectedSeats())
+        self.seatMapSelectDialogIsClosed.emit(self.getSelectedSeats())
         super().closeEvent(event)
 
 

src/gui/ALTimerTaskManageWidget.py

@@ -137,7 +137,7 @@ class ALTimerTaskManageWidget(QWidget, Ui_ALTimerTaskManageWidget):
 
     timerTaskIsReady = Signal(dict)
     timerTasksChanged = Signal()
-    timerTaskManageWidgetClosed = Signal()
+    timerTaskManageWidgetIsClosed = Signal()
 
     def __init__(
         self,
@@ -274,7 +274,7 @@ class ALTimerTaskManageWidget(QWidget, Ui_ALTimerTaskManageWidget):
     ):
 
         self.hide()
-        self.timerTaskManageWidgetClosed.emit()
+        self.timerTaskManageWidgetIsClosed.emit()
         event.ignore()