Add PyEnvComboBox to main widget

Author: muziing

src/py2exe_gui/Constants/__init__.py

@@ -8,3 +8,4 @@
 from .app_constants import *
 from .packaging_constants import *
 from .platform_constants import *
+from .python_env_constants import *

src/py2exe_gui/Widgets/center_widget.py

@@ -21,6 +21,7 @@
 from ..Constants import PyinstallerArgs
 from .arguments_browser import ArgumentsBrowser
 from .dialog_widgets import IconFileDlg, ScriptFileDlg
+from .pyenv_combobox import PyEnvComboBox
 
 
 class CenterWidget(QWidget):
@@ -46,6 +47,9 @@ def __init__(self, parent: QMainWindow) -> None:
         self.script_browse_btn = QPushButton()
         self.script_path_le = QLineEdit()
 
+        # Python 解释器选择下拉框
+        self.pyenv_combobox = PyEnvComboBox()
+
         # 打包后输出的项目名称
         self.project_name_label = QLabel()
         self.project_name_le = QLineEdit()
@@ -178,6 +182,7 @@ def _set_layout(self) -> None:
         self.main_layout = main_layout
         main_layout.addSpacing(10)
         main_layout.addLayout(script_layout)
+        main_layout.addWidget(self.pyenv_combobox)
         main_layout.addStretch(10)
         main_layout.addLayout(name_layout)
         main_layout.addStretch(10)
@@ -316,14 +321,19 @@ def icon_file_selected(file_path: str) -> None:
         self.console_checkbox.toggled.connect(console_selected)
 
     def _set_layout(self) -> None:
+        """
+        设置布局管理器 \n
+        """
+
         super()._set_layout()
-        self.main_layout.insertWidget(6, self.console_checkbox)
+
+        self.main_layout.insertWidget(7, self.console_checkbox)
         self.main_layout.addStretch(10)
         icon_layout = QGridLayout()
         icon_layout.addWidget(self.icon_path_label, 0, 0, 1, 2)
         icon_layout.addWidget(self.icon_path_le, 1, 0)
         icon_layout.addWidget(self.icon_browse_btn, 1, 1)
-        self.main_layout.insertLayout(7, icon_layout)
+        self.main_layout.insertLayout(8, icon_layout)
 
     @QtCore.Slot(tuple)
     def handle_option_set(self, option: tuple[PyinstallerArgs, str]) -> None:

src/py2exe_gui/Widgets/pyenv_checkbox.py src/py2exe_gui/Widgets/pyenv_combobox.pysrc/py2exe_gui/Widgets/pyenv_checkbox.py renamed to src/py2exe_gui/Widgets/pyenv_combobox.py

@@ -9,7 +9,8 @@
 from PySide6.QtGui import QIcon
 from PySide6.QtWidgets import QComboBox, QWidget
 
-from ..Constants.python_env_constants import PyEnv, PyEnvType, get_pyenv_version
+from ..Constants import RUNTIME_INFO, PyEnv, PyEnvType, get_pyenv_version
+from ..Utilities import get_sys_python
 
 
 class PyEnvComboBox(QComboBox):
@@ -22,21 +23,27 @@ def __init__(self, parent: Optional[QWidget] = None):
 
         self.setIconSize(QSize(18, 18))
 
+        if not RUNTIME_INFO.is_bundled:
+            # 在非 PyInstaller 捆绑环境中，第一项为当前用于运行 Py2exe-GUI 的 Python 环境
+            current_pyenv = PyEnv(PyEnvType.poetry, executable_path=sys.executable)
+            self.addItem(*self.gen_item(current_pyenv))
+        else:
+            # 若已由 PyInstaller 捆绑成冻结应用程序，则第一项为系统 Python 环境
+            sys_pyenv = PyEnv(PyEnvType.system, executable_path=get_sys_python())
+            self.addItem(*self.gen_item(sys_pyenv))
+
+        # 测试项
         self.addItem(
             QIcon(":/Icons/Python_128px"),
             f"Python {platform.python_version()}",
             sys.executable,
         )
 
-        self.addItem(
-            *self.gen_item(PyEnv(PyEnvType.poetry, executable_path=sys.executable))
-        )
-
     @classmethod
     def gen_item(cls, pyenv: PyEnv) -> tuple:
         """
-        根据传入的Python环境，生成一个适用于 QComboBox.addItem() 参数的三元素元组 \n
-        :param pyenv: Python解释器环境
+        根据传入的 Python 环境，生成一个适用于 QComboBox.addItem() 参数的三元素元组 \n
+        :param pyenv: Python 解释器环境
         :return: (icon, text, data)
         """
 
@@ -45,13 +52,13 @@ def gen_item(cls, pyenv: PyEnv) -> tuple:
 
         if pyenv.type == PyEnvType.system:
             icon = QIcon(":/Icons/Python_128px")
-            text = f"Python {version}"
+            text = f"Python {version} (System)"
         elif pyenv.type == PyEnvType.poetry:
             icon = QIcon(":/Icons/Poetry")
-            text = f"Poetry[Python {version}]"
+            text = f"Poetry [Python {version}]"
         elif pyenv.type == PyEnvType.conda:
             icon = QIcon(":/Icons/Conda")
-            text = f"Conda[Python {version}]"
+            text = f"Conda [Python {version}]"
         else:
             icon = QIcon(":/Icons/Python_128px")
             text = f"Python {version}"

src/py2exe_gui/__main__.py

@@ -37,6 +37,7 @@ def _connect_slots(self) -> None:
 
         self._connect_run_pkg_btn_slot()
         self._connect_mul_btn_slot(self.subprocess_dlg)
+        self._connect_pyenv_change()
 
         self.center_widget.option_selected.connect(self.packaging_task.handle_option)
         self.packaging_task.option_set.connect(self.packager.set_pyinstaller_args)
@@ -57,6 +58,18 @@ def _connect_slots(self) -> None:
             lambda: self.packager.subprocess.abort_process(2000)
         )
 
+    def _connect_pyenv_change(self):
+        """
+        处理用户通过选择不同的 Python 解释器时的响应
+        """
+
+        self.packager.set_pyinstaller(self.center_widget.pyenv_combobox.currentData())
+        self.center_widget.pyenv_combobox.currentIndexChanged.connect(
+            lambda: self.packager.set_pyinstaller(
+                self.center_widget.pyenv_combobox.currentData()
+            )
+        )
+
     def _connect_mul_btn_slot(self, subprocess_dlg):
         @Slot()
         def handle_multifunction() -> None:
@@ -109,6 +122,7 @@ def closeEvent(self, event: QCloseEvent) -> None:
 def main() -> None:
     """
     应用程序主入口函数
+    便于 Poetry 由此函数级入口构建启动脚本 \n
     """
 
     app = QApplication(sys.argv)