| -rw-r--r-- | noncore/net/mail/viewmail.cpp | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/noncore/net/mail/viewmail.cpp b/noncore/net/mail/viewmail.cpp index d5f9b7f..d2f1584 100644 --- a/noncore/net/mail/viewmail.cpp +++ b/noncore/net/mail/viewmail.cpp @@ -22,2 +22,3 @@ #include <qlayout.h> +#include <qstylesheet.h> @@ -298,2 +299,3 @@ void ViewMail::setMail(const RecMailP&mail ) + setCaption(tr("E-Mail by %1").arg( m_mail[0] ) ); setText(); @@ -331,3 +333,2 @@ void ViewMail::setText() { - QString toString; @@ -335,2 +336,3 @@ void ViewMail::setText() QString bccString; + QString mailHtml; @@ -348,6 +350,4 @@ void ViewMail::setText() } - - setCaption( caption().arg( m_mail[0] ) ); - - m_mailHtml = "<html><body>" + browser->setTextFormat(Qt::RichText); + mailHtml = "<html><body>" "<table width=\"100%\" border=\"0\"><tr bgcolor=\"#FFDD76\"><td>" @@ -359,11 +359,7 @@ void ViewMail::setText() "<b>" + tr( "Date" ) + ": </b> " + m_mail[3] + - "</td></tr></table><font face=fixed>"; - - if ( !m_showHtml ) - { - browser->setText( QString( m_mailHtml) + deHtml( m_mail[2] ) + "</font></html>" ); - } - else - { - browser->setText( QString( m_mailHtml) + m_mail[2] + "</font></html>" ); + "</td></tr></table>"; + if ( !m_showHtml ) { + browser->setText( mailHtml+"<font face=fixed>" + QStyleSheet::convertFromPlainText(m_mail[2]) + "</font></body></html>" ); + } else { + browser->setText(mailHtml+m_mail[2].simplifyWhiteSpace()+"</html>"); } @@ -405,5 +401,5 @@ void ViewMail::exec() -QString ViewMail::deHtml(const QString &string) +QString ViewMail::deHtml(const QString &aString) { - QString string_ = string; + QString string_ = aString; string_.replace(QRegExp("&"), "&"); |