summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/mail/imapwrapper.cpp5
-rw-r--r--noncore/net/mail/libmailwrapper/imapwrapper.cpp5
-rw-r--r--noncore/net/mail/libmailwrapper/mailtypes.cpp12
-rw-r--r--noncore/net/mail/libmailwrapper/mailtypes.h4
-rw-r--r--noncore/net/mail/mailtypes.cpp12
-rw-r--r--noncore/net/mail/mailtypes.h4
-rw-r--r--noncore/net/mail/mainwindow.cpp4
-rw-r--r--noncore/net/mail/viewmail.cpp32
-rw-r--r--noncore/net/mail/viewmail.h3
-rw-r--r--noncore/net/mail/viewmailbase.cpp5
10 files changed, 64 insertions, 22 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)
}
+ if (which->bd_description) {
+ target_part.setDescription(QString(which->bd_description));
+ }
target_part.setEncoding(encoding);
@@ -762,3 +765,3 @@ void IMAPwrapper::answeredMail(const RecMail&mail)
mailimap_flag_list_add(flist,mailimap_flag_new_answered());
- store_flags = mailimap_store_att_flags_new_set_flags(flist);
+ store_flags = mailimap_store_att_flags_new_add_flags(flist);
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)
}
+ if (which->bd_description) {
+ target_part.setDescription(QString(which->bd_description));
+ }
target_part.setEncoding(encoding);
@@ -762,3 +765,3 @@ void IMAPwrapper::answeredMail(const RecMail&mail)
mailimap_flag_list_add(flist,mailimap_flag_new_answered());
- store_flags = mailimap_store_att_flags_new_set_flags(flist);
+ store_flags = mailimap_store_att_flags_new_add_flags(flist);
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
RecPart::RecPart()
- : m_type(""),m_subtype(""),m_identifier(""),m_encoding(""),m_lines(0),m_size(0)
+ : m_type(""),m_subtype(""),m_identifier(""),m_encoding(""),m_description(""),m_lines(0),m_size(0)
{
@@ -157,2 +157,12 @@ void RecPart::setEncoding(const QString&encoding)
+const QString& RecPart::Description()const
+{
+ return m_description;
+}
+
+void RecPart::setDescription(const QString&desc)
+{
+ m_description = desc;
+}
+
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
protected:
- QString m_type,m_subtype,m_identifier,m_encoding;
+ QString m_type,m_subtype,m_identifier,m_encoding,m_description;
unsigned int m_lines,m_size;
@@ -100,2 +100,4 @@ public:
void setEncoding(const QString&encoding);
+ const QString&Description()const;
+ void setDescription(const QString&desc);
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
RecPart::RecPart()
- : m_type(""),m_subtype(""),m_identifier(""),m_encoding(""),m_lines(0),m_size(0)
+ : m_type(""),m_subtype(""),m_identifier(""),m_encoding(""),m_description(""),m_lines(0),m_size(0)
{
@@ -157,2 +157,12 @@ void RecPart::setEncoding(const QString&encoding)
+const QString& RecPart::Description()const
+{
+ return m_description;
+}
+
+void RecPart::setDescription(const QString&desc)
+{
+ m_description = desc;
+}
+
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
protected:
- QString m_type,m_subtype,m_identifier,m_encoding;
+ QString m_type,m_subtype,m_identifier,m_encoding,m_description;
unsigned int m_lines,m_size;
@@ -100,2 +100,4 @@ public:
void setEncoding(const QString&encoding);
+ const QString&Description()const;
+ void setDescription(const QString&desc);
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()
{
- if ( mail_data.getFlags().testBit( FLAG_SEEN ) == true ) {
+ if ( mail_data.getFlags().testBit( FLAG_ANSWERED ) == true) {
+ setPixmap( 0, Resource::loadPixmap( "opiemail/kmmsgreplied") );
+ } else if ( mail_data.getFlags().testBit( FLAG_SEEN ) == true ) {
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 @@
-AttachItem::AttachItem(QListView * parent,QListViewItem *after, const QString&mime,const QString&file,const QString&desc,int num)
+AttachItem::AttachItem(QListView * parent,QListViewItem *after, const QString&mime,const QString&desc,const QString&file,
+ const QString&fsize,int num)
: QListViewItem(parent,after),_partNum(num)
@@ -19,4 +20,5 @@ AttachItem::AttachItem(QListView * parent,QListViewItem *after, const QString&mi
setText(0, mime);
- setText(1, file);
- setText(2, desc);
+ setText(1, desc);
+ setText(2, file);
+ setText(3, fsize);
}
@@ -34,3 +36,3 @@ AttachItem * curItem=0;
QString type=body.Description().Type()+"/"+body.Description().Subtype();
-QString desc;
+QString desc,fsize;
double s = body.Description().Size();
@@ -63,3 +65,3 @@ default:
*/
- QTextOStream o(&desc);
+ QTextOStream o(&fsize);
if (w>0) o.precision(2); else o.precision(0);
@@ -69,3 +71,3 @@ default:
-curItem=new AttachItem(attachments,curItem,type,"Mailbody",desc,-1);
+curItem=new AttachItem(attachments,curItem,type,"Mailbody","",fsize,-1);
QString filename = "";
@@ -75,2 +77,3 @@ for (unsigned int i = 0; i < body.Parts().count();++i) {
for (;it!=body.Parts()[i].Parameters().end();++it) {
+ qDebug(it.key());
if (it.key().lower()=="name") {
@@ -97,3 +100,3 @@ for (unsigned int i = 0; i < body.Parts().count();++i) {
}
- QTextOStream o(&desc);
+ QTextOStream o(&fsize);
if (w>0) o.precision(2); else o.precision(0);
@@ -101,3 +104,4 @@ for (unsigned int i = 0; i < body.Parts().count();++i) {
o << s << " " << q << "Byte";
- curItem=new AttachItem(attachments,curItem,type,filename,desc,i);
+ desc = body.Parts()[i].Description();
+ curItem=new AttachItem(attachments,curItem,type,desc,filename,fsize,i);
}
@@ -105,3 +109,3 @@ for (unsigned int i = 0; i < body.Parts().count();++i) {
-void ViewMail::slotItemClicked( QListViewItem * item , const QPoint & point, int c ) {
+void ViewMail::slotItemClicked( QListViewItem * item , const QPoint & point, int ) {
if (!item )
@@ -109,6 +113,10 @@ void ViewMail::slotItemClicked( QListViewItem * item , const QPoint & point, int
- QPopupMenu *menu = new QPopupMenu();
+ if ( ( ( AttachItem* )item )->Partnumber() == -1 ) {
+ setText();
+ return;
+ }
+ QPopupMenu *menu = new QPopupMenu();
int ret=0;
- if ( item->text( 0 ).left( 4 ) == "text" ) {
+ if ( item->text( 0 ).left( 5 ) == "text/" ) {
menu->insertItem( tr( "Show Text" ), 1 );
@@ -125,3 +133,3 @@ void ViewMail::slotItemClicked( QListViewItem * item , const QPoint & point, int
QString str = OFileDialog::getSaveFileName( 1,
- "/", item->text( 1 ) , types, 0 );
+ "/", item->text( 2 ) , types, 0 );
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
public:
- AttachItem(QListView * parent,QListViewItem *after, const QString&mime,const QString&file,const QString&desc,int num);
+ AttachItem(QListView * parent,QListViewItem *after, const QString&mime,const QString&desc,const QString&file,
+ const QString&fsize,int num);
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,4 +57,5 @@ ViewMailBase::ViewMailBase(QWidget *parent, const char *name, WFlags fl)
attachments->addColumn("Mime Type", 60);
- attachments->addColumn(tr("Filename"), 100);
- attachments->addColumn(tr("Size"), 80);
+ attachments->addColumn(tr("Description"), 100);
+ attachments->addColumn(tr("Filename"), 80);
+ attachments->addColumn(tr("Size"), 80);
attachments->setSorting(-1);