-rw-r--r-- | noncore/net/mail/mainwindow.cpp | 6 | ||||
-rw-r--r-- | noncore/net/mail/viewmail.cpp | 56 | ||||
-rw-r--r-- | noncore/net/mail/viewmail.h | 2 |
3 files changed, 59 insertions, 5 deletions
diff --git a/noncore/net/mail/mainwindow.cpp b/noncore/net/mail/mainwindow.cpp index f0a915d..560715c 100644 --- a/noncore/net/mail/mainwindow.cpp +++ b/noncore/net/mail/mainwindow.cpp @@ -156,38 +156,40 @@ void MainWindow::displayMail(QListViewItem*item) if (!item) return; RecMail mail = ((MailListViewItem*)item)->data(); RecBody body = folderView->fetchBody(mail); ViewMail readMail( this ); readMail.setBody( body ); readMail.setMail( mail ); readMail.showMaximized(); readMail.exec(); ( (MailListViewItem*)item )->setPixmap( 0, Resource::loadPixmap( "opiemail/kmmsgunseen") ); } -MailListViewItem::MailListViewItem(QListView * parent, MailListViewItem * after ) - :QListViewItem(parent,after),mail_data() +MailListViewItem::MailListViewItem(QListView * parent, MailListViewItem * item ) + :QListViewItem(parent,item),mail_data() { } void MailListViewItem::showEntry() { if ( mail_data.getFlags().testBit( FLAG_SEEN ) == true ) { setPixmap( 0, Resource::loadPixmap( "opiemail/kmmsgunseen") ); } else { setPixmap( 0, Resource::loadPixmap( "opiemail/kmmsgnew") ); } setText(1,mail_data.getSubject()); setText(2,mail_data.getFrom()); setText(3,mail_data.getDate()); } void MailListViewItem::storeData(const RecMail&data) { mail_data = data; } const RecMail& MailListViewItem::data()const { return mail_data; } + + diff --git a/noncore/net/mail/viewmail.cpp b/noncore/net/mail/viewmail.cpp index 39c9820..c24d5d3 100644 --- a/noncore/net/mail/viewmail.cpp +++ b/noncore/net/mail/viewmail.cpp @@ -1,33 +1,36 @@ #include <qtextbrowser.h> #include <qmessagebox.h> #include <qtextstream.h> #include <qaction.h> +#include <qpopupmenu.h> #include <qapplication.h> +#include <opie/ofiledialog.h> + #include "settings.h" #include "composemail.h" #include "viewmail.h" AttachItem::AttachItem(QListView * parent,QListViewItem *after, const QString&mime,const QString&file,const QString&desc,int num) : QListViewItem(parent,after),_partNum(num) { setText(0, mime); setText(1, file); setText(2, desc); } - void ViewMail::setBody( RecBody body ) { +m_body = body; m_mail[2] = body.Bodytext(); attachbutton->setEnabled(body.Parts().count()>0); attachments->setEnabled(body.Parts().count()>0); if (body.Parts().count()==0) { return; } AttachItem * curItem=0; QString type=body.Description().Type()+"/"+body.Description().Subtype(); QString desc; double s = body.Description().Size(); int w; w=0; @@ -43,25 +46,25 @@ switch(w) { case 1: q="k"; break; case 2: q="M"; break; default: break; } { /* I did not found a method to make a CONTENT reset on a QTextStream - so I use this construct that the stream will re-constructed in each + so I use this construct that the stream will re-constructed in each loop. To let it work, the textstream is packed into a own area of code is it will be destructed after finishing its small job. */ QTextOStream o(&desc); if (w>0) o.precision(2); else o.precision(0); o.setf(QTextStream::fixed); o << s << " " << q << "Byte"; } curItem=new AttachItem(attachments,curItem,type,"Mailbody",desc,-1); QString filename = ""; for (unsigned int i = 0; i < body.Parts().count();++i) { @@ -89,24 +92,66 @@ for (unsigned int i = 0; i < body.Parts().count();++i) { default: q=""; break; } QTextOStream o(&desc); if (w>0) o.precision(2); else o.precision(0); o.setf(QTextStream::fixed); o << s << " " << q << "Byte"; curItem=new AttachItem(attachments,curItem,type,filename,desc,i); } } +void ViewMail::slotItemClicked( QListViewItem * item , const QPoint & point, int c ) { + if (!item ) + return; + + QPopupMenu *menu = new QPopupMenu(); + int ret=0; + + if ( item->text( 0 ).left( 4 ) == "text" ) { + menu->insertItem( tr( "Show Text" ), 1 ); + } + menu->insertItem( tr( "Save Attachemt" ), 0 ); + menu->insertSeparator(1); + + ret = menu->exec( point, 0 ); + + switch(ret) { + case 0: + { MimeTypes types; + types.insert( "all", "*" ); + QString str = OFileDialog::getSaveFileName( 1, + "/", item->text( 1 ) , types, 0 ); + + if( !str.isEmpty() ) { + qDebug( " first we will need a MIME wrapper" ); + } + } + break ; + + case 1: + + qDebug( QString( "Test selected" ).arg( ( ( AttachItem* )item )->Partnumber() ) ); + if ( ( ( AttachItem* )item )->Partnumber() == -1 ) { + setText(); + } else { + browser->setText( ( m_body.Parts()[( ( AttachItem* )item )->Partnumber() ] ).Identifier() ); + } + break; + } + delete menu; +} + + void ViewMail::setMail( RecMail mail ) { m_mail[0] = mail.getFrom(); m_mail[1] = mail.getSubject(); m_mail[3] = mail.getDate(); m_mail[4] = mail.Msgid(); m_mail2[0] = mail.To(); m_mail2[1] = mail.CC(); m_mail2[2] = mail.Bcc(); setText(); @@ -114,24 +159,26 @@ setText(); ViewMail::ViewMail( QWidget *parent, const char *name, WFlags fl) : ViewMailBase(parent, name, fl), _inLoop(false) { m_gotBody = false; connect(reply, SIGNAL(activated()), SLOT(slotReply())); connect(forward, SIGNAL(activated()), SLOT(slotForward())); attachments->setEnabled(m_gotBody); + connect( attachments, SIGNAL( clicked ( QListViewItem *, const QPoint & , int ) ), SLOT( slotItemClicked( QListViewItem *, const QPoint & , int ) ) ); + } void ViewMail::setText() { QString toString; QString ccString; QString bccString; for ( QStringList::Iterator it = ( m_mail2[0] ).begin(); it != ( m_mail2[0] ).end(); ++it ) { toString += (*it); } @@ -163,35 +210,38 @@ void ViewMail::setText() ViewMail::~ViewMail() { hide(); } void ViewMail::hide() { QWidget::hide(); if (_inLoop) { _inLoop = false; qApp->exit_loop(); - } + + } + } void ViewMail::exec() { show(); if (!_inLoop) { _inLoop = true; qApp->enter_loop(); } + } QString ViewMail::deHtml(const QString &string) { QString string_ = string; string_.replace(QRegExp("&"), "&"); string_.replace(QRegExp("<"), "<"); string_.replace(QRegExp(">"), ">"); string_.replace(QRegExp("\\n"), "<br>"); return string_; } diff --git a/noncore/net/mail/viewmail.h b/noncore/net/mail/viewmail.h index b497434..0e85839 100644 --- a/noncore/net/mail/viewmail.h +++ b/noncore/net/mail/viewmail.h @@ -29,26 +29,28 @@ public: void hide(); void exec(); void setMail( RecMail mail ); void setBody( RecBody body ); protected: QString deHtml(const QString &string); protected slots: void slotReply(); void slotForward(); void setText(); + void slotItemClicked( QListViewItem * item , const QPoint & point, int c ); private: bool _inLoop; QString m_mailHtml; bool m_gotBody; + RecBody m_body; // 0 from 1 subject 2 bodytext 3 date QMap <int,QString> m_mail; // 0 to 1 cc 2 bcc QMap <int,QStringList> m_mail2; }; #endif |