diff -r e97af1181efd -r e16573640cb8 WebBrowser/Network/QtHelpSchemeHandler.py --- a/WebBrowser/Network/QtHelpSchemeHandler.py Sat Apr 02 19:44:09 2016 +0200 +++ b/WebBrowser/Network/QtHelpSchemeHandler.py Sun Apr 03 16:22:18 2016 +0200 @@ -16,10 +16,6 @@ from PyQt5.QtWebEngineCore import QWebEngineUrlSchemeHandler, \ QWebEngineUrlRequestJob -##from .SchemeAccessHandler import SchemeAccessHandler -## -##from .NetworkReply import NetworkReply -## QtDocPath = "qthelp://org.qt-project." ExtensionMap = { @@ -206,78 +202,3 @@ @rtype bytes """ return self.__mimeType.encode("utf-8") -## -## -## -## -## -##class QtHelpAccessHandler(SchemeAccessHandler): -## """ -## Class implementing a scheme access handler for QtHelp. -## """ -## def __init__(self, engine, parent=None): -## """ -## Constructor -## -## @param engine reference to the help engine (QHelpEngine) -## @param parent reference to the parent object (QObject) -## """ -## SchemeAccessHandler.__init__(self, parent) -## -## self.__engine = engine -## -## def __mimeFromUrl(self, url): -## """ -## Private method to guess the mime type given an URL. -## -## @param url URL to guess the mime type from (QUrl) -## @return mime type for the given URL (string) -## """ -## path = url.path() -## ext = os.path.splitext(path)[1].lower() -## if ext in ExtensionMap: -## return ExtensionMap[ext] -## else: -## return "application/octet-stream" -## -## def createRequest(self, op, request, outgoingData=None): -## """ -## Public method to create a request. -## -## @param op the operation to be performed -## (QNetworkAccessManager.Operation) -## @param request reference to the request object (QNetworkRequest) -## @param outgoingData reference to an IODevice containing data to be sent -## (QIODevice) -## @return reference to the created reply object (QNetworkReply) -## """ -## url = request.url() -## strUrl = url.toString() -## -## # For some reason the url to load is already wrong (passed from webkit) -## # though the css file and the references inside should work that way. -## # One possible problem might be that the css is loaded at the same -## # level as the html, thus a path inside the css like -## # (../images/foo.png) might cd out of the virtual folder -## if not self.__engine.findFile(url).isValid(): -## if strUrl.startswith(QtDocPath): -## newUrl = request.url() -## if not newUrl.path().startswith("/qdoc/"): -## newUrl.setPath("qdoc" + newUrl.path()) -## url = newUrl -## strUrl = url.toString() -## -## mimeType = mimetypes.guess_type(strUrl)[0] -## if mimeType is None: -## # do our own (limited) guessing -## mimeType = self.__mimeFromUrl(url) -## -## if self.__engine.findFile(url).isValid(): -## data = self.__engine.fileData(url) -## else: -## data = QByteArray(self.tr( -## """<title>Error 404...</title>""" -## """<div align="center"><br><br>""" -## """<h1>The page could not be found</h1><br>""" -## """<h3>'{0}'</h3></div>""").format(strUrl).encode("utf-8")) -## return NetworkReply(request, data, mimeType, self.parent())