tried to implement a progress dialog when sending mails. It doesn't work

(dialog will show but makes no updates, when using qApp->progressEvents(x)
dialog hides)
I don't know why - and I giving up for the moment.

11 files changed, 396 insertions, 7 deletions

diff --git a/noncore/net/mail/libmailwrapper/sendmailprogress.cpp b/noncore/net/mail/libmailwrapper/sendmailprogress.cpp
new file mode 100644
index 0000000..13ddd37
--- a/dev/null
+++ b/noncore/net/mail/libmailwrapper/sendmailprogress.cpp
@@ -0,0 +1,48 @@
+#include "sendmailprogress.h"
+#include <qprogressbar.h>
+#include <qlabel.h>
+#include <qstring.h>
+
+progressMailSend::progressMailSend(QWidget*parent, const char * name)
+    :progressMailSendUI(parent,name,false),m_current_mail(0),m_current_single(0),m_max_mail(0),m_max_single(0)
+{
+}
+
+progressMailSend::~progressMailSend()
+{
+}
+
+void progressMailSend::setMaxMails(unsigned int aMaxMails)
+{
+    m_max_mail = aMaxMails;
+    allMailProgressBar->setTotalSteps(aMaxMails);
+    setMails();
+}
+
+void progressMailSend::setCurrentMails(unsigned int aCurrent)
+{
+    m_current_mail = aCurrent;
+    allMailProgressBar->setProgress(aCurrent);
+    setMails();
+}
+    
+void progressMailSend::setSingleMail(unsigned int aCurrent,unsigned int aMax)
+{
+    m_current_single = aCurrent;
+    m_max_single = aMax;
+    setSingle();
+}
+
+void progressMailSend::setSingle()
+{
+    QString text = QString(tr("%1 of %2 bytes send")).arg(m_current_single).arg(m_max_single);
+    singleMailLabel->setText(text);
+    singleMailProgressBar->setTotalSteps(m_max_single);
+    singleMailProgressBar->setProgress(m_current_single);
+}
+
+void progressMailSend::setMails()
+{
+    QString text = QString(tr("Sending mail %1 of %2")).arg(m_current_single+1).arg(m_max_single);
+    allMailLabel->setText(text);
+}
diff --git a/noncore/net/mail/libmailwrapper/sendmailprogress.h b/noncore/net/mail/libmailwrapper/sendmailprogress.h
new file mode 100644
index 0000000..5b7d33b
--- a/dev/null
+++ b/noncore/net/mail/libmailwrapper/sendmailprogress.h
@@ -0,0 +1,19 @@
+#include "sendmailprogressui.h"
+
+class progressMailSend:public progressMailSendUI
+{
+    Q_OBJECT
+public:
+    progressMailSend(QWidget*parent = 0, const char * name = 0);
+    ~progressMailSend();
+
+    void setMaxMails(unsigned int aMaxMails);
+    void setCurrentMails(unsigned int aCurrent);
+    
+    void setSingleMail(unsigned int aCurrent,unsigned int aMax);
+
+protected:
+    unsigned m_current_mail,m_current_single,m_max_mail,m_max_single;
+    void setSingle();
+    void setMails();
+};
diff --git a/noncore/net/mail/libmailwrapper/sendmailprogressui.ui b/noncore/net/mail/libmailwrapper/sendmailprogressui.ui
new file mode 100644
index 0000000..b90b088
--- a/dev/null
+++ b/noncore/net/mail/libmailwrapper/sendmailprogressui.ui
@@ -0,0 +1,110 @@
+<!DOCTYPE UI><UI>
+<class>progressMailSendUI</class>
+<widget>
+    <class>QDialog</class>
+    <property stdset="1">
+        <name>name</name>
+        <cstring>progressMailSendUI</cstring>
+    </property>
+    <property stdset="1">
+        <name>geometry</name>
+        <rect>
+            <x>0</x>
+            <y>0</y>
+            <width>316</width>
+            <height>266</height>
+        </rect>
+    </property>
+    <property stdset="1">
+        <name>caption</name>
+        <string>Sending mail</string>
+    </property>
+    <property>
+        <name>layoutMargin</name>
+    </property>
+    <property>
+        <name>layoutSpacing</name>
+    </property>
+    <vbox>
+        <property stdset="1">
+            <name>margin</name>
+            <number>4</number>
+        </property>
+        <property stdset="1">
+            <name>spacing</name>
+            <number>2</number>
+        </property>
+        <widget>
+            <class>QLabel</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>singleMailLabel</cstring>
+            </property>
+            <property stdset="1">
+                <name>text</name>
+                <string>Progress of mail</string>
+            </property>
+            <property stdset="1">
+                <name>alignment</name>
+                <set>AlignCenter</set>
+            </property>
+            <property>
+                <name>hAlign</name>
+            </property>
+        </widget>
+        <widget>
+            <class>QProgressBar</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>singleMailProgressBar</cstring>
+            </property>
+        </widget>
+        <widget>
+            <class>QLabel</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>allMailLabel</cstring>
+            </property>
+            <property stdset="1">
+                <name>text</name>
+                <string>Sending mail</string>
+            </property>
+            <property stdset="1">
+                <name>alignment</name>
+                <set>AlignCenter</set>
+            </property>
+            <property>
+                <name>hAlign</name>
+            </property>
+        </widget>
+        <widget>
+            <class>QProgressBar</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>allMailProgressBar</cstring>
+            </property>
+        </widget>
+        <spacer>
+            <property>
+                <name>name</name>
+                <cstring>Spacer6</cstring>
+            </property>
+            <property stdset="1">
+                <name>orientation</name>
+                <enum>Vertical</enum>
+            </property>
+            <property stdset="1">
+                <name>sizeType</name>
+                <enum>Expanding</enum>
+            </property>
+            <property>
+                <name>sizeHint</name>
+                <size>
+                    <width>20</width>
+                    <height>20</height>
+                </size>
+            </property>
+        </spacer>
+    </vbox>
+</widget>
+</UI>
diff --git a/noncore/net/mail/libmailwrapper/smtpwrapper.cpp b/noncore/net/mail/libmailwrapper/smtpwrapper.cpp
index b81a87f..53c0af5 100644
--- a/noncore/net/mail/libmailwrapper/smtpwrapper.cpp
+++ b/noncore/net/mail/libmailwrapper/smtpwrapper.cpp
@@ -1,113 +1,116 @@
 #include <stdlib.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <string.h>
 #include <qdir.h>
 #include <qt.h>
 
 #include <libetpan/libetpan.h>
 
 #include "smtpwrapper.h"
 #include "mailwrapper.h"
 #include "mboxwrapper.h"
 #include "logindialog.h"
 #include "mailtypes.h"
 #include "defines.h"
