From ff2b84787e454f8a11aaef7a4ce18941ac0d28fd Mon Sep 17 00:00:00 2001 From: harlekin Date: Sun, 14 Dec 2003 00:20:38 +0000 Subject: deleting of mails working --- (limited to 'noncore/net/mail') diff --git a/noncore/net/mail/accountview.cpp b/noncore/net/mail/accountview.cpp index 1069b9f..ac4f0e0 100644 --- a/noncore/net/mail/accountview.cpp +++ b/noncore/net/mail/accountview.cpp @@ -61,14 +61,14 @@ AbstractMail *IMAPviewItem::getWrapper() void IMAPviewItem::refresh(QList&) { QList *folders = wrapper->listFolders(); - + QListViewItem *child = firstChild(); while ( child ) { QListViewItem *tmp = child; child = child->nextSibling(); delete tmp; } - + Folder *it; for ( it = folders->first(); it; it = folders->next() ) { (void) new IMAPfolderItem( it, this ); @@ -80,7 +80,7 @@ RecBody IMAPviewItem::fetchBody(const RecMail&) return RecBody(); } -IMAPfolderItem::~IMAPfolderItem() +IMAPfolderItem::~IMAPfolderItem() { delete folder; } @@ -94,7 +94,7 @@ IMAPfolderItem::IMAPfolderItem( Folder *folderInit, IMAPviewItem *parent ) setText( 0, folder->getDisplayName() ); } -void IMAPfolderItem::refresh(QList&target) +void IMAPfolderItem::refresh(QList&target) { imap->getWrapper()->listMessages( folder->getName(),target ); } @@ -118,7 +118,7 @@ AccountView::AccountView( QWidget *parent, const char *name, WFlags flags ) void AccountView::populate( QList list ) { clear(); - + Account *it; for ( it = list.first(); it; it = list.next() ) { if ( it->getType().compare( "IMAP" ) == 0 ) { @@ -134,8 +134,10 @@ void AccountView::populate( QList list ) } void AccountView::refresh(QListViewItem *item) { + qDebug("AccountView refresh..."); - if ( item ) { + if ( item ) { + m_currentItem = item; QList headerlist; headerlist.setAutoDelete(true); AccountViewItem *view = static_cast(item); @@ -144,9 +146,19 @@ void AccountView::refresh(QListViewItem *item) { } } +void AccountView::refreshCurrent() +{ + if ( !m_currentItem ) return; + QList headerlist; + headerlist.setAutoDelete(true); + AccountViewItem *view = static_cast(m_currentItem); + view->refresh(headerlist); + emit refreshMailview(&headerlist); +} + void AccountView::refreshAll() { - + } RecBody AccountView::fetchBody(const RecMail&aMail) diff --git a/noncore/net/mail/accountview.h b/noncore/net/mail/accountview.h index 83d49af..cdc87ce 100644 --- a/noncore/net/mail/accountview.h +++ b/noncore/net/mail/accountview.h @@ -77,9 +77,13 @@ public: public slots: void refreshAll(); void refresh(QListViewItem *item); + void refreshCurrent(); signals: - void refreshMailview(QList*); + void refreshMailview(QList*); + +private: + QListViewItem* m_currentItem; }; #endif 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 @@ -60,6 +60,11 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags ) searchMails->addTo( toolBar ); 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, 0, 0, this ); @@ -98,7 +103,7 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags ) connect( mailView, SIGNAL( clicked( QListViewItem * ) ),this, SLOT( displayMail( QListViewItem * ) ) ); - connect(folderView,SIGNAL(refreshMailview(QList*)),this,SLOT(refreshMailView(QList*))); + connect(folderView, SIGNAL(refreshMailview(QList*)),this,SLOT(refreshMailView(QList*))); QTimer::singleShot( 1000, this, SLOT( slotAdjustColumns() ) ); } @@ -131,7 +136,7 @@ void MainWindow::slotAdjustColumns() void MainWindow::slotShowFolders( bool show ) { - qDebug( "Show Folders" ); + qDebug( "Show Folders" ); if ( show && folderView->isHidden() ) { qDebug( "-> showing" ); folderView->show(); @@ -153,6 +158,9 @@ void MainWindow::refreshMailView(QList*list) } void MainWindow::displayMail(QListViewItem*item) { + + m_currentItem = item; + if (!item) return; RecMail mail = ((MailListViewItem*)item)->data(); RecBody body = folderView->fetchBody(mail); @@ -162,9 +170,24 @@ void MainWindow::displayMail(QListViewItem*item) readMail.setMail( mail ); 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() { diff --git a/noncore/net/mail/mainwindow.h b/noncore/net/mail/mainwindow.h index 6c1cda0..8641510 100644 --- a/noncore/net/mail/mainwindow.h +++ b/noncore/net/mail/mainwindow.h @@ -26,16 +26,18 @@ protected slots: virtual void slotShowFolders( bool show ); virtual void refreshMailView(QList*); virtual void displayMail(QListViewItem*); + virtual void slotDeleteMail(); void slotAdjustLayout(); protected: QToolBar *toolBar; QMenuBar *menuBar; QPopupMenu *mailMenu, *settingsMenu; - QAction *composeMail, *sendQueued, *showFolders, *searchMails, + QAction *composeMail, *sendQueued, *showFolders, *searchMails, *deleteMails, *editSettings, *editAccounts, *syncFolders; AccountView *folderView; QListView *mailView; + QListViewItem* m_currentItem; QBoxLayout *layout; }; diff --git a/noncore/net/mail/viewmail.cpp b/noncore/net/mail/viewmail.cpp index 42707e3..163ffb7 100644 --- a/noncore/net/mail/viewmail.cpp +++ b/noncore/net/mail/viewmail.cpp @@ -11,6 +11,7 @@ #include "composemail.h" #include "viewmail.h" #include "abstractmail.h" +#include "accountview.h" AttachItem::AttachItem(QListView * parent,QListViewItem *after, const QString&mime,const QString&file,const QString&desc,int num) : QListViewItem(parent,after),_partNum(num) @@ -169,6 +170,7 @@ ViewMail::ViewMail( QWidget *parent, const char *name, WFlags fl) connect(reply, SIGNAL(activated()), SLOT(slotReply())); connect(forward, SIGNAL(activated()), SLOT(slotForward())); + connect( deleteMail, SIGNAL( activated() ), SLOT( slotDeleteMail( ) ) ); attachments->setEnabled(m_gotBody); connect( attachments, SIGNAL( clicked ( QListViewItem *, const QPoint & , int ) ), SLOT( slotItemClicked( QListViewItem *, const QPoint & , int ) ) ); @@ -315,3 +317,9 @@ void ViewMail::slotForward() composer.exec(); } +void ViewMail::slotDeleteMail( ) +{ + m_recMail.Wrapper()->deleteMail( m_recMail ); + hide(); + deleted = true; +} diff --git a/noncore/net/mail/viewmail.h b/noncore/net/mail/viewmail.h index bc12da1..765464c 100644 --- a/noncore/net/mail/viewmail.h +++ b/noncore/net/mail/viewmail.h @@ -30,6 +30,7 @@ public: void exec(); void setMail( RecMail mail ); void setBody( RecBody body ); + bool deleted; protected: QString deHtml(const QString &string); @@ -39,6 +40,8 @@ protected slots: void slotForward(); void setText(); void slotItemClicked( QListViewItem * item , const QPoint & point, int c ); + void slotDeleteMail( ); + private: bool _inLoop; -- cgit v0.9.0.2