Refactor the sub-widget button slot-funcs into MainApp

将主界面打包按钮槽函数、子进程对话框多功能按钮槽函数移动至 `MainApp` 中，避免了子控件中调用父控件属性的问题；

Author: muziing

src/py2exe_gui/Widgets/center_widget.py

@@ -192,22 +192,11 @@ def clean_selected(selected: bool) -> None:
                 self.option_selected.emit((PyinstallerArgs.clean, ""))
                 self.parent_widget.statusBar().showMessage("不会删除缓存与临时文件")
 
-        @QtCore.Slot()
-        def run_packaging() -> None:
-            """
-            “运行打包”按钮的槽函数 \n
-            """
-
-            # 先显示对话框窗口，后运行子进程，确保调试信息/错误信息能被直观显示
-            self.parent().subprocess_dlg.show()
-            self.parent().packager.run_packaging_process()
-
         # 连接信号与槽
         self.script_browse_btn.clicked.connect(self.script_file_dlg.open)
         self.script_file_dlg.fileSelected.connect(script_file_selected)
         self.project_name_le.editingFinished.connect(project_name_selected)
         self.fd_group.idClicked.connect(one_fd_selected)
-        self.run_packaging_btn.clicked.connect(run_packaging)
 
         if RUNTIME_INFO.platform in (PLATFORM.windows, PLATFORM.macos):
             self.icon_browse_btn.clicked.connect(self.icon_file_dlg.open)

src/py2exe_gui/Widgets/subprocess_widget.py

@@ -1,8 +1,6 @@
 # Licensed under the GPLv3 License: https://www.gnu.org/licenses/gpl-3.0.html
 # For details: https://github.com/muziing/Py2exe-GUI/blob/main/README.md#license
 
-import subprocess
-
 from PySide6.QtCore import Slot
 from PySide6.QtGui import QCloseEvent
 from PySide6.QtWidgets import (
@@ -14,8 +12,6 @@
     QWidget,
 )
 
-from ..Constants import PLATFORM
-from ..Core import RUNTIME_INFO
 from ..Core.subprocess_tool import SubProcessTool
 
 
@@ -45,9 +41,6 @@ def _setup(self) -> None:
         self.setMinimumWidth(400)
         self.setModal(True)  # 设置为模态对话框
 
-        # 连接信号与槽
-        self.multifunction_btn.clicked.connect(self.handle_multifunction)
-
         # 布局管理器
         main_layout = QVBoxLayout()
         main_layout.addWidget(self.info_label)
@@ -85,34 +78,12 @@ def handle_output(self, subprocess_output: tuple[int, str]) -> None:
             self.browser.append("请检查是否已经安装正确版本的 PyInstaller")
             self.multifunction_btn.setText("关闭")
 
-    @Slot()
-    def handle_multifunction(self) -> None:
-        """
-        处理多功能按钮点击信号的槽 \n
-        """
-
-        btn_text = self.multifunction_btn.text()
-        if btn_text == "取消":
-            self.parent().packager.subprocess.abort_process()
-            self.close()
-        elif btn_text == "打开输出位置":
-            dist_path = self.parent().packaging_task.script_path.parent / "dist"
-            if PLATFORM.windows == RUNTIME_INFO.platform:
-                from os import startfile as os_startfile  # fmt: skip
-                os_startfile(dist_path)  # noqa
-            elif PLATFORM.linux == RUNTIME_INFO.platform:
-                subprocess.call(["xdg-open", dist_path])
-            elif PLATFORM.macos == RUNTIME_INFO.platform:
-                subprocess.call(["open", dist_path])
-        elif btn_text == "关闭":
-            self.close()
-
     def closeEvent(self, event: QCloseEvent) -> None:
         """
         重写关闭事件，进行收尾清理 \n
         :param event: 关闭事件
         """
 
-        self.parent().packager.subprocess.abort_process()
+        self.finished.emit(-1)
         self.browser.clear()
         super().closeEvent(event)

src/py2exe_gui/__main__.py

@@ -2,11 +2,14 @@
 # For details: https://github.com/muziing/Py2exe-GUI/blob/main/README.md#license
 
 import sys
+from subprocess import call as subprocess_call
 
