ompi mail view fix

6 files changed, 37 insertions, 5 deletions

diff --git a/kmicromail/opiemail.cpp b/kmicromail/opiemail.cpp
index c20c7ce..ec192ea 100644
--- a/kmicromail/opiemail.cpp
+++ b/kmicromail/opiemail.cpp
@@ -46,499 +46,515 @@ OpieMail::OpieMail( QWidget *parent, const char *name )
     folderView->populate( settings->getAccounts() );
   
 }
 
 OpieMail::~OpieMail()
 {
     if (settings) delete settings;
 }
 
 void OpieMail::appMessage(const QCString &msg, const QByteArray &data)
 {
     
 }
 #include <stdlib.h>
 void OpieMail::message(const QCString &msg, const QByteArray &data)
 {
     // copied from old mail2
     static int ii = 0;
     //qDebug("QCOP CALL ############################# %d ", ii);
     //QString mess ( msg  );
     //qDebug("Message = %s ",mess.latin1());
     ++ii;
     //qDebug("KM:appMessage %d *%s* %x", ii, msg.data(), this);
 
     mPendingEmail = QString::null;
     mPendingName = QString::null;
     if (msg == "writeMail(QString,QString)")
     {
         //qDebug("writeMail(QString,QString) ");
         QDataStream stream(data,IO_ReadOnly);
         stream >> mPendingName >> mPendingEmail;
         // removing the whitespaces at beginning and end is needed!
         QTimer::singleShot ( 50, this, SLOT(slotComposeMail() ) ); 
     }
     else if (msg == "newMail()")
     {
         //qDebug("slotComposeMail() ");
         // we cannot call slotComposeMail(); directly, because may be executing a QCOP call
         // and a QCOP call does not like a processevents in his execution
         // with the Qtimer we call slotComposeMail() after we reached the main event loop
         QTimer::singleShot ( 50, this, SLOT(slotComposeMail() ) ); 
         // slotComposeMail();
     }
     else if (msg == "newMail(QString)")
     {
         //qDebug(" newMail(QString)");
         QDataStream stream(data,IO_ReadOnly);
         stream >> mPendingName;
         // the format is 
         //  NAME <EMAIL>:SUBJECT
         QTimer::singleShot ( 50, this, SLOT(slotComposeMail() ) ); 
     } else {
         mPendingData = data;
         mPendingMessage = msg;
         QTimer::singleShot ( 50, this, SLOT(slotExtAppHandler() ) ); 
     }
 
     //qDebug("END OpieMail::message ");
 }
 void OpieMail::slotExtAppHandler()
 {
     ExternalAppHandler::instance()->appMessage ( mPendingMessage, mPendingData );
 }
 void OpieMail::slotwriteMail2(const QString& namemail )
 {
     //qDebug("OpieMail::slotwriteMail2 ");
     //qApp->processEvents();
      ComposeMail compose( settings, this, 0, true );
     if ( !namemail.isEmpty() ) {
         QString to = namemail;
         if ( namemail.find( " <") > 1 ) {
             to = "\"" +to.replace( QRegExp( " <"), "\" <") ;
         } else 
         if ( namemail.find( "<") > 1 ) {
             to = "\"" +to.replace( QRegExp( "<"), "\" <") ;
         }
         int sub = to.find( ">:");
         if ( sub > 0 ) {
             compose.setTo( to.left(sub+1)  );
             compose.setSubject( to.mid(sub+2) );
         } else
             compose.setTo( to );
      }
     compose.slotAdjustColumns();
 #ifndef DESKTOP_VERSION
     compose.showMaximized();
 #endif
     compose.exec();
     raise();
     //qDebug("retttich ");
 }
 void OpieMail::slotwriteMail(const QString&name,const QString&email)
 {
     // qDebug("OpieMail::slotwriteMail ");
     ComposeMail compose( settings, this, 0, true );
     if (!email.isEmpty())
     {
         if (!name.isEmpty())
         {
             compose.setTo("\"" + name + "\"" + " " + "<"+ email + ">");
         }
         else
         {
             compose.setTo(email);
         }
     }
     compose.slotAdjustColumns();
 #ifndef DESKTOP_VERSION
     compose.showMaximized();
 #endif
     compose.exec();
     raise();
 }
 
 void OpieMail::slotComposeMail()
 {
     if ( mPendingEmail == QString::null && mPendingName == QString::null)
         slotwriteMail2( QString () );
     else {
         if ( mPendingEmail == QString::null )
             slotwriteMail2( mPendingName );
         else
             slotwriteMail( mPendingName, mPendingEmail );   
     }
     //slotwriteMail(0l,0l);
 }
 
 void OpieMail::slotSendQueued()
 {
     SMTPaccount *smtp = 0;
 
     QList<Account> list = settings->getAccounts();
     QList<SMTPaccount> smtpList;
     smtpList.setAutoDelete(false);
     Account *it;
     for ( it = list.first(); it; it = list.next() )
     {
         if ( it->getType() == MAILLIB::A_SMTP )
         {
             smtp = static_cast<SMTPaccount *>(it);
             smtpList.append(smtp);
         }
     }
     if (smtpList.count()==0)
     {
         QMessageBox::information(0,i18n("Info"),i18n("Define a smtp account first!\n"));
         return;
     }
     if ( QMessageBox::warning(this, i18n("Sending all mails"), i18n("Do you really want to send\nall queued mails?" )  , QMessageBox::Yes, QMessageBox::No ) == QMessageBox::No )
         return;
     if (smtpList.count()==1)
     {
         smtp = smtpList.at(0);
     }
     else
     {
         smtp = 0;
         selectsmtp selsmtp;
         selsmtp.setSelectionlist(&smtpList);
 #ifndef DESKTOP_VERSION
         selsmtp.showMaximized();
 #endif
         if (  selsmtp.exec() == QDialog::Accepted )
         {
             smtp = selsmtp.selected_smtp();
         }
     }
     if (smtp)
     {
      
         Global::statusMessage("Sending mails...!");
         SMTPwrapper * wrap = new SMTPwrapper(smtp);
         if ( wrap->flushOutbox() )
         {
             Global::statusMessage("Mails sent!");
         } 
         delete wrap;
     }
     // pending refresh list view, if outgoing is displayed
 }
 
 void OpieMail::slotSearchMails()
 {
     qDebug("OpieMail::slotSearchMails():not implemented ");
 }
 
 void OpieMail::slotEditSettings()
 {
 
     KOPrefsDialog settingsDialog( this,  "koprefs", true );
 #ifndef DESKTOP_VERSION
     settingsDialog.showMaximized();
 #endif
     settingsDialog.exec();
 
    slotSetCodec( KOPrefs::instance()->mCurrentCodec );
     //    KApplication::execDialog(settingsDialog);
 }
 
 void OpieMail::slotEditAccounts()
 {
     EditAccounts eaDialog( settings, this, 0, true );
     eaDialog.slotAdjustColumns();
 #ifndef DESKTOP_VERSION
     eaDialog.showMaximized();
 #endif
     eaDialog.exec();
     if ( settings ) delete settings;
     settings = new Settings();
 
     folderView->populate( settings->getAccounts() );
 }
 void OpieMail::replyMail()
 {
 
     QListViewItem*item = mailView->currentItem();
     if (!item) return;
     RecMailP mail = ((MailListViewItem*)item)->data();
     RecBodyP body = folderView->fetchBody(mail);
 
     QString rtext;
     rtext += QString("* %1 wrote on %2:\n")        // no i18n on purpose
         .arg(  mail->getFrom())
              .arg( mail->getDate());
 
     QString text = body->Bodytext();
     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 ( mail->getSubject().find(QRegExp("^Re: .*$")) != -1) prefix = "";
     else prefix = "Re: ";                // no i18n on purpose
 
     Settings *settings = new Settings();
     ComposeMail composer( settings ,this, 0, true);
     if (mail->Replyto().isEmpty()) {
         composer.setTo( mail->getFrom());
     } else {
         composer.setTo( mail->Replyto());
     }
     composer.setSubject( prefix + mail->getSubject());
     composer.setMessage( rtext );
     composer.setInReplyTo( mail->Msgid());
     composer.setCharset( body->getCharset() );
     if ( QDialog::Accepted == KApplication::execDialog( &composer ) )
     {
         mail->Wrapper()->answeredMail(mail);
     }
     delete settings;
 
 }
