reply and forward partly implemented but working

4 files changed, 68 insertions, 46 deletions

diff --git a/noncore/net/mail/composemail.cpp b/noncore/net/mail/composemail.cpp
index 96787e4..cfccdbb 100644
--- a/noncore/net/mail/composemail.cpp
+++ b/noncore/net/mail/composemail.cpp
@@ -1,117 +1,145 @@
 #include <qt.h>
 
 #include <opie/ofiledialog.h>
 #include <qpe/resource.h>
 
 #include "composemail.h"
 
 ComposeMail::ComposeMail( Settings *s, QWidget *parent, const char *name, bool modal, WFlags flags )
     : ComposeMailUI( parent, name, modal, flags )
 {
     settings = s;
 
     attList->addColumn( tr( "Name" ) );
     attList->addColumn( tr( "Size" ) );
 
     QList<Account> accounts = settings->getAccounts();
     Account *it;
     for ( it = accounts.first(); it; it = accounts.next() ) {
         if ( it->getType().compare( "SMTP" ) == 0 ) {
            SMTPaccount *smtp = static_cast<SMTPaccount *>(it);
            fromBox->insertItem( smtp->getMail() );
            smtpAccounts.append( smtp );
         }
     }
 
     if ( smtpAccounts.count() > 0 ) {
         fillValues( fromBox->currentItem() );
     } else {
         QMessageBox::information( this, tr( "Problem" ),
                                   tr( "<p>Please create an SMTP account first.</p>" ),
                                   tr( "Ok" ) );
     }
 
     connect( fromBox, SIGNAL( activated( int ) ), SLOT( fillValues( int ) ) );
     connect( toButton, SIGNAL( clicked() ), SLOT( pickAddressTo() ) );
     connect( ccButton, SIGNAL( clicked() ), SLOT( pickAddressCC() ) );
     connect( bccButton, SIGNAL( clicked() ), SLOT( pickAddressBCC() ) );
     connect( replyButton, SIGNAL( clicked() ), SLOT( pickAddressReply() ) );
     connect( addButton, SIGNAL( clicked() ), SLOT( addAttachment() ) );
     connect( deleteButton, SIGNAL( clicked() ), SLOT( removeAttachment() ) );
 }
 
 void ComposeMail::pickAddress( QLineEdit *line )
 {
     QString names = AddressPicker::getNames();
     if ( line->text().isEmpty() ) {
         line->setText( names );
     } else if ( !names.isEmpty() ) {
         line->setText( line->text() + ", " + names );
     }
 }
 
 
