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

resolve merge conflict

Browse Source
This commit is contained in:
Jonathan Warren 2013-10-25 17:42:47 -04:00
commit 3649010b34
2 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
README.md
View File

@ -10,6 +10,14 @@ sender and receiver of messages, from passive eavesdroppers like those running
warrantless wiretapping programs. warrantless wiretapping programs.
Development
----------
If you plan to put a non-trivial amount of work into coding new features, it
is recommended that you first solicit feedback on the DevTalk pseudo-mailing
list:
BM-2D9QKN4teYRvoq2fyzpiftPh9WP9qggtzh
references references
---------- ----------
* [project website](https://bitmessage.org) * [project website](https://bitmessage.org)

27
src/bitmessageqt/__init__.py
View File

@ -2711,22 +2711,25 @@ class MyForm(QtGui.QMainWindow):
'''select message from inbox where msgid=?''', msgid) '''select message from inbox where msgid=?''', msgid)
if queryreturn != []: if queryreturn != []:
for row in queryreturn: for row in queryreturn:
message, = row messageText, = row
message = unicode(message, 'utf-8)') messageText = unicode(messageText, 'utf-8)')
if len(messageText) > 30000:
messageText = (
messageText[:30000] + '\n' +
'--- Display of the remainder of the message ' +
'truncated because it is too long.\n' +
'--- To see the full message, right-click in the ' +
'Inbox view and select "View HTML code as formatted ' +
'text",\n' +
'--- or select "Save message as..." to save it to a ' +
'file, or select "Reply" and ' +
'view the full message in the quote.')
# If we have received this message from either a broadcast address # If we have received this message from either a broadcast address
# or from someone in our address book, display as HTML # or from someone in our address book, display as HTML
if decodeAddress(fromAddress)[3] in shared.broadcastSendersForWhichImWatching or shared.isAddressInMyAddressBook(fromAddress): if decodeAddress(fromAddress)[3] in shared.broadcastSendersForWhichImWatching or shared.isAddressInMyAddressBook(fromAddress):
if len(message) < 30000: self.ui.textEditInboxMessage.setText(messageText)
self.ui.textEditInboxMessage.setText(message) # Only show the first 30K characters
else:
self.ui.textEditInboxMessage.setText(message[
:30000] + '\n\nDisplay of the remainder of the message truncated because it is too long.') # Only show the first 30K characters
else: else:
if len(message) < 30000: self.ui.textEditInboxMessage.setPlainText(messageText)
self.ui.textEditInboxMessage.setPlainText(message) # Only show the first 30K characters
else:
self.ui.textEditInboxMessage.setPlainText(message[
:30000] + '\n\nDisplay of the remainder of the message truncated because it is too long.') # Only show the first 30K characters
self.ui.tableWidgetInbox.item(currentRow, 0).setFont(font) self.ui.tableWidgetInbox.item(currentRow, 0).setFont(font)
self.ui.tableWidgetInbox.item(currentRow, 1).setFont(font) self.ui.tableWidgetInbox.item(currentRow, 1).setFont(font)