Python/Py2exe-GUI
1
0
Fork 0
mirror of https://github.com/muziing/Py2exe-GUI.git synced 2025-01-13 16:42:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

Refactor center_widget

Browse Source 
将 `run_packaging()` 槽函数从__main__中移至中央控件类中；
修复类型注解错误；
This commit is contained in:
muzing 2022-11-29 19:24:20 +08:00
parent fc45541db9
commit aededb2363
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/py2exe_gui/Widgets/center_widget.py
View File

@ -15,7 +15,7 @@ from PySide6.QtWidgets import (
QWidget, QWidget,
) )
from ..Constants.packaging_constants import * from ..Constants.packaging_constants import PyinstallerArgs
from .arguments_browser import ArgumentsBrowser from .arguments_browser import ArgumentsBrowser
from .dialog_widgets import IconFileDlg, ScriptFileDlg from .dialog_widgets import IconFileDlg, ScriptFileDlg
@ -28,9 +28,9 @@ class CenterWidget(QWidget):
# 自定义信号 # 自定义信号
option_selected = QtCore.Signal(tuple) # 用户通过界面控件选择选项后发射此信号 option_selected = QtCore.Signal(tuple) # 用户通过界面控件选择选项后发射此信号
def __init__(self, parent: QMainWindow = None) -> None: def __init__(self, parent: QMainWindow) -> None:
""" """
:param parent: 父控件对象，应为主窗口 :param parent: 父控件对象，应为主程序
""" """
super(CenterWidget, self).__init__(parent) super(CenterWidget, self).__init__(parent)
@ -166,11 +166,21 @@ class CenterWidget(QWidget):
self.option_selected.emit((PyinstallerArgs.icon_path, file_path)) self.option_selected.emit((PyinstallerArgs.icon_path, file_path))
@QtCore.Slot()
def run_packaging() -> None:
"""
“运行打包”按钮的槽函数 \n
"""
self.parent().packager.run_packaging_process()
self.parent().subprocess_dlg.show()
# 连接信号与槽 # 连接信号与槽
self.script_browse_btn.clicked.connect(self.script_file_dlg.open) # type: ignore self.script_browse_btn.clicked.connect(self.script_file_dlg.open) # type: ignore
self.script_file_dlg.fileSelected.connect(script_file_selected) # type: ignore self.script_file_dlg.fileSelected.connect(script_file_selected) # type: ignore
self.project_name_le.editingFinished.connect(project_name_selected) # type: ignore self.project_name_le.editingFinished.connect(project_name_selected) # type: ignore
self.fd_group.idClicked.connect(one_fd_selected) # type: ignore self.fd_group.idClicked.connect(one_fd_selected) # type: ignore
self.run_packaging_btn.clicked.connect(run_packaging) # type: ignore
if self.parent().running_platform in ("Windows", "macOS"): if self.parent().running_platform in ("Windows", "macOS"):
self.icon_browse_btn.clicked.connect(self.icon_file_dlg.open) # type: ignore self.icon_browse_btn.clicked.connect(self.icon_file_dlg.open) # type: ignore

10
src/py2exe_gui/__main__.py
View File

@ -61,16 +61,6 @@ class MainApp(MainWindow):
) )
) )
@QtCore.Slot()
def run_packaging() -> None:
"""
“运行打包”按钮的槽函数 \n
"""
self.packager.run_packaging_process()
self.subprocess_dlg.show()
self.center_widget.run_packaging_btn.clicked.connect(run_packaging)
self.packager.subprocess.output.connect(self.subprocess_dlg.handle_output) self.packager.subprocess.output.connect(self.subprocess_dlg.handle_output)
def closeEvent(self, event: QtGui.QCloseEvent) -> None: def closeEvent(self, event: QtGui.QCloseEvent) -> None: