| -rw-r--r-- | kmicromail/viewmail.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/kmicromail/viewmail.cpp b/kmicromail/viewmail.cpp index 767a369..726f540 100644 --- a/kmicromail/viewmail.cpp +++ b/kmicromail/viewmail.cpp | |||
| @@ -356,50 +356,53 @@ ViewMail::ViewMail( QWidget *parent, const char *name, WFlags fl) | |||
| 356 | } | 356 | } |
| 357 | 357 | ||
| 358 | void ViewMail::readConfig() | 358 | void ViewMail::readConfig() |
| 359 | { | 359 | { |
| 360 | 360 | ||
| 361 | setFont ( KOPrefs::instance()->mReadFont ); | 361 | setFont ( KOPrefs::instance()->mReadFont ); |
| 362 | m_showHtml = KOPrefs::instance()->mViewAsHtml; | 362 | m_showHtml = KOPrefs::instance()->mViewAsHtml; |
| 363 | showHtml->setOn( m_showHtml ); | 363 | showHtml->setOn( m_showHtml ); |
| 364 | } | 364 | } |
| 365 | 365 | ||
| 366 | void ViewMail::setText() | 366 | void ViewMail::setText() |
| 367 | { | 367 | { |
| 368 | 368 | ||
| 369 | viewSource->setText(i18n("View Source")); | 369 | viewSource->setText(i18n("View Source")); |
| 370 | sourceOn = false; | 370 | sourceOn = false; |
| 371 | QString toString; | 371 | QString toString; |
| 372 | QString ccString; | 372 | QString ccString; |
| 373 | QString bccString; | 373 | QString bccString; |
| 374 | 374 | ||
| 375 | 375 | ||
| 376 | toString = m_mail2[0].join(","); | 376 | toString = m_mail2[0].join(","); |
| 377 | ccString = m_mail2[1].join(","); | 377 | ccString = m_mail2[1].join(","); |
| 378 | bccString = m_mail2[2].join(","); | 378 | bccString = m_mail2[2].join(","); |
| 379 | 379 | ||
| 380 | 380 | #ifdef DESKTOP_VERSION | |
| 381 | setCaption( i18n("E-Mail by %1").arg( m_mail[0] ) ); | 381 | setCaption( i18n("Size: ")+m_recMail->MsgsizeString()+" - "+i18n("E-Mail by %1").arg( m_mail[0] ) ); |
| 382 | #else | ||
| 383 | setCaption( m_recMail->MsgsizeString()+" - "+m_mail[0] ); | ||
| 384 | #endif | ||
| 382 | 385 | ||
| 383 | m_mailHtml = "<html><body>" | 386 | m_mailHtml = "<html><body>" |
| 384 | "<table width=\"100%\" border=\"0\"><tr bgcolor=\"#FFDD76\"><td>" | 387 | "<table width=\"100%\" border=\"0\"><tr bgcolor=\"#FFDD76\"><td>" |
| 385 | "<div align=left><b>" + deHtml( m_mail[1] ) + "</b></div>" | 388 | "<div align=left><b>" + deHtml( m_mail[1] ) + "</b></div>" |
| 386 | "</td></tr><tr bgcolor=\"#EEEEE6\"><td>" | 389 | "</td></tr><tr bgcolor=\"#EEEEE6\"><td>" |
| 387 | "<b>" + i18n( "From" ) + ": </b><font color=#6C86C0>" + deHtml( m_mail[0] ) + "</font><br>" | 390 | "<b>" + i18n( "From" ) + ": </b><font color=#6C86C0>" + deHtml( m_mail[0] ) + "</font><br>" |
| 388 | "<b>" + i18n( "To" ) + ": </b><font color=#6C86C0>" + deHtml( toString ) + "</font><br><b>" + | 391 | "<b>" + i18n( "To" ) + ": </b><font color=#6C86C0>" + deHtml( toString ) + "</font><br><b>" + |
| 389 | i18n( "Cc" ) + ": </b>" + deHtml( ccString ) + "<br>" | 392 | i18n( "Cc" ) + ": </b>" + deHtml( ccString ) + "<br>" |
| 390 | "<b>" + i18n( "Date" ) + ": </b> " + m_mail[3] + | 393 | "<b>" + i18n( "Date" ) + ": </b> " + m_mail[3] + |
| 391 | "</td></tr></table><font>"; | 394 | "</td></tr></table><font>"; |
| 392 | 395 | ||
| 393 | if ( !m_showHtml ) | 396 | if ( !m_showHtml ) |
| 394 | { | 397 | { |
| 395 | browser->setText( QString( m_mailHtml) + deHtml( m_mail[2] ) + "</font></html>" ); | 398 | browser->setText( QString( m_mailHtml) + deHtml( m_mail[2] ) + "</font></html>" ); |
| 396 | } | 399 | } |
| 397 | else | 400 | else |
| 398 | { | 401 | { |
| 399 | browser->setText( QString( m_mailHtml) + m_mail[2] + "</font></html>" ); | 402 | browser->setText( QString( m_mailHtml) + m_mail[2] + "</font></html>" ); |
| 400 | } | 403 | } |
| 401 | // remove later in favor of a real handling | 404 | // remove later in favor of a real handling |
| 402 | m_gotBody = true; | 405 | m_gotBody = true; |
| 403 | } | 406 | } |
| 404 | 407 | ||
| 405 | 408 | ||