eric: comparison eric6/Project/ProjectFormsBrowser.py

-:866adc8c315b
+:0acf98cd089a
 ProjectBrowserDirectoryItem, ProjectBrowserFormType
 )
 from .ProjectBaseBrowser import ProjectBaseBrowser
 import UI.PixmapCache
+from UI.NotificationWidget import NotificationTypes
 import Preferences
 import Utilities
 from eric6config import getConfig
 appendStderr = pyqtSignal(str)
 uipreview = pyqtSignal(str)
 showMenu = pyqtSignal(str, QMenu)
 menusAboutToBeCreated = pyqtSignal()
-PyuicIndentDefault = 4
+Pyuic5IndentDefault = 4
+Pyuic6IndentDefault = 4
 def __init__(self, project, parent=None):
 """
 Constructor
 self.dirMenuActions = []
 self.dirMultiMenuActions = []
 self.menusAboutToBeCreated.emit()
+projectType = self.project.getProjectType()
 self.menu = QMenu(self)
-if self.project.getProjectType() in ["PyQt5", "E6Plugin", "PySide2"]:
+if projectType in ["PyQt5", "PyQt6", "E6Plugin", "PySide2", "PySide6"]:
 self.menu.addAction(
 self.tr('Compile form'), self.__compileForm)
 self.menu.addAction(
 self.tr('Compile all forms'),
 self.__compileAllForms)
 self.tr('Remove from project'), self._removeFile)
 self.menuActions.append(act)
 act = self.menu.addAction(self.tr('Delete'), self.__deleteFile)
 self.menuActions.append(act)
 self.menu.addSeparator()
-if self.project.getProjectType() in ["PyQt5", "E6Plugin", "PySide2"]:
+if projectType in ["PyQt5", "PyQt6", "E6Plugin", "PySide2", "PySide6"]:
 self.menu.addAction(self.tr('New form...'), self.__newForm)
 else:
 if self.hooks["newForm"] is not None:
 self.menu.addAction(
 self.hooksMenuEntries.get(
 self.menu.addSeparator()
 self.menu.addAction(self.tr('Configure...'), self._configure)
 self.backMenu = QMenu(self)
 if (
-self.project.getProjectType() in [
+projectType in [
-"PyQt5", "E6Plugin", "PySide2"
+"PyQt5", "PyQt6", "E6Plugin", "PySide2", "PySide6"
-] or
+] or self.hooks["compileAllForms"] is not None
-self.hooks["compileAllForms"] is not None
 ):
 self.backMenu.addAction(
 self.tr('Compile all forms'), self.__compileAllForms)
 self.backMenu.addSeparator()
 self.__pyuicBackConfigAct = self.backMenu.addAction(
 self.backMenu.addAction(self.tr('Configure...'), self._configure)
 self.backMenu.setEnabled(False)
 # create the menu for multiple selected files
 self.multiMenu = QMenu(self)
-if self.project.getProjectType() in ["PyQt5", "E6Plugin", "PySide2"]:
+if projectType in ["PyQt5", "PyQt6", "E6Plugin", "PySide2", "PySide6"]:
 self.multiMenu.addAction(
 self.tr('Compile forms'), self.__compileSelectedForms)
 self.multiMenu.addSeparator()
 self.__pyuicMultiConfigAct = self.multiMenu.addAction(
 self.tr('Configure uic Compiler'),
 self.tr('Collapse all directories'), self._collapseAllDirs)
 self.multiMenu.addSeparator()
 self.multiMenu.addAction(self.tr('Configure...'), self._configure)
 self.dirMenu = QMenu(self)
-if self.project.getProjectType() in ["PyQt5", "E6Plugin", "PySide2"]:
+if projectType in ["PyQt5", "PyQt6", "E6Plugin", "PySide2", "PySide6"]:
 self.dirMenu.addAction(
 self.tr('Compile all forms'), self.__compileAllForms)
 self.dirMenu.addSeparator()
 self.__pyuicDirConfigAct = self.dirMenu.addAction(
 self.tr('Configure uic Compiler'),
 self.dirMenuActions.append(act)
 act = self.dirMenu.addAction(
 self.tr('Delete'), self._deleteDirectory)
 self.dirMenuActions.append(act)
 self.dirMenu.addSeparator()
-if self.project.getProjectType() in ["PyQt5", "E6Plugin", "PySide2"]:
+if projectType in ["PyQt5", "PyQt6", "E6Plugin", "PySide2", "PySide6"]:
 self.dirMenu.addAction(self.tr('New form...'), self.__newForm)
 else:
 if self.hooks["newForm"] is not None:
 self.dirMenu.addAction(
 self.hooksMenuEntries.get(
 self.tr('Collapse all directories'), self._collapseAllDirs)
 self.dirMenu.addSeparator()
 self.dirMenu.addAction(self.tr('Configure...'), self._configure)
 self.dirMultiMenu = QMenu(self)
-if self.project.getProjectType() in ["PyQt5", "E6Plugin", "PySide2"]:
+if projectType in ["PyQt5", "PyQt6", "E6Plugin", "PySide2", "PySide6"]:
 self.dirMultiMenu.addAction(
 self.tr('Compile all forms'), self.__compileAllForms)
 self.dirMultiMenu.addSeparator()
 self.__pyuicDirMultiConfigAct = self.dirMultiMenu.addAction(
 self.tr('Configure uic Compiler'),
 @param coord the position of the mouse pointer (QPoint)
 """
 if not self.project.isOpen():
 return