+void OpieMail::displayNextMail(ViewMail * vm)
+{
+    QListViewItem*item = mailView->currentItem();
+    if (!item) return;
+    item = item->itemBelow();
+    if (!item) {
+        vm->setCaption(i18n("End of List" ));
+        return;
+    }
+    mailView->setCurrentItem(item);
+    RecMailP mail = ((MailListViewItem*)item)->data();
+    RecBodyP body = folderView->fetchBody(mail);
+    vm->setBody( body );
+    vm->setMail( mail );
+}
 void OpieMail::displayMail()
 {
     QListViewItem*item = mailView->currentItem();
     if (!item) return;
     RecMailP mail = ((MailListViewItem*)item)->data();
     RecBodyP body = folderView->fetchBody(mail);
     ViewMail readMail( this,"", Qt::WType_Modal   );
     readMail.setBody( body );
     readMail.setMail( mail );
 #ifndef DESKTOP_VERSION
     readMail.showMaximized();
 #else
     readMail.resize( 640, 480);
 #endif
+    connect(  &readMail,SIGNAL( showNextMail(ViewMail *)  ), this, SLOT( displayNextMail(ViewMail *) ) );
     readMail.exec();
 
     if (  readMail.deleted )
     {
         folderView->refreshCurrent();
     }
     else
     {
         ( (MailListViewItem*)item )->setPixmap( 0, QPixmap() );
     }
 }
 void OpieMail::slotGetAllMail()
 {
     QListViewItem * item = folderView->firstChild();
     while ( item ){
         ((AccountViewItem *)item)->contextMenuSelected( 101 );
         item = item->nextSibling ();
     }
 }
 void OpieMail::slotGetMail()
 {
     QListViewItem * item = folderView->currentItem();
     if ( ! item ) return;
     ((AccountViewItem *)item)->contextMenuSelected( 101 );
 }
 void OpieMail::slotDeleteMail()
 {
     if (!mailView->currentItem()) return;
     RecMailP mail = ((MailListViewItem*)mailView->currentItem() )->data();
     if ( QMessageBox::warning(this, i18n("Delete Mail"), QString( i18n("<p>Do you really want to delete this mail? <br><br>" ) + mail->getFrom() + " - " + mail->getSubject() ) , QMessageBox::Yes, QMessageBox::No ) == QMessageBox::Yes )
     {
         mail->Wrapper()->deleteMail( mail );
         folderView->refreshCurrent();
     }
 }
 void OpieMail::slotDeleteAllMail()
 {
 
     QValueList<RecMailP> t;
     if ( QMessageBox::warning(this, i18n("Delete All Mails"), i18n("Do you really want to delete\nall selected mails?" )  , QMessageBox::Yes, QMessageBox::No ) == QMessageBox::Yes )
         {
             MailListViewItem* item = (MailListViewItem*)mailView->firstChild ();
             while ( item ) {
                 if ( item->isSelected() ) {
                     t.append( item->data() );
                 }
                 item = (MailListViewItem*)item->nextSibling();
             }
         }
     else
         return;
     if ( t.count() == 0 )
         return;
     RecMailP mail = t.first();
     mail->Wrapper()->deleteMailList(t);
     folderView->refreshCurrent();
 
 
 }
 void OpieMail::clearSelection()
 {
     mailView->clearSelection();
   
 }
 
 void OpieMail::mailHold(int button, QListViewItem *item,const QPoint&,int  )
 {
     if (!mailView->currentItem()) return;
     MAILLIB::ATYPE mailtype = ((MailListViewItem*)mailView->currentItem() )->wrapperType();
     /* just the RIGHT button - or hold on pda */
     if (button!=2) {return;}
     if (!item) return;
     QPopupMenu *m = new QPopupMenu(0);
     if (m)
     {
         if (mailtype==MAILLIB::A_NNTP) {
             m->insertItem(i18n("Read this posting"),this,SLOT(displayMail()));
             m->insertItem(i18n("Copy this posting"),this,SLOT(slotMoveCopyMail()));
             m->insertSeparator();
             m->insertItem(i18n("Copy all selected postings"),this,SLOT(slotMoveCopyAllMail()));
             m->insertItem(i18n("Clear selection"),this,SLOT(clearSelection()));
         } else {
             if (folderView->currentisDraft()) {
                 m->insertItem(i18n("Edit this mail"),this,SLOT(reEditMail()));
             }
             m->insertItem(i18n("Reply to this mail"),this,SLOT(replyMail()));
             m->insertSeparator();
             m->insertItem(i18n("Read this mail"),this,SLOT(displayMail()));
             m->insertItem(i18n("Move/Copy this mail"),this,SLOT(slotMoveCopyMail()));
             m->insertItem(i18n("Delete this mail"),this,SLOT(slotDeleteMail()));
             m->insertSeparator();
             m->insertItem(i18n("Move/Copy all selected mail"),this,SLOT(slotMoveCopyAllMail()));
             m->insertItem(i18n("Delete all selected mails"),this,SLOT(slotDeleteAllMail()));
             m->insertItem(i18n("Clear selection"),this,SLOT(clearSelection()));
         }
         m->setFocus();
         m->exec( QPoint( QCursor::pos().x(), QCursor::pos().y()) );
         delete m;
     }
 }
 
 void OpieMail::slotShowFolders( bool show )
 {
     if ( show && folderView->isHidden() )
     {
         folderView->show();
     }
     else if ( !show && !folderView->isHidden() )
     {
         folderView->hide();
     }
 }
 
 void OpieMail::refreshMailView(const QValueList<RecMailP>&list)
 {
     MailListViewItem*item = 0;
     mailView->clear();
 
     QValueList<RecMailP>::ConstIterator it;
     for (it = list.begin(); it != list.end();++it)
     {
         item = new MailListViewItem(mailView,item);
         item->storeData((*it));
         item->showEntry();
     }
     mailView->setSorting ( 4, false );
 }
 
 void OpieMail::mailLeftClicked( QListViewItem *item )
 {
     mailView->clearSelection();
     /* just LEFT button - or tap with stylus on pda */
     //if (button!=1) return;
     if (!item) return;
     if (folderView->currentisDraft()) {
         reEditMail();
     } else {
         displayMail();
     }
 }
 
 void OpieMail::slotMoveCopyMail()
 {
     if (!mailView->currentItem()) return;
     RecMailP mail = ((MailListViewItem*)mailView->currentItem() )->data();
     AbstractMail*targetMail = 0;
     QString targetFolder = "";
     Selectstore sels;
     folderView->setupFolderselect(&sels);
     if (!sels.exec()) return;
     targetMail = sels.currentMail();
     targetFolder = sels.currentFolder();
     if ( (mail->Wrapper()==targetMail && mail->getMbox()==targetFolder) ||
             targetFolder.isEmpty())
     {
         return;
     }
     if (sels.newFolder() && !targetMail->createMbox(targetFolder))
     {
         QMessageBox::critical(0,i18n("Error creating new Folder"),
                               i18n("<center>Error while creating<br>new folder - breaking.</center>"));
         return;
     }
     sels.hide();
     qApp->processEvents();
     // qDebug("hiding sels ");
     mail->Wrapper()->mvcpMail(mail,targetFolder,targetMail,sels.moveMails());
     folderView->refreshCurrent();
 }
 
 void OpieMail::slotMoveCopyAllMail()
 {
 
     if (!mailView->currentItem()) return;
     QValueList<RecMailP> t;
     // if ( QMessageBox::warning(this, i18n("Move/Copy all selected mails"), i18n("Do you really want to copy/move\nall selected mails?" )  , QMessageBox::Yes, QMessageBox::No ) == QMessageBox::Yes )
     {
         MailListViewItem* item = (MailListViewItem*)mailView->firstChild ();
         while ( item ) {
             if ( item->isSelected() ) {
                 t.append( item->data() );
             }
             item = (MailListViewItem*)item->nextSibling();
         }
     }
     // else
     //  return;
     if ( t.count() == 0 )
         return;
     RecMailP mail = t.first();
     AbstractMail*targetMail = 0;
     QString targetFolder = "";
     Selectstore sels;
     folderView->setupFolderselect(&sels);
     if (!sels.exec()) return;
     targetMail = sels.currentMail();
     targetFolder = sels.currentFolder();
     if ( (mail->Wrapper()==targetMail && mail->getMbox()==targetFolder) ||
             targetFolder.isEmpty())
     {
         return;
     }
     if (sels.newFolder() && !targetMail->createMbox(targetFolder))
     {
         QMessageBox::critical(0,i18n("Error creating new Folder"),
                               i18n("<center>Error while creating<br>new folder - breaking.</center>"));
         return;
     }
     sels.hide();
     qApp->processEvents();
     //qDebug("hiding sels ");
     mail->Wrapper()->mvcpMailList(t,targetFolder,targetMail,sels.moveMails());
     folderView->refreshCurrent();
 }
 
 void OpieMail::reEditMail()
 {
     if (!mailView->currentItem()) return;
 
     ComposeMail compose( settings, this, 0, true );
     compose.reEditMail(((MailListViewItem*)mailView->currentItem() )->data());
     compose.slotAdjustColumns();
 #ifndef DESKTOP_VERSION
     compose.showMaximized();
 #else
     compose.resize(640,480);
 #endif
     compose.exec();
 }
