diff -r 0a02c433f52d -r 5883ce99ee12 Helpviewer/Download/DownloadItem.py --- a/Helpviewer/Download/DownloadItem.py Fri Nov 01 15:48:48 2013 +0100 +++ b/Helpviewer/Download/DownloadItem.py Sun Nov 03 15:58:22 2013 +0100 @@ -226,7 +226,7 @@ self.__reply.close() self.on_stopButton_clicked() self.filenameLabel.setText( - self.trUtf8("Download canceled: {0}")\ + self.trUtf8("Download canceled: {0}") .format(QFileInfo(defaultFileName).fileName())) self.__canceledFileSelect = True return @@ -246,7 +246,7 @@ self.progressBar.setVisible(False) self.on_stopButton_clicked() self.infoLabel.setText(self.trUtf8( - "Download directory ({0}) couldn't be created.")\ + "Download directory ({0}) couldn't be created.") .format(saveDirPath.absolutePath())) return @@ -422,7 +422,7 @@ self.__getFileName() if not self.__output.open(QIODevice.WriteOnly): self.infoLabel.setText( - self.trUtf8("Error opening save file: {0}")\ + self.trUtf8("Error opening save file: {0}") .format(self.__output.errorString())) self.on_stopButton_clicked() self.statusChanged.emit() @@ -434,7 +434,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.trUtf8("Error saving: {0}") .format(self.__output.errorString())) self.on_stopButton_clicked() else: @@ -446,7 +446,7 @@ """ Private slot to handle a network error. """ - self.infoLabel.setText(self.trUtf8("Network Error: {0}")\ + self.infoLabel.setText(self.trUtf8("Network Error: {0}") .format(self.__reply.errorString())) self.tryAgainButton.setEnabled(True) self.tryAgainButton.setVisible(True) @@ -517,7 +517,7 @@ if self.bytesTotal() == -1: return -1.0 - timeRemaining = (self.bytesTotal() - + timeRemaining = (self.bytesTotal() - self.bytesReceived()) / self.currentSpeed() # ETA should never be 0 @@ -560,8 +560,8 @@ info = self.trUtf8("{0} of {1} ({2}/sec)\n{3}")\ .format( dataString(self.__bytesReceived), - bytesTotal == -1 and self.trUtf8("?") \ - or dataString(bytesTotal), + bytesTotal == -1 and self.trUtf8("?") + or dataString(bytesTotal), dataString(int(speed)), remaining) else: @@ -572,7 +572,7 @@ encoding="ascii"), str(self.__md5Hash.result().toHex(), encoding="ascii") - ) + ) else: info = self.trUtf8("{0} of {1} - Stopped")\ .format(dataString(self.__bytesReceived),