| author | alwin <alwin> | 2004-10-28 02:12:12 (UTC) |
|---|---|---|
| committer | alwin <alwin> | 2004-10-28 02:12:12 (UTC) |
| commit | 6205e982ec6d9ab1893919cd9c943c95b4baae33 (patch) (side-by-side diff) | |
| tree | 7f5eeab32ad333e441956ce3bccf313609a54b83 | |
| parent | beaee4a305e89b27f0482047daf06919fdd9d732 (diff) | |
| download | opie-6205e982ec6d9ab1893919cd9c943c95b4baae33.zip opie-6205e982ec6d9ab1893919cd9c943c95b4baae33.tar.gz opie-6205e982ec6d9ab1893919cd9c943c95b4baae33.tar.bz2 | |
fixed some problems when displaying mails
but it should reworked cause sometimes there are problems with html
mails.
| -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 @@ -19,8 +19,9 @@ #include <qaction.h> #include <qpopupmenu.h> #include <qfile.h> #include <qlayout.h> +#include <qstylesheet.h> using namespace Opie::Ui; using namespace Opie::Core; @@ -295,8 +296,9 @@ void ViewMail::setMail(const RecMailP&mail ) m_mail2[0] = mail->To(); m_mail2[1] = mail->CC(); m_mail2[2] = mail->Bcc(); + setCaption(tr("E-Mail by %1").arg( m_mail[0] ) ); setText(); } @@ -328,12 +330,12 @@ 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 ) { toString += (*it); @@ -345,28 +347,22 @@ void ViewMail::setText() for ( QStringList::Iterator it = ( m_mail2[2] ).begin(); it != ( m_mail2[2] ).end(); ++it ) { 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>" "</td></tr><tr bgcolor=\"#EEEEE6\"><td>" "<b>" + tr( "From" ) + ": </b><font color=#6C86C0>" + deHtml( m_mail[0] ) + "</font><br>" "<b>" + tr( "To" ) + ": </b><font color=#6C86C0>" + deHtml( toString ) + "</font><br><b>" + 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 m_gotBody = true; } @@ -402,11 +398,11 @@ 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("<"), "<"); string_.replace(QRegExp(">"), ">"); string_.replace(QRegExp("\\n"), "<br>"); 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 @@ -51,8 +51,9 @@ protected: protected slots: void slotReply(); void slotForward(); void setText(); + void setHeader(); void slotItemClicked( QListViewItem * item , const QPoint & point, int c ); void slotDeleteMail( ); void slotShowHtml( bool ); 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 @@ -13,9 +13,9 @@ 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); toolbar = new QToolBar(this); menubar = new QMenuBar( toolbar ); @@ -64,8 +64,9 @@ ViewMailBase::ViewMailBase(QWidget *parent, const char *name, WFlags fl) attachments->addColumn(tr("Size"), 80); attachments->setSorting(-1); attachments->hide(); + //header = new QTextBrowser(view); browser = new QTextBrowser(view); // openDiag = new OpenDiag(view); // openDiag->hide(); 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 @@ -21,9 +21,9 @@ public: protected: QAction *reply, *forward, *attachbutton, *deleteMail, *showHtml; QListView *attachments; QToolBar *toolbar; - QTextBrowser *browser; + QTextBrowser *browser;//,*header; OpenDiag *openDiag; QMenuBar *menubar; QPopupMenu *mailmenu; |