Add multifunction_btn to SubProcessDlg

为子进程窗口添加多功能按钮并基本实现功能；
优化 `__main__.py` 中的 import 语句；

Author: muziing

src/py2exe_gui/Widgets/dialog_widgets.py

@@ -5,12 +5,13 @@
     QFileDialog,
     QLabel,
     QMessageBox,
+    QPushButton,
     QTextBrowser,
     QVBoxLayout,
     QWidget,
 )
 
-from py2exe_gui.Core.subprocess_tool import SubProcessTool
+from ..Core.subprocess_tool import SubProcessTool
 
 
 class ScriptFileDlg(QFileDialog):
@@ -144,6 +145,8 @@ class SubProcessDlg(QDialog):
     用于显示子进程信息的对话框
     """
 
+    # TODO 重构SubProcessDlg
+
     def __init__(self, parent: QWidget = None) -> None:
         """
         :param parent: 父控件对象
@@ -153,6 +156,7 @@ def __init__(self, parent: QWidget = None) -> None:
 
         self.info_label = QLabel(self)
         self.browser = QTextBrowser(self)
+        self.multifunction_btn = QPushButton(self)  # 可用于“取消”“打开输出位置”等的多功能按钮
         self._setup()
 
     def _setup(self) -> None:
@@ -161,12 +165,17 @@ def _setup(self) -> None:
         """
 
         self.setWindowTitle("PyInstaller")
+        self.setMinimumWidth(400)
         self.setModal(True)
 
-        layout = QVBoxLayout()
-        layout.addWidget(self.info_label)
-        layout.addWidget(self.browser)
-        self.setLayout(layout)
+        self.multifunction_btn.setMaximumWidth(80)
+
+        # 布局管理器
+        main_layout = QVBoxLayout()
+        main_layout.addWidget(self.info_label)
+        main_layout.addWidget(self.browser)
+        main_layout.addWidget(self.multifunction_btn)
+        self.setLayout(main_layout)
 
     def handle_output(self, subprocess_output: tuple[int, str]) -> None:
         """
@@ -181,8 +190,11 @@ def handle_output(self, subprocess_output: tuple[int, str]) -> None:
             self.browser.append(output_text)
         elif output_type == SubProcessTool.FINISHED:
             self.info_label.setText("打包完成！")
+            self.multifunction_btn.setText("打开输出位置")
         elif output_type == SubProcessTool.STATE:
             self.info_label.setText(output_text)
+            if output_text == "正在运行中……":
+                self.multifunction_btn.setText("取消")
 
 
 if __name__ == "__main__":

src/py2exe_gui/__main__.py

@@ -1,12 +1,13 @@
+import os
+import subprocess
 import sys
 
 from PySide6 import QtGui
 from PySide6.QtWidgets import QApplication
 
-from py2exe_gui.Core.packaging import Packaging
-from py2exe_gui.Core.packaging_task import PackagingTask
-from py2exe_gui.Widgets.dialog_widgets import SubProcessDlg
-from py2exe_gui.Widgets.main_window import MainWindow
+# from .Constants import *
+from .Core import Packaging, PackagingTask
+from .Widgets import MainWindow, SubProcessDlg
 
 
 class MainApp(MainWindow):
@@ -21,11 +22,11 @@ def __init__(self, *args, **kwargs) -> None:
         self.packager = Packaging(self)
         self.subprocess_dlg = SubProcessDlg(self)
 
-        self._connect_signals()
+        self._connect_slots()
 
         self.status_bar.showMessage("就绪")
 
-    def _connect_signals(self) -> None:
+    def _connect_slots(self) -> None:
         """
         连接各种信号与槽 \n
         """
@@ -38,7 +39,6 @@ def _connect_signals(self) -> None:
             self.center_widget.handle_ready_to_pack
         )
 
-        # TODO 优化pyinstaller_args_browser的接口
         self.packager.args_settled.connect(
             lambda val: self.center_widget.pyinstaller_args_browser.enrich_args_text(
                 val
@@ -50,6 +50,23 @@ def run_packaging():
             self.subprocess_dlg.show()
 
         self.center_widget.run_packaging_btn.clicked.connect(run_packaging)
+
+        def handle_multifunction():
+            """处理子进程对话框多功能按钮点击信号的槽 \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 sys.platform.startswith("win32"):
+                    os.startfile(dist_path)
+                elif sys.platform.startswith("linux"):
+                    subprocess.call(["xdg-open", dist_path])
+                elif sys.platform.startswith("darwin"):
+                    subprocess.call(["open", dist_path])
+
+        self.subprocess_dlg.multifunction_btn.clicked.connect(handle_multifunction)
         self.packager.subprocess.output.connect(self.subprocess_dlg.handle_output)
 
     def closeEvent(self, event: QtGui.QCloseEvent) -> None: