diff -r 96232974dcdb -r 645c12de6b0c Helpviewer/UserAgent/UserAgentMenu.py
--- a/Helpviewer/UserAgent/UserAgentMenu.py Sun Mar 30 22:00:14 2014 +0200
+++ b/Helpviewer/UserAgent/UserAgentMenu.py Thu Apr 03 23:05:31 2014 +0200
@@ -51,9 +51,9 @@
# add default action
self.__defaultUserAgent = QAction(self)
- self.__defaultUserAgent.setText(self.trUtf8("Default"))
+ self.__defaultUserAgent.setText(self.tr("Default"))
self.__defaultUserAgent.setCheckable(True)
- self.__defaultUserAgent.triggered[()].connect(
+ self.__defaultUserAgent.triggered.connect(
self.__switchToDefaultUserAgent)
if self.__url:
self.__defaultUserAgent.setChecked(
@@ -71,9 +71,9 @@
# add other action
self.addSeparator()
self.__otherUserAgent = QAction(self)
- self.__otherUserAgent.setText(self.trUtf8("Other..."))
+ self.__otherUserAgent.setText(self.tr("Other..."))
self.__otherUserAgent.setCheckable(True)
- self.__otherUserAgent.triggered[()].connect(
+ self.__otherUserAgent.triggered.connect(
self.__switchToOtherUserAgent)
self.addAction(self.__otherUserAgent)
self.__actionGroup.addAction(self.__otherUserAgent)
@@ -96,8 +96,8 @@
from Helpviewer.HelpBrowserWV import HelpWebPage
userAgent, ok = QInputDialog.getText(
self,
- self.trUtf8("Custom user agent"),
- self.trUtf8("User agent:"),
+ self.tr("Custom user agent"),
+ self.tr("User agent:"),
QLineEdit.Normal,
HelpWebPage().userAgent(resolveEmpty=True))
if ok:
@@ -156,7 +156,7 @@
act.setToolTip(userAgent)
act.setCheckable(True)
act.setChecked(userAgent == currentUserAgentString)
- act.triggered[()].connect(self.__changeUserAgent)
+ act.triggered.connect(self.__changeUserAgent)
if menuStack:
menuStack[-1].addAction(act)
else:
@@ -168,7 +168,7 @@
attributes = xml.attributes()
title = attributes.value("title")
if title == "v_a_r_i_o_u_s":
- title = self.trUtf8("Various")
+ title = self.tr("Various")
menu = QMenu(self)
menu.setTitle(title)
@@ -181,8 +181,8 @@
if xml.hasError():
E5MessageBox.critical(
self,
- self.trUtf8("Parsing default user agents"),
- self.trUtf8(
+ self.tr("Parsing default user agents"),
+ self.tr(
"""<p>Error parsing default user agents.</p><p>{0}</p>""")
.format(xml.errorString()))