+#include "sendmailprogress.h"
+
+progressMailSend*SMTPwrapper::sendProgress = 0;
 
 SMTPwrapper::SMTPwrapper( Settings *s )
     : QObject()
 {
     settings = s;
 }
 
 QString SMTPwrapper::mailsmtpError( int errnum )
 {
     switch ( errnum ) {
         case MAILSMTP_NO_ERROR:
             return tr( "No error" );
         case MAILSMTP_ERROR_UNEXPECTED_CODE:
             return tr( "Unexpected error code" );
         case MAILSMTP_ERROR_SERVICE_NOT_AVAILABLE:
             return tr( "Service not available" );
         case MAILSMTP_ERROR_STREAM:
             return tr( "Stream error" );
         case MAILSMTP_ERROR_HOSTNAME:
             return tr( "gethostname() failed" );
         case MAILSMTP_ERROR_NOT_IMPLEMENTED:
             return tr( "Not implemented" );
         case MAILSMTP_ERROR_ACTION_NOT_TAKEN:
             return tr( "Error, action not taken" );
         case MAILSMTP_ERROR_EXCEED_STORAGE_ALLOCATION:
             return tr( "Data exceeds storage allocation" );
         case MAILSMTP_ERROR_IN_PROCESSING:
             return tr( "Error in processing" );
   //      case MAILSMTP_ERROR_INSUFFISANT_SYSTEM_STORAGE:
     //        return tr( "Insufficient system storage" );
         case MAILSMTP_ERROR_MAILBOX_UNAVAILABLE:
             return tr( "Mailbox unavailable" );
         case MAILSMTP_ERROR_MAILBOX_NAME_NOT_ALLOWED:
             return tr( "Mailbox name not allowed" );
         case MAILSMTP_ERROR_BAD_SEQUENCE_OF_COMMAND:
             return tr( "Bad command sequence" );
         case MAILSMTP_ERROR_USER_NOT_LOCAL:
             return tr( "User not local" );
         case MAILSMTP_ERROR_TRANSACTION_FAILED:
             return tr( "Transaction failed" );
         case MAILSMTP_ERROR_MEMORY:
             return tr( "Memory error" );
         case MAILSMTP_ERROR_CONNECTION_REFUSED:
             return tr( "Connection refused" );
         default:
             return tr( "Unknown error code" );
     }
 }
 
 mailimf_mailbox *SMTPwrapper::newMailbox(const QString&name, const QString&mail )
 {
     return mailimf_mailbox_new( strdup( name.latin1() ),
                                 strdup( mail.latin1() ) );
 }
 
 mailimf_address_list *SMTPwrapper::parseAddresses(const QString&addr )
 {
     mailimf_address_list *addresses;
 
     if ( addr.isEmpty() ) return NULL;
 
     addresses = mailimf_address_list_new_empty();
 
     QStringList list = QStringList::split( ',', addr );
     QStringList::Iterator it;
     for ( it = list.begin(); it != list.end(); it++ ) {
         char *str = strdup( (*it).latin1() );
         int err = mailimf_address_list_add_parse( addresses, str );
         if ( err != MAILIMF_NO_ERROR ) {
             qDebug( "Error parsing" );
             qDebug( *it );
             free( str );
         } else {
             qDebug( "Parse success! :)" );
         }
     }
 
     return addresses;
 }
 
 mailimf_fields *SMTPwrapper::createImfFields(const Mail&mail )
 {
     mailimf_fields *fields;
     mailimf_field *xmailer;
     mailimf_mailbox *sender, *fromBox;
     mailimf_mailbox_list *from;
     mailimf_address_list *to, *cc, *bcc, *reply;
     char *subject = strdup( mail.getSubject().latin1() );
     int err;
 
     sender = newMailbox( mail.getName(), mail.getMail() );
     if ( sender == NULL ) goto err_free;
 
     fromBox = newMailbox( mail.getName(), mail.getMail() );
     if ( fromBox == NULL ) goto err_free_sender;
 
@@ -427,288 +430,299 @@ char *SMTPwrapper::getFrom( mailimf_field *ffrom)
          && ffrom->fld_data.fld_from->frm_mb_list && ffrom->fld_data.fld_from->frm_mb_list->mb_list ) {
         clist *cl = ffrom->fld_data.fld_from->frm_mb_list->mb_list;
         clistiter *it;
         for ( it = clist_begin( cl ); it; it = it->next ) {
             mailimf_mailbox *mb = (mailimf_mailbox *) it->data;
             from = strdup( mb->mb_addr_spec );
         }
     }
 
     return from;
 }
 
 char *SMTPwrapper::getFrom( mailmime *mail )
 {
     mailimf_field *ffrom = 0;
     ffrom = getField( mail->mm_data.mm_message.mm_fields, MAILIMF_FIELD_FROM );
     return getFrom(ffrom);
 }
 
 SMTPaccount *SMTPwrapper::getAccount(const QString&name )
 {
     SMTPaccount *smtp;
 
     QList<Account> list = settings->getAccounts();
     Account *it;
     for ( it = list.first(); it; it = list.next() ) {
         if ( it->getType().compare( "SMTP" ) == 0 ) {
             smtp = static_cast<SMTPaccount *>(it);
             if ( smtp->getName()== name ) {
                 qDebug( "SMTPaccount found for" );
                 qDebug( name );
                 return smtp;
             }
         }
     }
 
     return NULL;
 }
 
 QString SMTPwrapper::getTmpFile() {
     int num = 0;
     QString unique;
 
     QDir dir( "/tmp" );
 
     QStringList list = dir.entryList( "opiemail-tmp-*" );
 
     do {
         unique.setNum( num++ );
     } while ( list.contains( "opiemail-tmp-" + unique ) > 0 );
 
     return "/tmp/opiemail-tmp-" + unique;
 }
 
 void SMTPwrapper::writeToFile(const QString&file, mailmime *mail )
 {
     FILE *f;
     int err, col = 0;
 
     f = fopen( file.latin1(), "w" );
     if ( f == NULL ) {
         qDebug( "writeToFile: error opening file" );
         return;
     }
 
     err = mailmime_write( f, &col, mail );
     if ( err != MAILIMF_NO_ERROR ) {
         fclose( f );
         qDebug( "writeToFile: error writing mailmime" );
         return;
     }
 
     fclose( f );
 }
 
 void SMTPwrapper::readFromFile(const QString&file, char **data, size_t *size )
 {
 
     QFile msg_cache(file);
     QString msg = "";
     msg_cache.open(IO_ReadOnly);
     char*message = new char[4096];
     memset(message,0,4096);
     while (msg_cache.readBlock(message,4095)>0) {
          msg+=message;
          memset(message,0,4096);
     }
     delete message;
     *data = (char*)malloc(msg.length()+1*sizeof(char));
     memset(*data,0,msg.length()+1);
     memcpy(*data,msg.ascii(),msg.length());
     *size=msg.length();
 }
 
 void SMTPwrapper::progress( size_t current, size_t maximum )
 {
-//    qDebug( "Current: %i of %i", current, maximum );
+    if (SMTPwrapper::sendProgress) {
+        SMTPwrapper::sendProgress->setSingleMail(current, maximum );
+        qDebug("%u of %u",current,maximum);
+    }
 }
 
 void SMTPwrapper::storeMail(char*mail, size_t length, const QString&box)
 {
     if (!mail) return;
     QString localfolders = (QString) getenv( "HOME" ) + QString("/Applications/opiemail/localmail/");
     MBOXwrapper*wrap = new MBOXwrapper(localfolders);
     wrap->storeMessage(mail,length,box);
     delete wrap;
 }
 
 void SMTPwrapper::smtpSend( mailmime *mail,bool later, SMTPaccount *smtp )
 {
     clist *rcpts = 0;
     char *from, *data;
     size_t size;
 
     if ( smtp == NULL ) {
         return;
     }
     from = data = 0;
     
     QString file = getTmpFile();
     writeToFile( file, mail );
     readFromFile( file, &data, &size );
     QFile f( file );
     f.remove();
     
     if (later) {
         storeMail(data,size,"Outgoing");
         if (data) free( data );
         return;
     }
     from = getFrom( mail );
     rcpts = createRcptList( mail->mm_data.mm_message.mm_fields );
     smtpSend(from,rcpts,data,size,smtp);
 }
 
 int SMTPwrapper::smtpSend(char*from,clist*rcpts,char*data,size_t size, SMTPaccount *smtp )
 {
     char *server, *user, *pass;
     bool ssl;
     uint16_t port;
     mailsmtp *session;
     int err,result;
     
     result = 1;
     server = user = pass = 0;
     server = strdup( smtp->getServer().latin1() );
     ssl = smtp->getSSL();
     port = smtp->getPort().toUInt();
     
     session = mailsmtp_new( 20, &progress );
     if ( session == NULL ) goto free_mem;
 
     qDebug( "Servername %s at port %i", server, port );
     if ( ssl ) {
         qDebug( "SSL session" );
         err = mailsmtp_ssl_connect( session, server, port );
     } else {
         qDebug( "No SSL session" );
         err = mailsmtp_socket_connect( session, server, port );
     }
     if ( err != MAILSMTP_NO_ERROR ) {result = 0;goto free_mem_session;}
 
     err = mailsmtp_init( session );
     if ( err != MAILSMTP_NO_ERROR ) {result = 0; goto free_con_session;}
 
     qDebug( "INIT OK" );
 
     if ( smtp->getLogin() ) {
         if ( smtp->getUser().isEmpty() || smtp->getPassword().isEmpty() ) {
             // get'em
             LoginDialog login( smtp->getUser(), smtp->getPassword(), NULL, 0, true );
             login.show();
             if ( QDialog::Accepted == login.exec() ) {
                 // ok
                 user = strdup( login.getUser().latin1() );
                 pass = strdup( login.getPassword().latin1() );
             } else {
                 result = 0; goto free_con_session;
             }
         } else {
             user = strdup( smtp->getUser().latin1() );
             pass = strdup( smtp->getPassword().latin1() );
         }
         qDebug( "session->auth: %i", session->auth);
         err = mailsmtp_auth( session, user, pass );
         if ( err == MAILSMTP_NO_ERROR ) qDebug("auth ok");
         qDebug( "Done auth!" );
     }
 
     err = mailsmtp_send( session, from, rcpts, data, size );
     if ( err != MAILSMTP_NO_ERROR ) {result = 0; goto free_con_session;}
 
     qDebug( "Mail sent." );
     storeMail(data,size,"Sent");
 
 free_con_session:
     mailsmtp_quit( session );
 free_mem_session:
     mailsmtp_free( session );
 free_mem:
     if (rcpts) smtp_address_list_free( rcpts );
     if (data) free( data );
     if (server) free( server );
     if (from) free( from );
     if ( smtp->getLogin() ) {
         free( user );
         free( pass );
     }
     return result;
 }
 
 void SMTPwrapper::sendMail(const Mail&mail,bool later )
 {
     mailmime * mimeMail;
     
     SMTPaccount *smtp = getAccount(mail.getName());
     
     mimeMail = createMimeMail(mail );
     if ( mimeMail == NULL ) {
         qDebug( "sendMail: error creating mime mail" );
     } else {
+        sendProgress = new progressMailSend();
+        sendProgress->showMaximized();
+        sendProgress->show();
+        qApp->processEvents(10);
         smtpSend( mimeMail,later,smtp);
         mailmime_free( mimeMail );
         qDebug("Clean up done");
+        sendProgress->hide();
+        delete sendProgress;
+        sendProgress = 0;
     }
 }
 
 int SMTPwrapper::sendQueuedMail(MBOXwrapper*wrap,SMTPaccount*smtp,RecMail*which)
 {
     char*data = 0;
     size_t length = 0;
     size_t curTok = 0;
     mailimf_fields *fields = 0;
     mailimf_field*ffrom = 0;
     clist *rcpts = 0;
     char*from = 0;
 
     wrap->fetchRawBody(*which,&data,&length);
     if (!data) return 0;
     int err = mailimf_fields_parse( data, length, &curTok, &fields );    
     if (err != MAILIMF_NO_ERROR) {
         free(data);
         delete wrap;
         return 0;
     }
     
     rcpts = createRcptList( fields );
     ffrom = getField(fields, MAILIMF_FIELD_FROM );
     from = getFrom(ffrom);
+    
     qDebug("Size: %i vs. %i",length,strlen(data));
     if (rcpts && from) {
         return smtpSend(from,rcpts,data,strlen(data),smtp );
     }
     return 0;
 }
 
 /* this is a special fun */
 void SMTPwrapper::flushOutbox(SMTPaccount*smtp)
 {
     if (!smtp) return;
     QString localfolders = (QString) getenv( "HOME" ) + QString("/Applications/opiemail/localmail/");
     MBOXwrapper*wrap = new MBOXwrapper(localfolders);
     if (!wrap) {
         qDebug("memory error");
         return;
     }
     QList<RecMail> mailsToSend;
     QList<RecMail> mailsToRemove;
     QString mbox("Outgoing");
     wrap->listMessages(mbox,mailsToSend);
     if (mailsToSend.count()==0) {
         delete wrap;
         return;
     }
     mailsToSend.setAutoDelete(false);
     while (mailsToSend.count()>0) {
         if (sendQueuedMail(wrap,smtp,mailsToSend.at(0))==0) {
             QMessageBox::critical(0,tr("Error sending mail"),
                 tr("Error sending queued mail - breaking"));
             break;
         }
         mailsToRemove.append(mailsToSend.at(0));
         mailsToSend.removeFirst();
     }
     wrap->deleteMails(mbox,mailsToRemove);
     mailsToSend.setAutoDelete(true);
     delete wrap;
 }