+from PySide6.QtCore import Slot
 from PySide6.QtGui import QCloseEvent
 from PySide6.QtWidgets import QApplication
 
-from .Core import Packaging, PackagingTask  # noqa
+from .Constants import PLATFORM  # noqa
+from .Core import RUNTIME_INFO, Packaging, PackagingTask  # noqa
 from .Resources import compiled_resources  # noqa
 from .Widgets import MainWindow, SubProcessDlg  # noqa
 
@@ -32,27 +35,74 @@ def _connect_slots(self) -> None:
         连接各种信号与槽 \n
         """
 
-        center_widget = self.center_widget
-        packaging_task = self.packaging_task
-        packager = self.packager
-
-        center_widget.option_selected.connect(packaging_task.handle_option)
-        packaging_task.option_set.connect(packager.set_pyinstaller_args)
-        packaging_task.option_set.connect(center_widget.handle_option_set)
-        packaging_task.option_error.connect(center_widget.handle_option_error)
-        packaging_task.ready_to_pack.connect(center_widget.handle_ready_to_pack)
-        packager.args_settled.connect(
-            lambda val: center_widget.pyinstaller_args_browser.enrich_args_text(val)
+        self._connect_run_pkg_btn_slot()
+        self._connect_mul_btn_slot(self.subprocess_dlg)
+
+        self.center_widget.option_selected.connect(self.packaging_task.handle_option)
+        self.packaging_task.option_set.connect(self.packager.set_pyinstaller_args)
+        self.packaging_task.option_set.connect(self.center_widget.handle_option_set)
+        self.packaging_task.option_error.connect(self.center_widget.handle_option_error)
+        self.packaging_task.ready_to_pack.connect(
+            self.center_widget.handle_ready_to_pack
+        )
+        self.packager.args_settled.connect(
+            lambda val: self.center_widget.pyinstaller_args_browser.enrich_args_text(
+                val
+            )
         )
-        packager.subprocess.output.connect(self.subprocess_dlg.handle_output)
+        self.packager.subprocess.output.connect(self.subprocess_dlg.handle_output)
+
+        # 用户关闭子进程对话框时中止打包进程
+        self.subprocess_dlg.finished.connect(
+            lambda: self.packager.subprocess.abort_process(2000)
+        )
+
+    def _connect_mul_btn_slot(self, subprocess_dlg):
+        @Slot()
+        def handle_multifunction() -> None:
+            """
+            处理子进程窗口多功能按钮点击信号的槽 \n
+            """
+
+            btn_text = self.subprocess_dlg.multifunction_btn.text()
+            if btn_text == "取消":
+                self.packager.subprocess.abort_process()
+                self.subprocess_dlg.close()
+            elif btn_text == "打开输出位置":
+                dist_path = self.packaging_task.script_path.parent / "dist"
+                if PLATFORM.windows == RUNTIME_INFO.platform:
+                    from os import startfile as os_startfile  # fmt: skip
+                    os_startfile(dist_path)  # noqa
+                elif PLATFORM.linux == RUNTIME_INFO.platform:
+                    subprocess_call(["xdg-open", dist_path])
+                elif PLATFORM.macos == RUNTIME_INFO.platform:
+                    subprocess_call(["open", dist_path])
+            elif btn_text == "关闭":
+                self.subprocess_dlg.close()
+
+        # 连接信号与槽
+        subprocess_dlg.multifunction_btn.clicked.connect(handle_multifunction)
+
+    def _connect_run_pkg_btn_slot(self):
+        @Slot()
+        def run_packaging() -> None:
+            """
+            “运行打包”按钮的槽函数 \n
+            """
+
+            # 先显示对话框窗口，后运行子进程，确保调试信息/错误信息能被直观显示
+            self.subprocess_dlg.show()
+            self.packager.run_packaging_process()
+
+        self.center_widget.run_packaging_btn.clicked.connect(run_packaging)
 
     def closeEvent(self, event: QCloseEvent) -> None:
         """
         重写关闭事件，进行收尾清理 \n
         :param event: 关闭事件
         """
 
-        self.packager.subprocess.abort_process()
+        # self.packager.subprocess.abort_process(3000)  # 不会访问到此行
         super().closeEvent(event)