summaryrefslogtreecommitdiff
authorharlekin <harlekin>2003-12-13 21:49:53 (UTC)
committer harlekin <harlekin>2003-12-13 21:49:53 (UTC)
commit8290f1a524b6f0051e49f8045d24e508d46868e2 (patch) (unidiff)
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) (ignore whitespace changes)
-rw-r--r--noncore/net/mail/viewmail.cpp10
-rw-r--r--noncore/net/mail/viewmail.h1
2 files changed, 7 insertions, 4 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,24 +1,25 @@
1#include <qtextbrowser.h> 1#include <qtextbrowser.h>
2#include <qmessagebox.h> 2#include <qmessagebox.h>
3#include <qtextstream.h> 3#include <qtextstream.h>
4#include <qaction.h> 4#include <qaction.h>
5#include <qpopupmenu.h> 5#include <qpopupmenu.h>
6#include <qapplication.h> 6#include <qapplication.h>
7 7
8#include <opie/ofiledialog.h> 8#include <opie/ofiledialog.h>
9 9
10#include "settings.h" 10#include "settings.h"
11#include "composemail.h" 11#include "composemail.h"
12#include "viewmail.h" 12#include "viewmail.h"
13#include "abstractmail.h"
13 14
14AttachItem::AttachItem(QListView * parent,QListViewItem *after, const QString&mime,const QString&file,const QString&desc,int num) 15AttachItem::AttachItem(QListView * parent,QListViewItem *after, const QString&mime,const QString&file,const QString&desc,int num)
15 : QListViewItem(parent,after),_partNum(num) 16 : QListViewItem(parent,after),_partNum(num)
16{ 17{
17 setText(0, mime); 18 setText(0, mime);
18 setText(1, file); 19 setText(1, file);
19 setText(2, desc); 20 setText(2, desc);
20} 21}
21 22
22void ViewMail::setBody( RecBody body ) { 23void ViewMail::setBody( RecBody body ) {
23 24
24m_body = body; 25m_body = body;
@@ -121,39 +122,40 @@ void ViewMail::slotItemClicked( QListViewItem * item , const QPoint & point, int
121 { MimeTypes types; 122 { MimeTypes types;
122 types.insert( "all", "*" ); 123 types.insert( "all", "*" );
123 QString str = OFileDialog::getSaveFileName( 1, 124 QString str = OFileDialog::getSaveFileName( 1,
124 "/", item->text( 1 ) , types, 0 ); 125 "/", item->text( 1 ) , types, 0 );
125 126
126 if( !str.isEmpty() ) { 127 if( !str.isEmpty() ) {
127 qDebug( " first we will need a MIME wrapper" ); 128 qDebug( " first we will need a MIME wrapper" );
128 } 129 }
129 } 130 }
130 break ; 131 break ;
131 132
132 case 1: 133 case 1:
133
134 qDebug( QString( "Test selected" ).arg( ( ( AttachItem* )item )->Partnumber() ) ); 134 qDebug( QString( "Test selected" ).arg( ( ( AttachItem* )item )->Partnumber() ) );
135 if ( ( ( AttachItem* )item )->Partnumber() == -1 ) { 135 if ( ( ( AttachItem* )item )->Partnumber() == -1 ) {
136 setText(); 136 setText();
137 } else { 137 } else {
138 browser->setText( ( m_body.Parts()[( ( AttachItem* )item )->Partnumber() ] ).Identifier() ); 138 browser->setText( m_recMail.Wrapper()->fetchPart( m_recMail, m_body.Parts()[ ( ( AttachItem* )item )->Partnumber() ] ) );
139 } 139 }
140 break; 140 break;
141 } 141 }
142 delete menu; 142 delete menu;
143} 143}
144 144
145 145
146void ViewMail::setMail( RecMail mail ) { 146void ViewMail::setMail( RecMail mail ) {
147 147
148m_recMail = mail;
149
148m_mail[0] = mail.getFrom(); 150m_mail[0] = mail.getFrom();
149m_mail[1] = mail.getSubject(); 151m_mail[1] = mail.getSubject();
150m_mail[3] = mail.getDate(); 152m_mail[3] = mail.getDate();
151m_mail[4] = mail.Msgid(); 153m_mail[4] = mail.Msgid();
152 154
153m_mail2[0] = mail.To(); 155m_mail2[0] = mail.To();
154m_mail2[1] = mail.CC(); 156m_mail2[1] = mail.CC();
155m_mail2[2] = mail.Bcc(); 157m_mail2[2] = mail.Bcc();
156 158
157setText(); 159setText();
158} 160}
159 161
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
@@ -36,21 +36,22 @@ protected:
36 36
37protected slots: 37protected slots:
38 void slotReply(); 38 void slotReply();
39 void slotForward(); 39 void slotForward();
40 void setText(); 40 void setText();
41 void slotItemClicked( QListViewItem * item , const QPoint & point, int c ); 41 void slotItemClicked( QListViewItem * item , const QPoint & point, int c );
42 42
43private: 43private:
44 bool _inLoop; 44 bool _inLoop;
45 QString m_mailHtml; 45 QString m_mailHtml;
46 bool m_gotBody; 46 bool m_gotBody;
47 RecBody m_body; 47 RecBody m_body;
48 RecMail m_recMail;
48 49
49 // 0 from 1 subject 2 bodytext 3 date 50 // 0 from 1 subject 2 bodytext 3 date
50 QMap <int,QString> m_mail; 51 QMap <int,QString> m_mail;
51 // 0 to 1 cc 2 bcc 52 // 0 to 1 cc 2 bcc
52 QMap <int,QStringList> m_mail2; 53 QMap <int,QStringList> m_mail2;
53 54
54}; 55};
55 56
56#endif 57#endif