Mercurial Repositories > eric / file diff

--- a/Helpviewer/HelpBrowserWV.py	Sat Feb 04 19:03:49 2012 +0100
+++ b/Helpviewer/HelpBrowserWV.py	Sun Feb 05 16:22:37 2012 +0100
@@ -294,7 +294,7 @@
     
     def userAgent(self, resolveEmpty=False):
         """
-        Public method to get the current user agent setting.
+        Public method to get the global user agent setting.
         
         @param resolveEmpty flag indicating to resolve an empty
             user agent (boolean)
@@ -307,7 +307,7 @@
     
     def setUserAgent(self, agent):
         """
-        Public method to set the current user agent string.
+        Public method to set the global user agent string.
         
         @param agent new current user agent string (string)
         """
@@ -320,9 +320,13 @@
         @param url URL to determine user agent for (QUrl)
         @return user agent string (string)
         """
-        agent = Preferences.getHelp("UserAgent")
+        agent = Helpviewer.HelpWindow.HelpWindow.userAgentsManager().userAgentForUrl(url)
         if agent == "":
-            agent = QWebPage.userAgentForUrl(self, url)
+            # no agent string specified for the given host -> use global one
+            agent = Preferences.getHelp("UserAgent")
+            if agent == "":
+                # no global agent string specified -> use default one
+                agent = QWebPage.userAgentForUrl(self, url)
         return agent
     
     def __managerFinished(self, reply):
@@ -824,6 +828,7 @@
         
         @param evt reference to the context menu event object (QContextMenuEvent)
         """
+        from .UserAgent.UserAgentMenu import UserAgentMenu
         menu = QMenu(self)
         
         frameAtPos = self.page().frameAt(evt.pos())
@@ -925,6 +930,9 @@
         menu.addAction(UI.PixmapCache.getIcon("mailSend.png"),
             self.trUtf8("Send Page Link"), self.__sendLink).setData(self.url())
         menu.addSeparator()
+        self.__userAgentMenu = UserAgentMenu(self.trUtf8("User Agent"), url=self.url())
+        menu.addMenu(self.__userAgentMenu)
+        menu.addSeparator()
         menu.addAction(self.mw.backAct)
         menu.addAction(self.mw.forwardAct)
         menu.addAction(self.mw.homeAct)