Mercurial Repositories > eric / changeset
changeset
Fixed some stupid copy&paste issues related to help files.
Sat, 28 Feb 2015 15:49:35 +0100
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Sat, 28 Feb 2015 15:49:35 +0100
- branch
- 6_0_x
- changeset 4138
- 95a60072ba45
- parent 4136
- 8254abb49c53
- child 4140
- 22040bea71a0
Fixed some stupid copy&paste issues related to help files.
(grafted from 54c38749f15320a1e1d926bbc724aed6a6dec164)
--- a/Preferences/ConfigurationPages/HelpDocumentationPage.py Fri Feb 27 19:45:53 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:45:53 2015 +0100 +++ b/Preferences/__init__.py Sat Feb 28 15:49:35 2015 +0100 @@ -697,7 +697,7 @@ "QtDocDir": "", "Qt4DocDir": "", "Qt5DocDir": "", - "PyQt5DocDir": "", + "PyQt4DocDir": "", "PyQt5DocDir": "", "PySideDocDir": "", "SingleHelpWindow": True,
--- a/UI/UserInterface.py Fri Feb 27 19:45:53 2015 +0100 +++ b/UI/UserInterface.py Sat Feb 28 15:49:35 2015 +0100 @@ -4685,7 +4685,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://"): @@ -4749,7 +4749,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://"):
