diff -r 9a21c547de5f -r a9a94491c4fd Helpviewer/Download/DownloadItem.py
--- a/Helpviewer/Download/DownloadItem.py Fri Jan 10 19:30:21 2014 +0100
+++ b/Helpviewer/Download/DownloadItem.py Sat Jan 11 11:55:33 2014 +0100
@@ -185,7 +185,7 @@
self.__reply.close()
self.on_stopButton_clicked()
self.filenameLabel.setText(
- self.trUtf8("Download canceled: {0}").format(
+ self.tr("Download canceled: {0}").format(
QFileInfo(defaultFileName).fileName()))
self.__canceledFileSelect = True
return
@@ -197,7 +197,7 @@
self.__reply.close()
self.on_stopButton_clicked()
self.filenameLabel.setText(
- self.trUtf8("VirusTotal scan scheduled: {0}").format(
+ self.tr("VirusTotal scan scheduled: {0}").format(
QFileInfo(defaultFileName).fileName()))
self.__canceledFileSelect = True
return
@@ -211,7 +211,7 @@
self.__gettingFileName = True
fileName = E5FileDialog.getSaveFileName(
None,
- self.trUtf8("Save File"),
+ self.tr("Save File"),
defaultFileName,
"")
self.__gettingFileName = False
@@ -220,7 +220,7 @@
self.__reply.close()
self.on_stopButton_clicked()
self.filenameLabel.setText(
- self.trUtf8("Download canceled: {0}")
+ self.tr("Download canceled: {0}")
.format(QFileInfo(defaultFileName).fileName()))
self.__canceledFileSelect = True
return
@@ -239,7 +239,7 @@
if not saveDirPath.mkpath(saveDirPath.absolutePath()):
self.progressBar.setVisible(False)
self.on_stopButton_clicked()
- self.infoLabel.setText(self.trUtf8(
+ self.infoLabel.setText(self.tr(
"Download directory ({0}) couldn't be created.")
.format(saveDirPath.absolutePath()))
return
@@ -417,7 +417,7 @@
self.__getFileName()
if not self.__output.open(QIODevice.WriteOnly):
self.infoLabel.setText(
- self.trUtf8("Error opening save file: {0}")
+ self.tr("Error opening save file: {0}")
.format(self.__output.errorString()))
self.on_stopButton_clicked()
self.statusChanged.emit()
@@ -429,7 +429,7 @@
self.__md5Hash.addData(buffer)
bytesWritten = self.__output.write(buffer)
if bytesWritten == -1:
- self.infoLabel.setText(self.trUtf8("Error saving: {0}")
+ self.infoLabel.setText(self.tr("Error saving: {0}")
.format(self.__output.errorString()))
self.on_stopButton_clicked()
else:
@@ -441,7 +441,7 @@
"""
Private slot to handle a network error.
"""
- self.infoLabel.setText(self.trUtf8("Network Error: {0}")
+ self.infoLabel.setText(self.tr("Network Error: {0}")
.format(self.__reply.errorString()))
self.tryAgainButton.setEnabled(True)
self.tryAgainButton.setVisible(True)
@@ -552,16 +552,16 @@
if bytesTotal > 0:
remaining = timeString(timeRemaining)
- info = self.trUtf8("{0} of {1} ({2}/sec)\n{3}")\
+ info = self.tr("{0} of {1} ({2}/sec)\n{3}")\
.format(
dataString(self.__bytesReceived),
- bytesTotal == -1 and self.trUtf8("?")
+ bytesTotal == -1 and self.tr("?")
or dataString(bytesTotal),
dataString(int(speed)),
remaining)
else:
if self.__bytesReceived == bytesTotal or bytesTotal == -1:
- info = self.trUtf8("{0} downloaded\nSHA1: {1}\nMD5: {2}")\
+ info = self.tr("{0} downloaded\nSHA1: {1}\nMD5: {2}")\
.format(dataString(self.__output.size()),
str(self.__sha1Hash.result().toHex(),
encoding="ascii"),
@@ -569,7 +569,7 @@
encoding="ascii")
)
else:
- info = self.trUtf8("{0} of {1} - Stopped")\
+ info = self.tr("{0} of {1} - Stopped")\
.format(dataString(self.__bytesReceived),
dataString(bytesTotal))
self.infoLabel.setText(info)