diff --git a/kmicromail/opiemail.h b/kmicromail/opiemail.h
index 44ab1ec..30968a7 100644
--- a/kmicromail/opiemail.h
+++ b/kmicromail/opiemail.h
@@ -1,56 +1,58 @@
 // CHANGED 2004-09-31 Lutz Rogowski
 #ifndef OPIEMAIL_H
 #define OPIEMAIL_H
 
 #include "mainwindow.h"
 #include <libmailwrapper/settings.h>
 
 #include <opie2/osmartpointer.h>
 #include <libmailwrapper/mailtypes.h>
+#include <viewmail.h>
 
 class OpieMail : public MainWindow
 {
     Q_OBJECT
 
 public:
     OpieMail( QWidget *parent = 0, const char *name = 0 );
     virtual ~OpieMail();
     static QString appName() { return QString::fromLatin1("kopiemail"); }
 
 public slots:
     virtual void slotwriteMail(const QString&name,const QString&email);
     virtual void slotwriteMail2(const QString&nameemail);
     virtual void slotComposeMail();
     virtual void slotExtAppHandler();
     virtual void appMessage(const QCString &msg, const QByteArray &data);
     virtual void message(const QCString &msg, const QByteArray &data);
 protected slots:
+    virtual void displayNextMail(ViewMail * vm);
     virtual void slotSendQueued();
     virtual void slotSearchMails();
     virtual void slotEditSettings();
     virtual void slotEditAccounts();
     virtual void displayMail();
     virtual void replyMail();
     virtual void slotDeleteMail();
     virtual void slotGetMail();
     virtual void slotGetAllMail();
     virtual void slotDeleteAllMail();
     virtual void mailHold(int, QListViewItem *,const QPoint&,int);
     virtual void slotShowFolders( bool show );
     virtual void refreshMailView(const QValueList<RecMailP>&);
     virtual void mailLeftClicked(  QListViewItem * );
     virtual void slotMoveCopyMail();
     virtual void slotMoveCopyAllMail();
     virtual void reEditMail();
     void clearSelection();
 
 private:
     QString mPendingEmail;
     QString mPendingName;
     QByteArray mPendingData;
     QCString mPendingMessage;
     Settings *settings;
 
 };
 
 #endif
