3 files changed, 43 insertions, 84 deletions
diff --git a/noncore/net/mail/mainwindow.cpp b/noncore/net/mail/mainwindow.cpp
index 6d13a8b..1d6e901 100644
--- a/noncore/net/mail/mainwindow.cpp
+++ b/noncore/net/mail/mainwindow.cpp
@@ -152,11 +152,10 @@ void MainWindow::displayMail(QListViewItem*item)
 {
    if (!item) return;
-    qDebug("View mail");
    RecMail mail = ((MailListViewItem*)item)->data();
    RecBody body = folderView->fetchBody(mail);
    ViewMail readMail( this );
+    readMail.setBody( body );
-    readMail.setMailInfo( mail.getFrom(), mail.To(), mail.getSubject(), mail.CC(), mail.Bcc(), mail.getDate(),  body.Bodytext(), mail.Msgid() );
+    readMail.setMail( mail );
    readMail.showMaximized();
    readMail.exec();
diff --git a/noncore/net/mail/viewmail.cpp b/noncore/net/mail/viewmail.cpp
index 7969235..7b8494d 100644
--- a/noncore/net/mail/viewmail.cpp
+++ b/noncore/net/mail/viewmail.cpp
@@ -24,14 +24,21 @@ AttachItem::AttachItem(QListViewItem *parent, AttachItemStore &attachItemStore)
 }
