Added the capability to define some help documentations with the qthelp:// scheme.

Mon, 17 Oct 2016 18:46:35 +0200

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Mon, 17 Oct 2016 18:46:35 +0200
changeset 5248
7675ecd58263
parent 5247
1fb624677956
child 5250
2f22b20ea9ad

Added the capability to define some help documentations with the qthelp:// scheme.

UI/UserInterface.py file | annotate | diff | comparison | revisions
--- a/UI/UserInterface.py	Sun Oct 16 22:35:11 2016 +0200
+++ b/UI/UserInterface.py	Mon Oct 17 18:46:35 2016 +0200
@@ -4865,7 +4865,7 @@
                 pythonDocDir = Utilities.getEnvironmentEntry(
                     "PYTHON3DOCDIR",
                     '/usr/share/doc/packages/python3/html')
-        if not pythonDocDir.startswith(("http://", "https://")):
+        if not pythonDocDir.startswith(("http://", "https://", "qthelp://")):
             if pythonDocDir.startswith("file://"):
                 pythonDocDir = pythonDocDir[7:]
             if not os.path.splitext(pythonDocDir)[1]:
@@ -4934,7 +4934,7 @@
                 pythonDocDir = Utilities.getEnvironmentEntry(
                     "PYTHON2DOCDIR",
                     '/usr/share/doc/packages/python/html')
-        if not pythonDocDir.startswith(("http://", "https://")):
+        if not pythonDocDir.startswith(("http://", "https://", "qthelp://")):
             if pythonDocDir.startswith("file://"):
                 pythonDocDir = pythonDocDir[7:]
             if not os.path.splitext(pythonDocDir)[1]:
@@ -5063,7 +5063,7 @@
                         """ has not been configured.</p>"""))
             return
         
-        if not pyqt4DocDir.startswith(("http://", "https://")):
+        if not pyqt4DocDir.startswith(("http://", "https://", "qthelp://")):
             home = ""
             if pyqt4DocDir:
                 if pyqt4DocDir.startswith("file://"):
@@ -5128,7 +5128,7 @@
                         """ has not been configured.</p>"""))
             return
         
-        if not pyqt5DocDir.startswith(("http://", "https://")):
+        if not pyqt5DocDir.startswith(("http://", "https://", "qthelp://")):
             home = ""
             if pyqt5DocDir:
                 if pyqt5DocDir.startswith("file://"):
@@ -5235,7 +5235,7 @@
                         """ has not been configured.</p>"""))
             return
         
-        if not pysideDocDir.startswith(("http://", "https://")):
+        if not pysideDocDir.startswith(("http://", "https://", "qthelp://")):
             if pysideDocDir.startswith("file://"):
                 pysideDocDir = pysideDocDir[7:]
             if not os.path.splitext(pysideDocDir)[1]:

eric ide

mercurial