summaryrefslogtreecommitdiff
authoralwin <alwin>2004-01-09 01:16:31 (UTC)
committer alwin <alwin>2004-01-09 01:16:31 (UTC)
commitd3a4757e062ffc5ce5840cb1c52215435a468ff0 (patch) (side-by-side diff)
treedf5fdfdf42909e31c112b8e147e9e80c9bc0e94d
parent9fc7d401f1445c5f3d3d74e173dea6de2ea4784a (diff)
downloadopie-d3a4757e062ffc5ce5840cb1c52215435a468ff0.zip
opie-d3a4757e062ffc5ce5840cb1c52215435a468ff0.tar.gz
opie-d3a4757e062ffc5ce5840cb1c52215435a468ff0.tar.bz2
- MHfolder in accountview enhanced
- mv/cp mails has special methods when copy between folder inside a mh storage - removed obsolete vars inside pop3wrapper
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/net/mail/accountview.cpp75
-rw-r--r--noncore/net/mail/accountview.h6
-rw-r--r--noncore/net/mail/libmailwrapper/mhwrapper.cpp68
-rw-r--r--noncore/net/mail/libmailwrapper/mhwrapper.h2
-rw-r--r--noncore/net/mail/libmailwrapper/pop3wrapper.cpp41
-rw-r--r--noncore/net/mail/libmailwrapper/pop3wrapper.h1
6 files changed, 155 insertions, 38 deletions
diff --git a/noncore/net/mail/accountview.cpp b/noncore/net/mail/accountview.cpp
index 62cbf62..3048e49 100644
--- a/noncore/net/mail/accountview.cpp
+++ b/noncore/net/mail/accountview.cpp
@@ -243,5 +243,4 @@ void IMAPviewItem::removeChilds()
delete tmp;
}
-
}
@@ -707,5 +706,6 @@ void AccountView::downloadMails(Folder*fromFolder,AbstractMail*fromWrapper)
* MH Account stuff
*/
-
+/* MH is a little bit different - the top folder can contains messages other than in IMAP and
+ POP3 and MBOX */
MHviewItem::MHviewItem( const QString&aPath, AccountView *parent )
: AccountViewItem( parent )
@@ -717,4 +717,5 @@ MHviewItem::MHviewItem( const QString&aPath, AccountView *parent )
setText( 0, " Local Folders" );
setOpen( true );
+ folder = 0;
}
@@ -722,4 +723,5 @@ MHviewItem::~MHviewItem()
{
delete wrapper;
+ if (folder) delete folder;
}
@@ -729,13 +731,12 @@ AbstractMail *MHviewItem::getWrapper()
}
-void MHviewItem::refresh( QList<RecMail> & )
+void MHviewItem::refresh( QList<RecMail> & target)
{
refresh(false);
+ getWrapper()->listMessages( "",target );
}
-void MHviewItem::refresh(bool force)
+void MHviewItem::removeChilds()
{
- if (childCount()>0 && force==false) return;
- QList<Folder> *folders = wrapper->listFolders();
QListViewItem *child = firstChild();
while ( child ) {
@@ -744,8 +745,27 @@ void MHviewItem::refresh(bool force)
delete tmp;
}
+}
+
+void MHviewItem::refresh(bool force)
+{
+ if (childCount()>0 && force==false) return;
+ removeChilds();
+ QList<Folder> *folders = wrapper->listFolders();
Folder *it;
- QListViewItem*item = 0;
+ MHfolderItem*item = 0;
+ MHfolderItem*pmaster = 0;
+ QString fname = "";
for ( it = folders->first(); it; it = folders->next() ) {
+ fname = it->getDisplayName();
+ /* this folder itself */
+ if (fname=="/") {
+ folder = it;
+ continue;
+ }
+ if (pmaster) {
+ item = new MHfolderItem( it, pmaster, item, this );
+ } else {
item = new MHfolderItem( it, this , item );
+ }
item->setSelectable(it->may_select());
}
@@ -767,4 +787,6 @@ QPopupMenu * MHviewItem::getContextMenu()
m->insertItem(QObject::tr("Refresh folder list",contextName),0);
m->insertItem(QObject::tr("Create new folder",contextName),1);
+ m->insertItem(QObject::tr("Delete all mails",contextName),2);
+ m->insertItem(QObject::tr("Move/Copie all mails",contextName),3);
}
return m;
@@ -783,8 +805,16 @@ void MHviewItem::createFolder()
}
+void MHviewItem::downloadMails()
+{
+ AccountView*bl = accountView();
+ if (!bl) return;
+ bl->downloadMails(folder,getWrapper());
+}
+
QStringList MHviewItem::subFolders()
{
QStringList result;
QListViewItem *child = firstChild();
+ result.append("/");
while ( child ) {
MHfolderItem *tmp = (MHfolderItem*)child;
@@ -805,4 +835,10 @@ void MHviewItem::contextMenuSelected(int which)
createFolder();
break;
+ case 2:
+ deleteAllMail(getWrapper(),folder);
+ break;
+ case 3:
+ downloadMails();
+ break;
default:
break;
@@ -820,12 +856,29 @@ MHfolderItem::MHfolderItem( Folder *folderInit, MHviewItem *parent , QListViewIt
folder = folderInit;
mbox = parent;
- if (folder->getDisplayName().lower() == "outgoing") {
+ initName();
+}
+
+MHfolderItem::MHfolderItem( Folder *folderInit, MHfolderItem *parent, QListViewItem*after, MHviewItem*master)
+ : AccountViewItem( parent,after )
+{
+ folder = folderInit;
+ mbox = master;
+ initName();
+}
+
+void MHfolderItem::initName()
+{
+ QString bName = folder->getDisplayName();
+ if (bName.startsWith("/")&&bName.length()>1) {
+ bName.replace(0,1,"");
+ }
+ if (bName.lower() == "outgoing") {
setPixmap( 0, PIXMAP_OUTBOXFOLDER );
- } else if (folder->getDisplayName().lower() == "inbox") {
+ } else if (bName.lower() == "inbox") {
setPixmap( 0, PIXMAP_INBOXFOLDER);
} else {
setPixmap( 0, PIXMAP_MBOXFOLDER );
}
- setText( 0, folder->getDisplayName() );
+ setText( 0, bName );
}
@@ -874,4 +927,5 @@ QPopupMenu * MHfolderItem::getContextMenu()
m->insertItem(QObject::tr("Delete folder",contextName),1);
m->insertItem(QObject::tr("Move/Copie all mails",contextName),2);
+ m->insertItem(QObject::tr("Create new folder",contextName),3);
}
return m;
@@ -901,2 +955,3 @@ void MHfolderItem::contextMenuSelected(int which)
}
}
+
diff --git a/noncore/net/mail/accountview.h b/noncore/net/mail/accountview.h
index f5a2973..60e2b4b 100644
--- a/noncore/net/mail/accountview.h
+++ b/noncore/net/mail/accountview.h
@@ -135,8 +135,10 @@ public:
protected:
+ void downloadMails();
+ void removeChilds();
virtual void createFolder();
QString m_Path;
AbstractMail *wrapper;
-
+ Folder *folder;
};
@@ -146,4 +148,5 @@ class MHfolderItem : public AccountViewItem
public:
MHfolderItem( Folder *folder, MHviewItem *parent , QListViewItem*after );
+ MHfolderItem( Folder *folder, MHfolderItem *parent, QListViewItem*after, MHviewItem*master);
virtual ~MHfolderItem();
virtual void refresh(QList<RecMail>&);
@@ -156,4 +159,5 @@ protected:
void downloadMails();
virtual void deleteFolder();
+ void initName();
Folder *folder;
MHviewItem *mbox;
diff --git a/noncore/net/mail/libmailwrapper/mhwrapper.cpp b/noncore/net/mail/libmailwrapper/mhwrapper.cpp
index 5adba55..512f778 100644
--- a/noncore/net/mail/libmailwrapper/mhwrapper.cpp
+++ b/noncore/net/mail/libmailwrapper/mhwrapper.cpp
@@ -332,2 +332,70 @@ const QString&MHwrapper::getName()const
return MHName;
}
+void MHwrapper::mvcpMail(const RecMail&mail,const QString&targetFolder,AbstractMail*targetWrapper,bool moveit)
+{
+ init_storage();
+ if (!m_storage) {
+ return;
+ }
+ if (targetWrapper != this) {
+ qDebug("Using generic");
+ Genericwrapper::mvcpMail(mail,targetFolder,targetWrapper,moveit);
+ return;
+ }
+ qDebug("Using internal routines for move/copy");
+ QString tf = buildPath(targetFolder);
+ int r = mailsession_select_folder(m_storage->sto_session,(char*)mail.getMbox().latin1());
+ if (r != MAIL_NO_ERROR) {
+ qDebug("Error selecting source mailbox");
+ return;
+ }
+ if (moveit) {
+ r = mailsession_move_message(m_storage->sto_session,mail.getNumber(),(char*)tf.latin1());
+ } else {
+ r = mailsession_copy_message(m_storage->sto_session,mail.getNumber(),(char*)tf.latin1());
+ }
+ if (r != MAIL_NO_ERROR) {
+ qDebug("Error copy/moving mail internal (%i)",r);
+ }
+}
+
+void MHwrapper::mvcpAllMails(Folder*fromFolder,const QString&targetFolder,AbstractMail*targetWrapper,bool moveit)
+{
+ init_storage();
+ if (!m_storage) {
+ return;
+ }
+ if (targetWrapper != this) {
+ qDebug("Using generic");
+ Genericwrapper::mvcpAllMails(fromFolder,targetFolder,targetWrapper,moveit);
+ return;
+ }
+ if (!fromFolder) return;
+ int r = mailsession_select_folder(m_storage->sto_session,(char*)fromFolder->getName().latin1());
+ if (r!=MAIL_NO_ERROR) {
+ qDebug("error selecting source folder!");
+ return;
+ }
+ QString tf = buildPath(targetFolder);
+ mailmessage_list*l=0;
+ r = mailsession_get_messages_list(m_storage->sto_session,&l);
+ if (r != MAIL_NO_ERROR) {
+ qDebug("Error message list");
+ }
+ unsigned j = 0;
+ for(unsigned int i = 0 ; l!= 0 && i < carray_count(l->msg_tab) ; ++i) {
+ mailmessage * msg;
+ msg = (mailmessage*)carray_get(l->msg_tab, i);
+ j = msg->msg_index;
+ if (moveit) {
+ r = mailsession_move_message(m_storage->sto_session,j,(char*)tf.latin1());
+ } else {
+ r = mailsession_copy_message(m_storage->sto_session,j,(char*)tf.latin1());
+ }
+ if (r != MAIL_NO_ERROR) {
+ qDebug("Error copy/moving mail internal (%i)",r);
+ break;
+ }
+ }
+ if (l) mailmessage_list_free(l);
+}
diff --git a/noncore/net/mail/libmailwrapper/mhwrapper.h b/noncore/net/mail/libmailwrapper/mhwrapper.h
index 7f028b4..79dec30 100644
--- a/noncore/net/mail/libmailwrapper/mhwrapper.h
+++ b/noncore/net/mail/libmailwrapper/mhwrapper.h
@@ -23,4 +23,6 @@ public:
virtual void deleteMail(const RecMail&mail);
virtual void answeredMail(const RecMail&mail);
+ virtual void mvcpMail(const RecMail&mail,const QString&targetFolder,AbstractMail*targetWrapper,bool moveit);
+ virtual void mvcpAllMails(Folder*fromFolder,const QString&targetFolder,AbstractMail*targetWrapper,bool moveit);
virtual int createMbox(const QString&folder,const Folder*f=0,const QString&d="",bool s=false);
diff --git a/noncore/net/mail/libmailwrapper/pop3wrapper.cpp b/noncore/net/mail/libmailwrapper/pop3wrapper.cpp
index f5eca4a..14c2059 100644
--- a/noncore/net/mail/libmailwrapper/pop3wrapper.cpp
+++ b/noncore/net/mail/libmailwrapper/pop3wrapper.cpp
@@ -15,5 +15,4 @@ POP3wrapper::POP3wrapper( POP3account *a )
account = a;
m_pop3 = NULL;
- m_folder = NULL;
msgTempName = a->getFileName()+"_msg_cache";
last_msg_id = 0;
@@ -59,5 +58,5 @@ RecBody POP3wrapper::fetchBody( const RecMail &mail ) {
msg_cache.open(IO_ReadWrite|IO_Truncate);
last_msg_id = mail.getNumber();
- err = mailsession_get_message(m_folder->fld_session, mail.getNumber(), &mailmsg);
+ err = mailsession_get_message(m_pop3->sto_session, mail.getNumber(), &mailmsg);
err = mailmessage_fetch(mailmsg,&message,&length);
msg_cache.writeBlock(message,length);
@@ -95,15 +94,17 @@ RecBody POP3wrapper::fetchBody( const RecMail &mail ) {
}
-void POP3wrapper::listMessages(const QString &, QList<RecMail> &target ) {
+void POP3wrapper::listMessages(const QString &, QList<RecMail> &target )
+{
login();
if (!m_pop3)
return;
uint32_t res_messages,res_recent,res_unseen;
- mailsession_status_folder(m_folder->fld_session,"INBOX",&res_messages,&res_recent,&res_unseen);
- parseList(target,m_folder->fld_session,"INBOX");
+ mailsession_status_folder(m_pop3->sto_session,"INBOX",&res_messages,&res_recent,&res_unseen);
+ parseList(target,m_pop3->sto_session,"INBOX");
Global::statusMessage( tr("Mailbox contains %1 mail(s)").arg(res_messages));
}
-void POP3wrapper::login() {
+void POP3wrapper::login()
+{
if (account->getOffline())
return;
@@ -158,19 +159,8 @@ void POP3wrapper::login() {
-
- m_folder = mailfolder_new(m_pop3, NULL, NULL);
-
- if (m_folder==0) {
- Global::statusMessage(tr("Error initializing folder"));
- mailstorage_free(m_pop3);
- m_pop3 = NULL;
- return;
- }
- err = mailfolder_connect(m_folder);
+ err = mailstorage_connect(m_pop3);
if (err != MAIL_NO_ERROR) {
qDebug( QString( "FEHLERNUMMER %1" ).arg( err ) );
Global::statusMessage(tr("Error initializing folder"));
- mailfolder_free(m_folder);
- m_folder = 0;
mailstorage_free(m_pop3);
m_pop3 = 0;
@@ -178,10 +168,9 @@ void POP3wrapper::login() {
}
-void POP3wrapper::logout() {
+void POP3wrapper::logout()
+{
int err = MAILPOP3_NO_ERROR;
if ( m_pop3 == NULL )
return;
- mailfolder_free(m_folder);
- m_folder = 0;
mailstorage_free(m_pop3);
m_pop3 = 0;
@@ -201,5 +190,5 @@ void POP3wrapper::deleteMail(const RecMail&mail) {
if (!m_pop3)
return;
- int err = mailsession_remove_message(m_folder->fld_session,mail.getNumber());
+ int err = mailsession_remove_message(m_pop3->sto_session,mail.getNumber());
if (err != MAIL_NO_ERROR) {
Global::statusMessage(tr("error deleting mail"));
@@ -216,5 +205,5 @@ int POP3wrapper::deleteAllMail(const Folder*) {
uint32_t result = 0;
- int err = mailsession_messages_number(m_folder->fld_session,NULL,&result);
+ int err = mailsession_messages_number(m_pop3->sto_session,NULL,&result);
if (err != MAIL_NO_ERROR) {
Global::statusMessage(tr("Error getting folder info"));
@@ -222,5 +211,5 @@ int POP3wrapper::deleteAllMail(const Folder*) {
}
for (unsigned int i = 0; i < result; ++i) {
- err = mailsession_remove_message(m_folder->fld_session,i+1);
+ err = mailsession_remove_message(m_pop3->sto_session,i+1);
if (err != MAIL_NO_ERROR) {
Global::statusMessage(tr("Error deleting mail %1").arg(i+1));
@@ -239,5 +228,5 @@ void POP3wrapper::statusFolder(folderStat&target_stat,const QString&) {
if (!m_pop3)
return;
- int r = mailsession_status_folder(m_folder->fld_session,0,&target_stat.message_count,
+ int r = mailsession_status_folder(m_pop3->sto_session,0,&target_stat.message_count,
&target_stat.message_recent,&target_stat.message_unseen);
}
@@ -248,5 +237,5 @@ encodedString* POP3wrapper::fetchRawBody(const RecMail&mail) {
encodedString*res = 0;
mailmessage * mailmsg = 0;
- int err = mailsession_get_message(m_folder->fld_session, mail.getNumber(), &mailmsg);
+ int err = mailsession_get_message(m_pop3->sto_session, mail.getNumber(), &mailmsg);
err = mailmessage_fetch(mailmsg,&target,&length);
if (mailmsg)
diff --git a/noncore/net/mail/libmailwrapper/pop3wrapper.h b/noncore/net/mail/libmailwrapper/pop3wrapper.h
index d2b708d..a24b9cf 100644
--- a/noncore/net/mail/libmailwrapper/pop3wrapper.h
+++ b/noncore/net/mail/libmailwrapper/pop3wrapper.h
@@ -38,5 +38,4 @@ protected:
POP3account *account;
mailstorage*m_pop3;
- mailfolder*m_folder;
};