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
@@ -17,12 +17,13 @@
 #include <qmessagebox.h>
 #include <qtextstream.h>
 #include <qaction.h>
 #include <qpopupmenu.h>
 #include <qfile.h>
 #include <qlayout.h>
+#include <qstylesheet.h>
 using namespace Opie::Ui;
 using namespace Opie::Core;
 AttachItem::AttachItem(QListView * parent,QListViewItem *after, const QString&mime,const QString&desc,const QString&file,
                       const QString&fsize,int num,const QValueList<int>&path)
@@ -293,12 +294,13 @@ void ViewMail::setMail(const RecMailP&mail )
    m_mail[4] = mail->Msgid();
    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();
 }
 ViewMail::ViewMail( QWidget *parent, const char *name, WFlags fl)
@@ -326,16 +328,16 @@ void ViewMail::readConfig()
    m_showHtml =  cfg.readBoolEntry( "showHtml", false );
    showHtml->setOn( m_showHtml );
 }
 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);
    }
    for ( QStringList::Iterator it = ( m_mail2[1] ).begin(); it != ( m_mail2[1] ).end(); ++it )
@@ -343,32 +345,26 @@ void ViewMail::setText()
        ccString += (*it);
    }
    for ( QStringList::Iterator it = ( m_mail2[2] ).begin(); it != ( m_mail2[2] ).end(); ++it )
    {
        bccString += (*it);
    }
+    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>"
                 "<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>";
+                 "</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>" );
    }
    // remove later in favor of a real handling
    m_gotBody = true;
 }
@@ -400,15 +396,15 @@ void ViewMail::exec()
        _inLoop = true;
        qApp->enter_loop();
    }
 }
-QString ViewMail::deHtml(const QString &string)
+QString ViewMail::deHtml(const QString &aString)
 {
-    QString string_ = string;
+    QString string_ = aString;
    string_.replace(QRegExp("&"), "&amp;");
    string_.replace(QRegExp("<"), "&lt;");
    string_.replace(QRegExp(">"), "&gt;");
    string_.replace(QRegExp("\\n"), "<br>");
    return string_;
 }
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
@@ -49,12 +49,13 @@ protected:
    AttachItem* lastChild(AttachItem*parent);
 protected slots:
    void slotReply();
    void slotForward();
    void setText();
+    void setHeader();
    void slotItemClicked( QListViewItem * item , const QPoint & point, int c );
    void slotDeleteMail( );
    void slotShowHtml( bool );
 private:
    void readConfig();
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
@@ -11,13 +11,13 @@
 #include "viewmailbase.h"
 //#include "opendiag.h"
 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 );
  mailmenu = new QPopupMenu( menubar );
  menubar->insertItem( tr( "Mail" ), mailmenu );
@@ -62,12 +62,13 @@ ViewMailBase::ViewMailBase(QWidget *parent, const char *name, WFlags fl)
        attachments->addColumn(tr("Description"), 100);
        attachments->addColumn(tr("Filename"), 80);
    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
@@ -19,13 +19,13 @@ public:
        ViewMailBase(QWidget *parent = 0, const char *name = 0, WFlags fl = 0);
 protected:
        QAction *reply, *forward, *attachbutton, *deleteMail, *showHtml;
        QListView *attachments;
        QToolBar *toolbar;
-        QTextBrowser *browser;
+    QTextBrowser *browser;//,*header;
        OpenDiag *openDiag;
         QMenuBar *menubar;
  QPopupMenu *mailmenu;
 protected slots:
        void slotChangeAttachview(bool state);

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
@@ -17,12 +17,13 @@
17	#include <qmessagebox.h>	17	#include <qmessagebox.h>
18	#include <qtextstream.h>	18	#include <qtextstream.h>
19	#include <qaction.h>	19	#include <qaction.h>
20	#include <qpopupmenu.h>	20	#include <qpopupmenu.h>
21	#include <qfile.h>	21	#include <qfile.h>
22	#include <qlayout.h>	22	#include <qlayout.h>
		23	#include <qstylesheet.h>
