--- a/src/eric7/Project/ProjectFormsBrowser.py Sun Apr 13 14:46:18 2025 +0200
+++ b/src/eric7/Project/ProjectFormsBrowser.py Sun Apr 13 15:53:14 2025 +0200
@@ -201,7 +201,7 @@
projectType = self.project.getProjectType()
self.menu = QMenu(self)
- if projectType in ["PyQt5", "PyQt6", "E7Plugin", "PySide6"]:
+ if projectType in ("PyQt6", "E7Plugin", "PySide6"):
if FileSystemUtilities.isRemoteFileName(self.project.getProjectPath()):
self.menu.addAction(self.tr("Open in Editor"), self.__openFileInEditor)
else:
@@ -267,7 +267,7 @@
self.menuActions.append(act)
self.menu.addSeparator()
if FileSystemUtilities.isPlainFileName(self.project.getProjectPath()):
- if projectType in ["PyQt5", "PyQt6", "E7Plugin", "PySide6"]:
+ if projectType in ("PyQt6", "E7Plugin", "PySide6"):
self.menu.addAction(self.tr("New form..."), self.__newForm)
else:
if self.hooks["newForm"] is not None:
@@ -292,7 +292,7 @@
self.backMenu = QMenu(self)
if FileSystemUtilities.isPlainFileName(self.project.getProjectPath()):
if (
- projectType in ["PyQt5", "PyQt6", "E7Plugin", "PySide6"]
+ projectType in ("PyQt6", "E7Plugin", "PySide6")
or self.hooks["compileAllForms"] is not None
):
self.backMenu.addAction(
@@ -332,7 +332,7 @@
# create the menu for multiple selected files
self.multiMenu = QMenu(self)
- if projectType in ["PyQt5", "PyQt6", "E7Plugin", "PySide6"]:
+ if projectType in ("PyQt6", "E7Plugin", "PySide6"):
if FileSystemUtilities.isRemoteFileName(self.project.getProjectPath()):
self.multiMenu.addAction(
self.tr("Open in Editor"), self.__openFileInEditor
@@ -388,7 +388,7 @@
self.dirMenu = QMenu(self)
if FileSystemUtilities.isPlainFileName(self.project.getProjectPath()):
- if projectType in ["PyQt5", "PyQt6", "E7Plugin", "PySide6"]:
+ if projectType in ("PyQt6", "E7Plugin", "PySide6"):
self.dirMenu.addAction(
self.tr("Compile all forms"), self.__compileAllForms
)
@@ -412,7 +412,7 @@
self.dirMenuActions.append(act)
self.dirMenu.addSeparator()
if FileSystemUtilities.isPlainFileName(self.project.getProjectPath()):
- if projectType in ["PyQt5", "PyQt6", "E7Plugin", "PySide6"]:
+ if projectType in ("PyQt6", "E7Plugin", "PySide6"):
self.dirMenu.addAction(self.tr("New form..."), self.__newForm)
else:
if self.hooks["newForm"] is not None:
@@ -439,7 +439,7 @@
self.dirMultiMenu = QMenu(self)
if FileSystemUtilities.isPlainFileName(self.project.getProjectPath()):
- if projectType in ["PyQt5", "PyQt6", "E7Plugin", "PySide6"]:
+ if projectType in ("PyQt6", "E7Plugin", "PySide6"):
self.dirMultiMenu.addAction(
self.tr("Compile all forms"), self.__compileAllForms
)
@@ -492,7 +492,7 @@
return
if FileSystemUtilities.isPlainFileName(self.project.getProjectPath()):
- enable = self.project.getProjectType() in ("PyQt5", "PyQt6", "E7Plugin")
+ enable = self.project.getProjectType() in ("PyQt6", "E7Plugin")
self.__pyuicConfigAct.setEnabled(enable)
self.__pyuicMultiConfigAct.setEnabled(enable)
self.__pyuicDirConfigAct.setEnabled(enable)
@@ -663,7 +663,6 @@
self.hooks["newForm"](path)
else:
if self.project.getProjectType() in [
- "PyQt5",
"PyQt6",
"E7Plugin",
"PySide6",
@@ -783,11 +782,7 @@
self.__resetUiCompiler()
if self.project.getProjectLanguage() == "Python3":
- if self.project.getProjectType() in ["PyQt5"]:
- self.__uicompiler = QtUtilities.generatePyQtToolPath(
- "pyuic5", ["py3uic5"]
- )
- elif self.project.getProjectType() in ["PyQt6", "E7Plugin"]:
+ if self.project.getProjectType() in ["PyQt6", "E7Plugin"]:
self.__uicompiler = QtUtilities.generatePyQtToolPath("pyuic6")
elif self.project.getProjectType() == "PySide6":
self.__uicompiler = QtUtilities.generatePySideToolPath(
@@ -931,29 +926,14 @@
if indentWidth != self.Pyuic6IndentDefault:
args.append("--indent={0}".format(indentWidth))
else:
- # PyQt5
- if Preferences.getQt("PyuicExecute"):
- args.append("-x")
- indentWidth = Preferences.getQt("PyuicIndent")
- if indentWidth != self.Pyuic5IndentDefault:
- args.append("--indent={0}".format(indentWidth))
- if (
- "uic5" in uicompiler
- and self.project.getProjectData(dataKey="UICPARAMS")["Package"]
- ):
- args.append(
- "--import-from={0}".format(
- self.project.getProjectData(dataKey="UICPARAMS")["Package"]
- )
- )
- elif Preferences.getQt("PyuicFromImports"):
- args.append("--from-imports")
- if self.project.getProjectData(dataKey="UICPARAMS")["RcSuffix"]:
- args.append(
- "--resource-suffix={0}".format(
- self.project.getProjectData(dataKey="UICPARAMS")["RcSuffix"]
- )
- )
+ EricMessageBox.critical(
+ self,
+ self.tr("Error Compiling Form"),
+ self.tr(
+ "The project type <b>{0}</b> is not supported."
+ ).format(self.project.getProjectType()),
+ )
+ return None
args.append(fn)
self.compileProc.finished.connect(self.__compileUIDone)
@@ -1107,7 +1087,6 @@
)
else:
if self.project.getProjectType() not in [
- "PyQt5",
"PyQt6",
"E7Plugin",
"PySide6",
@@ -1186,7 +1165,7 @@
params = self.project.getProjectData(dataKey="UICPARAMS")
- if self.project.getProjectType() in ["PyQt5", "PyQt6", "E7Plugin"]:
+ if self.project.getProjectType() in ("PyQt6", "E7Plugin"):
dlg = UicCompilerOptionsDialog(params, self.getUiCompiler(), parent=self)
if dlg.exec() == QDialog.DialogCode.Accepted:
package, suffix, root = dlg.getData()
