Bitmessage/PyBitmessage-2024-12-13
Archived
2
0
Fork 0
Code Issues 168 Pull Requests 53 Actions Packages Projects Releases 5 Wiki Activity

Runnable with both Python3 and Python2, with both PyQt5 and PyQt4 by using Qt.py #2250

Open
kashikoibumi wants to merge 127 commits from kashikoibumi/py3qt into v0.6
pull from: kashikoibumi/py3qt
merge into: Bitmessage:v0.6
Conversation 2 Commits 127 Files Changed 179 +9 -6
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 5f4b67a61e - Show all commits

10
src/bitmessageqt/uisignaler.py
View File

@ -14,8 +14,9 @@ class UISignaler(QtCore.QThread):
updateStatusBar = QtCore.Signal(object) updateStatusBar = QtCore.Signal(object)
updateSentItemStatusByToAddress = QtCore.Signal(object, str) updateSentItemStatusByToAddress = QtCore.Signal(object, str)
updateSentItemStatusByAckdata = QtCore.Signal(object, str) updateSentItemStatusByAckdata = QtCore.Signal(object, str)
displayNewInboxMessage = QtCore.Signal(object, str, str, object, str) displayNewInboxMessage = QtCore.Signal(object, str, object, object, str)
displayNewSentMessage = QtCore.Signal(object, str, str, str, object, str) displayNewSentMessage = QtCore.Signal(
object, str, str, object, object, str)
updateNetworkStatusTab = QtCore.Signal(bool, bool, Peer) updateNetworkStatusTab = QtCore.Signal(bool, bool, Peer)
updateNumberOfMessagesProcessed = QtCore.Signal() updateNumberOfMessagesProcessed = QtCore.Signal()
updateNumberOfPubkeysProcessed = QtCore.Signal() updateNumberOfPubkeysProcessed = QtCore.Signal()
@ -54,14 +55,15 @@ class UISignaler(QtCore.QThread):
self.updateSentItemStatusByAckdata.emit(ackData, message) self.updateSentItemStatusByAckdata.emit(ackData, message)
elif command == 'displayNewInboxMessage': elif command == 'displayNewInboxMessage':
inventoryHash, toAddress, fromAddress, subject, body = data inventoryHash, toAddress, fromAddress, subject, body = data
self.displayNewInboxMessage.emit( self.displayNewInboxMessage.emit(
inventoryHash, toAddress, fromAddress, inventoryHash, toAddress, fromAddress,
unicode(subject, 'utf-8'), body) subject, body)
elif command == 'displayNewSentMessage': elif command == 'displayNewSentMessage':
toAddress, fromLabel, fromAddress, subject, message, ackdata = data toAddress, fromLabel, fromAddress, subject, message, ackdata = data
self.displayNewSentMessage.emit( self.displayNewSentMessage.emit(
toAddress, fromLabel, fromAddress, toAddress, fromLabel, fromAddress,
unicode(subject, 'utf-8'), message, ackdata) subject.decode('utf-8'), message, ackdata)
elif command == 'updateNetworkStatusTab': elif command == 'updateNetworkStatusTab':
outbound, add, destination = data outbound, add, destination = data
self.updateNetworkStatusTab.emit(outbound, add, destination) self.updateNetworkStatusTab.emit(outbound, add, destination)

5
src/helper_msgcoding.py
View File

@ -155,5 +155,6 @@ class MsgDecode(object):
# Throw away any extra lines (headers) after the subject. # Throw away any extra lines (headers) after the subject.
if subject: if subject:
subject = subject.splitlines()[0] subject = subject.splitlines()[0]
self.subject = subject # Field types should be the same for all message types
self.body = body self.subject = subject.decode('utf-8', 'replace')
self.body = body.decode('utf-8', 'replace')