Mercurial Repositories > eric / file diff

--- a/eric7/Project/ProjectFormsBrowser.py	Thu May 20 19:19:33 2021 +0200
+++ b/eric7/Project/ProjectFormsBrowser.py	Thu May 20 19:20:50 2021 +0200
@@ -130,7 +130,7 @@
         projectType = self.project.getProjectType()
         
         self.menu = QMenu(self)
-        if projectType in ["PyQt5", "PyQt6", "E6Plugin", "PySide2", "PySide6"]:
+        if projectType in ["PyQt5", "PyQt6", "E7Plugin", "PySide2", "PySide6"]:
             self.menu.addAction(
                 self.tr('Compile form'), self.__compileForm)
             self.menu.addAction(
@@ -190,7 +190,7 @@
         act = self.menu.addAction(self.tr('Delete'), self.__deleteFile)
         self.menuActions.append(act)
         self.menu.addSeparator()
-        if projectType in ["PyQt5", "PyQt6", "E6Plugin", "PySide2", "PySide6"]:
+        if projectType in ["PyQt5", "PyQt6", "E7Plugin", "PySide2", "PySide6"]:
             self.menu.addAction(self.tr('New form...'), self.__newForm)
         else:
             if self.hooks["newForm"] is not None:
@@ -214,7 +214,7 @@
         self.backMenu = QMenu(self)
         if (
             projectType in [
-                "PyQt5", "PyQt6", "E6Plugin", "PySide2", "PySide6"
+                "PyQt5", "PyQt6", "E7Plugin", "PySide2", "PySide6"
             ] or self.hooks["compileAllForms"] is not None
         ):
             self.backMenu.addAction(
@@ -245,7 +245,7 @@
 
         # create the menu for multiple selected files
         self.multiMenu = QMenu(self)
-        if projectType in ["PyQt5", "PyQt6", "E6Plugin", "PySide2", "PySide6"]:
+        if projectType in ["PyQt5", "PyQt6", "E7Plugin", "PySide2", "PySide6"]:
             self.multiMenu.addAction(
                 self.tr('Compile forms'), self.__compileSelectedForms)
             self.multiMenu.addSeparator()
@@ -290,7 +290,7 @@
         self.multiMenu.addAction(self.tr('Configure...'), self._configure)
 
         self.dirMenu = QMenu(self)
-        if projectType in ["PyQt5", "PyQt6", "E6Plugin", "PySide2", "PySide6"]:
+        if projectType in ["PyQt5", "PyQt6", "E7Plugin", "PySide2", "PySide6"]:
             self.dirMenu.addAction(
                 self.tr('Compile all forms'), self.__compileAllForms)
             self.dirMenu.addSeparator()
@@ -313,7 +313,7 @@
             self.tr('Delete'), self._deleteDirectory)
         self.dirMenuActions.append(act)
         self.dirMenu.addSeparator()
-        if projectType in ["PyQt5", "PyQt6", "E6Plugin", "PySide2", "PySide6"]:
+        if projectType in ["PyQt5", "PyQt6", "E7Plugin", "PySide2", "PySide6"]:
             self.dirMenu.addAction(self.tr('New form...'), self.__newForm)
         else:
             if self.hooks["newForm"] is not None:
@@ -337,7 +337,7 @@
         self.dirMenu.addAction(self.tr('Configure...'), self._configure)
         
         self.dirMultiMenu = QMenu(self)
-        if projectType in ["PyQt5", "PyQt6", "E6Plugin", "PySide2", "PySide6"]:
+        if projectType in ["PyQt5", "PyQt6", "E7Plugin", "PySide2", "PySide6"]:
             self.dirMultiMenu.addAction(
                 self.tr('Compile all forms'), self.__compileAllForms)
             self.dirMultiMenu.addSeparator()
@@ -383,7 +383,7 @@
             return
         
         enable = (
-            self.project.getProjectType() in ("PyQt5", "PyQt6", "E6Plugin")
+            self.project.getProjectType() in ("PyQt5", "PyQt6", "E7Plugin")
         )
         self.__pyuicConfigAct.setEnabled(enable)
         self.__pyuicMultiConfigAct.setEnabled(enable)
@@ -568,7 +568,7 @@
             self.hooks["newForm"](path)
         else:
             if self.project.getProjectType() in [
-                "PyQt5", "PyQt6", "E6Plugin", "PySide2", "PySide6"
+                "PyQt5", "PyQt6", "E7Plugin", "PySide2", "PySide6"
             ]:
                 self.__newUiForm(path)
         
@@ -681,10 +681,10 @@
         self.__resetUiCompiler()
         
         if self.project.getProjectLanguage() == "Python3":
-            if self.project.getProjectType() in ["PyQt5", "E6Plugin"]:
+            if self.project.getProjectType() in ["PyQt5"]:
                 self.__uicompiler = Utilities.generatePyQtToolPath(
                     'pyuic5', ["py3uic5"])
-            elif self.project.getProjectType() in ["PyQt6"]:
+            elif self.project.getProjectType() in ["PyQt6", "E7Plugin"]:
                 self.__uicompiler = Utilities.generatePyQtToolPath(
                     'pyuic6')
             elif self.project.getProjectType() == "PySide2":
@@ -983,7 +983,7 @@
             self.hooks["compileChangedForms"](self.project.pdata["FORMS"])
         else:
             if self.project.getProjectType() not in [
-                "PyQt5", "PyQt6", "E6Plugin", "PySide2", "PySide6"
+                "PyQt5", "PyQt6", "E7Plugin", "PySide2", "PySide6"
             ]:
                 # ignore the request for non Qt GUI projects
                 return
@@ -1053,7 +1053,7 @@
         
         params = self.project.pdata["UICPARAMS"]
         
-        if self.project.getProjectType() in ["PyQt5", "PyQt6", "E6Plugin"]:
+        if self.project.getProjectType() in ["PyQt5", "PyQt6", "E7Plugin"]:
             dlg = UicCompilerOptionsDialog(params, self.getUiCompiler())
             if dlg.exec() == QDialog.DialogCode.Accepted:
                 package, suffix, root = dlg.getData()