2 files changed, 54 insertions, 4 deletions

diff --git a/noncore/net/mail/viewmail.cpp b/noncore/net/mail/viewmail.cpp
index d2e5e29..5e7ffeb 100644
--- a/noncore/net/mail/viewmail.cpp
+++ b/noncore/net/mail/viewmail.cpp
@@ -1,206 +1,249 @@
 #include <qtextbrowser.h>
 #include <qmessagebox.h>
 #include <qtextstream.h>
 #include <qaction.h>
 #include <qpopupmenu.h>
 #include <qfile.h>
 #include <qapplication.h>
+#include <qvaluelist.h>
 
 #include <qpe/config.h>
 
 #include <opie/ofiledialog.h>
 
 #include "settings.h"
 #include "composemail.h"
 #include "viewmail.h"
 #include "abstractmail.h"
 #include "accountview.h"
 #include "mailtypes.h"
 
 AttachItem::AttachItem(QListView * parent,QListViewItem *after, const QString&mime,const QString&desc,const QString&file,
-    const QString&fsize,int num)
+    const QString&fsize,int num,const QValueList<int>&path)
         : QListViewItem(parent,after),_partNum(num)
 {
+    _path=path;
         setText(0, mime);
         setText(1, desc);
         setText(2, file);
     setText(3, fsize);
 }
 
