Mercurial Repositories > eric / changeset

--- a/APIs/Python3/eric6.api	Mon Oct 23 19:41:35 2017 +0200
+++ b/APIs/Python3/eric6.api	Mon Oct 23 19:42:17 2017 +0200
@@ -1251,7 +1251,7 @@
 eric6.E5Gui.E5TableView.E5TableView.keyPressEvent?4(evt)
 eric6.E5Gui.E5TableView.E5TableView.removeAll?4()
 eric6.E5Gui.E5TableView.E5TableView.removeSelected?4()
-eric6.E5Gui.E5TextEditSearchWidget.E5TextEditSearchWidget.attachTextEdit?4(textedit)
+eric6.E5Gui.E5TextEditSearchWidget.E5TextEditSearchWidget.attachTextEdit?4(textedit, editType="QTextEdit")
 eric6.E5Gui.E5TextEditSearchWidget.E5TextEditSearchWidget.keyPressEvent?4(event)
 eric6.E5Gui.E5TextEditSearchWidget.E5TextEditSearchWidget.on_findNextButton_clicked?4()
 eric6.E5Gui.E5TextEditSearchWidget.E5TextEditSearchWidget.on_findPrevButton_clicked?4()
@@ -1541,11 +1541,13 @@
 eric6.E5Utilities.E5Cache.E5Cache.add?4(key, item)
 eric6.E5Utilities.E5Cache.E5Cache.clear?4()
 eric6.E5Utilities.E5Cache.E5Cache.get?4(key)
+eric6.E5Utilities.E5Cache.E5Cache.getMaximumCacheTime?4()
 eric6.E5Utilities.E5Cache.E5Cache.getSize?4()
 eric6.E5Utilities.E5Cache.E5Cache.info?4()
 eric6.E5Utilities.E5Cache.E5Cache.length?4()
 eric6.E5Utilities.E5Cache.E5Cache.remove?4(key)
 eric6.E5Utilities.E5Cache.E5Cache.reset?4()
+eric6.E5Utilities.E5Cache.E5Cache.setMaximumCacheTime?4(time)
 eric6.E5Utilities.E5Cache.E5Cache.setSize?4(newSize)
 eric6.E5Utilities.E5Cache.E5Cache?1(size=100)
 eric6.E5XML.Config.debuggerPropertiesFileFormatVersion?7
@@ -6309,6 +6311,9 @@
 eric6.Preferences.ConfigurationPages.EditorCalltipsQScintillaPage.EditorCalltipsQScintillaPage.save?4()
 eric6.Preferences.ConfigurationPages.EditorCalltipsQScintillaPage.EditorCalltipsQScintillaPage?1()
 eric6.Preferences.ConfigurationPages.EditorCalltipsQScintillaPage.create?4(dlg)
+eric6.Preferences.ConfigurationPages.EditorDocViewerPage.EditorDocViewerPage.save?4()
+eric6.Preferences.ConfigurationPages.EditorDocViewerPage.EditorDocViewerPage?1(parent=None)
+eric6.Preferences.ConfigurationPages.EditorDocViewerPage.create?4(dlg)
 eric6.Preferences.ConfigurationPages.EditorExportersPage.EditorExportersPage.on_exportersCombo_activated?4(exporter)
 eric6.Preferences.ConfigurationPages.EditorExportersPage.EditorExportersPage.on_rtfFontButton_clicked?4()
 eric6.Preferences.ConfigurationPages.EditorExportersPage.EditorExportersPage.save?4()
@@ -6590,6 +6595,7 @@
 eric6.Preferences.Prefs.corbaDefaults?7
 eric6.Preferences.Prefs.debuggerDefaults?7
 eric6.Preferences.Prefs.diffColourDefaults?7
+eric6.Preferences.Prefs.docuViewerDefaults?7
 eric6.Preferences.Prefs.editorColourDefaults?7
 eric6.Preferences.Prefs.editorDefaults?7
 eric6.Preferences.Prefs.editorExporterDefaults?7
@@ -6686,6 +6692,7 @@
 eric6.Preferences.getCorba?4(key, prefClass=Prefs)
 eric6.Preferences.getDebugger?4(key, prefClass=Prefs)
 eric6.Preferences.getDiffColour?4(key, prefClass=Prefs)
+eric6.Preferences.getDocuViewer?4(key, prefClass=Prefs)
 eric6.Preferences.getEditor?4(key, prefClass=Prefs)
 eric6.Preferences.getEditorAPI?4(language, projectType="", prefClass=Prefs)
 eric6.Preferences.getEditorColour?4(key, prefClass=Prefs)
@@ -6740,6 +6747,7 @@
 eric6.Preferences.setCorba?4(key, value, prefClass=Prefs)
 eric6.Preferences.setDebugger?4(key, value, prefClass=Prefs)
 eric6.Preferences.setDiffColour?4(key, value, prefClass=Prefs)
+eric6.Preferences.setDocuViewer?4(key, value, prefClass=Prefs)
 eric6.Preferences.setEditor?4(key, value, prefClass=Prefs)
 eric6.Preferences.setEditorAPI?4(language, projectType, apilist, prefClass=Prefs)
 eric6.Preferences.setEditorColour?4(key, value, prefClass=Prefs)
@@ -8669,6 +8677,29 @@
 eric6.UI.BrowserSortFilterProxyModel.BrowserSortFilterProxyModel?1(parent=None)
 eric6.UI.ClearPrivateDataDialog.ClearPrivateDataDialog.getData?4()
 eric6.UI.ClearPrivateDataDialog.ClearPrivateDataDialog?1(parent=None)
+eric6.UI.CodeDocumentationViewer.CodeDocumentationViewer.documentationReady?4(documentationInfo, isWarning=False, isDocWarning=False)
+eric6.UI.CodeDocumentationViewer.CodeDocumentationViewer.finalizeSetup?4()
+eric6.UI.CodeDocumentationViewer.CodeDocumentationViewer.getProviders?4()
+eric6.UI.CodeDocumentationViewer.CodeDocumentationViewer.isSupportedLanguage?4(language)
+eric6.UI.CodeDocumentationViewer.CodeDocumentationViewer.on_providerComboBox_currentIndexChanged?4(index)
+eric6.UI.CodeDocumentationViewer.CodeDocumentationViewer.preferencesChanged?4()
+eric6.UI.CodeDocumentationViewer.CodeDocumentationViewer.providerAdded?7
+eric6.UI.CodeDocumentationViewer.CodeDocumentationViewer.providerRemoved?7
+eric6.UI.CodeDocumentationViewer.CodeDocumentationViewer.registerProvider?4(providerName, providerDisplay, provider, supported)
+eric6.UI.CodeDocumentationViewer.CodeDocumentationViewer.showInfo?4(editor)
+eric6.UI.CodeDocumentationViewer.CodeDocumentationViewer.shutdown?4()
+eric6.UI.CodeDocumentationViewer.CodeDocumentationViewer.unregisterProvider?4(providerName)
+eric6.UI.CodeDocumentationViewer.CodeDocumentationViewer?1(parent=None)
+eric6.UI.CodeDocumentationViewer.PlainTextDocumentationViewer.clear?4()
+eric6.UI.CodeDocumentationViewer.PlainTextDocumentationViewer.preferencesChanged?4()
+eric6.UI.CodeDocumentationViewer.PlainTextDocumentationViewer.setText?4(text)
+eric6.UI.CodeDocumentationViewer.PlainTextDocumentationViewer?1(parent=None)
+eric6.UI.CodeDocumentationViewer.WebViewDocumentationViewer.clear?4()
+eric6.UI.CodeDocumentationViewer.WebViewDocumentationViewer.setHtml?4(html)
+eric6.UI.CodeDocumentationViewer.WebViewDocumentationViewer?1(parent=None)
+eric6.UI.CodeDocumentationViewerTemplate.prepareDocumentationViewerHtmlDocWarningDocument?4(text)
+eric6.UI.CodeDocumentationViewerTemplate.prepareDocumentationViewerHtmlDocument?4(documentationInfo)
+eric6.UI.CodeDocumentationViewerTemplate.prepareDocumentationViewerHtmlWarningDocument?4(text)
 eric6.UI.CompareDialog.CompareDialog.compare?4(lines1, lines2, name1="", name2="")
 eric6.UI.CompareDialog.CompareDialog.on_buttonBox_clicked?4(button)
 eric6.UI.CompareDialog.CompareDialog.on_diffButton_clicked?4()
@@ -8874,6 +8905,7 @@
 eric6.UI.UserInterface.UserInterface.ErrorLogFileName?7
 eric6.UI.UserInterface.UserInterface.LeftSide?7
 eric6.UI.UserInterface.UserInterface.RightSide?7
+eric6.UI.UserInterface.UserInterface.activateCodeDocumentationViewer?4(switchFocus=True)
 eric6.UI.UserInterface.UserInterface.activateCooperationViewer?4()
 eric6.UI.UserInterface.UserInterface.addE5Actions?4(actions, actionType)
 eric6.UI.UserInterface.UserInterface.addSideWidget?4(side, widget, icon, label)
@@ -8888,6 +8920,7 @@
 eric6.UI.UserInterface.UserInterface.checkProjectsWorkspace?4()
 eric6.UI.UserInterface.UserInterface.closeEvent?4(event)
 eric6.UI.UserInterface.UserInterface.createPopupMenu?4()
+eric6.UI.UserInterface.UserInterface.documentationViewer?4()
 eric6.UI.UserInterface.UserInterface.dragEnterEvent?4(event)
 eric6.UI.UserInterface.UserInterface.dragLeaveEvent?4(event)
 eric6.UI.UserInterface.UserInterface.dragMoveEvent?4(event)
@@ -9507,6 +9540,7 @@
 eric6.ViewManager.ViewManager.ViewManager.insertNumber?4(txt)
 eric6.ViewManager.ViewManager.ViewManager.insertSymbol?4(txt)
 eric6.ViewManager.ViewManager.ViewManager.isConnected?4()
+eric6.ViewManager.ViewManager.ViewManager.isEditorInfoSupported?4(language)
 eric6.ViewManager.ViewManager.ViewManager.lastEditorClosed?7
 eric6.ViewManager.ViewManager.ViewManager.mainWidget?4()
 eric6.ViewManager.ViewManager.ViewManager.newEditor?4()
@@ -9548,6 +9582,7 @@
 eric6.ViewManager.ViewManager.ViewManager.shareConnected?4(connected)
 eric6.ViewManager.ViewManager.ViewManager.shareEditor?4(share)
 eric6.ViewManager.ViewManager.ViewManager.showDebugSource?4(fn, line)
+eric6.ViewManager.ViewManager.ViewManager.showEditorInfo?4(editor)
 eric6.ViewManager.ViewManager.ViewManager.showReplaceWidget?4()
 eric6.ViewManager.ViewManager.ViewManager.showSearchWidget?4()
 eric6.ViewManager.ViewManager.ViewManager.showWindowMenu?4(windowMenu)

--- a/APIs/Python3/eric6.bas	Mon Oct 23 19:41:35 2017 +0200
+++ b/APIs/Python3/eric6.bas	Mon Oct 23 19:42:17 2017 +0200
@@ -76,6 +76,7 @@
 ClickToFlashPlugin WebPluginInterface
 ClickToFlashWhitelistDialog QDialog Ui_ClickToFlashWhitelistDialog
 ClosedTabsManager QObject
+CodeDocumentationViewer QWidget
 CodeMetricsDialog QDialog Ui_CodeMetricsDialog
 CodeStyleAddBuiltinIgnoreDialog QDialog Ui_CodeStyleAddBuiltinIgnoreDialog
 CodeStyleCheckerDialog QDialog Ui_CodeStyleCheckerDialog
@@ -225,6 +226,7 @@
 EditorButtonsWidget QWidget
 EditorCalltipsPage ConfigurationPageBase Ui_EditorCalltipsPage
 EditorCalltipsQScintillaPage ConfigurationPageBase Ui_EditorCalltipsQScintillaPage
+EditorDocViewerPage ConfigurationPageBase Ui_EditorDocViewerPage
 EditorExportersPage ConfigurationPageBase Ui_EditorExportersPage
 EditorFilePage ConfigurationPageBase Ui_EditorFilePage
 EditorGeneralPage ConfigurationPageBase Ui_EditorGeneralPage
@@ -580,6 +582,7 @@
 PersonalInformationManager QObject
 PixmapDiagram E5MainWindow
 PlainStrList list
+PlainTextDocumentationViewer QWidget
 PluginActivationError PluginError
 PluginClassFormatError PluginError
 PluginDetailsDialog QDialog Ui_PluginDetailsDialog
@@ -897,6 +900,7 @@
 WebIconProvider QObject
 WebInspector QWebEngineView
 WebPluginFactory QWebPluginFactory
+WebViewDocumentationViewer QWidget
 WidgetArea QMdiArea
 WidgetView QWidget
 XMLStreamReaderBase QXmlStreamReader

Binary file Documentation/Help/source.qch has changed

--- a/Documentation/Help/source.qhp	Mon Oct 23 19:41:35 2017 +0200
+++ b/Documentation/Help/source.qhp	Mon Oct 23 19:42:17 2017 +0200
@@ -785,6 +785,7 @@
               <section title="eric6.Preferences.ConfigurationPages.EditorAutocompletionQScintillaPage" ref="eric6.Preferences.ConfigurationPages.EditorAutocompletionQScintillaPage.html" />
               <section title="eric6.Preferences.ConfigurationPages.EditorCalltipsPage" ref="eric6.Preferences.ConfigurationPages.EditorCalltipsPage.html" />
               <section title="eric6.Preferences.ConfigurationPages.EditorCalltipsQScintillaPage" ref="eric6.Preferences.ConfigurationPages.EditorCalltipsQScintillaPage.html" />
+              <section title="eric6.Preferences.ConfigurationPages.EditorDocViewerPage" ref="eric6.Preferences.ConfigurationPages.EditorDocViewerPage.html" />
               <section title="eric6.Preferences.ConfigurationPages.EditorExportersPage" ref="eric6.Preferences.ConfigurationPages.EditorExportersPage.html" />
               <section title="eric6.Preferences.ConfigurationPages.EditorFilePage" ref="eric6.Preferences.ConfigurationPages.EditorFilePage.html" />
               <section title="eric6.Preferences.ConfigurationPages.EditorGeneralPage" ref="eric6.Preferences.ConfigurationPages.EditorGeneralPage.html" />
