3 files changed, 29 insertions, 21 deletions
diff --git a/noncore/net/mail/composemail.cpp b/noncore/net/mail/composemail.cpp
index 88dd780..96787e4 100644
--- a/noncore/net/mail/composemail.cpp
+++ b/noncore/net/mail/composemail.cpp
@@ -50,6 +50,7 @@ void ComposeMail::pickAddress( QLineEdit *line )
    }
 }
 void ComposeMail::pickAddressTo()
 {
    pickAddress( toLine );
diff --git a/noncore/net/mail/composemail.h b/noncore/net/mail/composemail.h
index c7ae22a..196a471 100644
--- a/noncore/net/mail/composemail.h
+++ b/noncore/net/mail/composemail.h
@@ -35,6 +35,7 @@ public:
 public slots:
    void slotAdjustColumns();
 protected slots:
    void accept();
    
@@ -48,6 +49,8 @@ private slots:
    void addAttachment();
    void removeAttachment();
 private:
    Settings *settings;
    QList<SMTPaccount> smtpAccounts;
diff --git a/noncore/net/mail/viewmail.cpp b/noncore/net/mail/viewmail.cpp
index cba9948..ed3ece9 100644
--- a/noncore/net/mail/viewmail.cpp
+++ b/noncore/net/mail/viewmail.cpp
@@ -3,8 +3,8 @@
 #include <qaction.h>
 #include <qapplication.h>
-//#include "mailfactory.h"
+#include "settings.h"
-//#include "composer.h"
+#include "composemail.h"
 #include "viewmail.h"
 AttachItem::AttachItem(QListView *parent, AttachItemStore &attachItemStore)
@@ -73,21 +73,22 @@ void ViewMail::setText()
     _mailHtml = tr(
                "<html><body>"
-                "<div align=center><b>%1</b></div>"
+                "<div align=center><b><font color=#FF2222>%1</b></font></div>"
                "<b>From:</b> %2<br>"
                "<b>To:</b> %3<br>"
                "%4"
                "%5"
                "<b>Date:</b> %6<hr>"
-                "<font face=fixed>%7</font>")
+                "<font face=fixed>")
                .arg( deHtml( m_mail[1] ) )
                .arg( deHtml( m_mail[0] ) )
                .arg( deHtml( toString ) )
                .arg( tr("<b>Cc:</b> %1<br>").arg( deHtml( ccString ) ) )
                .arg( tr("<b>Bcc:</b> %1<br>").arg( deHtml( bccString ) ) )
-                .arg( m_mail[3] )
+                .arg( m_mail[3] );
-                .arg("%1");
+        browser->setText( QString(_mailHtml) + deHtml( m_mail[2] ) + "</font>" );
-        browser->setText( QString(_mailHtml) + deHtml( m_mail[2] ) );
+        // remove later in favor of a real handling
+        _gotBody = true;
 }
@@ -135,21 +136,21 @@ void ViewMail::slotReply()
        }
        QString rtext;
-        //      rtext += QString("* %1 wrote on %2:\n")         // no i18n on purpose
+                rtext += QString("* %1 wrote on %2:\n")         // no i18n on purpose
-        //      .arg(_mail.envelope().from()[0].toString())
+                .arg(  m_mail[1] )
-        //      .arg(_mail.envelope().mailDate());
+                .arg( m_mail[3] );
-        //QString text = _mail.bodyPart(1).data();
+        QString text = m_mail[2];
-        //QStringList lines = QStringList::split(QRegExp("\\n"), text);
+        QStringList lines = QStringList::split(QRegExp("\\n"), text);
        QStringList::Iterator it;
-        //for (it = lines.begin(); it != lines.end(); it++) {
+        for (it = lines.begin(); it != lines.end(); it++) {
-        //      rtext += "> " + *it + "\n";
+                rtext += "> " + *it + "\n";
-        //}
+        }
        rtext += "\n";
        QString prefix;
-        //if (_mail.envelope().subject().find(QRegExp("^Re: *$")) != -1) prefix = "";
+        if ( m_mail[1].find(QRegExp("^Re: *$")) != -1) prefix = "";
-        //      else prefix = "Re: ";                   // no i18n on purpose
+                else prefix = "Re: ";                   // no i18n on purpose
        //SendMail sendMail;
        //sendMail.setTo(_mail.envelope().from()[0].toString());
@@ -157,10 +158,13 @@ void ViewMail::slotReply()
        //sendMail.setInReplyTo(_mail.envelope().messageId());
        //sendMail.setMessage(rtext);
-        //Composer composer(this, 0, true);
-        //composer.setSendMail(sendMail);
+/*        ComposeMail composer(this, 0, true);
-        //composer.showMaximized();
+        composer.setMessage(  );
-        //composer.exec();
+        composer.showMaximized();
+        composer.exec();
+*/
+      qDebug ( rtext );
 }
 void ViewMail::slotForward()

diff --git a/noncore/net/mail/composemail.cpp b/noncore/net/mail/composemail.cpp index 88dd780..96787e4 100644 --- a/noncore/net/mail/composemail.cpp +++ b/noncore/net/mail/composemail.cpp
@@ -50,6 +50,7 @@ void ComposeMail::pickAddress( QLineEdit *line )
50	}	50	}
51	}	51	}
52		52
		53