-enable = self.project.getProjectType() in ("PyQt5", "E6Plugin")
+enable = (
+self.project.getProjectType() in ("PyQt5", "PyQt6", "E6Plugin")
+)
 self.__pyuicConfigAct.setEnabled(enable)
 self.__pyuicMultiConfigAct.setEnabled(enable)
 self.__pyuicDirConfigAct.setEnabled(enable)
 self.__pyuicDirMultiConfigAct.setEnabled(enable)
 self.__pyuicBackConfigAct.setEnabled(enable)
 if self.hooks["newForm"] is not None:
 self.hooks["newForm"](path)
 else:
 if self.project.getProjectType() in [
-"PyQt5", "E6Plugin", "PySide2"
+"PyQt5", "PyQt6", "E6Plugin", "PySide2", "PySide6"
 ]:
 self.__newUiForm(path)
 def __newUiForm(self, path):
 """
 if self.project.getProjectLanguage() == "Python3":
 if self.project.getProjectType() in ["PyQt5"]:
 self.__uicompiler = Utilities.generatePyQtToolPath(
 'pyuic5', ["py3uic5"])
+elif self.project.getProjectType() in ["PyQt6"]:
+self.__uicompiler = Utilities.generatePyQtToolPath(
+'pyuic6')
 elif self.project.getProjectType() in ["E6Plugin"]:
 self.__uicompiler = Utilities.generatePyQtToolPath(
 'pyuic5', ["py3uic5"])
 elif self.project.getProjectType() == "PySide2":
 self.__uicompiler = Utilities.generatePySideToolPath(
-'pyside2-uic')
+'pyside2-uic', variant=2)
+elif self.project.getProjectType() == "PySide6":
+self.__uicompiler = Utilities.generatePySideToolPath(
+'pyside6-uic', variant=6)
 def getUiCompiler(self):
 """
 Public method to get the UI compiler executable of the project.
 return self.__uicompiler
 def __readStdout(self):
 """
 Private slot to handle the readyReadStandardOutput signal of the
-pyuic5/pyside2-uic process.
+pyuic5/pyuic6/pyside2-uic/pyside6-uic process.
 """
 if self.compileProc is None:
 return
 self.compileProc.setReadChannel(QProcess.StandardOutput)
 "utf-8", 'replace')
 def __readStderr(self):
 """
 Private slot to handle the readyReadStandardError signal of the
-pyuic5/pyside2-uic process.
+pyuic5/pyuic6/pyside2-uic/pyside6-uic process.
 """
 if self.compileProc is None:
 return
 ioEncoding = Preferences.getSystem("IOEncoding")
 with open(ofn, "w", encoding="utf-8", newline=newline) as f:
 for line in self.buf.splitlines():
 f.write(line + "\n")
 if self.compiledFile not in self.project.pdata["SOURCES"]:
 self.project.appendFile(ofn)