@@ -1008,11 +1009,15 @@
               <section title="eric6.UI.Previewers.PreviewerHTML" ref="eric6.UI.Previewers.PreviewerHTML.html" />
               <section title="eric6.UI.Previewers.PreviewerQSS" ref="eric6.UI.Previewers.PreviewerQSS.html" />
             </section>
+            <section title="eric6.UI.data" ref="index-eric6.UI.data.html">
+            </section>
             <section title="eric6.UI.AuthenticationDialog" ref="eric6.UI.AuthenticationDialog.html" />
             <section title="eric6.UI.Browser" ref="eric6.UI.Browser.html" />
             <section title="eric6.UI.BrowserModel" ref="eric6.UI.BrowserModel.html" />
             <section title="eric6.UI.BrowserSortFilterProxyModel" ref="eric6.UI.BrowserSortFilterProxyModel.html" />
             <section title="eric6.UI.ClearPrivateDataDialog" ref="eric6.UI.ClearPrivateDataDialog.html" />
+            <section title="eric6.UI.CodeDocumentationViewer" ref="eric6.UI.CodeDocumentationViewer.html" />
+            <section title="eric6.UI.CodeDocumentationViewerTemplate" ref="eric6.UI.CodeDocumentationViewerTemplate.html" />
             <section title="eric6.UI.CompareDialog" ref="eric6.UI.CompareDialog.html" />
             <section title="eric6.UI.Config" ref="eric6.UI.Config.html" />
             <section title="eric6.UI.DeleteFilesConfirmationDialog" ref="eric6.UI.DeleteFilesConfirmationDialog.html" />
@@ -2780,6 +2785,25 @@
       <keyword name="ClosedTabsManager.isClosedTabAvailable" id="ClosedTabsManager.isClosedTabAvailable" ref="eric6.WebBrowser.ClosedTabsManager.html#ClosedTabsManager.isClosedTabAvailable" />
       <keyword name="ClosedTabsManager.recordBrowser" id="ClosedTabsManager.recordBrowser" ref="eric6.Helpviewer.ClosedTabsManager.html#ClosedTabsManager.recordBrowser" />
       <keyword name="ClosedTabsManager.recordBrowser" id="ClosedTabsManager.recordBrowser" ref="eric6.WebBrowser.ClosedTabsManager.html#ClosedTabsManager.recordBrowser" />
+      <keyword name="CodeDocumentationViewer" id="CodeDocumentationViewer" ref="eric6.UI.CodeDocumentationViewer.html#CodeDocumentationViewer" />
+      <keyword name="CodeDocumentationViewer (Constructor)" id="CodeDocumentationViewer (Constructor)" ref="eric6.UI.CodeDocumentationViewer.html#CodeDocumentationViewer.__init__" />
+      <keyword name="CodeDocumentationViewer (Module)" id="CodeDocumentationViewer (Module)" ref="eric6.UI.CodeDocumentationViewer.html" />
+      <keyword name="CodeDocumentationViewer.__setHtml" id="CodeDocumentationViewer.__setHtml" ref="eric6.UI.CodeDocumentationViewer.html#CodeDocumentationViewer.__setHtml" />
+      <keyword name="CodeDocumentationViewer.__setHtmlWarning" id="CodeDocumentationViewer.__setHtmlWarning" ref="eric6.UI.CodeDocumentationViewer.html#CodeDocumentationViewer.__setHtmlWarning" />
+      <keyword name="CodeDocumentationViewer.__setupUi" id="CodeDocumentationViewer.__setupUi" ref="eric6.UI.CodeDocumentationViewer.html#CodeDocumentationViewer.__setupUi" />
+      <keyword name="CodeDocumentationViewer.__showDisabledMessage" id="CodeDocumentationViewer.__showDisabledMessage" ref="eric6.UI.CodeDocumentationViewer.html#CodeDocumentationViewer.__showDisabledMessage" />
+      <keyword name="CodeDocumentationViewer.__showTextViewer" id="CodeDocumentationViewer.__showTextViewer" ref="eric6.UI.CodeDocumentationViewer.html#CodeDocumentationViewer.__showTextViewer" />
+      <keyword name="CodeDocumentationViewer.documentationReady" id="CodeDocumentationViewer.documentationReady" ref="eric6.UI.CodeDocumentationViewer.html#CodeDocumentationViewer.documentationReady" />
+      <keyword name="CodeDocumentationViewer.finalizeSetup" id="CodeDocumentationViewer.finalizeSetup" ref="eric6.UI.CodeDocumentationViewer.html#CodeDocumentationViewer.finalizeSetup" />
+      <keyword name="CodeDocumentationViewer.getProviders" id="CodeDocumentationViewer.getProviders" ref="eric6.UI.CodeDocumentationViewer.html#CodeDocumentationViewer.getProviders" />
+      <keyword name="CodeDocumentationViewer.isSupportedLanguage" id="CodeDocumentationViewer.isSupportedLanguage" ref="eric6.UI.CodeDocumentationViewer.html#CodeDocumentationViewer.isSupportedLanguage" />
+      <keyword name="CodeDocumentationViewer.on_providerComboBox_currentIndexChanged" id="CodeDocumentationViewer.on_providerComboBox_currentIndexChanged" ref="eric6.UI.CodeDocumentationViewer.html#CodeDocumentationViewer.on_providerComboBox_currentIndexChanged" />
+      <keyword name="CodeDocumentationViewer.preferencesChanged" id="CodeDocumentationViewer.preferencesChanged" ref="eric6.UI.CodeDocumentationViewer.html#CodeDocumentationViewer.preferencesChanged" />
+      <keyword name="CodeDocumentationViewer.registerProvider" id="CodeDocumentationViewer.registerProvider" ref="eric6.UI.CodeDocumentationViewer.html#CodeDocumentationViewer.registerProvider" />
+      <keyword name="CodeDocumentationViewer.showInfo" id="CodeDocumentationViewer.showInfo" ref="eric6.UI.CodeDocumentationViewer.html#CodeDocumentationViewer.showInfo" />
+      <keyword name="CodeDocumentationViewer.shutdown" id="CodeDocumentationViewer.shutdown" ref="eric6.UI.CodeDocumentationViewer.html#CodeDocumentationViewer.shutdown" />
+      <keyword name="CodeDocumentationViewer.unregisterProvider" id="CodeDocumentationViewer.unregisterProvider" ref="eric6.UI.CodeDocumentationViewer.html#CodeDocumentationViewer.unregisterProvider" />
+      <keyword name="CodeDocumentationViewerTemplate (Module)" id="CodeDocumentationViewerTemplate (Module)" ref="eric6.UI.CodeDocumentationViewerTemplate.html" />
       <keyword name="CodeMetrics (Module)" id="CodeMetrics (Module)" ref="eric6.DataViews.CodeMetrics.html" />
       <keyword name="CodeMetricsDialog" id="CodeMetricsDialog" ref="eric6.DataViews.CodeMetricsDialog.html#CodeMetricsDialog" />
       <keyword name="CodeMetricsDialog (Constructor)" id="CodeMetricsDialog (Constructor)" ref="eric6.DataViews.CodeMetricsDialog.html#CodeMetricsDialog.__init__" />
@@ -4111,14 +4135,17 @@
       <keyword name="E5Cache (Module)" id="E5Cache (Module)" ref="eric6.E5Utilities.E5Cache.html" />
       <keyword name="E5Cache.__adjustToSize" id="E5Cache.__adjustToSize" ref="eric6.E5Utilities.E5Cache.html#E5Cache.__adjustToSize" />
       <keyword name="E5Cache.__moveLast" id="E5Cache.__moveLast" ref="eric6.E5Utilities.E5Cache.html#E5Cache.__moveLast" />
+      <keyword name="E5Cache.__pruneCache" id="E5Cache.__pruneCache" ref="eric6.E5Utilities.E5Cache.html#E5Cache.__pruneCache" />
       <keyword name="E5Cache.add" id="E5Cache.add" ref="eric6.E5Utilities.E5Cache.html#E5Cache.add" />
       <keyword name="E5Cache.clear" id="E5Cache.clear" ref="eric6.E5Utilities.E5Cache.html#E5Cache.clear" />
       <keyword name="E5Cache.get" id="E5Cache.get" ref="eric6.E5Utilities.E5Cache.html#E5Cache.get" />
+      <keyword name="E5Cache.getMaximumCacheTime" id="E5Cache.getMaximumCacheTime" ref="eric6.E5Utilities.E5Cache.html#E5Cache.getMaximumCacheTime" />
       <keyword name="E5Cache.getSize" id="E5Cache.getSize" ref="eric6.E5Utilities.E5Cache.html#E5Cache.getSize" />
       <keyword name="E5Cache.info" id="E5Cache.info" ref="eric6.E5Utilities.E5Cache.html#E5Cache.info" />
       <keyword name="E5Cache.length" id="E5Cache.length" ref="eric6.E5Utilities.E5Cache.html#E5Cache.length" />
       <keyword name="E5Cache.remove" id="E5Cache.remove" ref="eric6.E5Utilities.E5Cache.html#E5Cache.remove" />
       <keyword name="E5Cache.reset" id="E5Cache.reset" ref="eric6.E5Utilities.E5Cache.html#E5Cache.reset" />
+      <keyword name="E5Cache.setMaximumCacheTime" id="E5Cache.setMaximumCacheTime" ref="eric6.E5Utilities.E5Cache.html#E5Cache.setMaximumCacheTime" />
       <keyword name="E5Cache.setSize" id="E5Cache.setSize" ref="eric6.E5Utilities.E5Cache.html#E5Cache.setSize" />
       <keyword name="E5ClearableComboBox" id="E5ClearableComboBox" ref="eric6.E5Gui.E5ComboBox.html#E5ClearableComboBox" />
       <keyword name="E5ClearableComboBox (Constructor)" id="E5ClearableComboBox (Constructor)" ref="eric6.E5Gui.E5ComboBox.html#E5ClearableComboBox.__init__" />
@@ -4665,6 +4692,11 @@
       <keyword name="E5TextEditSearchWidget (Module)" id="E5TextEditSearchWidget (Module)" ref="eric6.E5Gui.E5TextEditSearchWidget.html" />
       <keyword name="E5TextEditSearchWidget.__find" id="E5TextEditSearchWidget.__find" ref="eric6.E5Gui.E5TextEditSearchWidget.html#E5TextEditSearchWidget.__find" />
       <keyword name="E5TextEditSearchWidget.__findByReturnPressed" id="E5TextEditSearchWidget.__findByReturnPressed" ref="eric6.E5Gui.E5TextEditSearchWidget.html#E5TextEditSearchWidget.__findByReturnPressed" />
+      <keyword name="E5TextEditSearchWidget.__findNextPrevCallback" id="E5TextEditSearchWidget.__findNextPrevCallback" ref="eric6.E5Gui.E5TextEditSearchWidget.html#E5TextEditSearchWidget.__findNextPrevCallback" />
+      <keyword name="E5TextEditSearchWidget.__findPrevNextQTextEdit" id="E5TextEditSearchWidget.__findPrevNextQTextEdit" ref="eric6.E5Gui.E5TextEditSearchWidget.html#E5TextEditSearchWidget.__findPrevNextQTextEdit" />
+      <keyword name="E5TextEditSearchWidget.__findPrevNextQWebEngineView" id="E5TextEditSearchWidget.__findPrevNextQWebEngineView" ref="eric6.E5Gui.E5TextEditSearchWidget.html#E5TextEditSearchWidget.__findPrevNextQWebEngineView" />
+      <keyword name="E5TextEditSearchWidget.__findPrevNextQWebView" id="E5TextEditSearchWidget.__findPrevNextQWebView" ref="eric6.E5Gui.E5TextEditSearchWidget.html#E5TextEditSearchWidget.__findPrevNextQWebView" />
+      <keyword name="E5TextEditSearchWidget.__setFindtextComboBackground" id="E5TextEditSearchWidget.__setFindtextComboBackground" ref="eric6.E5Gui.E5TextEditSearchWidget.html#E5TextEditSearchWidget.__setFindtextComboBackground" />
       <keyword name="E5TextEditSearchWidget.__setSearchButtons" id="E5TextEditSearchWidget.__setSearchButtons" ref="eric6.E5Gui.E5TextEditSearchWidget.html#E5TextEditSearchWidget.__setSearchButtons" />
       <keyword name="E5TextEditSearchWidget.attachTextEdit" id="E5TextEditSearchWidget.attachTextEdit" ref="eric6.E5Gui.E5TextEditSearchWidget.html#E5TextEditSearchWidget.attachTextEdit" />
       <keyword name="E5TextEditSearchWidget.keyPressEvent" id="E5TextEditSearchWidget.keyPressEvent" ref="eric6.E5Gui.E5TextEditSearchWidget.html#E5TextEditSearchWidget.keyPressEvent" />
@@ -4908,6 +4940,7 @@
       <keyword name="Editor.__callTip" id="Editor.__callTip" ref="eric6.QScintilla.Editor.html#Editor.__callTip" />
       <keyword name="Editor.__changeBreakPoints" id="Editor.__changeBreakPoints" ref="eric6.QScintilla.Editor.html#Editor.__changeBreakPoints" />
       <keyword name="Editor.__charAdded" id="Editor.__charAdded" ref="eric6.QScintilla.Editor.html#Editor.__charAdded" />
+      <keyword name="Editor.__charAddedPermanent" id="Editor.__charAddedPermanent" ref="eric6.QScintilla.Editor.html#Editor.__charAddedPermanent" />
       <keyword name="Editor.__checkEncoding" id="Editor.__checkEncoding" ref="eric6.QScintilla.Editor.html#Editor.__checkEncoding" />
       <keyword name="Editor.__checkEol" id="Editor.__checkEol" ref="eric6.QScintilla.Editor.html#Editor.__checkEol" />
       <keyword name="Editor.__checkLanguage" id="Editor.__checkLanguage" ref="eric6.QScintilla.Editor.html#Editor.__checkLanguage" />
