Mercurial Repositories > eric / file comparison
comparison: eric7/WebBrowser/Download/DownloadManager.py
eric7/WebBrowser/Download/DownloadManager.py
- branch
- eric7
- changeset 8556
- 766e1566cb74
- parent 8358
- 144a6b854f70
- child 8856
- df77fbfc150f
equal
deleted
inserted
replaced
| 8555:844c2713bf44 | 8556:766e1566cb74 |
|---|---|
| 226 for browser in window.browsers(): | 226 for browser in window.browsers(): |
| 227 if self.__testWebBrowserView(browser, url): | 227 if self.__testWebBrowserView(browser, url): |
| 228 window.closeBrowser(browser) | 228 window.closeBrowser(browser) |
| 229 return | 229 return |
| 230 | 230 |
| 231 def download(self, downloadItem): | 231 def download(self, downloadRequest): |
| 232 """ | 232 """ |
| 233 Public method to download a file. | 233 Public method to download a file. |
| 234 | 234 |
| 235 @param downloadItem reference to the download object containing the | 235 @param downloadRequest reference to the download object containing the |
| 236 download data. | 236 download data. |
| 237 @type QWebEngineDownloadItem | 237 @type QWebEngineDownloadRequest |
| 238 """ | 238 """ |
| 239 url = downloadItem.url() | 239 url = downloadRequest.url() |
| 240 if url.isEmpty(): | 240 if url.isEmpty(): |
| 241 return | 241 return |
| 242 | 242 |
| 243 self.__closeDownloadTab(url) | 243 self.__closeDownloadTab(url) |
| 244 | 244 |
| 262 " Browsing database.</p>{1}").format( | 262 " Browsing database.</p>{1}").format( |
| 263 url.toString(), "".join(threatMessages)), | 263 url.toString(), "".join(threatMessages)), |
| 264 EricMessageBox.Abort | EricMessageBox.Ignore, | 264 EricMessageBox.Abort | EricMessageBox.Ignore, |
| 265 EricMessageBox.Abort) | 265 EricMessageBox.Abort) |
| 266 if res == EricMessageBox.Abort: | 266 if res == EricMessageBox.Abort: |
| 267 downloadItem.cancel() | 267 downloadRequest.cancel() |
| 268 return | 268 return |
| 269 | 269 |
| 270 window = WebBrowserWindow.getWindow() | 270 window = WebBrowserWindow.getWindow() |
| 271 pageUrl = window.currentBrowser().url() if window else QUrl() | 271 pageUrl = window.currentBrowser().url() if window else QUrl() |
| 272 from .DownloadItem import DownloadItem | 272 from .DownloadItem import DownloadItem |
| 273 itm = DownloadItem(downloadItem=downloadItem, pageUrl=pageUrl, | 273 itm = DownloadItem(downloadRequest=downloadRequest, pageUrl=pageUrl, |
| 274 parent=self) | 274 parent=self) |
| 275 self.__addItem(itm) | 275 self.__addItem(itm) |
| 276 | 276 |
| 277 if Preferences.getWebBrowser("DownloadManagerAutoOpen"): | 277 if Preferences.getWebBrowser("DownloadManagerAutoOpen"): |
| 278 self.show() | 278 self.show() |
