From c7549de5f69c98c6b15b6e1a6f4d73ac3f04669e Mon Sep 17 00:00:00 2001 From: harlekin Date: Fri, 12 Dec 2003 13:50:54 +0000 Subject: code cleanups and output beautification --- 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 @@ -151,13 +151,12 @@ void MainWindow::refreshMailView(QList*list) 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(); } 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 @@ -23,33 +23,38 @@ AttachItem::AttachItem(QListViewItem *parent, AttachItemStore &attachItemStore) 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() @@ -71,26 +76,22 @@ void ViewMail::setText() setCaption( caption().arg( m_mail[0] ) ); - _mailHtml = tr( - "" - "

" - "From: %2
" - "To: %3
" - "%4" - "Date: %5

" - "") - .arg( deHtml( m_mail[1] ) ) - .arg( deHtml( m_mail[0] ) ) - .arg( deHtml( toString ) ) - .arg( tr("Cc: %1
").arg( deHtml( ccString ) ) ) - .arg( m_mail[3] ); - browser->setText( QString(_mailHtml) + deHtml( m_mail[2] ) + "" ); + m_mailHtml = "" + "

" + "

" + deHtml( m_mail[1] ) + "

" + "

" + "" + tr( "From" ) + ": " + deHtml( m_mail[0] ) + "
" + "" + tr( "To" ) + ": " + deHtml( toString ) + "
" + + tr( "Cc" ) + ": " + deHtml( ccString ) + "
" + "" + tr( "Date" ) + ": " + m_mail[3] + + "

"; + + browser->setText( QString( m_mailHtml) + deHtml( m_mail[2] ) + "" ); // remove later in favor of a real handling - _gotBody = true; + m_gotBody = true; } - ViewMail::~ViewMail() { hide(); @@ -128,7 +129,7 @@ QString ViewMail::deHtml(const QString &string) void ViewMail::slotReply() { - if (!_gotBody) { + if (!m_gotBody) { QMessageBox::information(this, tr("Error"), tr("

The mail body is not yet downloaded, so you cannot reply yet."), tr("Ok")); return; } @@ -158,12 +159,11 @@ void ViewMail::slotReply() composer.showMaximized(); composer.exec(); - qDebug ( rtext ); } void ViewMail::slotForward() { - if (!_gotBody) { + if (!m_gotBody) { QMessageBox::information(this, tr("Error"), tr("

The mail body is not yet downloaded, so you cannot forward yet."), tr("Ok")); return; } @@ -177,12 +177,6 @@ void ViewMail::slotForward() 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] ); @@ -192,9 +186,6 @@ void ViewMail::slotForward() ftext += QString("----- End forwarded message -----\n"); - qDebug( ftext ); - - Settings *settings = new Settings(); ComposeMail composer( settings ,this, 0, true); composer.setSubject( "Fwd: " + m_mail[1] ); @@ -203,23 +194,3 @@ void ViewMail::slotForward() composer.exec(); } -/* -void ViewMail::slotIMAPUid(IMAPResponse &response) -{ - disconnect(_handler, SIGNAL(gotResponse(IMAPResponse &)), this, SLOT(slotIMAPUid(IMAPResponse &))); - - if (response.statusResponse().status() == IMAPResponseEnums::OK) { - QValueList 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("

I was unable to retrieve the mail from the server. You can try again later or give up.

"), 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 @@ -6,8 +6,7 @@ #include #include "viewmailbase.h" -//#include "imapresponse.h" -//#include "mailtable.h" +#include "mailtypes.h" class AttachItemStore { @@ -49,11 +48,10 @@ public: 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: @@ -61,23 +59,14 @@ protected slots: 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 m_mail; - // 0 to - // 1 cc - // 2 bcc + // 0 to 1 cc 2 bcc QMap m_mail2; }; -- cgit v0.9.0.2