Mercurial Repositories > eric / changeset

--- a/eric6/Documentation/Source/eric6.WebBrowser.Tools.WebIconProvider.html	Mon May 11 18:30:25 2020 +0200
+++ b/eric6/Documentation/Source/eric6.WebBrowser.Tools.WebIconProvider.html	Tue May 12 17:22:50 2020 +0200
@@ -106,11 +106,11 @@
 </tr>
 <tr>
 <td><a href="#WebIconProvider.load">load</a></td>
-<td>Public method to load the bookmarks.</td>
+<td>Public method to load the web site icons.</td>
 </tr>
 <tr>
 <td><a href="#WebIconProvider.save">save</a></td>
-<td>Public method to save the zoom values.</td>
+<td>Public method to save the web site icons.</td>
 </tr>
 <tr>
 <td><a href="#WebIconProvider.saveIcon">saveIcon</a></td>
@@ -235,14 +235,14 @@
 <b>load</b>(<i></i>)
 
 <p>
-        Public method to load the bookmarks.
+        Public method to load the web site icons.
 </p>
 <a NAME="WebIconProvider.save" ID="WebIconProvider.save"></a>
 <h4>WebIconProvider.save</h4>
 <b>save</b>(<i></i>)
 
 <p>
-        Public method to save the zoom values.
+        Public method to save the web site icons.
 </p>
 <a NAME="WebIconProvider.saveIcon" ID="WebIconProvider.saveIcon"></a>
 <h4>WebIconProvider.saveIcon</h4>

--- a/eric6/WebBrowser/Tools/WebIconProvider.py	Mon May 11 18:30:25 2020 +0200
+++ b/eric6/WebBrowser/Tools/WebIconProvider.py	Tue May 12 17:22:50 2020 +0200
@@ -80,7 +80,7 @@
     
     def load(self):
         """
-        Public method to load the bookmarks.
+        Public method to load the web site icons.
         """
         if self.__loaded:
             return
@@ -105,7 +105,7 @@
     
     def save(self):
         """
-        Public method to save the zoom values.
+        Public method to save the web site icons.
         """
         if not self.__loaded:
             return
@@ -161,7 +161,7 @@
         @rtype str
         """
         return url.toString(QUrl.PrettyDecoded | QUrl.RemoveUserInfo |
-                            QUrl.RemoveFragment)
+                            QUrl.RemoveFragment| QUrl.RemovePath)
     
     def iconForUrl(self, url):
         """
@@ -187,18 +187,24 @@
         self.load()
         
         urlStr = self.__urlToString(url)
-        for iconUrlStr in self.__iconsDB:
-            if iconUrlStr.startswith(urlStr):
-                return self.__iconsDB[iconUrlStr]
+        if urlStr in self.__iconsDB:
+            return self.__iconsDB[urlStr]
+        else:
+            for iconUrlStr in self.__iconsDB:
+                if iconUrlStr.startswith(urlStr):
+                    return self.__iconsDB[iconUrlStr]
         
         # try replacing http scheme with https scheme
         url = QUrl(url)
         if url.scheme() == "http":
             url.setScheme("https")
-        urlStr = self.__urlToString(url)
-        for iconUrlStr in self.__iconsDB:
-            if iconUrlStr.startswith(urlStr):
-                return self.__iconsDB[iconUrlStr]
+            urlStr = self.__urlToString(url)
+            if urlStr in self.__iconsDB:
+                return self.__iconsDB[urlStr]
+            else:
+                for iconUrlStr in self.__iconsDB:
+                    if iconUrlStr.startswith(urlStr):
+                        return self.__iconsDB[iconUrlStr]
         
         if scheme == "https":
             return UI.PixmapCache.getIcon("securityHigh32")