diff --git a/kmicromail/viewmail.cpp b/kmicromail/viewmail.cpp
index 3bd6f41..60c764c 100644
--- a/kmicromail/viewmail.cpp
+++ b/kmicromail/viewmail.cpp
@@ -72,461 +72,462 @@ bool AttachItem::isParentof(const QValueList<int>&path)
 
 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;
 }
 
 AttachItem* ViewMail::lastChild(AttachItem*parent)
 {
     if (!parent) return 0;
     AttachItem* item = (AttachItem*)parent->firstChild();
     if (!item) return item;
     AttachItem*temp=0;
     while( (temp=(AttachItem*)item->nextSibling()))
     {
         item = temp;
     }
     return item;
 }
 
 void ViewMail::setBody(const RecBodyP&body )
 {
 
     m_body = body;
     m_mail[2] = body->Bodytext();
     // qDebug("********text %s ",m_mail[2].latin1() );
     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,body->Description()->Positionlist());
     QString filename = "";
 
     for (unsigned int i = 0; i < body->Parts().count();++i)
     {
         filename = "";
         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)
         {
             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();
         parentItem = searchParent(body->Parts()[i]->Positionlist());
         if (parentItem)
         {
             AttachItem*temp = lastChild(parentItem);
             if (temp) curItem = temp;
             curItem=new AttachItem(parentItem,curItem,type,desc,filename,fsize,i,body->Parts()[i]->Positionlist());
             attachments->setRootIsDecorated(true);
             curItem = parentItem;
         }
         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( i18n( "Show Text" ), 1 );
     }
     if (item->text(0).left(6)=="image/") {
         menu->insertItem(i18n("Display image preview"),2);
     }
     menu->insertItem( i18n( "Save Attachment" ),  0 );
     menu->insertSeparator(1);
 
     ret = menu->exec( point, 0 );
 
     switch(ret)
     {
     case 0:
         {
             //MimeTypes types;
             //types.insert( "all", "*" );
             QString str = KFileDialog::getSaveFileName( "/", item->text( 2 ), this );
 
             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 2: 
         {
 #ifdef DESKTOP_VERSION
             QString tmpfile = locateLocal( "tmp", "opiemail-image");
 #else
             QString tmpfile = "/tmp/opiemail-image";
 #endif
             encodedString*content = m_recMail->Wrapper()->fetchDecodedPart( m_recMail, m_body->Parts()[ ( ( AttachItem* )item )->Partnumber() ] );
             if (content) {
                 QFile output(tmpfile);
                 output.open(IO_WriteOnly);
                 output.writeBlock(content->Content(),content->Length());
                 output.close();
                 delete content;
                 MailImageDlg iview("");
                 iview.setName(tmpfile);
                 KApplication::execDialog(&iview);
                 output.remove();
             }
         }
         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(const RecMailP&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) ) ); 
