Mercurial Repositories > eric / file diff

--- a/WebBrowser/WebBrowserWindow.py	Fri Mar 11 19:49:18 2016 +0100
+++ b/WebBrowser/WebBrowserWindow.py	Sat Mar 12 16:49:36 2016 +0100
@@ -84,7 +84,7 @@
     
     _webProfile = None
     _networkManager = None
-##    _cookieJar = None
+    _cookieJar = None
 ##    _helpEngine = None
     _bookmarksManager = None
     _historyManager = None
@@ -1265,21 +1265,20 @@
                 self.__showAcceptedLanguages)
         self.__actions.append(self.acceptedLanguagesAct)
         
-        # TODO: Cookies
-##        self.cookiesAct = E5Action(
-##            self.tr('Cookies'),
-##            UI.PixmapCache.getIcon("cookie.png"),
-##            self.tr('C&ookies...'), 0, 0, self, 'webbrowser_cookies')
-##        self.cookiesAct.setStatusTip(self.tr(
-##            'Configure cookies handling'))
-##        self.cookiesAct.setWhatsThis(self.tr(
-##            """<b>Cookies</b>"""
-##            """<p>Configure cookies handling.</p>"""
-##        ))
-##        if not self.__initShortcutsOnly:
-##            self.cookiesAct.triggered.connect(
-##                self.__showCookiesConfiguration)
-##        self.__actions.append(self.cookiesAct)
+        self.cookiesAct = E5Action(
+            self.tr('Cookies'),
+            UI.PixmapCache.getIcon("cookie.png"),
+            self.tr('C&ookies...'), 0, 0, self, 'webbrowser_cookies')
+        self.cookiesAct.setStatusTip(self.tr(
+            'Configure cookies handling'))
+        self.cookiesAct.setWhatsThis(self.tr(
+            """<b>Cookies</b>"""
+            """<p>Configure cookies handling.</p>"""
+        ))
+        if not self.__initShortcutsOnly:
+            self.cookiesAct.triggered.connect(
+                self.__showCookiesConfiguration)
+        self.__actions.append(self.cookiesAct)
         
         self.flashCookiesAct = E5Action(
             self.tr('Flash Cookies'),
@@ -1898,7 +1897,7 @@
         menu.setTearOffEnabled(True)
         menu.addAction(self.prefAct)
         menu.addAction(self.acceptedLanguagesAct)
-##        menu.addAction(self.cookiesAct)
+        menu.addAction(self.cookiesAct)
         menu.addAction(self.flashCookiesAct)
 ##        menu.addAction(self.offlineStorageAct)
         menu.addAction(self.personalDataAct)
@@ -2048,7 +2047,7 @@
         settingstb.setIconSize(UI.Config.ToolBarIconSize)
         settingstb.addAction(self.prefAct)
         settingstb.addAction(self.acceptedLanguagesAct)
-##        settingstb.addAction(self.cookiesAct)
+        settingstb.addAction(self.cookiesAct)
         settingstb.addAction(self.flashCookiesAct)
 ##        settingstb.addAction(self.offlineStorageAct)
         settingstb.addAction(self.personalDataAct)
@@ -2545,9 +2544,8 @@
         # TODO: Network Monitor
 ##        self.__closeNetworkMonitor()
 ##        
-        # TODO: Cookies
-##        self.cookieJar().close()
-##        
+        self.cookieJar().close()
+        
         self.bookmarksToolBar.setModel(None)
         self.bookmarksManager().close()
         
@@ -2872,15 +2870,14 @@
         dlg.exec_()
         self.networkManager().languagesChanged()
     
-    # TODO: Cookies
-##    def __showCookiesConfiguration(self):
-##        """
-##        Private slot to configure the cookies handling.
-##        """
-##        from .CookieJar.CookiesConfigurationDialog import \
-##            CookiesConfigurationDialog
-##        dlg = CookiesConfigurationDialog(self)
-##        dlg.exec_()
+    def __showCookiesConfiguration(self):
+        """
+        Private slot to configure the cookies handling.
+        """
+        from .CookieJar.CookiesConfigurationDialog import \
+            CookiesConfigurationDialog
+        dlg = CookiesConfigurationDialog(self)
+        dlg.exec_()
     
     def __showFlashCookiesManagement(self):
         """
@@ -2941,18 +2938,19 @@
         
         return cls._networkManager
     
-    # TODO: Cookies
-##    @classmethod
-##    def cookieJar(cls):
-##        """
-##        Class method to get a reference to the cookie jar.
-##        
-##        @return reference to the cookie jar (CookieJar)
-##        """
-##            from .CookieJar.CookieJar import CookieJar
-##            cls._cookieJar = CookieJar()
-##        return cls.networkManager().cookieJar()
-##        
+    @classmethod
+    def cookieJar(cls):
+        """
+        Class method to get a reference to the cookie jar.
+        
+        @return reference to the cookie jar (CookieJar)
+        """
+        if cls._cookieJar is None:
+            from .CookieJar.CookieJar import CookieJar
+            cls._cookieJar = CookieJar()
+        
+        return cls._cookieJar
+        
     def __clearIconsDatabase(self):
         """
         Private slot to clear the favicons databse.
@@ -3348,9 +3346,8 @@
                 cachePath = self.webProfile().cachePath()
                 if cachePath:
                     shutil.rmtree(cachePath)
-            # TODO: Cookies
-##            if cookies:
-##                self.cookieJar().clear()
+            if cookies:
+                self.cookieJar().clear()
             if passwords:
                 self.passwordManager().clear()
             # TODO: Web Databases