code cleanups and output beautification

3 files changed, 43 insertions, 84 deletions

diff --git a/noncore/net/mail/mainwindow.cpp b/noncore/net/mail/mainwindow.cpp
index 6d13a8b..1d6e901 100644
--- a/noncore/net/mail/mainwindow.cpp
+++ b/noncore/net/mail/mainwindow.cpp
@@ -138,39 +138,38 @@ void MainWindow::slotShowFolders( bool show )
     }
 }
 
 void MainWindow::refreshMailView(QList<RecMail>*list)
 {
     MailListViewItem*item = 0;
     mailView->clear();
     for (unsigned int i = 0; i < list->count();++i) {
         item = new MailListViewItem(mailView,item);
         item->storeData(*(list->at(i)));
         item->showEntry();
     }
 }
 void MainWindow::displayMail(QListViewItem*item)
 {
     if (!item) return;
-    qDebug("View mail");
     RecMail mail = ((MailListViewItem*)item)->data();
     RecBody body = folderView->fetchBody(mail);
 
     ViewMail readMail( this );
-
-    readMail.setMailInfo( mail.getFrom(), mail.To(), mail.getSubject(), mail.CC(), mail.Bcc(), mail.getDate(),  body.Bodytext(), mail.Msgid() );
+    readMail.setBody( body );
+    readMail.setMail( mail );
     readMail.showMaximized();
     readMail.exec();
 }
 
 MailListViewItem::MailListViewItem(QListView * parent, MailListViewItem * after )
         :QListViewItem(parent,after),mail_data()
 {
 }
 
 void MailListViewItem::showEntry()
 {
     setText(0,mail_data.getSubject());
     setText(1,mail_data.getFrom());
     setText(2,mail_data.getDate());
 }
 
diff --git a/noncore/net/mail/viewmail.cpp b/noncore/net/mail/viewmail.cpp
index 7969235..7b8494d 100644
--- a/noncore/net/mail/viewmail.cpp
+++ b/noncore/net/mail/viewmail.cpp
@@ -10,100 +10,101 @@
 AttachItem::AttachItem(QListView *parent, AttachItemStore &attachItemStore)
         : QListViewItem(parent), _attachItemStore(attachItemStore)
 {
         setText(0, _attachItemStore.mimeType());
         setText(1, _attachItemStore.fileName());
         setText(2, _attachItemStore.description());
 }
 
 AttachItem::AttachItem(QListViewItem *parent, AttachItemStore &attachItemStore)
         : QListViewItem(parent), _attachItemStore(attachItemStore)
 {
         setText(0, _attachItemStore.mimeType());
         setText(1, _attachItemStore.fileName());
         setText(2, _attachItemStore.description());
 }
 
-void ViewMail::setMailInfo( const QString & from, const QStringList & to, const QString & subject, const QStringList & cc, const QStringList & bcc, const QString & date, const QString & bodytext, const QString & messageID ) {
 
-m_mail[0] = from;
-m_mail2[0] = to;
-m_mail[1] = subject;
-m_mail2[1] = cc;
-m_mail2[2] = bcc;
-m_mail[2] = bodytext;
-m_mail[3] = date;
-m_mail[4] = messageID;
+void ViewMail::setBody( RecBody body ) {
+
+m_mail[2] = body.Bodytext();
+
+}
+
+void ViewMail::setMail( RecMail mail ) {
+
+m_mail[0] = mail.getFrom();
+m_mail[1] = mail.getSubject();
+m_mail[3] = mail.getDate();
+m_mail[4] = mail.Msgid();
+
+m_mail2[0] = mail.To();
+m_mail2[1] = mail.CC();
+m_mail2[2] = mail.Bcc();
 
 setText();
 }
 
 
+
 ViewMail::ViewMail( QWidget *parent, const char *name, WFlags fl)
         : ViewMailBase(parent, name, fl), _inLoop(false)
 {
-        _gotBody = false;
+        m_gotBody = false;
 
         connect(reply, SIGNAL(activated()), SLOT(slotReply()));
         connect(forward, SIGNAL(activated()), SLOT(slotForward()));
 
-        attachments->setEnabled(_gotBody);
-
-        //_handler->iUid("FETCH", QString("%1 (BODY[1])").arg(mail.uid()));
-        //connect(_handler, SIGNAL(gotResponse(IMAPResponse &)), SLOT(slotIMAPUid(IMAPResponse &)));
+        attachments->setEnabled(m_gotBody);
 }
 
 void ViewMail::setText()
 {
 
   QString toString;
   QString ccString;
   QString bccString;
 
   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 ) {
                   ccString += (*it);
   }
   for ( QStringList::Iterator it = ( m_mail2[2] ).begin(); it != ( m_mail2[2] ).end(); ++it ) {
                   bccString += (*it);
   }
 
  setCaption( caption().arg( m_mail[0] ) );
 
-     _mailHtml = tr(
-                "<html><body>"
-                "<div align=center><b><font color=#0000FF>%1</b></font></div>"
-                "<b>From:</b><font color=#6C86C0> %2</font><br>"
-                "<b>To:</b><font color=#6C86C0> %3</font><br>"
-                "%4"
-                    "<b>Date:</b> %5<hr>"
-                "<font face=fixed>")
-                .arg( deHtml( m_mail[1] ) )
-                .arg( deHtml( m_mail[0] ) )
-                .arg( deHtml( toString ) )
-                .arg( tr("<b>Cc:</b> %1<br>").arg( deHtml( ccString ) ) )
-                .arg( m_mail[3] );
-        browser->setText( QString(_mailHtml) + deHtml( m_mail[2] ) + "</font>" );
+     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>";
+
+        browser->setText( QString( m_mailHtml) + deHtml( m_mail[2] ) + "</font></html>" );
         // remove later in favor of a real handling
-        _gotBody = true;
+        m_gotBody = true;
 }
 
 
