mail fixes

7 files changed, 72 insertions, 21 deletions

diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt
index 2516b2a..42b36f1 100644
--- a/bin/kdepim/WhatsNew.txt
+++ b/bin/kdepim/WhatsNew.txt
@@ -16,17 +16,19 @@ Made it possible to select in the date picker the (ligt grey )
 dates of the prev./next month with the mouse.
 
 OM/Pi:
 "Delete mail" icon in main window now deletes all selected mails.
 Fixed the problem, that the state flag of imap mails was ignored.
 Now mails with "FLAG_SEEN" on the imap server get no icon in the list view
-to idecate that they are already seen.
+to indecate that they are already seen.
 Fixed the problem that the body of some mails was not displayed in the
 mail viewer when fetching them from the imap server directly to read them.
 Made it (configurable) possible  to show the "To:" field in the list view.
 Added to the mail viewer the option "View Source" to make it possible to see the raw mail data.
+Added a "Download Mail" button to the mail viewer to quickly download the viewed mail to the
+local storage folder (specified in account setiings) of the account of the mail.
 
 
 
 ********** VERSION 1.9.19 ************
 
 Added a lot of missing translations to KA/Pi, 
diff --git a/kmicromail/accountview.h b/kmicromail/accountview.h
index fcf33d1..79ed2e7 100644
--- a/kmicromail/accountview.h
+++ b/kmicromail/accountview.h
@@ -22,13 +22,13 @@ public:
     virtual ~AccountView();
     virtual void populate( QList<Account> list );
     virtual RecBodyP fetchBody(const Opie::Core::OSmartPointer<RecMail>&aMail);
     virtual void downloadMails(const Opie::Core::OSmartPointer<Folder>&fromFolder,AbstractMail*fromWrapper);
     virtual void downloadMailsInbox(const Opie::Core::OSmartPointer<Folder>&fromFolder,AbstractMail*fromWrapper);
     virtual bool currentisDraft();
-
+    QValueList<MHviewItem*> allAccounts() { return mhAccounts;}
 public slots:
     virtual void refreshAll();
     virtual void refresh(QListViewItem *item);
     virtual void refreshCurrent();
     virtual void slotHold(int, QListViewItem *,const QPoint&,int);
     virtual void slotContextMenu(int id);
diff --git a/kmicromail/libmailwrapper/mailtypes.cpp b/kmicromail/libmailwrapper/mailtypes.cpp
index 89150ad..96d55e6 100644
--- a/kmicromail/libmailwrapper/mailtypes.cpp
+++ b/kmicromail/libmailwrapper/mailtypes.cpp
@@ -27,12 +27,29 @@ static bool stringCompareRec( const QString& s1, const QString& s2 )
 {
     if ( s1.isEmpty() && s2.isEmpty() )
         return true;
     return s1 == s2;
 }
 
+const QString RecMail::MsgsizeString() const
+{
+ 
+    double s = msg_size;
+    int w = 0;
+    s/=1024;
+    if (s>999.0) {
+        s/=1024.0;
+        ++w;
+    }
+    QString fsize = QString::number( s, 'f', 2 );
+    if ( w == 0 ) {
+        fsize += "kB" ;
+    } else
+        fsize += "MB" ;
+    return  fsize;
+}
 bool RecMail::isEqual( RecMail* r1 ) 
 {
     if ( !stringCompareRec( isodate, r1->isodate ) ) {
         //qDebug("date  *%s*   *%s* ", isodate.latin1(), r1->isodate.latin1());
         return false;
     }   
diff --git a/kmicromail/libmailwrapper/mailtypes.h b/kmicromail/libmailwrapper/mailtypes.h
index 32d92c0..39c0bac 100644
--- a/kmicromail/libmailwrapper/mailtypes.h
+++ b/kmicromail/libmailwrapper/mailtypes.h
@@ -52,12 +52,13 @@ public:
     void setMsgid(const QString&id){msg_id=id;}
     const QString&Msgid()const{return msg_id;}
     void setReplyto(const QString&reply){replyto=reply;}
     const QString&Replyto()const{return replyto;}
     void setMsgsize(unsigned int size){msg_size = size;}
     const unsigned int Msgsize()const{return msg_size;}
+    const QString MsgsizeString()const;
 
 
     void setTo(const QStringList&list);
     const QStringList&To()const;
     void setCC(const QStringList&list);
     const QStringList&CC()const;
diff --git a/kmicromail/mailistviewitem.cpp b/kmicromail/mailistviewitem.cpp
index ffb835c..137c482 100644
--- a/kmicromail/mailistviewitem.cpp
+++ b/kmicromail/mailistviewitem.cpp
@@ -19,44 +19,36 @@ void MailListViewItem::showEntry()
         /* I think it looks nicer if there are not such a log of icons but only on mails
            replied or new - Alwin*/ 
         //setPixmap( 0,SmallIcon ("kmmsgunseen") );
     } else  {
         setPixmap( 0,SmallIcon ( "kmmsgnew") );
     }
