Mercurial Repositories > eric / file diff

--- a/WebBrowser/UrlBar/UrlBar.py	Sat Feb 06 17:43:59 2016 +0100
+++ b/WebBrowser/UrlBar/UrlBar.py	Sun Feb 07 18:08:48 2016 +0100
@@ -27,7 +27,7 @@
 
 import WebBrowser.WebBrowserWindow
 
-##from .FavIconLabel import FavIconLabel
+from .FavIconLabel import FavIconLabel
 ##from .SslLabel import SslLabel
 ##
 import UI.PixmapCache
@@ -60,9 +60,8 @@
 ##        self.__bmInactiveIcon = QIcon(
 ##            self.__bmActiveIcon.pixmap(16, 16, QIcon.Disabled))
         
-        # TODO: FavIcon
-##        self.__favicon = FavIconLabel(self)
-##        self.addWidget(self.__favicon, E5LineEdit.LeftSide)
+        self.__favicon = FavIconLabel(self)
+        self.addWidget(self.__favicon, E5LineEdit.LeftSide)
         
         # TODO: SSL
 ##        self.__sslLabel = SslLabel(self)
@@ -120,8 +119,7 @@
         @param browser reference to the browser widget (WebBrowserView)
         """
         self.__browser = browser
-        # TODO: FavIcon
-##        self.__favicon.setBrowser(browser)
+        self.__favicon.setBrowser(browser)
         
         self.__browser.urlChanged.connect(self.__browserUrlChanged)
         self.__browser.loadProgress.connect(self.update)