From 4d46d9a8ac459750c162f4027574b18aef624854 Mon Sep 17 00:00:00 2001 From: N0U Date: Mon, 7 Apr 2014 18:25:03 -0700 Subject: [PATCH] Removed full html messages. Instead I just find all images and convert them in to play text with html tags --- src/bitmessageqt/__init__.py | 31 ++++++++++++++++++++++++++++--- 1 file changed, 28 insertions(+), 3 deletions(-) diff --git a/src/bitmessageqt/__init__.py b/src/bitmessageqt/__init__.py index 76814f89..0b40cee7 100644 --- a/src/bitmessageqt/__init__.py +++ b/src/bitmessageqt/__init__.py @@ -1852,15 +1852,40 @@ class MyForm(QtGui.QMainWindow): else: QtGui.QMessageBox.information(self,"Error","Could not open an image") + def getPlainMessageText(self): + text=QString() + text_block=self.ui.textEditMessage.document().begin() + while text_block.isValid(): + i=text_block.begin() + while not i.atEnd(): + frag=i.fragment() + if frag.isValid(): + frag_format=frag.charFormat() + if frag_format.isImageFormat(): + img_format=frag_format.toImageFormat() + image_data=self.ui.textEditMessage.document().resource( + QtGui.QTextDocument.ImageResource,QtCore.QUrl(img_format.name())) + img=QImage(image_data) + buf=QBuffer() + img.save(buf,"PNG") + encoded_data=buf.buffer().toBase64().data() + text+="\n" + else: + text+=frag.text() + i+=1 + text_block=text_block.next() + return str(text.toUtf8()) + + def click_pushButtonSend(self): self.statusBar().showMessage('') toAddresses = str(self.ui.lineEditTo.text()) fromAddress = str(self.ui.labelFrom.text()) subject = str(self.ui.lineEditSubject.text().toUtf8()) - message = str( - self.ui.textEditMessage.document().toHtml("utf-8")) + message = self.getPlainMessageText() #str( + #self.ui.textEditMessage.document().toPlainText()) # Remove style which may conatin some information about the user (ex. font='Ubuntu' on Ubuntu) - message=re.sub("