@@ -5020,6 +5053,7 @@
       <keyword name="Editor.__showApplicationDiagram" id="Editor.__showApplicationDiagram" ref="eric6.QScintilla.Editor.html#Editor.__showApplicationDiagram" />
       <keyword name="Editor.__showClassDiagram" id="Editor.__showClassDiagram" ref="eric6.QScintilla.Editor.html#Editor.__showClassDiagram" />
       <keyword name="Editor.__showCodeCoverage" id="Editor.__showCodeCoverage" ref="eric6.QScintilla.Editor.html#Editor.__showCodeCoverage" />
+      <keyword name="Editor.__showCodeInfo" id="Editor.__showCodeInfo" ref="eric6.QScintilla.Editor.html#Editor.__showCodeInfo" />
       <keyword name="Editor.__showCodeMetrics" id="Editor.__showCodeMetrics" ref="eric6.QScintilla.Editor.html#Editor.__showCodeMetrics" />
       <keyword name="Editor.__showCompletionsList" id="Editor.__showCompletionsList" ref="eric6.QScintilla.Editor.html#Editor.__showCompletionsList" />
       <keyword name="Editor.__showContextMenu" id="Editor.__showContextMenu" ref="eric6.QScintilla.Editor.html#Editor.__showContextMenu" />
@@ -5302,6 +5336,10 @@
       <keyword name="EditorCalltipsQScintillaPage (Constructor)" id="EditorCalltipsQScintillaPage (Constructor)" ref="eric6.Preferences.ConfigurationPages.EditorCalltipsQScintillaPage.html#EditorCalltipsQScintillaPage.__init__" />
       <keyword name="EditorCalltipsQScintillaPage (Module)" id="EditorCalltipsQScintillaPage (Module)" ref="eric6.Preferences.ConfigurationPages.EditorCalltipsQScintillaPage.html" />
       <keyword name="EditorCalltipsQScintillaPage.save" id="EditorCalltipsQScintillaPage.save" ref="eric6.Preferences.ConfigurationPages.EditorCalltipsQScintillaPage.html#EditorCalltipsQScintillaPage.save" />
+      <keyword name="EditorDocViewerPage" id="EditorDocViewerPage" ref="eric6.Preferences.ConfigurationPages.EditorDocViewerPage.html#EditorDocViewerPage" />
+      <keyword name="EditorDocViewerPage (Constructor)" id="EditorDocViewerPage (Constructor)" ref="eric6.Preferences.ConfigurationPages.EditorDocViewerPage.html#EditorDocViewerPage.__init__" />
+      <keyword name="EditorDocViewerPage (Module)" id="EditorDocViewerPage (Module)" ref="eric6.Preferences.ConfigurationPages.EditorDocViewerPage.html" />
+      <keyword name="EditorDocViewerPage.save" id="EditorDocViewerPage.save" ref="eric6.Preferences.ConfigurationPages.EditorDocViewerPage.html#EditorDocViewerPage.save" />
       <keyword name="EditorExportersPage" id="EditorExportersPage" ref="eric6.Preferences.ConfigurationPages.EditorExportersPage.html#EditorExportersPage" />
       <keyword name="EditorExportersPage (Constructor)" id="EditorExportersPage (Constructor)" ref="eric6.Preferences.ConfigurationPages.EditorExportersPage.html#EditorExportersPage.__init__" />
       <keyword name="EditorExportersPage (Module)" id="EditorExportersPage (Module)" ref="eric6.Preferences.ConfigurationPages.EditorExportersPage.html" />
@@ -10762,6 +10800,11 @@
       <keyword name="PlainStrList.__convert" id="PlainStrList.__convert" ref="eric6.Globals.compatibility_fixes.html#PlainStrList.__convert" />
       <keyword name="PlainStrList.__setitem__" id="PlainStrList.__setitem__" ref="eric6.Globals.compatibility_fixes.html#PlainStrList.__setitem__" />
       <keyword name="PlainStrList.insert" id="PlainStrList.insert" ref="eric6.Globals.compatibility_fixes.html#PlainStrList.insert" />
+      <keyword name="PlainTextDocumentationViewer" id="PlainTextDocumentationViewer" ref="eric6.UI.CodeDocumentationViewer.html#PlainTextDocumentationViewer" />
+      <keyword name="PlainTextDocumentationViewer (Constructor)" id="PlainTextDocumentationViewer (Constructor)" ref="eric6.UI.CodeDocumentationViewer.html#PlainTextDocumentationViewer.__init__" />
+      <keyword name="PlainTextDocumentationViewer.clear" id="PlainTextDocumentationViewer.clear" ref="eric6.UI.CodeDocumentationViewer.html#PlainTextDocumentationViewer.clear" />
+      <keyword name="PlainTextDocumentationViewer.preferencesChanged" id="PlainTextDocumentationViewer.preferencesChanged" ref="eric6.UI.CodeDocumentationViewer.html#PlainTextDocumentationViewer.preferencesChanged" />
+      <keyword name="PlainTextDocumentationViewer.setText" id="PlainTextDocumentationViewer.setText" ref="eric6.UI.CodeDocumentationViewer.html#PlainTextDocumentationViewer.setText" />
       <keyword name="PlistReader" id="PlistReader" ref="eric6.Utilities.binplistlib.html#PlistReader" />
       <keyword name="PlistReader (Constructor)" id="PlistReader (Constructor)" ref="eric6.Utilities.binplistlib.html#PlistReader.__init__" />
       <keyword name="PlistReader.getSizedInteger" id="PlistReader.getSizedInteger" ref="eric6.Utilities.binplistlib.html#PlistReader.getSizedInteger" />
@@ -15255,6 +15298,7 @@
       <keyword name="UserInterface.__writeCrashSession" id="UserInterface.__writeCrashSession" ref="eric6.UI.UserInterface.html#UserInterface.__writeCrashSession" />
       <keyword name="UserInterface.__writeSession" id="UserInterface.__writeSession" ref="eric6.UI.UserInterface.html#UserInterface.__writeSession" />
       <keyword name="UserInterface.__writeTasks" id="UserInterface.__writeTasks" ref="eric6.UI.UserInterface.html#UserInterface.__writeTasks" />
+      <keyword name="UserInterface.activateCodeDocumentationViewer" id="UserInterface.activateCodeDocumentationViewer" ref="eric6.UI.UserInterface.html#UserInterface.activateCodeDocumentationViewer" />
       <keyword name="UserInterface.activateCooperationViewer" id="UserInterface.activateCooperationViewer" ref="eric6.UI.UserInterface.html#UserInterface.activateCooperationViewer" />
       <keyword name="UserInterface.addE5Actions" id="UserInterface.addE5Actions" ref="eric6.UI.UserInterface.html#UserInterface.addE5Actions" />
       <keyword name="UserInterface.addSideWidget" id="UserInterface.addSideWidget" ref="eric6.UI.UserInterface.html#UserInterface.addSideWidget" />
@@ -15267,6 +15311,7 @@
       <keyword name="UserInterface.checkProjectsWorkspace" id="UserInterface.checkProjectsWorkspace" ref="eric6.UI.UserInterface.html#UserInterface.checkProjectsWorkspace" />
       <keyword name="UserInterface.closeEvent" id="UserInterface.closeEvent" ref="eric6.UI.UserInterface.html#UserInterface.closeEvent" />
       <keyword name="UserInterface.createPopupMenu" id="UserInterface.createPopupMenu" ref="eric6.UI.UserInterface.html#UserInterface.createPopupMenu" />
+      <keyword name="UserInterface.documentationViewer" id="UserInterface.documentationViewer" ref="eric6.UI.UserInterface.html#UserInterface.documentationViewer" />
       <keyword name="UserInterface.dragEnterEvent" id="UserInterface.dragEnterEvent" ref="eric6.UI.UserInterface.html#UserInterface.dragEnterEvent" />
       <keyword name="UserInterface.dragLeaveEvent" id="UserInterface.dragLeaveEvent" ref="eric6.UI.UserInterface.html#UserInterface.dragLeaveEvent" />
       <keyword name="UserInterface.dragMoveEvent" id="UserInterface.dragMoveEvent" ref="eric6.UI.UserInterface.html#UserInterface.dragMoveEvent" />
@@ -15564,6 +15609,7 @@
       <keyword name="ViewManager.__editSelectAll" id="ViewManager.__editSelectAll" ref="eric6.ViewManager.ViewManager.html#ViewManager.__editSelectAll" />
       <keyword name="ViewManager.__editSelectBrace" id="ViewManager.__editSelectBrace" ref="eric6.ViewManager.ViewManager.html#ViewManager.__editSelectBrace" />
       <keyword name="ViewManager.__editShowCallTips" id="ViewManager.__editShowCallTips" ref="eric6.ViewManager.ViewManager.html#ViewManager.__editShowCallTips" />
+      <keyword name="ViewManager.__editShowCodeInfo" id="ViewManager.__editShowCodeInfo" ref="eric6.ViewManager.ViewManager.html#ViewManager.__editShowCodeInfo" />
       <keyword name="ViewManager.__editSmartIndent" id="ViewManager.__editSmartIndent" ref="eric6.ViewManager.ViewManager.html#ViewManager.__editSmartIndent" />
       <keyword name="ViewManager.__editSortSelectedLines" id="ViewManager.__editSortSelectedLines" ref="eric6.ViewManager.ViewManager.html#ViewManager.__editSortSelectedLines" />
       <keyword name="ViewManager.__editSpellingDictionary" id="ViewManager.__editSpellingDictionary" ref="eric6.ViewManager.ViewManager.html#ViewManager.__editSpellingDictionary" />
@@ -15601,6 +15647,7 @@
       <keyword name="ViewManager.__initSearchActions" id="ViewManager.__initSearchActions" ref="eric6.ViewManager.ViewManager.html#ViewManager.__initSearchActions" />
       <keyword name="ViewManager.__initSpellingActions" id="ViewManager.__initSpellingActions" ref="eric6.ViewManager.ViewManager.html#ViewManager.__initSpellingActions" />
       <keyword name="ViewManager.__initViewActions" id="ViewManager.__initViewActions" ref="eric6.ViewManager.ViewManager.html#ViewManager.__initViewActions" />
+      <keyword name="ViewManager.__isEditorInfoSupportedEd" id="ViewManager.__isEditorInfoSupportedEd" ref="eric6.ViewManager.ViewManager.html#ViewManager.__isEditorInfoSupportedEd" />
       <keyword name="ViewManager.__lastEditPositionAvailable" id="ViewManager.__lastEditPositionAvailable" ref="eric6.ViewManager.ViewManager.html#ViewManager.__lastEditPositionAvailable" />
       <keyword name="ViewManager.__lastEditorClosed" id="ViewManager.__lastEditorClosed" ref="eric6.ViewManager.ViewManager.html#ViewManager.__lastEditorClosed" />
       <keyword name="ViewManager.__loadRecent" id="ViewManager.__loadRecent" ref="eric6.ViewManager.ViewManager.html#ViewManager.__loadRecent" />
@@ -15733,6 +15780,7 @@
       <keyword name="ViewManager.insertNumber" id="ViewManager.insertNumber" ref="eric6.ViewManager.ViewManager.html#ViewManager.insertNumber" />
       <keyword name="ViewManager.insertSymbol" id="ViewManager.insertSymbol" ref="eric6.ViewManager.ViewManager.html#ViewManager.insertSymbol" />
       <keyword name="ViewManager.isConnected" id="ViewManager.isConnected" ref="eric6.ViewManager.ViewManager.html#ViewManager.isConnected" />
+      <keyword name="ViewManager.isEditorInfoSupported" id="ViewManager.isEditorInfoSupported" ref="eric6.ViewManager.ViewManager.html#ViewManager.isEditorInfoSupported" />
       <keyword name="ViewManager.mainWidget" id="ViewManager.mainWidget" ref="eric6.ViewManager.ViewManager.html#ViewManager.mainWidget" />
       <keyword name="ViewManager.newEditor" id="ViewManager.newEditor" ref="eric6.ViewManager.ViewManager.html#ViewManager.newEditor" />
       <keyword name="ViewManager.newEditorView" id="ViewManager.newEditorView" ref="eric6.ViewManager.ViewManager.html#ViewManager.newEditorView" />
@@ -15772,6 +15820,7 @@
       <keyword name="ViewManager.shareConnected" id="ViewManager.shareConnected" ref="eric6.ViewManager.ViewManager.html#ViewManager.shareConnected" />
       <keyword name="ViewManager.shareEditor" id="ViewManager.shareEditor" ref="eric6.ViewManager.ViewManager.html#ViewManager.shareEditor" />
       <keyword name="ViewManager.showDebugSource" id="ViewManager.showDebugSource" ref="eric6.ViewManager.ViewManager.html#ViewManager.showDebugSource" />
+      <keyword name="ViewManager.showEditorInfo" id="ViewManager.showEditorInfo" ref="eric6.ViewManager.ViewManager.html#ViewManager.showEditorInfo" />
       <keyword name="ViewManager.showReplaceWidget" id="ViewManager.showReplaceWidget" ref="eric6.ViewManager.ViewManager.html#ViewManager.showReplaceWidget" />
       <keyword name="ViewManager.showSearchWidget" id="ViewManager.showSearchWidget" ref="eric6.ViewManager.ViewManager.html#ViewManager.showSearchWidget" />
       <keyword name="ViewManager.showWindowMenu" id="ViewManager.showWindowMenu" ref="eric6.ViewManager.ViewManager.html#ViewManager.showWindowMenu" />
@@ -16501,6 +16550,11 @@
       <keyword name="WebPluginInterface.isAnonymous" id="WebPluginInterface.isAnonymous" ref="eric6.Helpviewer.WebPlugins.WebPluginInterface.html#WebPluginInterface.isAnonymous" />
       <keyword name="WebPluginInterface.metaPlugin" id="WebPluginInterface.metaPlugin" ref="eric6.Helpviewer.WebPlugins.WebPluginInterface.html#WebPluginInterface.metaPlugin" />
       <keyword name="WebPlugins (Package)" id="WebPlugins (Package)" ref="index-eric6.Helpviewer.WebPlugins.html" />
