-rw-r--r-- | noncore/net/mail/imapwrapper.cpp | 5 | ||||
-rw-r--r-- | noncore/net/mail/libmailwrapper/imapwrapper.cpp | 5 | ||||
-rw-r--r-- | noncore/net/mail/libmailwrapper/mailtypes.cpp | 12 | ||||
-rw-r--r-- | noncore/net/mail/libmailwrapper/mailtypes.h | 4 | ||||
-rw-r--r-- | noncore/net/mail/mailtypes.cpp | 12 | ||||
-rw-r--r-- | noncore/net/mail/mailtypes.h | 4 | ||||
-rw-r--r-- | noncore/net/mail/mainwindow.cpp | 4 | ||||
-rw-r--r-- | noncore/net/mail/viewmail.cpp | 30 | ||||
-rw-r--r-- | noncore/net/mail/viewmail.h | 3 | ||||
-rw-r--r-- | noncore/net/mail/viewmailbase.cpp | 3 |
10 files changed, 62 insertions, 20 deletions
diff --git a/noncore/net/mail/imapwrapper.cpp b/noncore/net/mail/imapwrapper.cpp index 0ce2c6c..ad95384 100644 --- a/noncore/net/mail/imapwrapper.cpp +++ b/noncore/net/mail/imapwrapper.cpp | |||
@@ -698,2 +698,5 @@ void IMAPwrapper::fillBodyFields(RecPart&target_part,mailimap_body_fields*which) | |||
698 | } | 698 | } |
699 | if (which->bd_description) { | ||
700 | target_part.setDescription(QString(which->bd_description)); | ||
701 | } | ||
699 | target_part.setEncoding(encoding); | 702 | target_part.setEncoding(encoding); |
@@ -762,3 +765,3 @@ void IMAPwrapper::answeredMail(const RecMail&mail) | |||
762 | mailimap_flag_list_add(flist,mailimap_flag_new_answered()); | 765 | mailimap_flag_list_add(flist,mailimap_flag_new_answered()); |
763 | store_flags = mailimap_store_att_flags_new_set_flags(flist); | 766 | store_flags = mailimap_store_att_flags_new_add_flags(flist); |
764 | set = mailimap_set_new_single(mail.getNumber()); | 767 | set = mailimap_set_new_single(mail.getNumber()); |
diff --git a/noncore/net/mail/libmailwrapper/imapwrapper.cpp b/noncore/net/mail/libmailwrapper/imapwrapper.cpp index 0ce2c6c..ad95384 100644 --- a/noncore/net/mail/libmailwrapper/imapwrapper.cpp +++ b/noncore/net/mail/libmailwrapper/imapwrapper.cpp | |||
@@ -698,2 +698,5 @@ void IMAPwrapper::fillBodyFields(RecPart&target_part,mailimap_body_fields*which) | |||
698 | } | 698 | } |
699 | if (which->bd_description) { | ||
700 | target_part.setDescription(QString(which->bd_description)); | ||
701 | } | ||
699 | target_part.setEncoding(encoding); | 702 | target_part.setEncoding(encoding); |
@@ -762,3 +765,3 @@ void IMAPwrapper::answeredMail(const RecMail&mail) | |||
762 | mailimap_flag_list_add(flist,mailimap_flag_new_answered()); | 765 | mailimap_flag_list_add(flist,mailimap_flag_new_answered()); |
763 | store_flags = mailimap_store_att_flags_new_set_flags(flist); | 766 | store_flags = mailimap_store_att_flags_new_add_flags(flist); |
764 | set = mailimap_set_new_single(mail.getNumber()); | 767 | set = mailimap_set_new_single(mail.getNumber()); |
diff --git a/noncore/net/mail/libmailwrapper/mailtypes.cpp b/noncore/net/mail/libmailwrapper/mailtypes.cpp index 94f5d6f..8d9b247 100644 --- a/noncore/net/mail/libmailwrapper/mailtypes.cpp +++ b/noncore/net/mail/libmailwrapper/mailtypes.cpp | |||
@@ -87,3 +87,3 @@ const QStringList& RecMail::Bcc()const | |||
87 | RecPart::RecPart() | 87 | RecPart::RecPart() |
88 | : m_type(""),m_subtype(""),m_identifier(""),m_encoding(""),m_lines(0),m_size(0) | 88 | : m_type(""),m_subtype(""),m_identifier(""),m_encoding(""),m_description(""),m_lines(0),m_size(0) |
89 | { | 89 | { |
@@ -157,2 +157,12 @@ void RecPart::setEncoding(const QString&encoding) | |||
157 | 157 | ||
158 | const QString& RecPart::Description()const | ||
159 | { | ||
160 | return m_description; | ||
161 | } | ||
162 | |||
163 | void RecPart::setDescription(const QString&desc) | ||
164 | { | ||
165 | m_description = desc; | ||
166 | } | ||
167 | |||
158 | void RecPart::setParameters(const part_plist_t&list) | 168 | void RecPart::setParameters(const part_plist_t&list) |
diff --git a/noncore/net/mail/libmailwrapper/mailtypes.h b/noncore/net/mail/libmailwrapper/mailtypes.h index 9ef762d..7d7bebc 100644 --- a/noncore/net/mail/libmailwrapper/mailtypes.h +++ b/noncore/net/mail/libmailwrapper/mailtypes.h | |||
@@ -82,3 +82,3 @@ class RecPart | |||
82 | protected: | 82 | protected: |
83 | QString m_type,m_subtype,m_identifier,m_encoding; | 83 | QString m_type,m_subtype,m_identifier,m_encoding,m_description; |
84 | unsigned int m_lines,m_size; | 84 | unsigned int m_lines,m_size; |
@@ -100,2 +100,4 @@ public: | |||
100 | void setEncoding(const QString&encoding); | 100 | void setEncoding(const QString&encoding); |
101 | const QString&Description()const; | ||
102 | void setDescription(const QString&desc); | ||
101 | void setLines(unsigned int lines); | 103 | void setLines(unsigned int lines); |
diff --git a/noncore/net/mail/mailtypes.cpp b/noncore/net/mail/mailtypes.cpp index 94f5d6f..8d9b247 100644 --- a/noncore/net/mail/mailtypes.cpp +++ b/noncore/net/mail/mailtypes.cpp | |||
@@ -87,3 +87,3 @@ const QStringList& RecMail::Bcc()const | |||
87 | RecPart::RecPart() | 87 | RecPart::RecPart() |
88 | : m_type(""),m_subtype(""),m_identifier(""),m_encoding(""),m_lines(0),m_size(0) | 88 | : m_type(""),m_subtype(""),m_identifier(""),m_encoding(""),m_description(""),m_lines(0),m_size(0) |
89 | { | 89 | { |
@@ -157,2 +157,12 @@ void RecPart::setEncoding(const QString&encoding) | |||
157 | 157 | ||
158 | const QString& RecPart::Description()const | ||
159 | { | ||
160 | return m_description; | ||
161 | } | ||
162 | |||
163 | void RecPart::setDescription(const QString&desc) | ||
164 | { | ||
165 | m_description = desc; | ||
166 | } | ||
167 | |||
158 | void RecPart::setParameters(const part_plist_t&list) | 168 | void RecPart::setParameters(const part_plist_t&list) |
diff --git a/noncore/net/mail/mailtypes.h b/noncore/net/mail/mailtypes.h index 9ef762d..7d7bebc 100644 --- a/noncore/net/mail/mailtypes.h +++ b/noncore/net/mail/mailtypes.h | |||
@@ -82,3 +82,3 @@ class RecPart | |||
82 | protected: | 82 | protected: |
83 | QString m_type,m_subtype,m_identifier,m_encoding; | 83 | QString m_type,m_subtype,m_identifier,m_encoding,m_description; |
84 | unsigned int m_lines,m_size; | 84 | unsigned int m_lines,m_size; |
@@ -100,2 +100,4 @@ public: | |||
100 | void setEncoding(const QString&encoding); | 100 | void setEncoding(const QString&encoding); |
101 | const QString&Description()const; | ||
102 | void setDescription(const QString&desc); | ||
101 | void setLines(unsigned int lines); | 103 | void setLines(unsigned int lines); |
diff --git a/noncore/net/mail/mainwindow.cpp b/noncore/net/mail/mainwindow.cpp index fae3e97..8e2132e 100644 --- a/noncore/net/mail/mainwindow.cpp +++ b/noncore/net/mail/mainwindow.cpp | |||
@@ -201,3 +201,5 @@ void MailListViewItem::showEntry() | |||
201 | { | 201 | { |
202 | if ( mail_data.getFlags().testBit( FLAG_SEEN ) == true ) { | 202 | if ( mail_data.getFlags().testBit( FLAG_ANSWERED ) == true) { |
203 | setPixmap( 0, Resource::loadPixmap( "opiemail/kmmsgreplied") ); | ||
204 | } else if ( mail_data.getFlags().testBit( FLAG_SEEN ) == true ) { | ||
203 | setPixmap( 0, Resource::loadPixmap( "opiemail/kmmsgunseen") ); | 205 | setPixmap( 0, Resource::loadPixmap( "opiemail/kmmsgunseen") ); |
diff --git a/noncore/net/mail/viewmail.cpp b/noncore/net/mail/viewmail.cpp index 68d3c51..48b71eb 100644 --- a/noncore/net/mail/viewmail.cpp +++ b/noncore/net/mail/viewmail.cpp | |||
@@ -15,3 +15,4 @@ | |||
15 | 15 | ||
16 | AttachItem::AttachItem(QListView * parent,QListViewItem *after, const QString&mime,const QString&file,const QString&desc,int num) | 16 | AttachItem::AttachItem(QListView * parent,QListViewItem *after, const QString&mime,const QString&desc,const QString&file, |
17 | const QString&fsize,int num) | ||
17 | : QListViewItem(parent,after),_partNum(num) | 18 | : QListViewItem(parent,after),_partNum(num) |
@@ -19,4 +20,5 @@ AttachItem::AttachItem(QListView * parent,QListViewItem *after, const QString&mi | |||
19 | setText(0, mime); | 20 | setText(0, mime); |
20 | setText(1, file); | 21 | setText(1, desc); |
21 | setText(2, desc); | 22 | setText(2, file); |
23 | setText(3, fsize); | ||
22 | } | 24 | } |
@@ -34,3 +36,3 @@ AttachItem * curItem=0; | |||
34 | QString type=body.Description().Type()+"/"+body.Description().Subtype(); | 36 | QString type=body.Description().Type()+"/"+body.Description().Subtype(); |
35 | QString desc; | 37 | QString desc,fsize; |
36 | double s = body.Description().Size(); | 38 | double s = body.Description().Size(); |
@@ -63,3 +65,3 @@ default: | |||
63 | */ | 65 | */ |
64 | QTextOStream o(&desc); | 66 | QTextOStream o(&fsize); |
65 | if (w>0) o.precision(2); else o.precision(0); | 67 | if (w>0) o.precision(2); else o.precision(0); |
@@ -69,3 +71,3 @@ default: | |||
69 | 71 | ||
70 | curItem=new AttachItem(attachments,curItem,type,"Mailbody",desc,-1); | 72 | curItem=new AttachItem(attachments,curItem,type,"Mailbody","",fsize,-1); |
71 | QString filename = ""; | 73 | QString filename = ""; |
@@ -75,2 +77,3 @@ for (unsigned int i = 0; i < body.Parts().count();++i) { | |||
75 | for (;it!=body.Parts()[i].Parameters().end();++it) { | 77 | for (;it!=body.Parts()[i].Parameters().end();++it) { |
78 | qDebug(it.key()); | ||
76 | if (it.key().lower()=="name") { | 79 | if (it.key().lower()=="name") { |
@@ -97,3 +100,3 @@ for (unsigned int i = 0; i < body.Parts().count();++i) { | |||
97 | } | 100 | } |
98 | QTextOStream o(&desc); | 101 | QTextOStream o(&fsize); |
99 | if (w>0) o.precision(2); else o.precision(0); | 102 | if (w>0) o.precision(2); else o.precision(0); |
@@ -101,3 +104,4 @@ for (unsigned int i = 0; i < body.Parts().count();++i) { | |||
101 | o << s << " " << q << "Byte"; | 104 | o << s << " " << q << "Byte"; |
102 | curItem=new AttachItem(attachments,curItem,type,filename,desc,i); | 105 | desc = body.Parts()[i].Description(); |
106 | curItem=new AttachItem(attachments,curItem,type,desc,filename,fsize,i); | ||
103 | } | 107 | } |
@@ -105,3 +109,3 @@ for (unsigned int i = 0; i < body.Parts().count();++i) { | |||
105 | 109 | ||
106 | void ViewMail::slotItemClicked( QListViewItem * item , const QPoint & point, int c ) { | 110 | void ViewMail::slotItemClicked( QListViewItem * item , const QPoint & point, int ) { |
107 | if (!item ) | 111 | if (!item ) |
@@ -109,2 +113,6 @@ void ViewMail::slotItemClicked( QListViewItem * item , const QPoint & point, int | |||
109 | 113 | ||
114 | if ( ( ( AttachItem* )item )->Partnumber() == -1 ) { | ||
115 | setText(); | ||
116 | return; | ||
117 | } | ||
110 | QPopupMenu *menu = new QPopupMenu(); | 118 | QPopupMenu *menu = new QPopupMenu(); |
@@ -112,3 +120,3 @@ void ViewMail::slotItemClicked( QListViewItem * item , const QPoint & point, int | |||
112 | 120 | ||
113 | if ( item->text( 0 ).left( 4 ) == "text" ) { | 121 | if ( item->text( 0 ).left( 5 ) == "text/" ) { |
114 | menu->insertItem( tr( "Show Text" ), 1 ); | 122 | menu->insertItem( tr( "Show Text" ), 1 ); |
@@ -125,3 +133,3 @@ void ViewMail::slotItemClicked( QListViewItem * item , const QPoint & point, int | |||
125 | QString str = OFileDialog::getSaveFileName( 1, | 133 | QString str = OFileDialog::getSaveFileName( 1, |
126 | "/", item->text( 1 ) , types, 0 ); | 134 | "/", item->text( 2 ) , types, 0 ); |
127 | 135 | ||
diff --git a/noncore/net/mail/viewmail.h b/noncore/net/mail/viewmail.h index 765464c..dd7f854 100644 --- a/noncore/net/mail/viewmail.h +++ b/noncore/net/mail/viewmail.h | |||
@@ -13,3 +13,4 @@ class AttachItem : public QListViewItem | |||
13 | public: | 13 | public: |
14 | AttachItem(QListView * parent,QListViewItem *after, const QString&mime,const QString&file,const QString&desc,int num); | 14 | AttachItem(QListView * parent,QListViewItem *after, const QString&mime,const QString&desc,const QString&file, |
15 | const QString&fsize,int num); | ||
15 | int Partnumber() { return _partNum; } | 16 | int Partnumber() { return _partNum; } |
diff --git a/noncore/net/mail/viewmailbase.cpp b/noncore/net/mail/viewmailbase.cpp index 38f92b4..0c7f671 100644 --- a/noncore/net/mail/viewmailbase.cpp +++ b/noncore/net/mail/viewmailbase.cpp | |||
@@ -57,3 +57,4 @@ ViewMailBase::ViewMailBase(QWidget *parent, const char *name, WFlags fl) | |||
57 | attachments->addColumn("Mime Type", 60); | 57 | attachments->addColumn("Mime Type", 60); |
58 | attachments->addColumn(tr("Filename"), 100); | 58 | attachments->addColumn(tr("Description"), 100); |
59 | attachments->addColumn(tr("Filename"), 80); | ||
59 | attachments->addColumn(tr("Size"), 80); | 60 | attachments->addColumn(tr("Size"), 80); |