eric: comparison Helpviewer/HelpBrowserWV.py

-:863114db258e
+:b248526d3a1b
 """
 Module implementing the helpbrowser using QWebView.
 """
 from PyQt4.QtCore import pyqtSlot, pyqtSignal, QObject, QT_TRANSLATE_NOOP, QUrl, \
-QBuffer, QIODevice, QByteArray, QFileInfo, Qt, QTimer, QEvent, QRect
+QBuffer, QIODevice, QFileInfo, Qt, QTimer, QEvent, QRect, QFile
 from PyQt4.QtGui import qApp, QDesktopServices, QStyle, QMenu, QApplication, \
 QInputDialog, QLineEdit, QClipboard, QMouseEvent, QLabel, QToolTip, QColor, \
 QPalette, QFrame, QPrinter, QPrintDialog, QDialog
 from PyQt4 import QtWebKit
 from PyQt4.QtWebKit import QWebView, QWebPage, QWebSettings
 import Preferences
 import UI.PixmapCache
 from .Bookmarks.AddBookmarkDialog import AddBookmarkDialog
 from .JavaScriptResources import fetchLinks_js
-from .HTMLResources import notFoundPage_html, adblockPage_html
 try:
 from .SslInfoDialog import SslInfoDialog
 from PyQt4.QtNetwork import QSslCertificate
 SSL_AVAILABLE = True
 except ImportError:
 element.setAttribute("style", "display:none;")
 return False
 else:
 # the whole page is blocked
 rule = info.errorString.replace("AdBlockRule:", "")
-html = adblockPage_html
 title = self.trUtf8("Content blocked by AdBlock Plus")
-pixmap = UI.PixmapCache.getPixmap("adBlockPlus16.png")
+message = self.trUtf8("Blocked by rule: <i>{0}</i>").format(rule)
-imageBuffer = QBuffer()
-imageBuffer.open(QIODevice.ReadWrite)
+htmlFile = QFile(":/html/adblockPage.html")
-if pixmap.save(imageBuffer, "PNG"):
+htmlFile.open(QFile.ReadOnly)
-html = html.replace("@FAVICON@",
+html = htmlFile.readAll()
-str(imageBuffer.buffer().toBase64(),
+html = html.replace("@FAVICON@", "qrc:icons/adBlockPlus16.png")
-encoding="ascii"))
+html = html.replace("@IMAGE@", "qrc:icons/adBlockPlus64.png")
-pixmap = UI.PixmapCache.getPixmap("adBlockPlus64.png")
+html = html.replace("@TITLE@", title.encode("utf8"))
-imageBuffer = QBuffer()
+html = html.replace("@MESSAGE@", message.encode("utf8"))
-imageBuffer.open(QIODevice.ReadWrite)
+errorPage.content = html
-if pixmap.save(imageBuffer, "PNG"):
-html = html.replace("@IMAGE@",
-str(imageBuffer.buffer().toBase64(),
-encoding="ascii"))
-errorPage.content = QByteArray(html.format(
-title,
-self.trUtf8("Blocked by rule: <i>{0}</i>").format(rule)
-).encode("utf8"))
 return True
-html = notFoundPage_html
 title = self.trUtf8("Error loading page: {0}").format(urlString)
+htmlFile = QFile(":/html/notFoundPage.html")
+htmlFile.open(QFile.ReadOnly)
+html = htmlFile.readAll()
 pixmap = qApp.style()\
 .standardIcon(QStyle.SP_MessageBoxWarning, None, self.parent())\
 .pixmap(48, 48)
 imageBuffer = QBuffer()
 imageBuffer.open(QIODevice.ReadWrite)
 if pixmap.save(imageBuffer, "PNG"):
-html = html.replace("@IMAGE@",
+html = html.replace("@IMAGE@", imageBuffer.buffer().toBase64())
-str(imageBuffer.buffer().toBase64(), encoding="ascii"))
 pixmap = qApp.style()\
 .standardIcon(QStyle.SP_MessageBoxWarning, None, self.parent())\
 .pixmap(16, 16)
 imageBuffer = QBuffer()
 imageBuffer.open(QIODevice.ReadWrite)
 if pixmap.save(imageBuffer, "PNG"):
-html = html.replace("@FAVICON@",
+html = html.replace("@FAVICON@", imageBuffer.buffer().toBase64())
-str(imageBuffer.buffer().toBase64(), encoding="ascii"))
+html = html.replace("@TITLE@", title.encode("utf8"))
-errorPage.content = QByteArray(html.format(
+html = html.replace("@H1@", info.errorString.encode("utf8"))
-title,
+html = html.replace("@H2@", self.trUtf8("When connecting to: {0}.")\
-info.errorString,
+.format(urlString).encode("utf8"))
-self.trUtf8("When connecting to: {0}.").format(urlString),
+html = html.replace("@LI-1@",
 self.trUtf8("Check the address for errors such as "
 "<b>ww</b>.example.org instead of "
-"<b>www</b>.example.org"),
+"<b>www</b>.example.org").encode("utf8"))
+html = html.replace("@LI-2@",
 self.trUtf8("If the address is correct, try checking the network "
-"connection."),
+"connection.").encode("utf8"))
+html = html.replace("@LI-3@",
 self.trUtf8("If your computer or network is protected by a firewall "
 "or proxy, make sure that the browser is permitted to "
-"access the network."),
+"access the network.").encode("utf8"))
+html = html.replace("@LI-4@",
 self.trUtf8("If your cache policy is set to offline browsing,"
-"only pages in the local cache are available."),
+"only pages in the local cache are available.")\
-self.trUtf8("Try Again")
+.encode("utf8"))
-).encode("utf8"))
+html = html.replace("@BUTTON@", self.trUtf8("Try Again").encode("utf8"))
+errorPage.content = html
 return True
 except AttributeError:
 pass
 return QWebPage.extension(self, extension, option, output)
 if frame is None:
 # called from QWebFrame.javaScriptWindowObjectCleared
 frame = self.sender()
 if isinstance(frame, HelpWebPage):
 frame = frame.mainFrame()
