eric: comparison eric6/UI/UserInterface.py

-:2eeec6bc49e6
+:4621c9082a43
 """<p>Display the PyQt5 Documentation. Dependent upon your"""
 """ settings, this will either show the help in Eric's"""
 """ internal help viewer/web browser, or execute a web"""
 """ browser or Qt Assistant. </p>"""
 ))
-self.pyqt5DocAct.triggered.connect(self.__showPyQt5Doc)
+self.pyqt5DocAct.triggered.connect(
+lambda: self.__showPyQtDoc(variant=5))
 self.actions.append(self.pyqt5DocAct)
+self.pyqt6DocAct = E5Action(
+self.tr('PyQt6 Documentation'),
+self.tr('PyQt6 Documentation'),
+0, 0, self, 'pyqt6_documentation')
+self.pyqt6DocAct.setStatusTip(self.tr(
+'Open PyQt6 Documentation'))
+self.pyqt6DocAct.setWhatsThis(self.tr(
+"""<b>PyQt6 Documentation</b>"""
+"""<p>Display the PyQt6 Documentation. Dependent upon your"""
+""" settings, this will either show the help in Eric's"""
+""" internal help viewer/web browser, or execute a web"""
+""" browser or Qt Assistant. </p>"""
+))
+self.pyqt6DocAct.triggered.connect(
+lambda: self.__showPyQtDoc(variant=6))
+self.actions.append(self.pyqt6DocAct)
 def __initPythonDocActions(self):
 """
 Private slot to initialize the actions to show the Python
 documentation.
 """
 self.pythonDocAct = E5Action(
 self.tr('Python 3 Documentation'),
-self.tr('Python &3 Documentation'),
+self.tr('Python 3 Documentation'),
 0, 0, self, 'python3_documentation')
 self.pythonDocAct.setStatusTip(self.tr(
 'Open Python 3 Documentation'))
 self.pythonDocAct.setWhatsThis(self.tr(
 """<b>Python 3 Documentation</b>"""
 """
 Private slot to initialize the action to show the eric6 documentation.
 """
 self.ericDocAct = E5Action(
 self.tr("Eric API Documentation"),
-self.tr('&Eric API Documentation'),
+self.tr('Eric API Documentation'),
 0, 0, self, 'eric_documentation')
 self.ericDocAct.setStatusTip(self.tr(
 "Open Eric API Documentation"))
 self.ericDocAct.setWhatsThis(self.tr(
 """<b>Eric API Documentation</b>"""
 documentation.
 """
 if Utilities.checkPyside(variant=2):
 self.pyside2DocAct = E5Action(
 self.tr('PySide2 Documentation'),
-self.tr('PySide&2 Documentation'),
+self.tr('PySide2 Documentation'),
 0, 0, self, 'pyside2_documentation')
 self.pyside2DocAct.setStatusTip(self.tr(
 'Open PySide2 Documentation'))
 self.pyside2DocAct.setWhatsThis(self.tr(
 """<b>PySide2 Documentation</b>"""
 """ settings, this will either show the help in Eric's"""
 """ internal help viewer/web browser, or execute a web"""
 """ browser or Qt Assistant. </p>"""
 ))
 self.pyside2DocAct.triggered.connect(
-lambda: self.__showPySideDoc("2"))
+lambda: self.__showPySideDoc(variant=2))
 self.actions.append(self.pyside2DocAct)
 else:
 self.pyside2DocAct = None
+if Utilities.checkPyside(variant=6):
+self.pyside6DocAct = E5Action(
+self.tr('PySide6 Documentation'),
+self.tr('PySide6 Documentation'),
+0, 0, self, 'pyside6_documentation')
+self.pyside6DocAct.setStatusTip(self.tr(
+'Open PySide6 Documentation'))
+self.pyside6DocAct.setWhatsThis(self.tr(
+"""<b>PySide6 Documentation</b>"""
+"""<p>Display the PySide6 Documentation. Dependent upon your"""
+""" settings, this will either show the help in Eric's"""
+""" internal help viewer/web browser, or execute a web"""
+""" browser or Qt Assistant. </p>"""
+))
+self.pyside6DocAct.triggered.connect(
+lambda: self.__showPySideDoc(variant=6))
+self.actions.append(self.pyside6DocAct)
+else:
+self.pyside6DocAct = None
 def __initMenus(self):
 """
 Private slot to create the menus.
 """
 self.__menus["help"].addAction(self.ericDocAct)
 self.__menus["help"].addAction(self.pythonDocAct)
 self.__menus["help"].addAction(self.qt5DocAct)
 self.__menus["help"].addAction(self.qt6DocAct)
 self.__menus["help"].addAction(self.pyqt5DocAct)
+self.__menus["help"].addAction(self.pyqt6DocAct)
 if self.pyside2DocAct is not None:
 self.__menus["help"].addAction(self.pyside2DocAct)
+if self.pyside6DocAct is not None:
+self.__menus["help"].addAction(self.pyside6DocAct)
 self.__menus["help"].addSeparator()
 self.__menus["help"].addAction(self.versionAct)
 self.__menus["help"].addSeparator()
 self.__menus["help"].addAction(self.checkUpdateAct)
 self.__menus["help"].addAction(self.showVersionsAct)
 elif hvType == 3:
 self.__webBrowser(home)
 else:
 self.__customViewer(home)
-def __showPyQt5Doc(self):
+def __showPyQtDoc(self, variant=5):
 """
-Private slot to show the PyQt5 documentation.
+Private slot to show the PyQt5/6 documentation.
-"""
-pyqt5DocDir = Preferences.getHelp("PyQt5DocDir")
+@param variant PyQt variant to show documentation for (5 or 6)
-if not pyqt5DocDir:
+@type int or str
-pyqt5DocDir = Utilities.getEnvironmentEntry("PYQT5DOCDIR", None)
+"""
+pyqtDocDir = Preferences.getHelp("PyQt{0}DocDir".format(variant))
-if not pyqt5DocDir:
+if not pyqtDocDir:
+pyqtDocDir = Utilities.getEnvironmentEntry(
+"PYQT{0}DOCDIR".format(variant), None)
+if not pyqtDocDir:
 E5MessageBox.warning(
 self,
 self.tr("Documentation"),
-self.tr("""<p>The PyQt5 documentation starting point"""
+self.tr("""<p>The PyQt{0} documentation starting point"""
-""" has not been configured.</p>"""))
+""" has not been configured.</p>""").format(variant))
 return
-if not pyqt5DocDir.startswith(("http://", "https://", "qthelp://")):
+if not pyqtDocDir.startswith(("http://", "https://", "qthelp://")):
 home = ""
-if pyqt5DocDir:
+if pyqtDocDir:
-if pyqt5DocDir.startswith("file://"):
+if pyqtDocDir.startswith("file://"):
-pyqt5DocDir = pyqt5DocDir[7:]
+pyqtDocDir = pyqtDocDir[7:]
-if not os.path.splitext(pyqt5DocDir)[1]:
+if not os.path.splitext(pyqtDocDir)[1]:
 possibleHomes = [
 Utilities.normjoinpath(
-pyqt5DocDir, 'index.html'),
+pyqtDocDir, 'index.html'),
 Utilities.normjoinpath(
-pyqt5DocDir, 'class_reference.html'),
+pyqtDocDir, 'class_reference.html'),
 ]
 for possibleHome in possibleHomes:
 if os.path.exists(possibleHome):
 home = possibleHome
 break
 else:
-home = pyqt5DocDir
+home = pyqtDocDir
 if not home or not os.path.exists(home):
 E5MessageBox.warning(
 self,
 self.tr("Documentation Missing"),
 if Utilities.isWindowsPlatform():
 home = "file:///" + Utilities.fromNativeSeparators(home)
 else:
 home = "file://" + home
 else:
-home = pyqt5DocDir
+home = pyqtDocDir
 hvType = Preferences.getWebBrowser("HelpViewerType")
 if hvType == 1:
 self.launchHelpViewer(home)
 elif hvType == 2:
 elif hvType == 3:
 self.__webBrowser(home)
 else:
 self.__customViewer(home)
-def __showPySideDoc(self, variant="2"):
+def __showPySideDoc(self, variant=2):
 """
-Private slot to show the PySide2 documentation.
+Private slot to show the PySide2/PySide6 documentation.
-@param variant PySide variant (2)
+@param variant PySide variant (2 or 6)
-@type str
+@type int or str
 """
-pysideDocDir = Preferences.getHelp("PySide2DocDir")
+pysideDocDir = Preferences.getHelp("PySide{0}DocDir".format(variant))
 if not pysideDocDir:
 pysideDocDir = Utilities.getEnvironmentEntry(
-"PYSIDE2DOCDIR", None)
+"PYSIDE{0}DOCDIR".format(variant), None)
 if not pysideDocDir:
 E5MessageBox.warning(
 self,
 self.tr("Documentation"),

Mercurial Repositories > eric / file comparison

comparison: eric6/UI/UserInterface.py

eric6/UI/UserInterface.py