23		24
24	using namespace Opie::Ui;	25	using namespace Opie::Ui;
25	using namespace Opie::Core;	26	using namespace Opie::Core;
26		27
27	AttachItem::AttachItem(QListView * parent,QListViewItem *after, const QString&mime,const QString&desc,const QString&file,	28	AttachItem::AttachItem(QListView * parent,QListViewItem *after, const QString&mime,const QString&desc,const QString&file,
28	const QString&fsize,int num,const QValueList<int>&path)	29	const QString&fsize,int num,const QValueList<int>&path)
@@ -293,12 +294,13 @@ void ViewMail::setMail(const RecMailP&mail )
293	m_mail[4] = mail->Msgid();	294	m_mail[4] = mail->Msgid();
294		295
295	m_mail2[0] = mail->To();	296	m_mail2[0] = mail->To();
296	m_mail2[1] = mail->CC();	297	m_mail2[1] = mail->CC();
297	m_mail2[2] = mail->Bcc();	298	m_mail2[2] = mail->Bcc();
298		299
		300	setCaption(tr("E-Mail by %1").arg( m_mail[0] ) );
299	setText();	301	setText();
300	}	302	}
301		303
302		304
303		305
304	ViewMail::ViewMail( QWidget parent, const char name, WFlags fl)	306	ViewMail::ViewMail( QWidget parent, const char name, WFlags fl)
@@ -326,16 +328,16 @@ void ViewMail::readConfig()
326	m_showHtml = cfg.readBoolEntry( "showHtml", false );	328	m_showHtml = cfg.readBoolEntry( "showHtml", false );
327	showHtml->setOn( m_showHtml );	329	showHtml->setOn( m_showHtml );
328	}	330	}
329		331
330	void ViewMail::setText()	332	void ViewMail::setText()
331	{	333	{
332
333	QString toString;	334	QString toString;
334	QString ccString;	335	QString ccString;
335	QString bccString;	336	QString bccString;
		337	QString mailHtml;
336		338
337	for ( QStringList::Iterator it = ( m_mail2[0] ).begin(); it != ( m_mail2[0] ).end(); ++it )	339	for ( QStringList::Iterator it = ( m_mail2[0] ).begin(); it != ( m_mail2[0] ).end(); ++it )
338	{	340	{
339	toString += (*it);	341	toString += (*it);
340	}	342	}
341	for ( QStringList::Iterator it = ( m_mail2[1] ).begin(); it != ( m_mail2[1] ).end(); ++it )	343	for ( QStringList::Iterator it = ( m_mail2[1] ).begin(); it != ( m_mail2[1] ).end(); ++it )
@@ -343,32 +345,26 @@ void ViewMail::setText()
343	ccString += (*it);	345	ccString += (*it);
344	}	346	}
345	for ( QStringList::Iterator it = ( m_mail2[2] ).begin(); it != ( m_mail2[2] ).end(); ++it )	347	for ( QStringList::Iterator it = ( m_mail2[2] ).begin(); it != ( m_mail2[2] ).end(); ++it )
346	{	348	{
347	bccString += (*it);	349	bccString += (*it);
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>"
354	"<div align=left><b>" + deHtml( m_mail[1] ) + "</b></div>"	354	"<div align=left><b>" + deHtml( m_mail[1] ) + "</b></div>"
355	"</td></tr><tr bgcolor=\"#EEEEE6\"><td>"	355	"</td></tr><tr bgcolor=\"#EEEEE6\"><td>"
356	"<b>" + tr( "From" ) + ": </b><font color=#6C86C0>" + deHtml( m_mail[0] ) + "</font><br>"	356	"<b>" + tr( "From" ) + ": </b><font color=#6C86C0>" + deHtml( m_mail[0] ) + "</font><br>"
357	"<b>" + tr( "To" ) + ": </b><font color=#6C86C0>" + deHtml( toString ) + "</font><br><b>" +	357	"<b>" + tr( "To" ) + ": </b><font color=#6C86C0>" + deHtml( toString ) + "</font><br><b>" +
358	tr( "Cc" ) + ": </b>" + deHtml( ccString ) + "<br>"	358	tr( "Cc" ) + ": </b>" + deHtml( ccString ) + "<br>"
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	}
370	// remove later in favor of a real handling	366	// remove later in favor of a real handling
371	m_gotBody = true;	367	m_gotBody = true;
372	}	368	}
373		369
374		370
@@ -400,15 +396,15 @@ void ViewMail::exec()
400	_inLoop = true;	396	_inLoop = true;
401	qApp->enter_loop();	397	qApp->enter_loop();
402	}	398	}
403		399
404	}	400	}
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("&"), "&");
410	string_.replace(QRegExp("<"), "<");	406	string_.replace(QRegExp("<"), "<");
411	string_.replace(QRegExp(">"), ">");	407	string_.replace(QRegExp(">"), ">");
412	string_.replace(QRegExp("\\n"), "<br>");	408	string_.replace(QRegExp("\\n"), "<br>");
413	return string_;	409	return string_;
414	}	410	}


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
@@ -49,12 +49,13 @@ protected:
49	AttachItem* lastChild(AttachItem*parent);	49	AttachItem* lastChild(AttachItem*parent);
50		50
51	protected slots:	51	protected slots:
52	void slotReply();	52	void slotReply();
53	void slotForward();	53	void slotForward();
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 );
56	void slotDeleteMail( );	57	void slotDeleteMail( );
57	void slotShowHtml( bool );	58	void slotShowHtml( bool );
58		59
59	private:	60	private:
60	void readConfig();	61	void readConfig();


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
@@ -11,13 +11,13 @@
11	#include "viewmailbase.h"	11	#include "viewmailbase.h"
12	//#include "opendiag.h"	12	//#include "opendiag.h"
13		13
14	ViewMailBase::ViewMailBase(QWidget parent, const char name, WFlags fl)	14	ViewMailBase::ViewMailBase(QWidget parent, const char name, WFlags fl)
15	: QMainWindow(parent, name, fl)	15	: QMainWindow(parent, name, fl)
16	{	16	{
17	setCaption(tr("E-Mail by %1"));	17	setCaption(tr("E-Mail view"));
18	setToolBarsMovable(false);	18	setToolBarsMovable(false);
19		19
20	toolbar = new QToolBar(this);	20	toolbar = new QToolBar(this);
21	menubar = new QMenuBar( toolbar );	21	menubar = new QMenuBar( toolbar );
22	mailmenu = new QPopupMenu( menubar );	22	mailmenu = new QPopupMenu( menubar );
23	menubar->insertItem( tr( "Mail" ), mailmenu );	23	menubar->insertItem( tr( "Mail" ), mailmenu );
@@ -62,12 +62,13 @@ ViewMailBase::ViewMailBase(QWidget parent, const char name, WFlags fl)
62	attachments->addColumn(tr("Description"), 100);	62	attachments->addColumn(tr("Description"), 100);
63	attachments->addColumn(tr("Filename"), 80);	63	attachments->addColumn(tr("Filename"), 80);
64	attachments->addColumn(tr("Size"), 80);	64	attachments->addColumn(tr("Size"), 80);
65	attachments->setSorting(-1);	65	attachments->setSorting(-1);
66	attachments->hide();	66	attachments->hide();
67		67
		68	//header = new QTextBrowser(view);
68	browser = new QTextBrowser(view);	69	browser = new QTextBrowser(view);
69		70
70	//openDiag = new OpenDiag(view);	71	//openDiag = new OpenDiag(view);
71	//openDiag->hide();	72	//openDiag->hide();
72		73
73	}	74	}


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
@@ -19,13 +19,13 @@ public:
19	ViewMailBase(QWidget parent = 0, const char name = 0, WFlags fl = 0);	19	ViewMailBase(QWidget parent = 0, const char name = 0, WFlags fl = 0);
20		20
21	protected:	21	protected:
22	QAction reply, forward, attachbutton, deleteMail, *showHtml;	22	QAction reply, forward, attachbutton, deleteMail, *showHtml;
23	QListView *attachments;	23	QListView *attachments;
24	QToolBar *toolbar;	24	QToolBar *toolbar;
25	QTextBrowser *browser;	25	QTextBrowser browser;//,header;
26	OpenDiag *openDiag;	26	OpenDiag *openDiag;
27	QMenuBar *menubar;	27	QMenuBar *menubar;
28	QPopupMenu *mailmenu;	28	QPopupMenu *mailmenu;
29		29
30	protected slots:	30	protected slots:
31	void slotChangeAttachview(bool state);	31	void slotChangeAttachview(bool state);