-if frame.url().scheme() == "pyrc" and frame.url().path() == "home":
+if frame.url().scheme() == "eric" and frame.url().path() == "home":
 if self.__javaScriptEricObject is None:
 self.__javaScriptEricObject = JavaScriptEricObject(self.mw, self)
 frame.addToJavaScriptWindowObject("eric", self.__javaScriptEricObject)
 else:
 # called from QWebPage.frameCreated
 def __currentEngineChanged(self):
 """
 Private slot to track a change of the current search engine.
 """
-if self.url().toString() == "pyrc:home":
+if self.url().toString() == "eric:home":
 self.reload()
 def setSource(self, name):
 """
 Public method used to set the source to be displayed.
 data = reply.readAll()
 if contentSniff(data):
 notFoundFrame.setHtml(str(data, encoding="utf-8"), replyUrl)
 return
-html = notFoundPage_html
 urlString = bytes(replyUrl.toEncoded()).decode()
 title = self.trUtf8("Error loading page: {0}").format(urlString)
+htmlFile = QFile(":/html/notFoundPage.html")
+htmlFile.open(QFile.ReadOnly)
+html = htmlFile.readAll()
 pixmap = qApp.style()\
-.standardIcon(QStyle.SP_MessageBoxWarning, None, self)\
+.standardIcon(QStyle.SP_MessageBoxWarning, None, self.parent())\
-.pixmap(32, 32)
+.pixmap(48, 48)
 imageBuffer = QBuffer()
 imageBuffer.open(QIODevice.ReadWrite)
 if pixmap.save(imageBuffer, "PNG"):
-html = html.replace("IMAGE_BINARY_DATA_HERE",
+html = html.replace("@IMAGE@", imageBuffer.buffer().toBase64())
-str(imageBuffer.buffer().toBase64(), encoding="ascii"))
+pixmap = qApp.style()\
-html = html.format(
+.standardIcon(QStyle.SP_MessageBoxWarning, None, self.parent())\
-title,
+.pixmap(16, 16)
-reply.errorString(),
+imageBuffer = QBuffer()
-self.trUtf8("When connecting to: {0}.").format(urlString),
+imageBuffer.open(QIODevice.ReadWrite)
-self.trUtf8("Check the address for errors such as <b>ww</b>.example.org "
+if pixmap.save(imageBuffer, "PNG"):
-"instead of <b>www</b>.example.org"),
+html = html.replace("@FAVICON@", imageBuffer.buffer().toBase64())
+html = html.replace("@TITLE@", title.encode("utf8"))
+html = html.replace("@H1@", reply.errorString().encode("utf8"))
+html = html.replace("@H2@", self.trUtf8("When connecting to: {0}.")\
+.format(urlString).encode("utf8"))
+html = html.replace("@LI-1@",
+self.trUtf8("Check the address for errors such as "
+"<b>ww</b>.example.org instead of "
+"<b>www</b>.example.org").encode("utf8"))
+html = html.replace("@LI-2@",
 self.trUtf8("If the address is correct, try checking the network "
-"connection."),
+"connection.").encode("utf8"))
-self.trUtf8("If your computer or network is protected by a firewall or "
+html = html.replace("@LI-3@",
-"proxy, make sure that the browser is permitted to access "
+self.trUtf8("If your computer or network is protected by a firewall "
-"the network."),
+"or proxy, make sure that the browser is permitted to "
+"access the network.").encode("utf8"))
+html = html.replace("@LI-4@",
 self.trUtf8("If your cache policy is set to offline browsing,"
-"only pages in the local cache are available."),
+"only pages in the local cache are available.")\
-self.trUtf8("Try Again")
+.encode("utf8"))
-)
+html = html.replace("@BUTTON@", self.trUtf8("Try Again").encode("utf8"))
-notFoundFrame.setHtml(html, replyUrl)
+notFoundFrame.setHtml(bytes(html).decode("utf8"), replyUrl)
 self.mw.historyManager().removeHistoryEntry(replyUrl, self.title())
 self.loadFinished.emit(False)
 def __downloadRequested(self, request):
 """

Mercurial Repositories > eric / file comparison

comparison: Helpviewer/HelpBrowserWV.py

Helpviewer/HelpBrowserWV.py