diff --git a/noncore/net/mail/libmailwrapper/smtpwrapper.h b/noncore/net/mail/libmailwrapper/smtpwrapper.h
index c0dcc11..baa353b 100644
--- a/noncore/net/mail/libmailwrapper/smtpwrapper.h
+++ b/noncore/net/mail/libmailwrapper/smtpwrapper.h
@@ -1,63 +1,65 @@
 #ifndef SMTPwrapper_H
 #define SMTPwrapper_H
 
 #include <qpe/applnk.h>
 
 #include <qbitarray.h>
 #include <qdatetime.h>
 #include <libetpan/clist.h>
 
 #include "settings.h"
 
 class Mail;
 class MBOXwrapper;
 class RecMail;
 class Attachment;
 struct mailimf_fields;
 struct mailimf_field;
 struct mailimf_mailbox;
 struct mailmime;
 struct mailimf_address_list;
+class progressMailSend;
 
 class SMTPwrapper : public QObject
 {
     Q_OBJECT
 
 public:
     SMTPwrapper( Settings *s ); 
     virtual ~SMTPwrapper(){}
     void sendMail(const Mail& mail,bool later=false );
     void flushOutbox(SMTPaccount*smtp);
 
+    static progressMailSend*sendProgress;
 protected:
     mailimf_mailbox *newMailbox(const QString&name,const QString&mail );
     mailimf_fields *createImfFields(const Mail &mail );
     mailmime *createMimeMail(const Mail&mail );
     
     mailimf_address_list *parseAddresses(const QString&addr );
     void addFileParts( mailmime *message,const QList<Attachment>&files );
     mailmime *buildTxtPart(const QString&str );
     mailmime *buildFilePart(const QString&filename,const QString&mimetype,const QString&content);
     void smtpSend( mailmime *mail,bool later, SMTPaccount *smtp );
     clist *createRcptList( mailimf_fields *fields );
     SMTPaccount *getAccount(const QString&from );
     void writeToFile(const QString&file, mailmime *mail );
     void readFromFile(const QString&file, char **data, size_t *size );
     
     static void storeMail(char*mail, size_t length, const QString&box);
     static QString mailsmtpError( int err );
     static QString getTmpFile();
     static void progress( size_t current, size_t maximum );
     static void addRcpts( clist *list, mailimf_address_list *addr_list );
     static char *getFrom( mailmime *mail );
     static char *getFrom( mailimf_field *ffrom);
     static mailimf_field *getField( mailimf_fields *fields, int type );
-    static int smtpSend(char*from,clist*rcpts,char*data,size_t size, SMTPaccount *smtp );
+    int smtpSend(char*from,clist*rcpts,char*data,size_t size, SMTPaccount *smtp );
 
     void storeMail(mailmime*mail, const QString&box);
     Settings *settings;
     
     int sendQueuedMail(MBOXwrapper*wrap,SMTPaccount*smtp,RecMail*which);
 };
 
 #endif
