summaryrefslogtreecommitdiff
authorharlekin <harlekin>2003-12-13 21:49:53 (UTC)
committer harlekin <harlekin>2003-12-13 21:49:53 (UTC)
commit8290f1a524b6f0051e49f8045d24e508d46868e2 (patch) (side-by-side diff)
tree6c2acfab918834961c82558224c28b00077bc86f
parentc0e86973b0cd2d01163ccf60340c8d295aa645f4 (diff)
downloadopie-8290f1a524b6f0051e49f8045d24e508d46868e2.zip
opie-8290f1a524b6f0051e49f8045d24e508d46868e2.tar.gz
opie-8290f1a524b6f0051e49f8045d24e508d46868e2.tar.bz2
possible to show all kind of text attachemnts now
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/net/mail/viewmail.cpp6
-rw-r--r--noncore/net/mail/viewmail.h1
2 files changed, 5 insertions, 2 deletions
diff --git a/noncore/net/mail/viewmail.cpp b/noncore/net/mail/viewmail.cpp
index c24d5d3..a73dac5 100644
--- a/noncore/net/mail/viewmail.cpp
+++ b/noncore/net/mail/viewmail.cpp
@@ -1,36 +1,37 @@
#include <qtextbrowser.h>
#include <qmessagebox.h>
#include <qtextstream.h>
#include <qaction.h>
#include <qpopupmenu.h>
#include <qapplication.h>
#include <opie/ofiledialog.h>
#include "settings.h"
#include "composemail.h"
#include "viewmail.h"
+#include "abstractmail.h"
AttachItem::AttachItem(QListView * parent,QListViewItem *after, const QString&mime,const QString&file,const QString&desc,int num)
: QListViewItem(parent,after),_partNum(num)
{
setText(0, mime);
setText(1, file);
setText(2, desc);
}
void ViewMail::setBody( RecBody body ) {
m_body = body;
m_mail[2] = body.Bodytext();
attachbutton->setEnabled(body.Parts().count()>0);
attachments->setEnabled(body.Parts().count()>0);
if (body.Parts().count()==0) {
return;
}
AttachItem * curItem=0;
QString type=body.Description().Type()+"/"+body.Description().Subtype();
QString desc;
double s = body.Description().Size();
int w;
w=0;
@@ -109,63 +110,64 @@ void ViewMail::slotItemClicked( QListViewItem * item , const QPoint & point, int
int ret=0;
if ( item->text( 0 ).left( 4 ) == "text" ) {
menu->insertItem( tr( "Show Text" ), 1 );
}
menu->insertItem( tr( "Save Attachemt" ), 0 );
menu->insertSeparator(1);
ret = menu->exec( point, 0 );
switch(ret) {
case 0:
{ MimeTypes types;
types.insert( "all", "*" );
QString str = OFileDialog::getSaveFileName( 1,
"/", item->text( 1 ) , types, 0 );
if( !str.isEmpty() ) {
qDebug( " first we will need a MIME wrapper" );
}
}
break ;
case 1:
-
qDebug( QString( "Test selected" ).arg( ( ( AttachItem* )item )->Partnumber() ) );
if ( ( ( AttachItem* )item )->Partnumber() == -1 ) {
setText();
} else {
- browser->setText( ( m_body.Parts()[( ( AttachItem* )item )->Partnumber() ] ).Identifier() );
+ browser->setText( m_recMail.Wrapper()->fetchPart( m_recMail, m_body.Parts()[ ( ( AttachItem* )item )->Partnumber() ] ) );
}
break;
}
delete menu;
}
void ViewMail::setMail( RecMail mail ) {
+m_recMail = mail;
+
m_mail[0] = mail.getFrom();
m_mail[1] = mail.getSubject();
m_mail[3] = mail.getDate();
m_mail[4] = mail.Msgid();
m_mail2[0] = mail.To();
m_mail2[1] = mail.CC();
m_mail2[2] = mail.Bcc();
setText();
}
ViewMail::ViewMail( QWidget *parent, const char *name, WFlags fl)
: ViewMailBase(parent, name, fl), _inLoop(false)
{
m_gotBody = false;
connect(reply, SIGNAL(activated()), SLOT(slotReply()));
connect(forward, SIGNAL(activated()), SLOT(slotForward()));
attachments->setEnabled(m_gotBody);
connect( attachments, SIGNAL( clicked ( QListViewItem *, const QPoint & , int ) ), SLOT( slotItemClicked( QListViewItem *, const QPoint & , int ) ) );
diff --git a/noncore/net/mail/viewmail.h b/noncore/net/mail/viewmail.h
index 0e85839..bc12da1 100644
--- a/noncore/net/mail/viewmail.h
+++ b/noncore/net/mail/viewmail.h
@@ -24,33 +24,34 @@ class ViewMail : public ViewMailBase
public:
ViewMail( QWidget *parent = 0, const char *name = 0, WFlags fl = Qt::WType_Modal);
~ViewMail();
void hide();
void exec();
void setMail( RecMail mail );
void setBody( RecBody body );
protected:
QString deHtml(const QString &string);
protected slots:
void slotReply();
void slotForward();
void setText();
void slotItemClicked( QListViewItem * item , const QPoint & point, int c );
private:
bool _inLoop;
QString m_mailHtml;
bool m_gotBody;
RecBody m_body;
+ RecMail m_recMail;
// 0 from 1 subject 2 bodytext 3 date
QMap <int,QString> m_mail;
// 0 to 1 cc 2 bcc
QMap <int,QStringList> m_mail2;
};
#endif