+      <keyword name="WebViewDocumentationViewer" id="WebViewDocumentationViewer" ref="eric6.UI.CodeDocumentationViewer.html#WebViewDocumentationViewer" />
+      <keyword name="WebViewDocumentationViewer (Constructor)" id="WebViewDocumentationViewer (Constructor)" ref="eric6.UI.CodeDocumentationViewer.html#WebViewDocumentationViewer.__init__" />
+      <keyword name="WebViewDocumentationViewer.__showLink" id="WebViewDocumentationViewer.__showLink" ref="eric6.UI.CodeDocumentationViewer.html#WebViewDocumentationViewer.__showLink" />
+      <keyword name="WebViewDocumentationViewer.clear" id="WebViewDocumentationViewer.clear" ref="eric6.UI.CodeDocumentationViewer.html#WebViewDocumentationViewer.clear" />
+      <keyword name="WebViewDocumentationViewer.setHtml" id="WebViewDocumentationViewer.setHtml" ref="eric6.UI.CodeDocumentationViewer.html#WebViewDocumentationViewer.setHtml" />
       <keyword name="Whitespace" id="Whitespace" ref="eric6.Plugins.CheckerPlugins.Tabnanny.Tabnanny.html#Whitespace" />
       <keyword name="Whitespace (Constructor)" id="Whitespace (Constructor)" ref="eric6.Plugins.CheckerPlugins.Tabnanny.Tabnanny.html#Whitespace.__init__" />
       <keyword name="Whitespace.equal" id="Whitespace.equal" ref="eric6.Plugins.CheckerPlugins.Tabnanny.Tabnanny.html#Whitespace.equal" />
@@ -16777,6 +16831,7 @@
       <keyword name="create" id="create" ref="eric6.Preferences.ConfigurationPages.EditorAutocompletionQScintillaPage.html#create" />
       <keyword name="create" id="create" ref="eric6.Preferences.ConfigurationPages.EditorCalltipsPage.html#create" />
       <keyword name="create" id="create" ref="eric6.Preferences.ConfigurationPages.EditorCalltipsQScintillaPage.html#create" />
+      <keyword name="create" id="create" ref="eric6.Preferences.ConfigurationPages.EditorDocViewerPage.html#create" />
       <keyword name="create" id="create" ref="eric6.Preferences.ConfigurationPages.EditorExportersPage.html#create" />
       <keyword name="create" id="create" ref="eric6.Preferences.ConfigurationPages.EditorFilePage.html#create" />
       <keyword name="create" id="create" ref="eric6.Preferences.ConfigurationPages.EditorGeneralPage.html#create" />
@@ -16865,6 +16920,7 @@
       <keyword name="cursors (Package)" id="cursors (Package)" ref="index-eric6.IconEditor.cursors.html" />
       <keyword name="data (Package)" id="data (Package)" ref="index-eric6.E5Network.data.html" />
       <keyword name="data (Package)" id="data (Package)" ref="index-eric6.Helpviewer.data.html" />
+      <keyword name="data (Package)" id="data (Package)" ref="index-eric6.UI.data.html" />
       <keyword name="data (Package)" id="data (Package)" ref="index-eric6.WebBrowser.data.html" />
       <keyword name="dataDecrypt" id="dataDecrypt" ref="eric6.Utilities.crypto.__init__.html#dataDecrypt" />
       <keyword name="dataEncrypt" id="dataEncrypt" ref="eric6.Utilities.crypto.__init__.html#dataEncrypt" />
@@ -16985,6 +17041,7 @@
       <keyword name="getDefaults" id="getDefaults" ref="eric6.Plugins.VcsPlugins.vcsMercurial.LargefilesExtension.__init__.html#getDefaults" />
       <keyword name="getDiffColour" id="getDiffColour" ref="eric6.Preferences.__init__.html#getDiffColour" />
       <keyword name="getDirs" id="getDirs" ref="eric6.Utilities.__init__.html#getDirs" />
+      <keyword name="getDocuViewer" id="getDocuViewer" ref="eric6.Preferences.__init__.html#getDocuViewer" />
       <keyword name="getEditor" id="getEditor" ref="eric6.Preferences.__init__.html#getEditor" />
       <keyword name="getEditorAPI" id="getEditorAPI" ref="eric6.Preferences.__init__.html#getEditorAPI" />
       <keyword name="getEditorColour" id="getEditorColour" ref="eric6.Preferences.__init__.html#getEditorColour" />
@@ -17250,6 +17307,9 @@
       <keyword name="pixmapFromByteArray" id="pixmapFromByteArray" ref="eric6.WebBrowser.Tools.WebBrowserTools.html#pixmapFromByteArray" />
       <keyword name="pixmapToByteArray" id="pixmapToByteArray" ref="eric6.WebBrowser.Tools.WebBrowserTools.html#pixmapToByteArray" />
       <keyword name="pixmapToDataUrl" id="pixmapToDataUrl" ref="eric6.WebBrowser.Tools.WebBrowserTools.html#pixmapToDataUrl" />
+      <keyword name="prepareDocumentationViewerHtmlDocWarningDocument" id="prepareDocumentationViewerHtmlDocWarningDocument" ref="eric6.UI.CodeDocumentationViewerTemplate.html#prepareDocumentationViewerHtmlDocWarningDocument" />
+      <keyword name="prepareDocumentationViewerHtmlDocument" id="prepareDocumentationViewerHtmlDocument" ref="eric6.UI.CodeDocumentationViewerTemplate.html#prepareDocumentationViewerHtmlDocument" />
+      <keyword name="prepareDocumentationViewerHtmlWarningDocument" id="prepareDocumentationViewerHtmlWarningDocument" ref="eric6.UI.CodeDocumentationViewerTemplate.html#prepareDocumentationViewerHtmlWarningDocument" />
       <keyword name="prepareInfoFile" id="prepareInfoFile" ref="eric6.install.html#prepareInfoFile" />
       <keyword name="prepareJsonCommand" id="prepareJsonCommand" ref="eric6.DebugClients.Python.DebugUtilities.html#prepareJsonCommand" />
       <keyword name="prepareProcess" id="prepareProcess" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgUtilities.html#prepareProcess" />
@@ -17344,6 +17404,7 @@
       <keyword name="setCss" id="setCss" ref="eric6.WebBrowser.Tools.Scripts.html#setCss" />
       <keyword name="setDebugger" id="setDebugger" ref="eric6.Preferences.__init__.html#setDebugger" />
       <keyword name="setDiffColour" id="setDiffColour" ref="eric6.Preferences.__init__.html#setDiffColour" />
+      <keyword name="setDocuViewer" id="setDocuViewer" ref="eric6.Preferences.__init__.html#setDocuViewer" />
       <keyword name="setEditor" id="setEditor" ref="eric6.Preferences.__init__.html#setEditor" />
       <keyword name="setEditorAPI" id="setEditorAPI" ref="eric6.Preferences.__init__.html#setEditorAPI" />
       <keyword name="setEditorColour" id="setEditorColour" ref="eric6.Preferences.__init__.html#setEditorColour" />
@@ -18079,6 +18140,7 @@
       <file>eric6.Preferences.ConfigurationPages.EditorAutocompletionQScintillaPage.html</file>
       <file>eric6.Preferences.ConfigurationPages.EditorCalltipsPage.html</file>
       <file>eric6.Preferences.ConfigurationPages.EditorCalltipsQScintillaPage.html</file>
+      <file>eric6.Preferences.ConfigurationPages.EditorDocViewerPage.html</file>
       <file>eric6.Preferences.ConfigurationPages.EditorExportersPage.html</file>
       <file>eric6.Preferences.ConfigurationPages.EditorFilePage.html</file>
       <file>eric6.Preferences.ConfigurationPages.EditorGeneralPage.html</file>
@@ -18273,6 +18335,8 @@
       <file>eric6.UI.BrowserModel.html</file>
       <file>eric6.UI.BrowserSortFilterProxyModel.html</file>
       <file>eric6.UI.ClearPrivateDataDialog.html</file>
+      <file>eric6.UI.CodeDocumentationViewer.html</file>
+      <file>eric6.UI.CodeDocumentationViewerTemplate.html</file>
       <file>eric6.UI.CompareDialog.html</file>
       <file>eric6.UI.Config.html</file>
       <file>eric6.UI.DeleteFilesConfirmationDialog.html</file>
@@ -18647,6 +18711,7 @@
       <file>index-eric6.Toolbox.html</file>
       <file>index-eric6.Tools.html</file>
       <file>index-eric6.UI.Previewers.html</file>
+      <file>index-eric6.UI.data.html</file>
       <file>index-eric6.UI.html</file>
       <file>index-eric6.Utilities.ClassBrowsers.html</file>
       <file>index-eric6.Utilities.crypto.html</file>

--- a/Documentation/Source/eric6.E5Gui.E5TextEditSearchWidget.html	Mon Oct 23 19:41:35 2017 +0200
+++ b/Documentation/Source/eric6.E5Gui.E5TextEditSearchWidget.html	Mon Oct 23 19:42:17 2017 +0200
@@ -66,6 +66,21 @@
 <td><a href="#E5TextEditSearchWidget.__findByReturnPressed">__findByReturnPressed</a></td>
 <td>Private slot to handle the returnPressed signal of the findtext combobox.</td>
 </tr><tr>
+<td><a href="#E5TextEditSearchWidget.__findNextPrevCallback">__findNextPrevCallback</a></td>
+<td>Private method to process the result of the last search.</td>
+</tr><tr>
+<td><a href="#E5TextEditSearchWidget.__findPrevNextQTextEdit">__findPrevNextQTextEdit</a></td>
+<td>Private method to to search the associated edit widget of type QTextEdit.</td>
+</tr><tr>
+<td><a href="#E5TextEditSearchWidget.__findPrevNextQWebEngineView">__findPrevNextQWebEngineView</a></td>
+<td>Private method to to search the associated edit widget of type QWebEngineView.</td>
+</tr><tr>
+<td><a href="#E5TextEditSearchWidget.__findPrevNextQWebView">__findPrevNextQWebView</a></td>
+<td>Private method to to search the associated edit widget of type QWebView.</td>
+</tr><tr>
+<td><a href="#E5TextEditSearchWidget.__setFindtextComboBackground">__setFindtextComboBackground</a></td>
+<td>Private slot to change the findtext combo background to indicate errors.</td>
+</tr><tr>
 <td><a href="#E5TextEditSearchWidget.__setSearchButtons">__setSearchButtons</a></td>
 <td>Private slot to set the state of the search buttons.</td>
 </tr><tr>
@@ -115,7 +130,81 @@
 <p>
         Private slot to handle the returnPressed signal of the findtext
         combobox.
-</p><a NAME="E5TextEditSearchWidget.__setSearchButtons" ID="E5TextEditSearchWidget.__setSearchButtons"></a>
+</p><a NAME="E5TextEditSearchWidget.__findNextPrevCallback" ID="E5TextEditSearchWidget.__findNextPrevCallback"></a>
+<h4>E5TextEditSearchWidget.__findNextPrevCallback</h4>
+<b>__findNextPrevCallback</b>(<i>found</i>)
+<p>
+        Private method to process the result of the last search.
+</p><dl>
+<dt><i>found</i> (bool)</dt>
+<dd>
+flag indicating if the last search succeeded
+</dd>
+</dl><a NAME="E5TextEditSearchWidget.__findPrevNextQTextEdit" ID="E5TextEditSearchWidget.__findPrevNextQTextEdit"></a>
+<h4>E5TextEditSearchWidget.__findPrevNextQTextEdit</h4>
+<b>__findPrevNextQTextEdit</b>(<i>backwards</i>)
+<p>
+        Private method to to search the associated edit widget of
+        type QTextEdit.
+</p><dl>
+<dt><i>backwards</i> (bool)</dt>
+<dd>
+flag indicating a backwards search
+</dd>
+</dl><dl>
+<dt>Returns:</dt>
+<dd>
+flag indicating the search result
+</dd>
+</dl><dl>
+<dt>Return Type:</dt>
+<dd>
+bool
+</dd>
+</dl><a NAME="E5TextEditSearchWidget.__findPrevNextQWebEngineView" ID="E5TextEditSearchWidget.__findPrevNextQWebEngineView"></a>
+<h4>E5TextEditSearchWidget.__findPrevNextQWebEngineView</h4>
+<b>__findPrevNextQWebEngineView</b>(<i>backwards</i>)
+<p>
+        Private method to to search the associated edit widget of
+        type QWebEngineView.
+</p><dl>
+<dt><i>backwards</i> (bool)</dt>
+<dd>
+flag indicating a backwards search
+</dd>
+</dl><a NAME="E5TextEditSearchWidget.__findPrevNextQWebView" ID="E5TextEditSearchWidget.__findPrevNextQWebView"></a>
+<h4>E5TextEditSearchWidget.__findPrevNextQWebView</h4>
+<b>__findPrevNextQWebView</b>(<i>backwards</i>)
+<p>
+        Private method to to search the associated edit widget of
+        type QWebView.
+</p><dl>
+<dt><i>backwards</i> (bool)</dt>
+<dd>
+flag indicating a backwards search
+</dd>
+</dl><dl>
+<dt>Returns:</dt>
+<dd>
+flag indicating the search result
+</dd>
+</dl><dl>
+<dt>Return Type:</dt>
+<dd>
+bool
+</dd>
+</dl><a NAME="E5TextEditSearchWidget.__setFindtextComboBackground" ID="E5TextEditSearchWidget.__setFindtextComboBackground"></a>
+<h4>E5TextEditSearchWidget.__setFindtextComboBackground</h4>
+<b>__setFindtextComboBackground</b>(<i>error</i>)
+<p>
+        Private slot to change the findtext combo background to indicate
+        errors.
+</p><dl>
+<dt><i>error</i></dt>
+<dd>
+flag indicating an error condition (boolean)
+</dd>
+</dl><a NAME="E5TextEditSearchWidget.__setSearchButtons" ID="E5TextEditSearchWidget.__setSearchButtons"></a>
 <h4>E5TextEditSearchWidget.__setSearchButtons</h4>
 <b>__setSearchButtons</b>(<i>enabled</i>)
 <p>
