fixed some problems when displaying mails

but it should reworked cause sometimes there are problems with html mails.
author: alwin <alwin> 2004-10-28 02:12:12 (UTC)
committer: alwin <alwin> 2004-10-28 02:12:12 (UTC)
commit: 6205e982ec6d9ab1893919cd9c943c95b4baae33 (patch) (unidiff)
tree: 7f5eeab32ad333e441956ce3bccf313609a54b83 /noncore/net/mail
parent: beaee4a305e89b27f0482047daf06919fdd9d732 (diff)
download: opie-6205e982ec6d9ab1893919cd9c943c95b4baae33.zip
opie-6205e982ec6d9ab1893919cd9c943c95b4baae33.tar.gz
opie-6205e982ec6d9ab1893919cd9c943c95b4baae33.tar.bz2
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
@@ -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()
    }
+    browser->setTextFormat(Qt::RichText);
-    setCaption( caption().arg( m_mail[0] ) );
+    mailHtml = "<html><body>"
-    m_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>";
+                 "</td></tr></table>";
+    if ( !m_showHtml ) {
-    if ( !m_showHtml )
+        browser->setText( mailHtml+"<font face=fixed>" + QStyleSheet::convertFromPlainText(m_mail[2]) + "</font></body></html>" );
-    {
+    } else {
-        browser->setText( QString( m_mailHtml) + deHtml( m_mail[2] ) + "</font></html>" );
+        browser->setText(mailHtml+m_mail[2].simplifyWhiteSpace()+"</html>");
-    }
-    else
-    {
-        browser->setText( QString( m_mailHtml) + m_mail[2] + "</font></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("&"), "&amp;");
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
@@ -54,2 +54,3 @@ protected slots:
    void setText();
+    void setHeader();
    void slotItemClicked( QListViewItem * item , const QPoint & point, int c );
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
@@ -16,3 +16,3 @@ ViewMailBase::ViewMailBase(QWidget *parent, const char *name, WFlags fl)
 {
-        setCaption(tr("E-Mail by %1"));
+    setCaption(tr("E-Mail view"));
        setToolBarsMovable(false);
@@ -67,2 +67,3 @@ ViewMailBase::ViewMailBase(QWidget *parent, const char *name, WFlags fl)
+    //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
@@ -24,3 +24,3 @@ protected:
        QToolBar *toolbar;
-        QTextBrowser *browser;
+    QTextBrowser *browser;//,*header;
        OpenDiag *openDiag;
author	alwin <alwin>	2004-10-28 02:12:12 (UTC)
committer	alwin <alwin>	2004-10-28 02:12:12 (UTC)
commit	6205e982ec6d9ab1893919cd9c943c95b4baae33 (patch) (unidiff)
tree	7f5eeab32ad333e441956ce3bccf313609a54b83 /noncore/net/mail
parent	beaee4a305e89b27f0482047daf06919fdd9d732 (diff)
download	opie-6205e982ec6d9ab1893919cd9c943c95b4baae33.zip opie-6205e982ec6d9ab1893919cd9c943c95b4baae33.tar.gz opie-6205e982ec6d9ab1893919cd9c943c95b4baae33.tar.bz2

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
406	QString ViewMail::deHtml(const QString &string)	402	QString ViewMail::deHtml(const QString &aString)
407	{	403	{
408	QString string_ = string;	404	QString string_ = aString;
409	string_.replace(QRegExp("&"), "&");	405	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
@@ -54,2 +54,3 @@ protected slots:
54	void setText();	54	void setText();
		55	void setHeader();
55	void slotItemClicked( QListViewItem * item , const QPoint & point, int c );	56	void slotItemClicked( QListViewItem * item , const QPoint & point, int c );


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
@@ -16,3 +16,3 @@ ViewMailBase::ViewMailBase(QWidget parent, const char name, WFlags fl)
16	{	16	{
17	setCaption(tr("E-Mail by %1"));	17	setCaption(tr("E-Mail view"));
18	setToolBarsMovable(false);	18	setToolBarsMovable(false);
@@ -67,2 +67,3 @@ ViewMailBase::ViewMailBase(QWidget parent, const char name, WFlags fl)
67		67
		68	//header = new QTextBrowser(view);
68	browser = new QTextBrowser(view);	69	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
@@ -24,3 +24,3 @@ protected:
24	QToolBar *toolbar;	24	QToolBar *toolbar;
25	QTextBrowser *browser;	25	QTextBrowser browser;//,header;
26	OpenDiag *openDiag;	26	OpenDiag *openDiag;