-
 ViewMail::~ViewMail()
 {
         hide();
 }
 
 void ViewMail::hide()
 {
         QWidget::hide();
 
         if (_inLoop) {
                 _inLoop = false;
                 qApp->exit_loop();
         }
 }
 
 void ViewMail::exec()
@@ -115,111 +116,81 @@ void ViewMail::exec()
                 qApp->enter_loop();
         }
 }
 
 QString ViewMail::deHtml(const QString &string)
 {
         QString string_ = string;
         string_.replace(QRegExp("&"), "&amp;");
         string_.replace(QRegExp("<"), "&lt;");
         string_.replace(QRegExp(">"), "&gt;");
         string_.replace(QRegExp("\\n"), "<br>");
         return string_;
 }
 
 void ViewMail::slotReply()
 {
-        if (!_gotBody) {
+        if (!m_gotBody) {
                 QMessageBox::information(this, tr("Error"), tr("<p>The mail body is not yet downloaded, so you cannot reply yet."), tr("Ok"));
                 return;
         }
 
         QString rtext;
                 rtext += QString("* %1 wrote on %2:\n")         // no i18n on purpose
                 .arg(  m_mail[1] )
                 .arg( m_mail[3] );
 
         QString text = m_mail[2];
         QStringList lines = QStringList::split(QRegExp("\\n"), text);
         QStringList::Iterator it;
         for (it = lines.begin(); it != lines.end(); it++) {
                 rtext += "> " + *it + "\n";
         }
         rtext += "\n";
 
         QString prefix;
         if ( m_mail[1].find(QRegExp("^Re: *$")) != -1) prefix = "";
                 else prefix = "Re: ";                   // no i18n on purpose
 
         Settings *settings = new Settings();
         ComposeMail composer( settings ,this, 0, true);
         composer.setTo( m_mail[0] );
         composer.setSubject( "Re: " + m_mail[1] );
         composer.setMessage( rtext );
         composer.showMaximized();
         composer.exec();
 
-      qDebug ( rtext );
 }
 
 void ViewMail::slotForward()
 {
-        if (!_gotBody) {
+        if (!m_gotBody) {
                 QMessageBox::information(this, tr("Error"), tr("<p>The mail body is not yet downloaded, so you cannot forward yet."), tr("Ok"));
                 return;
         }
 
         QString ftext;
         ftext += QString("\n----- Forwarded message from %1 -----\n\n")
                 .arg( m_mail[0] );
         if (!m_mail[3].isNull())
                  ftext += QString("Date: %1\n")
                          .arg( m_mail[3] );
         if (!m_mail[0].isNull())
                  ftext += QString("From: %1\n")
                          .arg( m_mail[0] );
-        //if (!_mail.envelope().to().toString().isNull())
-                //ftext += QString("To: %1\n")
-                //      .arg(_mail.envelope().to().toString());
-        //if (!_mail.envelope().cc().toString().isNull())
-                //ftext += QString("Cc: %1\n")
-                //      .arg(_mail.envelope().cc().toString());
         if (!m_mail[1].isNull())
                  ftext += QString("Subject: %1\n")
                          .arg( m_mail[1] );
 
         ftext += QString("\n%1\n")
                  .arg( m_mail[2]);
 
         ftext += QString("----- End forwarded message -----\n");
 
-        qDebug( ftext );
-
-
         Settings *settings = new Settings();
         ComposeMail composer( settings ,this, 0, true);
         composer.setSubject( "Fwd: " + m_mail[1] );
         composer.setMessage( ftext );
         composer.showMaximized();
         composer.exec();
 }
 
-/*
-void ViewMail::slotIMAPUid(IMAPResponse &response)
-{
-        disconnect(_handler, SIGNAL(gotResponse(IMAPResponse &)), this, SLOT(slotIMAPUid(IMAPResponse &)));
-
-        if (response.statusResponse().status() == IMAPResponseEnums::OK) {
-                QValueList<IMAPResponseBodyPart> bodyParts;
-                bodyParts.append(response.FETCH()[0].bodyPart(0));
-                _mail.setBodyParts(bodyParts);
-
-                browser->setText(QString(_mailHtml).arg(deHtml(response.FETCH()[0].bodyPart(0).data())));
-
-        //      fillList(response.FETCH()[0].bodyStructure());
-
-                _gotBody = true;
-        } else {
-                QMessageBox::warning(this, tr("Error"), tr("<p>I was unable to retrieve the mail from the server. You can try again later or give up.</p>"), tr("Ok"));
-        }
-}
-*/
diff --git a/noncore/net/mail/viewmail.h b/noncore/net/mail/viewmail.h
index 258c09b..61baa1d 100644
--- a/noncore/net/mail/viewmail.h
+++ b/noncore/net/mail/viewmail.h
@@ -1,26 +1,25 @@
 #ifndef VIEWMAIL_H
 #define VIEWMAIL_H
 
 #include <qlistview.h>
 #include <qmap.h>
 #include <qstringlist.h>
 
 #include "viewmailbase.h"
-//#include "imapresponse.h"
-//#include "mailtable.h"
+#include "mailtypes.h"
 
 class AttachItemStore 
 {
 public:
         void setMimeType(QString mimeType) { _mimeType = mimeType; }
         QString mimeType() { return _mimeType; }
         void setFileName(QString fileName) { _fileName = fileName; }
         QString fileName() { return _fileName; }
         void setDescription(QString description) { _description = description; }
         QString description() { return _description; }
         void setPartNum(QString partNum) { _partNum = partNum; }
         QString partNum() { return _partNum; }
 
 private:
         QString _mimeType, _fileName, _description, _partNum;
 
@@ -36,50 +35,40 @@ public:
 
 private:
         AttachItemStore _attachItemStore;
 
 };
 
 class ViewMail : public ViewMailBase
 {
         Q_OBJECT
 
 public:
         ViewMail(  QWidget *parent = 0, const char *name = 0, WFlags fl = Qt::WType_Modal);
         ~ViewMail();
 
         void hide();
         void exec();
-    static QString appName() { return QString::fromLatin1("mail"); }
-        void setMailInfo( const QString & from, const QStringList & to, const QString & subject, const QStringList & cc, const QStringList & bcc,const QString & date, const QString & bodytext, const QString & messageID );
+        void setMail( RecMail mail );
+        void setBody( RecBody body );
 
 protected:
-        //void fillList(IMAPResponseBODYSTRUCTURE &structure);
         QString deHtml(const QString &string);
 
 protected slots:
         void slotReply();
         void slotForward();
         void setText();
 
-        //void slotIMAPUid(IMAPResponse &response);
-
 private:
         bool _inLoop;
-        //IMAPResponseFETCH _mail;
-        //IMAPHandler *_handler;
-        QString _mailHtml;
-        bool _gotBody;
-
-        // 0 from
-        // 1 subject
-        // 2 bodytext
-        // 3 date
+        QString m_mailHtml;
+        bool m_gotBody;
+
+        // 0 from  1 subject  2 bodytext 3 date
         QMap <int,QString>  m_mail;
-        // 0 to
-        // 1 cc
-        // 2 bcc
+        // 0 to 1 cc 2 bcc
         QMap <int,QStringList> m_mail2;
 
 };
 
 #endif