@@ -127,13 +216,16 @@
 </dd>
 </dl><a NAME="E5TextEditSearchWidget.attachTextEdit" ID="E5TextEditSearchWidget.attachTextEdit"></a>
 <h4>E5TextEditSearchWidget.attachTextEdit</h4>
-<b>attachTextEdit</b>(<i>textedit</i>)
+<b>attachTextEdit</b>(<i>textedit, editType="QTextEdit"</i>)
 <p>
         Public method to attach a QTextEdit widget.
 </p><dl>
-<dt><i>textedit</i></dt>
+<dt><i>textedit</i> (QTextEdit, QWebEngineView or QWebView)</dt>
 <dd>
-reference to the QTextEdit to be attached (QTextEdit)
+reference to the edit widget to be attached
+</dd><dt><i>editType</i> (str (one of "QTextEdit", "QWebEngineView" or "QWebView"))</dt>
+<dd>
+type of the attached edit widget
 </dd>
 </dl><a NAME="E5TextEditSearchWidget.keyPressEvent" ID="E5TextEditSearchWidget.keyPressEvent"></a>
 <h4>E5TextEditSearchWidget.keyPressEvent</h4>

--- a/Documentation/Source/eric6.E5Utilities.E5Cache.html	Mon Oct 23 19:41:35 2017 +0200
+++ b/Documentation/Source/eric6.E5Utilities.E5Cache.html	Mon Oct 23 19:42:17 2017 +0200
@@ -70,6 +70,9 @@
 <td><a href="#E5Cache.__moveLast">__moveLast</a></td>
 <td>Private method to move a cached item to the MRU position.</td>
 </tr><tr>
+<td><a href="#E5Cache.__pruneCache">__pruneCache</a></td>
+<td>Private slot to prune outdated cache entries and restart the timer.</td>
+</tr><tr>
 <td><a href="#E5Cache.add">add</a></td>
 <td>Public method to add an item to the cache.</td>
 </tr><tr>
@@ -79,8 +82,11 @@
 <td><a href="#E5Cache.get">get</a></td>
 <td>Public method to get an entry from the cache given its key.</td>
 </tr><tr>
+<td><a href="#E5Cache.getMaximumCacheTime">getMaximumCacheTime</a></td>
+<td>Public method to get the maximum time entries may exist in the cache.</td>
+</tr><tr>
 <td><a href="#E5Cache.getSize">getSize</a></td>
-<td>Public method to get the size of the cache.</td>
+<td>Public method to get the maximum size of the cache.</td>
 </tr><tr>
 <td><a href="#E5Cache.info">info</a></td>
 <td>Public method to get some information about the cache.</td>
@@ -94,8 +100,11 @@
 <td><a href="#E5Cache.reset">reset</a></td>
 <td>Public method to reset the cache.</td>
 </tr><tr>
+<td><a href="#E5Cache.setMaximumCacheTime">setMaximumCacheTime</a></td>
+<td>Public method to set the maximum time entries may exist in the cache.</td>
+</tr><tr>
 <td><a href="#E5Cache.setSize">setSize</a></td>
-<td>Public method to change the size of the cache.</td>
+<td>Public method to change the maximum size of the cache.</td>
 </tr>
 </table>
 <h3>Static Methods</h3>
@@ -127,7 +136,12 @@
 <dd>
 key of the item to be retrieved
 </dd>
-</dl><a NAME="E5Cache.add" ID="E5Cache.add"></a>
+</dl><a NAME="E5Cache.__pruneCache" ID="E5Cache.__pruneCache"></a>
+<h4>E5Cache.__pruneCache</h4>
+<b>__pruneCache</b>(<i></i>)
+<p>
+        Private slot to prune outdated cache entries and restart the timer.
+</p><a NAME="E5Cache.add" ID="E5Cache.add"></a>
 <h4>E5Cache.add</h4>
 <b>add</b>(<i>key, item</i>)
 <p>
@@ -171,11 +185,26 @@
 <dd>
 object or None
 </dd>
+</dl><a NAME="E5Cache.getMaximumCacheTime" ID="E5Cache.getMaximumCacheTime"></a>
+<h4>E5Cache.getMaximumCacheTime</h4>
+<b>getMaximumCacheTime</b>(<i></i>)
+<p>
+        Public method to get the maximum time entries may exist in the cache.
+</p><dl>
+<dt>Returns:</dt>
+<dd>
+maximum cache time in seconds
+</dd>
+</dl><dl>
+<dt>Return Type:</dt>
+<dd>
+int
+</dd>
 </dl><a NAME="E5Cache.getSize" ID="E5Cache.getSize"></a>
 <h4>E5Cache.getSize</h4>
 <b>getSize</b>(<i></i>)
 <p>
-        Public method to get the size of the cache.
+        Public method to get the maximum size of the cache.
 </p><dl>
 <dt>Returns:</dt>
 <dd>
@@ -234,11 +263,21 @@
 </p><p>
         This is like clear() but sets the various counters to their initial
         value as well.
-</p><a NAME="E5Cache.setSize" ID="E5Cache.setSize"></a>
+</p><a NAME="E5Cache.setMaximumCacheTime" ID="E5Cache.setMaximumCacheTime"></a>
+<h4>E5Cache.setMaximumCacheTime</h4>
+<b>setMaximumCacheTime</b>(<i>time</i>)
+<p>
+        Public method to set the maximum time entries may exist in the cache.
+</p><dl>
+<dt><i>time</i> (int)</dt>
+<dd>
+maximum cache time in seconds
+</dd>
+</dl><a NAME="E5Cache.setSize" ID="E5Cache.setSize"></a>
 <h4>E5Cache.setSize</h4>
 <b>setSize</b>(<i>newSize</i>)
 <p>
