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/net/mail/viewmail.cpp | |
parent | c361d36374d9c333ffe4b853067858df5636e1a5 (diff) | |
download | opie-e8ca3ebcf4cf356497670a455f43e08a16c0f2aa.zip opie-e8ca3ebcf4cf356497670a455f43e08a16c0f2aa.tar.gz opie-e8ca3ebcf4cf356497670a455f43e08a16c0f2aa.tar.bz2 |
more updated to the mail viewer
Diffstat (limited to 'noncore/net/mail/viewmail.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/net/mail/viewmail.cpp | 50 |
1 files changed, 27 insertions, 23 deletions
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 @@ -5,4 +5,4 @@ -//#include "mailfactory.h" -//#include "composer.h" +#include "settings.h" +#include "composemail.h" #include "viewmail.h" @@ -75,3 +75,3 @@ void ViewMail::setText() "<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>" @@ -81,3 +81,3 @@ void ViewMail::setText() "<b>Date:</b> %6<hr>" - "<font face=fixed>%7</font>") + "<font face=fixed>") .arg( deHtml( m_mail[1] ) ) @@ -87,5 +87,6 @@ void ViewMail::setText() .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; } @@ -137,12 +138,12 @@ void ViewMail::slotReply() QString rtext; -// rtext += QString("* %1 wrote on %2:\n") // no i18n on purpose -// .arg(_mail.envelope().from()[0].toString()) -// .arg(_mail.envelope().mailDate()); - -// QString text = _mail.bodyPart(1).data(); -// QStringList lines = QStringList::split(QRegExp("\\n"), text); - QStringList::Iterator it; -// for (it = lines.begin(); it != lines.end(); it++) { -// rtext += "> " + *it + "\n"; -// } + rtext += QString("* %1 wrote on %2:\n") // no i18n on purpose + .arg( m_mail[1] ) + .arg( m_mail[3] ); + + 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"; + } rtext += "\n"; @@ -150,4 +151,4 @@ void ViewMail::slotReply() 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 @@ -159,6 +160,9 @@ void ViewMail::slotReply() -// 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 ); } |