Helpviewer/HelpWindow.py

branch
6_0_x
changeset 4330
2c278493b31e
parent 4329
399e14805a5c
child 4421
c6feadf410a4
equal deleted inserted replaced
4329:399e14805a5c 4330:2c278493b31e
2628 @param url URL to be shown (QUrl) 2628 @param url URL to be shown (QUrl)
2629 """ 2629 """
2630 if not self.__activating: 2630 if not self.__activating:
2631 self.__activating = True 2631 self.__activating = True
2632 req = QNetworkRequest(url) 2632 req = QNetworkRequest(url)
2633 req.setRawHeader("X-Eric6-UserLoadAction", b"1") 2633 req.setRawHeader(b"X-Eric6-UserLoadAction", b"1")
2634 self.currentBrowser().setSource( 2634 self.currentBrowser().setSource(
2635 None, (req, QNetworkAccessManager.GetOperation, b"")) 2635 None, (req, QNetworkAccessManager.GetOperation, b""))
2636 self.__activating = False 2636 self.__activating = False
2637 2637
2638 def __linksActivated(self, links, keyword): 2638 def __linksActivated(self, links, keyword):
3203 3203
3204 @param url url to be opened (QUrl) 3204 @param url url to be opened (QUrl)
3205 @param title title of the bookmark (string) 3205 @param title title of the bookmark (string)
3206 """ 3206 """
3207 req = QNetworkRequest(url) 3207 req = QNetworkRequest(url)
3208 req.setRawHeader("X-Eric6-UserLoadAction", b"1") 3208 req.setRawHeader(b"X-Eric6-UserLoadAction", b"1")
3209 self.newTab(None, (req, QNetworkAccessManager.GetOperation, b"")) 3209 self.newTab(None, (req, QNetworkAccessManager.GetOperation, b""))
3210 3210
3211 @classmethod 3211 @classmethod
3212 def historyManager(cls): 3212 def historyManager(cls):
3213 """ 3213 """
3678 fileData = fileData.replace("\n", "") 3678 fileData = fileData.replace("\n", "")
3679 userStyle += fileData 3679 userStyle += fileData
3680 except IOError: 3680 except IOError:
3681 pass 3681 pass
3682 3682
3683 encodedStyle = bytes(QByteArray(userStyle).toBase64()).decode() 3683 encodedStyle = bytes(QByteArray(userStyle.encode("utf-8")).toBase64())\
3684 .decode()
3684 dataString = "data:text/css;charset=utf-8;base64,{0}".format( 3685 dataString = "data:text/css;charset=utf-8;base64,{0}".format(
3685 encodedStyle) 3686 encodedStyle)
3686 3687
3687 return QUrl(dataString) 3688 return QUrl(dataString)
3688 3689

eric ide

mercurial