-    connect( closeMail, SIGNAL( activated() ), SLOT( close() ) );
+    connect( closeMail, SIGNAL( activated() ), SLOT( close() ) ); 
+    connect( nextMail, SIGNAL( activated() ), SLOT( slotNextMail() ) );
 
     attachments->setEnabled(m_gotBody);
     connect( attachments,  SIGNAL( clicked(QListViewItem*,const QPoint&, int) ), SLOT( slotItemClicked(QListViewItem*,const QPoint&, int) ) );
 
     readConfig();
     attachments->setSorting(-1);
 }
 
 void ViewMail::readConfig()
 {
  
     setFont ( KOPrefs::instance()->mReadFont );
     m_showHtml =  KOPrefs::instance()->mViewAsHtml;
     showHtml->setOn( m_showHtml );
 }
 
 void ViewMail::setText()
 {
 
     QString toString;
     QString ccString;
     QString bccString;
 
    
     toString = m_mail2[0].join(",");
     ccString  = m_mail2[1].join(",");
     bccString = m_mail2[2].join(",");
   
 
     setCaption( i18n("E-Mail by %1").arg( m_mail[0] ) );
 
     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>" + i18n( "From" ) + ": </b><font color=#6C86C0>" + deHtml( m_mail[0] ) + "</font><br>"
                  "<b>" + i18n(  "To" ) + ": </b><font color=#6C86C0>" + deHtml( toString ) + "</font><br><b>" +
                  i18n( "Cc" ) + ": </b>" + deHtml( ccString ) + "<br>"
                  "<b>" + i18n( "Date" ) + ": </b> " +  m_mail[3] +
                  "</td></tr></table><font>";
 
     if ( !m_showHtml )
     {
         browser->setText( QString( m_mailHtml) + deHtml( m_mail[2] ) + "</font></html>" );
     }
     else
     {
         browser->setText( QString( m_mailHtml) + m_mail[2] + "</font></html>" );
     }
     // remove later in favor of a real handling
     m_gotBody = true;
 }
 
 
 ViewMail::~ViewMail()
 {
     m_recMail->Wrapper()->cleanMimeCache();
     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 (!m_gotBody)
     {
         QMessageBox::information(this, i18n("Error"), i18n("<p>The mail body is not yet downloaded, so you cannot reply yet."), i18n("Ok"));
         return;
     }
 
     QString rtext;
     rtext += QString("* %1 wrote on %2:\n")        // no i18n on purpose
              .arg(  m_mail[0] )
              .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);
     if (m_recMail->Replyto().isEmpty()) {
         composer.setTo(m_recMail->getFrom());
     } else {
         composer.setTo(m_recMail->Replyto());
     }
     composer.setSubject( prefix + m_mail[1] );
     composer.setMessage( rtext );
     composer.setInReplyTo(m_recMail->Msgid());
     composer.setCharset( m_body->getCharset()  );
 
     if ( QDialog::Accepted == KApplication::execDialog( &composer ) )
     {
         m_recMail->Wrapper()->answeredMail(m_recMail);
     }
     delete settings;
 }
   
 void ViewMail::slotForward()
 {
     if (!m_gotBody)
     {
         QMessageBox::information(this, i18n("Error"), i18n("<p>The mail body is not yet downloaded, so you cannot forward yet."), i18n("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 (!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");
 
     Settings *settings = new Settings();
     ComposeMail composer( settings ,this, 0, true);
     composer.setSubject( "Fwd: " + m_mail[1] );
     composer.setMessage( ftext );
     if ( QDialog::Accepted == KApplication::execDialog( &composer ))
     {
     }
 }
 
 void ViewMail::slotDeleteMail( )
 {
     if ( QMessageBox::warning(this, i18n("Delete Mail"), QString( i18n("<p>Do you really want to delete this mail? <br><br>" ) + m_mail[0] + " - " + m_mail[1] ) , QMessageBox::Yes, QMessageBox::No ) == QMessageBox::Yes )
     {
         m_recMail->Wrapper()->deleteMail( m_recMail );
         hide();
         deleted = true;
     }
 }
 
 MailImageDlg::MailImageDlg(const QString&fname,QWidget *parent, const char *name, bool modal, WFlags f)
     : QDialog(parent,name,modal)
 {
     QVBoxLayout*dlglayout = new QVBoxLayout(this);
     dlglayout->setSpacing(2);
     dlglayout->setMargin(1);
     //m_imageview = new Opie::MM::OImageScrollView(this);
     //dlglayout->addWidget(m_imageview);
 }
 
 MailImageDlg::~MailImageDlg()
 {
 }
 
 void MailImageDlg::setName(const QString&fname)
 {
     qDebug("viewmail.cpp: MailImageDlg::setName Pending");
     // m_imageview->setImage(fname);
 }
diff --git a/kmicromail/viewmail.h b/kmicromail/viewmail.h
index 194ac8e..c2c2ce3 100644
--- a/kmicromail/viewmail.h
+++ b/kmicromail/viewmail.h
@@ -1,86 +1,88 @@
 #ifndef VIEWMAIL_H
 #define VIEWMAIL_H
 
 #include "viewmailbase.h"
 #include <libmailwrapper/mailtypes.h>
 
 #include <qdialog.h>
 
 #include <qlistview.h>
 #include <qmap.h>
 #include <qstringlist.h>
 #include <qvaluelist.h>
 
 //namespace Opie { namespace MM { class OImageScrollView; } }
 
 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 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 = 0);
     ~ViewMail();
 
     void hide();
     void exec();
     void setMail(const RecMailP&mail );
     void setBody(const RecBodyP&body);
     bool deleted;
-
+ signals:
+    void showNextMail(ViewMail*);
 protected:
     QString deHtml(const QString &string);
     AttachItem* searchParent(const QValueList<int>&path);
     AttachItem* lastChild(AttachItem*parent);
 
 protected slots:
+    void slotNextMail() { emit  showNextMail(this); };
     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;
     RecBodyP m_body;
     RecMailP 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;
 };
 
 class MailImageDlg:public QDialog
 {
     Q_OBJECT
 public:
     MailImageDlg(const QString&,QWidget *parent = 0, const char *name = 0, bool modal = true, WFlags f = 0);
     ~MailImageDlg();
     void setName(const QString&);
 protected:
     //Opie::MM::OImageScrollView*m_imageview;
 };
 
 #endif
