summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show 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.cpp74
4 files changed, 65 insertions, 43 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>"
- "<b>From:</b> %2<br>"
- "<b>To:</b> %3<br>"
+ "<div align=center><b><font color=#0000FF>%1</b></font></div>"
+ "<b>From:</b><font color=#6C86C0> %2</font><br>"
+ "<b>To:</b><font color=#6C86C0> %3</font><br>"
"%4"
- "%5"
- "<b>Date:</b> %6<hr>"
+ "<b>Date:</b> %5<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;
-// sendMail.setTo(_mail.envelope().from()[0].toString());
-// sendMail.setSubject(prefix + _mail.envelope().subject());
-// sendMail.setInReplyTo(_mail.envelope().messageId());
-// sendMail.setMessage(rtext);
-
-
-/* ComposeMail composer(this, 0, true);
- composer.setMessage( );
+ 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) {
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(_mail.envelope().from()[0].toString());
- if (!_mail.envelope().mailDate().isNull())
+ ftext += QString("\n----- Forwarded message from %1 -----\n\n")
+ .arg( m_mail[0] );
+ if (!m_mail[3].isNull())
ftext += QString("Date: %1\n")
- .arg(_mail.envelope().mailDate());
- if (!_mail.envelope().from()[0].toString().isNull())
+ .arg( m_mail[3] );
+ if (!m_mail[0].isNull())
ftext += QString("From: %1\n")
- .arg(_mail.envelope().from()[0].toString());
- 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 (!_mail.envelope().bcc().toString().isNull())
- ftext += QString("Bcc: %1\n")
- .arg(_mail.envelope().bcc().toString());
- if (!_mail.envelope().subject().isNull())
+ .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(_mail.envelope().subject());
+ .arg( m_mail[1] );
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);
- composer.setSendMail(sendMail);
+ 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) {