1 files changed, 2 insertions, 1 deletions

diff --git a/kmicromail/viewmail.cpp b/kmicromail/viewmail.cpp
index 3bd6f41..60c764c 100644
--- a/kmicromail/viewmail.cpp
+++ b/kmicromail/viewmail.cpp
@@ -200,257 +200,258 @@ void ViewMail::setBody(const RecBodyP&body )
             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());
     }