1 files changed, 26 insertions, 3 deletions

diff --git a/noncore/net/mail/mainwindow.cpp b/noncore/net/mail/mainwindow.cpp
index 8ef7ddd..c410829 100644
--- a/noncore/net/mail/mainwindow.cpp
+++ b/noncore/net/mail/mainwindow.cpp
@@ -61,4 +61,9 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
     searchMails->addTo( mailMenu );
 
+    deleteMails = new QAction(tr("Delete Mail"), QIconSet(Resource::loadPixmap("mail/delete")), 0, 0, this);
+    deleteMails->addTo( toolBar );
+    deleteMails->addTo( mailMenu );
+    connect( deleteMails, SIGNAL( activated() ),
+             SLOT( slotDeleteMail() ) );
 
     editSettings = new QAction( tr( "Edit settings" ), ICON_EDITSETTINGS,
@@ -99,5 +104,5 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
              SLOT( displayMail( QListViewItem * ) ) );
 
-    connect(folderView,SIGNAL(refreshMailview(QList<RecMail>*)),this,SLOT(refreshMailView(QList<RecMail>*)));
+    connect(folderView, SIGNAL(refreshMailview(QList<RecMail>*)),this,SLOT(refreshMailView(QList<RecMail>*)));
 
    QTimer::singleShot( 1000, this, SLOT( slotAdjustColumns() ) );
@@ -132,5 +137,5 @@ void MainWindow::slotAdjustColumns()
 void MainWindow::slotShowFolders( bool show )
 {
-    qDebug( "Show Folders" );
+   qDebug( "Show Folders" );
     if ( show && folderView->isHidden() ) {
         qDebug( "-> showing" );
@@ -154,4 +159,7 @@ void MainWindow::refreshMailView(QList<RecMail>*list)
 void MainWindow::displayMail(QListViewItem*item)
 {
+
+    m_currentItem = item;
+
     if (!item) return;
     RecMail mail = ((MailListViewItem*)item)->data();
@@ -163,7 +171,22 @@ void MainWindow::displayMail(QListViewItem*item)
     readMail.showMaximized();
     readMail.exec();
-    ( (MailListViewItem*)item )->setPixmap( 0, Resource::loadPixmap( "opiemail/kmmsgunseen") );
+
+    if (  readMail.deleted ) {
+         folderView->refreshCurrent();
+    } else {
+        ( (MailListViewItem*)item )->setPixmap( 0, Resource::loadPixmap( "opiemail/kmmsgunseen") );
+    }
 }
 
+void MainWindow::slotDeleteMail()
+{
+    if (!m_currentItem) return;
+    RecMail mail = ((MailListViewItem*)m_currentItem)->data();
+    mail.Wrapper()->deleteMail( mail );
+    folderView->refreshCurrent();
+}
+
+
+
 MailListViewItem::MailListViewItem(QListView * parent, MailListViewItem * item )
         :QListViewItem(parent,item),mail_data()