diff -r 313e09453306 -r f32d7965a17e eric6/WebBrowser/Network/EricSchemeHandler.py
--- a/eric6/WebBrowser/Network/EricSchemeHandler.py Thu Sep 24 19:51:19 2020 +0200
+++ b/eric6/WebBrowser/Network/EricSchemeHandler.py Sat Sep 26 10:58:18 2020 +0200
@@ -7,14 +7,15 @@
Module implementing a scheme handler for the eric: scheme.
"""
-
from PyQt5.QtCore import (
pyqtSignal, QByteArray, QBuffer, QIODevice, QUrlQuery, QMutex, QMutexLocker
)
from PyQt5.QtWidgets import qApp
from PyQt5.QtWebEngineCore import QWebEngineUrlSchemeHandler
-from ..Tools.WebBrowserTools import readAllFileContents
+from ..Tools.WebBrowserTools import (
+ getHtmlPage, getJavascript, pixmapFileToDataUrl
+)
class EricSchemeHandler(QWebEngineUrlSchemeHandler):
@@ -163,12 +164,11 @@
message = self.tr(
"Blocked by rule: <i>{0} ({1})</i>").format(rule, subscription)
- # TODO: convert this to not use .qrc
- page = readAllFileContents(":/html/adblockPage.html")
+ page = getHtmlPage("adblockPage.html")
page = page.replace(
- "@FAVICON@", "qrc:icons/adBlockPlus16.png")
+ "@FAVICON@", pixmapFileToDataUrl("adBlockPlus16.png", True))
page = page.replace(
- "@IMAGE@", "qrc:icons/adBlockPlus64.png")
+ "@IMAGE@", pixmapFileToDataUrl("adBlockPlus64.png", True))
page = page.replace("@TITLE@", title)
page = page.replace("@MESSAGE@", message)
@@ -181,12 +181,13 @@
@return built Start page
@rtype str
"""
- # TODO: convert this to not use .qrc
- page = readAllFileContents(":/html/startPage.html")
- page = page.replace("@FAVICON@", "qrc:icons/ericWeb16.png")
- page = page.replace("@IMAGE@", "qrc:icons/ericWeb32.png")
- page = page.replace("@TITLE@",
- self.tr("Welcome to eric6 Web Browser!"))
+ page = getHtmlPage("startPage.html")
+ page = page.replace(
+ "@FAVICON@", pixmapFileToDataUrl("ericWeb16.png", True))
+ page = page.replace(
+ "@IMAGE@", pixmapFileToDataUrl("ericWeb32.png", True))
+ page = page.replace(
+ "@TITLE@", self.tr("Welcome to eric6 Web Browser!"))
page = page.replace("@ERIC_LINK@", self.tr("About eric6"))
page = page.replace("@HEADER_TITLE@", self.tr("eric6 Web Browser"))
page = page.replace("@SUBMIT@", self.tr("Search!"))
@@ -202,23 +203,31 @@
"""
Private method to create the Speeddial page.
- @return prepared speeddial page (QByteArray)
+ @return prepared speeddial page
+ @rtype str
"""
- # TODO: convert this to not use .qrc
if not self._speedDialPage:
- page = readAllFileContents(":/html/speeddialPage.html")
- page = page.replace("@FAVICON@", "qrc:icons/ericWeb16.png")
- page = page.replace("@IMG_PLUS@", "qrc:icons/plus.png")
- page = page.replace("@IMG_CLOSE@", "qrc:icons/close.png")
- page = page.replace("@IMG_EDIT@", "qrc:icons/edit.png")
- page = page.replace("@IMG_RELOAD@", "qrc:icons/reload.png")
- page = page.replace("@IMG_SETTINGS@", "qrc:icons/setting.png")
- page = page.replace("@LOADING-IMG@", "qrc:icons/loading.gif")
- page = page.replace("@BOX-BORDER@",
- "qrc:icons/box-border-small.png")
+ page = getHtmlPage("speeddialPage.html")
+ page = page.replace(
+ "@FAVICON@", pixmapFileToDataUrl("ericWeb16.png", True))
+ page = page.replace(
+ "@IMG_PLUS@", pixmapFileToDataUrl("plus.png", True))
+ page = page.replace(
+ "@IMG_CLOSE@", pixmapFileToDataUrl("close.png", True))
+ page = page.replace(
+ "@IMG_EDIT@", pixmapFileToDataUrl("edit.png", True))
+ page = page.replace(
+ "@IMG_RELOAD@", pixmapFileToDataUrl("reload.png", True))
+ page = page.replace(
+ "@IMG_SETTINGS@", pixmapFileToDataUrl("setting.png", True))
+ page = page.replace(
+ "@LOADING-IMG@", pixmapFileToDataUrl("loading.gif", True))
+ page = page.replace(
+ "@BOX-BORDER@",
+ pixmapFileToDataUrl("box-border-small.png", True))
- page = page.replace("@JQUERY@", "qrc:javascript/jquery.js")
- page = page.replace("@JQUERY-UI@", "qrc:javascript/jquery-ui.js")
+ page = page.replace("@JQUERY@", getJavascript("jquery.js"))
+ page = page.replace("@JQUERY-UI@", getJavascript("jquery-ui.js"))
page = page.replace("@SITE-TITLE@", self.tr("Speed Dial"))
page = page.replace("@URL@", self.tr("URL"))