diff --git a/noncore/net/mail/mail.pro b/noncore/net/mail/mail.pro
index dd3c337..ea5fb58 100644
--- a/noncore/net/mail/mail.pro
+++ b/noncore/net/mail/mail.pro
@@ -1,70 +1,73 @@
 CONFIG        += qt warn_on debug quick-app
 
 HEADERS         = defines.h \
                logindialog.h \
                settings.h \
                editaccounts.h \
                mailwrapper.h \
                composemail.h \
                accountview.h \
                mainwindow.h \
                viewmail.h \
                viewmailbase.h \
                opiemail.h \
                imapwrapper.h \
                mailtypes.h \
                mailistviewitem.h \
                pop3wrapper.h \
            abstractmail.h  \
         settingsdialog.h \
         statuswidget.h \
         smtpwrapper.h \
         genericwrapper.h \
-         mboxwrapper.h
+         mboxwrapper.h \
+		sendmailprogress.h 
                
 SOURCES         = main.cpp \
                opiemail.cpp \
                mainwindow.cpp \
                accountview.cpp \
                composemail.cpp \
                mailwrapper.cpp \
                imapwrapper.cpp \
                addresspicker.cpp \
                editaccounts.cpp \
                logindialog.cpp \
                viewmail.cpp \
                viewmailbase.cpp \
                settings.cpp \
                mailtypes.cpp \
                pop3wrapper.cpp \
            abstractmail.cpp \
         settingsdialog.cpp \
          statuswidget.cpp \
         smtpwrapper.cpp \
         genericwrapper.cpp \
