4 files changed, 68 insertions, 46 deletions
diff --git a/noncore/net/mail/composemail.cpp b/noncore/net/mail/composemail.cpp
index 96787e4..cfccdbb 100644
--- a/noncore/net/mail/composemail.cpp
+++ b/noncore/net/mail/composemail.cpp
@@ -46,16 +46,44 @@ void ComposeMail::pickAddress( QLineEdit *line )
    if ( line->text().isEmpty() ) {
        line->setText( names );
    } else if ( !names.isEmpty() ) {
        line->setText( line->text() + ", " + names );
    }
 }
+void ComposeMail::setTo( const QString & to )
+{
+/*  QString toline;
+  QStringList toEntry = to;
+  for ( QStringList::Iterator it = toEntry.begin(); it != toEntry.end(); ++it ) {
+     toline += (*it);
+  }
+  toLine->setText( toline );
+*/
+toLine->setText( to );
+}
+void ComposeMail::setSubject( const QString & subject )
+{
+ subjectLine->setText( subject );
+}
+void ComposeMail::setInReplyTo( const QString & messageId )
+{
+}
+void ComposeMail::setMessage( const QString & text )
+{
+  message->setText( text );
+}
 void ComposeMail::pickAddressTo()
 {
    pickAddress( toLine );
 }
 void ComposeMail::pickAddressCC()
 {
    pickAddress( ccLine );
diff --git a/noncore/net/mail/composemail.h b/noncore/net/mail/composemail.h
index 196a471..230e397 100644
--- a/noncore/net/mail/composemail.h
+++ b/noncore/net/mail/composemail.h
@@ -30,16 +30,20 @@ class ComposeMail : public ComposeMailUI
    Q_OBJECT
    
 public:
    ComposeMail( Settings *s, QWidget *parent = 0, const char *name = 0, bool modal = false, WFlags flags = 0 );
 public slots:
    void slotAdjustColumns();
+    void setTo( const QString & to );
+    void setSubject( const QString & subject );
+    void setInReplyTo( const QString & messageId );
+    void setMessage( const QString & text );
 protected slots:
    void accept();
    
 private slots:
    void fillValues( int current );
    void pickAddress( QLineEdit *line );
    void pickAddressTo();
diff --git a/noncore/net/mail/opie-mail.control b/noncore/net/mail/opie-mail.control
index afe0947..9dfe425 100644
--- a/noncore/net/mail/opie-mail.control
+++ b/noncore/net/mail/opie-mail.control
@@ -1,10 +1,10 @@
 Package: opie-mail
-Files: bin/opiemail apps/1Pim/opiemail.desktop pics/mail/*.png
+Files: bin/opiemail apps/1Pim/mail.desktop pics/opiemail/*.png
 Priority: optional
 Section: opie/applications
 Maintainer: Juergen Graf <jgf@handhelds.org>
 Architecture: arm
 Version: 0.0.1-$SUB_VERSION
 Depends: task-opie-minimal, libopie1
 Description: Opie's mail and news client (POP3, IMAP and NNTP)
 License: LGPL
diff --git a/noncore/net/mail/viewmail.cpp b/noncore/net/mail/viewmail.cpp
index ed3ece9..8f9ea07 100644
--- a/noncore/net/mail/viewmail.cpp
+++ b/noncore/net/mail/viewmail.cpp
@@ -68,28 +68,26 @@ void ViewMail::setText()
  for ( QStringList::Iterator it = ( m_mail2[2] ).begin(); it != ( m_mail2[2] ).end(); ++it ) {
                  bccString += (*it);
  }
 setCaption( caption().arg( m_mail[0] ) );
     _mailHtml = tr(
                "<html><body>"
-                "<div align=center><b><font color=#FF2222>%1</b></font></div>"
+                "<div align=center><b><font color=#0000FF>%1</b></font></div>"
-                "<b>From:</b> %2<br>"
+                "<b>From:</b><font color=#6C86C0> %2</font><br>"
-                "<b>To:</b> %3<br>"
+                "<b>To:</b><font color=#6C86C0> %3</font><br>"
                "%4"
-                "%5"
+                    "<b>Date:</b> %5<hr>"
-                "<b>Date:</b> %6<hr>"
                "<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] );
        browser->setText( QString(_mailHtml) + deHtml( m_mail[2] ) + "</font>" );
        // remove later in favor of a real handling
        _gotBody = true;
 }
@@ -147,75 +145,67 @@ void ViewMail::slotReply()
                rtext += "> " + *it + "\n";
        }
        rtext += "\n";
        QString prefix;
        if ( m_mail[1].find(QRegExp("^Re: *$")) != -1) prefix = "";
                else prefix = "Re: ";                   // no i18n on purpose
-        //SendMail sendMail;
+        Settings *settings = new Settings();
-        //sendMail.setTo(_mail.envelope().from()[0].toString());
+        ComposeMail composer( settings ,this, 0, true);
-        //sendMail.setSubject(prefix + _mail.envelope().subject());
+        composer.setTo( m_mail[0] );
-        //sendMail.setInReplyTo(_mail.envelope().messageId());
+        composer.setSubject( "Re: " + m_mail[1] );
-        //sendMail.setMessage(rtext);
+        composer.setMessage( rtext );
-/*        ComposeMail composer(this, 0, true);
-        composer.setMessage(  );
        composer.showMaximized();
        composer.exec();
-*/
      qDebug ( rtext );
 }
 void ViewMail::slotForward()
 {
        if (!_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")
+        ftext += QString("\n----- Forwarded message from %1 -----\n\n")
-                .arg(_mail.envelope().from()[0].toString());
+                .arg( m_mail[0] );
-        if (!_mail.envelope().mailDate().isNull())
+        if (!m_mail[3].isNull())
-                ftext += QString("Date: %1\n")
+                 ftext += QString("Date: %1\n")
-                        .arg(_mail.envelope().mailDate());
+                         .arg( m_mail[3] );
-        if (!_mail.envelope().from()[0].toString().isNull())
+        if (!m_mail[0].isNull())
-                ftext += QString("From: %1\n")
+                 ftext += QString("From: %1\n")
-                        .arg(_mail.envelope().from()[0].toString());
+                         .arg( m_mail[0] );
-        if (!_mail.envelope().to().toString().isNull())
+        //if (!_mail.envelope().to().toString().isNull())
-                ftext += QString("To: %1\n")
+                //ftext += QString("To: %1\n")
-                        .arg(_mail.envelope().to().toString());
+                //      .arg(_mail.envelope().to().toString());
-        if (!_mail.envelope().cc().toString().isNull())
+        //if (!_mail.envelope().cc().toString().isNull())
-                ftext += QString("Cc: %1\n")
+                //ftext += QString("Cc: %1\n")
-                        .arg(_mail.envelope().cc().toString());
+                //      .arg(_mail.envelope().cc().toString());
-        if (!_mail.envelope().bcc().toString().isNull())
+        if (!m_mail[1].isNull())
-                ftext += QString("Bcc: %1\n")
+                 ftext += QString("Subject: %1\n")
-                        .arg(_mail.envelope().bcc().toString());
+                         .arg( m_mail[1] );
-        if (!_mail.envelope().subject().isNull())
-                ftext += QString("Subject: %1\n")
-                        .arg(_mail.envelope().subject());
        ftext += QString("\n%1\n")
-                .arg(_mail.bodyPart(1).data());
+                 .arg( m_mail[2]);
        ftext += QString("----- End forwarded message -----\n");
-*/
-/*
-        SendMail sendMail;
-        sendMail.setSubject("Fwd: " + _mail.envelope().subject());
-        sendMail.setMessage(ftext);
-        Composer composer(this, 0, true);
+        qDebug( ftext );
-        composer.setSendMail(sendMail);
+        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) {

diff --git a/noncore/net/mail/composemail.cpp b/noncore/net/mail/composemail.cpp index 96787e4..cfccdbb 100644 --- a/noncore/net/mail/composemail.cpp +++ b/noncore/net/mail/composemail.cpp
@@ -46,16 +46,44 @@ void ComposeMail::pickAddress( QLineEdit *line )
46	if ( line->text().isEmpty() ) {	46	if ( line->text().isEmpty() ) {
47	line->setText( names );	47	line->setText( names );
48	} else if ( !names.isEmpty() ) {	48	} else if ( !names.isEmpty() ) {
49	line->setText( line->text() + ", " + names );	49	line->setText( line->text() + ", " + names );
50	}	50	}
51	}	51	}
52		52
53		53
		54	void ComposeMail::setTo( const QString & to )
		55	{
		56	/* QString toline;
		57	QStringList toEntry = to;
		58	for ( QStringList::Iterator it = toEntry.begin(); it != toEntry.end(); ++it ) {
		59	toline += (*it);
		60	}
		61	toLine->setText( toline );
		62	*/
		63	toLine->setText( to );
		64	}
		65
		66	void ComposeMail::setSubject( const QString & subject )
		67	{
		68	subjectLine->setText( subject );
		69	}
		70
		71	void ComposeMail::setInReplyTo( const QString & messageId )
		72	{
		73
		74	}
		75
		76	void ComposeMail::setMessage( const QString & text )
		77	{
		78	message->setText( text );
		79	}
		80
		81
54	void ComposeMail::pickAddressTo()	82	void ComposeMail::pickAddressTo()
55	{	83	{
56	pickAddress( toLine );	84	pickAddress( toLine );
57	}	85	}
58		86
59	void ComposeMail::pickAddressCC()	87	void ComposeMail::pickAddressCC()
60	{	88	{
61	pickAddress( ccLine );	89	pickAddress( ccLine );


diff --git a/noncore/net/mail/composemail.h b/noncore/net/mail/composemail.h index 196a471..230e397 100644 --- a/noncore/net/mail/composemail.h +++ b/noncore/net/mail/composemail.h
@@ -30,16 +30,20 @@ class ComposeMail : public ComposeMailUI
30	Q_OBJECT	30	Q_OBJECT
31		31
32	public:	32	public:
33	ComposeMail( Settings s, QWidget parent = 0, const char *name = 0, bool modal = false, WFlags flags = 0 );	33	ComposeMail( Settings s, QWidget parent = 0, const char *name = 0, bool modal = false, WFlags flags = 0 );
34		34
35	public slots:	35	public slots:
36	void slotAdjustColumns();	36	void slotAdjustColumns();
37		37
		38	void setTo( const QString & to );
		39	void setSubject( const QString & subject );
		40	void setInReplyTo( const QString & messageId );
		41	void setMessage( const QString & text );
38		42
39	protected slots:	43	protected slots:
40	void accept();	44	void accept();
41		45
42	private slots:	46	private slots:
43	void fillValues( int current );	47	void fillValues( int current );
44	void pickAddress( QLineEdit *line );	48	void pickAddress( QLineEdit *line );
45	void pickAddressTo();	49	void pickAddressTo();


diff --git a/noncore/net/mail/opie-mail.control b/noncore/net/mail/opie-mail.control index afe0947..9dfe425 100644 --- a/noncore/net/mail/opie-mail.control +++ b/noncore/net/mail/opie-mail.control
@@ -1,10 +1,10 @@
1	Package: opie-mail	1	Package: opie-mail
2	Files: bin/opiemail apps/1Pim/opiemail.desktop pics/mail/*.png	2	Files: bin/opiemail apps/1Pim/mail.desktop pics/opiemail/*.png
3	Priority: optional	3	Priority: optional
4	Section: opie/applications	4	Section: opie/applications
5	Maintainer: Juergen Graf <jgf@handhelds.org>	5	Maintainer: Juergen Graf <jgf@handhelds.org>
6	Architecture: arm	6	Architecture: arm
7	Version: 0.0.1-$SUB_VERSION	7	Version: 0.0.1-$SUB_VERSION
8	Depends: task-opie-minimal, libopie1	8	Depends: task-opie-minimal, libopie1
9	Description: Opie's mail and news client (POP3, IMAP and NNTP)	9	Description: Opie's mail and news client (POP3, IMAP and NNTP)
10	License: LGPL	10	License: LGPL


diff --git a/noncore/net/mail/viewmail.cpp b/noncore/net/mail/viewmail.cpp index ed3ece9..8f9ea07 100644 --- a/noncore/net/mail/viewmail.cpp +++ b/noncore/net/mail/viewmail.cpp
@@ -68,28 +68,26 @@ void ViewMail::setText()
68	for ( QStringList::Iterator it = ( m_mail2[2] ).begin(); it != ( m_mail2[2] ).end(); ++it ) {	68	for ( QStringList::Iterator it = ( m_mail2[2] ).begin(); it != ( m_mail2[2] ).end(); ++it ) {
69	bccString += (*it);	69	bccString += (*it);
70	}	70	}
71		71
72	setCaption( caption().arg( m_mail[0] ) );	72	setCaption( caption().arg( m_mail[0] ) );
73		73
74	_mailHtml = tr(	74	_mailHtml = tr(
75	"<html><body>"	75	"<html><body>"
76	"<div align=center><b><font color=#FF2222>%1</b></font></div>"	76	"<div align=center><b><font color=#0000FF>%1</b></font></div>"
77	"<b>From:</b> %2<br>"	77	"<b>From:</b><font color=#6C86C0> %2</font><br>"
78	"<b>To:</b> %3<br>"	78	"<b>To:</b><font color=#6C86C0> %3</font><br>"
79	"%4"	79	"%4"
80	"%5"	80	"<b>Date:</b> %5<hr>"
81	"<b>Date:</b> %6<hr>"
82	"<font face=fixed>")	81	"<font face=fixed>")
83	.arg( deHtml( m_mail[1] ) )	82	.arg( deHtml( m_mail[1] ) )
84	.arg( deHtml( m_mail[0] ) )	83	.arg( deHtml( m_mail[0] ) )
85	.arg( deHtml( toString ) )	84	.arg( deHtml( toString ) )
86	.arg( tr("<b>Cc:</b> %1<br>").arg( deHtml( ccString ) ) )	85	.arg( tr("<b>Cc:</b> %1<br>").arg( deHtml( ccString ) ) )
87	.arg( tr("<b>Bcc:</b> %1<br>").arg( deHtml( bccString ) ) )
88	.arg( m_mail[3] );	86	.arg( m_mail[3] );
89	browser->setText( QString(_mailHtml) + deHtml( m_mail[2] ) + "</font>" );	87	browser->setText( QString(_mailHtml) + deHtml( m_mail[2] ) + "</font>" );
90	// remove later in favor of a real handling	88	// remove later in favor of a real handling
91	_gotBody = true;	89	_gotBody = true;
92	}	90	}
93		91
94		92
95		93
@@ -147,75 +145,67 @@ void ViewMail::slotReply()
147	rtext += "> " + *it + "\n";	145	rtext += "> " + *it + "\n";
148	}	146	}
149	rtext += "\n";	147	rtext += "\n";
150		148
151	QString prefix;	149	QString prefix;
152	if ( m_mail[1].find(QRegExp("^Re: *$")) != -1) prefix = "";	150	if ( m_mail[1].find(QRegExp("^Re: *$")) != -1) prefix = "";
153	else prefix = "Re: "; // no i18n on purpose	151	else prefix = "Re: "; // no i18n on purpose
154		152
155	//SendMail sendMail;	153	Settings *settings = new Settings();
156	//sendMail.setTo(_mail.envelope().from()[0].toString());	154	ComposeMail composer( settings ,this, 0, true);
157	//sendMail.setSubject(prefix + _mail.envelope().subject());	155	composer.setTo( m_mail[0] );
158	//sendMail.setInReplyTo(_mail.envelope().messageId());	156	composer.setSubject( "Re: " + m_mail[1] );
159	//sendMail.setMessage(rtext);	157	composer.setMessage( rtext );
160
161
162	/* ComposeMail composer(this, 0, true);
163	composer.setMessage( );
164	composer.showMaximized();	158	composer.showMaximized();
165	composer.exec();	159	composer.exec();
166	*/	160
167	qDebug ( rtext );	161	qDebug ( rtext );
168	}	162	}
169		163
170	void ViewMail::slotForward()	164	void ViewMail::slotForward()
171	{	165	{
172	if (!_gotBody) {	166	if (!_gotBody) {
173	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"));
174	return;	168	return;
175	}	169	}
176		170
177	QString ftext;	171	QString ftext;
178	/*ftext += QString("\n----- Forwarded message from %1 -----\n\n")	172	ftext += QString("\n----- Forwarded message from %1 -----\n\n")
179	.arg(_mail.envelope().from()[0].toString());	173	.arg( m_mail[0] );
180	if (!_mail.envelope().mailDate().isNull())	174	if (!m_mail[3].isNull())
181	ftext += QString("Date: %1\n")	175	ftext += QString("Date: %1\n")
182	.arg(_mail.envelope().mailDate());	176	.arg( m_mail[3] );
183	if (!_mail.envelope().from()[0].toString().isNull())	177	if (!m_mail[0].isNull())
184	ftext += QString("From: %1\n")	178	ftext += QString("From: %1\n")
185	.arg(_mail.envelope().from()[0].toString());	179	.arg( m_mail[0] );
186	if (!_mail.envelope().to().toString().isNull())	180	//if (!_mail.envelope().to().toString().isNull())
187	ftext += QString("To: %1\n")	181	//ftext += QString("To: %1\n")
188	.arg(_mail.envelope().to().toString());	182	// .arg(_mail.envelope().to().toString());
189	if (!_mail.envelope().cc().toString().isNull())	183	//if (!_mail.envelope().cc().toString().isNull())
190	ftext += QString("Cc: %1\n")	184	//ftext += QString("Cc: %1\n")
191	.arg(_mail.envelope().cc().toString());	185	// .arg(_mail.envelope().cc().toString());
192	if (!_mail.envelope().bcc().toString().isNull())	186	if (!m_mail[1].isNull())
193	ftext += QString("Bcc: %1\n")	187	ftext += QString("Subject: %1\n")
194	.arg(_mail.envelope().bcc().toString());	188	.arg( m_mail[1] );
195	if (!_mail.envelope().subject().isNull())
196	ftext += QString("Subject: %1\n")
197	.arg(_mail.envelope().subject());
198		189
199	ftext += QString("\n%1\n")	190	ftext += QString("\n%1\n")
200	.arg(_mail.bodyPart(1).data());	191	.arg( m_mail[2]);
201		192
202	ftext += QString("----- End forwarded message -----\n");	193	ftext += QString("----- End forwarded message -----\n");
203	*/
204	/*
205	SendMail sendMail;
206	sendMail.setSubject("Fwd: " + _mail.envelope().subject());
207	sendMail.setMessage(ftext);
208		194
209	Composer composer(this, 0, true);	195	qDebug( ftext );
210	composer.setSendMail(sendMail);	196
		197
		198	Settings *settings = new Settings();
		199	ComposeMail composer( settings ,this, 0, true);
		200	composer.setSubject( "Fwd: " + m_mail[1] );
		201	composer.setMessage( ftext );
211	composer.showMaximized();	202	composer.showMaximized();
212	composer.exec();	203	composer.exec();
213	*/
214	}	204	}
215		205
216	/*	206	/*
217	void ViewMail::slotIMAPUid(IMAPResponse &response)	207	void ViewMail::slotIMAPUid(IMAPResponse &response)
218	{	208	{
219	disconnect(_handler, SIGNAL(gotResponse(IMAPResponse &)), this, SLOT(slotIMAPUid(IMAPResponse &)));	209	disconnect(_handler, SIGNAL(gotResponse(IMAPResponse &)), this, SLOT(slotIMAPUid(IMAPResponse &)));
220		210
221	if (response.statusResponse().status() == IMAPResponseEnums::OK) {	211	if (response.statusResponse().status() == IMAPResponseEnums::OK) {