code cleanups and output beautification

author: harlekin <harlekin> 2003-12-12 13:50:54 (UTC)
committer: harlekin <harlekin> 2003-12-12 13:50:54 (UTC)
commit: c7549de5f69c98c6b15b6e1a6f4d73ac3f04669e (patch) (unidiff)
tree: b836cf4336a2e8b13636298bb12d4d794cdb3bff
parent: 77299749e119436aab7af82e065357fca0cead96 (diff)
download: opie-c7549de5f69c98c6b15b6e1a6f4d73ac3f04669e.zip
opie-c7549de5f69c98c6b15b6e1a6f4d73ac3f04669e.tar.gz
opie-c7549de5f69c98c6b15b6e1a6f4d73ac3f04669e.tar.bz2
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
@@ -142,31 +142,30 @@ void MainWindow::refreshMailView(QList<RecMail>*list)
 {
    MailListViewItem*item = 0;
    mailView->clear();
    for (unsigned int i = 0; i < list->count();++i) {
        item = new MailListViewItem(mailView,item);
        item->storeData(*(list->at(i)));
        item->showEntry();
    }
 }
 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();
 }
 MailListViewItem::MailListViewItem(QListView * parent, MailListViewItem * after )
        :QListViewItem(parent,after),mail_data()
 {
 }
 void MailListViewItem::showEntry()
 {
    setText(0,mail_data.getSubject());
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
@@ -14,92 +14,93 @@ AttachItem::AttachItem(QListView *parent, AttachItemStore &attachItemStore)
        setText(1, _attachItemStore.fileName());
        setText(2, _attachItemStore.description());
 }
 AttachItem::AttachItem(QListViewItem *parent, AttachItemStore &attachItemStore)
        : QListViewItem(parent), _attachItemStore(attachItemStore)
 {
        setText(0, _attachItemStore.mimeType());
        setText(1, _attachItemStore.fileName());
        setText(2, _attachItemStore.description());
 }
