ompi html fixes

author: zautrix <zautrix> 2005-02-24 11:19:48 (UTC)
committer: zautrix <zautrix> 2005-02-24 11:19:48 (UTC)
commit: ff8a2f593fae5ffe82f889ab70d32bf02a45f4fb (patch) (unidiff)
tree: b3b4c6ee66b7ae39fad43622a2badacdbe9ed4e1 /kmicromail
parent: 66ea8a0023a2a58e7887a41c265f2a7112b6b625 (diff)
download: kdepimpi-ff8a2f593fae5ffe82f889ab70d32bf02a45f4fb.zip
kdepimpi-ff8a2f593fae5ffe82f889ab70d32bf02a45f4fb.tar.gz
kdepimpi-ff8a2f593fae5ffe82f889ab70d32bf02a45f4fb.tar.bz2
2 files changed, 22 insertions, 3 deletions
diff --git a/kmicromail/viewmail.cpp b/kmicromail/viewmail.cpp
index 726f540..685b4e4 100644
--- a/kmicromail/viewmail.cpp
+++ b/kmicromail/viewmail.cpp
@@ -99,6 +99,18 @@ void ViewMail::setBody(const RecBodyP&body )
    m_body = body;
    m_mail[2] = body->Bodytext();
+    m_showHtml =  KOPrefs::instance()->mViewAsHtml;
+    if ( m_showHtml ) {
+        if ( m_mail[2].find ("<html>",0,false ) > -1 ) {
+            qDebug("html mail ");
+        } else {
+            qDebug("no html mail ");
+            m_showHtml = false;
+        }
+    }
+    showHtml->blockSignals( true );
+    showHtml->setOn( m_showHtml );
+    showHtml->blockSignals( false );
    // qDebug("********text %s ",m_mail[2].latin1() );
    attachbutton->setEnabled(body->Parts().count()>0);
    attachments->setEnabled(body->Parts().count()>0);
@@ -331,7 +343,14 @@ void ViewMail::setMail(const RecMailP&mail )
    setText();
 }
+void ViewMail::slotNextMail() 
+{ 
+    nextMail->blockSignals( true );
+    setCaption(i18n("Displaying next mail...please wait!")); 
+    qApp->processEvents();
+    emit  showNextMail(this); 
+    nextMail->blockSignals( false );
+}
 ViewMail::ViewMail( QWidget *parent, const char *name, WFlags fl)
        : ViewMailBase(parent, name, fl), _inLoop(false)
@@ -339,6 +358,7 @@ ViewMail::ViewMail( QWidget *parent, const char *name, WFlags fl)
    m_gotBody = false;
    deleted = false;
    sourceOn = false;
+    readConfig();
    connect( reply, SIGNAL(activated()), SLOT(slotReply()));
    connect( forward, SIGNAL(activated()), SLOT(slotForward()));
    connect( deleteMail, SIGNAL( activated() ),  SLOT( slotDeleteMail() ) );
@@ -351,7 +371,6 @@ ViewMail::ViewMail( QWidget *parent, const char *name, WFlags fl)
    attachments->setEnabled(m_gotBody);
    connect( attachments,  SIGNAL( clicked(QListViewItem*,const QPoint&, int) ), SLOT( slotItemClicked(QListViewItem*,const QPoint&, int) ) );
-    readConfig();
    attachments->setSorting(-1);
 }
diff --git a/kmicromail/viewmail.h b/kmicromail/viewmail.h
index fc5edcf..bb5b685 100644
--- a/kmicromail/viewmail.h
+++ b/kmicromail/viewmail.h
@@ -54,7 +54,7 @@ protected:
    AttachItem* lastChild(AttachItem*parent);
 protected slots:
-    void slotNextMail() { setCaption(i18n("Displaying next mail...please wait!")); qApp->processEvents();emit  showNextMail(this); };
+    void slotNextMail();
    void slotReply();
    void slotForward();
    void setText();
author	zautrix <zautrix>	2005-02-24 11:19:48 (UTC)
committer	zautrix <zautrix>	2005-02-24 11:19:48 (UTC)
commit	ff8a2f593fae5ffe82f889ab70d32bf02a45f4fb (patch) (unidiff)
tree	b3b4c6ee66b7ae39fad43622a2badacdbe9ed4e1 /kmicromail
parent	66ea8a0023a2a58e7887a41c265f2a7112b6b625 (diff)
download	kdepimpi-ff8a2f593fae5ffe82f889ab70d32bf02a45f4fb.zip kdepimpi-ff8a2f593fae5ffe82f889ab70d32bf02a45f4fb.tar.gz kdepimpi-ff8a2f593fae5ffe82f889ab70d32bf02a45f4fb.tar.bz2

