eric: changeset 4137:54c38749f153

Binary file Documentation/Help/source.qch has changed
--- a/Preferences/ConfigurationPages/HelpDocumentationPage.py	Fri Feb 27 19:44:08 2015 +0100
+++ b/Preferences/ConfigurationPages/HelpDocumentationPage.py	Sat Feb 28 15:49:35 2015 +0100
@@ -71,7 +71,7 @@
         self.qt5DocDirEdit.setText(
             Preferences.getHelp("Qt5DocDir"))
         self.pyqt4DocDirEdit.setText(
-            Preferences.getHelp("PyQt5DocDir"))
+            Preferences.getHelp("PyQt4DocDir"))
         self.pyqt5DocDirEdit.setText(
             Preferences.getHelp("PyQt5DocDir"))
         self.pysideDocDirEdit.setText(
@@ -94,7 +94,7 @@
             "Qt5DocDir",
             self.qt5DocDirEdit.text())
         Preferences.setHelp(
-            "PyQt5DocDir",
+            "PyQt4DocDir",
             self.pyqt4DocDirEdit.text())
         Preferences.setHelp(
             "PyQt5DocDir",
--- a/Preferences/__init__.py	Fri Feb 27 19:44:08 2015 +0100
+++ b/Preferences/__init__.py	Sat Feb 28 15:49:35 2015 +0100
@@ -805,7 +805,7 @@
         "QtDocDir": "",
         "Qt4DocDir": "",
         "Qt5DocDir": "",
-        "PyQt5DocDir": "",
+        "PyQt4DocDir": "",
         "PyQt5DocDir": "",
         "PySideDocDir": "",
         "SingleHelpWindow": True,
--- a/UI/UserInterface.py	Fri Feb 27 19:44:08 2015 +0100
+++ b/UI/UserInterface.py	Sat Feb 28 15:49:35 2015 +0100
@@ -4732,7 +4732,7 @@
             else:
                 pythonDocDir = Utilities.getEnvironmentEntry(
                     "PYTHON3DOCDIR",
-                    '/usr/share/doc/packages/python/html')
+                    '/usr/share/doc/packages/python3/html')
         if not pythonDocDir.startswith("http://") and \
            not pythonDocDir.startswith("https://"):
             if pythonDocDir.startswith("file://"):
@@ -4796,7 +4796,7 @@
             else:
                 pythonDocDir = Utilities.getEnvironmentEntry(
                     "PYTHON2DOCDIR",
-                    '/usr/share/doc/packages/python/html/python-docs-html')
+                    '/usr/share/doc/packages/python/html')
         if not pythonDocDir.startswith("http://") and \
            not pythonDocDir.startswith("https://"):
             if pythonDocDir.startswith("file://"):
Documentation/Help/source.qch		file \| annotate \| diff \| comparison \| revisions
Preferences/ConfigurationPages/HelpDocumentationPage.py		file \| annotate \| diff \| comparison \| revisions
Preferences/__init__.py		file \| annotate \| diff \| comparison \| revisions
UI/UserInterface.py		file \| annotate \| diff \| comparison \| revisions