diff --git a/kmicromail/viewmailbase.cpp b/kmicromail/viewmailbase.cpp
index 3d7ed42..c4731a7 100644
--- a/kmicromail/viewmailbase.cpp
+++ b/kmicromail/viewmailbase.cpp
@@ -1,93 +1,104 @@
 // CHANGED 2004-08-06 Lutz Rogowski
 #include <qtextbrowser.h>
 #include <qlistview.h>
 #include <qaction.h>
 #include <qlabel.h>
 #include <qvbox.h>
 
 #include <qtoolbar.h>
 #include <qmenubar.h>
 #include <kiconloader.h>
 //#include <qpe/resource.h>
 #include <klocale.h>
 
 #include "viewmailbase.h"
 //#include "opendiag.h"
 
 ViewMailBase::ViewMailBase(QWidget *parent, const char *name, WFlags fl)
         : QMainWindow(parent, name, fl)
 {
 
         setToolBarsMovable(false);
 
         toolbar = new QToolBar(this);
   menubar = new QMenuBar( toolbar );
   mailmenu = new QPopupMenu( menubar );
   menubar->insertItem( i18n( "Mail" ), mailmenu );
 
         toolbar->setHorizontalStretchable(true);
         addToolBar(toolbar);
 
         reply = new QAction(i18n("Reply"),SmallIcon("reply"), 0, 0, this);
         reply->addTo(toolbar);
          reply->addTo(mailmenu);
 
         forward = new QAction(i18n("Forward"),SmallIcon("forward"), 0, 0, this);
         forward->addTo(toolbar);
         forward->addTo(mailmenu);
 
         attachbutton = new QAction(i18n("Attachments"),SmallIcon("attach"), 0, 0, this, 0, true);
         attachbutton->addTo(toolbar);
         attachbutton->addTo(mailmenu);
         connect(attachbutton, SIGNAL(toggled(bool)), SLOT(slotChangeAttachview(bool)));
 
 
         showHtml = new QAction( i18n( "Show Html" ), SmallIcon(  "html" ), 0, 0, this, 0, true );
         showHtml->addTo( toolbar );
         showHtml->addTo( mailmenu );
 
     deleteMail = new QAction(i18n("Delete Mail"),SmallIcon("trash"), 0, 0, this);
         deleteMail->addTo(toolbar);
         deleteMail->addTo(mailmenu);
-          closeMail = new QAction(i18n("Close"),SmallIcon("exit"), 0, 0, this);
+
+
+
+    nextMail = new QAction(i18n("Show next mail"),SmallIcon("add"), 0, 0, this);
         QLabel *spacer = new QLabel(toolbar);
+        nextMail->addTo(toolbar);
+        nextMail->addTo(mailmenu);
+
+
+
+
+          closeMail = new QAction(i18n("Close"),SmallIcon("exit"), 0, 0, this);
+        //QLabel *spacer = new QLabel(toolbar);
         spacer->setBackgroundMode(QWidget::PaletteButton);
         toolbar->setStretchableWidget(spacer);
         closeMail->addTo(toolbar);
         closeMail->addTo(mailmenu);
         QVBox *view = new QVBox(this);
         setCentralWidget(view);
 
         attachments = new QListView(view);
         attachments->setMinimumHeight(90);
         attachments->setMaximumHeight(90);
         attachments->setAllColumnsShowFocus(true);
         attachments->addColumn("Mime Type", 60);
         attachments->addColumn(i18n("Description"), 100);
         attachments->addColumn(i18n("Filename"), 80);
     attachments->addColumn(i18n("Size"), 80);
     attachments->setSorting(-1);
         attachments->hide();
 
         browser = new QTextBrowser(view);
 
         //openDiag = new OpenDiag(view);
         //openDiag->hide();
 
 }
 
 void ViewMailBase::slotChangeAttachview(bool state)
 {
         if (state) attachments->show();
         else attachments->hide();
 }
 
 void ViewMailBase::keyPressEvent ( QKeyEvent * e )
 {
     if( e->key()==Qt::Key_Escape ) {
         close();
         e->accept();
         return;
     }
     QWidget::keyPressEvent(e);
 }