53	void ComposeMail::pickAddressTo()	54	void ComposeMail::pickAddressTo()
54	{	55	{
55	pickAddress( toLine );	56	pickAddress( toLine );


diff --git a/noncore/net/mail/composemail.h b/noncore/net/mail/composemail.h index c7ae22a..196a471 100644 --- a/noncore/net/mail/composemail.h +++ b/noncore/net/mail/composemail.h
@@ -35,6 +35,7 @@ public:
35	public slots:	35	public slots:
36	void slotAdjustColumns();	36	void slotAdjustColumns();
37		37
		38
38	protected slots:	39	protected slots:
39	void accept();	40	void accept();
40		41
@@ -48,6 +49,8 @@ private slots:
48	void addAttachment();	49	void addAttachment();
49	void removeAttachment();	50	void removeAttachment();
50		51
		52
		53
51	private:	54	private:
52	Settings *settings;	55	Settings *settings;
53	QList<SMTPaccount> smtpAccounts;	56	QList<SMTPaccount> smtpAccounts;


diff --git a/noncore/net/mail/viewmail.cpp b/noncore/net/mail/viewmail.cpp index cba9948..ed3ece9 100644 --- a/noncore/net/mail/viewmail.cpp +++ b/noncore/net/mail/viewmail.cpp
@@ -3,8 +3,8 @@
3	#include <qaction.h>	3	#include <qaction.h>
4	#include <qapplication.h>	4	#include <qapplication.h>
5		5
6	//#include "mailfactory.h"	6	#include "settings.h"
7	//#include "composer.h"	7	#include "composemail.h"
8	#include "viewmail.h"	8	#include "viewmail.h"
9		9
10	AttachItem::AttachItem(QListView *parent, AttachItemStore &attachItemStore)	10	AttachItem::AttachItem(QListView *parent, AttachItemStore &attachItemStore)
@@ -73,21 +73,22 @@ void ViewMail::setText()
73		73
74	_mailHtml = tr(	74	_mailHtml = tr(
75	"<html><body>"	75	"<html><body>"
76	"<div align=center><b>%1</b></div>"	76	"<div align=center><b><font color=#FF2222>%1</b></font></div>"
77	"<b>From:</b> %2<br>"	77	"<b>From:</b> %2<br>"
78	"<b>To:</b> %3<br>"	78	"<b>To:</b> %3<br>"
79	"%4"	79	"%4"
80	"%5"	80	"%5"
81	"<b>Date:</b> %6<hr>"	81	"<b>Date:</b> %6<hr>"
82	"<font face=fixed>%7</font>")	82	"<font face=fixed>")
83	.arg( deHtml( m_mail[1] ) )	83	.arg( deHtml( m_mail[1] ) )
84	.arg( deHtml( m_mail[0] ) )	84	.arg( deHtml( m_mail[0] ) )
85	.arg( deHtml( toString ) )	85	.arg( deHtml( toString ) )
86	.arg( tr("<b>Cc:</b> %1<br>").arg( deHtml( ccString ) ) )	86	.arg( tr("<b>Cc:</b> %1<br>").arg( deHtml( ccString ) ) )
87	.arg( tr("<b>Bcc:</b> %1<br>").arg( deHtml( bccString ) ) )	87	.arg( tr("<b>Bcc:</b> %1<br>").arg( deHtml( bccString ) ) )
88	.arg( m_mail[3] )	88	.arg( m_mail[3] );
89	.arg("%1");	89	browser->setText( QString(_mailHtml) + deHtml( m_mail[2] ) + "</font>" );
90	browser->setText( QString(_mailHtml) + deHtml( m_mail[2] ) );	90	// remove later in favor of a real handling
		91	_gotBody = true;
91	}	92	}
92		93
93		94
@@ -135,21 +136,21 @@ void ViewMail::slotReply()
135	}	136	}
136		137
137	QString rtext;	138	QString rtext;
138	// rtext += QString("* %1 wrote on %2:\n") // no i18n on purpose	139	rtext += QString("* %1 wrote on %2:\n") // no i18n on purpose
139	// .arg(_mail.envelope().from()[0].toString())	140	.arg( m_mail[1] )
140	// .arg(_mail.envelope().mailDate());	141	.arg( m_mail[3] );
141		142
142	//QString text = _mail.bodyPart(1).data();	143	QString text = m_mail[2];
143	//QStringList lines = QStringList::split(QRegExp("\\n"), text);	144	QStringList lines = QStringList::split(QRegExp("\\n"), text);
144	QStringList::Iterator it;	145	QStringList::Iterator it;
145	//for (it = lines.begin(); it != lines.end(); it++) {	146	for (it = lines.begin(); it != lines.end(); it++) {
146	// rtext += "> " + *it + "\n";	147	rtext += "> " + *it + "\n";
147	//}	148	}
148	rtext += "\n";	149	rtext += "\n";
149		150
150	QString prefix;	151	QString prefix;
151	//if (_mail.envelope().subject().find(QRegExp("^Re: *$")) != -1) prefix = "";	152	if ( m_mail[1].find(QRegExp("^Re: *$")) != -1) prefix = "";
152	// else prefix = "Re: "; // no i18n on purpose	153	else prefix = "Re: "; // no i18n on purpose
153		154
154	//SendMail sendMail;	155	//SendMail sendMail;
155	//sendMail.setTo(_mail.envelope().from()[0].toString());	156	//sendMail.setTo(_mail.envelope().from()[0].toString());
@@ -157,10 +158,13 @@ void ViewMail::slotReply()
157	//sendMail.setInReplyTo(_mail.envelope().messageId());	158	//sendMail.setInReplyTo(_mail.envelope().messageId());
158	//sendMail.setMessage(rtext);	159	//sendMail.setMessage(rtext);
159		160
160	//Composer composer(this, 0, true);	161
161	//composer.setSendMail(sendMail);	162	/* ComposeMail composer(this, 0, true);
162	//composer.showMaximized();	163	composer.setMessage( );
163	//composer.exec();	164	composer.showMaximized();
		165	composer.exec();
		166	*/
		167	qDebug ( rtext );
164	}	168	}
165		169
166	void ViewMail::slotForward()	170	void ViewMail::slotForward()