author | harlekin <harlekin> | 2003-12-10 01:13:03 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2003-12-10 01:13:03 (UTC) |
commit | 9a7db10da12232625be270feae5df761cfe11afa (patch) (side-by-side diff) | |
tree | 80de2161839bb27a75532e17bfc0844c5cabf1b9 | |
parent | 162c32b06ddfbf935ee7e43694ea1ee4df51a96c (diff) | |
download | opie-9a7db10da12232625be270feae5df761cfe11afa.zip opie-9a7db10da12232625be270feae5df761cfe11afa.tar.gz opie-9a7db10da12232625be270feae5df761cfe11afa.tar.bz2 |
reply and forward partly implemented but working
-rw-r--r-- | noncore/net/mail/composemail.cpp | 28 | ||||
-rw-r--r-- | noncore/net/mail/composemail.h | 4 | ||||
-rw-r--r-- | noncore/net/mail/opie-mail.control | 2 | ||||
-rw-r--r-- | noncore/net/mail/viewmail.cpp | 74 |
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 @@ -48,12 +48,40 @@ void ComposeMail::pickAddress( QLineEdit *line ) } 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() 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 @@ -32,12 +32,16 @@ class ComposeMail : public ComposeMailUI 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 ); 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,8 +1,8 @@ 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 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 @@ -70,24 +70,22 @@ void ViewMail::setText() } 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; } @@ -149,71 +147,63 @@ void ViewMail::slotReply() 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 &))); |