author | alwin <alwin> | 2004-01-03 13:04:52 (UTC) |
---|---|---|
committer | alwin <alwin> | 2004-01-03 13:04:52 (UTC) |
commit | 22564b62e15c1ea3feada5b2f9b6ec4d98b40c6b (patch) (unidiff) | |
tree | 85847776be6743270b18f5e1df9fa6451288f7a6 /noncore/net/mail | |
parent | 452aac36b77ed1f7e6db3a7952028bf6027e54b6 (diff) | |
download | opie-22564b62e15c1ea3feada5b2f9b6ec4d98b40c6b.zip opie-22564b62e15c1ea3feada5b2f9b6ec4d98b40c6b.tar.gz opie-22564b62e15c1ea3feada5b2f9b6ec4d98b40c6b.tar.bz2 |
some more display beauty
-rw-r--r-- | noncore/net/mail/viewmail.cpp | 14 | ||||
-rw-r--r-- | noncore/net/mail/viewmail.h | 1 |
2 files changed, 15 insertions, 0 deletions
diff --git a/noncore/net/mail/viewmail.cpp b/noncore/net/mail/viewmail.cpp index d4c5150..ed77eb5 100644 --- a/noncore/net/mail/viewmail.cpp +++ b/noncore/net/mail/viewmail.cpp | |||
@@ -57,16 +57,28 @@ AttachItem* ViewMail::searchParent(const QValueList<int>&path) | |||
57 | QListViewItemIterator it( attachments ); | 57 | QListViewItemIterator it( attachments ); |
58 | for ( ; it.current(); ++it ) { | 58 | for ( ; it.current(); ++it ) { |
59 | AttachItem*ati = (AttachItem*)it.current(); | 59 | AttachItem*ati = (AttachItem*)it.current(); |
60 | if (ati->isParentof(path)) return ati; | 60 | if (ati->isParentof(path)) return ati; |
61 | } | 61 | } |
62 | return 0; | 62 | return 0; |
63 | } | 63 | } |
64 | 64 | ||
65 | AttachItem* ViewMail::lastChild(AttachItem*parent) | ||
66 | { | ||
67 | if (!parent) return 0; | ||
68 | AttachItem* item = (AttachItem*)parent->firstChild(); | ||
69 | if (!item) return item; | ||
70 | AttachItem*temp=0; | ||
71 | while( (temp=(AttachItem*)item->nextSibling())) { | ||
72 | item = temp; | ||
73 | } | ||
74 | return item; | ||
75 | } | ||
76 | |||
65 | void ViewMail::setBody( RecBody body ) { | 77 | void ViewMail::setBody( RecBody body ) { |
66 | 78 | ||
67 | m_body = body; | 79 | m_body = body; |
68 | m_mail[2] = body.Bodytext(); | 80 | m_mail[2] = body.Bodytext(); |
69 | attachbutton->setEnabled(body.Parts().count()>0); | 81 | attachbutton->setEnabled(body.Parts().count()>0); |
70 | attachments->setEnabled(body.Parts().count()>0); | 82 | attachments->setEnabled(body.Parts().count()>0); |
71 | if (body.Parts().count()==0) { | 83 | if (body.Parts().count()==0) { |
72 | return; | 84 | return; |
@@ -141,16 +153,18 @@ for (unsigned int i = 0; i < body.Parts().count();++i) { | |||
141 | } | 153 | } |
142 | QTextOStream o(&fsize); | 154 | QTextOStream o(&fsize); |
143 | if (w>0) o.precision(2); else o.precision(0); | 155 | if (w>0) o.precision(2); else o.precision(0); |
144 | o.setf(QTextStream::fixed); | 156 | o.setf(QTextStream::fixed); |
145 | o << s << " " << q << "Byte"; | 157 | o << s << " " << q << "Byte"; |
146 | desc = body.Parts()[i].Description(); | 158 | desc = body.Parts()[i].Description(); |
147 | parentItem = searchParent(body.Parts()[i].Positionlist()); | 159 | parentItem = searchParent(body.Parts()[i].Positionlist()); |
148 | if (parentItem) { | 160 | if (parentItem) { |
161 | AttachItem*temp = lastChild(parentItem); | ||
162 | if (temp) curItem = temp; | ||
149 | curItem=new AttachItem(parentItem,curItem,type,desc,filename,fsize,i,body.Parts()[i].Positionlist()); | 163 | curItem=new AttachItem(parentItem,curItem,type,desc,filename,fsize,i,body.Parts()[i].Positionlist()); |
150 | attachments->setRootIsDecorated(true); | 164 | attachments->setRootIsDecorated(true); |
151 | curItem = parentItem; | 165 | curItem = parentItem; |
152 | } else { | 166 | } else { |
153 | curItem=new AttachItem(attachments,curItem,type,desc,filename,fsize,i,body.Parts()[i].Positionlist()); | 167 | curItem=new AttachItem(attachments,curItem,type,desc,filename,fsize,i,body.Parts()[i].Positionlist()); |
154 | } | 168 | } |
155 | } | 169 | } |
156 | } | 170 | } |
diff --git a/noncore/net/mail/viewmail.h b/noncore/net/mail/viewmail.h index b3d3b4e..29681cc 100644 --- a/noncore/net/mail/viewmail.h +++ b/noncore/net/mail/viewmail.h | |||
@@ -37,16 +37,17 @@ public: | |||
37 | void exec(); | 37 | void exec(); |
38 | void setMail( RecMail mail ); | 38 | void setMail( RecMail mail ); |
39 | void setBody( RecBody body ); | 39 | void setBody( RecBody body ); |
40 | bool deleted; | 40 | bool deleted; |
41 | 41 | ||
42 | protected: | 42 | protected: |
43 | QString deHtml(const QString &string); | 43 | QString deHtml(const QString &string); |
44 | AttachItem* searchParent(const QValueList<int>&path); | 44 | AttachItem* searchParent(const QValueList<int>&path); |
45 | AttachItem* lastChild(AttachItem*parent); | ||
45 | 46 | ||
46 | protected slots: | 47 | protected slots: |
47 | void slotReply(); | 48 | void slotReply(); |
48 | void slotForward(); | 49 | void slotForward(); |
49 | void setText(); | 50 | void setText(); |
50 | void slotItemClicked( QListViewItem * item , const QPoint & point, int c ); | 51 | void slotItemClicked( QListViewItem * item , const QPoint & point, int c ); |
51 | void slotDeleteMail( ); | 52 | void slotDeleteMail( ); |
52 | void slotShowHtml( bool ); | 53 | void slotShowHtml( bool ); |