diff -r d07c71a34adf -r a1471981ef18 src/eric7/Project/ProjectFormsBrowser.py
--- a/src/eric7/Project/ProjectFormsBrowser.py Thu Apr 10 18:39:29 2025 +0200
+++ b/src/eric7/Project/ProjectFormsBrowser.py Sun Apr 13 14:46:18 2025 +0200
@@ -201,7 +201,7 @@
projectType = self.project.getProjectType()
self.menu = QMenu(self)
- if projectType in ["PyQt5", "PyQt6", "E7Plugin", "PySide2", "PySide6"]:
+ if projectType in ["PyQt5", "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", "PySide2", "PySide6"]:
+ if projectType in ["PyQt5", "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", "PySide2", "PySide6"]
+ projectType in ["PyQt5", "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", "PySide2", "PySide6"]:
+ if projectType in ["PyQt5", "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", "PySide2", "PySide6"]:
+ if projectType in ["PyQt5", "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", "PySide2", "PySide6"]:
+ if projectType in ["PyQt5", "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", "PySide2", "PySide6"]:
+ if projectType in ["PyQt5", "PyQt6", "E7Plugin", "PySide6"]:
self.dirMultiMenu.addAction(
self.tr("Compile all forms"), self.__compileAllForms
)
@@ -666,7 +666,6 @@
"PyQt5",
"PyQt6",
"E7Plugin",
- "PySide2",
"PySide6",
]:
self.__newUiForm(path)
@@ -790,10 +789,6 @@
)
elif self.project.getProjectType() in ["PyQt6", "E7Plugin"]:
self.__uicompiler = QtUtilities.generatePyQtToolPath("pyuic6")
- elif self.project.getProjectType() == "PySide2":
- self.__uicompiler = QtUtilities.generatePySideToolPath(
- "pyside2-uic", variant=2
- )
elif self.project.getProjectType() == "PySide6":
self.__uicompiler = QtUtilities.generatePySideToolPath(
"pyside6-uic", variant=6
@@ -814,7 +809,7 @@
def __readStdout(self):
"""
Private slot to handle the readyReadStandardOutput signal of the
- pyuic5/pyuic6/pyside2-uic/pyside6-uic process.
+ pyuic5/pyuic6/pyside6-uic process.
"""
if self.compileProc is None:
return
@@ -828,7 +823,7 @@
def __readStderr(self):
"""
Private slot to handle the readyReadStandardError signal of the
- pyuic5/pyuic6/pyside2-uic/pyside6-uic process.
+ pyuic5/pyuic6/pyside6-uic process.
"""
if self.compileProc is None:
return
@@ -924,11 +919,7 @@
dirname, filename = os.path.split(ofn)
self.compiledFile = os.path.join(dirname, "Ui_" + filename + ".py")
- if self.project.getProjectType() == "PySide2":
- # PySide2
- if Preferences.getQt("PySide2FromImports"):
- args.append("--from-imports")
- elif self.project.getProjectType() == "PySide6":
+ if self.project.getProjectType() == "PySide6":
# PySide6
if Preferences.getQt("PySide6FromImports"):
args.append("--from-imports")
@@ -1119,7 +1110,6 @@
"PyQt5",
"PyQt6",
"E7Plugin",
- "PySide2",
"PySide6",
]:
# ignore the request for non Qt GUI projects