diff --git a/kmicromail/viewmailbase.h b/kmicromail/viewmailbase.h
index 1c8948a..c97e9e3 100644
--- a/kmicromail/viewmailbase.h
+++ b/kmicromail/viewmailbase.h
@@ -1,39 +1,39 @@
 // CHANGED 2004-08-06 Lutz Rogowski
 #ifndef VIEWMAILBASE_H
 #define VIEWMAILBASE_H
 
 #include <qmainwindow.h>
 
 class QAction;
 class OpenDiag;
 class QListView;
 class QToolBar;
 class QTextBrowser;
 class QMenuBar;
 class QPopupMenu;
 
 class ViewMailBase : public QMainWindow
 {
         Q_OBJECT
 
 public:
         ViewMailBase(QWidget *parent = 0, const char *name = 0, WFlags fl = 0);
 
 protected:
-        QAction *reply, *forward, *attachbutton, *deleteMail, *showHtml, *closeMail;
+        QAction *reply, *forward, *attachbutton, *deleteMail, *showHtml, *closeMail, *nextMail;
         QListView *attachments;
         QToolBar *toolbar;
         QTextBrowser *browser;
         OpenDiag *openDiag;
          QMenuBar *menubar;
-  QPopupMenu *mailmenu;
+    QPopupMenu *mailmenu;
 
 protected slots:
         void slotChangeAttachview(bool state);
     virtual void keyPressEvent ( QKeyEvent * e );
 
 
 };
 
 #endif