Skip to content

Commit aededb2

Browse files
committed
Refactor center_widget
将 `run_packaging()` 槽函数从__main__中移至中央控件类中; 修复类型注解错误;
1 parent fc45541 commit aededb2

2 files changed

Lines changed: 13 additions & 13 deletions

File tree

src/py2exe_gui/Widgets/center_widget.py

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
QWidget,
1616
)
1717

18-
from ..Constants.packaging_constants import *
18+
from ..Constants.packaging_constants import PyinstallerArgs
1919
from .arguments_browser import ArgumentsBrowser
2020
from .dialog_widgets import IconFileDlg, ScriptFileDlg
2121

@@ -28,9 +28,9 @@ class CenterWidget(QWidget):
2828
# 自定义信号
2929
option_selected = QtCore.Signal(tuple) # 用户通过界面控件选择选项后发射此信号
3030

31-
def __init__(self, parent: QMainWindow = None) -> None:
31+
def __init__(self, parent: QMainWindow) -> None:
3232
"""
33-
:param parent: 父控件对象,应为主窗口
33+
:param parent: 父控件对象,应为主程序
3434
"""
3535

3636
super(CenterWidget, self).__init__(parent)
@@ -166,11 +166,21 @@ def icon_file_selected(file_path: str) -> None:
166166

167167
self.option_selected.emit((PyinstallerArgs.icon_path, file_path))
168168

169+
@QtCore.Slot()
170+
def run_packaging() -> None:
171+
"""
172+
“运行打包”按钮的槽函数 \n
173+
"""
174+
175+
self.parent().packager.run_packaging_process()
176+
self.parent().subprocess_dlg.show()
177+
169178
# 连接信号与槽
170179
self.script_browse_btn.clicked.connect(self.script_file_dlg.open) # type: ignore
171180
self.script_file_dlg.fileSelected.connect(script_file_selected) # type: ignore
172181
self.project_name_le.editingFinished.connect(project_name_selected) # type: ignore
173182
self.fd_group.idClicked.connect(one_fd_selected) # type: ignore
183+
self.run_packaging_btn.clicked.connect(run_packaging) # type: ignore
174184

175185
if self.parent().running_platform in ("Windows", "macOS"):
176186
self.icon_browse_btn.clicked.connect(self.icon_file_dlg.open) # type: ignore

src/py2exe_gui/__main__.py

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -61,16 +61,6 @@ def _connect_slots(self) -> None:
6161
)
6262
)
6363

64-
@QtCore.Slot()
65-
def run_packaging() -> None:
66-
"""
67-
“运行打包”按钮的槽函数 \n
68-
"""
69-
70-
self.packager.run_packaging_process()
71-
self.subprocess_dlg.show()
72-
73-
self.center_widget.run_packaging_btn.clicked.connect(run_packaging)
7464
self.packager.subprocess.output.connect(self.subprocess_dlg.handle_output)
7565

7666
def closeEvent(self, event: QtGui.QCloseEvent) -> None:

0 commit comments

Comments
 (0)