summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--kmicromail/accountitem.cpp22
-rw-r--r--kmicromail/accountview.cpp5
-rw-r--r--kmicromail/libmailwrapper/abstractmail.cpp67
-rw-r--r--kmicromail/libmailwrapper/abstractmail.h7
-rw-r--r--kmicromail/libmailwrapper/genericwrapper.cpp64
-rw-r--r--kmicromail/libmailwrapper/genericwrapper.h2
-rw-r--r--kmicromail/libmailwrapper/imapwrapper.cpp18
-rw-r--r--kmicromail/libmailwrapper/imapwrapper.h1
-rw-r--r--kmicromail/libmailwrapper/mailtypes.cpp23
-rw-r--r--kmicromail/libmailwrapper/mailtypes.h5
-rw-r--r--kmicromail/libmailwrapper/mboxwrapper.h1
-rw-r--r--kmicromail/libmailwrapper/mhwrapper.cpp1
-rw-r--r--kmicromail/libmailwrapper/mhwrapper.h1
-rw-r--r--kmicromail/libmailwrapper/nntpwrapper.h1
-rw-r--r--kmicromail/libmailwrapper/pop3wrapper.h2
-rw-r--r--kmicromail/libmailwrapper/smtpwrapper.h1
-rw-r--r--kmicromail/mailistviewitem.cpp7
17 files changed, 207 insertions, 21 deletions
diff --git a/kmicromail/accountitem.cpp b/kmicromail/accountitem.cpp
index 1698b40..7b9b881 100644
--- a/kmicromail/accountitem.cpp
+++ b/kmicromail/accountitem.cpp
@@ -94,3 +94,3 @@ QPopupMenu * POP3viewItem::getContextMenu()
m->insertItem(QObject::tr("Set offline",contextName),1);
- m->insertItem(QObject::tr("Download messages",contextName),2);
+ m->insertItem(QObject::tr("Download new INBOX messages",contextName),2);
}
@@ -99,2 +99,3 @@ QPopupMenu * POP3viewItem::getContextMenu()
m->insertItem(QObject::tr("Set online",contextName),1);
+ m->insertItem(QObject::tr("Download new INBOX messages",contextName),2);
}
@@ -139,2 +140,4 @@ void POP3viewItem::contextMenuSelected(int which)
case 2: // daunlood
+ if (account->getOffline())
+ setOnOffline();
AccountView*bl = accountView();
@@ -515,2 +518,4 @@ QPopupMenu * IMAPviewItem::getContextMenu()
m->insertItem(QObject::tr("Set offline",contextName),3);
+ m->insertSeparator();
+ m->insertItem(QObject::tr("Download new INBOX messages",contextName),4);
}
@@ -519,2 +524,4 @@ QPopupMenu * IMAPviewItem::getContextMenu()
m->insertItem(QObject::tr("Set online",contextName),3);
+ m->insertSeparator();
+ m->insertItem(QObject::tr("Download new INBOX messages",contextName),4);
}
@@ -572,2 +579,15 @@ void IMAPviewItem::contextMenuSelected(int id)
break;
+ case 4: // daunlood
+ {
+ if (account->getOffline()) {
+ contextMenuSelected( 3 );
+ }
+ AccountView*bl = accountView();
+ if (!bl) return;
+ AccountViewItem* in = findSubItem( "inbox" , 0);
+ if ( ! in )
+ return;
+ bl->downloadMailsInbox(in->getFolder(),getWrapper());
+ }
+ break;
default:
diff --git a/kmicromail/accountview.cpp b/kmicromail/accountview.cpp
index 85523b1..de8c5bb 100644
--- a/kmicromail/accountview.cpp
+++ b/kmicromail/accountview.cpp
@@ -143,2 +143,3 @@ void AccountView::downloadMailsInbox(const FolderP&fromFolder,AbstractMail*fromW
{
+#if 0
AbstractMail*targetMail = 0;
@@ -164,5 +165,7 @@ void AccountView::downloadMailsInbox(const FolderP&fromFolder,AbstractMail*fromW
maxsize = sels.sizeSpinBox->value();
-
fromWrapper->mvcpAllMails(fromFolder,targetFolder,targetMail,sels.moveMails(), maxsize);
+#endif
+ fromWrapper->downloadNewMails( fromFolder, mhAccounts[0]->getWrapper());
refreshCurrent();
+
}
diff --git a/kmicromail/libmailwrapper/abstractmail.cpp b/kmicromail/libmailwrapper/abstractmail.cpp
index f876235..374d606 100644
--- a/kmicromail/libmailwrapper/abstractmail.cpp
+++ b/kmicromail/libmailwrapper/abstractmail.cpp
@@ -12,2 +12,3 @@
#include <qapplication.h>
+#include <qmessagebox.h>
@@ -160,2 +161,68 @@ void AbstractMail::deleteMailList(const QValueList<RecMailP>&target)
}
+
+void AbstractMail::downloadNewMails(const FolderP&fromFolder, AbstractMail*targetMail )
+{
+ qDebug("AbstractMail::downloadNewMails %s ", fromFolder->getName().latin1());
+ // get local folder
+ Account * acc = getAccount();
+ if ( !acc ) return;
+ QString lfName = acc->getLocalFolder();
+ if ( lfName.isEmpty() )
+ lfName = acc->getAccountName();
+ // create local folder
+ if ( !targetMail->createMbox(lfName))
+ {
+ QMessageBox::critical(0,tr("Error creating new Folder"),
+ tr("Error while creating new folder\n%1\n\nCancelling action.").arg(lfName));
+ return;
+ }
+ QValueList<RecMailP> t;
+ listMessages(fromFolder->getName(),t,acc->getMaxMailSize() );
+ if ( t.count() == 0 ) {
+ Global::statusMessage(tr("There are no new messages"));
+ return;
+ }
+ QValueList<RecMailP> e;
+ targetMail->listMessages(lfName,e,acc->getMaxMailSize() );
+ qDebug("target has mails %d ", e.count());
+ QValueList<RecMailP> n;
+ int iii = 0;
+ int count = t.count();
+ while (iii < count ) {
+ RecMailP r = (*t.at( iii ));
+ bool found = false;
+ int jjj = 0;
+ int countE = e.count();
+ while (jjj < countE ) {
+ RecMailP re = (*e.at( jjj ));
+ if ( re->isEqual(r) ) {
+ found = true;
+ break;
+ }
+ ++jjj;
+ }
+ if ( found )
+ qDebug("found ");
+ else
+ qDebug("NOT found ");
+
+ if ( !found ) {
+ n.append( r );
+ }
+ ++iii;
+ }
+ if ( n.count() == 0 ) {
+ Global::statusMessage(tr("There are no new messages"));
+ return;
+ }
+ mvcpMailList( n,lfName,targetMail,!acc->getLeaveOnServer());
+
+
+#if 0
+ QValueList<RecMailP> t;
+ listMessages(fromFolder->getName(),t, maxSizeInKb);
+ mvcpMailList( t,targetFolder,targetWrapper,moveit);
+#endif
+
+}
void AbstractMail::mvcpAllMails(const FolderP&fromFolder,
diff --git a/kmicromail/libmailwrapper/abstractmail.h b/kmicromail/libmailwrapper/abstractmail.h
index cae83f4..2069ca1 100644
--- a/kmicromail/libmailwrapper/abstractmail.h
+++ b/kmicromail/libmailwrapper/abstractmail.h
@@ -12,2 +12,5 @@
+
+#include "mailwrapper.h"
+
class IMAPwrapper;
@@ -40,3 +43,3 @@ public:
virtual void storeMessage(const char*msg,size_t length, const QString&folder)=0;
-
+ void downloadNewMails(const FolderP&fromFolder,AbstractMail*targetWrapper );
virtual void mvcpAllMails(const Opie::Core::OSmartPointer<Folder>&fromFolder,
@@ -57,2 +60,4 @@ public:
+ virtual Account* getAccount() = 0;
+
static AbstractMail* getWrapper(IMAPaccount *a);
diff --git a/kmicromail/libmailwrapper/genericwrapper.cpp b/kmicromail/libmailwrapper/genericwrapper.cpp
index 9614d53..2b04847 100644
--- a/kmicromail/libmailwrapper/genericwrapper.cpp
+++ b/kmicromail/libmailwrapper/genericwrapper.cpp
@@ -5,2 +5,5 @@
+#include <kconfig.h>
+#include <kglobal.h>
+#include <kstandarddirs.h>
@@ -26,2 +29,44 @@ Genericwrapper::~Genericwrapper()
}
+QString Genericwrapper::parseDateTime( mailimf_date_time *date )
+{
+ static bool init = false ;
+ if ( ! init ) {
+ KConfig kon ( locateLocal( "config", "korganizerrc" ) );
+ kon.setGroup("Locale");
+ KGlobal::locale()->setIntDateFormat( (KLocale::IntDateFormat)kon.readNumEntry( "PreferredDate",0) );
+ QString dummy = kon.readEntry( "UserDateFormatShort","%aK %d.%m.%y" );// kon.readEntry( "");
+ KGlobal::locale()->setHore24Format( !kon.readBoolEntry( "PreferredTime",0 ) );
+ KGlobal::locale()->setDateFormatShort(dummy.replace( QRegExp("K"), QString(",") ));
+ kon.setGroup("Time & Date");
+ KGlobal::locale()->setDaylightSaving( kon.readBoolEntry( "UseDaylightsaving", true ),
+ kon.readNumEntry( "DaylightsavingStart", 90),
+ kon.readNumEntry( "DaylightsavingEnd",304) );
+ KGlobal::locale()->setTimezone( kon.readEntry( "TimeZoneName" ," 00:00 Europe/London(UTC)") );
+
+ init = true;
+
+ }
+ QDateTime dt (QDate(date->dt_year,date->dt_month, date->dt_day ),QTime(date->dt_hour, date->dt_min, date->dt_sec ) );
+ int off = KGlobal::locale()->localTimeOffset( dt );
+ dt = dt.addSecs( off*60 );
+ QString ret = KGlobal::locale()->formatDateTime( dt,true,true);
+ if ( off < 0 )
+ ret += " -";
+ else
+ ret += " +";
+ ret += QString::number( off / 60 );
+ ret += "h";
+#if 0
+ char tmp[23];
+
+ // snprintf( tmp, 23, "%02i.%02i.%04i %02i:%02i:%02i %+05i",
+ // date->dt_day, date->dt_month, date->dt_year, date->dt_hour, date->dt_min, date->dt_sec, date->dt_zone );
+ snprintf( tmp, 23, "%04i-%02i-%02i %02i:%02i:%02i %+05i",
+ date->dt_year,date->dt_month, date->dt_day, date->dt_hour, date->dt_min, date->dt_sec, date->dt_zone );
+
+
+ return QString( tmp );
+#endif
+ return ret;
+}
@@ -244,13 +289,2 @@ RecBodyP Genericwrapper::parseMail( mailmessage * msg )
-QString Genericwrapper::parseDateTime( mailimf_date_time *date )
-{
- char tmp[23];
-
- // snprintf( tmp, 23, "%02i.%02i.%04i %02i:%02i:%02i %+05i",
- // date->dt_day, date->dt_month, date->dt_year, date->dt_hour, date->dt_min, date->dt_sec, date->dt_zone );
- snprintf( tmp, 23, "%04i-%02i-%02i %02i:%02i:%02i %+05i",
- date->dt_year,date->dt_month, date->dt_day, date->dt_hour, date->dt_min, date->dt_sec, date->dt_zone );
-
- return QString( tmp );
-}
@@ -450,4 +484,10 @@ void Genericwrapper::parseList(QValueList<Opie::Core::OSmartPointer<RecMail> > &
mail->setBcc( parseAddressList( single_fields.fld_bcc->bcc_addr_list ) );
- if (single_fields.fld_orig_date)
+ if (single_fields.fld_orig_date) {
mail->setDate( parseDateTime( single_fields.fld_orig_date->dt_date_time ) );
+ char tmp[23];
+ struct mailimf_date_time* date = single_fields.fld_orig_date->dt_date_time;
+ snprintf( tmp, 23, "%04i-%02i-%02i %02i:%02i:%02i %05i",
+ date->dt_year,date->dt_month, date->dt_day, date->dt_hour, date->dt_min, date->dt_sec, date->dt_zone );
+ mail->setIsoDate( QString( tmp ) );
+ }
// crashes when accessing pop3 account?
diff --git a/kmicromail/libmailwrapper/genericwrapper.h b/kmicromail/libmailwrapper/genericwrapper.h
index 235e116..244212f 100644
--- a/kmicromail/libmailwrapper/genericwrapper.h
+++ b/kmicromail/libmailwrapper/genericwrapper.h
@@ -44,2 +44,3 @@ public:
virtual void storeMessage(const char*msg,size_t length, const QString&folder){};
+ static QString parseDateTime( mailimf_date_time *date );
@@ -51,3 +52,2 @@ protected:
QString parseAddressList( mailimf_address_list *list );
- QString parseDateTime( mailimf_date_time *date );
diff --git a/kmicromail/libmailwrapper/imapwrapper.cpp b/kmicromail/libmailwrapper/imapwrapper.cpp
index 6faa524..5441a9b 100644
--- a/kmicromail/libmailwrapper/imapwrapper.cpp
+++ b/kmicromail/libmailwrapper/imapwrapper.cpp
@@ -9,2 +9,3 @@
#include <qprogressbar.h>
+#include "genericwrapper.h"
@@ -458,4 +459,19 @@ RecMail*IMAPwrapper::parse_list_result(mailimap_msg_att* m_att)
continue;
- if ( head->env_date != NULL )
+ if ( head->env_date != NULL ) {
m->setDate(head->env_date);
+ struct mailimf_date_time result;
+ struct mailimf_date_time* date = &result;
+ struct mailimf_date_time **re = &date;
+ size_t length = m->getDate().length();
+ size_t index = 0;
+ if ( mailimf_date_time_parse(head->env_date, length,&index, re ) == MAILIMF_NO_ERROR ) {
+ m->setDate( Genericwrapper::parseDateTime( date ) );
+ char tmp[23];
+ snprintf( tmp, 23, "%04i-%02i-%02i %02i:%02i:%02i %05i",
+ date->dt_year,date->dt_month, date->dt_day, date->dt_hour, date->dt_min, date->dt_sec, date->dt_zone );
+ m->setIsoDate( QString( tmp ) );
+ } else {
+ m->setIsoDate(head->env_date);
+ }
+ }
if ( head->env_subject != NULL )
diff --git a/kmicromail/libmailwrapper/imapwrapper.h b/kmicromail/libmailwrapper/imapwrapper.h
index db8ab5b..5535d8d 100644
--- a/kmicromail/libmailwrapper/imapwrapper.h
+++ b/kmicromail/libmailwrapper/imapwrapper.h
@@ -54,2 +54,3 @@ public:
virtual const QString&getName()const;
+ virtual Account* getAccount() { return account; };
diff --git a/kmicromail/libmailwrapper/mailtypes.cpp b/kmicromail/libmailwrapper/mailtypes.cpp
index d43bdc6..1a4ffd1 100644
--- a/kmicromail/libmailwrapper/mailtypes.cpp
+++ b/kmicromail/libmailwrapper/mailtypes.cpp
@@ -25,3 +25,26 @@ RecMail::~RecMail()
}
+static bool stringCompareRec( const QString& s1, const QString& s2 )
+{
+ if ( s1.isEmpty() && s2.isEmpty() )
+ return true;
+ return s1 == s2;
+}
+
+bool RecMail::isEqual( RecMail* r1 )
+{
+ if ( !stringCompareRec( isodate, r1->isodate ) ) {
+ // qDebug("date *%s* *%s* ", isodate.latin1(), r1->isodate.latin1());
+ return false;
+ }
+ if ( !stringCompareRec( from, r1->from ) ) {
+ //qDebug("from *%s* *%s* ", from.latin1(), r1->from.latin1());
+ return false;
+ }
+ if ( !stringCompareRec( subject, r1->subject ) ) {
+ //qDebug("sub ");
+ return false;
+ }
+ return true;
+}
void RecMail::copy_old(const RecMail&old)
diff --git a/kmicromail/libmailwrapper/mailtypes.h b/kmicromail/libmailwrapper/mailtypes.h
index c317880..020278d 100644
--- a/kmicromail/libmailwrapper/mailtypes.h
+++ b/kmicromail/libmailwrapper/mailtypes.h
@@ -37,2 +37,3 @@ public:
virtual ~RecMail();
+ bool isEqual( RecMail* r1 );
@@ -42,2 +43,4 @@ public:
void setDate( const QString&a ) { date = a; }
+ const QString&getIsoDate()const{ return isodate; }
+ void setIsoDate( const QString&a ) { isodate = a; }
const QString&getFrom()const{ return from; }
@@ -74,3 +77,3 @@ public:
protected:
- QString subject,date,from,mbox,msg_id,replyto;
+ QString subject,date,isodate,from,mbox,msg_id,replyto;
unsigned int msg_number,msg_size;
diff --git a/kmicromail/libmailwrapper/mboxwrapper.h b/kmicromail/libmailwrapper/mboxwrapper.h
index 9731b85..d03940f 100644
--- a/kmicromail/libmailwrapper/mboxwrapper.h
+++ b/kmicromail/libmailwrapper/mboxwrapper.h
@@ -38,2 +38,3 @@ public:
virtual const QString&getName()const;
+ virtual Account* getAccount() { return 0; };
diff --git a/kmicromail/libmailwrapper/mhwrapper.cpp b/kmicromail/libmailwrapper/mhwrapper.cpp
index cbc52d9..962dac0 100644
--- a/kmicromail/libmailwrapper/mhwrapper.cpp
+++ b/kmicromail/libmailwrapper/mhwrapper.cpp
@@ -67,2 +67,3 @@ void MHwrapper::listMessages(const QString & mailbox, QValueList<Opie::Core::OSm
{
+ qDebug("MHwrapper::listMessages ");
init_storage();
diff --git a/kmicromail/libmailwrapper/mhwrapper.h b/kmicromail/libmailwrapper/mhwrapper.h
index 550824d..d1b7d1f 100644
--- a/kmicromail/libmailwrapper/mhwrapper.h
+++ b/kmicromail/libmailwrapper/mhwrapper.h
@@ -44,2 +44,3 @@ public:
virtual const QString&getName()const;
+ virtual Account* getAccount() { return 0; };
diff --git a/kmicromail/libmailwrapper/nntpwrapper.h b/kmicromail/libmailwrapper/nntpwrapper.h
index 5d4e5ce..8c54f12 100644
--- a/kmicromail/libmailwrapper/nntpwrapper.h
+++ b/kmicromail/libmailwrapper/nntpwrapper.h
@@ -39,2 +39,3 @@ public:
static void nntp_progress( size_t current, size_t maximum );
+ virtual Account* getAccount() { return account; };
diff --git a/kmicromail/libmailwrapper/pop3wrapper.h b/kmicromail/libmailwrapper/pop3wrapper.h
index 7c70942..ebc2fc7 100644
--- a/kmicromail/libmailwrapper/pop3wrapper.h
+++ b/kmicromail/libmailwrapper/pop3wrapper.h
@@ -36,3 +36,3 @@ public:
static void pop3_progress( size_t current, size_t maximum );
-
+ virtual Account* getAccount() { return account; };
protected:
diff --git a/kmicromail/libmailwrapper/smtpwrapper.h b/kmicromail/libmailwrapper/smtpwrapper.h
index 105cbf5..ec42b56 100644
--- a/kmicromail/libmailwrapper/smtpwrapper.h
+++ b/kmicromail/libmailwrapper/smtpwrapper.h
@@ -29,2 +29,3 @@ public:
static progressMailSend*sendProgress;
+ virtual Account* getAccount() { return m_SmtpAccount; };
diff --git a/kmicromail/mailistviewitem.cpp b/kmicromail/mailistviewitem.cpp
index b92b0cf..484a635 100644
--- a/kmicromail/mailistviewitem.cpp
+++ b/kmicromail/mailistviewitem.cpp
@@ -55,3 +55,3 @@ void MailListViewItem::showEntry()
//setText(3, fsize + "MB");
- mKeyMap.insert(4, "M" +fsort );
+ mKeyMap.insert(3, "M" +fsort );
}
@@ -59,3 +59,3 @@ void MailListViewItem::showEntry()
setText(2,mail_data->getFrom());
-
+#if 0
QString date = mail_data->getDate();
@@ -100,2 +100,3 @@ void MailListViewItem::showEntry()
}
+ //qDebug("insert Date %s ", date.latin1());
// if ( date.left(1) != "1" || date.left(1) != "2" )
@@ -103,2 +104,4 @@ void MailListViewItem::showEntry()
mKeyMap.insert(4,date);
+#endif
+ mKeyMap.insert(4,mail_data->getIsoDate());
setText(4,mail_data->getDate());