diff -r 6ff7ccf0cb50 -r a5248d27c8a9 eric6/UI/UserInterface.py
--- a/eric6/UI/UserInterface.py Sat Dec 19 19:57:09 2020 +0100
+++ b/eric6/UI/UserInterface.py Sun Dec 20 12:35:26 2020 +0100
@@ -2852,7 +2852,7 @@
"""
self.qt5DocAct = E5Action(
self.tr('Qt5 Documentation'),
- self.tr('Qt&5 Documentation'),
+ self.tr('Qt5 Documentation'),
0, 0, self, 'qt5_documentation')
self.qt5DocAct.setStatusTip(self.tr('Open Qt5 Documentation'))
self.qt5DocAct.setWhatsThis(self.tr(
@@ -2862,12 +2862,27 @@
""" help viewer/web browser, or execute a web browser or Qt"""
""" Assistant. </p>"""
))
- self.qt5DocAct.triggered.connect(self.__showQt5Doc)
+ self.qt5DocAct.triggered.connect(lambda: self.__showQtDoc(5))
self.actions.append(self.qt5DocAct)
+ self.qt6DocAct = E5Action(
+ self.tr('Qt6 Documentation'),
+ self.tr('Qt6 Documentation'),
+ 0, 0, self, 'qt6_documentation')
+ self.qt6DocAct.setStatusTip(self.tr('Open Qt6 Documentation'))
+ self.qt6DocAct.setWhatsThis(self.tr(
+ """<b>Qt6 Documentation</b>"""
+ """<p>Display the Qt6 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.qt6DocAct.triggered.connect(lambda: self.__showQtDoc(6))
+ self.actions.append(self.qt6DocAct)
+
self.pyqt5DocAct = E5Action(
self.tr('PyQt5 Documentation'),
- self.tr('PyQt&5 Documentation'),
+ self.tr('PyQt5 Documentation'),
0, 0, self, 'pyqt5_documentation')
self.pyqt5DocAct.setStatusTip(self.tr(
'Open PyQt5 Documentation'))
@@ -3235,8 +3250,8 @@
self.__menus["help"].addAction(self.ericDocAct)
self.__menus["help"].addAction(self.pythonDocAct)
self.__menus["help"].addAction(self.qt5DocAct)
- if self.pyqt5DocAct is not None:
- self.__menus["help"].addAction(self.pyqt5DocAct)
+ self.__menus["help"].addAction(self.qt6DocAct)
+ self.__menus["help"].addAction(self.pyqt5DocAct)
if self.pyside2DocAct is not None:
self.__menus["help"].addAction(self.pyside2DocAct)
self.__menus["help"].addSeparator()
@@ -5640,20 +5655,17 @@
else:
self.__customViewer(home)
- def __showQt5Doc(self):
- """
- Private slot to show the Qt5 documentation.
- """
- self.__showQtDoc(5)
-
def __showQtDoc(self, version):
"""
Private method to show the Qt documentation.
- @param version Qt version to show documentation for (integer)
- """
- if version == 5:
- qtDocDir = Preferences.getQt5DocDir()
+ @param version Qt version to show documentation for
+ @type int
+ """
+ if version in [5, 6]:
+ qtDocDir = Preferences.getQtDocDir(version)
+ else:
+ return
if qtDocDir.startswith("qthelp://"):
if not os.path.splitext(qtDocDir)[1]:
