4 files changed, 65 insertions, 67 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
@@ -20,6 +20,7 @@
 #include <qpopupmenu.h>
 #include <qfile.h>
 #include <qlayout.h>
+#include <qstylesheet.h>
 using namespace Opie::Ui;
 using namespace Opie::Core;
@@ -296,6 +297,7 @@ void ViewMail::setMail(const RecMailP&mail )
    m_mail2[1] = mail->CC();
    m_mail2[2] = mail->Bcc();
+    setCaption(tr("E-Mail by %1").arg( m_mail[0] ) );
    setText();
 }
@@ -329,10 +331,10 @@ 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 )
    {
@@ -346,26 +348,20 @@ void ViewMail::setText()
    {
        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>"
+                 "<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;
@@ -403,9 +399,9 @@ 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;");
    string_.replace(QRegExp("<"), "&lt;");
    string_.replace(QRegExp(">"), "&gt;");
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
@@ -52,6 +52,7 @@ 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
@@ -12,70 +12,71 @@
 //#include "opendiag.h"
 ViewMailBase::ViewMailBase(QWidget *parent, const char *name, WFlags fl)
-        : QMainWindow(parent, name, fl)
+    : QMainWindow(parent, name, fl)
 {
-        setCaption(tr("E-Mail by %1"));
+    setCaption(tr("E-Mail view"));
-        setToolBarsMovable(false);
+    setToolBarsMovable(false);
-        toolbar = new QToolBar(this);
+    toolbar = new QToolBar(this);
-  menubar = new QMenuBar( toolbar );
+    menubar = new QMenuBar( toolbar );
-  mailmenu = new QPopupMenu( menubar );
+    mailmenu = new QPopupMenu( menubar );
-  menubar->insertItem( tr( "Mail" ), mailmenu );
+    menubar->insertItem( tr( "Mail" ), mailmenu );
-        toolbar->setHorizontalStretchable(true);
+    toolbar->setHorizontalStretchable(true);
-        addToolBar(toolbar);
+    addToolBar(toolbar);
-        QLabel *spacer = new QLabel(toolbar);
+    QLabel *spacer = new QLabel(toolbar);
-        spacer->setBackgroundMode(QWidget::PaletteButton);
+    spacer->setBackgroundMode(QWidget::PaletteButton);
-        toolbar->setStretchableWidget(spacer);
+    toolbar->setStretchableWidget(spacer);
-        reply = new QAction(tr("Reply"), QIconSet(Resource::loadPixmap("mail/reply")), 0, 0, this);
+    reply = new QAction(tr("Reply"), QIconSet(Resource::loadPixmap("mail/reply")), 0, 0, this);
-        reply->addTo(toolbar);
+    reply->addTo(toolbar);
-         reply->addTo(mailmenu);
+    reply->addTo(mailmenu);
-        forward = new QAction(tr("Forward"), QIconSet(Resource::loadPixmap("mail/forward")), 0, 0, this);
+    forward = new QAction(tr("Forward"), QIconSet(Resource::loadPixmap("mail/forward")), 0, 0, this);
-        forward->addTo(toolbar);
+    forward->addTo(toolbar);
-        forward->addTo(mailmenu);
+    forward->addTo(mailmenu);
-        attachbutton = new QAction(tr("Attachments"), QIconSet(Resource::loadPixmap("mail/attach")), 0, 0, this, 0, true);
+    attachbutton = new QAction(tr("Attachments"), QIconSet(Resource::loadPixmap("mail/attach")), 0, 0, this, 0, true);
-        attachbutton->addTo(toolbar);
+    attachbutton->addTo(toolbar);
-        attachbutton->addTo(mailmenu);
+    attachbutton->addTo(mailmenu);
-        connect(attachbutton, SIGNAL(toggled(bool)), SLOT(slotChangeAttachview(bool)));
+    connect(attachbutton, SIGNAL(toggled(bool)), SLOT(slotChangeAttachview(bool)));
        showHtml = new QAction( tr( "Show Html" ), QIconSet( Resource::loadPixmap( "mail/html" ) ), 0, 0, this, 0, true );
        showHtml->addTo( toolbar );
        showHtml->addTo( mailmenu );
-        deleteMail = new QAction(tr("Delete Mail"), QIconSet(Resource::loadPixmap("trash")), 0, 0, this);
+    deleteMail = new QAction(tr("Delete Mail"), QIconSet(Resource::loadPixmap("trash")), 0, 0, this);
-        deleteMail->addTo(toolbar);
+    deleteMail->addTo(toolbar);
-        deleteMail->addTo(mailmenu);
+    deleteMail->addTo(mailmenu);
-        QVBox *view = new QVBox(this);
+    QVBox *view = new QVBox(this);
-        setCentralWidget(view);
+    setCentralWidget(view);
-        attachments = new QListView(view);
+    attachments = new QListView(view);
-        attachments->setMinimumHeight(90);
+    attachments->setMinimumHeight(90);
-        attachments->setMaximumHeight(90);
+    attachments->setMaximumHeight(90);
-        attachments->setAllColumnsShowFocus(true);
+    attachments->setAllColumnsShowFocus(true);
-        attachments->addColumn("Mime Type", 60);
+    attachments->addColumn("Mime Type", 60);
-        attachments->addColumn(tr("Description"), 100);
+    attachments->addColumn(tr("Description"), 100);
-        attachments->addColumn(tr("Filename"), 80);
+    attachments->addColumn(tr("Filename"), 80);
    attachments->addColumn(tr("Size"), 80);
    attachments->setSorting(-1);
-        attachments->hide();
+    attachments->hide();
-        browser = new QTextBrowser(view);
+    //header = new QTextBrowser(view);
+    browser = new QTextBrowser(view);
-        //openDiag = new OpenDiag(view);
+//  openDiag = new OpenDiag(view);
-        //openDiag->hide();
+//  openDiag->hide();
 }
 void ViewMailBase::slotChangeAttachview(bool state)
 {
-        if (state) attachments->show();
+    if (state) attachments->show();
-        else attachments->hide();
+    else attachments->hide();
 }
 void ViewMailBase::keyPressEvent ( QKeyEvent * e )
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
@@ -13,22 +13,22 @@ class QPopupMenu;
 class ViewMailBase : public QMainWindow
 {
-        Q_OBJECT
+    Q_OBJECT
 public:
-        ViewMailBase(QWidget *parent = 0, const char *name = 0, WFlags fl = 0);
+    ViewMailBase(QWidget *parent = 0, const char *name = 0, WFlags fl = 0);
 protected:
-        QAction *reply, *forward, *attachbutton, *deleteMail, *showHtml;
+    QAction *reply, *forward, *attachbutton, *deleteMail, *showHtml;
-        QListView *attachments;
+    QListView *attachments;
-        QToolBar *toolbar;
+    QToolBar *toolbar;
-        QTextBrowser *browser;
+    QTextBrowser *browser;//,*header;
-        OpenDiag *openDiag;
+    OpenDiag *openDiag;
-         QMenuBar *menubar;
+    QMenuBar *menubar;
-  QPopupMenu *mailmenu;
+    QPopupMenu *mailmenu;
 protected slots:
-        void slotChangeAttachview(bool state);
+    void slotChangeAttachview(bool state);
    virtual void keyPressEvent ( QKeyEvent * e );

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
@@ -20,6 +20,7 @@
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;
@@ -296,6 +297,7 @@ void ViewMail::setMail(const RecMailP&mail )
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
@@ -329,10 +331,10 @@ void ViewMail::readConfig()
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	{
@@ -346,26 +348,20 @@ void ViewMail::setText()
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;
@@ -403,9 +399,9 @@ void ViewMail::exec()
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(">"), ">");


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
@@ -52,6 +52,7 @@ 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 );


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
@@ -12,70 +12,71 @@
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 );
24		24
25	toolbar->setHorizontalStretchable(true);	25	toolbar->setHorizontalStretchable(true);
26	addToolBar(toolbar);	26	addToolBar(toolbar);
27		27
28	QLabel *spacer = new QLabel(toolbar);	28	QLabel *spacer = new QLabel(toolbar);
29	spacer->setBackgroundMode(QWidget::PaletteButton);	29	spacer->setBackgroundMode(QWidget::PaletteButton);
30	toolbar->setStretchableWidget(spacer);	30	toolbar->setStretchableWidget(spacer);
31		31
32	reply = new QAction(tr("Reply"), QIconSet(Resource::loadPixmap("mail/reply")), 0, 0, this);	32	reply = new QAction(tr("Reply"), QIconSet(Resource::loadPixmap("mail/reply")), 0, 0, this);
33	reply->addTo(toolbar);	33	reply->addTo(toolbar);
34	reply->addTo(mailmenu);	34	reply->addTo(mailmenu);
35		35
36	forward = new QAction(tr("Forward"), QIconSet(Resource::loadPixmap("mail/forward")), 0, 0, this);	36	forward = new QAction(tr("Forward"), QIconSet(Resource::loadPixmap("mail/forward")), 0, 0, this);
37	forward->addTo(toolbar);	37	forward->addTo(toolbar);
38	forward->addTo(mailmenu);	38	forward->addTo(mailmenu);
39		39
40	attachbutton = new QAction(tr("Attachments"), QIconSet(Resource::loadPixmap("mail/attach")), 0, 0, this, 0, true);	40	attachbutton = new QAction(tr("Attachments"), QIconSet(Resource::loadPixmap("mail/attach")), 0, 0, this, 0, true);
41	attachbutton->addTo(toolbar);	41	attachbutton->addTo(toolbar);
42	attachbutton->addTo(mailmenu);	42	attachbutton->addTo(mailmenu);
43	connect(attachbutton, SIGNAL(toggled(bool)), SLOT(slotChangeAttachview(bool)));	43	connect(attachbutton, SIGNAL(toggled(bool)), SLOT(slotChangeAttachview(bool)));
44		44
45		45
46	showHtml = new QAction( tr( "Show Html" ), QIconSet( Resource::loadPixmap( "mail/html" ) ), 0, 0, this, 0, true );	46	showHtml = new QAction( tr( "Show Html" ), QIconSet( Resource::loadPixmap( "mail/html" ) ), 0, 0, this, 0, true );
47	showHtml->addTo( toolbar );	47	showHtml->addTo( toolbar );
48	showHtml->addTo( mailmenu );	48	showHtml->addTo( mailmenu );
49		49
50	deleteMail = new QAction(tr("Delete Mail"), QIconSet(Resource::loadPixmap("trash")), 0, 0, this);	50	deleteMail = new QAction(tr("Delete Mail"), QIconSet(Resource::loadPixmap("trash")), 0, 0, this);
51	deleteMail->addTo(toolbar);	51	deleteMail->addTo(toolbar);
52	deleteMail->addTo(mailmenu);	52	deleteMail->addTo(mailmenu);
53		53
54	QVBox *view = new QVBox(this);	54	QVBox *view = new QVBox(this);
55	setCentralWidget(view);	55	setCentralWidget(view);
56		56
57	attachments = new QListView(view);	57	attachments = new QListView(view);
58	attachments->setMinimumHeight(90);	58	attachments->setMinimumHeight(90);
59	attachments->setMaximumHeight(90);	59	attachments->setMaximumHeight(90);
60	attachments->setAllColumnsShowFocus(true);	60	attachments->setAllColumnsShowFocus(true);
61	attachments->addColumn("Mime Type", 60);	61	attachments->addColumn("Mime Type", 60);
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	browser = new QTextBrowser(view);	68	//header = 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	}
74		75
75	void ViewMailBase::slotChangeAttachview(bool state)	76	void ViewMailBase::slotChangeAttachview(bool state)
76	{	77	{
77	if (state) attachments->show();	78	if (state) attachments->show();
78	else attachments->hide();	79	else attachments->hide();
79	}	80	}
80		81
81	void ViewMailBase::keyPressEvent ( QKeyEvent * e )	82	void ViewMailBase::keyPressEvent ( QKeyEvent * e )


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
@@ -13,22 +13,22 @@ class QPopupMenu;
13		13
14	class ViewMailBase : public QMainWindow	14	class ViewMailBase : public QMainWindow
15	{	15	{
16	Q_OBJECT	16	Q_OBJECT
17		17
18	public:	18	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);
32	virtual void keyPressEvent ( QKeyEvent * e );	32	virtual void keyPressEvent ( QKeyEvent * e );
33		33
34		34