From d1a7eb08cad465c5fc0de53f75aaecf7803f0945 Mon Sep 17 00:00:00 2001 From: alwin Date: Sun, 28 Dec 2003 02:45:07 +0000 Subject: - dir handling for mbox accounts (delete, new, delete all mail) - fixed memory leaks in mbox account class - reduced count of used string constants while using "tr" with context string - mbox displays messages into global status bar - fixed a possible raise condition when deleting a mail directory --- (limited to 'noncore/net/mail/accountview.cpp') diff --git a/noncore/net/mail/accountview.cpp b/noncore/net/mail/accountview.cpp index 8aac14b..30765cf 100644 --- a/noncore/net/mail/accountview.cpp +++ b/noncore/net/mail/accountview.cpp @@ -185,10 +185,10 @@ QPopupMenu * IMAPviewItem::getContextMenu() { QPopupMenu *m = new QPopupMenu(0); if (m) { - m->insertItem(QObject::tr("Refresh folder list","IMAPviewItem"),0); - m->insertItem(QObject::tr("Create new folder","IMAPviewItem"),1); + m->insertItem(QObject::tr("Refresh folder list",contextName),0); + m->insertItem(QObject::tr("Create new folder",contextName),1); m->insertSeparator(); - m->insertItem(QObject::tr("Disconnect","IMAPviewItem"),2); + m->insertItem(QObject::tr("Disconnect",contextName),2); } return m; } @@ -291,14 +291,14 @@ QPopupMenu * IMAPfolderItem::getContextMenu() QPopupMenu *m = new QPopupMenu(0); if (m) { if (folder->may_select()) { - m->insertItem(QObject::tr("Refresh header list","IMAPfolderItem"),0); - m->insertItem(QObject::tr("Delete all mails","IMAPfolderItem"),1); + m->insertItem(QObject::tr("Refresh header list",contextName),0); + m->insertItem(QObject::tr("Delete all mails",contextName),1); } if (folder->no_inferior()==false) { - m->insertItem(QObject::tr("Create new subfolder","IMAPfolderItem"),2); + m->insertItem(QObject::tr("Create new subfolder",contextName),2); } if (folder->getDisplayName().lower()!="inbox") { - m->insertItem(QObject::tr("Delete folder","IMAPfolderItem"),3); + m->insertItem(QObject::tr("Delete folder",contextName),3); } } return m; @@ -306,10 +306,10 @@ QPopupMenu * IMAPfolderItem::getContextMenu() void IMAPfolderItem::deleteAllMails() { - int yesno = QMessageBox::warning(0,QObject::tr("Delete all mails","IMAPfolderItem"), - QObject::tr("
Realy delete all mails in box
%1
","IMAPfolderItem").arg(folder->getDisplayName()), - QObject::tr("Yes","IMAPfolderItem"), - QObject::tr("No","IMAPfolderItem"),QString::null,1,1); + int yesno = QMessageBox::warning(0,QObject::tr("Delete all mails",contextName), + QObject::tr("
Realy delete all mails in box
%1
",contextName).arg(folder->getDisplayName()), + QObject::tr("Yes",contextName), + QObject::tr("No",contextName),QString::null,1,1); qDebug("Auswahl: %i",yesno); if (yesno == 0) { if (imap->getWrapper()->deleteAllMail(folder)) { @@ -335,16 +335,21 @@ void IMAPfolderItem::createNewFolder() void IMAPfolderItem::deleteFolder() { - int yesno = QMessageBox::warning(0,QObject::tr("Delete folder","IMAPfolderItem"), - QObject::tr("
Realy delete folder
%1
and all if it content?
","IMAPfolderItem").arg(folder->getDisplayName()), - QObject::tr("Yes","IMAPfolderItem"), - QObject::tr("No","IMAPfolderItem"),QString::null,1,1); + int yesno = QMessageBox::warning(0,QObject::tr("Delete folder",contextName), + QObject::tr("
Realy delete folder
%1
and all if it content?
",contextName).arg(folder->getDisplayName()), + QObject::tr("Yes",contextName), + QObject::tr("No",contextName),QString::null,1,1); qDebug("Auswahl: %i",yesno); if (yesno == 0) { if (imap->getWrapper()->deleteMbox(folder)) { - /* be carefull - after that this object is destroyd so don't call + QListView*v=listView(); + IMAPviewItem * box = imap; + /* be carefull - after that this object is destroyd so don't use * any member of it after that call!!*/ imap->refreshFolders(true); + if (v) { + v->setSelected(box,true); + } } } } @@ -375,6 +380,8 @@ void IMAPfolderItem::contextMenuSelected(int id) * Generic stuff */ +const QString AccountViewItem::contextName="AccountViewItem"; + AccountView::AccountView( QWidget *parent, const char *name, WFlags flags ) : QListView( parent, name, flags ) { @@ -490,6 +497,12 @@ AbstractMail *MBOXviewItem::getWrapper() void MBOXviewItem::refresh( QList & ) { + refresh(false); +} + +void MBOXviewItem::refresh(bool force) +{ + if (childCount()>0 && force==false) return; QList *folders = wrapper->listFolders(); QListViewItem *child = firstChild(); while ( child ) { @@ -510,10 +523,46 @@ void MBOXviewItem::refresh( QList & ) RecBody MBOXviewItem::fetchBody( const RecMail &mail ) { - qDebug( "POP3 fetchBody" ); + qDebug( "MBOX fetchBody" ); return wrapper->fetchBody( mail ); } +QPopupMenu * MBOXviewItem::getContextMenu() +{ + QPopupMenu *m = new QPopupMenu(0); + if (m) { + m->insertItem(QObject::tr("Refresh folder list",contextName),0); + m->insertItem(QObject::tr("Create new folder",contextName),1); + } + return m; +} + +void MBOXviewItem::createFolder() +{ + Newmdirdlg ndirdlg(0,0,true); + ndirdlg.showMaximized(); + if (ndirdlg.exec()) { + QString ndir = ndirdlg.Newdir(); + if (wrapper->createMbox(ndir)) { + refresh(true); + } + } +} + +void MBOXviewItem::contextMenuSelected(int which) +{ + switch (which) { + case 0: + refresh(true); + break; + case 1: + createFolder(); + break; + default: + break; + } +} + MBOXfolderItem::~MBOXfolderItem() { delete folder; @@ -544,3 +593,63 @@ RecBody MBOXfolderItem::fetchBody(const RecMail&aMail) { return mbox->getWrapper()->fetchBody(aMail); } + +void MBOXfolderItem::deleteAllMails() +{ + int yesno = QMessageBox::warning(0,QObject::tr("Delete all mails",contextName), + QObject::tr("
Realy delete all mails in box
%1
",contextName).arg(folder->getDisplayName()), + QObject::tr("Yes",contextName), + QObject::tr("No",contextName),QString::null,1,1); + qDebug("Auswahl: %i",yesno); + if (yesno == 0) { + if (mbox->getWrapper()->deleteAllMail(folder)) { + AccountView * view = (AccountView*)listView(); + if (view) view->refreshCurrent(); + } + } +} + +void MBOXfolderItem::deleteFolder() +{ + int yesno = QMessageBox::warning(0,QObject::tr("Delete folder",contextName), + QObject::tr("
Realy delete folder
%1
and all if it content?
",contextName).arg(folder->getDisplayName()), + QObject::tr("Yes",contextName), + QObject::tr("No",contextName),QString::null,1,1); + qDebug("Auswahl: %i",yesno); + if (yesno == 0) { + if (mbox->getWrapper()->deleteMbox(folder)) { + QListView*v=listView(); + MBOXviewItem * box = mbox; + /* be carefull - after that this object is destroyd so don't use + * any member of it after that call!!*/ + mbox->refresh(true); + if (v) { + v->setSelected(box,true); + } + } + } +} + +QPopupMenu * MBOXfolderItem::getContextMenu() +{ + QPopupMenu *m = new QPopupMenu(0); + if (m) { + m->insertItem(QObject::tr("Delete all mails",contextName),0); + m->insertItem(QObject::tr("Delete folder",contextName),1); + } + return m; +} + +void MBOXfolderItem::contextMenuSelected(int which) +{ + switch(which) { + case 0: + deleteAllMails(); + break; + case 1: + deleteFolder(); + break; + default: + break; + } +} -- cgit v0.9.0.2