citizenaspirant/PyBitmessage
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Merge pull request #679 from enikesha/htmlfix

Browse Source 
Fix unicode handling in 'View HTML code as formated text'. Fixes #667
This commit is contained in:
Jonathan Warren 2014-07-14 19:45:15 -04:00
commit ce62294975
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)
if queryreturn != []:
for row in queryreturn:
messageAtCurrentInboxRow, = row
messageText, = row
lines = messageAtCurrentInboxRow.split('\n')
for i in xrange(len(lines)):
lines = messageText.split('\n')
totalLines = len(lines)
for i in xrange(totalLines):
if 'Message ostensibly from ' in lines[i]:
lines[i] = '<p style="font-size: 12px; color: grey;">%s</span></p>' % (
lines[i])
elif lines[i] == '------------------------------------------------------':
lines[i] = '<hr>'
content = ''
for i in xrange(len(lines)):
content += lines[i]
content = content.replace('\n\n', '<br><br>')
elif lines[i] == '' and (i+1) < totalLines and \
lines[i+1] != '------------------------------------------------------':
lines[i] = '<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))
def on_action_InboxMarkUnread(self):