summaryrefslogtreecommitdiff
path: root/noncore/net/mail/viewmail.cpp
Unidiff
Diffstat (limited to 'noncore/net/mail/viewmail.cpp') (more/less context) (show whitespace changes)
-rw-r--r--noncore/net/mail/viewmail.cpp28
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 @@
22#include <qlayout.h> 22#include <qlayout.h>
23#include <qstylesheet.h>
23 24
@@ -298,2 +299,3 @@ void ViewMail::setMail(const RecMailP&mail )
298 299
300 setCaption(tr("E-Mail by %1").arg( m_mail[0] ) );
299 setText(); 301 setText();
@@ -331,3 +333,2 @@ void ViewMail::setText()
331{ 333{
332
333 QString toString; 334 QString toString;
@@ -335,2 +336,3 @@ void ViewMail::setText()
335 QString bccString; 336 QString bccString;
337 QString mailHtml;
336 338
@@ -348,6 +350,4 @@ void ViewMail::setText()
348 } 350 }
349 351 browser->setTextFormat(Qt::RichText);
350 setCaption( caption().arg( m_mail[0] ) ); 352 mailHtml = "<html><body>"
351
352 m_mailHtml = "<html><body>"
353 "<table width=\"100%\" border=\"0\"><tr bgcolor=\"#FFDD76\"><td>" 353 "<table width=\"100%\" border=\"0\"><tr bgcolor=\"#FFDD76\"><td>"
@@ -359,11 +359,7 @@ void ViewMail::setText()
359 "<b>" + tr( "Date" ) + ": </b> " + m_mail[3] + 359 "<b>" + tr( "Date" ) + ": </b> " + m_mail[3] +
360 "</td></tr></table><font face=fixed>"; 360 "</td></tr></table>";
361 361 if ( !m_showHtml ) {
362 if ( !m_showHtml ) 362 browser->setText( mailHtml+"<font face=fixed>" + QStyleSheet::convertFromPlainText(m_mail[2]) + "</font></body></html>" );
363 { 363 } else {
364 browser->setText( QString( m_mailHtml) + deHtml( m_mail[2] ) + "</font></html>" ); 364 browser->setText(mailHtml+m_mail[2].simplifyWhiteSpace()+"</html>");
365 }
366 else
367 {
368 browser->setText( QString( m_mailHtml) + m_mail[2] + "</font></html>" );
369 } 365 }
@@ -405,5 +401,5 @@ void ViewMail::exec()
405 401
406QString ViewMail::deHtml(const QString &string) 402QString ViewMail::deHtml(const QString &aString)
407{ 403{
408 QString string_ = string; 404 QString string_ = aString;
409 string_.replace(QRegExp("&"), "&amp;"); 405 string_.replace(QRegExp("&"), "&amp;");