-        mboxwrapper.cpp
+        mboxwrapper.cpp \
+		sendmailprogress.cpp
                
 INTERFACES     = editaccountsui.ui \
                selectmailtypeui.ui \
                imapconfigui.ui \
                pop3configui.ui \
                nntpconfigui.ui \
                smtpconfigui.ui \
                addresspickerui.ui \
                logindialogui.ui \
                composemailui.ui \
         settingsdialogui.ui \
-        statuswidgetui.ui
+        statuswidgetui.ui \
+	sendmailprogressui.ui
 
 INCLUDEPATH += $(OPIEDIR)/include
 
 CONFTEST = $$system( echo $CONFIG_TARGET_MACOSX )
 contains( CONFTEST, y ){
     LIBS        += -lqpe -letpan -lssl -lcrypto -lopie -liconv
 }else{
     LIBS        += -lqpe -letpan -lssl -lcrypto -lopie
 }
 
 TARGET       = opiemail
 
 include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/net/mail/sendmailprogress.cpp b/noncore/net/mail/sendmailprogress.cpp
new file mode 100644
index 0000000..13ddd37
--- a/dev/null
+++ b/noncore/net/mail/sendmailprogress.cpp
@@ -0,0 +1,48 @@
+#include "sendmailprogress.h"
+#include <qprogressbar.h>
+#include <qlabel.h>
+#include <qstring.h>
+
+progressMailSend::progressMailSend(QWidget*parent, const char * name)
+    :progressMailSendUI(parent,name,false),m_current_mail(0),m_current_single(0),m_max_mail(0),m_max_single(0)
+{
+}
+
+progressMailSend::~progressMailSend()
+{
+}
+
+void progressMailSend::setMaxMails(unsigned int aMaxMails)
+{
+    m_max_mail = aMaxMails;
+    allMailProgressBar->setTotalSteps(aMaxMails);
+    setMails();
+}
+
+void progressMailSend::setCurrentMails(unsigned int aCurrent)
+{
+    m_current_mail = aCurrent;
+    allMailProgressBar->setProgress(aCurrent);
+    setMails();
+}
+    
+void progressMailSend::setSingleMail(unsigned int aCurrent,unsigned int aMax)
+{
+    m_current_single = aCurrent;
+    m_max_single = aMax;
+    setSingle();
+}
+
+void progressMailSend::setSingle()
+{
+    QString text = QString(tr("%1 of %2 bytes send")).arg(m_current_single).arg(m_max_single);
+    singleMailLabel->setText(text);
+    singleMailProgressBar->setTotalSteps(m_max_single);
+    singleMailProgressBar->setProgress(m_current_single);
+}
+
+void progressMailSend::setMails()
+{
+    QString text = QString(tr("Sending mail %1 of %2")).arg(m_current_single+1).arg(m_max_single);
+    allMailLabel->setText(text);
+}
diff --git a/noncore/net/mail/sendmailprogress.h b/noncore/net/mail/sendmailprogress.h
new file mode 100644
index 0000000..5b7d33b
--- a/dev/null
+++ b/noncore/net/mail/sendmailprogress.h
@@ -0,0 +1,19 @@
+#include "sendmailprogressui.h"
+
+class progressMailSend:public progressMailSendUI
+{
+    Q_OBJECT
+public:
+    progressMailSend(QWidget*parent = 0, const char * name = 0);
+    ~progressMailSend();
+
+    void setMaxMails(unsigned int aMaxMails);
+    void setCurrentMails(unsigned int aCurrent);
+    
+    void setSingleMail(unsigned int aCurrent,unsigned int aMax);
+
+protected:
+    unsigned m_current_mail,m_current_single,m_max_mail,m_max_single;
+    void setSingle();
+    void setMails();
+};
diff --git a/noncore/net/mail/sendmailprogressui.ui b/noncore/net/mail/sendmailprogressui.ui
new file mode 100644
index 0000000..b90b088
--- a/dev/null
+++ b/noncore/net/mail/sendmailprogressui.ui
@@ -0,0 +1,110 @@
+<!DOCTYPE UI><UI>
+<class>progressMailSendUI</class>
+<widget>
+    <class>QDialog</class>
+    <property stdset="1">
+        <name>name</name>
+        <cstring>progressMailSendUI</cstring>
+    </property>
+    <property stdset="1">
+        <name>geometry</name>
+        <rect>
+            <x>0</x>
+            <y>0</y>
+            <width>316</width>
+            <height>266</height>
+        </rect>
+    </property>
+    <property stdset="1">
+        <name>caption</name>
+        <string>Sending mail</string>
+    </property>
+    <property>
+        <name>layoutMargin</name>
+    </property>
+    <property>
+        <name>layoutSpacing</name>
+    </property>
+    <vbox>
+        <property stdset="1">
+            <name>margin</name>
+            <number>4</number>
+        </property>
+        <property stdset="1">
+            <name>spacing</name>
+            <number>2</number>
+        </property>
+        <widget>
+            <class>QLabel</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>singleMailLabel</cstring>
+            </property>
+            <property stdset="1">
+                <name>text</name>
+                <string>Progress of mail</string>
+            </property>
+            <property stdset="1">
+                <name>alignment</name>
+                <set>AlignCenter</set>
+            </property>
+            <property>
+                <name>hAlign</name>
+            </property>
+        </widget>
+        <widget>
+            <class>QProgressBar</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>singleMailProgressBar</cstring>
+            </property>
+        </widget>
+        <widget>
+            <class>QLabel</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>allMailLabel</cstring>
+            </property>
+            <property stdset="1">
+                <name>text</name>
+                <string>Sending mail</string>
+            </property>
+            <property stdset="1">
+                <name>alignment</name>
+                <set>AlignCenter</set>
+            </property>
+            <property>
+                <name>hAlign</name>
+            </property>
+        </widget>
+        <widget>
+            <class>QProgressBar</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>allMailProgressBar</cstring>
+            </property>
+        </widget>
+        <spacer>
+            <property>
+                <name>name</name>
+                <cstring>Spacer6</cstring>
+            </property>
+            <property stdset="1">
+                <name>orientation</name>
+                <enum>Vertical</enum>
+            </property>
+            <property stdset="1">
+                <name>sizeType</name>
+                <enum>Expanding</enum>
+            </property>
+            <property>
+                <name>sizeHint</name>
+                <size>
+                    <width>20</width>
+                    <height>20</height>
+                </size>
+            </property>
+        </spacer>
+    </vbox>
+</widget>
+</UI>
diff --git a/noncore/net/mail/smtpwrapper.cpp b/noncore/net/mail/smtpwrapper.cpp
index b81a87f..53c0af5 100644
--- a/noncore/net/mail/smtpwrapper.cpp
+++ b/noncore/net/mail/smtpwrapper.cpp
@@ -1,113 +1,116 @@
 #include <stdlib.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <string.h>
 #include <qdir.h>
 #include <qt.h>
 
 #include <libetpan/libetpan.h>
 
 #include "smtpwrapper.h"
 #include "mailwrapper.h"
 #include "mboxwrapper.h"
 #include "logindialog.h"
 #include "mailtypes.h"
 #include "defines.h"