+void ComposeMail::setTo( const QString & to )
+{
+/*  QString toline;
+  QStringList toEntry = to;
+  for ( QStringList::Iterator it = toEntry.begin(); it != toEntry.end(); ++it ) {
+     toline += (*it);
+  }
+  toLine->setText( toline );
+*/
+toLine->setText( to );
+}
+
+void ComposeMail::setSubject( const QString & subject )
+{
+ subjectLine->setText( subject );
+}
+
+void ComposeMail::setInReplyTo( const QString & messageId )
+{
+
+}
+
+void ComposeMail::setMessage( const QString & text )
+{
+  message->setText( text );
+}
+
+
 void ComposeMail::pickAddressTo()
 {
     pickAddress( toLine );
 }
 
 void ComposeMail::pickAddressCC()
 {
     pickAddress( ccLine );
 }
 
 void ComposeMail::pickAddressBCC()
 {
     pickAddress( bccLine );
 }
 
 void ComposeMail::pickAddressReply()
 {
     pickAddress( replyLine );
 }
 
 void ComposeMail::fillValues( int current )
 {
     SMTPaccount *smtp = smtpAccounts.at( current );
 
     ccLine->clear();
     if ( smtp->getUseCC() ) {
         ccLine->setText( smtp->getCC() );
     }
     bccLine->clear();
     if ( smtp->getUseBCC() ) {
         bccLine->setText( smtp->getBCC() );
     }
     replyLine->clear();
     if ( smtp->getUseReply() ) {
         replyLine->setText( smtp->getReply() );
     }
 
     sigMultiLine->setText( smtp->getSignature() );
 }
 
 void ComposeMail::slotAdjustColumns()
 {
     int currPage = tabWidget->currentPageIndex();
 
     tabWidget->showPage( attachTab );
     attList->setColumnWidth( 0, attList->visibleWidth() - 80 );
     attList->setColumnWidth( 1, 80 );
 
     tabWidget->setCurrentPage( currPage );
 }
 
 void ComposeMail::addAttachment()
 {
     DocLnk lnk = OFileDialog::getOpenFileName( 1, "/" );
     if ( !lnk.name().isEmpty() ) {
         Attachment *att = new Attachment( lnk );
         (void) new AttachViewItem( attList, att );
     }
 }
 
 void ComposeMail::removeAttachment()
 {
     if ( !attList->currentItem() ) {
         QMessageBox::information( this, tr( "Error" ),
diff --git a/noncore/net/mail/composemail.h b/noncore/net/mail/composemail.h
index 196a471..230e397 100644
--- a/noncore/net/mail/composemail.h
+++ b/noncore/net/mail/composemail.h
@@ -1,71 +1,75 @@
 #ifndef COMPOSEMAIL_H
 #define COMPOSEMAIL_H
 
 #include <qlineedit.h>
 #include <qlistview.h>
 
 #include "composemailui.h"
 #include "addresspickerui.h"
 #include "settings.h"
 #include "mailwrapper.h"
 
 
 class AddressPicker : public AddressPickerUI
 {
         Q_OBJECT
 
 public:
         AddressPicker( QWidget *parent = 0, const char *name = 0, bool modal = false, WFlags flags = 0 );
         static QString getNames();
 
 protected:
         QString selectedNames;
         void accept();
 
 };
 
 
 class ComposeMail : public ComposeMailUI
 {
     Q_OBJECT
     
 public:
     ComposeMail( Settings *s, QWidget *parent = 0, const char *name = 0, bool modal = false, WFlags flags = 0 );
 
 public slots:
     void slotAdjustColumns();
 
+    void setTo( const QString & to );
+    void setSubject( const QString & subject );
+    void setInReplyTo( const QString & messageId );
+    void setMessage( const QString & text );
 
 protected slots:
     void accept();
     
 private slots:
     void fillValues( int current );
     void pickAddress( QLineEdit *line );
     void pickAddressTo();
     void pickAddressCC();
     void pickAddressBCC();
     void pickAddressReply();
     void addAttachment();
     void removeAttachment();
 
 
 
 private:
     Settings *settings;
     QList<SMTPaccount> smtpAccounts;
 
 };
 
 class AttachViewItem : public QListViewItem
 {
         public:
     AttachViewItem( QListView *parent, Attachment *att );
         Attachment *getAttachment() { return attachment; }
 
 private:
         Attachment *attachment;
 
 };
 
 #endif
diff --git a/noncore/net/mail/opie-mail.control b/noncore/net/mail/opie-mail.control
index afe0947..9dfe425 100644
--- a/noncore/net/mail/opie-mail.control
+++ b/noncore/net/mail/opie-mail.control
@@ -1,10 +1,10 @@
 Package: opie-mail
-Files: bin/opiemail apps/1Pim/opiemail.desktop pics/mail/*.png
+Files: bin/opiemail apps/1Pim/mail.desktop pics/opiemail/*.png
 Priority: optional
 Section: opie/applications
 Maintainer: Juergen Graf <jgf@handhelds.org>
 Architecture: arm
 Version: 0.0.1-$SUB_VERSION
 Depends: task-opie-minimal, libopie1
 Description: Opie's mail and news client (POP3, IMAP and NNTP)
 License: LGPL
diff --git a/noncore/net/mail/viewmail.cpp b/noncore/net/mail/viewmail.cpp
index ed3ece9..8f9ea07 100644
--- a/noncore/net/mail/viewmail.cpp
+++ b/noncore/net/mail/viewmail.cpp
@@ -12,224 +12,214 @@ AttachItem::AttachItem(QListView *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 ) {
 
 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;
 
 setText();
 
 }
 
 
 ViewMail::ViewMail( QWidget *parent, const char *name, WFlags fl)
         : ViewMailBase(parent, name, fl), _inLoop(false)
 {
         _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 &)));
 }
 
 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=#FF2222>%1</b></font></div>"
-                "<b>From:</b> %2<br>"
-                "<b>To:</b> %3<br>"
+                "<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"
-                "%5"
-                "<b>Date:</b> %6<hr>"
+                    "<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( tr("<b>Bcc:</b> %1<br>").arg( deHtml( bccString ) ) )
                 .arg( m_mail[3] );
         browser->setText( QString(_mailHtml) + deHtml( m_mail[2] ) + "</font>" );
         // remove later in favor of a real handling
         _gotBody = true;
 }
 
 
 
 ViewMail::~ViewMail()
 {
         hide();
 }
 
 void ViewMail::hide()
 {
         QWidget::hide();
 
         if (_inLoop) {
                 _inLoop = false;
                 qApp->exit_loop();
         }
 }
 
 void ViewMail::exec()
 {
         show();
 
         if (!_inLoop) {
                 _inLoop = true;
                 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) {
                 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
 
-        //SendMail sendMail;
-        //sendMail.setTo(_mail.envelope().from()[0].toString());
-        //sendMail.setSubject(prefix + _mail.envelope().subject());
-        //sendMail.setInReplyTo(_mail.envelope().messageId());
-        //sendMail.setMessage(rtext);
-
-
-/*        ComposeMail composer(this, 0, true);
-        composer.setMessage(  );
+        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) {
                 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(_mail.envelope().from()[0].toString());
-        if (!_mail.envelope().mailDate().isNull())
-                ftext += QString("Date: %1\n")
-                        .arg(_mail.envelope().mailDate());
-        if (!_mail.envelope().from()[0].toString().isNull())
-                ftext += QString("From: %1\n")
-                        .arg(_mail.envelope().from()[0].toString());
-        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 (!_mail.envelope().bcc().toString().isNull())
-                ftext += QString("Bcc: %1\n")
-                        .arg(_mail.envelope().bcc().toString());
-        if (!_mail.envelope().subject().isNull())
-                ftext += QString("Subject: %1\n")
-                        .arg(_mail.envelope().subject());
+        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(_mail.bodyPart(1).data());
+                 .arg( m_mail[2]);
 
         ftext += QString("----- End forwarded message -----\n");
-*/
-/*
-        SendMail sendMail;
-        sendMail.setSubject("Fwd: " + _mail.envelope().subject());
-        sendMail.setMessage(ftext);
 
-        Composer composer(this, 0, true);
-        composer.setSendMail(sendMail);
+        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"));
         }
 }
 */