Fri, 16 Feb 2018 20:18:29 +0100
Updated source docu.
--- a/APIs/Python3/eric6.api Fri Feb 16 20:15:49 2018 +0100 +++ b/APIs/Python3/eric6.api Fri Feb 16 20:18:29 2018 +0100 @@ -1325,6 +1325,7 @@ eric6.E5Gui.E5ToolButton.E5ToolButton.ToolBarLookOption?7 eric6.E5Gui.E5ToolButton.E5ToolButton.aboutToHideMenu?7 eric6.E5Gui.E5ToolButton.E5ToolButton.aboutToShowMenu?7 +eric6.E5Gui.E5ToolButton.E5ToolButton.badgeText?4() eric6.E5Gui.E5ToolButton.E5ToolButton.contextMenuEvent?4(evt) eric6.E5Gui.E5ToolButton.E5ToolButton.controlClicked?7 eric6.E5Gui.E5ToolButton.E5ToolButton.doubleClicked?7 @@ -1333,6 +1334,7 @@ eric6.E5Gui.E5ToolButton.E5ToolButton.mouseDoubleClickEvent?4(evt) eric6.E5Gui.E5ToolButton.E5ToolButton.mousePressEvent?4(evt) eric6.E5Gui.E5ToolButton.E5ToolButton.mouseReleaseEvent?4(evt) +eric6.E5Gui.E5ToolButton.E5ToolButton.setBadgeText?4(text) eric6.E5Gui.E5ToolButton.E5ToolButton.setMenu?4(menu) eric6.E5Gui.E5ToolButton.E5ToolButton.setShowMenuInside?4(enable) eric6.E5Gui.E5ToolButton.E5ToolButton.setToolbarButtonLook?4(enable) @@ -11014,19 +11016,20 @@ eric6.WebBrowser.Download.DownloadItem.DownloadItem.setData?4(data) eric6.WebBrowser.Download.DownloadItem.DownloadItem.setIcon?4(icon) eric6.WebBrowser.Download.DownloadItem.DownloadItem.statusChanged?7 -eric6.WebBrowser.Download.DownloadItem.DownloadItem?1(downloadItem=None, parent=None) +eric6.WebBrowser.Download.DownloadItem.DownloadItem?1(downloadItem=None, pageUrl="", parent=None) eric6.WebBrowser.Download.DownloadManager.DownloadManager.RemoveExit?7 eric6.WebBrowser.Download.DownloadManager.DownloadManager.RemoveNever?7 eric6.WebBrowser.Download.DownloadManager.DownloadManager.RemoveSuccessFullDownload?7 -eric6.WebBrowser.Download.DownloadManager.DownloadManager.activeDownloads?4() +eric6.WebBrowser.Download.DownloadManager.DownloadManager.activeDownloadsCount?4() eric6.WebBrowser.Download.DownloadManager.DownloadManager.allowQuit?4() eric6.WebBrowser.Download.DownloadManager.DownloadManager.changeOccurred?4() eric6.WebBrowser.Download.DownloadManager.DownloadManager.cleanup?4() eric6.WebBrowser.Download.DownloadManager.DownloadManager.closeEvent?4(evt) -eric6.WebBrowser.Download.DownloadManager.DownloadManager.count?4() eric6.WebBrowser.Download.DownloadManager.DownloadManager.download?4(downloadItem) eric6.WebBrowser.Download.DownloadManager.DownloadManager.downloadDirectory?4() eric6.WebBrowser.Download.DownloadManager.DownloadManager.downloads?4() +eric6.WebBrowser.Download.DownloadManager.DownloadManager.downloadsCount?4() +eric6.WebBrowser.Download.DownloadManager.DownloadManager.downloadsCountChanged?7 eric6.WebBrowser.Download.DownloadManager.DownloadManager.on_cleanupButton_clicked?4() eric6.WebBrowser.Download.DownloadManager.DownloadManager.removePolicy?4() eric6.WebBrowser.Download.DownloadManager.DownloadManager.save?4() @@ -11034,6 +11037,7 @@ eric6.WebBrowser.Download.DownloadManager.DownloadManager.setRemovePolicy?4(policy) eric6.WebBrowser.Download.DownloadManager.DownloadManager.shutdown?4() eric6.WebBrowser.Download.DownloadManager.DownloadManager?1(parent=None) +eric6.WebBrowser.Download.DownloadManagerButton.DownloadManagerButton?1(parent=None) eric6.WebBrowser.Download.DownloadModel.DownloadModel.data?4(index, role) eric6.WebBrowser.Download.DownloadModel.DownloadModel.flags?4(index) eric6.WebBrowser.Download.DownloadModel.DownloadModel.mimeData?4(indexes) @@ -11157,6 +11161,13 @@ eric6.WebBrowser.GreaseMonkey.GreaseMonkeyDownloader.GreaseMonkeyDownloader?1(url, manager, mode) eric6.WebBrowser.GreaseMonkey.GreaseMonkeyJavaScript.bootstrap_js?7 eric6.WebBrowser.GreaseMonkey.GreaseMonkeyJavaScript.values_js?7 +eric6.WebBrowser.GreaseMonkey.GreaseMonkeyJsObject.GreaseMonkeyJsObject.deleteValue?4(nspace, name) +eric6.WebBrowser.GreaseMonkey.GreaseMonkeyJsObject.GreaseMonkeyJsObject.getValue?4(nspace, name, dValue) +eric6.WebBrowser.GreaseMonkey.GreaseMonkeyJsObject.GreaseMonkeyJsObject.listValues?4(nspace) +eric6.WebBrowser.GreaseMonkey.GreaseMonkeyJsObject.GreaseMonkeyJsObject.setClipboard?4(text) +eric6.WebBrowser.GreaseMonkey.GreaseMonkeyJsObject.GreaseMonkeyJsObject.setSettingsFile?4(name) +eric6.WebBrowser.GreaseMonkey.GreaseMonkeyJsObject.GreaseMonkeyJsObject.setValue?4(nspace, name, value) +eric6.WebBrowser.GreaseMonkey.GreaseMonkeyJsObject.GreaseMonkeyJsObject?1(parent=None) eric6.WebBrowser.GreaseMonkey.GreaseMonkeyManager.GreaseMonkeyManager.addScript?4(script) eric6.WebBrowser.GreaseMonkey.GreaseMonkeyManager.GreaseMonkeyManager.allScripts?4() eric6.WebBrowser.GreaseMonkey.GreaseMonkeyManager.GreaseMonkeyManager.canRunOnScheme?4(scheme) @@ -11181,6 +11192,8 @@ eric6.WebBrowser.GreaseMonkey.GreaseMonkeyScript.GreaseMonkeyScript.exclude?4() eric6.WebBrowser.GreaseMonkey.GreaseMonkeyScript.GreaseMonkeyScript.fileName?4() eric6.WebBrowser.GreaseMonkey.GreaseMonkeyScript.GreaseMonkeyScript.fullName?4() +eric6.WebBrowser.GreaseMonkey.GreaseMonkeyScript.GreaseMonkeyScript.icon?4() +eric6.WebBrowser.GreaseMonkey.GreaseMonkeyScript.GreaseMonkeyScript.iconUrl?4() eric6.WebBrowser.GreaseMonkey.GreaseMonkeyScript.GreaseMonkeyScript.include?4() eric6.WebBrowser.GreaseMonkey.GreaseMonkeyScript.GreaseMonkeyScript.isEnabled?4() eric6.WebBrowser.GreaseMonkey.GreaseMonkeyScript.GreaseMonkeyScript.isUpdating?4() @@ -11328,10 +11341,14 @@ eric6.WebBrowser.ImageSearch.ImageSearchEngine.ImageSearchEngine.searchEngineNames?4() eric6.WebBrowser.ImageSearch.ImageSearchEngine.ImageSearchEngine.setSearchEngine?4(searchEngine) eric6.WebBrowser.ImageSearch.ImageSearchEngine.ImageSearchEngine?1(parent=None) +eric6.WebBrowser.JavaScript.ExternalJsObject.ExternalJsObject.extraObjects?7 eric6.WebBrowser.JavaScript.ExternalJsObject.ExternalJsObject.page?4() eric6.WebBrowser.JavaScript.ExternalJsObject.ExternalJsObject.passwordManager?4() +eric6.WebBrowser.JavaScript.ExternalJsObject.ExternalJsObject.registerExtraObject?4(name, jsObject) +eric6.WebBrowser.JavaScript.ExternalJsObject.ExternalJsObject.setupWebChannel?4(channel, page) eric6.WebBrowser.JavaScript.ExternalJsObject.ExternalJsObject.speedDial?4() eric6.WebBrowser.JavaScript.ExternalJsObject.ExternalJsObject.startPage?4() +eric6.WebBrowser.JavaScript.ExternalJsObject.ExternalJsObject.unregisterExtraObject?4(name) eric6.WebBrowser.JavaScript.ExternalJsObject.ExternalJsObject?1(page) eric6.WebBrowser.JavaScript.PasswordManagerJsObject.PasswordManagerJsObject.formSubmitted?4(urlStr, userName, password, data) eric6.WebBrowser.JavaScript.PasswordManagerJsObject.PasswordManagerJsObject?1(parent=None) @@ -11948,7 +11965,8 @@ eric6.WebBrowser.Tools.Scripts.setCss?4(css) eric6.WebBrowser.Tools.Scripts.setStyleSheet?4(css) eric6.WebBrowser.Tools.Scripts.setupFormObserver?4() -eric6.WebBrowser.Tools.Scripts.setupWebChannel?4() +eric6.WebBrowser.Tools.Scripts.setupWebChannel?4(worldId) +eric6.WebBrowser.Tools.Scripts.setupWindowObject?4() eric6.WebBrowser.Tools.WebBrowserTools.containsSpace?4(string) eric6.WebBrowser.Tools.WebBrowserTools.ensureUniqueFilename?4(name, appendFormat="({0})") eric6.WebBrowser.Tools.WebBrowserTools.filterCharsFromFilename?4(name) @@ -12104,6 +12122,7 @@ eric6.WebBrowser.WebBrowserLanguagesDialog.WebBrowserLanguagesDialog.on_upButton_clicked?4() eric6.WebBrowser.WebBrowserLanguagesDialog.WebBrowserLanguagesDialog?1(parent=None) eric6.WebBrowser.WebBrowserPage.WebBrowserPage.SafeJsWorld?7 +eric6.WebBrowser.WebBrowserPage.WebBrowserPage.UnsafeJsWorld?7 eric6.WebBrowser.WebBrowserPage.WebBrowserPage.acceptNavigationRequest?4(url, type_, isMainFrame) eric6.WebBrowser.WebBrowserPage.WebBrowserPage.certificateError?4(error) eric6.WebBrowser.WebBrowserPage.WebBrowserPage.execJavaScript?4(script, worldId=QWebEngineScript.MainWorld, timeout=500) @@ -12114,7 +12133,9 @@ eric6.WebBrowser.WebBrowserPage.WebBrowserPage.isJavaScriptEnabled?4() eric6.WebBrowser.WebBrowserPage.WebBrowserPage.javaScriptConsoleMessage?4(level, message, lineNumber, sourceId) eric6.WebBrowser.WebBrowserPage.WebBrowserPage.mapToViewport?4(pos) +eric6.WebBrowser.WebBrowserPage.WebBrowserPage.navigationRequestAccepted?7 eric6.WebBrowser.WebBrowserPage.WebBrowserPage.printCallback?4(resDict=resultDict) +eric6.WebBrowser.WebBrowserPage.WebBrowserPage.printRequested?7 eric6.WebBrowser.WebBrowserPage.WebBrowserPage.resultCallback?4(resDict=resultDict) eric6.WebBrowser.WebBrowserPage.WebBrowserPage.runJavaScript?4(script, worldId=-1, callback=None) eric6.WebBrowser.WebBrowserPage.WebBrowserPage.safeBrowsingAbort?7 @@ -12122,7 +12143,6 @@ eric6.WebBrowser.WebBrowserPage.WebBrowserPage.scroll?4(x, y) eric6.WebBrowser.WebBrowserPage.WebBrowserPage.scrollPosition?4() eric6.WebBrowser.WebBrowserPage.WebBrowserPage.scrollTo?4(pos) -eric6.WebBrowser.WebBrowserPage.WebBrowserPage.setJavaScriptEnabled?4(enable) eric6.WebBrowser.WebBrowserPage.WebBrowserPage.setUserAgent?4(agent) eric6.WebBrowser.WebBrowserPage.WebBrowserPage.userAgent?4(resolveEmpty=False) eric6.WebBrowser.WebBrowserPage.WebBrowserPage.userAgentForUrl?4(url) @@ -12234,6 +12254,7 @@ eric6.WebBrowser.WebBrowserView.WebBrowserView.source?4() eric6.WebBrowser.WebBrowserView.WebBrowserView.sourceChanged?7 eric6.WebBrowser.WebBrowserView.WebBrowserView.storeSessionData?4(data) +eric6.WebBrowser.WebBrowserView.WebBrowserView.title?4() eric6.WebBrowser.WebBrowserView.WebBrowserView.undo?4() eric6.WebBrowser.WebBrowserView.WebBrowserView.unselect?4() eric6.WebBrowser.WebBrowserView.WebBrowserView.zoomIn?4() @@ -12361,9 +12382,11 @@ eric6.WebBrowser.WebBrowserWindow.WebBrowserWindow.webBrowserWindowClosed?7 eric6.WebBrowser.WebBrowserWindow.WebBrowserWindow.webBrowserWindowOpened?7 eric6.WebBrowser.WebBrowserWindow.WebBrowserWindow.webProfile?4(private=False) +eric6.WebBrowser.WebBrowserWindow.WebBrowserWindow.webSettings?4() eric6.WebBrowser.WebBrowserWindow.WebBrowserWindow?1(home, path, parent, name, fromEric=False, initShortcutsOnly=False, searchWord=None, private=False, qthelp=False, settingsDir="", restoreSession=False) eric6.WebBrowser.WebInspector.WebInspector.closeEvent?4(evt) eric6.WebBrowser.WebInspector.WebInspector.inspectElement?4() +eric6.WebBrowser.WebInspector.WebInspector.inspectorClosed?7 eric6.WebBrowser.WebInspector.WebInspector.isEnabled?4() eric6.WebBrowser.WebInspector.WebInspector.setView?4(view, inspectElement=False) eric6.WebBrowser.WebInspector.WebInspector?1(parent=None)
--- a/APIs/Python3/eric6.bas Fri Feb 16 20:15:49 2018 +0100 +++ b/APIs/Python3/eric6.bas Fri Feb 16 20:18:29 2018 +0100 @@ -148,6 +148,7 @@ DownloadAskActionDialog QDialog Ui_DownloadAskActionDialog DownloadItem QWidget Ui_DownloadItem DownloadManager QDialog Ui_DownloadManager +DownloadManagerButton E5ToolButton DownloadModel QAbstractListModel DuplicateParamError Exception E5Action QAction @@ -369,6 +370,7 @@ GreaseMonkeyConfigurationListWidget QListWidget GreaseMonkeyConfigurationScriptInfoDialog QDialog Ui_GreaseMonkeyConfigurationScriptInfoDialog GreaseMonkeyDownloader QObject +GreaseMonkeyJsObject QObject GreaseMonkeyManager QObject GreaseMonkeyScript QObject HelpAppearancePage ConfigurationPageBase Ui_HelpAppearancePage
--- a/Documentation/Help/source.qhp Fri Feb 16 20:15:49 2018 +0100 +++ b/Documentation/Help/source.qhp Fri Feb 16 20:18:29 2018 +0100 @@ -1254,6 +1254,7 @@ <section title="eric6.WebBrowser.Download.DownloadAskActionDialog" ref="eric6.WebBrowser.Download.DownloadAskActionDialog.html" /> <section title="eric6.WebBrowser.Download.DownloadItem" ref="eric6.WebBrowser.Download.DownloadItem.html" /> <section title="eric6.WebBrowser.Download.DownloadManager" ref="eric6.WebBrowser.Download.DownloadManager.html" /> + <section title="eric6.WebBrowser.Download.DownloadManagerButton" ref="eric6.WebBrowser.Download.DownloadManagerButton.html" /> <section title="eric6.WebBrowser.Download.DownloadModel" ref="eric6.WebBrowser.Download.DownloadModel.html" /> <section title="eric6.WebBrowser.Download.DownloadUtilities" ref="eric6.WebBrowser.Download.DownloadUtilities.html" /> </section> @@ -1285,6 +1286,7 @@ <section title="eric6.WebBrowser.GreaseMonkey.GreaseMonkeyAddScriptDialog" ref="eric6.WebBrowser.GreaseMonkey.GreaseMonkeyAddScriptDialog.html" /> <section title="eric6.WebBrowser.GreaseMonkey.GreaseMonkeyDownloader" ref="eric6.WebBrowser.GreaseMonkey.GreaseMonkeyDownloader.html" /> <section title="eric6.WebBrowser.GreaseMonkey.GreaseMonkeyJavaScript" ref="eric6.WebBrowser.GreaseMonkey.GreaseMonkeyJavaScript.html" /> + <section title="eric6.WebBrowser.GreaseMonkey.GreaseMonkeyJsObject" ref="eric6.WebBrowser.GreaseMonkey.GreaseMonkeyJsObject.html" /> <section title="eric6.WebBrowser.GreaseMonkey.GreaseMonkeyManager" ref="eric6.WebBrowser.GreaseMonkey.GreaseMonkeyManager.html" /> <section title="eric6.WebBrowser.GreaseMonkey.GreaseMonkeyScript" ref="eric6.WebBrowser.GreaseMonkey.GreaseMonkeyScript.html" /> </section> @@ -4255,7 +4257,7 @@ <keyword name="DownloadManager.__updateRow" id="DownloadManager.__updateRow" ref="eric6.Helpviewer.Download.DownloadManager.html#DownloadManager.__updateRow" /> <keyword name="DownloadManager.__updateRow" id="DownloadManager.__updateRow" ref="eric6.WebBrowser.Download.DownloadManager.html#DownloadManager.__updateRow" /> <keyword name="DownloadManager.activeDownloads" id="DownloadManager.activeDownloads" ref="eric6.Helpviewer.Download.DownloadManager.html#DownloadManager.activeDownloads" /> - <keyword name="DownloadManager.activeDownloads" id="DownloadManager.activeDownloads" ref="eric6.WebBrowser.Download.DownloadManager.html#DownloadManager.activeDownloads" /> + <keyword name="DownloadManager.activeDownloadsCount" id="DownloadManager.activeDownloadsCount" ref="eric6.WebBrowser.Download.DownloadManager.html#DownloadManager.activeDownloadsCount" /> <keyword name="DownloadManager.allowQuit" id="DownloadManager.allowQuit" ref="eric6.Helpviewer.Download.DownloadManager.html#DownloadManager.allowQuit" /> <keyword name="DownloadManager.allowQuit" id="DownloadManager.allowQuit" ref="eric6.WebBrowser.Download.DownloadManager.html#DownloadManager.allowQuit" /> <keyword name="DownloadManager.changeOccurred" id="DownloadManager.changeOccurred" ref="eric6.Helpviewer.Download.DownloadManager.html#DownloadManager.changeOccurred" /> @@ -4264,13 +4266,13 @@ <keyword name="DownloadManager.cleanup" id="DownloadManager.cleanup" ref="eric6.WebBrowser.Download.DownloadManager.html#DownloadManager.cleanup" /> <keyword name="DownloadManager.closeEvent" id="DownloadManager.closeEvent" ref="eric6.WebBrowser.Download.DownloadManager.html#DownloadManager.closeEvent" /> <keyword name="DownloadManager.count" id="DownloadManager.count" ref="eric6.Helpviewer.Download.DownloadManager.html#DownloadManager.count" /> - <keyword name="DownloadManager.count" id="DownloadManager.count" ref="eric6.WebBrowser.Download.DownloadManager.html#DownloadManager.count" /> <keyword name="DownloadManager.download" id="DownloadManager.download" ref="eric6.Helpviewer.Download.DownloadManager.html#DownloadManager.download" /> <keyword name="DownloadManager.download" id="DownloadManager.download" ref="eric6.WebBrowser.Download.DownloadManager.html#DownloadManager.download" /> <keyword name="DownloadManager.downloadDirectory" id="DownloadManager.downloadDirectory" ref="eric6.Helpviewer.Download.DownloadManager.html#DownloadManager.downloadDirectory" /> <keyword name="DownloadManager.downloadDirectory" id="DownloadManager.downloadDirectory" ref="eric6.WebBrowser.Download.DownloadManager.html#DownloadManager.downloadDirectory" /> <keyword name="DownloadManager.downloads" id="DownloadManager.downloads" ref="eric6.Helpviewer.Download.DownloadManager.html#DownloadManager.downloads" /> <keyword name="DownloadManager.downloads" id="DownloadManager.downloads" ref="eric6.WebBrowser.Download.DownloadManager.html#DownloadManager.downloads" /> + <keyword name="DownloadManager.downloadsCount" id="DownloadManager.downloadsCount" ref="eric6.WebBrowser.Download.DownloadManager.html#DownloadManager.downloadsCount" /> <keyword name="DownloadManager.handleUnsupportedContent" id="DownloadManager.handleUnsupportedContent" ref="eric6.Helpviewer.Download.DownloadManager.html#DownloadManager.handleUnsupportedContent" /> <keyword name="DownloadManager.on_cleanupButton_clicked" id="DownloadManager.on_cleanupButton_clicked" ref="eric6.Helpviewer.Download.DownloadManager.html#DownloadManager.on_cleanupButton_clicked" /> <keyword name="DownloadManager.on_cleanupButton_clicked" id="DownloadManager.on_cleanupButton_clicked" ref="eric6.WebBrowser.Download.DownloadManager.html#DownloadManager.on_cleanupButton_clicked" /> @@ -4284,6 +4286,11 @@ <keyword name="DownloadManager.setRemovePolicy" id="DownloadManager.setRemovePolicy" ref="eric6.WebBrowser.Download.DownloadManager.html#DownloadManager.setRemovePolicy" /> <keyword name="DownloadManager.shutdown" id="DownloadManager.shutdown" ref="eric6.Helpviewer.Download.DownloadManager.html#DownloadManager.shutdown" /> <keyword name="DownloadManager.shutdown" id="DownloadManager.shutdown" ref="eric6.WebBrowser.Download.DownloadManager.html#DownloadManager.shutdown" /> + <keyword name="DownloadManagerButton" id="DownloadManagerButton" ref="eric6.WebBrowser.Download.DownloadManagerButton.html#DownloadManagerButton" /> + <keyword name="DownloadManagerButton (Constructor)" id="DownloadManagerButton (Constructor)" ref="eric6.WebBrowser.Download.DownloadManagerButton.html#DownloadManagerButton.__init__" /> + <keyword name="DownloadManagerButton (Module)" id="DownloadManagerButton (Module)" ref="eric6.WebBrowser.Download.DownloadManagerButton.html" /> + <keyword name="DownloadManagerButton.__buttonClicked" id="DownloadManagerButton.__buttonClicked" ref="eric6.WebBrowser.Download.DownloadManagerButton.html#DownloadManagerButton.__buttonClicked" /> + <keyword name="DownloadManagerButton.__updateState" id="DownloadManagerButton.__updateState" ref="eric6.WebBrowser.Download.DownloadManagerButton.html#DownloadManagerButton.__updateState" /> <keyword name="DownloadModel" id="DownloadModel" ref="eric6.Helpviewer.Download.DownloadModel.html#DownloadModel" /> <keyword name="DownloadModel" id="DownloadModel" ref="eric6.WebBrowser.Download.DownloadModel.html#DownloadModel" /> <keyword name="DownloadModel (Constructor)" id="DownloadModel (Constructor)" ref="eric6.Helpviewer.Download.DownloadModel.html#DownloadModel.__init__" /> @@ -5015,11 +5022,13 @@ <keyword name="E5ToolButton (Module)" id="E5ToolButton (Module)" ref="eric6.E5Gui.E5ToolButton.html" /> <keyword name="E5ToolButton.__menuAboutToHide" id="E5ToolButton.__menuAboutToHide" ref="eric6.E5Gui.E5ToolButton.html#E5ToolButton.__menuAboutToHide" /> <keyword name="E5ToolButton.__showMenu" id="E5ToolButton.__showMenu" ref="eric6.E5Gui.E5ToolButton.html#E5ToolButton.__showMenu" /> + <keyword name="E5ToolButton.badgeText" id="E5ToolButton.badgeText" ref="eric6.E5Gui.E5ToolButton.html#E5ToolButton.badgeText" /> <keyword name="E5ToolButton.contextMenuEvent" id="E5ToolButton.contextMenuEvent" ref="eric6.E5Gui.E5ToolButton.html#E5ToolButton.contextMenuEvent" /> <keyword name="E5ToolButton.menu" id="E5ToolButton.menu" ref="eric6.E5Gui.E5ToolButton.html#E5ToolButton.menu" /> <keyword name="E5ToolButton.mouseDoubleClickEvent" id="E5ToolButton.mouseDoubleClickEvent" ref="eric6.E5Gui.E5ToolButton.html#E5ToolButton.mouseDoubleClickEvent" /> <keyword name="E5ToolButton.mousePressEvent" id="E5ToolButton.mousePressEvent" ref="eric6.E5Gui.E5ToolButton.html#E5ToolButton.mousePressEvent" /> <keyword name="E5ToolButton.mouseReleaseEvent" id="E5ToolButton.mouseReleaseEvent" ref="eric6.E5Gui.E5ToolButton.html#E5ToolButton.mouseReleaseEvent" /> + <keyword name="E5ToolButton.setBadgeText" id="E5ToolButton.setBadgeText" ref="eric6.E5Gui.E5ToolButton.html#E5ToolButton.setBadgeText" /> <keyword name="E5ToolButton.setMenu" id="E5ToolButton.setMenu" ref="eric6.E5Gui.E5ToolButton.html#E5ToolButton.setMenu" /> <keyword name="E5ToolButton.setShowMenuInside" id="E5ToolButton.setShowMenuInside" ref="eric6.E5Gui.E5ToolButton.html#E5ToolButton.setShowMenuInside" /> <keyword name="E5ToolButton.setToolbarButtonLook" id="E5ToolButton.setToolbarButtonLook" ref="eric6.E5Gui.E5ToolButton.html#E5ToolButton.setToolbarButtonLook" /> @@ -5879,8 +5888,11 @@ <keyword name="ExternalJsObject (Module)" id="ExternalJsObject (Module)" ref="eric6.WebBrowser.JavaScript.ExternalJsObject.html" /> <keyword name="ExternalJsObject.page" id="ExternalJsObject.page" ref="eric6.WebBrowser.JavaScript.ExternalJsObject.html#ExternalJsObject.page" /> <keyword name="ExternalJsObject.passwordManager" id="ExternalJsObject.passwordManager" ref="eric6.WebBrowser.JavaScript.ExternalJsObject.html#ExternalJsObject.passwordManager" /> + <keyword name="ExternalJsObject.registerExtraObject" id="ExternalJsObject.registerExtraObject" ref="eric6.WebBrowser.JavaScript.ExternalJsObject.html#ExternalJsObject.registerExtraObject" /> + <keyword name="ExternalJsObject.setupWebChannel" id="ExternalJsObject.setupWebChannel" ref="eric6.WebBrowser.JavaScript.ExternalJsObject.html#ExternalJsObject.setupWebChannel" /> <keyword name="ExternalJsObject.speedDial" id="ExternalJsObject.speedDial" ref="eric6.WebBrowser.JavaScript.ExternalJsObject.html#ExternalJsObject.speedDial" /> <keyword name="ExternalJsObject.startPage" id="ExternalJsObject.startPage" ref="eric6.WebBrowser.JavaScript.ExternalJsObject.html#ExternalJsObject.startPage" /> + <keyword name="ExternalJsObject.unregisterExtraObject" id="ExternalJsObject.unregisterExtraObject" ref="eric6.WebBrowser.JavaScript.ExternalJsObject.html#ExternalJsObject.unregisterExtraObject" /> <keyword name="FavIconLabel" id="FavIconLabel" ref="eric6.Helpviewer.UrlBar.FavIconLabel.html#FavIconLabel" /> <keyword name="FavIconLabel" id="FavIconLabel" ref="eric6.WebBrowser.UrlBar.FavIconLabel.html#FavIconLabel" /> <keyword name="FavIconLabel (Constructor)" id="FavIconLabel (Constructor)" ref="eric6.Helpviewer.UrlBar.FavIconLabel.html#FavIconLabel.__init__" /> @@ -7402,6 +7414,15 @@ <keyword name="GreaseMonkeyDownloader.updateScript" id="GreaseMonkeyDownloader.updateScript" ref="eric6.WebBrowser.GreaseMonkey.GreaseMonkeyDownloader.html#GreaseMonkeyDownloader.updateScript" /> <keyword name="GreaseMonkeyJavaScript (Module)" id="GreaseMonkeyJavaScript (Module)" ref="eric6.Helpviewer.GreaseMonkey.GreaseMonkeyJavaScript.html" /> <keyword name="GreaseMonkeyJavaScript (Module)" id="GreaseMonkeyJavaScript (Module)" ref="eric6.WebBrowser.GreaseMonkey.GreaseMonkeyJavaScript.html" /> + <keyword name="GreaseMonkeyJsObject" id="GreaseMonkeyJsObject" ref="eric6.WebBrowser.GreaseMonkey.GreaseMonkeyJsObject.html#GreaseMonkeyJsObject" /> + <keyword name="GreaseMonkeyJsObject (Constructor)" id="GreaseMonkeyJsObject (Constructor)" ref="eric6.WebBrowser.GreaseMonkey.GreaseMonkeyJsObject.html#GreaseMonkeyJsObject.__init__" /> + <keyword name="GreaseMonkeyJsObject (Module)" id="GreaseMonkeyJsObject (Module)" ref="eric6.WebBrowser.GreaseMonkey.GreaseMonkeyJsObject.html" /> + <keyword name="GreaseMonkeyJsObject.deleteValue" id="GreaseMonkeyJsObject.deleteValue" ref="eric6.WebBrowser.GreaseMonkey.GreaseMonkeyJsObject.html#GreaseMonkeyJsObject.deleteValue" /> + <keyword name="GreaseMonkeyJsObject.getValue" id="GreaseMonkeyJsObject.getValue" ref="eric6.WebBrowser.GreaseMonkey.GreaseMonkeyJsObject.html#GreaseMonkeyJsObject.getValue" /> + <keyword name="GreaseMonkeyJsObject.listValues" id="GreaseMonkeyJsObject.listValues" ref="eric6.WebBrowser.GreaseMonkey.GreaseMonkeyJsObject.html#GreaseMonkeyJsObject.listValues" /> + <keyword name="GreaseMonkeyJsObject.setClipboard" id="GreaseMonkeyJsObject.setClipboard" ref="eric6.WebBrowser.GreaseMonkey.GreaseMonkeyJsObject.html#GreaseMonkeyJsObject.setClipboard" /> + <keyword name="GreaseMonkeyJsObject.setSettingsFile" id="GreaseMonkeyJsObject.setSettingsFile" ref="eric6.WebBrowser.GreaseMonkey.GreaseMonkeyJsObject.html#GreaseMonkeyJsObject.setSettingsFile" /> + <keyword name="GreaseMonkeyJsObject.setValue" id="GreaseMonkeyJsObject.setValue" ref="eric6.WebBrowser.GreaseMonkey.GreaseMonkeyJsObject.html#GreaseMonkeyJsObject.setValue" /> <keyword name="GreaseMonkeyManager" id="GreaseMonkeyManager" ref="eric6.Helpviewer.GreaseMonkey.GreaseMonkeyManager.html#GreaseMonkeyManager" /> <keyword name="GreaseMonkeyManager" id="GreaseMonkeyManager" ref="eric6.WebBrowser.GreaseMonkey.GreaseMonkeyManager.html#GreaseMonkeyManager" /> <keyword name="GreaseMonkeyManager (Constructor)" id="GreaseMonkeyManager (Constructor)" ref="eric6.Helpviewer.GreaseMonkey.GreaseMonkeyManager.html#GreaseMonkeyManager.__init__" /> @@ -7449,9 +7470,11 @@ <keyword name="GreaseMonkeyScript (Constructor)" id="GreaseMonkeyScript (Constructor)" ref="eric6.WebBrowser.GreaseMonkey.GreaseMonkeyScript.html#GreaseMonkeyScript.__init__" /> <keyword name="GreaseMonkeyScript (Module)" id="GreaseMonkeyScript (Module)" ref="eric6.Helpviewer.GreaseMonkey.GreaseMonkeyScript.html" /> <keyword name="GreaseMonkeyScript (Module)" id="GreaseMonkeyScript (Module)" ref="eric6.WebBrowser.GreaseMonkey.GreaseMonkeyScript.html" /> + <keyword name="GreaseMonkeyScript.__downloadIcon" id="GreaseMonkeyScript.__downloadIcon" ref="eric6.WebBrowser.GreaseMonkey.GreaseMonkeyScript.html#GreaseMonkeyScript.__downloadIcon" /> <keyword name="GreaseMonkeyScript.__downloadRequires" id="GreaseMonkeyScript.__downloadRequires" ref="eric6.WebBrowser.GreaseMonkey.GreaseMonkeyScript.html#GreaseMonkeyScript.__downloadRequires" /> <keyword name="GreaseMonkeyScript.__downloaderError" id="GreaseMonkeyScript.__downloaderError" ref="eric6.WebBrowser.GreaseMonkey.GreaseMonkeyScript.html#GreaseMonkeyScript.__downloaderError" /> <keyword name="GreaseMonkeyScript.__downloaderFinished" id="GreaseMonkeyScript.__downloaderFinished" ref="eric6.WebBrowser.GreaseMonkey.GreaseMonkeyScript.html#GreaseMonkeyScript.__downloaderFinished" /> + <keyword name="GreaseMonkeyScript.__iconDownloaded" id="GreaseMonkeyScript.__iconDownloaded" ref="eric6.WebBrowser.GreaseMonkey.GreaseMonkeyScript.html#GreaseMonkeyScript.__iconDownloaded" /> <keyword name="GreaseMonkeyScript.__parseScript" id="GreaseMonkeyScript.__parseScript" ref="eric6.Helpviewer.GreaseMonkey.GreaseMonkeyScript.html#GreaseMonkeyScript.__parseScript" /> <keyword name="GreaseMonkeyScript.__parseScript" id="GreaseMonkeyScript.__parseScript" ref="eric6.WebBrowser.GreaseMonkey.GreaseMonkeyScript.html#GreaseMonkeyScript.__parseScript" /> <keyword name="GreaseMonkeyScript.__reloadScript" id="GreaseMonkeyScript.__reloadScript" ref="eric6.WebBrowser.GreaseMonkey.GreaseMonkeyScript.html#GreaseMonkeyScript.__reloadScript" /> @@ -7469,6 +7492,8 @@ <keyword name="GreaseMonkeyScript.fileName" id="GreaseMonkeyScript.fileName" ref="eric6.WebBrowser.GreaseMonkey.GreaseMonkeyScript.html#GreaseMonkeyScript.fileName" /> <keyword name="GreaseMonkeyScript.fullName" id="GreaseMonkeyScript.fullName" ref="eric6.Helpviewer.GreaseMonkey.GreaseMonkeyScript.html#GreaseMonkeyScript.fullName" /> <keyword name="GreaseMonkeyScript.fullName" id="GreaseMonkeyScript.fullName" ref="eric6.WebBrowser.GreaseMonkey.GreaseMonkeyScript.html#GreaseMonkeyScript.fullName" /> + <keyword name="GreaseMonkeyScript.icon" id="GreaseMonkeyScript.icon" ref="eric6.WebBrowser.GreaseMonkey.GreaseMonkeyScript.html#GreaseMonkeyScript.icon" /> + <keyword name="GreaseMonkeyScript.iconUrl" id="GreaseMonkeyScript.iconUrl" ref="eric6.WebBrowser.GreaseMonkey.GreaseMonkeyScript.html#GreaseMonkeyScript.iconUrl" /> <keyword name="GreaseMonkeyScript.include" id="GreaseMonkeyScript.include" ref="eric6.Helpviewer.GreaseMonkey.GreaseMonkeyScript.html#GreaseMonkeyScript.include" /> <keyword name="GreaseMonkeyScript.include" id="GreaseMonkeyScript.include" ref="eric6.WebBrowser.GreaseMonkey.GreaseMonkeyScript.html#GreaseMonkeyScript.include" /> <keyword name="GreaseMonkeyScript.isEnabled" id="GreaseMonkeyScript.isEnabled" ref="eric6.Helpviewer.GreaseMonkey.GreaseMonkeyScript.html#GreaseMonkeyScript.isEnabled" /> @@ -10292,6 +10317,7 @@ <keyword name="JavaScriptIcon" id="JavaScriptIcon" ref="eric6.WebBrowser.StatusBar.JavaScriptIcon.html#JavaScriptIcon" /> <keyword name="JavaScriptIcon (Constructor)" id="JavaScriptIcon (Constructor)" ref="eric6.WebBrowser.StatusBar.JavaScriptIcon.html#JavaScriptIcon.__init__" /> <keyword name="JavaScriptIcon (Module)" id="JavaScriptIcon (Module)" ref="eric6.WebBrowser.StatusBar.JavaScriptIcon.html" /> + <keyword name="JavaScriptIcon.__navigationRequestAccepted" id="JavaScriptIcon.__navigationRequestAccepted" ref="eric6.WebBrowser.StatusBar.JavaScriptIcon.html#JavaScriptIcon.__navigationRequestAccepted" /> <keyword name="JavaScriptIcon.__showJavaScriptSettingsDialog" id="JavaScriptIcon.__showJavaScriptSettingsDialog" ref="eric6.WebBrowser.StatusBar.JavaScriptIcon.html#JavaScriptIcon.__showJavaScriptSettingsDialog" /> <keyword name="JavaScriptIcon.__showMenu" id="JavaScriptIcon.__showMenu" ref="eric6.WebBrowser.StatusBar.JavaScriptIcon.html#JavaScriptIcon.__showMenu" /> <keyword name="JavaScriptIcon.__toggleJavaScript" id="JavaScriptIcon.__toggleJavaScript" ref="eric6.WebBrowser.StatusBar.JavaScriptIcon.html#JavaScriptIcon.__toggleJavaScript" /> @@ -17517,7 +17543,9 @@ <keyword name="WebBrowserPage (Module)" id="WebBrowserPage (Module)" ref="eric6.WebBrowser.WebBrowserPage.html" /> <keyword name="WebBrowserPage.__featurePermissionRequested" id="WebBrowserPage.__featurePermissionRequested" ref="eric6.WebBrowser.WebBrowserPage.html#WebBrowserPage.__featurePermissionRequested" /> <keyword name="WebBrowserPage.__fullScreenRequested" id="WebBrowserPage.__fullScreenRequested" ref="eric6.WebBrowser.WebBrowserPage.html#WebBrowserPage.__fullScreenRequested" /> - <keyword name="WebBrowserPage.__setupWebChannel" id="WebBrowserPage.__setupWebChannel" ref="eric6.WebBrowser.WebBrowserPage.html#WebBrowserPage.__setupWebChannel" /> + <keyword name="WebBrowserPage.__loadProgressSlot" id="WebBrowserPage.__loadProgressSlot" ref="eric6.WebBrowser.WebBrowserPage.html#WebBrowserPage.__loadProgressSlot" /> + <keyword name="WebBrowserPage.__setupChannelTimeout" id="WebBrowserPage.__setupChannelTimeout" ref="eric6.WebBrowser.WebBrowserPage.html#WebBrowserPage.__setupChannelTimeout" /> + <keyword name="WebBrowserPage.__setupWebChannelForUrl" id="WebBrowserPage.__setupWebChannelForUrl" ref="eric6.WebBrowser.WebBrowserPage.html#WebBrowserPage.__setupWebChannelForUrl" /> <keyword name="WebBrowserPage.__urlChanged" id="WebBrowserPage.__urlChanged" ref="eric6.WebBrowser.WebBrowserPage.html#WebBrowserPage.__urlChanged" /> <keyword name="WebBrowserPage.acceptNavigationRequest" id="WebBrowserPage.acceptNavigationRequest" ref="eric6.WebBrowser.WebBrowserPage.html#WebBrowserPage.acceptNavigationRequest" /> <keyword name="WebBrowserPage.certificateError" id="WebBrowserPage.certificateError" ref="eric6.WebBrowser.WebBrowserPage.html#WebBrowserPage.certificateError" /> @@ -17540,7 +17568,6 @@ <keyword name="WebBrowserPage.scroll" id="WebBrowserPage.scroll" ref="eric6.WebBrowser.WebBrowserPage.html#WebBrowserPage.scroll" /> <keyword name="WebBrowserPage.scrollPosition" id="WebBrowserPage.scrollPosition" ref="eric6.WebBrowser.WebBrowserPage.html#WebBrowserPage.scrollPosition" /> <keyword name="WebBrowserPage.scrollTo" id="WebBrowserPage.scrollTo" ref="eric6.WebBrowser.WebBrowserPage.html#WebBrowserPage.scrollTo" /> - <keyword name="WebBrowserPage.setJavaScriptEnabled" id="WebBrowserPage.setJavaScriptEnabled" ref="eric6.WebBrowser.WebBrowserPage.html#WebBrowserPage.setJavaScriptEnabled" /> <keyword name="WebBrowserPage.setUserAgent" id="WebBrowserPage.setUserAgent" ref="eric6.WebBrowser.WebBrowserPage.html#WebBrowserPage.setUserAgent" /> <keyword name="WebBrowserPage.userAgent" id="WebBrowserPage.userAgent" ref="eric6.WebBrowser.WebBrowserPage.html#WebBrowserPage.userAgent" /> <keyword name="WebBrowserPage.userAgentForUrl" id="WebBrowserPage.userAgentForUrl" ref="eric6.WebBrowser.WebBrowserPage.html#WebBrowserPage.userAgentForUrl" /> @@ -17661,6 +17688,7 @@ <keyword name="WebBrowserView.__openLinkInNewTab" id="WebBrowserView.__openLinkInNewTab" ref="eric6.WebBrowser.WebBrowserView.html#WebBrowserView.__openLinkInNewTab" /> <keyword name="WebBrowserView.__openLinkInNewWindow" id="WebBrowserView.__openLinkInNewWindow" ref="eric6.WebBrowser.WebBrowserView.html#WebBrowserView.__openLinkInNewWindow" /> <keyword name="WebBrowserView.__pauseMedia" id="WebBrowserView.__pauseMedia" ref="eric6.WebBrowser.WebBrowserView.html#WebBrowserView.__pauseMedia" /> + <keyword name="WebBrowserView.__printPage" id="WebBrowserView.__printPage" ref="eric6.WebBrowser.WebBrowserView.html#WebBrowserView.__printPage" /> <keyword name="WebBrowserView.__reloadAllSpeedDials" id="WebBrowserView.__reloadAllSpeedDials" ref="eric6.WebBrowser.WebBrowserView.html#WebBrowserView.__reloadAllSpeedDials" /> <keyword name="WebBrowserView.__renderPreview" id="WebBrowserView.__renderPreview" ref="eric6.WebBrowser.WebBrowserView.html#WebBrowserView.__renderPreview" /> <keyword name="WebBrowserView.__renderProcessTerminated" id="WebBrowserView.__renderProcessTerminated" ref="eric6.WebBrowser.WebBrowserView.html#WebBrowserView.__renderProcessTerminated" /> @@ -17734,6 +17762,7 @@ <keyword name="WebBrowserView.showEvent" id="WebBrowserView.showEvent" ref="eric6.WebBrowser.WebBrowserView.html#WebBrowserView.showEvent" /> <keyword name="WebBrowserView.source" id="WebBrowserView.source" ref="eric6.WebBrowser.WebBrowserView.html#WebBrowserView.source" /> <keyword name="WebBrowserView.storeSessionData" id="WebBrowserView.storeSessionData" ref="eric6.WebBrowser.WebBrowserView.html#WebBrowserView.storeSessionData" /> + <keyword name="WebBrowserView.title" id="WebBrowserView.title" ref="eric6.WebBrowser.WebBrowserView.html#WebBrowserView.title" /> <keyword name="WebBrowserView.undo" id="WebBrowserView.undo" ref="eric6.WebBrowser.WebBrowserView.html#WebBrowserView.undo" /> <keyword name="WebBrowserView.unselect" id="WebBrowserView.unselect" ref="eric6.WebBrowser.WebBrowserView.html#WebBrowserView.unselect" /> <keyword name="WebBrowserView.zoomIn" id="WebBrowserView.zoomIn" ref="eric6.WebBrowser.WebBrowserView.html#WebBrowserView.zoomIn" /> @@ -17963,6 +17992,7 @@ <keyword name="WebBrowserWindow.toggleFullScreen" id="WebBrowserWindow.toggleFullScreen" ref="eric6.WebBrowser.WebBrowserWindow.html#WebBrowserWindow.toggleFullScreen" /> <keyword name="WebBrowserWindow.userAgentsManager" id="WebBrowserWindow.userAgentsManager" ref="eric6.WebBrowser.WebBrowserWindow.html#WebBrowserWindow.userAgentsManager" /> <keyword name="WebBrowserWindow.webProfile" id="WebBrowserWindow.webProfile" ref="eric6.WebBrowser.WebBrowserWindow.html#WebBrowserWindow.webProfile" /> + <keyword name="WebBrowserWindow.webSettings" id="WebBrowserWindow.webSettings" ref="eric6.WebBrowser.WebBrowserWindow.html#WebBrowserWindow.webSettings" /> <keyword name="WebDatabasesDialog" id="WebDatabasesDialog" ref="eric6.Helpviewer.OfflineStorage.WebDatabasesDialog.html#WebDatabasesDialog" /> <keyword name="WebDatabasesDialog (Constructor)" id="WebDatabasesDialog (Constructor)" ref="eric6.Helpviewer.OfflineStorage.WebDatabasesDialog.html#WebDatabasesDialog.__init__" /> <keyword name="WebDatabasesDialog (Module)" id="WebDatabasesDialog (Module)" ref="eric6.Helpviewer.OfflineStorage.WebDatabasesDialog.html" /> @@ -18992,6 +19022,7 @@ <keyword name="setWebBrowser" id="setWebBrowser" ref="eric6.Preferences.__init__.html#setWebBrowser" /> <keyword name="setupFormObserver" id="setupFormObserver" ref="eric6.WebBrowser.Tools.Scripts.html#setupFormObserver" /> <keyword name="setupWebChannel" id="setupWebChannel" ref="eric6.WebBrowser.Tools.Scripts.html#setupWebChannel" /> + <keyword name="setupWindowObject" id="setupWindowObject" ref="eric6.WebBrowser.Tools.Scripts.html#setupWindowObject" /> <keyword name="shelve (Module)" id="shelve (Module)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.ShelveExtension.shelve.html" /> <keyword name="shouldResetLayout" id="shouldResetLayout" ref="eric6.Preferences.__init__.html#shouldResetLayout" /> <keyword name="shutilCopy" id="shutilCopy" ref="eric6.install-debugclients.html#shutilCopy" /> @@ -20075,6 +20106,7 @@ <file>eric6.WebBrowser.Download.DownloadAskActionDialog.html</file> <file>eric6.WebBrowser.Download.DownloadItem.html</file> <file>eric6.WebBrowser.Download.DownloadManager.html</file> + <file>eric6.WebBrowser.Download.DownloadManagerButton.html</file> <file>eric6.WebBrowser.Download.DownloadModel.html</file> <file>eric6.WebBrowser.Download.DownloadUtilities.html</file> <file>eric6.WebBrowser.FeaturePermissions.FeaturePermissionBar.html</file> @@ -20096,6 +20128,7 @@ <file>eric6.WebBrowser.GreaseMonkey.GreaseMonkeyConfiguration.GreaseMonkeyConfigurationScriptInfoDialog.html</file> <file>eric6.WebBrowser.GreaseMonkey.GreaseMonkeyDownloader.html</file> <file>eric6.WebBrowser.GreaseMonkey.GreaseMonkeyJavaScript.html</file> + <file>eric6.WebBrowser.GreaseMonkey.GreaseMonkeyJsObject.html</file> <file>eric6.WebBrowser.GreaseMonkey.GreaseMonkeyManager.html</file> <file>eric6.WebBrowser.GreaseMonkey.GreaseMonkeyScript.html</file> <file>eric6.WebBrowser.History.HistoryCompleter.html</file>
--- a/Documentation/Source/eric6.E5Gui.E5ToolButton.html Fri Feb 16 20:15:49 2018 +0100 +++ b/Documentation/Source/eric6.E5Gui.E5ToolButton.html Fri Feb 16 20:18:29 2018 +0100 @@ -86,6 +86,9 @@ <td><a href="#E5ToolButton.__showMenu">__showMenu</a></td> <td>Private slot to show the tool button menu.</td> </tr><tr> +<td><a href="#E5ToolButton.badgeText">badgeText</a></td> +<td>Public method to get the badge text.</td> +</tr><tr> <td><a href="#E5ToolButton.contextMenuEvent">contextMenuEvent</a></td> <td>Protected method to handle context menu events.</td> </tr><tr> @@ -101,6 +104,9 @@ <td><a href="#E5ToolButton.mouseReleaseEvent">mouseReleaseEvent</a></td> <td>Protected method to handle mouse release events.</td> </tr><tr> +<td><a href="#E5ToolButton.setBadgeText">setBadgeText</a></td> +<td>Public method to set the badge text.</td> +</tr><tr> <td><a href="#E5ToolButton.setMenu">setMenu</a></td> <td>Public method to set the tool button menu.</td> </tr><tr> @@ -141,7 +147,22 @@ <b>__showMenu</b>(<i></i>) <p> Private slot to show the tool button menu. -</p><a NAME="E5ToolButton.contextMenuEvent" ID="E5ToolButton.contextMenuEvent"></a> +</p><a NAME="E5ToolButton.badgeText" ID="E5ToolButton.badgeText"></a> +<h4>E5ToolButton.badgeText</h4> +<b>badgeText</b>(<i></i>) +<p> + Public method to get the badge text. +</p><dl> +<dt>Returns:</dt> +<dd> +badge text +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +str +</dd> +</dl><a NAME="E5ToolButton.contextMenuEvent" ID="E5ToolButton.contextMenuEvent"></a> <h4>E5ToolButton.contextMenuEvent</h4> <b>contextMenuEvent</b>(<i>evt</i>) <p> @@ -196,6 +217,16 @@ <dd> reference to the mouse event </dd> +</dl><a NAME="E5ToolButton.setBadgeText" ID="E5ToolButton.setBadgeText"></a> +<h4>E5ToolButton.setBadgeText</h4> +<b>setBadgeText</b>(<i>text</i>) +<p> + Public method to set the badge text. +</p><dl> +<dt><i>text</i> (str)</dt> +<dd> +badge text to be set +</dd> </dl><a NAME="E5ToolButton.setMenu" ID="E5ToolButton.setMenu"></a> <h4>E5ToolButton.setMenu</h4> <b>setMenu</b>(<i>menu</i>)
--- a/Documentation/Source/eric6.WebBrowser.Download.DownloadItem.html Fri Feb 16 20:15:49 2018 +0100 +++ b/Documentation/Source/eric6.WebBrowser.Download.DownloadItem.html Fri Feb 16 20:18:29 2018 +0100 @@ -169,17 +169,20 @@ </table> <a NAME="DownloadItem.__init__" ID="DownloadItem.__init__"></a> <h4>DownloadItem (Constructor)</h4> -<b>DownloadItem</b>(<i>downloadItem=None, parent=None</i>) +<b>DownloadItem</b>(<i>downloadItem=None, pageUrl="", parent=None</i>) <p> Constructor </p><dl> -<dt><i>downloadItem</i></dt> +<dt><i>downloadItem</i> (QWebEngineDownloadItem)</dt> <dd> reference to the download object containing the download data. -</dd><dt><i>parent=</i> (QWebEngineDownloadItem)</dt> +</dd><dt><i>pageUrl</i> (QUrl)</dt> <dd> -reference to the parent widget (QWidget) +URL of the calling page +</dd><dt><i>parent</i> (QWidget)</dt> +<dd> +reference to the parent widget </dd> </dl><a NAME="DownloadItem.__adjustSize" ID="DownloadItem.__adjustSize"></a> <h4>DownloadItem.__adjustSize</h4>
--- a/Documentation/Source/eric6.WebBrowser.Download.DownloadManager.html Fri Feb 16 20:15:49 2018 +0100 +++ b/Documentation/Source/eric6.WebBrowser.Download.DownloadManager.html Fri Feb 16 20:18:29 2018 +0100 @@ -43,7 +43,14 @@ <h2>DownloadManager</h2> <p> Class implementing the download manager. -</p> +</p><h3>Signals</h3> +<dl> +<dt>downloadsCountChanged()</dt> +<dd> +emitted to indicate a change of the + count of download items +</dd> +</dl> <h3>Derived from</h3> QDialog, Ui_DownloadManager <h3>Class Attributes</h3> @@ -105,7 +112,7 @@ <td><a href="#DownloadManager.__updateRow">__updateRow</a></td> <td>Private slot to update a download item.</td> </tr><tr> -<td><a href="#DownloadManager.activeDownloads">activeDownloads</a></td> +<td><a href="#DownloadManager.activeDownloadsCount">activeDownloadsCount</a></td> <td>Public method to get the number of active downloads.</td> </tr><tr> <td><a href="#DownloadManager.allowQuit">allowQuit</a></td> @@ -120,9 +127,6 @@ <td><a href="#DownloadManager.closeEvent">closeEvent</a></td> <td>Protected event handler for the close event.</td> </tr><tr> -<td><a href="#DownloadManager.count">count</a></td> -<td>Public method to get the number of downloads.</td> -</tr><tr> <td><a href="#DownloadManager.download">download</a></td> <td>Public method to download a file.</td> </tr><tr> @@ -132,6 +136,9 @@ <td><a href="#DownloadManager.downloads">downloads</a></td> <td>Public method to get a reference to the downloads.</td> </tr><tr> +<td><a href="#DownloadManager.downloadsCount">downloadsCount</a></td> +<td>Public method to get the number of downloads.</td> +</tr><tr> <td><a href="#DownloadManager.on_cleanupButton_clicked">on_cleanupButton_clicked</a></td> <td>Private slot cleanup the downloads.</td> </tr><tr> @@ -263,9 +270,9 @@ <dd> reference to the download item </dd> -</dl><a NAME="DownloadManager.activeDownloads" ID="DownloadManager.activeDownloads"></a> -<h4>DownloadManager.activeDownloads</h4> -<b>activeDownloads</b>(<i></i>) +</dl><a NAME="DownloadManager.activeDownloadsCount" ID="DownloadManager.activeDownloadsCount"></a> +<h4>DownloadManager.activeDownloadsCount</h4> +<b>activeDownloadsCount</b>(<i></i>) <p> Public method to get the number of active downloads. </p><dl> @@ -303,16 +310,6 @@ <dd> reference to the close event </dd> -</dl><a NAME="DownloadManager.count" ID="DownloadManager.count"></a> -<h4>DownloadManager.count</h4> -<b>count</b>(<i></i>) -<p> - Public method to get the number of downloads. -</p><dl> -<dt>Returns:</dt> -<dd> -number of downloads (integer) -</dd> </dl><a NAME="DownloadManager.download" ID="DownloadManager.download"></a> <h4>DownloadManager.download</h4> <b>download</b>(<i>downloadItem</i>) @@ -344,6 +341,21 @@ <dd> reference to the downloads (list of DownloadItem) </dd> +</dl><a NAME="DownloadManager.downloadsCount" ID="DownloadManager.downloadsCount"></a> +<h4>DownloadManager.downloadsCount</h4> +<b>downloadsCount</b>(<i></i>) +<p> + Public method to get the number of downloads. +</p><dl> +<dt>Returns:</dt> +<dd> +number of downloads +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +int +</dd> </dl><a NAME="DownloadManager.on_cleanupButton_clicked" ID="DownloadManager.on_cleanupButton_clicked"></a> <h4>DownloadManager.on_cleanupButton_clicked</h4> <b>on_cleanupButton_clicked</b>(<i></i>)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Documentation/Source/eric6.WebBrowser.Download.DownloadManagerButton.html Fri Feb 16 20:18:29 2018 +0100 @@ -0,0 +1,97 @@ +<!DOCTYPE html> +<html><head> +<title>eric6.WebBrowser.Download.DownloadManagerButton</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.WebBrowser.Download.DownloadManagerButton</h1> +<p> +Module implementing a tool button for the download manager. +</p> +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Classes</h3> +<table> +<tr> +<td><a href="#DownloadManagerButton">DownloadManagerButton</a></td> +<td>Class implementing a tool button for the download manager.</td> +</tr> +</table> +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> +<hr /><hr /> +<a NAME="DownloadManagerButton" ID="DownloadManagerButton"></a> +<h2>DownloadManagerButton</h2> +<p> + Class implementing a tool button for the download manager. +</p> +<h3>Derived from</h3> +E5ToolButton +<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="#DownloadManagerButton.__init__">DownloadManagerButton</a></td> +<td>Constructor</td> +</tr><tr> +<td><a href="#DownloadManagerButton.__buttonClicked">__buttonClicked</a></td> +<td>Private slot handling a user clicking the button.</td> +</tr><tr> +<td><a href="#DownloadManagerButton.__updateState">__updateState</a></td> +<td>Private slot to update the button state.</td> +</tr> +</table> +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<a NAME="DownloadManagerButton.__init__" ID="DownloadManagerButton.__init__"></a> +<h4>DownloadManagerButton (Constructor)</h4> +<b>DownloadManagerButton</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="DownloadManagerButton.__buttonClicked" ID="DownloadManagerButton.__buttonClicked"></a> +<h4>DownloadManagerButton.__buttonClicked</h4> +<b>__buttonClicked</b>(<i></i>) +<p> + Private slot handling a user clicking the button. +</p><a NAME="DownloadManagerButton.__updateState" ID="DownloadManagerButton.__updateState"></a> +<h4>DownloadManagerButton.__updateState</h4> +<b>__updateState</b>(<i></i>) +<p> + Private slot to update the button state. +</p> +<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.WebBrowser.GreaseMonkey.GreaseMonkeyJsObject.html Fri Feb 16 20:18:29 2018 +0100 @@ -0,0 +1,216 @@ +<!DOCTYPE html> +<html><head> +<title>eric6.WebBrowser.GreaseMonkey.GreaseMonkeyJsObject</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.WebBrowser.GreaseMonkey.GreaseMonkeyJsObject</h1> +<p> +Module implementing the Python side for GreaseMonkey scripts. +</p> +<h3>Global Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Classes</h3> +<table> +<tr> +<td><a href="#GreaseMonkeyJsObject">GreaseMonkeyJsObject</a></td> +<td>Class implementing the Python side for GreaseMonkey scripts.</td> +</tr> +</table> +<h3>Functions</h3> +<table> +<tr><td>None</td></tr> +</table> +<hr /><hr /> +<a NAME="GreaseMonkeyJsObject" ID="GreaseMonkeyJsObject"></a> +<h2>GreaseMonkeyJsObject</h2> +<p> + Class implementing the Python side for GreaseMonkey scripts. +</p> +<h3>Derived from</h3> +QObject +<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="#GreaseMonkeyJsObject.__init__">GreaseMonkeyJsObject</a></td> +<td>Constructor</td> +</tr><tr> +<td><a href="#GreaseMonkeyJsObject.deleteValue">deleteValue</a></td> +<td>Public slot to set delete the named variable for the identified script.</td> +</tr><tr> +<td><a href="#GreaseMonkeyJsObject.getValue">getValue</a></td> +<td>Public slot to get the value for the named variable for the identified script.</td> +</tr><tr> +<td><a href="#GreaseMonkeyJsObject.listValues">listValues</a></td> +<td>Public slot to list the stored variables for the identified script.</td> +</tr><tr> +<td><a href="#GreaseMonkeyJsObject.setClipboard">setClipboard</a></td> +<td>Public slot to set some clipboard text.</td> +</tr><tr> +<td><a href="#GreaseMonkeyJsObject.setSettingsFile">setSettingsFile</a></td> +<td>Public method to set the settings file for the GreaseMonkey parameters.</td> +</tr><tr> +<td><a href="#GreaseMonkeyJsObject.setValue">setValue</a></td> +<td>Public slot to set the value for the named variable for the identified script.</td> +</tr> +</table> +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<a NAME="GreaseMonkeyJsObject.__init__" ID="GreaseMonkeyJsObject.__init__"></a> +<h4>GreaseMonkeyJsObject (Constructor)</h4> +<b>GreaseMonkeyJsObject</b>(<i>parent=None</i>) +<p> + Constructor +</p><dl> +<dt><i>parent</i> (QObject)</dt> +<dd> +reference to the parent object +</dd> +</dl><a NAME="GreaseMonkeyJsObject.deleteValue" ID="GreaseMonkeyJsObject.deleteValue"></a> +<h4>GreaseMonkeyJsObject.deleteValue</h4> +<b>deleteValue</b>(<i>nspace, name</i>) +<p> + Public slot to set delete the named variable for the identified script. +</p><dl> +<dt><i>nspace</i> (str)</dt> +<dd> +unique script id +</dd><dt><i>name</i> (str)</dt> +<dd> +name of the variable +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +flag indicating success +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl><a NAME="GreaseMonkeyJsObject.getValue" ID="GreaseMonkeyJsObject.getValue"></a> +<h4>GreaseMonkeyJsObject.getValue</h4> +<b>getValue</b>(<i>nspace, name, dValue</i>) +<p> + Public slot to get the value for the named variable for the identified + script. +</p><dl> +<dt><i>nspace</i> (str)</dt> +<dd> +unique script id +</dd><dt><i>name</i> (str)</dt> +<dd> +name of the variable +</dd><dt><i>dValue</i> (str)</dt> +<dd> +default value +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +value for the named variable +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +str +</dd> +</dl><a NAME="GreaseMonkeyJsObject.listValues" ID="GreaseMonkeyJsObject.listValues"></a> +<h4>GreaseMonkeyJsObject.listValues</h4> +<b>listValues</b>(<i>nspace</i>) +<p> + Public slot to list the stored variables for the identified script. +</p><dl> +<dt><i>nspace</i> (str)</dt> +<dd> +unique script id +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +list of stored variables +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +list of str +</dd> +</dl><a NAME="GreaseMonkeyJsObject.setClipboard" ID="GreaseMonkeyJsObject.setClipboard"></a> +<h4>GreaseMonkeyJsObject.setClipboard</h4> +<b>setClipboard</b>(<i>text</i>) +<p> + Public slot to set some clipboard text. +</p><dl> +<dt><i>text</i> (str)</dt> +<dd> +text to be copied to the clipboard +</dd> +</dl><a NAME="GreaseMonkeyJsObject.setSettingsFile" ID="GreaseMonkeyJsObject.setSettingsFile"></a> +<h4>GreaseMonkeyJsObject.setSettingsFile</h4> +<b>setSettingsFile</b>(<i>name</i>) +<p> + Public method to set the settings file for the GreaseMonkey parameters. +</p><dl> +<dt><i>name</i> (str)</dt> +<dd> +name of the settings file +</dd> +</dl><a NAME="GreaseMonkeyJsObject.setValue" ID="GreaseMonkeyJsObject.setValue"></a> +<h4>GreaseMonkeyJsObject.setValue</h4> +<b>setValue</b>(<i>nspace, name, value</i>) +<p> + Public slot to set the value for the named variable for the identified + script. +</p><dl> +<dt><i>nspace</i> (str)</dt> +<dd> +unique script id +</dd><dt><i>name</i> (str)</dt> +<dd> +name of the variable +</dd><dt><i>value</i> (str)</dt> +<dd> +value to be set +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +flag indicating success +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /> +</body></html> \ No newline at end of file
--- a/Documentation/Source/eric6.WebBrowser.GreaseMonkey.GreaseMonkeyScript.html Fri Feb 16 20:15:49 2018 +0100 +++ b/Documentation/Source/eric6.WebBrowser.GreaseMonkey.GreaseMonkeyScript.html Fri Feb 16 20:18:29 2018 +0100 @@ -70,6 +70,9 @@ <td><a href="#GreaseMonkeyScript.__init__">GreaseMonkeyScript</a></td> <td>Constructor</td> </tr><tr> +<td><a href="#GreaseMonkeyScript.__downloadIcon">__downloadIcon</a></td> +<td>Private slot to download the script icon.</td> +</tr><tr> <td><a href="#GreaseMonkeyScript.__downloadRequires">__downloadRequires</a></td> <td>Private method to download the required scripts.</td> </tr><tr> @@ -79,6 +82,9 @@ <td><a href="#GreaseMonkeyScript.__downloaderFinished">__downloaderFinished</a></td> <td>Private slot to handle a finished download.</td> </tr><tr> +<td><a href="#GreaseMonkeyScript.__iconDownloaded">__iconDownloaded</a></td> +<td>Private slot to handle a finished download of a script icon.</td> +</tr><tr> <td><a href="#GreaseMonkeyScript.__parseScript">__parseScript</a></td> <td>Private method to parse the given script and populate the data structure.</td> </tr><tr> @@ -112,6 +118,12 @@ <td><a href="#GreaseMonkeyScript.fullName">fullName</a></td> <td>Public method to get the full name of the script.</td> </tr><tr> +<td><a href="#GreaseMonkeyScript.icon">icon</a></td> +<td>Public method to get the icon of the script.</td> +</tr><tr> +<td><a href="#GreaseMonkeyScript.iconUrl">iconUrl</a></td> +<td>Public method to get the icon URL of the script.</td> +</tr><tr> <td><a href="#GreaseMonkeyScript.include">include</a></td> <td>Public method to get the list of included URLs.</td> </tr><tr> @@ -172,7 +184,12 @@ <dd> path of the Javascript file (string) </dd> -</dl><a NAME="GreaseMonkeyScript.__downloadRequires" ID="GreaseMonkeyScript.__downloadRequires"></a> +</dl><a NAME="GreaseMonkeyScript.__downloadIcon" ID="GreaseMonkeyScript.__downloadIcon"></a> +<h4>GreaseMonkeyScript.__downloadIcon</h4> +<b>__downloadIcon</b>(<i></i>) +<p> + Private slot to download the script icon. +</p><a NAME="GreaseMonkeyScript.__downloadRequires" ID="GreaseMonkeyScript.__downloadRequires"></a> <h4>GreaseMonkeyScript.__downloadRequires</h4> <b>__downloadRequires</b>(<i></i>) <p> @@ -197,6 +214,16 @@ <dd> reference to the downloader object </dd> +</dl><a NAME="GreaseMonkeyScript.__iconDownloaded" ID="GreaseMonkeyScript.__iconDownloaded"></a> +<h4>GreaseMonkeyScript.__iconDownloaded</h4> +<b>__iconDownloaded</b>(<i>reply</i>) +<p> + Private slot to handle a finished download of a script icon. +</p><dl> +<dt><i>reply</i> (QNetworkReply)</dt> +<dd> +reference to the network reply +</dd> </dl><a NAME="GreaseMonkeyScript.__parseScript" ID="GreaseMonkeyScript.__parseScript"></a> <h4>GreaseMonkeyScript.__parseScript</h4> <b>__parseScript</b>(<i></i>) @@ -309,6 +336,31 @@ <dd> full name of the script (string) </dd> +</dl><a NAME="GreaseMonkeyScript.icon" ID="GreaseMonkeyScript.icon"></a> +<h4>GreaseMonkeyScript.icon</h4> +<b>icon</b>(<i></i>) +<p> + Public method to get the icon of the script. +</p><dl> +<dt>Returns:</dt> +<dd> +script icon +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +QIcon +</dd> +</dl><a NAME="GreaseMonkeyScript.iconUrl" ID="GreaseMonkeyScript.iconUrl"></a> +<h4>GreaseMonkeyScript.iconUrl</h4> +<b>iconUrl</b>(<i></i>) +<p> + Public method to get the icon URL of the script. +</p><dl> +<dt>Returns:</dt> +<dd> +icon URL of the script (QUrl) +</dd> </dl><a NAME="GreaseMonkeyScript.include" ID="GreaseMonkeyScript.include"></a> <h4>GreaseMonkeyScript.include</h4> <b>include</b>(<i></i>)
--- a/Documentation/Source/eric6.WebBrowser.JavaScript.ExternalJsObject.html Fri Feb 16 20:15:49 2018 +0100 +++ b/Documentation/Source/eric6.WebBrowser.JavaScript.ExternalJsObject.html Fri Feb 16 20:18:29 2018 +0100 @@ -49,11 +49,20 @@ QObject <h3>Class Attributes</h3> <table> -<tr><td>None</td></tr> +<tr><td>extraObjects</td></tr> </table> <h3>Class Methods</h3> <table> -<tr><td>None</td></tr> +<tr> +<td><a href="#ExternalJsObject.registerExtraObject">registerExtraObject</a></td> +<td>Class method to register extra JavaScript objects.</td> +</tr><tr> +<td><a href="#ExternalJsObject.setupWebChannel">setupWebChannel</a></td> +<td>Class method to setup the web channel.</td> +</tr><tr> +<td><a href="#ExternalJsObject.unregisterExtraObject">unregisterExtraObject</a></td> +<td>Class method to unregister extra JavaScript objects.</td> +</tr> </table> <h3>Methods</h3> <table> @@ -78,7 +87,43 @@ <table> <tr><td>None</td></tr> </table> -<a NAME="ExternalJsObject.__init__" ID="ExternalJsObject.__init__"></a> +<a NAME="ExternalJsObject.registerExtraObject" ID="ExternalJsObject.registerExtraObject"></a> +<h4>ExternalJsObject.registerExtraObject (class method)</h4> +<b>registerExtraObject</b>(<i>name, jsObject</i>) +<p> + Class method to register extra JavaScript objects. +</p><dl> +<dt><i>name</i> (str)</dt> +<dd> +name for the object +</dd><dt><i>jsObject</i> (QObject)</dt> +<dd> +reference to the JavaScript object to be registered +</dd> +</dl><a NAME="ExternalJsObject.setupWebChannel" ID="ExternalJsObject.setupWebChannel"></a> +<h4>ExternalJsObject.setupWebChannel (class method)</h4> +<b>setupWebChannel</b>(<i>channel, page</i>) +<p> + Class method to setup the web channel. +</p><dl> +<dt><i>channel</i> (QWebChannel)</dt> +<dd> +reference to the channel +</dd><dt><i>page</i> (QWebEnginePage)</dt> +<dd> +reference to the web page +</dd> +</dl><a NAME="ExternalJsObject.unregisterExtraObject" ID="ExternalJsObject.unregisterExtraObject"></a> +<h4>ExternalJsObject.unregisterExtraObject (class method)</h4> +<b>unregisterExtraObject</b>(<i>name</i>) +<p> + Class method to unregister extra JavaScript objects. +</p><dl> +<dt><i>name</i> (str)</dt> +<dd> +name of the object +</dd> +</dl><a NAME="ExternalJsObject.__init__" ID="ExternalJsObject.__init__"></a> <h4>ExternalJsObject (Constructor)</h4> <b>ExternalJsObject</b>(<i>page</i>) <p>
--- a/Documentation/Source/eric6.WebBrowser.StatusBar.JavaScriptIcon.html Fri Feb 16 20:15:49 2018 +0100 +++ b/Documentation/Source/eric6.WebBrowser.StatusBar.JavaScriptIcon.html Fri Feb 16 20:18:29 2018 +0100 @@ -60,6 +60,9 @@ <td><a href="#JavaScriptIcon.__init__">JavaScriptIcon</a></td> <td>Constructor</td> </tr><tr> +<td><a href="#JavaScriptIcon.__navigationRequestAccepted">__navigationRequestAccepted</a></td> +<td>Private method to handle the navigationRequestAccepted signal.</td> +</tr><tr> <td><a href="#JavaScriptIcon.__showJavaScriptSettingsDialog">__showJavaScriptSettingsDialog</a></td> <td>Private slot to show the JavaScript settings dialog.</td> </tr><tr> @@ -90,6 +93,26 @@ <dd> reference to the web browser window </dd> +</dl><a NAME="JavaScriptIcon.__navigationRequestAccepted" ID="JavaScriptIcon.__navigationRequestAccepted"></a> +<h4>JavaScriptIcon.__navigationRequestAccepted</h4> +<b>__navigationRequestAccepted</b>(<i>url, navigationType, isMainFrame, page</i>) +<p> + Private method to handle the navigationRequestAccepted signal. +</p><dl> +<dt><i>url</i> (QUrl)</dt> +<dd> +URL being loaded +</dd><dt><i>navigationType</i> (QWebEnginePage.NavigationType)</dt> +<dd> +type of navigation request +</dd><dt><i>isMainFrame</i> (bool)</dt> +<dd> +flag indicating a navigation request of the + main frame +</dd><dt><i>page</i> (WebBrowserPage)</dt> +<dd> +reference to the web page +</dd> </dl><a NAME="JavaScriptIcon.__showJavaScriptSettingsDialog" ID="JavaScriptIcon.__showJavaScriptSettingsDialog"></a> <h4>JavaScriptIcon.__showJavaScriptSettingsDialog</h4> <b>__showJavaScriptSettingsDialog</b>(<i></i>)
--- a/Documentation/Source/eric6.WebBrowser.Tools.Scripts.html Fri Feb 16 20:15:49 2018 +0100 +++ b/Documentation/Source/eric6.WebBrowser.Tools.Scripts.html Fri Feb 16 20:18:29 2018 +0100 @@ -66,6 +66,9 @@ </tr><tr> <td><a href="#setupWebChannel">setupWebChannel</a></td> <td>Function generating a script to setup the web channel.</td> +</tr><tr> +<td><a href="#setupWindowObject">setupWindowObject</a></td> +<td>Function generating a script to setup window.object add-ons.</td> </tr> </table> <hr /><hr /> @@ -279,10 +282,15 @@ <hr /><hr /> <a NAME="setupWebChannel" ID="setupWebChannel"></a> <h2>setupWebChannel</h2> -<b>setupWebChannel</b>(<i></i>) +<b>setupWebChannel</b>(<i>worldId</i>) <p> Function generating a script to setup the web channel. </p><dl> +<dt><i>worldId</i> (int)</dt> +<dd> +world ID for which to setup the channel +</dd> +</dl><dl> <dt>Returns:</dt> <dd> script to setup the web channel @@ -294,5 +302,23 @@ </dd> </dl> <div align="right"><a href="#top">Up</a></div> +<hr /><hr /> +<a NAME="setupWindowObject" ID="setupWindowObject"></a> +<h2>setupWindowObject</h2> +<b>setupWindowObject</b>(<i></i>) +<p> + Function generating a script to setup window.object add-ons. +</p><dl> +<dt>Returns:</dt> +<dd> +generated script +</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.WebBrowser.WebBrowserPage.html Fri Feb 16 20:15:49 2018 +0100 +++ b/Documentation/Source/eric6.WebBrowser.WebBrowserPage.html Fri Feb 16 20:18:29 2018 +0100 @@ -45,7 +45,15 @@ Class implementing an enhanced web page. </p><h3>Signals</h3> <dl> -<dt>safeBrowsingAbort()</dt> +<dt>navigationRequestAccepted(url, navigation type, main frame)</dt> +<dd> +emitted + to signal an accepted navigation request +</dd><dt>printRequested()</dt> +<dd> +emitted to indicate a print request of the shown + web page +</dd><dt>safeBrowsingAbort()</dt> <dd> emitted to indicate an abort due to a safe browsing event @@ -59,7 +67,7 @@ QWebEnginePage <h3>Class Attributes</h3> <table> -<tr><td>SafeJsWorld</td></tr> +<tr><td>SafeJsWorld</td></tr><tr><td>UnsafeJsWorld</td></tr> </table> <h3>Class Methods</h3> <table> @@ -86,7 +94,13 @@ <td><a href="#WebBrowserPage.__fullScreenRequested">__fullScreenRequested</a></td> <td>Private slot handling a full screen request.</td> </tr><tr> -<td><a href="#WebBrowserPage.__setupWebChannel">__setupWebChannel</a></td> +<td><a href="#WebBrowserPage.__loadProgressSlot">__loadProgressSlot</a></td> +<td>Private slot to implement a workaround for the loadFinished signal not working properly in Qt 5.10.0.</td> +</tr><tr> +<td><a href="#WebBrowserPage.__setupChannelTimeout">__setupChannelTimeout</a></td> +<td>Private slot to initiate the setup of the web channel.</td> +</tr><tr> +<td><a href="#WebBrowserPage.__setupWebChannelForUrl">__setupWebChannelForUrl</a></td> <td>Private method to setup a web channel to our external object.</td> </tr><tr> <td><a href="#WebBrowserPage.__urlChanged">__urlChanged</a></td> @@ -139,9 +153,6 @@ </tr><tr> <td><a href="#WebBrowserPage.scrollTo">scrollTo</a></td> <td>Public method to scroll to the given position.</td> -</tr><tr> -<td><a href="#WebBrowserPage.setJavaScriptEnabled">setJavaScriptEnabled</a></td> -<td>Public method to enable JavaScript.</td> </tr> </table> <h3>Static Methods</h3> @@ -222,12 +233,33 @@ <dd> reference to the full screen request </dd> -</dl><a NAME="WebBrowserPage.__setupWebChannel" ID="WebBrowserPage.__setupWebChannel"></a> -<h4>WebBrowserPage.__setupWebChannel</h4> -<b>__setupWebChannel</b>(<i></i>) +</dl><a NAME="WebBrowserPage.__loadProgressSlot" ID="WebBrowserPage.__loadProgressSlot"></a> +<h4>WebBrowserPage.__loadProgressSlot</h4> +<b>__loadProgressSlot</b>(<i>progress</i>) +<p> + Private slot to implement a workaround for the loadFinished signal + not working properly in Qt 5.10.0. +</p><dl> +<dt><i>progress</i> (int)</dt> +<dd> +load progress in percent +</dd> +</dl><a NAME="WebBrowserPage.__setupChannelTimeout" ID="WebBrowserPage.__setupChannelTimeout"></a> +<h4>WebBrowserPage.__setupChannelTimeout</h4> +<b>__setupChannelTimeout</b>(<i></i>) +<p> + Private slot to initiate the setup of the web channel. +</p><a NAME="WebBrowserPage.__setupWebChannelForUrl" ID="WebBrowserPage.__setupWebChannelForUrl"></a> +<h4>WebBrowserPage.__setupWebChannelForUrl</h4> +<b>__setupWebChannelForUrl</b>(<i>url</i>) <p> Private method to setup a web channel to our external object. -</p><a NAME="WebBrowserPage.__urlChanged" ID="WebBrowserPage.__urlChanged"></a> +</p><dl> +<dt><i>url</i> (QUrl)</dt> +<dd> +URL for which to setup the web channel +</dd> +</dl><a NAME="WebBrowserPage.__urlChanged" ID="WebBrowserPage.__urlChanged"></a> <h4>WebBrowserPage.__urlChanged</h4> <b>__urlChanged</b>(<i>url</i>) <p> @@ -498,16 +530,6 @@ <dd> position to scroll to </dd> -</dl><a NAME="WebBrowserPage.setJavaScriptEnabled" ID="WebBrowserPage.setJavaScriptEnabled"></a> -<h4>WebBrowserPage.setJavaScriptEnabled</h4> -<b>setJavaScriptEnabled</b>(<i>enable</i>) -<p> - Public method to enable JavaScript. -</p><dl> -<dt><i>enable</i> (bool)</dt> -<dd> -flag indicating the enabled state to be set -</dd> </dl> <div align="right"><a href="#top">Up</a></div> <hr />
--- a/Documentation/Source/eric6.WebBrowser.WebBrowserView.html Fri Feb 16 20:15:49 2018 +0100 +++ b/Documentation/Source/eric6.WebBrowser.WebBrowserView.html Fri Feb 16 20:18:29 2018 +0100 @@ -200,6 +200,9 @@ <td><a href="#WebBrowserView.__pauseMedia">__pauseMedia</a></td> <td>Private slot to pause or play the selected media.</td> </tr><tr> +<td><a href="#WebBrowserView.__printPage">__printPage</a></td> +<td>Private slot to support printing from the web page.</td> +</tr><tr> <td><a href="#WebBrowserView.__reloadAllSpeedDials">__reloadAllSpeedDials</a></td> <td>Private slot to reload all speed dials.</td> </tr><tr> @@ -419,6 +422,9 @@ <td><a href="#WebBrowserView.storeSessionData">storeSessionData</a></td> <td>Public method to store session data to be restored later on.</td> </tr><tr> +<td><a href="#WebBrowserView.title">title</a></td> +<td>Public method to get the view title.</td> +</tr><tr> <td><a href="#WebBrowserView.undo">undo</a></td> <td>Public slot to undo the last edit action.</td> </tr><tr> @@ -799,6 +805,11 @@ <b>__pauseMedia</b>(<i></i>) <p> Private slot to pause or play the selected media. +</p><a NAME="WebBrowserView.__printPage" ID="WebBrowserView.__printPage"></a> +<h4>WebBrowserView.__printPage</h4> +<b>__printPage</b>(<i></i>) +<p> + Private slot to support printing from the web page. </p><a NAME="WebBrowserView.__reloadAllSpeedDials" ID="WebBrowserView.__reloadAllSpeedDials"></a> <h4>WebBrowserView.__reloadAllSpeedDials</h4> <b>__reloadAllSpeedDials</b>(<i></i>) @@ -1522,6 +1533,21 @@ <dd> dictionary with session data to be restored </dd> +</dl><a NAME="WebBrowserView.title" ID="WebBrowserView.title"></a> +<h4>WebBrowserView.title</h4> +<b>title</b>(<i></i>) +<p> + Public method to get the view title. +</p><dl> +<dt>Returns:</dt> +<dd> +view title +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +str +</dd> </dl><a NAME="WebBrowserView.undo" ID="WebBrowserView.undo"></a> <h4>WebBrowserView.undo</h4> <b>undo</b>(<i></i>)
--- a/Documentation/Source/eric6.WebBrowser.WebBrowserWindow.html Fri Feb 16 20:15:49 2018 +0100 +++ b/Documentation/Source/eric6.WebBrowser.WebBrowserWindow.html Fri Feb 16 20:18:29 2018 +0100 @@ -170,6 +170,9 @@ </tr><tr> <td><a href="#WebBrowserWindow.webProfile">webProfile</a></td> <td>Class method handling the web engine profile.</td> +</tr><tr> +<td><a href="#WebBrowserWindow.webSettings">webSettings</a></td> +<td>Class method to get the web settings of the current profile.</td> </tr> </table> <h3>Methods</h3> @@ -1070,6 +1073,21 @@ <dd> QWebEngineProfile </dd> +</dl><a NAME="WebBrowserWindow.webSettings" ID="WebBrowserWindow.webSettings"></a> +<h4>WebBrowserWindow.webSettings (class method)</h4> +<b>webSettings</b>(<i></i>) +<p> + Class method to get the web settings of the current profile. +</p><dl> +<dt>Returns:</dt> +<dd> +web settings of the current profile +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +QWebEngineSettings +</dd> </dl><a NAME="WebBrowserWindow.__init__" ID="WebBrowserWindow.__init__"></a> <h4>WebBrowserWindow (Constructor)</h4> <b>WebBrowserWindow</b>(<i>home, path, parent, name, fromEric=False, initShortcutsOnly=False, searchWord=None, private=False, qthelp=False, settingsDir="", restoreSession=False</i>)
--- a/Documentation/Source/eric6.WebBrowser.WebInspector.html Fri Feb 16 20:15:49 2018 +0100 +++ b/Documentation/Source/eric6.WebBrowser.WebInspector.html Fri Feb 16 20:18:29 2018 +0100 @@ -52,7 +52,14 @@ <h2>WebInspector</h2> <p> Class implementing a QWebEngineView to load the web inspector in. -</p> +</p><h3>Signals</h3> +<dl> +<dt>inspectorClosed</dt> +<dd> +emitted to indicate the closing of the inspector + window +</dd> +</dl> <h3>Derived from</h3> QWebEngineView <h3>Class Attributes</h3> @@ -61,7 +68,10 @@ </table> <h3>Class Methods</h3> <table> -<tr><td>None</td></tr> +<tr> +<td><a href="#WebInspector.isEnabled">isEnabled</a></td> +<td>Class method to check, if the web inspector is enabled.</td> +</tr> </table> <h3>Methods</h3> <table> @@ -84,9 +94,6 @@ <td><a href="#WebInspector.inspectElement">inspectElement</a></td> <td>Public method to inspect an element.</td> </tr><tr> -<td><a href="#WebInspector.isEnabled">isEnabled</a></td> -<td>Public method to check, if the web inspector is enabled.</td> -</tr><tr> <td><a href="#WebInspector.setView">setView</a></td> <td>Public method to connect a view to this inspector.</td> </tr> @@ -95,7 +102,22 @@ <table> <tr><td>None</td></tr> </table> -<a NAME="WebInspector.__init__" ID="WebInspector.__init__"></a> +<a NAME="WebInspector.isEnabled" ID="WebInspector.isEnabled"></a> +<h4>WebInspector.isEnabled (class method)</h4> +<b>isEnabled</b>(<i></i>) +<p> + Class method to check, if the web inspector is enabled. +</p><dl> +<dt>Returns:</dt> +<dd> +flag indicating the enabled state +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl><a NAME="WebInspector.__init__" ID="WebInspector.__init__"></a> <h4>WebInspector (Constructor)</h4> <b>WebInspector</b>(<i>parent=None</i>) <p> @@ -135,22 +157,7 @@ <b>inspectElement</b>(<i></i>) <p> Public method to inspect an element. -</p><a NAME="WebInspector.isEnabled" ID="WebInspector.isEnabled"></a> -<h4>WebInspector.isEnabled</h4> -<b>isEnabled</b>(<i></i>) -<p> - Public method to check, if the web inspector is enabled. -</p><dl> -<dt>Returns:</dt> -<dd> -flag indicating the enabled state -</dd> -</dl><dl> -<dt>Return Type:</dt> -<dd> -bool -</dd> -</dl><a NAME="WebInspector.setView" ID="WebInspector.setView"></a> +</p><a NAME="WebInspector.setView" ID="WebInspector.setView"></a> <h4>WebInspector.setView</h4> <b>setView</b>(<i>view, inspectElement=False</i>) <p>
--- a/Documentation/Source/index-eric6.WebBrowser.Download.html Fri Feb 16 20:15:49 2018 +0100 +++ b/Documentation/Source/index-eric6.WebBrowser.Download.html Fri Feb 16 20:18:29 2018 +0100 @@ -37,6 +37,9 @@ <td><a href="eric6.WebBrowser.Download.DownloadManager.html">DownloadManager</a></td> <td>Module implementing the download manager class.</td> </tr><tr> +<td><a href="eric6.WebBrowser.Download.DownloadManagerButton.html">DownloadManagerButton</a></td> +<td>Module implementing a tool button for the download manager.</td> +</tr><tr> <td><a href="eric6.WebBrowser.Download.DownloadModel.html">DownloadModel</a></td> <td>Module implementing the download model.</td> </tr><tr>
--- a/Documentation/Source/index-eric6.WebBrowser.GreaseMonkey.html Fri Feb 16 20:15:49 2018 +0100 +++ b/Documentation/Source/index-eric6.WebBrowser.GreaseMonkey.html Fri Feb 16 20:18:29 2018 +0100 @@ -44,6 +44,9 @@ <td><a href="eric6.WebBrowser.GreaseMonkey.GreaseMonkeyJavaScript.html">GreaseMonkeyJavaScript</a></td> <td>Module containing some JavaScript resources.</td> </tr><tr> +<td><a href="eric6.WebBrowser.GreaseMonkey.GreaseMonkeyJsObject.html">GreaseMonkeyJsObject</a></td> +<td>Module implementing the Python side for GreaseMonkey scripts.</td> +</tr><tr> <td><a href="eric6.WebBrowser.GreaseMonkey.GreaseMonkeyManager.html">GreaseMonkeyManager</a></td> <td>Module implementing the manager for GreaseMonkey scripts.</td> </tr><tr>
--- a/WebBrowser/Download/DownloadManager.py Fri Feb 16 20:15:49 2018 +0100 +++ b/WebBrowser/Download/DownloadManager.py Fri Feb 16 20:18:29 2018 +0100 @@ -451,7 +451,7 @@ Public method to get the number of downloads. @return number of downloads - @type int + @rtype int """ return len(self.__downloads)