+#include "sendmailprogress.h"
+
+progressMailSend*SMTPwrapper::sendProgress = 0;
 
 SMTPwrapper::SMTPwrapper( Settings *s )
     : QObject()
 {
     settings = s;
 }
 
 QString SMTPwrapper::mailsmtpError( int errnum )
 {
     switch ( errnum ) {
         case MAILSMTP_NO_ERROR:
             return tr( "No error" );
         case MAILSMTP_ERROR_UNEXPECTED_CODE:
             return tr( "Unexpected error code" );
         case MAILSMTP_ERROR_SERVICE_NOT_AVAILABLE:
             return tr( "Service not available" );
         case MAILSMTP_ERROR_STREAM:
             return tr( "Stream error" );
         case MAILSMTP_ERROR_HOSTNAME:
             return tr( "gethostname() failed" );
         case MAILSMTP_ERROR_NOT_IMPLEMENTED:
             return tr( "Not implemented" );
         case MAILSMTP_ERROR_ACTION_NOT_TAKEN:
             return tr( "Error, action not taken" );
         case MAILSMTP_ERROR_EXCEED_STORAGE_ALLOCATION:
             return tr( "Data exceeds storage allocation" );
         case MAILSMTP_ERROR_IN_PROCESSING:
             return tr( "Error in processing" );
   //      case MAILSMTP_ERROR_INSUFFISANT_SYSTEM_STORAGE:
     //        return tr( "Insufficient system storage" );
         case MAILSMTP_ERROR_MAILBOX_UNAVAILABLE:
             return tr( "Mailbox unavailable" );
         case MAILSMTP_ERROR_MAILBOX_NAME_NOT_ALLOWED:
             return tr( "Mailbox name not allowed" );
         case MAILSMTP_ERROR_BAD_SEQUENCE_OF_COMMAND:
             return tr( "Bad command sequence" );
         case MAILSMTP_ERROR_USER_NOT_LOCAL:
             return tr( "User not local" );
         case MAILSMTP_ERROR_TRANSACTION_FAILED:
             return tr( "Transaction failed" );
         case MAILSMTP_ERROR_MEMORY:
             return tr( "Memory error" );
         case MAILSMTP_ERROR_CONNECTION_REFUSED:
             return tr( "Connection refused" );
         default:
             return tr( "Unknown error code" );
     }
 }
 
 mailimf_mailbox *SMTPwrapper::newMailbox(const QString&name, const QString&mail )
 {
     return mailimf_mailbox_new( strdup( name.latin1() ),
                                 strdup( mail.latin1() ) );
 }
 
 mailimf_address_list *SMTPwrapper::parseAddresses(const QString&addr )
 {
     mailimf_address_list *addresses;
 
     if ( addr.isEmpty() ) return NULL;
 
     addresses = mailimf_address_list_new_empty();
 
     QStringList list = QStringList::split( ',', addr );
     QStringList::Iterator it;
     for ( it = list.begin(); it != list.end(); it++ ) {
         char *str = strdup( (*it).latin1() );
         int err = mailimf_address_list_add_parse( addresses, str );
         if ( err != MAILIMF_NO_ERROR ) {
             qDebug( "Error parsing" );
             qDebug( *it );
             free( str );
         } else {
             qDebug( "Parse success! :)" );
         }
     }
 
     return addresses;
 }
 
 mailimf_fields *SMTPwrapper::createImfFields(const Mail&mail )
 {
     mailimf_fields *fields;
     mailimf_field *xmailer;
     mailimf_mailbox *sender, *fromBox;
     mailimf_mailbox_list *from;
     mailimf_address_list *to, *cc, *bcc, *reply;
     char *subject = strdup( mail.getSubject().latin1() );
     int err;
 
     sender = newMailbox( mail.getName(), mail.getMail() );
     if ( sender == NULL ) goto err_free;
 
     fromBox = newMailbox( mail.getName(), mail.getMail() );
     if ( fromBox == NULL ) goto err_free_sender;
 
@@ -427,288 +430,299 @@ char *SMTPwrapper::getFrom( mailimf_field *ffrom)
          && ffrom->fld_data.fld_from->frm_mb_list && ffrom->fld_data.fld_from->frm_mb_list->mb_list ) {
         clist *cl = ffrom->fld_data.fld_from->frm_mb_list->mb_list;
         clistiter *it;
         for ( it = clist_begin( cl ); it; it = it->next ) {
             mailimf_mailbox *mb = (mailimf_mailbox *) it->data;
             from = strdup( mb->mb_addr_spec );
         }
     }
 
     return from;
 }
 
 char *SMTPwrapper::getFrom( mailmime *mail )
 {
     mailimf_field *ffrom = 0;
     ffrom = getField( mail->mm_data.mm_message.mm_fields, MAILIMF_FIELD_FROM );
     return getFrom(ffrom);
 }
 
 SMTPaccount *SMTPwrapper::getAccount(const QString&name )
 {
     SMTPaccount *smtp;
 
     QList<Account> list = settings->getAccounts();
     Account *it;
     for ( it = list.first(); it; it = list.next() ) {
         if ( it->getType().compare( "SMTP" ) == 0 ) {
             smtp = static_cast<SMTPaccount *>(it);
             if ( smtp->getName()== name ) {
                 qDebug( "SMTPaccount found for" );
                 qDebug( name );
                 return smtp;
             }
         }
     }
 
     return NULL;
 }
 
 QString SMTPwrapper::getTmpFile() {
     int num = 0;
     QString unique;
 
     QDir dir( "/tmp" );
 
     QStringList list = dir.entryList( "opiemail-tmp-*" );
 
     do {
         unique.setNum( num++ );
     } while ( list.contains( "opiemail-tmp-" + unique ) > 0 );
 
     return "/tmp/opiemail-tmp-" + unique;
 }
 
 void SMTPwrapper::writeToFile(const QString&file, mailmime *mail )
 {
     FILE *f;
     int err, col = 0;
 
     f = fopen( file.latin1(), "w" );
     if ( f == NULL ) {
         qDebug( "writeToFile: error opening file" );
         return;
     }
 
     err = mailmime_write( f, &col, mail );
     if ( err != MAILIMF_NO_ERROR ) {
         fclose( f );
         qDebug( "writeToFile: error writing mailmime" );
         return;
     }
 
     fclose( f );
 }
 
 void SMTPwrapper::readFromFile(const QString&file, char **data, size_t *size )
 {
 
     QFile msg_cache(file);
     QString msg = "";
     msg_cache.open(IO_ReadOnly);
     char*message = new char[4096];
     memset(message,0,4096);
     while (msg_cache.readBlock(message,4095)>0) {
          msg+=message;
          memset(message,0,4096);
     }
     delete message;
     *data = (char*)malloc(msg.length()+1*sizeof(char));
     memset(*data,0,msg.length()+1);
     memcpy(*data,msg.ascii(),msg.length());
     *size=msg.length();
 }
 
 void SMTPwrapper::progress( size_t current, size_t maximum )
 {
-//    qDebug( "Current: %i of %i", current, maximum );
+    if (SMTPwrapper::sendProgress) {
+        SMTPwrapper::sendProgress->setSingleMail(current, maximum );
+        qDebug("%u of %u",current,maximum);
+    }
 }
 
 void SMTPwrapper::storeMail(char*mail, size_t length, const QString&box)
 {
     if (!mail) return;
     QString localfolders = (QString) getenv( "HOME" ) + QString("/Applications/opiemail/localmail/");
     MBOXwrapper*wrap = new MBOXwrapper(localfolders);
     wrap->storeMessage(mail,length,box);
     delete wrap;
 }
 
 void SMTPwrapper::smtpSend( mailmime *mail,bool later, SMTPaccount *smtp )
 {
     clist *rcpts = 0;
     char *from, *data;
     size_t size;
 
     if ( smtp == NULL ) {
         return;
     }
     from = data = 0;
     
     QString file = getTmpFile();
     writeToFile( file, mail );
     readFromFile( file, &data, &size );
     QFile f( file );
     f.remove();
     
     if (later) {
         storeMail(data,size,"Outgoing");
         if (data) free( data );
         return;
     }
     from = getFrom( mail );
     rcpts = createRcptList( mail->mm_data.mm_message.mm_fields );
     smtpSend(from,rcpts,data,size,smtp);
 }
 
 int SMTPwrapper::smtpSend(char*from,clist*rcpts,char*data,size_t size, SMTPaccount *smtp )
 {
     char *server, *user, *pass;
     bool ssl;
     uint16_t port;
     mailsmtp *session;
     int err,result;
     
     result = 1;
     server = user = pass = 0;
     server = strdup( smtp->getServer().latin1() );
     ssl = smtp->getSSL();
     port = smtp->getPort().toUInt();
     
     session = mailsmtp_new( 20, &progress );
     if ( session == NULL ) goto free_mem;
 
     qDebug( "Servername %s at port %i", server, port );
     if ( ssl ) {
         qDebug( "SSL session" );
         err = mailsmtp_ssl_connect( session, server, port );
     } else {
         qDebug( "No SSL session" );
         err = mailsmtp_socket_connect( session, server, port );
     }
     if ( err != MAILSMTP_NO_ERROR ) {result = 0;goto free_mem_session;}
 
     err = mailsmtp_init( session );
     if ( err != MAILSMTP_NO_ERROR ) {result = 0; goto free_con_session;}
 
     qDebug( "INIT OK" );
 
     if ( smtp->getLogin() ) {
         if ( smtp->getUser().isEmpty() || smtp->getPassword().isEmpty() ) {
             // get'em
             LoginDialog login( smtp->getUser(), smtp->getPassword(), NULL, 0, true );
             login.show();
             if ( QDialog::Accepted == login.exec() ) {
                 // ok
                 user = strdup( login.getUser().latin1() );
                 pass = strdup( login.getPassword().latin1() );
             } else {
                 result = 0; goto free_con_session;
             }
         } else {
             user = strdup( smtp->getUser().latin1() );
             pass = strdup( smtp->getPassword().latin1() );
         }
         qDebug( "session->auth: %i", session->auth);
         err = mailsmtp_auth( session, user, pass );
         if ( err == MAILSMTP_NO_ERROR ) qDebug("auth ok");
         qDebug( "Done auth!" );
     }
 
     err = mailsmtp_send( session, from, rcpts, data, size );
     if ( err != MAILSMTP_NO_ERROR ) {result = 0; goto free_con_session;}
 
     qDebug( "Mail sent." );
     storeMail(data,size,"Sent");
 
 free_con_session:
     mailsmtp_quit( session );
 free_mem_session:
     mailsmtp_free( session );
 free_mem:
     if (rcpts) smtp_address_list_free( rcpts );
     if (data) free( data );
     if (server) free( server );
     if (from) free( from );
     if ( smtp->getLogin() ) {
         free( user );
         free( pass );
     }
     return result;
 }
 
 void SMTPwrapper::sendMail(const Mail&mail,bool later )
 {
     mailmime * mimeMail;
     
     SMTPaccount *smtp = getAccount(mail.getName());
     
     mimeMail = createMimeMail(mail );
     if ( mimeMail == NULL ) {
         qDebug( "sendMail: error creating mime mail" );
     } else {
+        sendProgress = new progressMailSend();
+        sendProgress->showMaximized();
+        sendProgress->show();
+        qApp->processEvents(10);
         smtpSend( mimeMail,later,smtp);
         mailmime_free( mimeMail );
         qDebug("Clean up done");
+        sendProgress->hide();
+        delete sendProgress;
+        sendProgress = 0;
     }
 }
 
 int SMTPwrapper::sendQueuedMail(MBOXwrapper*wrap,SMTPaccount*smtp,RecMail*which)
 {
     char*data = 0;
     size_t length = 0;
     size_t curTok = 0;
     mailimf_fields *fields = 0;
     mailimf_field*ffrom = 0;
     clist *rcpts = 0;
     char*from = 0;
 
     wrap->fetchRawBody(*which,&data,&length);
     if (!data) return 0;
     int err = mailimf_fields_parse( data, length, &curTok, &fields );    
     if (err != MAILIMF_NO_ERROR) {
         free(data);
         delete wrap;
         return 0;
     }
     
     rcpts = createRcptList( fields );
     ffrom = getField(fields, MAILIMF_FIELD_FROM );
     from = getFrom(ffrom);
+    
     qDebug("Size: %i vs. %i",length,strlen(data));
     if (rcpts && from) {
         return smtpSend(from,rcpts,data,strlen(data),smtp );
     }
     return 0;
 }
 
 /* this is a special fun */
 void SMTPwrapper::flushOutbox(SMTPaccount*smtp)
 {
     if (!smtp) return;
     QString localfolders = (QString) getenv( "HOME" ) + QString("/Applications/opiemail/localmail/");
     MBOXwrapper*wrap = new MBOXwrapper(localfolders);
     if (!wrap) {
         qDebug("memory error");
         return;
     }
     QList<RecMail> mailsToSend;
     QList<RecMail> mailsToRemove;
     QString mbox("Outgoing");
     wrap->listMessages(mbox,mailsToSend);
     if (mailsToSend.count()==0) {
         delete wrap;
         return;
     }
     mailsToSend.setAutoDelete(false);
     while (mailsToSend.count()>0) {
         if (sendQueuedMail(wrap,smtp,mailsToSend.at(0))==0) {
             QMessageBox::critical(0,tr("Error sending mail"),
                 tr("Error sending queued mail - breaking"));
             break;
         }
         mailsToRemove.append(mailsToSend.at(0));
         mailsToSend.removeFirst();
     }
     wrap->deleteMails(mbox,mailsToRemove);
     mailsToSend.setAutoDelete(true);
     delete wrap;
 }
