summaryrefslogtreecommitdiff
authorharlekin <harlekin>2003-12-13 13:45:40 (UTC)
committer harlekin <harlekin>2003-12-13 13:45:40 (UTC)
commite1dc235a829398482dddc66b931d6eec840382ec (patch) (unidiff)
treeb4a93390a382eb9ce2f9c9a3703e4f03c3e475e0
parent865b023c57f657c8eff26baa670fc76bbcd548e4 (diff)
downloadopie-e1dc235a829398482dddc66b931d6eec840382ec.zip
opie-e1dc235a829398482dddc66b931d6eec840382ec.tar.gz
opie-e1dc235a829398482dddc66b931d6eec840382ec.tar.bz2
beginning of attachment handling ( user side )
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/mail/mainwindow.cpp6
-rw-r--r--noncore/net/mail/viewmail.cpp56
-rw-r--r--noncore/net/mail/viewmail.h2
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
@@ -165,8 +165,8 @@ void MainWindow::displayMail(QListViewItem*item)
165 ( (MailListViewItem*)item )->setPixmap( 0, Resource::loadPixmap( "opiemail/kmmsgunseen") ); 165 ( (MailListViewItem*)item )->setPixmap( 0, Resource::loadPixmap( "opiemail/kmmsgunseen") );
166} 166}
167 167
168MailListViewItem::MailListViewItem(QListView * parent, MailListViewItem * after ) 168MailListViewItem::MailListViewItem(QListView * parent, MailListViewItem * item )
169 :QListViewItem(parent,after),mail_data() 169 :QListViewItem(parent,item),mail_data()
170{ 170{
171} 171}
172 172
@@ -191,3 +191,5 @@ const RecMail& MailListViewItem::data()const
191{ 191{
192 return mail_data; 192 return mail_data;
193} 193}
194
195
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
@@ -2,8 +2,11 @@
2#include <qmessagebox.h> 2#include <qmessagebox.h>
3#include <qtextstream.h> 3#include <qtextstream.h>
4#include <qaction.h> 4#include <qaction.h>
5#include <qpopupmenu.h>
5#include <qapplication.h> 6#include <qapplication.h>
6 7
8#include <opie/ofiledialog.h>
9
7#include "settings.h" 10#include "settings.h"
8#include "composemail.h" 11#include "composemail.h"
9#include "viewmail.h" 12#include "viewmail.h"
@@ -16,9 +19,9 @@ AttachItem::AttachItem(QListView * parent,QListViewItem *after, const QString&mi
16 setText(2, desc); 19 setText(2, desc);
17} 20}
18 21
19
20void ViewMail::setBody( RecBody body ) { 22void ViewMail::setBody( RecBody body ) {
21 23
24m_body = body;
22m_mail[2] = body.Bodytext(); 25m_mail[2] = body.Bodytext();
23attachbutton->setEnabled(body.Parts().count()>0); 26attachbutton->setEnabled(body.Parts().count()>0);
24attachments->setEnabled(body.Parts().count()>0); 27attachments->setEnabled(body.Parts().count()>0);
@@ -52,7 +55,7 @@ default:
52 55
53{ 56{
54 /* I did not found a method to make a CONTENT reset on a QTextStream 57 /* I did not found a method to make a CONTENT reset on a QTextStream
55 so I use this construct that the stream will re-constructed in each 58 so I use this construct that the stream will re-constructed in each
56 loop. To let it work, the textstream is packed into a own area of 59 loop. To let it work, the textstream is packed into a own area of
57 code is it will be destructed after finishing its small job. 60 code is it will be destructed after finishing its small job.
58 */ 61 */
@@ -98,6 +101,48 @@ for (unsigned int i = 0; i < body.Parts().count();++i) {
98} 101}
99} 102}
100 103
104void ViewMail::slotItemClicked( QListViewItem * item , const QPoint & point, int c ) {
105 if (!item )
106 return;
107
108 QPopupMenu *menu = new QPopupMenu();
109 int ret=0;
110
111 if ( item->text( 0 ).left( 4 ) == "text" ) {
112 menu->insertItem( tr( "Show Text" ), 1 );
113 }
114 menu->insertItem( tr( "Save Attachemt" ), 0 );
115 menu->insertSeparator(1);
116
117 ret = menu->exec( point, 0 );
118
119 switch(ret) {
120 case 0:
121 { MimeTypes types;
122 types.insert( "all", "*" );
123 QString str = OFileDialog::getSaveFileName( 1,
124 "/", item->text( 1 ) , types, 0 );
125
126 if( !str.isEmpty() ) {
127 qDebug( " first we will need a MIME wrapper" );
128 }
129 }
130 break ;
131
132 case 1:
133
134 qDebug( QString( "Test selected" ).arg( ( ( AttachItem* )item )->Partnumber() ) );
135 if ( ( ( AttachItem* )item )->Partnumber() == -1 ) {
136 setText();
137 } else {
138 browser->setText( ( m_body.Parts()[( ( AttachItem* )item )->Partnumber() ] ).Identifier() );
139 }
140 break;
141 }
142 delete menu;
143}
144
145
101void ViewMail::setMail( RecMail mail ) { 146void ViewMail::setMail( RecMail mail ) {
102 147
103m_mail[0] = mail.getFrom(); 148m_mail[0] = mail.getFrom();
@@ -123,6 +168,8 @@ ViewMail::ViewMail( QWidget *parent, const char *name, WFlags fl)
123 connect(forward, SIGNAL(activated()), SLOT(slotForward())); 168 connect(forward, SIGNAL(activated()), SLOT(slotForward()));
124 169
125 attachments->setEnabled(m_gotBody); 170 attachments->setEnabled(m_gotBody);
171 connect( attachments, SIGNAL( clicked ( QListViewItem *, const QPoint & , int ) ), SLOT( slotItemClicked( QListViewItem *, const QPoint & , int ) ) );
172
126} 173}
127 174
128void ViewMail::setText() 175void ViewMail::setText()
@@ -172,7 +219,9 @@ void ViewMail::hide()
172 if (_inLoop) { 219 if (_inLoop) {
173 _inLoop = false; 220 _inLoop = false;
174 qApp->exit_loop(); 221 qApp->exit_loop();
175 } 222
223 }
224
176} 225}
177 226
178void ViewMail::exec() 227void ViewMail::exec()
@@ -183,6 +232,7 @@ void ViewMail::exec()
183 _inLoop = true; 232 _inLoop = true;
184 qApp->enter_loop(); 233 qApp->enter_loop();
185 } 234 }
235
186} 236}
187 237
188QString ViewMail::deHtml(const QString &string) 238QString ViewMail::deHtml(const QString &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
@@ -38,11 +38,13 @@ protected slots:
38 void slotReply(); 38 void slotReply();
39 void slotForward(); 39 void slotForward();
40 void setText(); 40 void setText();
41 void slotItemClicked( QListViewItem * item , const QPoint & point, int c );
41 42
42private: 43private:
43 bool _inLoop; 44 bool _inLoop;
44 QString m_mailHtml; 45 QString m_mailHtml;
45 bool m_gotBody; 46 bool m_gotBody;
47 RecBody m_body;
46 48
47 // 0 from 1 subject 2 bodytext 3 date 49 // 0 from 1 subject 2 bodytext 3 date
48 QMap <int,QString> m_mail; 50 QMap <int,QString> m_mail;