eric: comparison WebBrowser/Download/DownloadManager.py

-:57da9217196b
+:2b6f7e026cdc
 """
 from __future__ import unicode_literals
 from PyQt5.QtCore import pyqtSlot, Qt, QModelIndex, QFileInfo
-from PyQt5.QtGui import QCursor
+from PyQt5.QtGui import QCursor, QKeySequence
 from PyQt5.QtWidgets import QDialog, QStyle, QFileIconProvider, QMenu, \
-QApplication
+QApplication, QShortcut
-from PyQt5.QtNetwork import QNetworkRequest
-from PyQt5.QtWebKit import QWebSettings
 from E5Gui import E5MessageBox
 from .Ui_DownloadManager import Ui_DownloadManager
 self.setWindowFlags(Qt.Window)
 self.__saveTimer = AutoSaver(self, self.save)
 self.__model = DownloadModel(self)
-self.__manager = Helpviewer.HelpWindow.HelpWindow\
+self.__manager = WebBrowserWindow.networkManager()
-.networkAccessManager()
 self.__iconProvider = None
 self.__downloads = []
 self.__downloadDirectory = ""
 self.__loaded = False
 self.downloadsView.horizontalHeader().setStretchLastSection(True)
 self.downloadsView.setModel(self.__model)
 self.downloadsView.setContextMenuPolicy(Qt.CustomContextMenu)
 self.downloadsView.customContextMenuRequested.connect(
 self.__customContextMenuRequested)
+self.__clearShortcut = QShortcut(QKeySequence("Ctrl+L"), self)
+self.__clearShortcut.activated.connect(self.on_cleanupButton_clicked)
 self.__load()
 def __customContextMenuRequested(self, pos):
 """
 if not res:
 self.show()
 return False
 return True
-def download(self, requestOrUrl, requestFileName=False, mainWindow=None):
+def download(self, downloadItem):
 """
 Public method to download a file.
-@param requestOrUrl reference to a request object (QNetworkRequest)
+@param downloadItem reference to the download object containing the
-or a URL to be downloaded (QUrl)
+download data.
-@keyparam requestFileName flag indicating to ask for the
+@type QWebEngineDownloadItem
-download file name (boolean)
+"""
-@keyparam mainWindow reference to the main window (HelpWindow)
+if downloadItem.url().isEmpty():
-"""
-request = QNetworkRequest(requestOrUrl)
-if request.url().isEmpty():
-return
-self.handleUnsupportedContent(
-self.__manager.get(request),
-requestFileName=requestFileName,
-download=True,
-mainWindow=mainWindow)
-def handleUnsupportedContent(self, reply, requestFileName=False,
-webPage=None, download=False,
-mainWindow=None):
-"""
-Public method to handle unsupported content by downloading the
-referenced resource.
-@param reply reference to the reply object (QNetworkReply)
-@keyparam requestFileName indicating to ask for a filename
-(boolean)
-@keyparam webPage reference to the web page (HelpWebPage)
-@keyparam download flag indicating a download request (boolean)
-@keyparam mainWindow reference to the main window (HelpWindow)
-"""
-if reply is None or reply.url().isEmpty():
-return
-size = reply.header(QNetworkRequest.ContentLengthHeader)
-if size == 0:
 return
 from .DownloadItem import DownloadItem
-itm = DownloadItem(
+itm = DownloadItem(downloadItem, parent=self)
-reply=reply, requestFilename=requestFileName,
-webPage=webPage, download=download, parent=self,
-mainWindow=mainWindow)
 self.__addItem(itm)
 if itm.canceledFileSelect():
 return
 self.downloadsView.setRowHeight(
 row,
 max(oldHeight, itm.minimumSizeHint().height() * 1.5))
 remove = False
-globalSettings = QWebSettings.globalSettings()
+# TODO: Private Browsing
-if not itm.downloading() and \
+##        globalSettings = QWebSettings.globalSettings()
-globalSettings.testAttribute(QWebSettings.PrivateBrowsingEnabled):
+##        if not itm.downloading() and \
-remove = True
+##           globalSettings.testAttribute(QWebSettings.PrivateBrowsingEnabled):
+##            remove = True
 if itm.downloadedSuccessfully() and \
 self.removePolicy() == DownloadManager.RemoveSuccessFullDownload:
 remove = True
 DownloadManager.RemoveSuccessFullDownload)
 if policy == self.removePolicy():
 return
-Preferences.getWebBrowser("DownloadManagerRemovePolicy", self.policy)
+Preferences.setWebBrowser("DownloadManagerRemovePolicy", self.policy)
 def save(self):
 """
 Public method to save the download settings.
 """
 Preferences.setWebBrowser("DownloadManagerSize", self.size())
 Preferences.setWebBrowser("DownloadManagerPosition", self.pos())
 if self.removePolicy() == DownloadManager.RemoveExit:
 return
-downloads = []
+# TODO: Downloads: check saving downloads
-for download in self.__downloads:
+##        downloads = []
-downloads.append(download.getData())
+##        for download in self.__downloads:
-Preferences.setWebBrowser("DownloadManagerDownloads", downloads)
+##            downloads.append(download.getData())
+##        Preferences.setWebBrowser("DownloadManagerDownloads", downloads)
 def __load(self):
 """
 Private method to load the download settings.
 """
 if size.isValid():
 self.resize(size)
 pos = Preferences.getWebBrowser("DownloadManagerPosition")
 self.move(pos)
-downloads = Preferences.getWebBrowser("DownloadManagerDownloads")
+# TODO: Downloads: check laoding downloads
-for download in downloads:
+##        downloads = Preferences.getWebBrowser("DownloadManagerDownloads")
-if not download[0].isEmpty() and \
+##        for download in downloads:
-download[1] != "":
+##            if not download[0].isEmpty() and \
-from .DownloadItem import DownloadItem
+##               download[1] != "":
-itm = DownloadItem(parent=self)
+##                from .DownloadItem import DownloadItem
-itm.setData(download)
+##                itm = DownloadItem(parent=self)
-self.__addItem(itm)
+##                itm.setData(download)
+##                self.__addItem(itm)
 self.cleanupButton.setEnabled(
 (len(self.__downloads) - self.activeDownloads()) > 0)
 self.__loaded = True
 self.__updateActiveItemCount()
 ###########################################################################
 ## Context menu related methods below
 ###########################################################################
+# TODO: Downloads: check the context menu actions
 def __currentItem(self):
 """
 Private method to get a reference to the current item.
 @return reference to the current item (DownloadItem)

Mercurial Repositories > eric / file comparison

comparison: WebBrowser/Download/DownloadManager.py

WebBrowser/Download/DownloadManager.py