author | alwin <alwin> | 2004-01-02 02:47:12 (UTC) |
---|---|---|
committer | alwin <alwin> | 2004-01-02 02:47:12 (UTC) |
commit | fec64a3eb7b198666eb9937df47323bad94b1ba0 (patch) (unidiff) | |
tree | a781a5999d7efb3b3926aa056bf8bac471f5e484 /noncore/net/mail | |
parent | 5fbf2a6b9cda98ab16fa1f0e1ac848a9bb523a72 (diff) | |
download | opie-fec64a3eb7b198666eb9937df47323bad94b1ba0.zip opie-fec64a3eb7b198666eb9937df47323bad94b1ba0.tar.gz opie-fec64a3eb7b198666eb9937df47323bad94b1ba0.tar.bz2 |
display of attachments has a hierarchic structure (if needed)
-rw-r--r-- | noncore/net/mail/viewmail.cpp | 49 | ||||
-rw-r--r-- | noncore/net/mail/viewmail.h | 9 |
2 files changed, 54 insertions, 4 deletions
diff --git a/noncore/net/mail/viewmail.cpp b/noncore/net/mail/viewmail.cpp index d2e5e29..5e7ffeb 100644 --- a/noncore/net/mail/viewmail.cpp +++ b/noncore/net/mail/viewmail.cpp | |||
@@ -5,6 +5,7 @@ | |||
5 | #include <qpopupmenu.h> | 5 | #include <qpopupmenu.h> |
6 | #include <qfile.h> | 6 | #include <qfile.h> |
7 | #include <qapplication.h> | 7 | #include <qapplication.h> |
8 | #include <qvaluelist.h> | ||
8 | 9 | ||
9 | #include <qpe/config.h> | 10 | #include <qpe/config.h> |
10 | 11 | ||
@@ -18,15 +19,49 @@ | |||
18 | #include "mailtypes.h" | 19 | #include "mailtypes.h" |
19 | 20 | ||
20 | AttachItem::AttachItem(QListView * parent,QListViewItem *after, const QString&mime,const QString&desc,const QString&file, | 21 | AttachItem::AttachItem(QListView * parent,QListViewItem *after, const QString&mime,const QString&desc,const QString&file, |
21 | const QString&fsize,int num) | 22 | const QString&fsize,int num,const QValueList<int>&path) |
22 | : QListViewItem(parent,after),_partNum(num) | 23 | : QListViewItem(parent,after),_partNum(num) |
23 | { | 24 | { |
25 | _path=path; | ||
24 | setText(0, mime); | 26 | setText(0, mime); |
25 | setText(1, desc); | 27 | setText(1, desc); |
26 | setText(2, file); | 28 | setText(2, file); |
27 | setText(3, fsize); | 29 | setText(3, fsize); |
28 | } | 30 | } |
29 | 31 | ||
32 | AttachItem::AttachItem(QListViewItem * parent,QListViewItem *after, const QString&mime,const QString&desc,const QString&file, | ||
33 | const QString&fsize,int num,const QValueList<int>&path) | ||
34 | : QListViewItem(parent,after),_partNum(num) | ||
35 | { | ||
36 | _path=path; | ||
37 | setText(0, mime); | ||
38 | setText(1, desc); | ||
39 | setText(2, file); | ||
40 | setText(3, fsize); | ||
41 | } | ||
42 | |||
43 | bool AttachItem::isParentof(const QValueList<int>&path) | ||
44 | { | ||
45 | /* if not set, then no parent */ | ||
46 | if (path.count()==0||_path.count()==0) return false; | ||
47 | /* the parent must have one digit less then a child */ | ||
48 | if (path.count()!=_path.count()+1) return false; | ||
49 | for (unsigned int i=0; i < _path.count();++i) { | ||
50 | if (_path[i]!=path[i]) return false; | ||
51 | } | ||
52 | return true; | ||
53 | } | ||
54 | |||
55 | AttachItem* ViewMail::searchParent(const QValueList<int>&path) | ||
56 | { | ||
57 | QListViewItemIterator it( attachments ); | ||
58 | for ( ; it.current(); ++it ) { | ||
59 | AttachItem*ati = (AttachItem*)it.current(); | ||
60 | if (ati->isParentof(path)) return ati; | ||
61 | } | ||
62 | return 0; | ||
63 | } | ||
64 | |||
30 | void ViewMail::setBody( RecBody body ) { | 65 | void ViewMail::setBody( RecBody body ) { |
31 | 66 | ||
32 | m_body = body; | 67 | m_body = body; |
@@ -37,6 +72,7 @@ if (body.Parts().count()==0) { | |||
37 | return; | 72 | return; |
38 | } | 73 | } |
39 | AttachItem * curItem=0; | 74 | AttachItem * curItem=0; |
75 | AttachItem * parentItem = 0; | ||
40 | QString type=body.Description().Type()+"/"+body.Description().Subtype(); | 76 | QString type=body.Description().Type()+"/"+body.Description().Subtype(); |
41 | QString desc,fsize; | 77 | QString desc,fsize; |
42 | double s = body.Description().Size(); | 78 | double s = body.Description().Size(); |
@@ -73,8 +109,9 @@ default: | |||
73 | o << s << " " << q << "Byte"; | 109 | o << s << " " << q << "Byte"; |
74 | } | 110 | } |
75 | 111 | ||
76 | curItem=new AttachItem(attachments,curItem,type,"Mailbody","",fsize,-1); | 112 | curItem=new AttachItem(attachments,curItem,type,"Mailbody","",fsize,-1,body.Description().Positionlist()); |
77 | QString filename = ""; | 113 | QString filename = ""; |
114 | |||
78 | for (unsigned int i = 0; i < body.Parts().count();++i) { | 115 | for (unsigned int i = 0; i < body.Parts().count();++i) { |
79 | type = body.Parts()[i].Type()+"/"+body.Parts()[i].Subtype(); | 116 | type = body.Parts()[i].Type()+"/"+body.Parts()[i].Subtype(); |
80 | part_plist_t::ConstIterator it = body.Parts()[i].Parameters().begin(); | 117 | part_plist_t::ConstIterator it = body.Parts()[i].Parameters().begin(); |
@@ -107,7 +144,13 @@ for (unsigned int i = 0; i < body.Parts().count();++i) { | |||
107 | o.setf(QTextStream::fixed); | 144 | o.setf(QTextStream::fixed); |
108 | o << s << " " << q << "Byte"; | 145 | o << s << " " << q << "Byte"; |
109 | desc = body.Parts()[i].Description(); | 146 | desc = body.Parts()[i].Description(); |
110 | curItem=new AttachItem(attachments,curItem,type,desc,filename,fsize,i); | 147 | parentItem = searchParent(body.Parts()[i].Positionlist()); |
148 | if (parentItem) { | ||
149 | curItem=new AttachItem(parentItem,curItem,type,desc,filename,fsize,i,body.Parts()[i].Positionlist()); | ||
150 | attachments->setRootIsDecorated(true); | ||
151 | } else { | ||
152 | curItem=new AttachItem(attachments,curItem,type,desc,filename,fsize,i,body.Parts()[i].Positionlist()); | ||
153 | } | ||
111 | } | 154 | } |
112 | } | 155 | } |
113 | 156 | ||
diff --git a/noncore/net/mail/viewmail.h b/noncore/net/mail/viewmail.h index bf7a4dd..b3d3b4e 100644 --- a/noncore/net/mail/viewmail.h +++ b/noncore/net/mail/viewmail.h | |||
@@ -4,6 +4,7 @@ | |||
4 | #include <qlistview.h> | 4 | #include <qlistview.h> |
5 | #include <qmap.h> | 5 | #include <qmap.h> |
6 | #include <qstringlist.h> | 6 | #include <qstringlist.h> |
7 | #include <qvaluelist.h> | ||
7 | 8 | ||
8 | #include "viewmailbase.h" | 9 | #include "viewmailbase.h" |
9 | #include "mailtypes.h" | 10 | #include "mailtypes.h" |
@@ -12,11 +13,16 @@ class AttachItem : public QListViewItem | |||
12 | { | 13 | { |
13 | public: | 14 | public: |
14 | AttachItem(QListView * parent,QListViewItem *after, const QString&mime,const QString&desc,const QString&file, | 15 | AttachItem(QListView * parent,QListViewItem *after, const QString&mime,const QString&desc,const QString&file, |
15 | const QString&fsize,int num); | 16 | const QString&fsize,int num,const QValueList<int>&path); |
17 | AttachItem(QListViewItem * parent,QListViewItem *after, const QString&mime,const QString&desc,const QString&file, | ||
18 | const QString&fsize,int num,const QValueList<int>&path); | ||
16 | int Partnumber() { return _partNum; } | 19 | int Partnumber() { return _partNum; } |
20 | bool isParentof(const QValueList<int>&path); | ||
17 | 21 | ||
18 | private: | 22 | private: |
19 | int _partNum; | 23 | int _partNum; |
24 | /* needed for a better display of attachments */ | ||
25 | QValueList<int> _path; | ||
20 | }; | 26 | }; |
21 | 27 | ||
22 | class ViewMail : public ViewMailBase | 28 | class ViewMail : public ViewMailBase |
@@ -35,6 +41,7 @@ public: | |||
35 | 41 | ||
36 | protected: | 42 | protected: |
37 | QString deHtml(const QString &string); | 43 | QString deHtml(const QString &string); |
44 | AttachItem* searchParent(const QValueList<int>&path); | ||
38 | 45 | ||
39 | protected slots: | 46 | protected slots: |
40 | void slotReply(); | 47 | void slotReply(); |