From 51b9a59719815c6f30aa55e4fd95e38619413450 Mon Sep 17 00:00:00 2001 From: Innocenty Enikeew Date: Tue, 3 Jun 2014 09:45:59 +0400 Subject: [PATCH] Optimizations and better newlines handling --- src/bitmessageqt/__init__.py | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/bitmessageqt/__init__.py b/src/bitmessageqt/__init__.py index 486f80ec..dd67d211 100644 --- a/src/bitmessageqt/__init__.py +++ b/src/bitmessageqt/__init__.py @@ -2585,19 +2585,20 @@ class MyForm(QtGui.QMainWindow): for row in queryreturn: messageText, = row - messageText = shared.fixPotentiallyInvalidUTF8Data(messageText) - messageText = unicode(messageText, 'utf-8)') 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]: - lines[i] = u'

%s

' % ( + lines[i] = '

%s

' % ( lines[i]) elif lines[i] == '------------------------------------------------------': lines[i] = '
' - content = u'' - for i in xrange(len(lines)): - content += lines[i] - content = content.replace('\n\n', '

') + elif lines[i] == '' and (i+1) < totalLines and \ + lines[i+1] != '------------------------------------------------------': + lines[i] = '

' + 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):