1 files changed, 56 insertions, 35 deletions
diff --git a/noncore/net/mail/viewmail.cpp b/noncore/net/mail/viewmail.cpp
index d86454c..e11fe1f 100644
--- a/noncore/net/mail/viewmail.cpp
+++ b/noncore/net/mail/viewmail.cpp
@@ -3,12 +3,14 @@
 #include <qtextstream.h>
 #include <qaction.h>
 #include <qpopupmenu.h>
 #include <qfile.h>
 #include <qapplication.h>
+#include <qpe/config.h>
 #include <opie/ofiledialog.h>
 #include "settings.h"
 #include "composemail.h"
 #include "viewmail.h"
 #include "abstractmail.h"
@@ -106,12 +108,18 @@ for (unsigned int i = 0; i < body.Parts().count();++i) {
    o << s << " " << q << "Byte";
    desc = body.Parts()[i].Description();
    curItem=new AttachItem(attachments,curItem,type,desc,filename,fsize,i);
 }
 }
+void ViewMail::slotShowHtml( bool state ) {
+    m_showHtml = state;
+    setText();
+}
 void ViewMail::slotItemClicked( QListViewItem * item , const QPoint & point, int ) {
    if (!item )
        return;
    if (  ( ( AttachItem* )item )->Partnumber() == -1 ) {
        setText();
@@ -161,76 +169,89 @@ void ViewMail::slotItemClicked( QListViewItem * item , const QPoint & point, int
 delete menu;
 }
 void ViewMail::setMail( RecMail mail ) {
-m_recMail = mail;
+    m_recMail = mail;
-m_mail[0] = mail.getFrom();
+    m_mail[0] = mail.getFrom();
-m_mail[1] = mail.getSubject();
+    m_mail[1] = mail.getSubject();
-m_mail[3] = mail.getDate();
+    m_mail[3] = mail.getDate();
-m_mail[4] = mail.Msgid();
+    m_mail[4] = mail.Msgid();
-m_mail2[0] = mail.To();
+    m_mail2[0] = mail.To();
-m_mail2[1] = mail.CC();
+    m_mail2[1] = mail.CC();
-m_mail2[2] = mail.Bcc();
+    m_mail2[2] = mail.Bcc();
-setText();
+    setText();
 }
 ViewMail::ViewMail( QWidget *parent, const char *name, WFlags fl)
        : ViewMailBase(parent, name, fl), _inLoop(false)
 {
        m_gotBody = false;
        deleted = false;
-        connect(reply, SIGNAL(activated()), SLOT(slotReply()));
+        connect( reply, SIGNAL(activated()), SLOT(slotReply()));
-        connect(forward, SIGNAL(activated()), SLOT(slotForward()));
+        connect( forward, SIGNAL(activated()), SLOT(slotForward()));
        connect( deleteMail, SIGNAL( activated() ),  SLOT( slotDeleteMail(  ) ) );
+        connect( showHtml, SIGNAL( toggled( bool ) ), SLOT( slotShowHtml( bool ) ) );
        attachments->setEnabled(m_gotBody);
        connect( attachments,  SIGNAL( clicked ( QListViewItem *, const QPoint & , int ) ), SLOT( slotItemClicked(  QListViewItem *,  const QPoint & , int ) ) );
+        readConfig();
 }
+void ViewMail::readConfig() {
+    Config cfg( "mail" );
+    cfg.setGroup( "Settings" );
+    m_showHtml =  cfg.readBoolEntry( "showHtml", false );
+    showHtml->setOn( m_showHtml );
+}
 void ViewMail::setText()
 {
-  QString toString;
+    QString toString;
-  QString ccString;
+    QString ccString;
-  QString bccString;
+    QString bccString;
-  for ( QStringList::Iterator it = ( m_mail2[0] ).begin(); it != ( m_mail2[0] ).end(); ++it ) {
+    for ( QStringList::Iterator it = ( m_mail2[0] ).begin(); it != ( m_mail2[0] ).end(); ++it ) {
-                  toString += (*it);
+        toString += (*it);
-  }
+    }
-  for ( QStringList::Iterator it = ( m_mail2[1] ).begin(); it != ( m_mail2[1] ).end(); ++it ) {
+    for ( QStringList::Iterator it = ( m_mail2[1] ).begin(); it != ( m_mail2[1] ).end(); ++it ) {
-                  ccString += (*it);
+        ccString += (*it);
-  }
+    }
-  for ( QStringList::Iterator it = ( m_mail2[2] ).begin(); it != ( m_mail2[2] ).end(); ++it ) {
+    for ( QStringList::Iterator it = ( m_mail2[2] ).begin(); it != ( m_mail2[2] ).end(); ++it ) {
-                  bccString += (*it);
+        bccString += (*it);
-  }
+    }
- setCaption( caption().arg( m_mail[0] ) );
+    setCaption( caption().arg( m_mail[0] ) );
-     m_mailHtml = "<html><body>"
+    m_mailHtml = "<html><body>"
-                  "<table width=\"100%\" border=\"0\"><tr bgcolor=\"#FFDD76\"><td>"
+                 "<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>"
+                 "</td></tr><tr bgcolor=\"#EEEEE6\"><td>"
-                         "<b>" + tr( "From" ) + ": </b><font color=#6C86C0>" + deHtml( m_mail[0] ) + "</font><br>"
+                 "<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>" +
+                 "<b>" + tr(  "To" ) + ": </b><font color=#6C86C0>" + deHtml( toString ) + "</font><br><b>" +
-                  tr( "Cc" ) + ": </b>" + deHtml( ccString ) + "<br>"
+                 tr( "Cc" ) + ": </b>" + deHtml( ccString ) + "<br>"
-                      "<b>" + tr( "Date" ) + ": </b> " +  m_mail[3] +
+                 "<b>" + tr( "Date" ) + ": </b> " +  m_mail[3] +
-                  "</td></tr></table><font face=fixed>";
+                 "</td></tr></table><font face=fixed>";
+    if ( !m_showHtml ) {
        browser->setText( QString( m_mailHtml) + deHtml( m_mail[2] ) + "</font></html>" );
-        // remove later in favor of a real handling
+    } else {
-        m_gotBody = true;
+               browser->setText( QString( m_mailHtml) + m_mail[2] + "</font></html>" );
+    }
+    // remove later in favor of a real handling
+    m_gotBody = true;
 }
 ViewMail::~ViewMail()
 {
        hide();