2 files changed, 6 insertions, 5 deletions

diff --git a/noncore/net/mail/mainwindow.cpp b/noncore/net/mail/mainwindow.cpp
index 560715c..8ef7ddd 100644
--- a/noncore/net/mail/mainwindow.cpp
+++ b/noncore/net/mail/mainwindow.cpp
@@ -1,195 +1,195 @@
 #include <qlabel.h>
 #include <qvbox.h>
 #include <qheader.h>
 #include <qtimer.h>
 #include <qlayout.h>
 
 #include <qpe/qpeapplication.h>
 #include <qpe/resource.h>
 
 #include "defines.h"
 #include "mainwindow.h"
 #include "viewmail.h"
 #include "mailtypes.h"
 #include "mailistviewitem.h"
 
 MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
     : QMainWindow( parent, name, flags )
 {
     setCaption( tr( "Mail" ) );
     setToolBarsMovable( false );
 
     toolBar = new QToolBar( this );
     menuBar = new QMenuBar( toolBar );
     mailMenu = new QPopupMenu( menuBar );
     menuBar->insertItem( tr( "Mail" ), mailMenu );
     settingsMenu = new QPopupMenu( menuBar );
     menuBar->insertItem( tr( "Settings" ), settingsMenu );
 
     addToolBar( toolBar );
     toolBar->setHorizontalStretchable( true );
 
     QLabel *spacer = new QLabel( toolBar );
     spacer->setBackgroundMode( QWidget::PaletteButton );
     toolBar->setStretchableWidget( spacer );
 
     composeMail = new QAction( tr( "Compose new mail" ), ICON_COMPOSEMAIL,
                                0, 0, this );
     composeMail->addTo( toolBar );
     composeMail->addTo( mailMenu );
 
     sendQueued = new QAction( tr( "Send queued mails" ), ICON_SENDQUEUED,
                               0, 0, this );
     sendQueued->addTo( toolBar );
     sendQueued->addTo( mailMenu );
 
     syncFolders = new QAction( tr( "Sync mailfolders" ), ICON_SYNC,
                                0, 0, this );
     syncFolders->addTo( toolBar );
     syncFolders->addTo( mailMenu );
 
     showFolders = new QAction( tr( "Show/Hide folders" ), ICON_SHOWFOLDERS,
                                0, 0, this, 0, true );
     showFolders->addTo( toolBar );
     showFolders->addTo( mailMenu );
     connect(showFolders, SIGNAL( toggled( bool ) ),
             SLOT( slotShowFolders( bool ) ) );
 
     searchMails = new QAction( tr( "Search mails" ), ICON_SEARCHMAILS,
                                0, 0, this );
     searchMails->addTo( toolBar );
     searchMails->addTo( mailMenu );
 
 
     editSettings = new QAction( tr( "Edit settings" ), ICON_EDITSETTINGS,
                                 0, 0, this );
     editSettings->addTo( settingsMenu );
 
     editAccounts = new QAction( tr( "Configure accounts" ), ICON_EDITACCOUNTS,
                                 0, 0, this );
     editAccounts->addTo( settingsMenu );
 
     QWidget *view = new QWidget(  this );
     setCentralWidget( view );
 
     layout = new QBoxLayout ( view, QBoxLayout::LeftToRight );
 
     folderView = new AccountView( view );
     folderView->header()->hide();
     folderView->addColumn( tr( "Mailbox" ) );
     folderView->hide();
 
     layout->addWidget( folderView );
 
     mailView = new QListView( view );
-    mailView->addColumn( tr( "Status" ) );
+    mailView->addColumn( tr( "" ) );
     mailView->addColumn( tr( "Subject" ),QListView::Manual );
     mailView->addColumn( tr( "Sender" ),QListView::Manual );
     mailView->addColumn( tr( "Date" ));
     mailView->setAllColumnsShowFocus(true);
     mailView->setSorting(-1);
 
     layout->addWidget( mailView );
     layout->setStretchFactor( folderView, 1 );
     layout->setStretchFactor( mailView, 2 );
 
     slotAdjustLayout();
 
     connect( mailView, SIGNAL( clicked( QListViewItem * ) ),this,
              SLOT( displayMail( QListViewItem * ) ) );
 
     connect(folderView,SIGNAL(refreshMailview(QList<RecMail>*)),this,SLOT(refreshMailView(QList<RecMail>*)));
 
-   QTimer::singleShot( 1000, this, SLOT(  slotAdjustColumns() ) );
+   QTimer::singleShot( 1000, this, SLOT( slotAdjustColumns() ) );
 }
 
 
 void MainWindow::slotAdjustLayout() {
 
   QWidget *d = QApplication::desktop();
 
   if ( d->width() < d->height() ) {
     layout->setDirection( QBoxLayout::TopToBottom );
     } else {
     layout->setDirection( QBoxLayout::LeftToRight );
   }
   delete d;
 }
 
 void MainWindow::slotAdjustColumns()
 {
     bool hidden = folderView->isHidden();
     if ( hidden ) folderView->show();
     folderView->setColumnWidth( 0, folderView->visibleWidth() );
     if ( hidden ) folderView->hide();
 
     mailView->setColumnWidth( 0, 10 );
     mailView->setColumnWidth( 1, mailView->visibleWidth() - 130 );
     mailView->setColumnWidth( 2, 80 );
     mailView->setColumnWidth( 3, 50 );
 }
 
 void MainWindow::slotShowFolders( bool show )
 {
     qDebug( "Show Folders" );
     if ( show && folderView->isHidden() ) {
         qDebug( "-> showing" );
         folderView->show();
     } else if ( !show && !folderView->isHidden() ) {
         qDebug( "-> hiding" );
         folderView->hide();
     }
 }
 
 void MainWindow::refreshMailView(QList<RecMail>*list)
 {
     MailListViewItem*item = 0;
     mailView->clear();
     for (unsigned int i = 0; i < list->count();++i) {
         item = new MailListViewItem(mailView,item);
         item->storeData(*(list->at(i)));
         item->showEntry();
     }
 }
 void MainWindow::displayMail(QListViewItem*item)
 {
     if (!item) return;
     RecMail mail = ((MailListViewItem*)item)->data();
     RecBody body = folderView->fetchBody(mail);
 
     ViewMail readMail( this );
     readMail.setBody( body );
     readMail.setMail( mail );
     readMail.showMaximized();
     readMail.exec();
     ( (MailListViewItem*)item )->setPixmap( 0, Resource::loadPixmap( "opiemail/kmmsgunseen") );
 }
 
 MailListViewItem::MailListViewItem(QListView * parent, MailListViewItem * item )
         :QListViewItem(parent,item),mail_data()
 {
 }
 
 void MailListViewItem::showEntry()
 {
     if ( mail_data.getFlags().testBit( FLAG_SEEN ) == true )  {
         setPixmap( 0, Resource::loadPixmap( "opiemail/kmmsgunseen") );
     } else  {
         setPixmap( 0, Resource::loadPixmap( "opiemail/kmmsgnew") );
     }
     setText(1,mail_data.getSubject());
     setText(2,mail_data.getFrom());
     setText(3,mail_data.getDate());
 }
 
 void MailListViewItem::storeData(const RecMail&data)
 {
     mail_data = data;
 }
 
 const RecMail& MailListViewItem::data()const
 {
     return mail_data;
 }
 
 
