WebBrowser/Download/DownloadManager.py

changeset 6085
7e48a0d98cce
parent 6048
82ad8ec9548c
child 6091
7b989321d74c
--- a/WebBrowser/Download/DownloadManager.py	Wed Jan 24 12:37:53 2018 +0100
+++ b/WebBrowser/Download/DownloadManager.py	Wed Jan 24 18:45:50 2018 +0100
@@ -125,8 +125,7 @@
         """
         Public method to stop the download manager.
         """
-        self.__saveTimer.changeOccurred()
-        self.__saveTimer.saveIfNeccessary()
+        self.save()
         self.close()
     
     def activeDownloads(self):
@@ -339,20 +338,31 @@
         pos = Preferences.getWebBrowser("DownloadManagerPosition")
         self.move(pos)
         
-        downloads = Preferences.getWebBrowser("DownloadManagerDownloads")
-        for download in downloads:
-            if not download[0].isEmpty() and \
-               download[1] != "":
-                from .DownloadItem import DownloadItem
-                itm = DownloadItem(parent=self)
-                itm.setData(download)
-                self.__addItem(itm, append=True)
-        self.cleanupButton.setEnabled(
-            (len(self.__downloads) - self.activeDownloads()) > 0)
+        from WebBrowser.WebBrowserWindow import WebBrowserWindow
+        if not WebBrowserWindow.isPrivate():
+            downloads = Preferences.getWebBrowser("DownloadManagerDownloads")
+            for download in downloads:
+                if not download[0].isEmpty() and \
+                   download[1] != "":
+                    from .DownloadItem import DownloadItem
+                    itm = DownloadItem(parent=self)
+                    itm.setData(download)
+                    self.__addItem(itm, append=True)
+            self.cleanupButton.setEnabled(
+                (len(self.__downloads) - self.activeDownloads()) > 0)
         
         self.__loaded = True
         self.__updateActiveItemCount()
     
+    def closeEvent(self, evt):
+        """
+        Protected event handler for the close event.
+        
+        @param evt reference to the close event
+        @type QCloseEvent
+        """
+        self.save()
+    
     def cleanup(self):
         """
         Public slot to cleanup the downloads.

eric ide

mercurial