+AttachItem::AttachItem(QListViewItem * parent,QListViewItem *after, const QString&mime,const QString&desc,const QString&file,
+    const QString&fsize,int num,const QValueList<int>&path)
+        : QListViewItem(parent,after),_partNum(num)
+{
+    _path=path;
+        setText(0, mime);
+        setText(1, desc);
+        setText(2, file);
+    setText(3, fsize);
+}
+
+bool AttachItem::isParentof(const QValueList<int>&path)
+{
+    /* if not set, then no parent */
+    if (path.count()==0||_path.count()==0) return false;
+    /* the parent must have one digit less then a child */
+    if (path.count()!=_path.count()+1) return false;
+    for (unsigned int i=0; i < _path.count();++i) {
+        if (_path[i]!=path[i]) return false;
+    }
+    return true;
+}
+
+AttachItem* ViewMail::searchParent(const QValueList<int>&path)
+{
+    QListViewItemIterator it( attachments );
+    for ( ; it.current(); ++it ) {
+        AttachItem*ati = (AttachItem*)it.current();
+        if (ati->isParentof(path)) return ati;
+    }
+    return 0;
+}
+
 void ViewMail::setBody( RecBody body ) {
 
 m_body = body;
 m_mail[2] = body.Bodytext();
 attachbutton->setEnabled(body.Parts().count()>0);
 attachments->setEnabled(body.Parts().count()>0);
 if (body.Parts().count()==0) {
     return;
 }
 AttachItem * curItem=0;
+AttachItem * parentItem = 0;
 QString type=body.Description().Type()+"/"+body.Description().Subtype();
 QString desc,fsize;
 double s = body.Description().Size();
 int w;
 w=0;
 
 while (s>1024) {
     s/=1024;
     ++w;
     if (w>=2) break;
 }
 
 QString q="";
 switch(w) {
 case 1:
     q="k";
     break;
 case 2:
     q="M";
     break;
 default:
     break;
 }
 
 {
     /* I did not found a method to make a CONTENT reset on a QTextStream
        so I use this construct that the stream will re-constructed in each
        loop. To let it work, the textstream is packed into a own area of
        code is it will be destructed after finishing its small job.
     */
     QTextOStream o(&fsize);
     if (w>0) o.precision(2); else o.precision(0);
     o.setf(QTextStream::fixed);
     o << s << " " << q << "Byte";
 }
 
-curItem=new AttachItem(attachments,curItem,type,"Mailbody","",fsize,-1);
+curItem=new AttachItem(attachments,curItem,type,"Mailbody","",fsize,-1,body.Description().Positionlist());
 QString filename = "";
+
 for (unsigned int i = 0; i < body.Parts().count();++i) {
     type = body.Parts()[i].Type()+"/"+body.Parts()[i].Subtype();
     part_plist_t::ConstIterator it = body.Parts()[i].Parameters().begin();
     for (;it!=body.Parts()[i].Parameters().end();++it) {
         qDebug(it.key());
         if (it.key().lower()=="name") {
             filename=it.data();
         }
     }
     s = body.Parts()[i].Size();
     w = 0;
     while (s>1024) {
         s/=1024;
         ++w;
         if (w>=2) break;
     }
     switch(w) {
     case 1:
         q="k";
         break;
     case 2:
         q="M";
         break;
     default:
         q="";
         break;
     }
     QTextOStream o(&fsize);
     if (w>0) o.precision(2); else o.precision(0);
     o.setf(QTextStream::fixed);
     o << s << " " << q << "Byte";
     desc = body.Parts()[i].Description();
-    curItem=new AttachItem(attachments,curItem,type,desc,filename,fsize,i);
+    parentItem = searchParent(body.Parts()[i].Positionlist());
+    if (parentItem) {
+        curItem=new AttachItem(parentItem,curItem,type,desc,filename,fsize,i,body.Parts()[i].Positionlist());
+        attachments->setRootIsDecorated(true);
+    } else {
+        curItem=new AttachItem(attachments,curItem,type,desc,filename,fsize,i,body.Parts()[i].Positionlist());
+    }
 }
 }
 
 
 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();
         return;
     }
     QPopupMenu *menu = new QPopupMenu();
   int ret=0;
 
   if ( item->text( 0 ).left( 5 ) == "text/" || item->text(0)=="message/rfc822" )  {
      menu->insertItem( tr( "Show Text" ), 1 );
   }
   menu->insertItem( tr( "Save Attachment" ),  0 );
   menu->insertSeparator(1);
 
   ret = menu->exec( point, 0 );
 
   switch(ret) {
         case 0:
              { MimeTypes types;
              types.insert( "all", "*" );
              QString str = OFileDialog::getSaveFileName( 1,
                   "/", item->text( 2 )  , types, 0 );
 
              if( !str.isEmpty() ) {
                encodedString*content = m_recMail.Wrapper()->fetchDecodedPart( m_recMail, m_body.Parts()[ ( ( AttachItem* )item )->Partnumber() ] );
                if (content) {
                  QFile output(str);
                  output.open(IO_WriteOnly);
                  output.writeBlock(content->Content(),content->Length());
                  output.close();
                  delete content;
                }
              }
              }
         break ;
 
         case 1:
              if (  ( ( AttachItem* )item )->Partnumber() == -1 ) {
                 setText();
              } else {
                 if (  m_recMail.Wrapper() != 0l )  { // make sure that there is a wrapper , even after delete or simular actions
                 browser->setText( m_recMail.Wrapper()->fetchTextPart( m_recMail, m_body.Parts()[ ( ( AttachItem* )item )->Partnumber() ] ) );
                 }
              }
         break;
  }
  delete menu;
 }
 
 
 void ViewMail::setMail( RecMail mail ) {
 
     m_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)
 {
         m_gotBody = false;
         deleted = false;
 
         connect( reply, SIGNAL(activated()), SLOT(slotReply()));
         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();
 
diff --git a/noncore/net/mail/viewmail.h b/noncore/net/mail/viewmail.h
index bf7a4dd..b3d3b4e 100644
--- a/noncore/net/mail/viewmail.h
+++ b/noncore/net/mail/viewmail.h
@@ -1,64 +1,71 @@
 #ifndef VIEWMAIL_H
 #define VIEWMAIL_H
 
 #include <qlistview.h>
 #include <qmap.h>
 #include <qstringlist.h>
+#include <qvaluelist.h>
 
 #include "viewmailbase.h"
 #include "mailtypes.h"
 
 class AttachItem : public QListViewItem
 {
 public:
     AttachItem(QListView * parent,QListViewItem *after, const QString&mime,const QString&desc,const QString&file,
-        const QString&fsize,int num);
+        const QString&fsize,int num,const QValueList<int>&path);
+    AttachItem(QListViewItem * parent,QListViewItem *after, const QString&mime,const QString&desc,const QString&file,
+        const QString&fsize,int num,const QValueList<int>&path);
     int Partnumber() { return _partNum; }
+    bool isParentof(const QValueList<int>&path);
 
 private:
     int _partNum;
+    /* needed for a better display of attachments */
+    QValueList<int> _path;
 };
 
 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();
         void setMail( RecMail mail );
         void setBody( RecBody body );
         bool deleted;
 
 protected:
         QString deHtml(const QString &string);
+    AttachItem* searchParent(const QValueList<int>&path);
 
 protected slots:
         void slotReply();
         void slotForward();
         void setText();
         void slotItemClicked( QListViewItem * item , const QPoint & point, int c );
         void slotDeleteMail( );
         void slotShowHtml( bool );
 
 private:
         void readConfig();
         
         bool _inLoop;
         QString m_mailHtml;
         bool m_gotBody;
         RecBody m_body;
         RecMail m_recMail;
         bool m_showHtml;
 
         // 0 from  1 subject  2 bodytext 3 date
         QMap <int,QString>  m_mail;
         // 0 to 1 cc 2 bcc
         QMap <int,QStringList> m_mail2;
 
 };
 
 #endif