Sun, 08 Apr 2018 17:36:43 +0200
Regenerated source docu.
--- a/APIs/Python3/eric6.api Sun Apr 08 17:34:59 2018 +0200 +++ b/APIs/Python3/eric6.api Sun Apr 08 17:36:43 2018 +0200 @@ -11023,6 +11023,7 @@ eric6.WebBrowser.Download.DownloadItem.DownloadItem.currentSpeed?4() eric6.WebBrowser.Download.DownloadItem.DownloadItem.downloadCanceled?4() eric6.WebBrowser.Download.DownloadItem.DownloadItem.downloadFinished?7 +eric6.WebBrowser.Download.DownloadItem.DownloadItem.downloadProgress?4() eric6.WebBrowser.Download.DownloadItem.DownloadItem.downloadedSuccessfully?4() eric6.WebBrowser.Download.DownloadItem.DownloadItem.downloading?4() eric6.WebBrowser.Download.DownloadItem.DownloadItem.fileName?4() @@ -11043,6 +11044,7 @@ 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.UpdateTimerTimeout?7 eric6.WebBrowser.Download.DownloadManager.DownloadManager.activeDownloadsCount?4() eric6.WebBrowser.Download.DownloadManager.DownloadManager.allowQuit?4() eric6.WebBrowser.Download.DownloadManager.DownloadManager.changeOccurred?4() @@ -11058,7 +11060,9 @@ eric6.WebBrowser.Download.DownloadManager.DownloadManager.save?4() eric6.WebBrowser.Download.DownloadManager.DownloadManager.setDownloadDirectory?4(directory) eric6.WebBrowser.Download.DownloadManager.DownloadManager.setRemovePolicy?4(policy) +eric6.WebBrowser.Download.DownloadManager.DownloadManager.show?4() eric6.WebBrowser.Download.DownloadManager.DownloadManager.shutdown?4() +eric6.WebBrowser.Download.DownloadManager.DownloadManager.timerEvent?4(evt) 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) @@ -11068,6 +11072,7 @@ eric6.WebBrowser.Download.DownloadModel.DownloadModel.rowCount?4(parent=None) eric6.WebBrowser.Download.DownloadModel.DownloadModel?1(manager, parent=None) eric6.WebBrowser.Download.DownloadUtilities.dataString?4(size) +eric6.WebBrowser.Download.DownloadUtilities.speedString?4(speed) eric6.WebBrowser.Download.DownloadUtilities.timeString?4(timeRemaining) eric6.WebBrowser.FeaturePermissions.FeaturePermissionBar.FeaturePermissionBar.DefaultHeight?7 eric6.WebBrowser.FeaturePermissions.FeaturePermissionBar.FeaturePermissionBar.hide?4() @@ -12187,6 +12192,7 @@ eric6.WebBrowser.WebBrowserTabWidget.WebBrowserTabWidget.closeAllBrowsers?4(shutdown=False) eric6.WebBrowser.WebBrowserTabWidget.WebBrowserTabWidget.closeBrowser?4() eric6.WebBrowser.WebBrowserTabWidget.WebBrowserTabWidget.closeBrowserAt?4(index, shutdown=False) +eric6.WebBrowser.WebBrowserTabWidget.WebBrowserTabWidget.closeBrowserView?4(browser) eric6.WebBrowser.WebBrowserTabWidget.WebBrowserTabWidget.closedTabsManager?4() eric6.WebBrowser.WebBrowserTabWidget.WebBrowserTabWidget.currentBrowser?4() eric6.WebBrowser.WebBrowserTabWidget.WebBrowserTabWidget.currentUrlBar?4() @@ -12208,6 +12214,7 @@ eric6.WebBrowser.WebBrowserTabWidget.WebBrowserTabWidget.sourceChanged?7 eric6.WebBrowser.WebBrowserTabWidget.WebBrowserTabWidget.stackedUrlBar?4() eric6.WebBrowser.WebBrowserTabWidget.WebBrowserTabWidget.titleChanged?7 +eric6.WebBrowser.WebBrowserTabWidget.WebBrowserTabWidget.urlBarForView?4(view) eric6.WebBrowser.WebBrowserTabWidget.WebBrowserTabWidget?1(parent) eric6.WebBrowser.WebBrowserView.WebBrowserView.ZoomLevelDefault?7 eric6.WebBrowser.WebBrowserView.WebBrowserView.ZoomLevels?7 @@ -12277,6 +12284,7 @@ eric6.WebBrowser.WebBrowserView.WebBrowserView.source?4() eric6.WebBrowser.WebBrowserView.WebBrowserView.sourceChanged?7 eric6.WebBrowser.WebBrowserView.WebBrowserView.storeSessionData?4(data) +eric6.WebBrowser.WebBrowserView.WebBrowserView.tabWidget?4() eric6.WebBrowser.WebBrowserView.WebBrowserView.title?4() eric6.WebBrowser.WebBrowserView.WebBrowserView.undo?4() eric6.WebBrowser.WebBrowserView.WebBrowserView.unselect?4() @@ -12330,6 +12338,8 @@ eric6.WebBrowser.WebBrowserWindow.WebBrowserWindow.bookmarksManager?4() eric6.WebBrowser.WebBrowserWindow.WebBrowserWindow.browserAt?4(index) eric6.WebBrowser.WebBrowserWindow.WebBrowserWindow.browsers?4() +eric6.WebBrowser.WebBrowserWindow.WebBrowserWindow.closeBrowser?4(browser) +eric6.WebBrowser.WebBrowserWindow.WebBrowserWindow.closeCurrentBrowser?4() eric6.WebBrowser.WebBrowserWindow.WebBrowserWindow.closeEvent?4(e) eric6.WebBrowser.WebBrowserWindow.WebBrowserWindow.cookieJar?4() eric6.WebBrowser.WebBrowserWindow.WebBrowserWindow.createPopupMenu?4()
--- a/Documentation/Help/source.qhp Sun Apr 08 17:34:59 2018 +0200 +++ b/Documentation/Help/source.qhp Sun Apr 08 17:36:43 2018 +0200 @@ -4199,6 +4199,7 @@ <keyword name="DownloadItem.currentSpeed" id="DownloadItem.currentSpeed" ref="eric6.WebBrowser.Download.DownloadItem.html#DownloadItem.currentSpeed" /> <keyword name="DownloadItem.downloadCanceled" id="DownloadItem.downloadCanceled" ref="eric6.Helpviewer.Download.DownloadItem.html#DownloadItem.downloadCanceled" /> <keyword name="DownloadItem.downloadCanceled" id="DownloadItem.downloadCanceled" ref="eric6.WebBrowser.Download.DownloadItem.html#DownloadItem.downloadCanceled" /> + <keyword name="DownloadItem.downloadProgress" id="DownloadItem.downloadProgress" ref="eric6.WebBrowser.Download.DownloadItem.html#DownloadItem.downloadProgress" /> <keyword name="DownloadItem.downloadedSuccessfully" id="DownloadItem.downloadedSuccessfully" ref="eric6.Helpviewer.Download.DownloadItem.html#DownloadItem.downloadedSuccessfully" /> <keyword name="DownloadItem.downloadedSuccessfully" id="DownloadItem.downloadedSuccessfully" ref="eric6.WebBrowser.Download.DownloadItem.html#DownloadItem.downloadedSuccessfully" /> <keyword name="DownloadItem.downloading" id="DownloadItem.downloading" ref="eric6.Helpviewer.Download.DownloadItem.html#DownloadItem.downloading" /> @@ -4237,6 +4238,7 @@ <keyword name="DownloadManager (Module)" id="DownloadManager (Module)" ref="eric6.WebBrowser.Download.DownloadManager.html" /> <keyword name="DownloadManager.__addItem" id="DownloadManager.__addItem" ref="eric6.Helpviewer.Download.DownloadManager.html#DownloadManager.__addItem" /> <keyword name="DownloadManager.__addItem" id="DownloadManager.__addItem" ref="eric6.WebBrowser.Download.DownloadManager.html#DownloadManager.__addItem" /> + <keyword name="DownloadManager.__closeDownloadTab" id="DownloadManager.__closeDownloadTab" ref="eric6.WebBrowser.Download.DownloadManager.html#DownloadManager.__closeDownloadTab" /> <keyword name="DownloadManager.__contextMenuCancel" id="DownloadManager.__contextMenuCancel" ref="eric6.Helpviewer.Download.DownloadManager.html#DownloadManager.__contextMenuCancel" /> <keyword name="DownloadManager.__contextMenuCancel" id="DownloadManager.__contextMenuCancel" ref="eric6.WebBrowser.Download.DownloadManager.html#DownloadManager.__contextMenuCancel" /> <keyword name="DownloadManager.__contextMenuCopyLink" id="DownloadManager.__contextMenuCopyLink" ref="eric6.Helpviewer.Download.DownloadManager.html#DownloadManager.__contextMenuCopyLink" /> @@ -4260,10 +4262,12 @@ <keyword name="DownloadManager.__finished" id="DownloadManager.__finished" ref="eric6.WebBrowser.Download.DownloadManager.html#DownloadManager.__finished" /> <keyword name="DownloadManager.__load" id="DownloadManager.__load" ref="eric6.Helpviewer.Download.DownloadManager.html#DownloadManager.__load" /> <keyword name="DownloadManager.__load" id="DownloadManager.__load" ref="eric6.WebBrowser.Download.DownloadManager.html#DownloadManager.__load" /> + <keyword name="DownloadManager.__startUpdateTimer" id="DownloadManager.__startUpdateTimer" ref="eric6.WebBrowser.Download.DownloadManager.html#DownloadManager.__startUpdateTimer" /> + <keyword name="DownloadManager.__stopUpdateTimer" id="DownloadManager.__stopUpdateTimer" ref="eric6.WebBrowser.Download.DownloadManager.html#DownloadManager.__stopUpdateTimer" /> + <keyword name="DownloadManager.__taskbarButton" id="DownloadManager.__taskbarButton" ref="eric6.WebBrowser.Download.DownloadManager.html#DownloadManager.__taskbarButton" /> + <keyword name="DownloadManager.__testWebBrowserView" id="DownloadManager.__testWebBrowserView" ref="eric6.WebBrowser.Download.DownloadManager.html#DownloadManager.__testWebBrowserView" /> <keyword name="DownloadManager.__updateActiveItemCount" id="DownloadManager.__updateActiveItemCount" ref="eric6.Helpviewer.Download.DownloadManager.html#DownloadManager.__updateActiveItemCount" /> - <keyword name="DownloadManager.__updateActiveItemCount" id="DownloadManager.__updateActiveItemCount" ref="eric6.WebBrowser.Download.DownloadManager.html#DownloadManager.__updateActiveItemCount" /> <keyword name="DownloadManager.__updateItemCount" id="DownloadManager.__updateItemCount" ref="eric6.Helpviewer.Download.DownloadManager.html#DownloadManager.__updateItemCount" /> - <keyword name="DownloadManager.__updateItemCount" id="DownloadManager.__updateItemCount" ref="eric6.WebBrowser.Download.DownloadManager.html#DownloadManager.__updateItemCount" /> <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" /> @@ -4294,8 +4298,10 @@ <keyword name="DownloadManager.setDownloadDirectory" id="DownloadManager.setDownloadDirectory" ref="eric6.WebBrowser.Download.DownloadManager.html#DownloadManager.setDownloadDirectory" /> <keyword name="DownloadManager.setRemovePolicy" id="DownloadManager.setRemovePolicy" ref="eric6.Helpviewer.Download.DownloadManager.html#DownloadManager.setRemovePolicy" /> <keyword name="DownloadManager.setRemovePolicy" id="DownloadManager.setRemovePolicy" ref="eric6.WebBrowser.Download.DownloadManager.html#DownloadManager.setRemovePolicy" /> + <keyword name="DownloadManager.show" id="DownloadManager.show" ref="eric6.WebBrowser.Download.DownloadManager.html#DownloadManager.show" /> <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="DownloadManager.timerEvent" id="DownloadManager.timerEvent" ref="eric6.WebBrowser.Download.DownloadManager.html#DownloadManager.timerEvent" /> <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" /> @@ -17664,6 +17670,7 @@ <keyword name="WebBrowserTabWidget.closeAllBrowsers" id="WebBrowserTabWidget.closeAllBrowsers" ref="eric6.WebBrowser.WebBrowserTabWidget.html#WebBrowserTabWidget.closeAllBrowsers" /> <keyword name="WebBrowserTabWidget.closeBrowser" id="WebBrowserTabWidget.closeBrowser" ref="eric6.WebBrowser.WebBrowserTabWidget.html#WebBrowserTabWidget.closeBrowser" /> <keyword name="WebBrowserTabWidget.closeBrowserAt" id="WebBrowserTabWidget.closeBrowserAt" ref="eric6.WebBrowser.WebBrowserTabWidget.html#WebBrowserTabWidget.closeBrowserAt" /> + <keyword name="WebBrowserTabWidget.closeBrowserView" id="WebBrowserTabWidget.closeBrowserView" ref="eric6.WebBrowser.WebBrowserTabWidget.html#WebBrowserTabWidget.closeBrowserView" /> <keyword name="WebBrowserTabWidget.closedTabsManager" id="WebBrowserTabWidget.closedTabsManager" ref="eric6.WebBrowser.WebBrowserTabWidget.html#WebBrowserTabWidget.closedTabsManager" /> <keyword name="WebBrowserTabWidget.currentBrowser" id="WebBrowserTabWidget.currentBrowser" ref="eric6.WebBrowser.WebBrowserTabWidget.html#WebBrowserTabWidget.currentBrowser" /> <keyword name="WebBrowserTabWidget.currentUrlBar" id="WebBrowserTabWidget.currentUrlBar" ref="eric6.WebBrowser.WebBrowserTabWidget.html#WebBrowserTabWidget.currentUrlBar" /> @@ -17681,6 +17688,7 @@ <keyword name="WebBrowserTabWidget.restoreClosedTab" id="WebBrowserTabWidget.restoreClosedTab" ref="eric6.WebBrowser.WebBrowserTabWidget.html#WebBrowserTabWidget.restoreClosedTab" /> <keyword name="WebBrowserTabWidget.shallShutDown" id="WebBrowserTabWidget.shallShutDown" ref="eric6.WebBrowser.WebBrowserTabWidget.html#WebBrowserTabWidget.shallShutDown" /> <keyword name="WebBrowserTabWidget.stackedUrlBar" id="WebBrowserTabWidget.stackedUrlBar" ref="eric6.WebBrowser.WebBrowserTabWidget.html#WebBrowserTabWidget.stackedUrlBar" /> + <keyword name="WebBrowserTabWidget.urlBarForView" id="WebBrowserTabWidget.urlBarForView" ref="eric6.WebBrowser.WebBrowserTabWidget.html#WebBrowserTabWidget.urlBarForView" /> <keyword name="WebBrowserTools (Module)" id="WebBrowserTools (Module)" ref="eric6.WebBrowser.Tools.WebBrowserTools.html" /> <keyword name="WebBrowserView" id="WebBrowserView" ref="eric6.WebBrowser.WebBrowserView.html#WebBrowserView" /> <keyword name="WebBrowserView (Constructor)" id="WebBrowserView (Constructor)" ref="eric6.WebBrowser.WebBrowserView.html#WebBrowserView.__init__" /> @@ -17795,6 +17803,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.tabWidget" id="WebBrowserView.tabWidget" ref="eric6.WebBrowser.WebBrowserView.html#WebBrowserView.tabWidget" /> <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" /> @@ -17952,6 +17961,8 @@ <keyword name="WebBrowserWindow.bookmarksManager" id="WebBrowserWindow.bookmarksManager" ref="eric6.WebBrowser.WebBrowserWindow.html#WebBrowserWindow.bookmarksManager" /> <keyword name="WebBrowserWindow.browserAt" id="WebBrowserWindow.browserAt" ref="eric6.WebBrowser.WebBrowserWindow.html#WebBrowserWindow.browserAt" /> <keyword name="WebBrowserWindow.browsers" id="WebBrowserWindow.browsers" ref="eric6.WebBrowser.WebBrowserWindow.html#WebBrowserWindow.browsers" /> + <keyword name="WebBrowserWindow.closeBrowser" id="WebBrowserWindow.closeBrowser" ref="eric6.WebBrowser.WebBrowserWindow.html#WebBrowserWindow.closeBrowser" /> + <keyword name="WebBrowserWindow.closeCurrentBrowser" id="WebBrowserWindow.closeCurrentBrowser" ref="eric6.WebBrowser.WebBrowserWindow.html#WebBrowserWindow.closeCurrentBrowser" /> <keyword name="WebBrowserWindow.closeEvent" id="WebBrowserWindow.closeEvent" ref="eric6.WebBrowser.WebBrowserWindow.html#WebBrowserWindow.closeEvent" /> <keyword name="WebBrowserWindow.cookieJar" id="WebBrowserWindow.cookieJar" ref="eric6.WebBrowser.WebBrowserWindow.html#WebBrowserWindow.cookieJar" /> <keyword name="WebBrowserWindow.createPopupMenu" id="WebBrowserWindow.createPopupMenu" ref="eric6.WebBrowser.WebBrowserWindow.html#WebBrowserWindow.createPopupMenu" /> @@ -19062,6 +19073,7 @@ <keyword name="shutilCopy" id="shutilCopy" ref="eric6.install.html#shutilCopy" /> <keyword name="simpleAppStartup" id="simpleAppStartup" ref="eric6.Toolbox.Startup.html#simpleAppStartup" /> <keyword name="sort" id="sort" ref="eric6.Graphics.GraphicsUtilities.html#sort" /> + <keyword name="speedString" id="speedString" ref="eric6.WebBrowser.Download.DownloadUtilities.html#speedString" /> <keyword name="splitPath" id="splitPath" ref="eric6.Utilities.__init__.html#splitPath" /> <keyword name="startDebugger" id="startDebugger" ref="eric6.DebugClients.Python.eric6dbgstub.html#startDebugger" /> <keyword name="startswithPath" id="startswithPath" ref="eric6.Utilities.__init__.html#startswithPath" />
--- a/Documentation/Source/eric6.WebBrowser.Download.DownloadItem.html Sun Apr 08 17:34:59 2018 +0200 +++ b/Documentation/Source/eric6.WebBrowser.Download.DownloadItem.html Sun Apr 08 17:36:43 2018 +0200 @@ -45,7 +45,7 @@ Class implementing a widget controlling a download. </p><h3>Signals</h3> <dl> -<dt>downloadFinished()</dt> +<dt>downloadFinished(success)</dt> <dd> emitted when a download finished </dd><dt>progress(int, int)</dt> @@ -120,6 +120,9 @@ <td><a href="#DownloadItem.downloadCanceled">downloadCanceled</a></td> <td>Public method to check, if the download was cancelled.</td> </tr><tr> +<td><a href="#DownloadItem.downloadProgress">downloadProgress</a></td> +<td>Public method to get the download progress.</td> +</tr><tr> <td><a href="#DownloadItem.downloadedSuccessfully">downloadedSuccessfully</a></td> <td>Public method to check for a successful download.</td> </tr><tr> @@ -322,6 +325,21 @@ <dd> flag indicating a canceled download (boolean) </dd> +</dl><a NAME="DownloadItem.downloadProgress" ID="DownloadItem.downloadProgress"></a> +<h4>DownloadItem.downloadProgress</h4> +<b>downloadProgress</b>(<i></i>) +<p> + Public method to get the download progress. +</p><dl> +<dt>Returns:</dt> +<dd> +current download progress +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +int +</dd> </dl><a NAME="DownloadItem.downloadedSuccessfully" ID="DownloadItem.downloadedSuccessfully"></a> <h4>DownloadItem.downloadedSuccessfully</h4> <b>downloadedSuccessfully</b>(<i></i>)
--- a/Documentation/Source/eric6.WebBrowser.Download.DownloadManager.html Sun Apr 08 17:34:59 2018 +0200 +++ b/Documentation/Source/eric6.WebBrowser.Download.DownloadManager.html Sun Apr 08 17:36:43 2018 +0200 @@ -55,7 +55,7 @@ QDialog, Ui_DownloadManager <h3>Class Attributes</h3> <table> -<tr><td>RemoveExit</td></tr><tr><td>RemoveNever</td></tr><tr><td>RemoveSuccessFullDownload</td></tr> +<tr><td>RemoveExit</td></tr><tr><td>RemoveNever</td></tr><tr><td>RemoveSuccessFullDownload</td></tr><tr><td>UpdateTimerTimeout</td></tr> </table> <h3>Class Methods</h3> <table> @@ -70,6 +70,9 @@ <td><a href="#DownloadManager.__addItem">__addItem</a></td> <td>Private method to add a download to the list of downloads.</td> </tr><tr> +<td><a href="#DownloadManager.__closeDownloadTab">__closeDownloadTab</a></td> +<td>Private method to close an empty tab, that was opened only for loading the download URL.</td> +</tr><tr> <td><a href="#DownloadManager.__contextMenuCancel">__contextMenuCancel</a></td> <td>Private method to cancel the current download.</td> </tr><tr> @@ -103,11 +106,17 @@ <td><a href="#DownloadManager.__load">__load</a></td> <td>Private method to load the download settings.</td> </tr><tr> -<td><a href="#DownloadManager.__updateActiveItemCount">__updateActiveItemCount</a></td> -<td>Private method to update the window title.</td> +<td><a href="#DownloadManager.__startUpdateTimer">__startUpdateTimer</a></td> +<td>Private slot to start the update timer.</td> +</tr><tr> +<td><a href="#DownloadManager.__stopUpdateTimer">__stopUpdateTimer</a></td> +<td>Private slot to stop the update timer.</td> </tr><tr> -<td><a href="#DownloadManager.__updateItemCount">__updateItemCount</a></td> -<td>Private method to update the count label.</td> +<td><a href="#DownloadManager.__taskbarButton">__taskbarButton</a></td> +<td>Private method to get a reference to the task bar button (Windows only).</td> +</tr><tr> +<td><a href="#DownloadManager.__testWebBrowserView">__testWebBrowserView</a></td> +<td>Private method to test a web browser view against an URL.</td> </tr><tr> <td><a href="#DownloadManager.__updateRow">__updateRow</a></td> <td>Private slot to update a download item.</td> @@ -140,7 +149,7 @@ <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> +<td>Private slot to cleanup the downloads.</td> </tr><tr> <td><a href="#DownloadManager.removePolicy">removePolicy</a></td> <td>Public method to get the remove policy.</td> @@ -154,8 +163,14 @@ <td><a href="#DownloadManager.setRemovePolicy">setRemovePolicy</a></td> <td>Public method to set the remove policy.</td> </tr><tr> +<td><a href="#DownloadManager.show">show</a></td> +<td>Public slot to show the download manager dialog.</td> +</tr><tr> <td><a href="#DownloadManager.shutdown">shutdown</a></td> <td>Public method to stop the download manager.</td> +</tr><tr> +<td><a href="#DownloadManager.timerEvent">timerEvent</a></td> +<td>Protected event handler for timer events.</td> </tr> </table> <h3>Static Methods</h3> @@ -185,6 +200,17 @@ <dd> flag indicating to append the item </dd> +</dl><a NAME="DownloadManager.__closeDownloadTab" ID="DownloadManager.__closeDownloadTab"></a> +<h4>DownloadManager.__closeDownloadTab</h4> +<b>__closeDownloadTab</b>(<i>url</i>) +<p> + Private method to close an empty tab, that was opened only for loading + the download URL. +</p><dl> +<dt><i>url</i> (QUrl)</dt> +<dd> +download URL +</dd> </dl><a NAME="DownloadManager.__contextMenuCancel" ID="DownloadManager.__contextMenuCancel"></a> <h4>DownloadManager.__contextMenuCancel</h4> <b>__contextMenuCancel</b>(<i></i>) @@ -242,25 +268,69 @@ </dd> </dl><a NAME="DownloadManager.__finished" ID="DownloadManager.__finished"></a> <h4>DownloadManager.__finished</h4> -<b>__finished</b>(<i></i>) +<b>__finished</b>(<i>success</i>) <p> Private slot to handle a finished download. -</p><a NAME="DownloadManager.__load" ID="DownloadManager.__load"></a> +</p><dl> +<dt><i>success</i> (bool)</dt> +<dd> +flag indicating a successful download +</dd> +</dl><a NAME="DownloadManager.__load" ID="DownloadManager.__load"></a> <h4>DownloadManager.__load</h4> <b>__load</b>(<i></i>) <p> Private method to load the download settings. -</p><a NAME="DownloadManager.__updateActiveItemCount" ID="DownloadManager.__updateActiveItemCount"></a> -<h4>DownloadManager.__updateActiveItemCount</h4> -<b>__updateActiveItemCount</b>(<i></i>) +</p><a NAME="DownloadManager.__startUpdateTimer" ID="DownloadManager.__startUpdateTimer"></a> +<h4>DownloadManager.__startUpdateTimer</h4> +<b>__startUpdateTimer</b>(<i></i>) +<p> + Private slot to start the update timer. +</p><a NAME="DownloadManager.__stopUpdateTimer" ID="DownloadManager.__stopUpdateTimer"></a> +<h4>DownloadManager.__stopUpdateTimer</h4> +<b>__stopUpdateTimer</b>(<i></i>) +<p> + Private slot to stop the update timer. +</p><a NAME="DownloadManager.__taskbarButton" ID="DownloadManager.__taskbarButton"></a> +<h4>DownloadManager.__taskbarButton</h4> +<b>__taskbarButton</b>(<i></i>) <p> - Private method to update the window title. -</p><a NAME="DownloadManager.__updateItemCount" ID="DownloadManager.__updateItemCount"></a> -<h4>DownloadManager.__updateItemCount</h4> -<b>__updateItemCount</b>(<i></i>) + Private method to get a reference to the task bar button (Windows + only). +</p><dl> +<dt>Returns:</dt> +<dd> +reference to the task bar button +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +QWinTaskbarButton or None +</dd> +</dl><a NAME="DownloadManager.__testWebBrowserView" ID="DownloadManager.__testWebBrowserView"></a> +<h4>DownloadManager.__testWebBrowserView</h4> +<b>__testWebBrowserView</b>(<i>view, url</i>) <p> - Private method to update the count label. -</p><a NAME="DownloadManager.__updateRow" ID="DownloadManager.__updateRow"></a> + Private method to test a web browser view against an URL. +</p><dl> +<dt><i>view</i> (WebBrowserView)</dt> +<dd> +reference to the web browser view to be tested +</dd><dt><i>url</i> (QUrl)</dt> +<dd> +URL to test against +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +flag indicating, that the view is the one for the URL +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool +</dd> +</dl><a NAME="DownloadManager.__updateRow" ID="DownloadManager.__updateRow"></a> <h4>DownloadManager.__updateRow</h4> <b>__updateRow</b>(<i>itm</i>) <p> @@ -360,7 +430,7 @@ <h4>DownloadManager.on_cleanupButton_clicked</h4> <b>on_cleanupButton_clicked</b>(<i></i>) <p> - Private slot cleanup the downloads. + Private slot to cleanup the downloads. </p><a NAME="DownloadManager.removePolicy" ID="DownloadManager.removePolicy"></a> <h4>DownloadManager.removePolicy</h4> <b>removePolicy</b>(<i></i>) @@ -398,12 +468,27 @@ (DownloadManager.RemoveExit, DownloadManager.RemoveNever, DownloadManager.RemoveSuccessFullDownload) </dd> -</dl><a NAME="DownloadManager.shutdown" ID="DownloadManager.shutdown"></a> +</dl><a NAME="DownloadManager.show" ID="DownloadManager.show"></a> +<h4>DownloadManager.show</h4> +<b>show</b>(<i></i>) +<p> + Public slot to show the download manager dialog. +</p><a NAME="DownloadManager.shutdown" ID="DownloadManager.shutdown"></a> <h4>DownloadManager.shutdown</h4> <b>shutdown</b>(<i></i>) <p> Public method to stop the download manager. -</p> +</p><a NAME="DownloadManager.timerEvent" ID="DownloadManager.timerEvent"></a> +<h4>DownloadManager.timerEvent</h4> +<b>timerEvent</b>(<i>evt</i>) +<p> + Protected event handler for timer events. +</p><dl> +<dt><i>evt</i> (QTimerEvent)</dt> +<dd> +reference to the timer event +</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.Download.DownloadModel.html Sun Apr 08 17:34:59 2018 +0200 +++ b/Documentation/Source/eric6.WebBrowser.Download.DownloadModel.html Sun Apr 08 17:36:43 2018 +0200 @@ -70,7 +70,7 @@ <td>Public method to return the mime data.</td> </tr><tr> <td><a href="#DownloadModel.removeRows">removeRows</a></td> -<td>Public method to remove bookmarks from the model.</td> +<td>Public method to remove downloads from the model.</td> </tr><tr> <td><a href="#DownloadModel.rowCount">rowCount</a></td> <td>Public method to get the number of rows of the model.</td> @@ -86,12 +86,12 @@ <p> Constructor </p><dl> -<dt><i>manager</i></dt> +<dt><i>manager</i> (DownloadManager)</dt> <dd> -reference to the download manager (DownloadManager) -</dd><dt><i>parent</i></dt> +reference to the download manager +</dd><dt><i>parent</i> (QObject)</dt> <dd> -reference to the parent object (QObject) +reference to the parent object </dd> </dl><a NAME="DownloadModel.data" ID="DownloadModel.data"></a> <h4>DownloadModel.data</h4> @@ -99,32 +99,42 @@ <p> Public method to get data from the model. </p><dl> -<dt><i>index</i></dt> +<dt><i>index</i> (QModelIndex)</dt> <dd> -index to get data for (QModelIndex) -</dd><dt><i>role</i></dt> +index to get data for +</dd><dt><i>role</i> (int)</dt> <dd> -role of the data to retrieve (integer) +role of the data to retrieve </dd> </dl><dl> <dt>Returns:</dt> <dd> requested data </dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +any +</dd> </dl><a NAME="DownloadModel.flags" ID="DownloadModel.flags"></a> <h4>DownloadModel.flags</h4> <b>flags</b>(<i>index</i>) <p> Public method to get flags for an item. </p><dl> -<dt><i>index</i></dt> +<dt><i>index</i> (QModelIndex)</dt> <dd> -index of the node cell (QModelIndex) +index of the node cell </dd> </dl><dl> <dt>Returns:</dt> <dd> -flags (Qt.ItemFlags) +flags +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +Qt.ItemFlags </dd> </dl><a NAME="DownloadModel.mimeData" ID="DownloadModel.mimeData"></a> <h4>DownloadModel.mimeData</h4> @@ -132,35 +142,45 @@ <p> Public method to return the mime data. </p><dl> -<dt><i>indexes</i></dt> +<dt><i>indexes</i> (QModelIndexList)</dt> <dd> -list of indexes (QModelIndexList) +list of indexes </dd> </dl><dl> <dt>Returns:</dt> <dd> -mime data (QMimeData) +mime data +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +QMimeData </dd> </dl><a NAME="DownloadModel.removeRows" ID="DownloadModel.removeRows"></a> <h4>DownloadModel.removeRows</h4> <b>removeRows</b>(<i>row, count, parent=None</i>) <p> - Public method to remove bookmarks from the model. + Public method to remove downloads from the model. </p><dl> -<dt><i>row</i></dt> +<dt><i>row</i> (int)</dt> <dd> -row of the first bookmark to remove (integer) -</dd><dt><i>count</i></dt> +row of the first download to remove +</dd><dt><i>count</i> (int)</dt> <dd> -number of bookmarks to remove (integer) -</dd><dt><i>parent</i></dt> +number of downloads to remove +</dd><dt><i>parent</i> (QModelIndex)</dt> <dd> -index of the parent bookmark node (QModelIndex) +index of the parent download node </dd> </dl><dl> <dt>Returns:</dt> <dd> -flag indicating successful removal (boolean) +flag indicating successful removal +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool </dd> </dl><a NAME="DownloadModel.rowCount" ID="DownloadModel.rowCount"></a> <h4>DownloadModel.rowCount</h4> @@ -168,14 +188,19 @@ <p> Public method to get the number of rows of the model. </p><dl> -<dt><i>parent</i></dt> +<dt><i>parent</i> (QModelIndex)</dt> <dd> -parent index (QModelIndex) +parent index </dd> </dl><dl> <dt>Returns:</dt> <dd> -number of rows (integer) +number of rows +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +int </dd> </dl> <div align="right"><a href="#top">Up</a></div>
--- a/Documentation/Source/eric6.WebBrowser.Download.DownloadUtilities.html Sun Apr 08 17:34:59 2018 +0200 +++ b/Documentation/Source/eric6.WebBrowser.Download.DownloadUtilities.html Sun Apr 08 17:36:43 2018 +0200 @@ -37,6 +37,9 @@ <td><a href="#dataString">dataString</a></td> <td>Module function to generate a formatted size string.</td> </tr><tr> +<td><a href="#speedString">speedString</a></td> +<td>Module function to generate a formatted speed string.</td> +</tr><tr> <td><a href="#timeString">timeString</a></td> <td>Module function to format the given time.</td> </tr> @@ -48,14 +51,42 @@ <p> Module function to generate a formatted size string. </p><dl> -<dt><i>size</i></dt> +<dt><i>size</i> (int)</dt> <dd> -size to be formatted (integer) +size to be formatted </dd> </dl><dl> <dt>Returns:</dt> <dd> -formatted data string (string) +formatted data string +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +str +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /><hr /> +<a NAME="speedString" ID="speedString"></a> +<h2>speedString</h2> +<b>speedString</b>(<i>speed</i>) +<p> + Module function to generate a formatted speed string. +</p><dl> +<dt><i>speed</i> (float)</dt> +<dd> +speed to be formatted +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +formatted speed string +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +str </dd> </dl> <div align="right"><a href="#top">Up</a></div> @@ -66,14 +97,19 @@ <p> Module function to format the given time. </p><dl> -<dt><i>timeRemaining</i></dt> +<dt><i>timeRemaining</i> (float)</dt> <dd> -time to be formatted (float) +time to be formatted </dd> </dl><dl> <dt>Returns:</dt> <dd> -time string (string) +time string +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +str </dd> </dl> <div align="right"><a href="#top">Up</a></div>
--- a/Documentation/Source/eric6.WebBrowser.WebBrowserTabWidget.html Sun Apr 08 17:34:59 2018 +0200 +++ b/Documentation/Source/eric6.WebBrowser.WebBrowserTabWidget.html Sun Apr 08 17:36:43 2018 +0200 @@ -203,6 +203,9 @@ <td><a href="#WebBrowserTabWidget.closeBrowserAt">closeBrowserAt</a></td> <td>Public slot to close a browser based on its index.</td> </tr><tr> +<td><a href="#WebBrowserTabWidget.closeBrowserView">closeBrowserView</a></td> +<td>Public method to close the given browser.</td> +</tr><tr> <td><a href="#WebBrowserTabWidget.closedTabsManager">closedTabsManager</a></td> <td>Public slot to get a reference to the closed tabs manager.</td> </tr><tr> @@ -253,6 +256,9 @@ </tr><tr> <td><a href="#WebBrowserTabWidget.stackedUrlBar">stackedUrlBar</a></td> <td>Public method to get a reference to the stacked url bar.</td> +</tr><tr> +<td><a href="#WebBrowserTabWidget.urlBarForView">urlBarForView</a></td> +<td>Public method to get a reference to the UrlBar associated with the given view.</td> </tr> </table> <h3>Static Methods</h3> @@ -619,6 +625,16 @@ <dd> flag indicating a shutdown action </dd> +</dl><a NAME="WebBrowserTabWidget.closeBrowserView" ID="WebBrowserTabWidget.closeBrowserView"></a> +<h4>WebBrowserTabWidget.closeBrowserView</h4> +<b>closeBrowserView</b>(<i>browser</i>) +<p> + Public method to close the given browser. +</p><dl> +<dt><i>browser</i> (WebBrowserView)</dt> +<dd> +reference to the web browser view to be closed +</dd> </dl><a NAME="WebBrowserTabWidget.closedTabsManager" ID="WebBrowserTabWidget.closedTabsManager"></a> <h4>WebBrowserTabWidget.closedTabsManager</h4> <b>closedTabsManager</b>(<i></i>) @@ -818,6 +834,27 @@ <dd> reference to the stacked url bar (StackedUrlBar) </dd> +</dl><a NAME="WebBrowserTabWidget.urlBarForView" ID="WebBrowserTabWidget.urlBarForView"></a> +<h4>WebBrowserTabWidget.urlBarForView</h4> +<b>urlBarForView</b>(<i>view</i>) +<p> + Public method to get a reference to the UrlBar associated with the + given view. +</p><dl> +<dt><i>view</i> (WebBrowserView)</dt> +<dd> +reference to the view to get the urlbar for +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +reference to the associated urlbar +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +UrlBar +</dd> </dl> <div align="right"><a href="#top">Up</a></div> <hr />
--- a/Documentation/Source/eric6.WebBrowser.WebBrowserView.html Sun Apr 08 17:34:59 2018 +0200 +++ b/Documentation/Source/eric6.WebBrowser.WebBrowserView.html Sun Apr 08 17:36:43 2018 +0200 @@ -422,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.tabWidget">tabWidget</a></td> +<td>Public method to get a reference to the tab widget containing this view.</td> +</tr><tr> <td><a href="#WebBrowserView.title">title</a></td> <td>Public method to get the view title.</td> </tr><tr> @@ -1533,6 +1536,22 @@ <dd> dictionary with session data to be restored </dd> +</dl><a NAME="WebBrowserView.tabWidget" ID="WebBrowserView.tabWidget"></a> +<h4>WebBrowserView.tabWidget</h4> +<b>tabWidget</b>(<i></i>) +<p> + Public method to get a reference to the tab widget containing this + view. +</p><dl> +<dt>Returns:</dt> +<dd> +reference to the tab widget +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +WebBrowserTabWidget +</dd> </dl><a NAME="WebBrowserView.title" ID="WebBrowserView.title"></a> <h4>WebBrowserView.title</h4> <b>title</b>(<i></i>)
--- a/Documentation/Source/eric6.WebBrowser.WebBrowserWindow.html Sun Apr 08 17:34:59 2018 +0200 +++ b/Documentation/Source/eric6.WebBrowser.WebBrowserWindow.html Sun Apr 08 17:36:43 2018 +0200 @@ -526,6 +526,12 @@ <td><a href="#WebBrowserWindow.browsers">browsers</a></td> <td>Public method to get a list of references to all web browsers.</td> </tr><tr> +<td><a href="#WebBrowserWindow.closeBrowser">closeBrowser</a></td> +<td>Public method to close the given browser.</td> +</tr><tr> +<td><a href="#WebBrowserWindow.closeCurrentBrowser">closeCurrentBrowser</a></td> +<td>Public method to close the current web browser.</td> +</tr><tr> <td><a href="#WebBrowserWindow.closeEvent">closeEvent</a></td> <td>Protected event handler for the close event.</td> </tr><tr> @@ -1918,7 +1924,22 @@ <dd> list of references to web browsers (list of WebBrowserView) </dd> -</dl><a NAME="WebBrowserWindow.closeEvent" ID="WebBrowserWindow.closeEvent"></a> +</dl><a NAME="WebBrowserWindow.closeBrowser" ID="WebBrowserWindow.closeBrowser"></a> +<h4>WebBrowserWindow.closeBrowser</h4> +<b>closeBrowser</b>(<i>browser</i>) +<p> + Public method to close the given browser. +</p><dl> +<dt><i>browser</i> (WebBrowserView)</dt> +<dd> +reference to the web browser view to be closed +</dd> +</dl><a NAME="WebBrowserWindow.closeCurrentBrowser" ID="WebBrowserWindow.closeCurrentBrowser"></a> +<h4>WebBrowserWindow.closeCurrentBrowser</h4> +<b>closeCurrentBrowser</b>(<i></i>) +<p> + Public method to close the current web browser. +</p><a NAME="WebBrowserWindow.closeEvent" ID="WebBrowserWindow.closeEvent"></a> <h4>WebBrowserWindow.closeEvent</h4> <b>closeEvent</b>(<i>e</i>) <p>