summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/mail/composemail.cpp28
-rw-r--r--noncore/net/mail/composemail.h4
-rw-r--r--noncore/net/mail/opie-mail.control2
-rw-r--r--noncore/net/mail/viewmail.cpp80
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
@@ -53,2 +53,30 @@ void ComposeMail::pickAddress( QLineEdit *line )
53 53
54void 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*/
63toLine->setText( to );
64}
65
66void ComposeMail::setSubject( const QString & subject )
67{
68 subjectLine->setText( subject );
69}
70
71void ComposeMail::setInReplyTo( const QString & messageId )
72{
73
74}
75
76void ComposeMail::setMessage( const QString & text )
77{
78 message->setText( text );
79}
80
81
54void ComposeMail::pickAddressTo() 82void ComposeMail::pickAddressTo()
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
@@ -37,2 +37,6 @@ public slots:
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
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,3 +1,3 @@
1Package: opie-mail 1Package: opie-mail
2Files: bin/opiemail apps/1Pim/opiemail.desktop pics/mail/*.png 2Files: bin/opiemail apps/1Pim/mail.desktop pics/opiemail/*.png
3Priority: optional 3Priority: optional
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
@@ -75,8 +75,7 @@ void ViewMail::setText()
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>")
@@ -86,3 +85,2 @@ void ViewMail::setText()
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] );
@@ -154,14 +152,10 @@ void ViewMail::slotReply()
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 );
@@ -177,38 +171,34 @@ void ViewMail::slotForward()
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}