diff --git a/kmicromail/viewmail.cpp b/kmicromail/viewmail.cpp index 726f540..685b4e4 100644 --- a/kmicromail/viewmail.cpp +++ b/kmicromail/viewmail.cpp
@@ -99,6 +99,18 @@ void ViewMail::setBody(const RecBodyP&body )
99		99
100	m_body = body;	100	m_body = body;
101	m_mail[2] = body->Bodytext();	101	m_mail[2] = body->Bodytext();
		102	m_showHtml = KOPrefs::instance()->mViewAsHtml;
		103	if ( m_showHtml ) {
		104	if ( m_mail[2].find ("<html>",0,false ) > -1 ) {
		105	qDebug("html mail ");
		106	} else {
		107	qDebug("no html mail ");
		108	m_showHtml = false;
		109	}
		110	}
		111	showHtml->blockSignals( true );
		112	showHtml->setOn( m_showHtml );
		113	showHtml->blockSignals( false );
102	// qDebug("********text %s ",m_mail[2].latin1() );	114	// qDebug("********text %s ",m_mail[2].latin1() );
103	attachbutton->setEnabled(body->Parts().count()>0);	115	attachbutton->setEnabled(body->Parts().count()>0);
104	attachments->setEnabled(body->Parts().count()>0);	116	attachments->setEnabled(body->Parts().count()>0);
@@ -331,7 +343,14 @@ void ViewMail::setMail(const RecMailP&mail )
331	setText();	343	setText();
332	}	344	}
333		345
334		346	void ViewMail::slotNextMail()
		347	{
		348	nextMail->blockSignals( true );
		349	setCaption(i18n("Displaying next mail...please wait!"));
		350	qApp->processEvents();
		351	emit showNextMail(this);
		352	nextMail->blockSignals( false );
		353	}
335		354
336	ViewMail::ViewMail( QWidget parent, const char name, WFlags fl)	355	ViewMail::ViewMail( QWidget parent, const char name, WFlags fl)
337	: ViewMailBase(parent, name, fl), _inLoop(false)	356	: ViewMailBase(parent, name, fl), _inLoop(false)
@@ -339,6 +358,7 @@ ViewMail::ViewMail( QWidget parent, const char name, WFlags fl)
339	m_gotBody = false;	358	m_gotBody = false;
340	deleted = false;	359	deleted = false;
341	sourceOn = false;	360	sourceOn = false;
		361	readConfig();
342	connect( reply, SIGNAL(activated()), SLOT(slotReply()));	362	connect( reply, SIGNAL(activated()), SLOT(slotReply()));
343	connect( forward, SIGNAL(activated()), SLOT(slotForward()));	363	connect( forward, SIGNAL(activated()), SLOT(slotForward()));
344	connect( deleteMail, SIGNAL( activated() ), SLOT( slotDeleteMail() ) );	364	connect( deleteMail, SIGNAL( activated() ), SLOT( slotDeleteMail() ) );
@@ -351,7 +371,6 @@ ViewMail::ViewMail( QWidget parent, const char name, WFlags fl)
351	attachments->setEnabled(m_gotBody);	371	attachments->setEnabled(m_gotBody);
352	connect( attachments, SIGNAL( clicked(QListViewItem,const QPoint&, int) ), SLOT( slotItemClicked(QListViewItem,const QPoint&, int) ) );	372	connect( attachments, SIGNAL( clicked(QListViewItem,const QPoint&, int) ), SLOT( slotItemClicked(QListViewItem,const QPoint&, int) ) );
353		373
354	readConfig();
355	attachments->setSorting(-1);	374	attachments->setSorting(-1);
356	}	375	}
357		376


diff --git a/kmicromail/viewmail.h b/kmicromail/viewmail.h index fc5edcf..bb5b685 100644 --- a/kmicromail/viewmail.h +++ b/kmicromail/viewmail.h
@@ -54,7 +54,7 @@ protected:
54	AttachItem* lastChild(AttachItem*parent);	54	AttachItem* lastChild(AttachItem*parent);
55		55
56	protected slots:	56	protected slots:
57	void slotNextMail() { setCaption(i18n("Displaying next mail...please wait!")); qApp->processEvents();emit showNextMail(this); };	57	void slotNextMail();
58	void slotReply();	58	void slotReply();
59	void slotForward();	59	void slotForward();
60	void setText();	60	void setText();