author | harlekin <harlekin> | 2003-12-09 23:51:22 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2003-12-09 23:51:22 (UTC) |
commit | e8ca3ebcf4cf356497670a455f43e08a16c0f2aa (patch) (side-by-side diff) | |
tree | 0fa7ad39387559a527bee58d24cbc4ac50a35e23 /noncore | |
parent | c361d36374d9c333ffe4b853067858df5636e1a5 (diff) | |
download | opie-e8ca3ebcf4cf356497670a455f43e08a16c0f2aa.zip opie-e8ca3ebcf4cf356497670a455f43e08a16c0f2aa.tar.gz opie-e8ca3ebcf4cf356497670a455f43e08a16c0f2aa.tar.bz2 |
more updated to the mail viewer
-rw-r--r-- | noncore/net/mail/composemail.cpp | 1 | ||||
-rw-r--r-- | noncore/net/mail/composemail.h | 3 | ||||
-rw-r--r-- | noncore/net/mail/viewmail.cpp | 46 |
3 files changed, 29 insertions, 21 deletions
diff --git a/noncore/net/mail/composemail.cpp b/noncore/net/mail/composemail.cpp index 88dd780..96787e4 100644 --- a/noncore/net/mail/composemail.cpp +++ b/noncore/net/mail/composemail.cpp @@ -47,12 +47,13 @@ void ComposeMail::pickAddress( QLineEdit *line ) line->setText( names ); } else if ( !names.isEmpty() ) { line->setText( line->text() + ", " + names ); } } + void ComposeMail::pickAddressTo() { pickAddress( toLine ); } void ComposeMail::pickAddressCC() diff --git a/noncore/net/mail/composemail.h b/noncore/net/mail/composemail.h index c7ae22a..196a471 100644 --- a/noncore/net/mail/composemail.h +++ b/noncore/net/mail/composemail.h @@ -32,12 +32,13 @@ 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(); + protected slots: void accept(); private slots: void fillValues( int current ); void pickAddress( QLineEdit *line ); @@ -45,12 +46,14 @@ private slots: void pickAddressCC(); void pickAddressBCC(); void pickAddressReply(); void addAttachment(); void removeAttachment(); + + private: Settings *settings; QList<SMTPaccount> smtpAccounts; }; diff --git a/noncore/net/mail/viewmail.cpp b/noncore/net/mail/viewmail.cpp index cba9948..ed3ece9 100644 --- a/noncore/net/mail/viewmail.cpp +++ b/noncore/net/mail/viewmail.cpp @@ -1,13 +1,13 @@ #include <qtextbrowser.h> #include <qmessagebox.h> #include <qaction.h> #include <qapplication.h> -//#include "mailfactory.h" -//#include "composer.h" +#include "settings.h" +#include "composemail.h" #include "viewmail.h" AttachItem::AttachItem(QListView *parent, AttachItemStore &attachItemStore) : QListViewItem(parent), _attachItemStore(attachItemStore) { setText(0, _attachItemStore.mimeType()); @@ -70,27 +70,28 @@ void ViewMail::setText() } setCaption( caption().arg( m_mail[0] ) ); _mailHtml = tr( "<html><body>" - "<div align=center><b>%1</b></div>" + "<div align=center><b><font color=#FF2222>%1</b></font></div>" "<b>From:</b> %2<br>" "<b>To:</b> %3<br>" "%4" "%5" "<b>Date:</b> %6<hr>" - "<font face=fixed>%7</font>") + "<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] ) - .arg("%1"); - browser->setText( QString(_mailHtml) + deHtml( m_mail[2] ) ); + .arg( m_mail[3] ); + browser->setText( QString(_mailHtml) + deHtml( m_mail[2] ) + "</font>" ); + // remove later in favor of a real handling + _gotBody = true; } ViewMail::~ViewMail() { @@ -132,38 +133,41 @@ void ViewMail::slotReply() if (!_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(_mail.envelope().from()[0].toString()) -// .arg(_mail.envelope().mailDate()); + rtext += QString("* %1 wrote on %2:\n") // no i18n on purpose + .arg( m_mail[1] ) + .arg( m_mail[3] ); -// QString text = _mail.bodyPart(1).data(); -// QStringList lines = QStringList::split(QRegExp("\\n"), text); + QString text = m_mail[2]; + QStringList lines = QStringList::split(QRegExp("\\n"), text); QStringList::Iterator it; -// for (it = lines.begin(); it != lines.end(); it++) { -// rtext += "> " + *it + "\n"; -// } + for (it = lines.begin(); it != lines.end(); it++) { + rtext += "> " + *it + "\n"; + } rtext += "\n"; QString prefix; -// if (_mail.envelope().subject().find(QRegExp("^Re: *$")) != -1) prefix = ""; -// else prefix = "Re: "; // no i18n on purpose + 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); -// Composer composer(this, 0, true); -// composer.setSendMail(sendMail); -// composer.showMaximized(); -// composer.exec(); + +/* 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")); |