Skip to content

Commit 669a056

Browse files
committed
Version 0.1.12
新功能: - 添加通过脚本形式启动 Py2exe-GUI 的功能 - 增加 `PyInstaller命令选项详情` 窗口 - 将 `IconFileDlg` 默认打开目录自动设置为脚本所在目录 修复与增强: - 增强 `SubProcessTool` 调试能力,添加当子进程发生错误时向终端输出的警告信息;调整启动子进程与显示对话框窗口的顺序,确保子进程输出信息能够被捕获; - 增强获取运行时信息机制,获取平台、用户语言等; - 调整部分槽函数位置与组织结构,使能通过 Mypy 检查; 依赖项更新: - 更新数个开发依赖工具版本
1 parent e8b6652 commit 669a056

6 files changed

Lines changed: 71 additions & 103 deletions

File tree

.pre-commit-config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ repos:
1010
- id: end-of-file-fixer
1111

1212
- repo: https://github.com/psf/black
13-
rev: 23.11.0
13+
rev: 23.12.0
1414
hooks:
1515
- id: black
1616
args: [--config, "./pyproject.toml"]
1717

1818
- repo: https://github.com/pycqa/isort
19-
rev: 5.12.0
19+
rev: 5.13.1
2020
hooks:
2121
- id: isort
2222
args: [--settings-path, "./pyproject.toml"]

poetry.lock

Lines changed: 62 additions & 53 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pyproject.toml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[tool.poetry]
22
name = "py2exe-gui"
3-
version = "0.1.11"
3+
version = "0.1.12"
44
description = "GUI for PyInstaller, based on PySide6"
55
keywords = ["PyInstaller", "GUI", "PySide6"]
66
authors = ["muzing <muzi2001@foxmail.com>"]
@@ -23,16 +23,18 @@ py2exe-gui = 'py2exe_gui.__main__:main'
2323
[tool.poetry.dependencies]
2424
python = ">=3.8,<3.12"
2525
PySide6 = "^6.6.0"
26+
pyyaml = "^6.0.1"
2627

2728
[tool.poetry.group.dev]
2829

2930
[tool.poetry.group.dev.dependencies]
3031
pre-commit = "^3.5.0"
31-
black = "^23.11.0"
32-
isort = "^5.12.0"
32+
black = "^23.12.0"
33+
isort = "^5.13.0"
3334
ruff = "^0.1.7"
3435
mypy = "^1.7.0"
3536
pyinstaller = "^6.2.0"
37+
types-pyyaml = "^6.0.12.12"
3638

3739
[tool.black]
3840
line-length = 88

src/py2exe_gui/Constants/app_constants.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ class AppConstant:
88
"""
99

1010
NAME = "Py2exe-GUI"
11-
VERSION = "0.1.11"
11+
VERSION = "0.1.12"
1212
AUTHORS = ["muzing <muzi2001@foxmail.com>"]
1313
LICENSE = "GPL-3.0-or-later"

src/py2exe_gui/Core/subprocess_tool.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ def start_process(
7979

8080
def abort_process(self, timeout: int = 5000) -> bool:
8181
"""
82-
终止子进程 \n
82+
尝试中止子进程,超时后杀死子进程。若子进程没有运行,则什么都不做。 \n
8383
:param timeout: 超时时间,单位为毫秒
8484
:return: 子进程是否完成
8585
"""

src/py2exe_gui/Widgets/dialog_widgets.py

Lines changed: 0 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,6 @@ def __init__(self, parent: Optional[QWidget] = None) -> None:
2020

2121
super().__init__(parent)
2222

23-
self._setup()
24-
25-
def _setup(self) -> None:
26-
"""
27-
配置脚本路径对话框 \n
28-
"""
29-
3023
self.setAcceptMode(QFileDialog.AcceptMode.AcceptOpen)
3124
self.setViewMode(QFileDialog.ViewMode.Detail)
3225
self.setNameFilters(("Python脚本文件 (*.py *.pyw)", "所有文件 (*)"))
@@ -49,13 +42,6 @@ def __init__(self, parent: Optional[QWidget] = None) -> None:
4942

5043
super().__init__(parent)
5144

52-
self._setup()
53-
54-
def _setup(self) -> None:
55-
"""
56-
配置应用图标对话框 \n
57-
"""
58-
5945
self.setAcceptMode(QFileDialog.AcceptMode.AcceptOpen)
6046
self.setViewMode(QFileDialog.ViewMode.Detail)
6147
self.setNameFilters(("图标文件 (*.ico *.icns)", "所有文件 (*)"))
@@ -66,28 +52,6 @@ def _setup(self) -> None:
6652
self.setLabelText(QFileDialog.DialogLabel.Reject, "取消")
6753

6854

69-
class AddDataDlg(QFileDialog):
70-
"""
71-
用于添加附加数据的对话框
72-
"""
73-
74-
def __init__(self, parent: Optional[QWidget] = None) -> None:
75-
"""
76-
:param parent: 父控件对象
77-
"""
78-
79-
super().__init__(parent)
80-
81-
self._setup()
82-
83-
def _setup(self) -> None:
84-
"""
85-
配置添加数据对话框 \n
86-
"""
87-
88-
pass
89-
90-
9155
class AboutDlg(QMessageBox):
9256
"""
9357
用于显示关于信息的对话框
@@ -101,13 +65,6 @@ def __init__(self, parent: Optional[QWidget] = None) -> None:
10165
super().__init__(parent)
10266

10367
self._about_text: str = ""
104-
self._setup()
105-
106-
def _setup(self) -> None:
107-
"""
108-
配置关于信息对话框 \n
109-
"""
110-
11168
self.setWindowTitle("关于")
11269
self.setStandardButtons(QMessageBox.StandardButton.Ok)
11370
self.setTextFormat(Qt.TextFormat.MarkdownText)

0 commit comments

Comments
 (0)