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

Fix unicode handling in 'View HTML code as formated text'. Fixes #667 #679

Merged
enikesha merged 2 commits from htmlfix into master 2014-07-15 01:45:15 +02:00
Conversation 3 Commits 2 Files Changed 1 +10 -7
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/bitmessageqt/__init__.py
View File

@ -2583,19 +2583,22 @@ 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:
messageAtCurrentInboxRow, = row messageText, = row
lines = messageAtCurrentInboxRow.split('\n') lines = messageText.split('\n')
for i in xrange(len(lines)): totalLines = len(lines)
for i in xrange(totalLines):
if 'Message ostensibly from ' in lines[i]: if 'Message ostensibly from ' in lines[i]:
lines[i] = '<p style="font-size: 12px; color: grey;">%s</span></p>' % ( lines[i] = '<p style="font-size: 12px; color: grey;">%s</span></p>' % (
lines[i]) lines[i])
elif lines[i] == '------------------------------------------------------': elif lines[i] == '------------------------------------------------------':
lines[i] = '<hr>' lines[i] = '<hr>'
content = '' elif lines[i] == '' and (i+1) < totalLines and \
for i in xrange(len(lines)): lines[i+1] != '------------------------------------------------------':
content += lines[i] lines[i] = '<br><br>'
content = content.replace('\n\n', '<br><br>') content = ' '.join(lines) # To keep the whitespace between lines
content = shared.fixPotentiallyInvalidUTF8Data(content)
content = unicode(content, 'utf-8)')
self.ui.textEditInboxMessage.setHtml(QtCore.QString(content)) self.ui.textEditInboxMessage.setHtml(QtCore.QString(content))
def on_action_InboxMarkUnread(self): def on_action_InboxMarkUnread(self):