diff --git a/noncore/net/mail/smtpwrapper.h b/noncore/net/mail/smtpwrapper.h
index c0dcc11..baa353b 100644
--- a/noncore/net/mail/smtpwrapper.h
+++ b/noncore/net/mail/smtpwrapper.h
@@ -1,63 +1,65 @@
 #ifndef SMTPwrapper_H
 #define SMTPwrapper_H
 
 #include <qpe/applnk.h>
 
 #include <qbitarray.h>
 #include <qdatetime.h>
 #include <libetpan/clist.h>
 
 #include "settings.h"
 
 class Mail;
 class MBOXwrapper;
 class RecMail;
 class Attachment;
 struct mailimf_fields;
 struct mailimf_field;
 struct mailimf_mailbox;
 struct mailmime;
 struct mailimf_address_list;
+class progressMailSend;
 
 class SMTPwrapper : public QObject
 {
     Q_OBJECT
 
 public:
     SMTPwrapper( Settings *s ); 
     virtual ~SMTPwrapper(){}
     void sendMail(const Mail& mail,bool later=false );
     void flushOutbox(SMTPaccount*smtp);
 
+    static progressMailSend*sendProgress;
 protected:
     mailimf_mailbox *newMailbox(const QString&name,const QString&mail );
     mailimf_fields *createImfFields(const Mail &mail );
     mailmime *createMimeMail(const Mail&mail );
     
     mailimf_address_list *parseAddresses(const QString&addr );
     void addFileParts( mailmime *message,const QList<Attachment>&files );
     mailmime *buildTxtPart(const QString&str );
     mailmime *buildFilePart(const QString&filename,const QString&mimetype,const QString&content);
     void smtpSend( mailmime *mail,bool later, SMTPaccount *smtp );
     clist *createRcptList( mailimf_fields *fields );
     SMTPaccount *getAccount(const QString&from );
     void writeToFile(const QString&file, mailmime *mail );
     void readFromFile(const QString&file, char **data, size_t *size );
     
     static void storeMail(char*mail, size_t length, const QString&box);
     static QString mailsmtpError( int err );
     static QString getTmpFile();
     static void progress( size_t current, size_t maximum );
     static void addRcpts( clist *list, mailimf_address_list *addr_list );
     static char *getFrom( mailmime *mail );
     static char *getFrom( mailimf_field *ffrom);
     static mailimf_field *getField( mailimf_fields *fields, int type );
-    static int smtpSend(char*from,clist*rcpts,char*data,size_t size, SMTPaccount *smtp );
+    int smtpSend(char*from,clist*rcpts,char*data,size_t size, SMTPaccount *smtp );
 
     void storeMail(mailmime*mail, const QString&box);
     Settings *settings;
     
     int sendQueuedMail(MBOXwrapper*wrap,SMTPaccount*smtp,RecMail*which);
 };
 
 #endif