Mercurial Repositories > eric / file diff

--- a/Helpviewer/Network/EricAccessHandler.py	Mon Sep 15 20:12:38 2014 +0200
+++ b/Helpviewer/Network/EricAccessHandler.py	Fri Sep 19 19:29:09 2014 +0200
@@ -11,6 +11,8 @@
 
 from PyQt4.QtCore import QFile, QByteArray
 
+import Utilities
+
 from .SchemeAccessHandler import SchemeAccessHandler
 
 
@@ -72,38 +74,39 @@
         if self._speedDialPage is None:
             htmlFile = QFile(":/html/speeddialPage.html")
             htmlFile.open(QFile.ReadOnly)
-            html = htmlFile.readAll()
-            
-            html.replace("@FAVICON@", "qrc:icons/ericWeb16.png")
-            html.replace("@IMG_PLUS@", "qrc:icons/plus.png")
-            html.replace("@IMG_CLOSE@", "qrc:icons/close.png")
-            html.replace("@IMG_EDIT@", "qrc:icons/edit.png")
-            html.replace("@IMG_RELOAD@", "qrc:icons/reload.png")
-            html.replace("@IMG_SETTINGS@", "qrc:icons/setting.png")
-            html.replace("@LOADING-IMG@", "qrc:icons/loading.gif")
-            html.replace("@BOX-BORDER@", "qrc:icons/box-border-small.png")
-            
-            html.replace("@JQUERY@", "qrc:javascript/jquery.js")
-            html.replace("@JQUERY-UI@", "qrc:javascript/jquery-ui.js")
+            html = bytes(htmlFile.readAll()).decode()
             
-            html.replace("@SITE-TITLE@", self.tr("Speed Dial"))
-            html.replace("@URL@", self.tr("URL"))
-            html.replace("@TITLE@", self.tr("Title"))
-            html.replace("@APPLY@", self.tr("Apply"))
-            html.replace("@NEW-PAGE@", self.tr("New Page"))
-            html.replace("@TITLE-EDIT@", self.tr("Edit"))
-            html.replace("@TITLE-REMOVE@", self.tr("Remove"))
-            html.replace("@TITLE-RELOAD@", self.tr("Reload"))
-            html.replace(
+            html = (html.replace("@FAVICON@", "qrc:icons/ericWeb16.png")
+                .replace("@IMG_PLUS@", "qrc:icons/plus.png")
+                .replace("@IMG_CLOSE@", "qrc:icons/close.png")
+                .replace("@IMG_EDIT@", "qrc:icons/edit.png")
+                .replace("@IMG_RELOAD@", "qrc:icons/reload.png")
+                .replace("@IMG_SETTINGS@", "qrc:icons/setting.png")
+                .replace("@LOADING-IMG@", "qrc:icons/loading.gif")
+                .replace("@BOX-BORDER@", "qrc:icons/box-border-small.png")
+                
+                .replace("@JQUERY@", "qrc:javascript/jquery.js")
+                .replace("@JQUERY-UI@", "qrc:javascript/jquery-ui.js")
+                
+                .replace("@SITE-TITLE@", self.tr("Speed Dial"))
+                .replace("@URL@", self.tr("URL"))
+                .replace("@TITLE@", self.tr("Title"))
+                .replace("@APPLY@", self.tr("Apply"))
+                .replace("@NEW-PAGE@", self.tr("New Page"))
+                .replace("@TITLE-EDIT@", self.tr("Edit"))
+                .replace("@TITLE-REMOVE@", self.tr("Remove"))
+                .replace("@TITLE-RELOAD@", self.tr("Reload"))
+                .replace(
                 "@TITLE-FETCHTITLE@", self.tr("Load title from page"))
-            html.replace(
+                .replace(
                 "@SETTINGS-TITLE@", self.tr("Speed Dial Settings"))
-            html.replace("@ADD-TITLE@", self.tr("Add New Page"))
-            html.replace(
+                .replace("@ADD-TITLE@", self.tr("Add New Page"))
+                .replace(
                 "@TXT_NRROWS@", self.tr("Maximum pages in a row:"))
-            html.replace("@TXT_SDSIZE@", self.tr("Change size of pages:"))
+                .replace("@TXT_SDSIZE@", self.tr("Change size of pages:"))
+            )
             
-            self._speedDialPage = html
+            self._speedDialPage = Utilities.html_uencode(html)
         
         import Helpviewer.HelpWindow
         html = QByteArray(self._speedDialPage)