-    double s = mail_data->Msgsize();
-    int w = 0;
-    s/=1024;
-    if (s>999.0) {
-        s/=1024.0;
-        ++w;
-    }
-    QString fsort;
-    fsort.sprintf( "%.2f", s );
-    QString fsize = QString::number( s, 'f', 2 );
+    QString fsize = mail_data->MsgsizeString();
     //  1.23
     // 11.23
     // 111.23
     // 999.23 maxlen
+    QString fsort; 
     switch(fsize.length() ) {
-    case 4:
+    case 6:
         fsort = "00" + fsize ;
         break;
-    case 5:
+    case 7:
         fsort = "0" + fsize ;
         break;
     default:
         fsort = fsize ;
     break;
     
     }
-    if ( w == 0 ) {
-        setText(3, fsize + "kB" );
+    setText(3, fsize );
+    //qDebug("fsize *%s* ",fsize.latin1() );
+    //qDebug("fsort *%s* ",fsort.latin1() );
+    if ( fsize.right(2) == "kB" ) {
         mKeyMap.insert(3, "k" + fsort);
-        //setText(3, "kB" + fsort ); // test only
     } else {
-        //setText(3, fsize + "MB");
         mKeyMap.insert(3, "M" +fsort );
     }
     setText(1,mail_data->getSubject());
     setText(2,mail_data->getFrom());
     mKeyMap.insert(4,mail_data->getIsoDate());
     setText(4,mail_data->getDate());
diff --git a/kmicromail/opiemail.cpp b/kmicromail/opiemail.cpp
index 6e54bf4..760e3b0 100644
--- a/kmicromail/opiemail.cpp
+++ b/kmicromail/opiemail.cpp
@@ -18,12 +18,13 @@
 #include "composemail.h"
 #include "mailistviewitem.h"
 #include "viewmail.h"
 #include "selectstore.h"
 #include "selectsmtp.h"
 #include "accountitem.h"
+#include "accountview.h"
 #include "klocale.h"
 
 #include <qmessagebox.h>
 #include <qtimer.h>
 #include <qcursor.h>
 #include <qtextbrowser.h>
@@ -310,13 +311,48 @@ void OpieMail::closeViewMail(ViewMail * vm)
 {
     vm->hide();
 }
 
 void  OpieMail::slotDownloadMail( )
 {
-    qDebug("slotDownloadMail( ) ");
+    QListViewItem*item = mailView->currentItem();
+    if (!item ) {
+        Global::statusMessage("Error: No item slected!");
+        return;
+    }
+    RecMailP mail = ((MailListViewItem*)item)->data();
+    Account * acc = mail->Wrapper()->getAccount();
+    if ( !acc ) {
+        Global::statusMessage("Mail is already stored locally!");
+        return;
+    }
+    QString lfName = acc->getLocalFolder();
+    //qDebug("local folder " + lfName );
+    if ( lfName.isEmpty() )
+        lfName = acc->getAccountName();
+    AbstractMail* targetMail = folderView->allAccounts()[0]->getWrapper();
+    //qDebug("target %d %d ",targetMail,mail->Wrapper() );
+    if ( targetMail == mail->Wrapper() ) {
+        Global::statusMessage("Mail is already locally stored!");
+        return;
+    }
+    if ( !targetMail->createMbox(lfName)) {
+        Global::statusMessage("Error creating folder!");
+        return;
+    }
+    Global::statusMessage("Fetching mail...please wait!");
+    qApp->processEvents();
+    encodedString*st = 0;
+    st = mail->Wrapper()->fetchRawBody(mail);
+    if ( st ) {
+        targetMail->storeMessage(st->Content(),st->Length(),lfName);
+        Global::statusMessage("Mail stored in "+ lfName);
+        delete st;
+    } else {
+        Global::statusMessage("Error: Cannot fetch mail!");
+    }
 }
 
 
 void OpieMail::deleteAndDisplayNextMail(ViewMail * vm)
 {
     QListViewItem*item = mailView->currentItem();
diff --git a/kmicromail/viewmail.cpp b/kmicromail/viewmail.cpp
index 767a369..726f540 100644
--- a/kmicromail/viewmail.cpp
+++ b/kmicromail/viewmail.cpp
@@ -374,14 +374,17 @@ void ViewMail::setText()
 
    
     toString = m_mail2[0].join(",");
     ccString  = m_mail2[1].join(",");
     bccString = m_mail2[2].join(",");
   
-
-    setCaption( i18n("E-Mail by %1").arg( m_mail[0] ) );
+#ifdef DESKTOP_VERSION
+    setCaption( i18n("Size: ")+m_recMail->MsgsizeString()+" - "+i18n("E-Mail by %1").arg( m_mail[0] ) );
+#else
+    setCaption( m_recMail->MsgsizeString()+" - "+m_mail[0] );
+#endif
 
     m_mailHtml = "<html><body>"
                  "<table width=\"100%\" border=\"0\"><tr bgcolor=\"#FFDD76\"><td>"
                  "<div align=left><b>" + deHtml( m_mail[1] ) + "</b></div>"
                  "</td></tr><tr bgcolor=\"#EEEEE6\"><td>"
                  "<b>" + i18n( "From" ) + ": </b><font color=#6C86C0>" + deHtml( m_mail[0] ) + "</font><br>"