-        Public method to change the size of the cache.
+        Public method to change the maximum size of the cache.
 </p><dl>
 <dt><i>newSize</i> (int)</dt>
 <dd>

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Documentation/Source/eric6.Preferences.ConfigurationPages.EditorDocViewerPage.html	Mon Oct 23 19:42:17 2017 +0200
@@ -0,0 +1,110 @@
+<!DOCTYPE html>
+<html><head>
+<title>eric6.Preferences.ConfigurationPages.EditorDocViewerPage</title>
+<meta charset="UTF-8">
+<style>
+body {
+    background: #EDECE6;
+    margin: 0em 1em 10em 1em;
+    color: black;
+}
+
+h1 { color: white; background: #85774A; }
+h2 { color: white; background: #85774A; }
+h3 { color: white; background: #9D936E; }
+h4 { color: white; background: #9D936E; }
+    
+a { color: #BA6D36; }
+
+</style>
+</head>
+<body><a NAME="top" ID="top"></a>
+<h1>eric6.Preferences.ConfigurationPages.EditorDocViewerPage</h1>
+<p>
+Module implementing the Editor Documentation Viewer configuration page.
+</p>
+<h3>Global Attributes</h3>
+<table>
+<tr><td>None</td></tr>
+</table>
+<h3>Classes</h3>
+<table>
+<tr>
+<td><a href="#EditorDocViewerPage">EditorDocViewerPage</a></td>
+<td>Class documentation goes here.</td>
+</tr>
+</table>
+<h3>Functions</h3>
+<table>
+<tr>
+<td><a href="#create">create</a></td>
+<td>Module function to create the configuration page.</td>
+</tr>
+</table>
+<hr /><hr />
+<a NAME="EditorDocViewerPage" ID="EditorDocViewerPage"></a>
+<h2>EditorDocViewerPage</h2>
+<p>
+    Class documentation goes here.
+</p>
+<h3>Derived from</h3>
+ConfigurationPageBase, Ui_EditorDocViewerPage
+<h3>Class Attributes</h3>
+<table>
+<tr><td>None</td></tr>
+</table>
+<h3>Class Methods</h3>
+<table>
+<tr><td>None</td></tr>
+</table>
+<h3>Methods</h3>
+<table>
+<tr>
+<td><a href="#EditorDocViewerPage.__init__">EditorDocViewerPage</a></td>
+<td>Constructor</td>
+</tr><tr>
+<td><a href="#EditorDocViewerPage.save">save</a></td>
+<td>Public slot to save the Editor Typing configuration.</td>
+</tr>
+</table>
+<h3>Static Methods</h3>
+<table>
+<tr><td>None</td></tr>
+</table>
+<a NAME="EditorDocViewerPage.__init__" ID="EditorDocViewerPage.__init__"></a>
+<h4>EditorDocViewerPage (Constructor)</h4>
+<b>EditorDocViewerPage</b>(<i>parent=None</i>)
+<p>
+        Constructor
+</p><dl>
+<dt><i>parent</i> (QWidget)</dt>
+<dd>
+reference to the parent widget
+</dd>
+</dl><a NAME="EditorDocViewerPage.save" ID="EditorDocViewerPage.save"></a>
+<h4>EditorDocViewerPage.save</h4>
+<b>save</b>(<i></i>)
+<p>
+        Public slot to save the Editor Typing configuration.
+</p>
+<div align="right"><a href="#top">Up</a></div>
+<hr /><hr />
+<a NAME="create" ID="create"></a>
+<h2>create</h2>
+<b>create</b>(<i>dlg</i>)
+<p>
+    Module function to create the configuration page.
+</p><dl>
+<dt><i>dlg</i></dt>
+<dd>
+reference to the configuration dialog
+</dd>
+</dl><dl>
+<dt>Returns:</dt>
+<dd>
+reference to the instantiated page (ConfigurationPageBase)
+</dd>
+</dl>
+<div align="right"><a href="#top">Up</a></div>
+<hr />
+</body></html>
\ No newline at end of file

--- a/Documentation/Source/eric6.Preferences.__init__.html	Mon Oct 23 19:41:35 2017 +0200
+++ b/Documentation/Source/eric6.Preferences.__init__.html	Mon Oct 23 19:42:17 2017 +0200
@@ -64,6 +64,9 @@
 <td><a href="#getDiffColour">getDiffColour</a></td>
 <td>Module function to retrieve the colours for the diff highlighter.</td>
 </tr><tr>
+<td><a href="#getDocuViewer">getDocuViewer</a></td>
+<td>Module function to retrieve the Code Documentation Viewer related settings.</td>
+</tr><tr>
 <td><a href="#getEditor">getEditor</a></td>
 <td>Module function to retrieve the various editor settings.</td>
 </tr><tr>
@@ -226,6 +229,9 @@
 <td><a href="#setDiffColour">setDiffColour</a></td>
 <td>Module function to store the diff highlighter colours.</td>
 </tr><tr>
+<td><a href="#setDocuViewer">setDocuViewer</a></td>
+<td>Module function to store the Code Documentation Viewer related settings.</td>
+</tr><tr>
 <td><a href="#setEditor">setEditor</a></td>
 <td>Module function to store the various editor settings.</td>
 </tr><tr>
@@ -369,7 +375,7 @@
 object
 <h3>Class Attributes</h3>
 <table>
-<tr><td>cooperationDefaults</td></tr><tr><td>corbaDefaults</td></tr><tr><td>debuggerDefaults</td></tr><tr><td>diffColourDefaults</td></tr><tr><td>editorColourDefaults</td></tr><tr><td>editorDefaults</td></tr><tr><td>editorExporterDefaults</td></tr><tr><td>editorOtherFontsDefaults</td></tr><tr><td>editorTypingDefaults</td></tr><tr><td>geometryDefaults</td></tr><tr><td>graphicsDefaults</td></tr><tr><td>helpDefaults</td></tr><tr><td>hexEditorDefaults</td></tr><tr><td>iconEditorDefaults</td></tr><tr><td>iconsDefaults</td></tr><tr><td>ircDefaults</td></tr><tr><td>multiProjectDefaults</td></tr><tr><td>pluginManagerDefaults</td></tr><tr><td>printerDefaults</td></tr><tr><td>projectBrowserColourDefaults</td></tr><tr><td>projectBrowserFlagsDefaults</td></tr><tr><td>projectDefaults</td></tr><tr><td>pyflakesDefaults</td></tr><tr><td>qtDefaults</td></tr><tr><td>resetLayout</td></tr><tr><td>shellDefaults</td></tr><tr><td>sysDefaults</td></tr><tr><td>tasksDefaults</td></tr><tr><td>templatesDefaults</td></tr><tr><td>trayStarterDefaults</td></tr><tr><td>uiDefaults</td></tr><tr><td>userDefaults</td></tr><tr><td>varDefaults</td></tr><tr><td>vcsDefaults</td></tr><tr><td>webBrowserDefaults</td></tr><tr><td>webEngineSettingsIntitialized</td></tr><tr><td>webSettingsIntitialized</td></tr>
+<tr><td>cooperationDefaults</td></tr><tr><td>corbaDefaults</td></tr><tr><td>debuggerDefaults</td></tr><tr><td>diffColourDefaults</td></tr><tr><td>docuViewerDefaults</td></tr><tr><td>editorColourDefaults</td></tr><tr><td>editorDefaults</td></tr><tr><td>editorExporterDefaults</td></tr><tr><td>editorOtherFontsDefaults</td></tr><tr><td>editorTypingDefaults</td></tr><tr><td>geometryDefaults</td></tr><tr><td>graphicsDefaults</td></tr><tr><td>helpDefaults</td></tr><tr><td>hexEditorDefaults</td></tr><tr><td>iconEditorDefaults</td></tr><tr><td>iconsDefaults</td></tr><tr><td>ircDefaults</td></tr><tr><td>multiProjectDefaults</td></tr><tr><td>pluginManagerDefaults</td></tr><tr><td>printerDefaults</td></tr><tr><td>projectBrowserColourDefaults</td></tr><tr><td>projectBrowserFlagsDefaults</td></tr><tr><td>projectDefaults</td></tr><tr><td>pyflakesDefaults</td></tr><tr><td>qtDefaults</td></tr><tr><td>resetLayout</td></tr><tr><td>shellDefaults</td></tr><tr><td>sysDefaults</td></tr><tr><td>tasksDefaults</td></tr><tr><td>templatesDefaults</td></tr><tr><td>trayStarterDefaults</td></tr><tr><td>uiDefaults</td></tr><tr><td>userDefaults</td></tr><tr><td>varDefaults</td></tr><tr><td>vcsDefaults</td></tr><tr><td>webBrowserDefaults</td></tr><tr><td>webEngineSettingsIntitialized</td></tr><tr><td>webSettingsIntitialized</td></tr>
 </table>
 <h3>Class Methods</h3>
 <table>
@@ -513,6 +519,27 @@
 </dl><dl>
 <dt>Returns:</dt>
 <dd>
+the requested diff colour
+</dd>
+</dl>
+<div align="right"><a href="#top">Up</a></div>
+<hr /><hr />
+<a NAME="getDocuViewer" ID="getDocuViewer"></a>
+<h2>getDocuViewer</h2>
+<b>getDocuViewer</b>(<i>key, prefClass=Prefs</i>)
+<p>
+    Module function to retrieve the Code Documentation Viewer related settings.
+</p><dl>
+<dt><i>key</i></dt>
+<dd>
+the key of the value to get
+</dd><dt><i>prefClass</i></dt>
+<dd>
+preferences class used as the storage area
+</dd>
+</dl><dl>
+<dt>Returns:</dt>
+<dd>
 the requested editor colour
 </dd>
 </dl>
@@ -1574,6 +1601,25 @@
 </dl>
 <div align="right"><a href="#top">Up</a></div>
 <hr /><hr />
+<a NAME="setDocuViewer" ID="setDocuViewer"></a>
+<h2>setDocuViewer</h2>
+<b>setDocuViewer</b>(<i>key, value, prefClass=Prefs</i>)
+<p>
+    Module function to store the Code Documentation Viewer related settings.
+</p><dl>
+<dt><i>key</i></dt>
+<dd>
+the key of the setting to be set
+</dd><dt><i>value</i></dt>
+<dd>
+the value to be set
+</dd><dt><i>prefClass</i></dt>
+<dd>
+preferences class used as the storage area
+</dd>
+</dl>
+<div align="right"><a href="#top">Up</a></div>
+<hr /><hr />
 <a NAME="setEditor" ID="setEditor"></a>
 <h2>setEditor</h2>
 <b>setEditor</b>(<i>key, value, prefClass=Prefs</i>)

--- a/Documentation/Source/eric6.QScintilla.Editor.html	Mon Oct 23 19:41:35 2017 +0200
+++ b/Documentation/Source/eric6.QScintilla.Editor.html	Mon Oct 23 19:42:17 2017 +0200
@@ -210,6 +210,9 @@
 <td><a href="#Editor.__charAdded">__charAdded</a></td>
 <td>Private slot called to handle the user entering a character.</td>
 </tr><tr>
+<td><a href="#Editor.__charAddedPermanent">__charAddedPermanent</a></td>
+<td>Private slot called to handle the user entering a character.</td>
+</tr><tr>
 <td><a href="#Editor.__checkEncoding">__checkEncoding</a></td>
 <td>Private method to check the selected encoding of the encodings submenu.</td>
 </tr><tr>
@@ -546,6 +549,9 @@
 <td><a href="#Editor.__showCodeCoverage">__showCodeCoverage</a></td>
 <td>Private method to handle the code coverage context menu action.</td>
 </tr><tr>
+<td><a href="#Editor.__showCodeInfo">__showCodeInfo</a></td>
+<td>Private slot to handle the context menu action to show code info.</td>
+</tr><tr>
 <td><a href="#Editor.__showCodeMetrics">__showCodeMetrics</a></td>
 <td>Private method to handle the code metrics context menu action.</td>
 </tr><tr>
@@ -1332,11 +1338,15 @@
 </dd>
 </dl><a NAME="Editor.__autoComplete" ID="Editor.__autoComplete"></a>
 <h4>Editor.__autoComplete</h4>
-<b>__autoComplete</b>(<i>context=None</i>)
+<b>__autoComplete</b>(<i>auto=True, context=None</i>)
 <p>
         Private method to start auto-completion via plug-ins.
 </p><dl>
-<dt><i>context=</i> (bool or None)</dt>
+<dt><i>auto=</i></dt>
+<dd>
+flag indicating a call from the __charAdded method
+            (boolean)
+</dd><dt><i>context=</i> (bool or None)</dt>
 <dd>
 flag indicating to complete a context
 </dd>
@@ -1449,6 +1459,19 @@
 <dd>
 value of the character entered (integer)
 </dd>
+</dl><a NAME="Editor.__charAddedPermanent" ID="Editor.__charAddedPermanent"></a>
+<h4>Editor.__charAddedPermanent</h4>
+<b>__charAddedPermanent</b>(<i>charNumber</i>)
+<p>
+        Private slot called to handle the user entering a character.
+</p><p>
+        Note: This slot is always connected independent of the auto-completion
+        and calltips handling __charAdded() slot.
+</p><dl>
+<dt><i>charNumber</i></dt>
+<dd>
+value of the character entered (integer)
+</dd>
 </dl><a NAME="Editor.__checkEncoding" ID="Editor.__checkEncoding"></a>
 <h4>Editor.__checkEncoding</h4>
 <b>__checkEncoding</b>(<i></i>)
@@ -2436,6 +2459,11 @@
 <b>__showCodeCoverage</b>(<i></i>)
 <p>
         Private method to handle the code coverage context menu action.
+</p><a NAME="Editor.__showCodeInfo" ID="Editor.__showCodeInfo"></a>
+<h4>Editor.__showCodeInfo</h4>
+<b>__showCodeInfo</b>(<i></i>)
+<p>
+        Private slot to handle the context menu action to show code info.
 </p><a NAME="Editor.__showCodeMetrics" ID="Editor.__showCodeMetrics"></a>
 <h4>Editor.__showCodeMetrics</h4>
 <b>__showCodeMetrics</b>(<i></i>)

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Documentation/Source/eric6.UI.CodeDocumentationViewer.html	Mon Oct 23 19:42:17 2017 +0200
@@ -0,0 +1,457 @@
+<!DOCTYPE html>
+<html><head>
+<title>eric6.UI.CodeDocumentationViewer</title>
+<meta charset="UTF-8">
+<style>
+body {
+    background: #EDECE6;
+    margin: 0em 1em 10em 1em;
+    color: black;
+}
+
+h1 { color: white; background: #85774A; }
+h2 { color: white; background: #85774A; }
+h3 { color: white; background: #9D936E; }
+h4 { color: white; background: #9D936E; }
+    
+a { color: #BA6D36; }
+
+</style>
+</head>
+<body><a NAME="top" ID="top"></a>
+<h1>eric6.UI.CodeDocumentationViewer</h1>
+<p>
+Module implementing a widget to show some source code information provided by
+plug-ins.
+</p>
+<h3>Global Attributes</h3>
+<table>
+<tr><td>None</td></tr>
+</table>
+<h3>Classes</h3>
+<table>
+<tr>
+<td><a href="#CodeDocumentationViewer">CodeDocumentationViewer</a></td>
+<td>Class implementing a widget to show some source code information provided by plug-ins.</td>
+</tr><tr>
+<td><a href="#PlainTextDocumentationViewer">PlainTextDocumentationViewer</a></td>
+<td>Class implementing the plain text documentation viewer.</td>
+</tr><tr>
+<td><a href="#WebViewDocumentationViewer">WebViewDocumentationViewer</a></td>
+<td>Class implementing the rich text documentation viewer.</td>
+</tr>
+</table>
+<h3>Functions</h3>
+<table>
+<tr><td>None</td></tr>
+</table>
+<hr /><hr />
+<a NAME="CodeDocumentationViewer" ID="CodeDocumentationViewer"></a>
+<h2>CodeDocumentationViewer</h2>
+<p>
+    Class implementing a widget to show some source code information provided
+    by plug-ins.
+</p><h3>Signals</h3>
+<dl>
+<dt>providerAdded()</dt>
+<dd>
+emitted to indicate the availability of a new
+        provider
+</dd><dt>providerRemoved()</dt>
+<dd>
+emitted to indicate the removal of a provider
+</dd>
+</dl>
+<h3>Derived from</h3>
+QWidget
+<h3>Class Attributes</h3>
+<table>
+<tr><td>None</td></tr>
+</table>
+<h3>Class Methods</h3>
+<table>
+<tr><td>None</td></tr>
+</table>
+<h3>Methods</h3>
+<table>
+<tr>
+<td><a href="#CodeDocumentationViewer.__init__">CodeDocumentationViewer</a></td>
+<td>Constructor</td>
+</tr><tr>
+<td><a href="#CodeDocumentationViewer.__setHtml">__setHtml</a></td>
+<td>Private slot to set the prepared HTML text.</td>
+</tr><tr>
+<td><a href="#CodeDocumentationViewer.__setHtmlWarning">__setHtmlWarning</a></td>
+<td>Private slot to set a display message.</td>
+</tr><tr>
+<td><a href="#CodeDocumentationViewer.__setupUi">__setupUi</a></td>
+<td>Private method to generate the UI layout.</td>
+</tr><tr>
+<td><a href="#CodeDocumentationViewer.__showDisabledMessage">__showDisabledMessage</a></td>
+<td>Private method to show a message giving the reason for being disabled.</td>
+</tr><tr>
+<td><a href="#CodeDocumentationViewer.__showTextViewer">__showTextViewer</a></td>
+<td>Private slot to show the selected viewer.</td>
+</tr><tr>
+<td><a href="#CodeDocumentationViewer.documentationReady">documentationReady</a></td>
+<td>Public method to provide the documentation info to the viewer.</td>
+</tr><tr>
+<td><a href="#CodeDocumentationViewer.finalizeSetup">finalizeSetup</a></td>
+<td>Public method to finalize the setup of the documentation viewer.</td>
+</tr><tr>
+<td><a href="#CodeDocumentationViewer.getProviders">getProviders</a></td>
+<td>Public method to get a list of providers and their visible strings.</td>
+</tr><tr>
+<td><a href="#CodeDocumentationViewer.isSupportedLanguage">isSupportedLanguage</a></td>
+<td>Public method to check, if the given language is supported by the selected provider.</td>
+</tr><tr>
+<td><a href="#CodeDocumentationViewer.on_providerComboBox_currentIndexChanged">on_providerComboBox_currentIndexChanged</a></td>
+<td>Private slot to handle the selection of a provider.</td>
+</tr><tr>
+<td><a href="#CodeDocumentationViewer.preferencesChanged">preferencesChanged</a></td>
+<td>Public slot to handle a change of preferences.</td>
+</tr><tr>
+<td><a href="#CodeDocumentationViewer.registerProvider">registerProvider</a></td>
+<td>Public method register a source docu provider.</td>
+</tr><tr>
+<td><a href="#CodeDocumentationViewer.showInfo">showInfo</a></td>
+<td>Public method to request code documentation data from a provider.</td>
+</tr><tr>
+<td><a href="#CodeDocumentationViewer.shutdown">shutdown</a></td>
+<td>Public method to perform shutdown actions.</td>
+</tr><tr>
+<td><a href="#CodeDocumentationViewer.unregisterProvider">unregisterProvider</a></td>
+<td>Public method register a source docu provider.</td>
+</tr>
+</table>
+<h3>Static Methods</h3>
+<table>
+<tr><td>None</td></tr>
+</table>
+<a NAME="CodeDocumentationViewer.__init__" ID="CodeDocumentationViewer.__init__"></a>
+<h4>CodeDocumentationViewer (Constructor)</h4>
+<b>CodeDocumentationViewer</b>(<i>parent=None</i>)
+<p>
+        Constructor
+</p><dl>
+<dt><i>parent</i> (QWidget)</dt>
+<dd>
+reference to the parent widget
+</dd>
+</dl><a NAME="CodeDocumentationViewer.__setHtml" ID="CodeDocumentationViewer.__setHtml"></a>
+<h4>CodeDocumentationViewer.__setHtml</h4>
+<b>__setHtml</b>(<i>html</i>)
+<p>
+        Private slot to set the prepared HTML text.
+</p><dl>
+<dt><i>html</i> (str)</dt>
+<dd>
+prepared HTML text
+</dd>
+</dl><a NAME="CodeDocumentationViewer.__setHtmlWarning" ID="CodeDocumentationViewer.__setHtmlWarning"></a>
+<h4>CodeDocumentationViewer.__setHtmlWarning</h4>
+<b>__setHtmlWarning</b>(<i>warningText</i>)
+<p>
+        Private slot to set a display message.
+</p><dl>
+<dt><i>warningText</i> (str)</dt>
+<dd>
+text to be shown as a warning
+</dd>
+</dl><a NAME="CodeDocumentationViewer.__setupUi" ID="CodeDocumentationViewer.__setupUi"></a>
+<h4>CodeDocumentationViewer.__setupUi</h4>
+<b>__setupUi</b>(<i></i>)
+<p>
+        Private method to generate the UI layout.
+</p><a NAME="CodeDocumentationViewer.__showDisabledMessage" ID="CodeDocumentationViewer.__showDisabledMessage"></a>
+<h4>CodeDocumentationViewer.__showDisabledMessage</h4>
+<b>__showDisabledMessage</b>(<i></i>)
+<p>
+        Private method to show a message giving the reason for being disabled.
+</p><a NAME="CodeDocumentationViewer.__showTextViewer" ID="CodeDocumentationViewer.__showTextViewer"></a>
+<h4>CodeDocumentationViewer.__showTextViewer</h4>
+<b>__showTextViewer</b>(<i>richText</i>)
+<p>
+        Private slot to show the selected viewer.
+</p><dl>
+<dt><i>richText</i> (bool)</dt>
+<dd>
+flag indicating the rich text viewer
+</dd>
+</dl><a NAME="CodeDocumentationViewer.documentationReady" ID="CodeDocumentationViewer.documentationReady"></a>
+<h4>CodeDocumentationViewer.documentationReady</h4>
+<b>documentationReady</b>(<i>documentationInfo, isWarning=False, isDocWarning=False</i>)
+<p>
+        Public method to provide the documentation info to the viewer.
+</p><p>
+        If documentationInfo is a dictionary, it should contains these keys
+        and data:
+</p><p>
+        name: the name of the inspected object
+        argspec: its argspec
+        note: A phrase describing the type of object (function or method) and
+            the module it belongs to.
+        docstring: its documentation string
+</p><dl>
+<dt><i>documentationInfo</i> (dict or str)</dt>
+<dd>
+dictionary containing the source docu data
+</dd><dt><i>isWarning</i> (bool)</dt>
+<dd>
+flag indicating a warning page
+</dd><dt><i>isDocWarning</i> (bool)</dt>
+<dd>
+flag indicating a documentation warning page
+</dd>
+</dl><a NAME="CodeDocumentationViewer.finalizeSetup" ID="CodeDocumentationViewer.finalizeSetup"></a>
+<h4>CodeDocumentationViewer.finalizeSetup</h4>
+<b>finalizeSetup</b>(<i></i>)
+<p>
+        Public method to finalize the setup of the documentation viewer.
+</p><a NAME="CodeDocumentationViewer.getProviders" ID="CodeDocumentationViewer.getProviders"></a>
+<h4>CodeDocumentationViewer.getProviders</h4>
+<b>getProviders</b>(<i></i>)
+<p>
+        Public method to get a list of providers and their visible strings.
+</p><dl>
+<dt>Returns:</dt>
+<dd>
+list containing the providers and their visible strings
+</dd>
+</dl><dl>
+<dt>Return Type:</dt>
+<dd>
+list of tuple of (str,str)
+</dd>
+</dl><a NAME="CodeDocumentationViewer.isSupportedLanguage" ID="CodeDocumentationViewer.isSupportedLanguage"></a>
+<h4>CodeDocumentationViewer.isSupportedLanguage</h4>
+<b>isSupportedLanguage</b>(<i>language</i>)
+<p>
+        Public method to check, if the given language is supported by the
+        selected provider.
+</p><dl>
+<dt><i>language</i> (str)</dt>
+<dd>
+editor programming language to check
+</dd>
+</dl><dl>
+<dt>Returns:</dt>
+<dd>
+flag indicating the support status
+</dd>
+</dl><dl>
+<dt>Return Type:</dt>
+<dd>
+bool
+</dd>
+</dl><a NAME="CodeDocumentationViewer.on_providerComboBox_currentIndexChanged" ID="CodeDocumentationViewer.on_providerComboBox_currentIndexChanged"></a>
+<h4>CodeDocumentationViewer.on_providerComboBox_currentIndexChanged</h4>
+<b>on_providerComboBox_currentIndexChanged</b>(<i>index</i>)
+<p>
+        Private slot to handle the selection of a provider.
+</p><dl>
+<dt><i>index</i> (int)</dt>
+<dd>
+index of the selected provider
+</dd>
+</dl><a NAME="CodeDocumentationViewer.preferencesChanged" ID="CodeDocumentationViewer.preferencesChanged"></a>
+<h4>CodeDocumentationViewer.preferencesChanged</h4>
+<b>preferencesChanged</b>(<i></i>)
+<p>
+        Public slot to handle a change of preferences.
+</p><a NAME="CodeDocumentationViewer.registerProvider" ID="CodeDocumentationViewer.registerProvider"></a>
+<h4>CodeDocumentationViewer.registerProvider</h4>
+<b>registerProvider</b>(<i>providerName, providerDisplay, provider, supported</i>)
+<p>
+        Public method register a source docu provider.
+</p><dl>
+<dt><i>providerName</i> (str)</dt>
+<dd>
+name of the provider (must be unique)
+</dd><dt><i>providerDisplay</i> (str)</dt>
+<dd>
+visible name of the provider
+</dd><dt><i>provider</i> (function(editor))</dt>
+<dd>
+function to be called to determine source docu
+</dd><dt><i>supported</i> (function(language))</dt>
+<dd>
+function to be called to determine, if a language is
+            supported
+</dd>
+</dl><dl>
+<dt>Raises <b>KeyError</b>:</dt>
+<dd>
+raised if a provider with the given name was
+            already registered
+</dd>
+</dl><a NAME="CodeDocumentationViewer.showInfo" ID="CodeDocumentationViewer.showInfo"></a>
+<h4>CodeDocumentationViewer.showInfo</h4>
+<b>showInfo</b>(<i>editor</i>)
+<p>
+        Public method to request code documentation data from a provider.
+</p><dl>
+<dt><i>editor</i> (Editor)</dt>
+<dd>
+reference to the editor to request code docu for
+</dd>
+</dl><a NAME="CodeDocumentationViewer.shutdown" ID="CodeDocumentationViewer.shutdown"></a>
+<h4>CodeDocumentationViewer.shutdown</h4>
+<b>shutdown</b>(<i></i>)
+<p>
+        Public method to perform shutdown actions.
+</p><a NAME="CodeDocumentationViewer.unregisterProvider" ID="CodeDocumentationViewer.unregisterProvider"></a>
+<h4>CodeDocumentationViewer.unregisterProvider</h4>
+<b>unregisterProvider</b>(<i>providerName</i>)
+<p>
+        Public method register a source docu provider.
+</p><dl>
+<dt><i>providerName</i> (str)</dt>
+<dd>
+name of the provider (must be unique)
+</dd>
+</dl>
+<div align="right"><a href="#top">Up</a></div>
+<hr /><hr />
+<a NAME="PlainTextDocumentationViewer" ID="PlainTextDocumentationViewer"></a>
+<h2>PlainTextDocumentationViewer</h2>
+<p>
+    Class implementing the plain text documentation viewer.
+</p>
+<h3>Derived from</h3>
+QWidget
+<h3>Class Attributes</h3>
+<table>
+<tr><td>None</td></tr>
+</table>
+<h3>Class Methods</h3>
+<table>
+<tr><td>None</td></tr>
+</table>
+<h3>Methods</h3>
+<table>
+<tr>
+<td><a href="#PlainTextDocumentationViewer.__init__">PlainTextDocumentationViewer</a></td>
+<td>Constructor</td>
+</tr><tr>
+<td><a href="#PlainTextDocumentationViewer.clear">clear</a></td>
+<td>Public method to clear the contents.</td>
+</tr><tr>
+<td><a href="#PlainTextDocumentationViewer.preferencesChanged">preferencesChanged</a></td>
+<td>Public slot to handle a change of preferences.</td>
+</tr><tr>
+<td><a href="#PlainTextDocumentationViewer.setText">setText</a></td>
+<td>Public method to set the text to be shown.</td>
+</tr>
+</table>
+<h3>Static Methods</h3>
+<table>
+<tr><td>None</td></tr>
+</table>
+<a NAME="PlainTextDocumentationViewer.__init__" ID="PlainTextDocumentationViewer.__init__"></a>
+<h4>PlainTextDocumentationViewer (Constructor)</h4>
+<b>PlainTextDocumentationViewer</b>(<i>parent=None</i>)
+<p>
+        Constructor
+</p><dl>
+<dt><i>parent</i> (QWidget)</dt>
+<dd>
+reference to the parent widget
+</dd>
+</dl><a NAME="PlainTextDocumentationViewer.clear" ID="PlainTextDocumentationViewer.clear"></a>
+<h4>PlainTextDocumentationViewer.clear</h4>
+<b>clear</b>(<i></i>)
+<p>
+        Public method to clear the contents.
+</p><a NAME="PlainTextDocumentationViewer.preferencesChanged" ID="PlainTextDocumentationViewer.preferencesChanged"></a>
+<h4>PlainTextDocumentationViewer.preferencesChanged</h4>
+<b>preferencesChanged</b>(<i></i>)
+<p>
+        Public slot to handle a change of preferences.
+</p><a NAME="PlainTextDocumentationViewer.setText" ID="PlainTextDocumentationViewer.setText"></a>
+<h4>PlainTextDocumentationViewer.setText</h4>
+<b>setText</b>(<i>text</i>)
+<p>
+        Public method to set the text to be shown.
+</p><dl>
+<dt><i>text</i> (str)</dt>
+<dd>
+text to be shown
+</dd>
+</dl>
+<div align="right"><a href="#top">Up</a></div>
+<hr /><hr />
+<a NAME="WebViewDocumentationViewer" ID="WebViewDocumentationViewer"></a>
+<h2>WebViewDocumentationViewer</h2>
+<p>
+    Class implementing the rich text documentation viewer.
+</p>
+<h3>Derived from</h3>
+QWidget
+<h3>Class Attributes</h3>
+<table>
+<tr><td>None</td></tr>
+</table>
+<h3>Class Methods</h3>
+<table>
+<tr><td>None</td></tr>
+</table>
+<h3>Methods</h3>
+<table>
+<tr>
+<td><a href="#WebViewDocumentationViewer.__init__">WebViewDocumentationViewer</a></td>
+<td>Constructor</td>
+</tr><tr>
+<td><a href="#WebViewDocumentationViewer.__showLink">__showLink</a></td>
+<td>Private slot to show the hovered link in a tooltip.</td>
+</tr><tr>
+<td><a href="#WebViewDocumentationViewer.clear">clear</a></td>
+<td>Public method to clear the shown contents.</td>
+</tr><tr>
+<td><a href="#WebViewDocumentationViewer.setHtml">setHtml</a></td>
+<td>Public method to set the HTML text of the widget.</td>
+</tr>
+</table>
+<h3>Static Methods</h3>
+<table>
+<tr><td>None</td></tr>
+</table>
+<a NAME="WebViewDocumentationViewer.__init__" ID="WebViewDocumentationViewer.__init__"></a>
+<h4>WebViewDocumentationViewer (Constructor)</h4>
+<b>WebViewDocumentationViewer</b>(<i>parent=None</i>)
+<p>
+        Constructor
+</p><dl>
+<dt><i>parent</i> (QWidget)</dt>
+<dd>
+reference to the parent widget
+</dd>
+</dl><a NAME="WebViewDocumentationViewer.__showLink" ID="WebViewDocumentationViewer.__showLink"></a>
+<h4>WebViewDocumentationViewer.__showLink</h4>
+<b>__showLink</b>(<i>urlStr</i>)
+<p>
+        Private slot to show the hovered link in a tooltip.
+</p><dl>
+<dt><i>urlStr</i> (str)</dt>
+<dd>
+hovered URL
+</dd>
+</dl><a NAME="WebViewDocumentationViewer.clear" ID="WebViewDocumentationViewer.clear"></a>
+<h4>WebViewDocumentationViewer.clear</h4>
+<b>clear</b>(<i></i>)
+<p>
+        Public method to clear the shown contents.
+</p><a NAME="WebViewDocumentationViewer.setHtml" ID="WebViewDocumentationViewer.setHtml"></a>
+<h4>WebViewDocumentationViewer.setHtml</h4>
+<b>setHtml</b>(<i>html</i>)
+<p>
+        Public method to set the HTML text of the widget.
+</p><dl>
+<dt><i>html</i> (str)</dt>
+<dd>
+HTML text to be shown
+</dd>
+</dl>
+<div align="right"><a href="#top">Up</a></div>
+<hr />
+</body></html>
\ No newline at end of file

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Documentation/Source/eric6.UI.CodeDocumentationViewerTemplate.html	Mon Oct 23 19:42:17 2017 +0200
@@ -0,0 +1,118 @@
+<!DOCTYPE html>
+<html><head>
+<title>eric6.UI.CodeDocumentationViewerTemplate</title>
+<meta charset="UTF-8">
+<style>
+body {
+    background: #EDECE6;
+    margin: 0em 1em 10em 1em;
+    color: black;
+}
+
+h1 { color: white; background: #85774A; }
+h2 { color: white; background: #85774A; }
+h3 { color: white; background: #9D936E; }
+h4 { color: white; background: #9D936E; }
+    
+a { color: #BA6D36; }
+
+</style>
+</head>
+<body><a NAME="top" ID="top"></a>
+<h1>eric6.UI.CodeDocumentationViewerTemplate</h1>
+<p>
+Module implementing functions to prepare an HTML documentation view.
+</p>
+<h3>Global Attributes</h3>
+<table>
+<tr><td>None</td></tr>
+</table>
+<h3>Classes</h3>
+<table>
+<tr><td>None</td></tr>
+</table>
+<h3>Functions</h3>
+<table>
+<tr>
+<td><a href="#prepareDocumentationViewerHtmlDocWarningDocument">prepareDocumentationViewerHtmlDocWarningDocument</a></td>
+<td>Public function to prepare a HTML warning document.</td>
+</tr><tr>
+<td><a href="#prepareDocumentationViewerHtmlDocument">prepareDocumentationViewerHtmlDocument</a></td>
+<td>Public function to prepare the HTML document.</td>
+</tr><tr>
+<td><a href="#prepareDocumentationViewerHtmlWarningDocument">prepareDocumentationViewerHtmlWarningDocument</a></td>
+<td>Public function to prepare a HTML warning document.</td>
+</tr>
+</table>
+<hr /><hr />
+<a NAME="prepareDocumentationViewerHtmlDocWarningDocument" ID="prepareDocumentationViewerHtmlDocWarningDocument"></a>
+<h2>prepareDocumentationViewerHtmlDocWarningDocument</h2>
+<b>prepareDocumentationViewerHtmlDocWarningDocument</b>(<i>text</i>)
+<p>
+    Public function to prepare a HTML warning document.
+</p><dl>
+<dt><i>text</i> (str)</dt>
+<dd>
+warning text to be shown
+</dd>
+</dl><dl>
+<dt>Returns:</dt>
+<dd>
+prepared HTML document
+</dd>
+</dl><dl>
+<dt>Return Type:</dt>
+<dd>
+str
+</dd>
+</dl>
+<div align="right"><a href="#top">Up</a></div>
+<hr /><hr />
+<a NAME="prepareDocumentationViewerHtmlDocument" ID="prepareDocumentationViewerHtmlDocument"></a>
+<h2>prepareDocumentationViewerHtmlDocument</h2>
+<b>prepareDocumentationViewerHtmlDocument</b>(<i>documentationInfo</i>)
+<p>
+    Public function to prepare the HTML document.
+</p><dl>
+<dt><i>documentationInfo</i> (dict)</dt>
+<dd>
+dictionary containing the various documentation
+        parts
+</dd>
+</dl><dl>
+<dt>Returns:</dt>
+<dd>
+prepared HTML document
+</dd>
+</dl><dl>
+<dt>Return Type:</dt>
+<dd>
+str
+</dd>
+</dl>
+<div align="right"><a href="#top">Up</a></div>
+<hr /><hr />
+<a NAME="prepareDocumentationViewerHtmlWarningDocument" ID="prepareDocumentationViewerHtmlWarningDocument"></a>
+<h2>prepareDocumentationViewerHtmlWarningDocument</h2>
+<b>prepareDocumentationViewerHtmlWarningDocument</b>(<i>text</i>)
+<p>
+    Public function to prepare a HTML warning document.
+</p><dl>
+<dt><i>text</i> (str)</dt>
+<dd>
+warning text to be shown
+</dd>
+</dl><dl>
+<dt>Returns:</dt>
+<dd>
+prepared HTML document
+</dd>
+</dl><dl>
+<dt>Return Type:</dt>
+<dd>
+str
+</dd>
+</dl>
+<div align="right"><a href="#top">Up</a></div>
+<hr />
+</body></html>
\ No newline at end of file

--- a/Documentation/Source/eric6.UI.Previewers.PreviewerHTML.html	Mon Oct 23 19:41:35 2017 +0200
+++ b/Documentation/Source/eric6.UI.Previewers.PreviewerHTML.html	Mon Oct 23 19:42:17 2017 +0200
@@ -543,9 +543,8 @@
                 Class is placed here, because it depends on imported markdown,
                 and markdown import is lazy.
 </p><p>
-                (see http://achinghead.com/
-                python-markdown-adding-insert-delete.html this page for
-                details)
+                (see https://pythonhosted.org/Markdown/extensions/api.html
+                this page for details)
 </p>
 <h3>Derived from</h3>
 markdown.Extension

--- a/Documentation/Source/eric6.UI.UserInterface.html	Mon Oct 23 19:41:35 2017 +0200
+++ b/Documentation/Source/eric6.UI.UserInterface.html	Mon Oct 23 19:42:17 2017 +0200
@@ -675,6 +675,9 @@
 <td><a href="#UserInterface.__writeTasks">__writeTasks</a></td>
 <td>Private slot to write the tasks data to an XML file (.e6t).</td>
 </tr><tr>
+<td><a href="#UserInterface.activateCodeDocumentationViewer">activateCodeDocumentationViewer</a></td>
+<td>Public slot to handle the activation of the Code Documentation Viewer.</td>
+</tr><tr>
 <td><a href="#UserInterface.activateCooperationViewer">activateCooperationViewer</a></td>
 <td>Public slot to handle the activation of the cooperation window.</td>
 </tr><tr>
@@ -711,6 +714,9 @@
 <td><a href="#UserInterface.createPopupMenu">createPopupMenu</a></td>
 <td>Public method to create the toolbars menu for Qt.</td>
 </tr><tr>
+<td><a href="#UserInterface.documentationViewer">documentationViewer</a></td>
+<td>Public method to provide a reference to the code documentation viewer.</td>
+</tr><tr>
 <td><a href="#UserInterface.dragEnterEvent">dragEnterEvent</a></td>
 <td>Protected method to handle the drag enter event.</td>
 </tr><tr>
@@ -2060,7 +2066,17 @@
 <b>__writeTasks</b>(<i></i>)
 <p>
         Private slot to write the tasks data to an XML file (.e6t).
-</p><a NAME="UserInterface.activateCooperationViewer" ID="UserInterface.activateCooperationViewer"></a>
+</p><a NAME="UserInterface.activateCodeDocumentationViewer" ID="UserInterface.activateCodeDocumentationViewer"></a>
+<h4>UserInterface.activateCodeDocumentationViewer</h4>
+<b>activateCodeDocumentationViewer</b>(<i>switchFocus=True</i>)
+<p>
+        Public slot to handle the activation of the Code Documentation Viewer.
+</p><dl>
+<dt><i>switchFocus</i> (bool)</dt>
+<dd>
+flag indicating to transfer the input focus
+</dd>
+</dl><a NAME="UserInterface.activateCooperationViewer" ID="UserInterface.activateCooperationViewer"></a>
 <h4>UserInterface.activateCooperationViewer</h4>
 <b>activateCooperationViewer</b>(<i></i>)
 <p>
@@ -2169,6 +2185,21 @@
 <dd>
 toolbars menu (QMenu)
 </dd>
+</dl><a NAME="UserInterface.documentationViewer" ID="UserInterface.documentationViewer"></a>
+<h4>UserInterface.documentationViewer</h4>
+<b>documentationViewer</b>(<i></i>)
+<p>
+        Public method to provide a reference to the code documentation viewer.
+</p><dl>
+<dt>Returns:</dt>
+<dd>
+reference to the code documentation viewer
+</dd>
+</dl><dl>
+<dt>Return Type:</dt>
+<dd>
+CodeDocumentationViewer
+</dd>
 </dl><a NAME="UserInterface.dragEnterEvent" ID="UserInterface.dragEnterEvent"></a>
 <h4>UserInterface.dragEnterEvent</h4>
 <b>dragEnterEvent</b>(<i>event</i>)

--- a/Documentation/Source/eric6.ViewManager.ViewManager.html	Mon Oct 23 19:41:35 2017 +0200
+++ b/Documentation/Source/eric6.ViewManager.ViewManager.html	Mon Oct 23 19:42:17 2017 +0200
@@ -318,6 +318,9 @@
 <td><a href="#ViewManager.__editShowCallTips">__editShowCallTips</a></td>
 <td>Private method to handle the calltips action.</td>
 </tr><tr>
+<td><a href="#ViewManager.__editShowCodeInfo">__editShowCodeInfo</a></td>
+<td>Private method to handle the code info action.</td>
+</tr><tr>
 <td><a href="#ViewManager.__editSmartIndent">__editSmartIndent</a></td>
 <td>Private method to handle the smart indent action.</td>
 </tr><tr>
@@ -429,6 +432,9 @@
 <td><a href="#ViewManager.__initViewActions">__initViewActions</a></td>
 <td>Private method defining the user interface actions for the view commands.</td>
 </tr><tr>
+<td><a href="#ViewManager.__isEditorInfoSupportedEd">__isEditorInfoSupportedEd</a></td>
+<td>Private method to check, if an editor is supported by the documentation viewer.</td>
+</tr><tr>
 <td><a href="#ViewManager.__lastEditPositionAvailable">__lastEditPositionAvailable</a></td>
 <td>Private slot to handle the lastEditPositionAvailable signal of an editor.</td>
 </tr><tr>
@@ -825,6 +831,9 @@
 <td><a href="#ViewManager.isConnected">isConnected</a></td>
 <td>Public method to check the connection status of the IDE.</td>
 </tr><tr>
+<td><a href="#ViewManager.isEditorInfoSupported">isEditorInfoSupported</a></td>
+<td>Public method to check, if a language is supported by the documentation viewer.</td>
+</tr><tr>
 <td><a href="#ViewManager.mainWidget">mainWidget</a></td>
 <td>Public method to return a reference to the main Widget of a specific view manager subclass.</td>
 </tr><tr>
@@ -942,6 +951,9 @@
 <td><a href="#ViewManager.showDebugSource">showDebugSource</a></td>
 <td>Public method to open the given file and highlight the given line in it.</td>
 </tr><tr>
+<td><a href="#ViewManager.showEditorInfo">showEditorInfo</a></td>
+<td>Public method to show some information for a given editor.</td>
+</tr><tr>
 <td><a href="#ViewManager.showReplaceWidget">showReplaceWidget</a></td>
 <td>Public method to show the replace widget.</td>
 </tr><tr>
@@ -1200,6 +1212,11 @@
 <b>__editShowCallTips</b>(<i></i>)
 <p>
         Private method to handle the calltips action.
+</p><a NAME="ViewManager.__editShowCodeInfo" ID="ViewManager.__editShowCodeInfo"></a>
+<h4>ViewManager.__editShowCodeInfo</h4>
+<b>__editShowCodeInfo</b>(<i></i>)
+<p>
+        Private method to handle the code info action.
 </p><a NAME="ViewManager.__editSmartIndent" ID="ViewManager.__editSmartIndent"></a>
 <h4>ViewManager.__editSmartIndent</h4>
 <b>__editSmartIndent</b>(<i></i>)
@@ -1443,7 +1460,28 @@
 <p>
         Private method defining the user interface actions for the view
         commands.
-</p><a NAME="ViewManager.__lastEditPositionAvailable" ID="ViewManager.__lastEditPositionAvailable"></a>
+</p><a NAME="ViewManager.__isEditorInfoSupportedEd" ID="ViewManager.__isEditorInfoSupportedEd"></a>
+<h4>ViewManager.__isEditorInfoSupportedEd</h4>
+<b>__isEditorInfoSupportedEd</b>(<i>editor</i>)
+<p>
+        Private method to check, if an editor is supported by the
+        documentation viewer.
+</p><dl>
+<dt><i>editor</i> (Editor)</dt>
+<dd>
+reference to the editor to check for
+</dd>
+</dl><dl>
+<dt>Returns:</dt>
+<dd>
+flag indicating the support status
+</dd>
+</dl><dl>
+<dt>Return Type:</dt>
+<dd>
+bool
+</dd>
+</dl><a NAME="ViewManager.__lastEditPositionAvailable" ID="ViewManager.__lastEditPositionAvailable"></a>
 <h4>ViewManager.__lastEditPositionAvailable</h4>
 <b>__lastEditPositionAvailable</b>(<i></i>)
 <p>
@@ -2663,6 +2701,27 @@
 <dd>
 flag indicating the connection status (boolean)
 </dd>
+</dl><a NAME="ViewManager.isEditorInfoSupported" ID="ViewManager.isEditorInfoSupported"></a>
+<h4>ViewManager.isEditorInfoSupported</h4>
+<b>isEditorInfoSupported</b>(<i>language</i>)
+<p>
+        Public method to check, if a language is supported by the
+        documentation viewer.
+</p><dl>
+<dt><i>language</i> (str)</dt>
+<dd>
+editor programming language to check
+</dd>
+</dl><dl>
+<dt>Returns:</dt>
+<dd>
+flag indicating the support status
+</dd>
+</dl><dl>
+<dt>Return Type:</dt>
+<dd>
+bool
+</dd>
 </dl><a NAME="ViewManager.mainWidget" ID="ViewManager.mainWidget"></a>
 <h4>ViewManager.mainWidget</h4>
 <b>mainWidget</b>(<i></i>)
@@ -3096,6 +3155,16 @@
 <dd>
 line number to highlight (int)
 </dd>
+</dl><a NAME="ViewManager.showEditorInfo" ID="ViewManager.showEditorInfo"></a>
+<h4>ViewManager.showEditorInfo</h4>
+<b>showEditorInfo</b>(<i>editor</i>)
+<p>
+        Public method to show some information for a given editor.
+</p><dl>
+<dt><i>editor</i> (Editor)</dt>
+<dd>
+editor to show information text for
+</dd>
 </dl><a NAME="ViewManager.showReplaceWidget" ID="ViewManager.showReplaceWidget"></a>
 <h4>ViewManager.showReplaceWidget</h4>
 <b>showReplaceWidget</b>(<i></i>)

--- a/Documentation/Source/index-eric6.Preferences.ConfigurationPages.html	Mon Oct 23 19:41:35 2017 +0200
+++ b/Documentation/Source/index-eric6.Preferences.ConfigurationPages.html	Mon Oct 23 19:42:17 2017 +0200
@@ -67,6 +67,9 @@
 <td><a href="eric6.Preferences.ConfigurationPages.EditorCalltipsQScintillaPage.html">EditorCalltipsQScintillaPage</a></td>
 <td>Module implementing the QScintilla Calltips configuration page.</td>
 </tr><tr>
+<td><a href="eric6.Preferences.ConfigurationPages.EditorDocViewerPage.html">EditorDocViewerPage</a></td>
+<td>Module implementing the Editor Documentation Viewer configuration page.</td>
+</tr><tr>
 <td><a href="eric6.Preferences.ConfigurationPages.EditorExportersPage.html">EditorExportersPage</a></td>
 <td>Module implementing the Editor Exporters configuration page.</td>
 </tr><tr>

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Documentation/Source/index-eric6.UI.data.html	Mon Oct 23 19:42:17 2017 +0200
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<html><head>
+<title>eric6.UI.data</title>
+<meta charset="UTF-8">
+<style>
+body {
+    background: #EDECE6;
+    margin: 0em 1em 10em 1em;
+    color: black;
+}
+
+h1 { color: white; background: #85774A; }
+h2 { color: white; background: #85774A; }
+h3 { color: white; background: #9D936E; }
+h4 { color: white; background: #9D936E; }
+    
+a { color: #BA6D36; }
+
+</style>
+</head>
+<body>
+<h1>eric6.UI.data</h1>
+<p>
+Package defining some data used by UI widgets.
+</p>
+
+
+</body></html>
\ No newline at end of file

--- a/Documentation/Source/index-eric6.UI.html	Mon Oct 23 19:41:35 2017 +0200
+++ b/Documentation/Source/index-eric6.UI.html	Mon Oct 23 19:42:17 2017 +0200
@@ -32,6 +32,9 @@
 <tr>
 <td><a href="index-eric6.UI.Previewers.html">Previewers</a></td>
 <td>Package containing the various previewer modules.</td>
+</tr><tr>
+<td><a href="index-eric6.UI.data.html">data</a></td>
+<td>Package defining some data used by UI widgets.</td>
 </tr>
 </table>
 
@@ -53,6 +56,12 @@
 <td><a href="eric6.UI.ClearPrivateDataDialog.html">ClearPrivateDataDialog</a></td>
 <td>Module implementing a dialog to select which private data to clear.</td>
 </tr><tr>
+<td><a href="eric6.UI.CodeDocumentationViewer.html">CodeDocumentationViewer</a></td>
+<td>Module implementing a widget to show some source code information provided by plug-ins.</td>
+</tr><tr>
+<td><a href="eric6.UI.CodeDocumentationViewerTemplate.html">CodeDocumentationViewerTemplate</a></td>
+<td>Module implementing functions to prepare an HTML documentation view.</td>
+</tr><tr>
 <td><a href="eric6.UI.CompareDialog.html">CompareDialog</a></td>
 <td>Module implementing a dialog to compare two files and show the result side by side.</td>
 </tr><tr>