diff -r 96232974dcdb -r 645c12de6b0c Helpviewer/UrlBar/UrlBar.py
--- a/Helpviewer/UrlBar/UrlBar.py Sun Mar 30 22:00:14 2014 +0200
+++ b/Helpviewer/UrlBar/UrlBar.py Thu Apr 03 23:05:31 2014 +0200
@@ -9,8 +9,8 @@
from __future__ import unicode_literals
try:
- str = unicode # __IGNORE_WARNING__
-except (NameError):
+ str = unicode
+except NameError:
pass
from PyQt4.QtCore import pyqtSlot, Qt, QPointF, QUrl, QDateTime, qVersion
@@ -47,8 +47,8 @@
@param parent reference to the parent widget (HelpBrowser)
"""
E5LineEdit.__init__(self, parent)
- self.setInactiveText(self.trUtf8("Enter the URL here."))
- self.setWhatsThis(self.trUtf8("Enter the URL here."))
+ self.setInactiveText(self.tr("Enter the URL here."))
+ self.setWhatsThis(self.tr("Enter the URL here."))
self.__mw = mainWindow
self.__browser = None
@@ -86,10 +86,10 @@
self.addWidget(self.__clearButton, E5LineEdit.RightSide)
self.__clearButton.setVisible(False)
- self.__bookmarkButton.clicked[()].connect(self.__showBookmarkInfo)
- self.__privacyButton.clicked[()].connect(self.__privacyClicked)
- self.__rssButton.clicked[()].connect(self.__rssClicked)
- self.__clearButton.clicked[()].connect(self.clear)
+ self.__bookmarkButton.clicked.connect(self.__showBookmarkInfo)
+ self.__privacyButton.clicked.connect(self.__privacyClicked)
+ self.__rssButton.clicked.connect(self.__rssClicked)
+ self.__clearButton.clicked.connect(self.clear)
self.__mw.privacyChanged.connect(self.__privacyButton.setVisible)
self.textChanged.connect(self.__textChanged)
@@ -204,7 +204,7 @@
if cn != "":
org = cn.split(".", 1)[1]
if org == "":
- org = self.trUtf8("Unknown")
+ org = self.tr("Unknown")
self.__sslLabel.setText(" {0} ".format(org))
self.__sslLabel.setVisible(True)
if qVersion() >= "5.0.0":
