eric7/Project/CreateDialogCodeDialog.py

branch
eric7
changeset 8336
d566c2970f39
parent 8324
83084f088655
child 8356
68ec9c3d4de5
--- a/eric7/Project/CreateDialogCodeDialog.py	Thu May 20 19:19:33 2021 +0200
+++ b/eric7/Project/CreateDialogCodeDialog.py	Thu May 20 19:20:50 2021 +0200
@@ -164,9 +164,9 @@
         venvName = self.project.getDebugProperty("VIRTUALENV")
         if not venvName:
             # no project specific environment, try a type specific one
-            if projectType in ("PyQt5", "E6Plugin", "PySide2"):
+            if projectType in ("PyQt5", "PySide2"):
                 venvName = Preferences.getQt("PyQtVenvName")
-            elif projectType in ("PyQt6", "PySide6"):
+            elif projectType in ("PyQt6", "E7Plugin", "PySide6"):
                 venvName = Preferences.getQt("PyQt6VenvName")
         interpreter = venvManager.getVirtualenvInterpreter(venvName)
         execPath = venvManager.getVirtualenvExecPath(venvName)
@@ -183,9 +183,9 @@
             else:
                 env.insert("PATH", execPath)
         
-        if projectType in ("PyQt5", "E6Plugin", "PySide2"):
+        if projectType in ("PyQt5", "PySide2"):
             loadUi = os.path.join(os.path.dirname(__file__), "UicLoadUi5.py")
-        elif projectType in ("PyQt6", "PySide6"):
+        elif projectType in ("PyQt6", "E7Plugin", "PySide6"):
             loadUi = os.path.join(os.path.dirname(__file__), "UicLoadUi6.py")
         args = [
             loadUi,
@@ -413,12 +413,13 @@
                     tmplName = os.path.join(
                         getConfig('ericCodeTemplatesDir'),
                         "impl_pyside6.py.tmpl")
-                elif self.project.getProjectType() in [
-                        "PyQt5", "E6Plugin"]:
+                elif self.project.getProjectType() == "PyQt5":
                     tmplName = os.path.join(
                         getConfig('ericCodeTemplatesDir'),
                         "impl_pyqt5.py.tmpl")
-                elif self.project.getProjectType() == "PyQt6":
+                elif self.project.getProjectType() in [
+                    "PyQt6", "E7Plugin"
+                ]:
                     tmplName = os.path.join(
                         getConfig('ericCodeTemplatesDir'),
                         "impl_pyqt6.py.tmpl")

eric ide

mercurial