diff -r 863114db258e -r b248526d3a1b Helpviewer/Network/PyrcAccessHandler.py
--- a/Helpviewer/Network/PyrcAccessHandler.py Thu Feb 23 16:48:19 2012 +0100
+++ b/Helpviewer/Network/PyrcAccessHandler.py Thu Feb 23 20:03:58 2012 +0100
@@ -7,17 +7,13 @@
Module implementing a scheme access handler for Python resources.
"""
-from PyQt4.QtCore import QBuffer, QIODevice, QByteArray
-
-from Helpviewer.HTMLResources import startPage_html
+from PyQt4.QtCore import QFile
from .SchemeAccessHandler import SchemeAccessHandler
from .NetworkReply import NetworkReply
from .NetworkProtocolUnknownErrorReply import NetworkProtocolUnknownErrorReply
-import UI.PixmapCache
-
class PyrcAccessHandler(SchemeAccessHandler):
"""
@@ -33,20 +29,12 @@
(QIODevice)
@return reference to the created reply object (QNetworkReply)
"""
- if request.url().toString() == "pyrc:home":
- html = startPage_html
- pixmap = UI.PixmapCache.getPixmap("ericWeb32.png")
- imageBuffer = QBuffer()
- imageBuffer.open(QIODevice.ReadWrite)
- if pixmap.save(imageBuffer, "PNG"):
- html = html.replace("@IMAGE@",
- str(imageBuffer.buffer().toBase64(), encoding="ascii"))
- pixmap = UI.PixmapCache.getPixmap("ericWeb16.png")
- imageBuffer = QBuffer()
- imageBuffer.open(QIODevice.ReadWrite)
- if pixmap.save(imageBuffer, "PNG"):
- html = html.replace("@FAVICON@",
- str(imageBuffer.buffer().toBase64(), encoding="ascii"))
- return NetworkReply(request, QByteArray(html), "text/html", self.parent())
+ if request.url().toString() == "eric:home":
+ htmlFile = QFile(":/html/startPage.html")
+ htmlFile.open(QFile.ReadOnly)
+ html = htmlFile.readAll()
+ html = html.replace("@IMAGE@", "qrc:icons/ericWeb32.png")
+ html = html.replace("@FAVICON@", "qrc:icons/ericWeb16.png")
+ return NetworkReply(request, html, "text/html", self.parent())
- return NetworkProtocolUnknownErrorReply("pyrc", self.parent())
+ return NetworkProtocolUnknownErrorReply("eric", self.parent())