-if not self.noDialog and not ui.notificationsEnabled():
-E5MessageBox.information(
-self,
-self.tr("Form Compilation"),
-self.tr("The compilation of the form file"
-" was successful."))
-else:
-ui.showNotification(
-UI.PixmapCache.getPixmap("designer48"),
-self.tr("Form Compilation"),
-self.tr("The compilation of the form file"
-" was successful."))
-self.project.projectFormCompiled.emit(self.compiledFile)
-except OSError as msg:
-if not self.noDialog:
-E5MessageBox.information(
-self,
-self.tr("Form Compilation"),
-self.tr(
-"<p>The compilation of the form file failed.</p>"
-"<p>Reason: {0}</p>").format(str(msg)))
-else:
-ui.showNotification(
-UI.PixmapCache.getPixmap("designer48"),
-self.tr("Form Compilation"),
-self.tr(
-"<p>The compilation of the form file failed.</p>"
-"<p>Reason: {0}</p>").format(str(msg)))
-else:
-if not self.noDialog:
-E5MessageBox.information(
-self,
-self.tr("Form Compilation"),
-self.tr("The compilation of the form file failed."))
-else:
 ui.showNotification(
 UI.PixmapCache.getPixmap("designer48"),
 self.tr("Form Compilation"),
-self.tr("The compilation of the form file failed."))
+self.tr("The compilation of the form file"
+" was successful."))
+self.project.projectFormCompiled.emit(self.compiledFile)
+except OSError as msg:
+ui.showNotification(
+UI.PixmapCache.getPixmap("designer48"),
+self.tr("Form Compilation"),
+self.tr(
+"<p>The compilation of the form file failed.</p>"
+"<p>Reason: {0}</p>").format(str(msg)),
+kind=NotificationTypes.Critical,
+timeout=0)
+else:
+ui.showNotification(
+UI.PixmapCache.getPixmap("designer48"),
+self.tr("Form Compilation"),
+self.tr("The compilation of the form file failed."),
+kind=NotificationTypes.Critical,
+timeout=0)
 self.compileProc = None
 def __compileUI(self, fn, noDialog=False, progress=None):
 """
 Private method to compile a .ui file to a .py/.rb file.
 if self.project.getProjectType() == "PySide2":
 # PySide2
 if Preferences.getQt("PySide2FromImports"):
 args.append("--from-imports")
+elif self.project.getProjectType() == "PySide6":
+# PySide6
+if Preferences.getQt("PySide6FromImports"):
+args.append("--from-imports")
+elif self.project.getProjectType() == "PyQt6":
+# PyQt6
+if Preferences.getQt("Pyuic6Execute"):
+args.append("-x")
+indentWidth = Preferences.getQt("Pyuic6Indent")
+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.PyuicIndentDefault:
+if indentWidth != self.Pyuic5IndentDefault:
 args.append("--indent={0}".format(indentWidth))
 if (
 'uic5' in uicompiler and
 self.project.pdata["UICPARAMS"]["Package"]
 ):
 """
 if self.hooks["compileChangedForms"] is not None:
 self.hooks["compileChangedForms"](self.project.pdata["FORMS"])
 else:
 if self.project.getProjectType() not in [
-"PyQt5", "E6Plugin", "PySide2"
+"PyQt5", "PyQt6", "E6Plugin", "PySide2", "PySide6"
 ]:
 # ignore the request for non Qt GUI projects
 return
 progress = E5ProgressDialog(
 """
 from .UicCompilerOptionsDialog import UicCompilerOptionsDialog
 params = self.project.pdata["UICPARAMS"]
-if self.project.getProjectType() in ["PyQt5", "E6Plugin"]:
+if self.project.getProjectType() in ["PyQt5", "PyQt6", "E6Plugin"]:
 dlg = UicCompilerOptionsDialog(params, self.getUiCompiler())
 if dlg.exec() == QDialog.Accepted:
 package, suffix, root = dlg.getData()
 if package != params["Package"]:
 params["Package"] = package

Mercurial Repositories > eric / file comparison

comparison: eric6/Project/ProjectFormsBrowser.py

eric6/Project/ProjectFormsBrowser.py