Mercurial Repositories > eric / file diff

--- a/WebBrowser/WebBrowserWindow.py	Mon Mar 28 17:04:18 2016 +0200
+++ b/WebBrowser/WebBrowserWindow.py	Tue Mar 29 10:32:22 2016 +0200
@@ -93,7 +93,7 @@
     _adblockManager = None
     _downloadManager = None
     _feedsManager = None
-##    _userAgentsManager = None
+    _userAgentsManager = None
     _syncManager = None
     _speedDial = None
     _personalInformationManager = None
@@ -1592,21 +1592,20 @@
             self.siteInfoAct.triggered.connect(self.__showSiteinfoDialog)
         self.__actions.append(self.siteInfoAct)
         
-        # TODO: User Agents
-##        self.userAgentManagerAct = E5Action(
-##            self.tr('Manage User Agent Settings'),
-##            self.tr('Manage &User Agent Settings'),
-##            0, 0, self, 'webbrowser_user_agent_settings')
-##        self.userAgentManagerAct.setStatusTip(self.tr(
-##            'Shows a dialog to manage the User Agent settings'))
-##        self.userAgentManagerAct.setWhatsThis(self.tr(
-##            """<b>Manage User Agent Settings</b>"""
-##            """<p>Shows a dialog to manage the User Agent settings.</p>"""
-##        ))
-##        if not self.__initShortcutsOnly:
-##            self.userAgentManagerAct.triggered.connect(
-##                self.__showUserAgentsDialog)
-##        self.__actions.append(self.userAgentManagerAct)
+        self.userAgentManagerAct = E5Action(
+            self.tr('Manage User Agent Settings'),
+            self.tr('Manage &User Agent Settings'),
+            0, 0, self, 'webbrowser_user_agent_settings')
+        self.userAgentManagerAct.setStatusTip(self.tr(
+            'Shows a dialog to manage the User Agent settings'))
+        self.userAgentManagerAct.setWhatsThis(self.tr(
+            """<b>Manage User Agent Settings</b>"""
+            """<p>Shows a dialog to manage the User Agent settings.</p>"""
+        ))
+        if not self.__initShortcutsOnly:
+            self.userAgentManagerAct.triggered.connect(
+                self.__showUserAgentsDialog)
+        self.__actions.append(self.userAgentManagerAct)
         
         self.synchronizationAct = E5Action(
             self.tr('Synchronize data'),
@@ -1792,12 +1791,11 @@
         self.__settingsMenu.aboutToShow.connect(
             self.__aboutToShowSettingsMenu)
         
-        # TODO: UserAgents
-##        from .UserAgent.UserAgentMenu import UserAgentMenu
-##        self.__userAgentMenu = UserAgentMenu(self.tr("Global User Agent"))
-##        menu.addMenu(self.__userAgentMenu)
-##        menu.addAction(self.userAgentManagerAct)
-##        menu.addSeparator()
+        from .UserAgent.UserAgentMenu import UserAgentMenu
+        self.__userAgentMenu = UserAgentMenu(self.tr("Global User Agent"))
+        menu.addMenu(self.__userAgentMenu)
+        menu.addAction(self.userAgentManagerAct)
+        menu.addSeparator()
         
         if WebBrowserWindow.useQtHelp:
             menu.addAction(self.manageQtHelpDocsAct)
@@ -2414,9 +2412,8 @@
         
         self.adBlockManager().close()
         
-        # TODO: UserAgents
-##        self.userAgentsManager().close()
-##        
+        self.userAgentsManager().close()
+        
         self.speedDial().close()
         
         self.syncManager().close()
@@ -3682,29 +3679,28 @@
         self.__siteinfoDialog = SiteInfoDialog(self.currentBrowser(), self)
         self.__siteinfoDialog.show()
 
-    # TODO: User Agents
-##    @classmethod
-##    def userAgentsManager(cls):
-##        """
-##        Class method to get a reference to the user agents manager.
-##        
-##        @return reference to the user agents manager (UserAgentManager)
-##        """
-##        if cls._userAgentsManager is None:
-##            from .UserAgent.UserAgentManager import UserAgentManager
-##            cls._userAgentsManager = UserAgentManager()
-##        
-##        return cls._userAgentsManager
-##    
-##    def __showUserAgentsDialog(self):
-##        """
-##        Private slot to show the user agents management dialog.
-##        """
-##        from .UserAgent.UserAgentsDialog import UserAgentsDialog
-##        
-##        dlg = UserAgentsDialog(self)
-##        dlg.exec_()
-##    
+    @classmethod
+    def userAgentsManager(cls):
+        """
+        Class method to get a reference to the user agents manager.
+        
+        @return reference to the user agents manager (UserAgentManager)
+        """
+        if cls._userAgentsManager is None:
+            from .UserAgent.UserAgentManager import UserAgentManager
+            cls._userAgentsManager = UserAgentManager()
+        
+        return cls._userAgentsManager
+    
+    def __showUserAgentsDialog(self):
+        """
+        Private slot to show the user agents management dialog.
+        """
+        from .UserAgent.UserAgentsDialog import UserAgentsDialog
+        
+        dlg = UserAgentsDialog(self)
+        dlg.exec_()
+    
     @classmethod
     def syncManager(cls):
         """