-void ViewMail::setMailInfo( const QString & from, const QStringList & to, const QString & subject, const QStringList & cc, const QStringList & bcc, const QString & date, const QString & bodytext, const QString & messageID ) {
-m_mail[0] = from;
+void ViewMail::setBody( RecBody body ) {
-m_mail2[0] = to;
-m_mail[1] = subject;
+m_mail[2] = body.Bodytext();
-m_mail2[1] = cc;
-m_mail2[2] = bcc;
+}
-m_mail[2] = bodytext;
-m_mail[3] = date;
+void ViewMail::setMail( RecMail mail ) {
-m_mail[4] = messageID;
+m_mail[0] = mail.getFrom();
+m_mail[1] = mail.getSubject();
+m_mail[3] = mail.getDate();
+m_mail[4] = mail.Msgid();
+m_mail2[0] = mail.To();
+m_mail2[1] = mail.CC();
+m_mail2[2] = mail.Bcc();
 setText();
@@ -39,16 +46,14 @@ setText();
 ViewMail::ViewMail( QWidget *parent, const char *name, WFlags fl)
        : ViewMailBase(parent, name, fl), _inLoop(false)
 {
-        _gotBody = false;
+        m_gotBody = false;
        connect(reply, SIGNAL(activated()), SLOT(slotReply()));
        connect(forward, SIGNAL(activated()), SLOT(slotForward()));
-        attachments->setEnabled(_gotBody);
+        attachments->setEnabled(m_gotBody);
-        //_handler->iUid("FETCH", QString("%1 (BODY[1])").arg(mail.uid()));
-        //connect(_handler, SIGNAL(gotResponse(IMAPResponse &)), SLOT(slotIMAPUid(IMAPResponse &)));
 }
@@ -72,24 +77,20 @@ void ViewMail::setText()
 setCaption( caption().arg( m_mail[0] ) );
-     _mailHtml = tr(
+     m_mailHtml = "<html><body>"
-                "<html><body>"
+                  "<table width=\"100%\" border=\"0\"><tr bgcolor=\"#FFDD76\"><td>"
-                "<div align=center><b><font color=#0000FF>%1</b></font></div>"
+                  "<div align=left><b>" + deHtml( m_mail[1] ) + "</b></div>"
-                "<b>From:</b><font color=#6C86C0> %2</font><br>"
+                  "</td></tr><tr bgcolor=\"#EEEEE6\"><td>"
-                "<b>To:</b><font color=#6C86C0> %3</font><br>"
+                         "<b>" + tr( "From" ) + ": </b><font color=#6C86C0>" + deHtml( m_mail[0] ) + "</font><br>"
-                "%4"
+                  "<b>" + tr(  "To" ) + ": </b><font color=#6C86C0>" + deHtml( toString ) + "</font><br><b>" +
-                    "<b>Date:</b> %5<hr>"
+                  tr( "Cc" ) + ": </b>" + deHtml( ccString ) + "<br>"
-                "<font face=fixed>")
+                      "<b>" + tr( "Date" ) + ": </b> " +  m_mail[3] +
-                .arg( deHtml( m_mail[1] ) )
+                  "</td></tr></table><font face=fixed>";
-                .arg( deHtml( m_mail[0] ) )
-                .arg( deHtml( toString ) )
+        browser->setText( QString( m_mailHtml) + deHtml( m_mail[2] ) + "</font></html>" );
-                .arg( tr("<b>Cc:</b> %1<br>").arg( deHtml( ccString ) ) )
-                .arg( m_mail[3] );
-        browser->setText( QString(_mailHtml) + deHtml( m_mail[2] ) + "</font>" );
        // remove later in favor of a real handling
-        _gotBody = true;
+        m_gotBody = true;
 }
 ViewMail::~ViewMail()
 {
@@ -129,5 +130,5 @@ QString ViewMail::deHtml(const QString &string)
 void ViewMail::slotReply()
 {
-        if (!_gotBody) {
+        if (!m_gotBody) {
                QMessageBox::information(this, tr("Error"), tr("<p>The mail body is not yet downloaded, so you cannot reply yet."), tr("Ok"));
                return;
@@ -159,10 +160,9 @@ void ViewMail::slotReply()
        composer.exec();
-      qDebug ( rtext );
 }
 void ViewMail::slotForward()
 {
-        if (!_gotBody) {
+        if (!m_gotBody) {
                QMessageBox::information(this, tr("Error"), tr("<p>The mail body is not yet downloaded, so you cannot forward yet."), tr("Ok"));
                return;
@@ -178,10 +178,4 @@ void ViewMail::slotForward()
                 ftext += QString("From: %1\n")
                         .arg( m_mail[0] );
-        //if (!_mail.envelope().to().toString().isNull())
-                //ftext += QString("To: %1\n")
-                //      .arg(_mail.envelope().to().toString());
-        //if (!_mail.envelope().cc().toString().isNull())
-                //ftext += QString("Cc: %1\n")
-                //      .arg(_mail.envelope().cc().toString());
        if (!m_mail[1].isNull())
                 ftext += QString("Subject: %1\n")
@@ -193,7 +187,4 @@ void ViewMail::slotForward()
        ftext += QString("----- End forwarded message -----\n");
-        qDebug( ftext );
        Settings *settings = new Settings();
        ComposeMail composer( settings ,this, 0, true);
@@ -204,22 +195,2 @@ void ViewMail::slotForward()
 }
-/*
-void ViewMail::slotIMAPUid(IMAPResponse &response)
-{
-        disconnect(_handler, SIGNAL(gotResponse(IMAPResponse &)), this, SLOT(slotIMAPUid(IMAPResponse &)));
-        if (response.statusResponse().status() == IMAPResponseEnums::OK) {
-                QValueList<IMAPResponseBodyPart> bodyParts;
-                bodyParts.append(response.FETCH()[0].bodyPart(0));
-                _mail.setBodyParts(bodyParts);
-                browser->setText(QString(_mailHtml).arg(deHtml(response.FETCH()[0].bodyPart(0).data())));
-        //      fillList(response.FETCH()[0].bodyStructure());
-                _gotBody = true;
-        } else {
-                QMessageBox::warning(this, tr("Error"), tr("<p>I was unable to retrieve the mail from the server. You can try again later or give up.</p>"), tr("Ok"));
-        }
-}
-*/
diff --git a/noncore/net/mail/viewmail.h b/noncore/net/mail/viewmail.h
index 258c09b..61baa1d 100644
--- a/noncore/net/mail/viewmail.h
+++ b/noncore/net/mail/viewmail.h
@@ -7,6 +7,5 @@
 #include "viewmailbase.h"
-//#include "imapresponse.h"
+#include "mailtypes.h"
-//#include "mailtable.h"
 class AttachItemStore 
@@ -50,9 +49,8 @@ public:
        void hide();
        void exec();
-    static QString appName() { return QString::fromLatin1("mail"); }
+        void setMail( RecMail mail );
-        void setMailInfo( const QString & from, const QStringList & to, const QString & subject, const QStringList & cc, const QStringList & bcc,const QString & date, const QString & bodytext, const QString & messageID );
+        void setBody( RecBody body );
 protected:
-        //void fillList(IMAPResponseBODYSTRUCTURE &structure);
        QString deHtml(const QString &string);
@@ -62,21 +60,12 @@ protected slots:
        void setText();
-        //void slotIMAPUid(IMAPResponse &response);
 private:
        bool _inLoop;
-        //IMAPResponseFETCH _mail;
+        QString m_mailHtml;
-        //IMAPHandler *_handler;
+        bool m_gotBody;
-        QString _mailHtml;
-        bool _gotBody;
+        // 0 from  1 subject  2 bodytext 3 date
-        // 0 from
-        // 1 subject
-        // 2 bodytext
-        // 3 date
        QMap <int,QString>  m_mail;
-        // 0 to
+        // 0 to 1 cc 2 bcc
-        // 1 cc
-        // 2 bcc
        QMap <int,QStringList> m_mail2;

diff --git a/noncore/net/mail/mainwindow.cpp b/noncore/net/mail/mainwindow.cpp index 6d13a8b..1d6e901 100644 --- a/noncore/net/mail/mainwindow.cpp +++ b/noncore/net/mail/mainwindow.cpp
@@ -152,11 +152,10 @@ void MainWindow::displayMail(QListViewItem*item)
152	{	152	{
153	if (!item) return;	153	if (!item) return;
154	qDebug("View mail");
155	RecMail mail = ((MailListViewItem*)item)->data();	154	RecMail mail = ((MailListViewItem*)item)->data();
156	RecBody body = folderView->fetchBody(mail);	155	RecBody body = folderView->fetchBody(mail);
157		156
158	ViewMail readMail( this );	157	ViewMail readMail( this );
159		158	readMail.setBody( body );
160	readMail.setMailInfo( mail.getFrom(), mail.To(), mail.getSubject(), mail.CC(), mail.Bcc(), mail.getDate(), body.Bodytext(), mail.Msgid() );	159	readMail.setMail( mail );
161	readMail.showMaximized();	160	readMail.showMaximized();
162	readMail.exec();	161	readMail.exec();


diff --git a/noncore/net/mail/viewmail.cpp b/noncore/net/mail/viewmail.cpp index 7969235..7b8494d 100644 --- a/noncore/net/mail/viewmail.cpp +++ b/noncore/net/mail/viewmail.cpp
@@ -24,14 +24,21 @@ AttachItem::AttachItem(QListViewItem *parent, AttachItemStore &attachItemStore)
24	}	24	}
25		25
26	void ViewMail::setMailInfo( const QString & from, const QStringList & to, const QString & subject, const QStringList & cc, const QStringList & bcc, const QString & date, const QString & bodytext, const QString & messageID ) {
27		26
28	m_mail[0] = from;	27	void ViewMail::setBody( RecBody body ) {
29	m_mail2[0] = to;	28
30	m_mail[1] = subject;	29	m_mail[2] = body.Bodytext();
31	m_mail2[1] = cc;	30
32	m_mail2[2] = bcc;	31	}
33	m_mail[2] = bodytext;	32
34	m_mail[3] = date;	33	void ViewMail::setMail( RecMail mail ) {
35	m_mail[4] = messageID;	34
		35	m_mail[0] = mail.getFrom();
		36	m_mail[1] = mail.getSubject();
		37	m_mail[3] = mail.getDate();
		38	m_mail[4] = mail.Msgid();
		39
		40	m_mail2[0] = mail.To();
		41	m_mail2[1] = mail.CC();
		42	m_mail2[2] = mail.Bcc();
36		43
37	setText();	44	setText();
@@ -39,16 +46,14 @@ setText();
39		46
40		47
		48
41	ViewMail::ViewMail( QWidget parent, const char name, WFlags fl)	49	ViewMail::ViewMail( QWidget parent, const char name, WFlags fl)
42	: ViewMailBase(parent, name, fl), _inLoop(false)	50	: ViewMailBase(parent, name, fl), _inLoop(false)
43	{	51	{
44	_gotBody = false;	52	m_gotBody = false;
45		53
46	connect(reply, SIGNAL(activated()), SLOT(slotReply()));	54	connect(reply, SIGNAL(activated()), SLOT(slotReply()));
47	connect(forward, SIGNAL(activated()), SLOT(slotForward()));	55	connect(forward, SIGNAL(activated()), SLOT(slotForward()));
48		56
49	attachments->setEnabled(_gotBody);	57	attachments->setEnabled(m_gotBody);
50
51	//_handler->iUid("FETCH", QString("%1 (BODY[1])").arg(mail.uid()));
52	//connect(_handler, SIGNAL(gotResponse(IMAPResponse &)), SLOT(slotIMAPUid(IMAPResponse &)));
53	}	58	}
54		59
@@ -72,24 +77,20 @@ void ViewMail::setText()
72	setCaption( caption().arg( m_mail[0] ) );	77	setCaption( caption().arg( m_mail[0] ) );
73		78
74	_mailHtml = tr(	79	m_mailHtml = "<html><body>"
75	"<html><body>"	80	"<table width=\"100%\" border=\"0\"><tr bgcolor=\"#FFDD76\"><td>"
76	"<div align=center><b><font color=#0000FF>%1</b></font></div>"	81	"<div align=left><b>" + deHtml( m_mail[1] ) + "</b></div>"
77	"<b>From:</b><font color=#6C86C0> %2</font><br>"	82	"</td></tr><tr bgcolor=\"#EEEEE6\"><td>"
78	"<b>To:</b><font color=#6C86C0> %3</font><br>"	83	"<b>" + tr( "From" ) + ": </b><font color=#6C86C0>" + deHtml( m_mail[0] ) + "</font><br>"
79	"%4"	84	"<b>" + tr( "To" ) + ": </b><font color=#6C86C0>" + deHtml( toString ) + "</font><br><b>" +
80	"<b>Date:</b> %5<hr>"	85	tr( "Cc" ) + ": </b>" + deHtml( ccString ) + "<br>"
81	"<font face=fixed>")	86	"<b>" + tr( "Date" ) + ": </b> " + m_mail[3] +
82	.arg( deHtml( m_mail[1] ) )	87	"</td></tr></table><font face=fixed>";
83	.arg( deHtml( m_mail[0] ) )	88
84	.arg( deHtml( toString ) )	89	browser->setText( QString( m_mailHtml) + deHtml( m_mail[2] ) + "</font></html>" );
85	.arg( tr("<b>Cc:</b> %1<br>").arg( deHtml( ccString ) ) )
86	.arg( m_mail[3] );
87	browser->setText( QString(_mailHtml) + deHtml( m_mail[2] ) + "</font>" );
88	// remove later in favor of a real handling	90	// remove later in favor of a real handling
89	_gotBody = true;	91	m_gotBody = true;
90	}	92	}
91		93
92		94
93
94	ViewMail::~ViewMail()	95	ViewMail::~ViewMail()
95	{	96	{
@@ -129,5 +130,5 @@ QString ViewMail::deHtml(const QString &string)
129	void ViewMail::slotReply()	130	void ViewMail::slotReply()
130	{	131	{
131	if (!_gotBody) {	132	if (!m_gotBody) {
132	QMessageBox::information(this, tr("Error"), tr("<p>The mail body is not yet downloaded, so you cannot reply yet."), tr("Ok"));	133	QMessageBox::information(this, tr("Error"), tr("<p>The mail body is not yet downloaded, so you cannot reply yet."), tr("Ok"));
133	return;	134	return;
@@ -159,10 +160,9 @@ void ViewMail::slotReply()
159	composer.exec();	160	composer.exec();
160		161
161	qDebug ( rtext );
162	}	162	}
163		163
164	void ViewMail::slotForward()	164	void ViewMail::slotForward()
165	{	165	{
166	if (!_gotBody) {	166	if (!m_gotBody) {
167	QMessageBox::information(this, tr("Error"), tr("<p>The mail body is not yet downloaded, so you cannot forward yet."), tr("Ok"));	167	QMessageBox::information(this, tr("Error"), tr("<p>The mail body is not yet downloaded, so you cannot forward yet."), tr("Ok"));
168	return;	168	return;
@@ -178,10 +178,4 @@ void ViewMail::slotForward()
178	ftext += QString("From: %1\n")	178	ftext += QString("From: %1\n")
179	.arg( m_mail[0] );	179	.arg( m_mail[0] );
180	//if (!_mail.envelope().to().toString().isNull())
181	//ftext += QString("To: %1\n")
182	// .arg(_mail.envelope().to().toString());
183	//if (!_mail.envelope().cc().toString().isNull())
184	//ftext += QString("Cc: %1\n")
185	// .arg(_mail.envelope().cc().toString());
186	if (!m_mail[1].isNull())	180	if (!m_mail[1].isNull())
187	ftext += QString("Subject: %1\n")	181	ftext += QString("Subject: %1\n")
@@ -193,7 +187,4 @@ void ViewMail::slotForward()
193	ftext += QString("----- End forwarded message -----\n");	187	ftext += QString("----- End forwarded message -----\n");
194		188
195	qDebug( ftext );
196
197
198	Settings *settings = new Settings();	189	Settings *settings = new Settings();
199	ComposeMail composer( settings ,this, 0, true);	190	ComposeMail composer( settings ,this, 0, true);
@@ -204,22 +195,2 @@ void ViewMail::slotForward()
204	}	195	}
205		196
206	/*
207	void ViewMail::slotIMAPUid(IMAPResponse &response)
208	{
209	disconnect(_handler, SIGNAL(gotResponse(IMAPResponse &)), this, SLOT(slotIMAPUid(IMAPResponse &)));
210
211	if (response.statusResponse().status() == IMAPResponseEnums::OK) {
212	QValueList<IMAPResponseBodyPart> bodyParts;
213	bodyParts.append(response.FETCH()[0].bodyPart(0));
214	_mail.setBodyParts(bodyParts);
215
216	browser->setText(QString(_mailHtml).arg(deHtml(response.FETCH()[0].bodyPart(0).data())));
217
218	// fillList(response.FETCH()[0].bodyStructure());
219
220	_gotBody = true;
221	} else {
222	QMessageBox::warning(this, tr("Error"), tr("<p>I was unable to retrieve the mail from the server. You can try again later or give up.</p>"), tr("Ok"));
223	}
224	}
225	*/


diff --git a/noncore/net/mail/viewmail.h b/noncore/net/mail/viewmail.h index 258c09b..61baa1d 100644 --- a/noncore/net/mail/viewmail.h +++ b/noncore/net/mail/viewmail.h
@@ -7,6 +7,5 @@
7		7
8	#include "viewmailbase.h"	8	#include "viewmailbase.h"
9	//#include "imapresponse.h"	9	#include "mailtypes.h"
10	//#include "mailtable.h"
11		10
12	class AttachItemStore	11	class AttachItemStore
@@ -50,9 +49,8 @@ public:
50	void hide();	49	void hide();
51	void exec();	50	void exec();
52	static QString appName() { return QString::fromLatin1("mail"); }	51	void setMail( RecMail mail );
53	void setMailInfo( const QString & from, const QStringList & to, const QString & subject, const QStringList & cc, const QStringList & bcc,const QString & date, const QString & bodytext, const QString & messageID );	52	void setBody( RecBody body );
54		53
55	protected:	54	protected:
56	//void fillList(IMAPResponseBODYSTRUCTURE &structure);
57	QString deHtml(const QString &string);	55	QString deHtml(const QString &string);
58		56
@@ -62,21 +60,12 @@ protected slots:
62	void setText();	60	void setText();
63		61
64	//void slotIMAPUid(IMAPResponse &response);
65
66	private:	62	private:
67	bool _inLoop;	63	bool _inLoop;
68	//IMAPResponseFETCH _mail;	64	QString m_mailHtml;
69	//IMAPHandler *_handler;	65	bool m_gotBody;
70	QString _mailHtml;	66
71	bool _gotBody;	67	// 0 from 1 subject 2 bodytext 3 date
72
73	// 0 from
74	// 1 subject
75	// 2 bodytext
76	// 3 date
77	QMap <int,QString> m_mail;	68	QMap <int,QString> m_mail;
78	// 0 to	69	// 0 to 1 cc 2 bcc
79	// 1 cc
80	// 2 bcc
81	QMap <int,QStringList> m_mail2;	70	QMap <int,QStringList> m_mail2;
82		71