+
+class MTextEdit : public QTextEdit {
+ Q_OBJECT
+
+ public:
+ MTextEdit(QWidget* parent);
+
+ void dropImage(const QImage& image, const QString& format);
+
+ protected:
+ bool canInsertFromMimeData(const QMimeData* source) const;
+ void insertFromMimeData(const QMimeData* source);
+ QMimeData* createMimeDataFromSelection() const;
+};
+
+#endif
diff --git a/src/librssguard/services/gmail/gui/formaddeditemail.cpp b/src/librssguard/services/gmail/gui/formaddeditemail.cpp
index 08de90e46..a4c9c583a 100644
--- a/src/librssguard/services/gmail/gui/formaddeditemail.cpp
+++ b/src/librssguard/services/gmail/gui/formaddeditemail.cpp
@@ -62,13 +62,16 @@ void FormAddEditEmail::execForReply(Message* original_message) {
auto from_header =
m_root->network()->getMessageMetadata(original_message->m_customId, {QSL("FROM")}, m_root->networkProxy());
- m_ui.m_txtMessage->setPlainText(QTextDocumentFragment::fromHtml(m_originalMessage->m_contents).toPlainText());
- m_ui.m_txtMessage->moveCursor(QTextCursor::MoveOperation::Start);
- m_ui.m_txtMessage->insertHtml(QSL(""
- "---------- Original message ----------"
- "
"));
+ // TODO: konverze html > plain
+ // QTextDocumentFragment::fromHtml(m_originalMessage->m_contents).toPlainText()
+ m_ui.m_txtMessage->setText(m_originalMessage->m_contents);
+ m_ui.m_txtMessage->editor()->moveCursor(QTextCursor::MoveOperation::Start);
+ m_ui.m_txtMessage->editor()->insertHtml(QSL(""
+ "---------- Original message ----------"
+ "
"));
+ m_ui.m_txtMessage->editor()->moveCursor(QTextCursor::MoveOperation::Start);
- addRecipientRow(from_header["From"]);
+ addRecipientRow(from_header[QSL("From")]);
exec();
}
@@ -92,8 +95,8 @@ void FormAddEditEmail::execForForward(Message* original_message) {
"
")
.arg(m_originalMessage->m_author, m_originalMessage->m_created.toString(), m_originalMessage->m_title, to_header);
- m_ui.m_txtMessage->setHtml(forward_header + m_originalMessage->m_contents);
- m_ui.m_txtMessage->moveCursor(QTextCursor::MoveOperation::Start);
+ m_ui.m_txtMessage->setText(forward_header + m_originalMessage->m_contents);
+ m_ui.m_txtMessage->editor()->moveCursor(QTextCursor::MoveOperation::Start);
addRecipientRow()->setFocus();
exec();
diff --git a/src/librssguard/services/gmail/gui/formaddeditemail.ui b/src/librssguard/services/gmail/gui/formaddeditemail.ui
index 65f44e610..d4326ac81 100644
--- a/src/librssguard/services/gmail/gui/formaddeditemail.ui
+++ b/src/librssguard/services/gmail/gui/formaddeditemail.ui
@@ -7,7 +7,7 @@
0
0
423
- 310
+ 398
@@ -39,14 +39,14 @@
-
-
+
0
1
-
+
Contents of your e-mail message
@@ -86,6 +86,12 @@
QToolButton
+
+ MRichTextEdit
+ QWidget
+
+ 1
+
m_btnAdder