From 19a43030a716e30916817f8c1be5a44f3f43cd2b Mon Sep 17 00:00:00 2001 From: Romain Bignon Date: Mon, 4 Oct 2010 22:52:23 +0200 Subject: [PATCH] support sending HTML or plaintext messages (choice in combobox) --- .../applications/qboobmsg/messages_manager.py | 35 +++++++++++-------- .../qboobmsg/ui/messages_manager.ui | 14 ++++++++ 2 files changed, 34 insertions(+), 15 deletions(-) diff --git a/weboob/applications/qboobmsg/messages_manager.py b/weboob/applications/qboobmsg/messages_manager.py index c0353c68..a291d1f1 100644 --- a/weboob/applications/qboobmsg/messages_manager.py +++ b/weboob/applications/qboobmsg/messages_manager.py @@ -190,27 +190,35 @@ class MessagesManager(QWidget): text = unicode(self.ui.replyEdit.toPlainText()) title = unicode(self.ui.titleEdit.text()) + self.ui.backendsList.setEnabled(False) + self.ui.threadsList.setEnabled(False) + self.ui.messagesTree.setEnabled(False) self.ui.replyButton.setEnabled(False) - self.ui.titleEdit.setEnabled(False) - self.ui.replyEdit.setEnabled(False) - self.ui.sendButton.setEnabled(False) + self.ui.replyWidget.setEnabled(False) self.ui.sendButton.setText(self.tr('Sending...')) + flags = 0 + if self.ui.htmlBox.currentIndex() == 0: + flags = Message.IS_HTML m = Message(thread=self.thread, id=0, title=title, sender=None, receiver=None, content=text, - parent=self.message) + parent=self.message, + flags=flags) self.process_reply = QtDo(self.weboob, self._postReply_cb, self._postReply_eb) self.process_reply.do('post_message', m, backends=self.thread.backend) def _postReply_cb(self, backend, ignored): + if not backend: + return + + self.ui.backendsList.setEnabled(True) + self.ui.threadsList.setEnabled(True) + self.ui.messagesTree.setEnabled(True) self.ui.replyButton.setEnabled(True) - self.ui.titleEdit.setEnabled(True) - self.ui.titleEdit.clear() - self.ui.replyEdit.setEnabled(True) - self.ui.replyEdit.clear() + self.ui.replyWidget.setEnabled(True) self.ui.sendButton.setEnabled(True) self.ui.sendButton.setText(self.tr('Send')) self.hideReply() @@ -223,13 +231,10 @@ class MessagesManager(QWidget): content += '\n%s\n' % backtrace QMessageBox.critical(self, self.tr('Error while posting reply'), content, QMessageBox.Ok) + self.ui.backendsList.setEnabled(True) + self.ui.threadsList.setEnabled(True) + self.ui.messagesTree.setEnabled(True) self.ui.replyButton.setEnabled(True) - self.ui.titleEdit.setEnabled(True) - self.ui.titleEdit.clear() - self.ui.replyEdit.setEnabled(True) - self.ui.replyEdit.clear() - self.ui.sendButton.setEnabled(True) + self.ui.replyWidget.setEnabled(True) self.ui.sendButton.setText(self.tr('Send')) self.process_reply = None - - diff --git a/weboob/applications/qboobmsg/ui/messages_manager.ui b/weboob/applications/qboobmsg/ui/messages_manager.ui index 1cbe3f60..9076b565 100644 --- a/weboob/applications/qboobmsg/ui/messages_manager.ui +++ b/weboob/applications/qboobmsg/ui/messages_manager.ui @@ -214,6 +214,20 @@ + + + + + With HTML + + + + + Without HTML + + + +