diff --git a/noncore/net/mail/viewmail.cpp b/noncore/net/mail/viewmail.cpp
index a73dac5..42707e3 100644
--- a/noncore/net/mail/viewmail.cpp
+++ b/noncore/net/mail/viewmail.cpp
@@ -1,316 +1,317 @@
 #include <qtextbrowser.h>
 #include <qmessagebox.h>
 #include <qtextstream.h>
 #include <qaction.h>
 #include <qpopupmenu.h>
 #include <qapplication.h>
 
 #include <opie/ofiledialog.h>
 
 #include "settings.h"
 #include "composemail.h"
 #include "viewmail.h"
 #include "abstractmail.h"
 
 AttachItem::AttachItem(QListView * parent,QListViewItem *after, const QString&mime,const QString&file,const QString&desc,int num)
         : QListViewItem(parent,after),_partNum(num)
 {
         setText(0, mime);
         setText(1, file);
         setText(2, desc);
 }
 
 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;
 QString type=body.Description().Type()+"/"+body.Description().Subtype();
 QString desc;
 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(&desc);
     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",desc,-1);
 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) {
         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(&desc);
     if (w>0) o.precision(2); else o.precision(0);
     o.setf(QTextStream::fixed);
     o << s << " " << q << "Byte";
     curItem=new AttachItem(attachments,curItem,type,filename,desc,i);
 }
 }
 
 void ViewMail::slotItemClicked( QListViewItem * item , const QPoint & point, int c ) {
     if (!item )
         return;
 
   QPopupMenu *menu = new QPopupMenu();
   int ret=0;
 
   if ( item->text( 0 ).left( 4 ) == "text" )  {
      menu->insertItem( tr( "Show Text" ), 1 );
   }
-  menu->insertItem( tr( "Save Attachemt" ),  0 );
+  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( 1 )  , types, 0 );
 
              if( !str.isEmpty() ) {
-               qDebug(  " first we will need a MIME wrapper" );
+               qDebug( "first we will need a MIME wrapper" );
              }
              }
         break ;
 
         case 1:
-             qDebug(  QString( "Test selected" ).arg(  ( ( AttachItem* )item )->Partnumber() )  );
              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()->fetchPart( 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;
 
         connect(reply, SIGNAL(activated()), SLOT(slotReply()));
         connect(forward, SIGNAL(activated()), SLOT(slotForward()));
 
         attachments->setEnabled(m_gotBody);
         connect( attachments,  SIGNAL( clicked ( QListViewItem *, const QPoint & , int ) ), SLOT( slotItemClicked(  QListViewItem *,  const QPoint & , int ) ) );
 
 }
 
 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] ) );
 
      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>" + tr( "From" ) + ": </b><font color=#6C86C0>" + deHtml( m_mail[0] ) + "</font><br>"
                   "<b>" + tr(  "To" ) + ": </b><font color=#6C86C0>" + deHtml( toString ) + "</font><br><b>" +
                   tr( "Cc" ) + ": </b>" + deHtml( ccString ) + "<br>"
                       "<b>" + tr( "Date" ) + ": </b> " +  m_mail[3] +
                   "</td></tr></table><font face=fixed>";
 
         browser->setText( QString( m_mailHtml) + deHtml( m_mail[2] ) + "</font></html>" );
         // remove later in favor of a real handling
         m_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 (!m_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
 
         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();
 
 }
 
 void ViewMail::slotForward()
 {
         if (!m_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( 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 );
         composer.showMaximized();
         composer.exec();
 }