diff -r 313e09453306 -r f32d7965a17e eric6/WebBrowser/SpeedDial/SpeedDial.py
--- a/eric6/WebBrowser/SpeedDial/SpeedDial.py Thu Sep 24 19:51:19 2020 +0200
+++ b/eric6/WebBrowser/SpeedDial/SpeedDial.py Sat Sep 26 10:58:18 2020 +0200
@@ -14,11 +14,10 @@
pyqtSignal, pyqtSlot, QObject, QCryptographicHash, QByteArray, QUrl,
qWarning
)
-from PyQt5.QtGui import QPixmap
from E5Gui import E5MessageBox
-from ..Tools.WebBrowserTools import pixmapToDataUrl
+from ..Tools.WebBrowserTools import pixmapFileToDataUrl
from Utilities.AutoSaver import AutoSaver
import Utilities
@@ -119,18 +118,17 @@
for page in self.__webPages:
if page.broken:
- imgSource = "qrc:icons/brokenPage.png"
+ imgSource = pixmapFileToDataUrl("brokenPage.png", True)
else:
imgSource = self.__imageFileName(page.url)
if not os.path.exists(imgSource):
self.loadThumbnail(page.url, False)
- imgSource = "qrc:icons/loading.gif"
+ imgSource = pixmapFileToDataUrl("loading.gif", True)
if not page.url:
imgSource = ""
else:
- imgSource = pixmapToDataUrl(
- QPixmap(imgSource)).toString()
+ imgSource = pixmapFileToDataUrl(imgSource, True)
self.__initialScript += (
"addBox('{0}', '{1}', '{2}');\n").format(
@@ -400,7 +398,7 @@
fileName = self.__imageFileName(url)
if image.isNull():
- fileName = "qrc:icons/brokenPage.png"
+ fileName = "brokenPage.png"
title = self.tr("Unable to load")
page = self.pageForUrl(thumbnailer.url())
page.broken = True
@@ -418,7 +416,7 @@
self.pageTitleLoaded.emit(url, title)
self.thumbnailLoaded.emit(
- url, pixmapToDataUrl(QPixmap(fileName)).toString())
+ url, pixmapFileToDataUrl(fileName, True))
def __escapeTitle(self, title):
"""
