| -rw-r--r-- | noncore/net/mail/viewmail.cpp | 28 | ||||
| -rw-r--r-- | noncore/net/mail/viewmail.h | 1 | ||||
| -rw-r--r-- | noncore/net/mail/viewmailbase.cpp | 3 | ||||
| -rw-r--r-- | noncore/net/mail/viewmailbase.h | 2 |
4 files changed, 16 insertions, 18 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 @@ -21,4 +21,5 @@ #include <qfile.h> #include <qlayout.h> +#include <qstylesheet.h> using namespace Opie::Ui; @@ -297,4 +298,5 @@ void ViewMail::setMail(const RecMailP&mail ) m_mail2[2] = mail->Bcc(); + setCaption(tr("E-Mail by %1").arg( m_mail[0] ) ); setText(); } @@ -330,8 +332,8 @@ void ViewMail::readConfig() void ViewMail::setText() { - QString toString; QString ccString; QString bccString; + QString mailHtml; for ( QStringList::Iterator it = ( m_mail2[0] ).begin(); it != ( m_mail2[0] ).end(); ++it ) @@ -347,8 +349,6 @@ void ViewMail::setText() bccString += (*it); } - - 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>" "<div align=left><b>" + deHtml( m_mail[1] ) + "</b></div>" @@ -358,13 +358,9 @@ void ViewMail::setText() tr( "Cc" ) + ": </b>" + deHtml( ccString ) + "<br>" "<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>"); } // remove later in favor of a real handling @@ -404,7 +400,7 @@ void ViewMail::exec() } -QString ViewMail::deHtml(const QString &string) +QString ViewMail::deHtml(const QString &aString) { - QString string_ = string; + QString string_ = aString; string_.replace(QRegExp("&"), "&"); string_.replace(QRegExp("<"), "<"); diff --git a/noncore/net/mail/viewmail.h b/noncore/net/mail/viewmail.h index 297836b..560453a 100644 --- a/noncore/net/mail/viewmail.h +++ b/noncore/net/mail/viewmail.h @@ -53,4 +53,5 @@ protected slots: void slotForward(); void setText(); + void setHeader(); void slotItemClicked( QListViewItem * item , const QPoint & point, int c ); void slotDeleteMail( ); diff --git a/noncore/net/mail/viewmailbase.cpp b/noncore/net/mail/viewmailbase.cpp index cbb98cc..49a0e6a 100644 --- a/noncore/net/mail/viewmailbase.cpp +++ b/noncore/net/mail/viewmailbase.cpp @@ -15,5 +15,5 @@ ViewMailBase::ViewMailBase(QWidget *parent, const char *name, WFlags fl) : QMainWindow(parent, name, fl) { - setCaption(tr("E-Mail by %1")); + setCaption(tr("E-Mail view")); setToolBarsMovable(false); @@ -66,4 +66,5 @@ ViewMailBase::ViewMailBase(QWidget *parent, const char *name, WFlags fl) attachments->hide(); + //header = new QTextBrowser(view); browser = new QTextBrowser(view); diff --git a/noncore/net/mail/viewmailbase.h b/noncore/net/mail/viewmailbase.h index fdaad2a..583b1f6 100644 --- a/noncore/net/mail/viewmailbase.h +++ b/noncore/net/mail/viewmailbase.h @@ -23,5 +23,5 @@ protected: QListView *attachments; QToolBar *toolbar; - QTextBrowser *browser; + QTextBrowser *browser;//,*header; OpenDiag *openDiag; QMenuBar *menubar; |