-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();
 }
 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 &)));
 }
 void ViewMail::setText()
 {
  QString toString;
  QString ccString;
  QString bccString;
  for ( QStringList::Iterator it = ( m_mail2[0] ).begin(); it != ( m_mail2[0] ).end(); ++it ) {
                  toString += (*it);
  }
  for ( QStringList::Iterator it = ( m_mail2[1] ).begin(); it != ( m_mail2[1] ).end(); ++it ) {
                  ccString += (*it);
  }
  for ( QStringList::Iterator it = ( m_mail2[2] ).begin(); it != ( m_mail2[2] ).end(); ++it ) {
                  bccString += (*it);
  }
 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()
 {
        hide();
 }
 void ViewMail::hide()
 {
        QWidget::hide();
        if (_inLoop) {
                _inLoop = false;
                qApp->exit_loop();
@@ -119,25 +120,25 @@ void ViewMail::exec()
 QString ViewMail::deHtml(const QString &string)
 {
        QString string_ = string;
        string_.replace(QRegExp("&"), "&amp;");
        string_.replace(QRegExp("<"), "&lt;");
        string_.replace(QRegExp(">"), "&gt;");
        string_.replace(QRegExp("\\n"), "<br>");
        return 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;
        }
        QString rtext;
                rtext += QString("* %1 wrote on %2:\n")         // no i18n on purpose
                .arg(  m_mail[1] )
                .arg( m_mail[3] );
        QString text = m_mail[2];
        QStringList lines = QStringList::split(QRegExp("\\n"), text);
        QStringList::Iterator it;
@@ -149,77 +150,47 @@ void ViewMail::slotReply()
        QString prefix;
        if ( m_mail[1].find(QRegExp("^Re: *$")) != -1) prefix = "";
                else prefix = "Re: ";                   // no i18n on purpose
        Settings *settings = new Settings();
        ComposeMail composer( settings ,this, 0, true);
        composer.setTo( m_mail[0] );
        composer.setSubject( "Re: " + m_mail[1] );
        composer.setMessage( rtext );
        composer.showMaximized();
        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;
        }
        QString ftext;
        ftext += QString("\n----- Forwarded message from %1 -----\n\n")
                .arg( m_mail[0] );
        if (!m_mail[3].isNull())
                 ftext += QString("Date: %1\n")
                         .arg( m_mail[3] );
        if (!m_mail[0].isNull())
                 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")
                         .arg( m_mail[1] );
        ftext += QString("\n%1\n")
                 .arg( m_mail[2]);
        ftext += QString("----- End forwarded message -----\n");
-        qDebug( ftext );
        Settings *settings = new Settings();
        ComposeMail composer( settings ,this, 0, true);
        composer.setSubject( "Fwd: " + m_mail[1] );
        composer.setMessage( ftext );
        composer.showMaximized();
        composer.exec();
 }
-/*
-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
@@ -1,22 +1,21 @@
 #ifndef VIEWMAIL_H
 #define VIEWMAIL_H
 #include <qlistview.h>
 #include <qmap.h>
 #include <qstringlist.h>
 #include "viewmailbase.h"
-//#include "imapresponse.h"
+#include "mailtypes.h"
-//#include "mailtable.h"
 class AttachItemStore 
 {
 public:
        void setMimeType(QString mimeType) { _mimeType = mimeType; }
        QString mimeType() { return _mimeType; }
        void setFileName(QString fileName) { _fileName = fileName; }
        QString fileName() { return _fileName; }
        void setDescription(QString description) { _description = description; }
        QString description() { return _description; }
        void setPartNum(QString partNum) { _partNum = partNum; }
        QString partNum() { return _partNum; }
@@ -40,46 +39,36 @@ private:
 };
 class ViewMail : public ViewMailBase
 {
        Q_OBJECT
 public:
        ViewMail(  QWidget *parent = 0, const char *name = 0, WFlags fl = Qt::WType_Modal);
        ~ViewMail();
        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);
 protected slots:
        void slotReply();
        void slotForward();
        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;
 };
 #endif
author	harlekin <harlekin>	2003-12-12 13:50:54 (UTC)
committer	harlekin <harlekin>	2003-12-12 13:50:54 (UTC)
commit	c7549de5f69c98c6b15b6e1a6f4d73ac3f04669e (patch) (unidiff)
tree	b836cf4336a2e8b13636298bb12d4d794cdb3bff
parent	77299749e119436aab7af82e065357fca0cead96 (diff)
download	opie-c7549de5f69c98c6b15b6e1a6f4d73ac3f04669e.zip opie-c7549de5f69c98c6b15b6e1a6f4d73ac3f04669e.tar.gz opie-c7549de5f69c98c6b15b6e1a6f4d73ac3f04669e.tar.bz2

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
@@ -142,31 +142,30 @@ void MainWindow::refreshMailView(QList<RecMail>*list)
142	{	142	{
143	MailListViewItem*item = 0;	143	MailListViewItem*item = 0;
144	mailView->clear();	144	mailView->clear();
145	for (unsigned int i = 0; i < list->count();++i) {	145	for (unsigned int i = 0; i < list->count();++i) {
146	item = new MailListViewItem(mailView,item);	146	item = new MailListViewItem(mailView,item);
147	item->storeData(*(list->at(i)));	147	item->storeData(*(list->at(i)));
148	item->showEntry();	148	item->showEntry();
149	}	149	}
150	}	150	}
151	void MainWindow::displayMail(QListViewItem*item)	151	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();
163	}	162	}
164		163
165	MailListViewItem::MailListViewItem(QListView * parent, MailListViewItem * after )	164	MailListViewItem::MailListViewItem(QListView * parent, MailListViewItem * after )
166	:QListViewItem(parent,after),mail_data()	165	:QListViewItem(parent,after),mail_data()
167	{	166	{
168	}	167	}
169		168
170	void MailListViewItem::showEntry()	169	void MailListViewItem::showEntry()
171	{	170	{
172	setText(0,mail_data.getSubject());	171	setText(0,mail_data.getSubject());


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
@@ -14,92 +14,93 @@ AttachItem::AttachItem(QListView *parent, AttachItemStore &attachItemStore)
14	setText(1, _attachItemStore.fileName());	14	setText(1, _attachItemStore.fileName());
15	setText(2, _attachItemStore.description());	15	setText(2, _attachItemStore.description());
16	}	16	}
17		17
18	AttachItem::AttachItem(QListViewItem *parent, AttachItemStore &attachItemStore)	18	AttachItem::AttachItem(QListViewItem *parent, AttachItemStore &attachItemStore)
19	: QListViewItem(parent), _attachItemStore(attachItemStore)	19	: QListViewItem(parent), _attachItemStore(attachItemStore)
20	{	20	{
21	setText(0, _attachItemStore.mimeType());	21	setText(0, _attachItemStore.mimeType());
22	setText(1, _attachItemStore.fileName());	22	setText(1, _attachItemStore.fileName());
23	setText(2, _attachItemStore.description());	23	setText(2, _attachItemStore.description());
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();
38	}	45	}
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
55	void ViewMail::setText()	60	void ViewMail::setText()
56	{	61	{
57		62
58	QString toString;	63	QString toString;
59	QString ccString;	64	QString ccString;
60	QString bccString;	65	QString bccString;
61		66
62	for ( QStringList::Iterator it = ( m_mail2[0] ).begin(); it != ( m_mail2[0] ).end(); ++it ) {	67	for ( QStringList::Iterator it = ( m_mail2[0] ).begin(); it != ( m_mail2[0] ).end(); ++it ) {
63	toString += (*it);	68	toString += (*it);
64	}	69	}
65	for ( QStringList::Iterator it = ( m_mail2[1] ).begin(); it != ( m_mail2[1] ).end(); ++it ) {	70	for ( QStringList::Iterator it = ( m_mail2[1] ).begin(); it != ( m_mail2[1] ).end(); ++it ) {
66	ccString += (*it);	71	ccString += (*it);
67	}	72	}
68	for ( QStringList::Iterator it = ( m_mail2[2] ).begin(); it != ( m_mail2[2] ).end(); ++it ) {	73	for ( QStringList::Iterator it = ( m_mail2[2] ).begin(); it != ( m_mail2[2] ).end(); ++it ) {
69	bccString += (*it);	74	bccString += (*it);
70	}	75	}
71		76
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	{
96	hide();	97	hide();
97	}	98	}
98		99
99	void ViewMail::hide()	100	void ViewMail::hide()
100	{	101	{
101	QWidget::hide();	102	QWidget::hide();
102		103
103	if (_inLoop) {	104	if (_inLoop) {
104	_inLoop = false;	105	_inLoop = false;
105	qApp->exit_loop();	106	qApp->exit_loop();
@@ -119,25 +120,25 @@ void ViewMail::exec()
119	QString ViewMail::deHtml(const QString &string)	120	QString ViewMail::deHtml(const QString &string)
120	{	121	{
121	QString string_ = string;	122	QString string_ = string;
122	string_.replace(QRegExp("&"), "&");	123	string_.replace(QRegExp("&"), "&");
123	string_.replace(QRegExp("<"), "<");	124	string_.replace(QRegExp("<"), "<");
124	string_.replace(QRegExp(">"), ">");	125	string_.replace(QRegExp(">"), ">");
125	string_.replace(QRegExp("\\n"), "<br>");	126	string_.replace(QRegExp("\\n"), "<br>");
126	return string_;	127	return string_;
127	}	128	}
128		129
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;
134	}	135	}
135		136
136	QString rtext;	137	QString rtext;
137	rtext += QString("* %1 wrote on %2:\n") // no i18n on purpose	138	rtext += QString("* %1 wrote on %2:\n") // no i18n on purpose
138	.arg( m_mail[1] )	139	.arg( m_mail[1] )
139	.arg( m_mail[3] );	140	.arg( m_mail[3] );
140		141
141	QString text = m_mail[2];	142	QString text = m_mail[2];
142	QStringList lines = QStringList::split(QRegExp("\\n"), text);	143	QStringList lines = QStringList::split(QRegExp("\\n"), text);
143	QStringList::Iterator it;	144	QStringList::Iterator it;
@@ -149,77 +150,47 @@ void ViewMail::slotReply()
149	QString prefix;	150	QString prefix;
150	if ( m_mail[1].find(QRegExp("^Re: *$")) != -1) prefix = "";	151	if ( m_mail[1].find(QRegExp("^Re: *$")) != -1) prefix = "";
151	else prefix = "Re: "; // no i18n on purpose	152	else prefix = "Re: "; // no i18n on purpose
152		153
153	Settings *settings = new Settings();	154	Settings *settings = new Settings();
154	ComposeMail composer( settings ,this, 0, true);	155	ComposeMail composer( settings ,this, 0, true);
155	composer.setTo( m_mail[0] );	156	composer.setTo( m_mail[0] );
156	composer.setSubject( "Re: " + m_mail[1] );	157	composer.setSubject( "Re: " + m_mail[1] );
157	composer.setMessage( rtext );	158	composer.setMessage( rtext );
158	composer.showMaximized();	159	composer.showMaximized();
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;
169	}	169	}
170		170
171	QString ftext;	171	QString ftext;
172	ftext += QString("\n----- Forwarded message from %1 -----\n\n")	172	ftext += QString("\n----- Forwarded message from %1 -----\n\n")
173	.arg( m_mail[0] );	173	.arg( m_mail[0] );
174	if (!m_mail[3].isNull())	174	if (!m_mail[3].isNull())
175	ftext += QString("Date: %1\n")	175	ftext += QString("Date: %1\n")
176	.arg( m_mail[3] );	176	.arg( m_mail[3] );
177	if (!m_mail[0].isNull())	177	if (!m_mail[0].isNull())
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")
188	.arg( m_mail[1] );	182	.arg( m_mail[1] );
189		183
190	ftext += QString("\n%1\n")	184	ftext += QString("\n%1\n")
191	.arg( m_mail[2]);	185	.arg( m_mail[2]);
192		186
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);
200	composer.setSubject( "Fwd: " + m_mail[1] );	191	composer.setSubject( "Fwd: " + m_mail[1] );
201	composer.setMessage( ftext );	192	composer.setMessage( ftext );
202	composer.showMaximized();	193	composer.showMaximized();
203	composer.exec();	194	composer.exec();
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
@@ -1,22 +1,21 @@
1	#ifndef VIEWMAIL_H	1	#ifndef VIEWMAIL_H
2	#define VIEWMAIL_H	2	#define VIEWMAIL_H
3		3
4	#include <qlistview.h>	4	#include <qlistview.h>
5	#include <qmap.h>	5	#include <qmap.h>
6	#include <qstringlist.h>	6	#include <qstringlist.h>
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
13	{	12	{
14	public:	13	public:
15	void setMimeType(QString mimeType) { _mimeType = mimeType; }	14	void setMimeType(QString mimeType) { _mimeType = mimeType; }
16	QString mimeType() { return _mimeType; }	15	QString mimeType() { return _mimeType; }
17	void setFileName(QString fileName) { _fileName = fileName; }	16	void setFileName(QString fileName) { _fileName = fileName; }
18	QString fileName() { return _fileName; }	17	QString fileName() { return _fileName; }
19	void setDescription(QString description) { _description = description; }	18	void setDescription(QString description) { _description = description; }
20	QString description() { return _description; }	19	QString description() { return _description; }
21	void setPartNum(QString partNum) { _partNum = partNum; }	20	void setPartNum(QString partNum) { _partNum = partNum; }
22	QString partNum() { return _partNum; }	21	QString partNum() { return _partNum; }
@@ -40,46 +39,36 @@ private:
40	};	39	};
41		40
42	class ViewMail : public ViewMailBase	41	class ViewMail : public ViewMailBase
43	{	42	{
44	Q_OBJECT	43	Q_OBJECT
45		44
46	public:	45	public:
47	ViewMail( QWidget parent = 0, const char name = 0, WFlags fl = Qt::WType_Modal);	46	ViewMail( QWidget parent = 0, const char name = 0, WFlags fl = Qt::WType_Modal);
48	~ViewMail();	47	~ViewMail();
49		48
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
59	protected slots:	57	protected slots:
60	void slotReply();	58	void slotReply();
61	void slotForward();	59	void slotForward();
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
83	};	72	};
84		73
85	#endif	74	#endif