summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/net/mail/viewmail.cpp40
-rw-r--r--noncore/net/mail/viewmail.h9
-rw-r--r--noncore/net/mail/viewmailbase.cpp18
-rw-r--r--noncore/net/mail/viewmailbase.h2
4 files changed, 57 insertions, 12 deletions
diff --git a/noncore/net/mail/viewmail.cpp b/noncore/net/mail/viewmail.cpp
index d2f1584..a64a168 100644
--- a/noncore/net/mail/viewmail.cpp
+++ b/noncore/net/mail/viewmail.cpp
@@ -250,18 +250,31 @@ void ViewMail::slotItemClicked( QListViewItem * item , const QPoint & point, int
250 250
251 case 2: 251 case 2:
252 { 252 {
253 QString tmpfile = "/tmp/opiemail-image"; 253 QString tmpfile = QString("/tmp/opiemail-image-%1").arg(_icounter++);
254 encodedString*content = m_recMail->Wrapper()->fetchDecodedPart( m_recMail, m_body->Parts()[ ( ( AttachItem* )item )->Partnumber() ] ); 254 encodedString*content = m_recMail->Wrapper()->fetchDecodedPart( m_recMail, m_body->Parts()[ ( ( AttachItem* )item )->Partnumber() ] );
255 if (content) { 255 if (content && content->Length()) {
256 QFile output(tmpfile); 256 QFile output(tmpfile);
257 output.open(IO_WriteOnly); 257 output.open(IO_WriteOnly);
258 output.writeBlock(content->Content(),content->Length()); 258 output.writeBlock(content->Content(),content->Length());
259 output.close(); 259 output.close();
260 delete content; 260 delete content;
261 if (!m_PicsInline) {
261 MailImageDlg iview(""); 262 MailImageDlg iview("");
262 iview.setName(tmpfile); 263 iview.setName(tmpfile);
263 QPEApplication::execDialog(&iview); 264 QPEApplication::execDialog(&iview);
265 } else {
266 if (!m_lastdlg) {
267 m_lastdlg=new Opie::MM::OImageScrollView("",browser->parentWidget(),false);
268 m_lastdlg->setAutoScale(true);
269 }
270 //m_lastdlg->setImage("");
271 m_lastdlg->setImage(tmpfile);
272 browser->hide();
273 m_lastdlg->show();
274 }
264 output.remove(); 275 output.remove();
276 } else {
277 QMessageBox::critical(this, tr("Reading attachment"), tr("Could not read content of attachment"));
265 } 278 }
266 } 279 }
267 break; 280 break;
@@ -313,19 +326,38 @@ ViewMail::ViewMail( QWidget *parent, const char *name, WFlags fl)
313 connect( forward, SIGNAL(activated()), SLOT(slotForward())); 326 connect( forward, SIGNAL(activated()), SLOT(slotForward()));
314 connect( deleteMail, SIGNAL( activated() ), SLOT( slotDeleteMail() ) ); 327 connect( deleteMail, SIGNAL( activated() ), SLOT( slotDeleteMail() ) );
315 connect( showHtml, SIGNAL( toggled(bool) ), SLOT( slotShowHtml(bool) ) ); 328 connect( showHtml, SIGNAL( toggled(bool) ), SLOT( slotShowHtml(bool) ) );
329 connect( showPicsInline, SIGNAL( toggled(bool) ), SLOT( slotImageInline(bool) ) );
316 330
317 attachments->setEnabled(m_gotBody); 331 attachments->setEnabled(m_gotBody);
318 connect( attachments, SIGNAL( clicked(QListViewItem*,const QPoint&, int) ), SLOT( slotItemClicked(QListViewItem*,const QPoint&, int) ) ); 332 connect( attachments, SIGNAL( clicked(QListViewItem*,const QPoint&, int) ), SLOT( slotItemClicked(QListViewItem*,const QPoint&, int) ) );
333 m_lastdlg = 0;
334 _icounter = 0;
319 335
320 readConfig(); 336 readConfig();
321 attachments->setSorting(-1); 337 attachments->setSorting(-1);
322} 338}
323 339
340void ViewMail::slotImageInline(bool how)
341{
342 Config cfg( "mail" );
343 cfg.writeEntry( "showPicsInline", how);
344 m_PicsInline = how;
345 if (m_lastdlg&&!how) {
346 browser->show();
347 m_lastdlg->hide();
348 m_lastdlg->reparent(0,QPoint(0,0),false);
349 delete m_lastdlg;
350 m_lastdlg = 0;
351 }
352}
353
324void ViewMail::readConfig() 354void ViewMail::readConfig()
325{ 355{
326 Config cfg( "mail" ); 356 Config cfg( "mail" );
327 cfg.setGroup( "Settings" ); 357 cfg.setGroup( "Settings" );
328 m_showHtml = cfg.readBoolEntry( "showHtml", false ); 358 m_showHtml = cfg.readBoolEntry( "showHtml", false );
359 m_PicsInline = cfg.readBoolEntry( "showPicsInline", true );
360 showPicsInline->setOn(m_PicsInline);
329 showHtml->setOn( m_showHtml ); 361 showHtml->setOn( m_showHtml );
330} 362}
331 363
@@ -336,6 +368,10 @@ void ViewMail::setText()
336 QString bccString; 368 QString bccString;
337 QString mailHtml; 369 QString mailHtml;
338 370
371 if (m_lastdlg) {
372 m_lastdlg->hide();
373 }
374 browser->show();
339 for ( QStringList::Iterator it = ( m_mail2[0] ).begin(); it != ( m_mail2[0] ).end(); ++it ) 375 for ( QStringList::Iterator it = ( m_mail2[0] ).begin(); it != ( m_mail2[0] ).end(); ++it )
340 { 376 {
341 toString += (*it); 377 toString += (*it);
diff --git a/noncore/net/mail/viewmail.h b/noncore/net/mail/viewmail.h
index 297836b..f5033f0 100644
--- a/noncore/net/mail/viewmail.h
+++ b/noncore/net/mail/viewmail.h
@@ -11,6 +11,8 @@
11#include <qstringlist.h> 11#include <qstringlist.h>
12#include <qvaluelist.h> 12#include <qvaluelist.h>
13 13
14class MailImageDlg;
15
14namespace Opie { namespace MM { class OImageScrollView; } } 16namespace Opie { namespace MM { class OImageScrollView; } }
15 17
16class AttachItem : public QListViewItem 18class AttachItem : public QListViewItem
@@ -48,6 +50,8 @@ protected:
48 AttachItem* searchParent(const QValueList<int>&path); 50 AttachItem* searchParent(const QValueList<int>&path);
49 AttachItem* lastChild(AttachItem*parent); 51 AttachItem* lastChild(AttachItem*parent);
50 52
53 Opie::MM::OImageScrollView*m_lastdlg;
54
51protected slots: 55protected slots:
52 void slotReply(); 56 void slotReply();
53 void slotForward(); 57 void slotForward();
@@ -55,6 +59,7 @@ protected slots:
55 void slotItemClicked( QListViewItem * item , const QPoint & point, int c ); 59 void slotItemClicked( QListViewItem * item , const QPoint & point, int c );
56 void slotDeleteMail( ); 60 void slotDeleteMail( );
57 void slotShowHtml( bool ); 61 void slotShowHtml( bool );
62 void slotImageInline(bool);
58 63
59private: 64private:
60 void readConfig(); 65 void readConfig();
@@ -64,7 +69,9 @@ private:
64 bool m_gotBody; 69 bool m_gotBody;
65 RecBodyP m_body; 70 RecBodyP m_body;
66 RecMailP m_recMail; 71 RecMailP m_recMail;
67 bool m_showHtml; 72 bool m_showHtml:1;
73 bool m_PicsInline:1;
74 unsigned int _icounter;
68 75
69 // 0 from 1 subject 2 bodytext 3 date 76 // 0 from 1 subject 2 bodytext 3 date
70 QMap <int,QString> m_mail; 77 QMap <int,QString> m_mail;
diff --git a/noncore/net/mail/viewmailbase.cpp b/noncore/net/mail/viewmailbase.cpp
index 49a0e6a..65ad0d6 100644
--- a/noncore/net/mail/viewmailbase.cpp
+++ b/noncore/net/mail/viewmailbase.cpp
@@ -5,6 +5,7 @@
5#include <qvbox.h> 5#include <qvbox.h>
6 6
7#include <qtoolbar.h> 7#include <qtoolbar.h>
8#include <qlayout.h>
8#include <qmenubar.h> 9#include <qmenubar.h>
9#include <qpe/resource.h> 10#include <qpe/resource.h>
10 11
@@ -21,10 +22,8 @@ ViewMailBase::ViewMailBase(QWidget *parent, const char *name, WFlags fl)
21 menubar = new QMenuBar( toolbar ); 22 menubar = new QMenuBar( toolbar );
22 mailmenu = new QPopupMenu( menubar ); 23 mailmenu = new QPopupMenu( menubar );
23 menubar->insertItem( tr( "Mail" ), mailmenu ); 24 menubar->insertItem( tr( "Mail" ), mailmenu );
24
25 toolbar->setHorizontalStretchable(true); 25 toolbar->setHorizontalStretchable(true);
26 addToolBar(toolbar); 26 addToolBar(toolbar);
27
28 QLabel *spacer = new QLabel(toolbar); 27 QLabel *spacer = new QLabel(toolbar);
29 spacer->setBackgroundMode(QWidget::PaletteButton); 28 spacer->setBackgroundMode(QWidget::PaletteButton);
30 toolbar->setStretchableWidget(spacer); 29 toolbar->setStretchableWidget(spacer);
@@ -47,11 +46,18 @@ ViewMailBase::ViewMailBase(QWidget *parent, const char *name, WFlags fl)
47 showHtml->addTo( toolbar ); 46 showHtml->addTo( toolbar );
48 showHtml->addTo( mailmenu ); 47 showHtml->addTo( mailmenu );
49 48
49 showPicsInline= new QAction(tr("Show image preview inline"), QIconSet(Resource::loadPixmap("pixmap")), 0, 0, this);
50 showPicsInline->setToggleAction(true);
51 showPicsInline->addTo(toolbar);
52 showPicsInline->addTo(mailmenu);
53
50 deleteMail = new QAction(tr("Delete Mail"), QIconSet(Resource::loadPixmap("trash")), 0, 0, this); 54 deleteMail = new QAction(tr("Delete Mail"), QIconSet(Resource::loadPixmap("trash")), 0, 0, this);
51 deleteMail->addTo(toolbar); 55 deleteMail->addTo(toolbar);
52 deleteMail->addTo(mailmenu); 56 deleteMail->addTo(mailmenu);
53 57
54 QVBox *view = new QVBox(this); 58 QVBox *view = new QVBox(this);
59 view->setSpacing(1);
60 view->setMargin(0);
55 setCentralWidget(view); 61 setCentralWidget(view);
56 62
57 attachments = new QListView(view); 63 attachments = new QListView(view);
@@ -63,14 +69,10 @@ ViewMailBase::ViewMailBase(QWidget *parent, const char *name, WFlags fl)
63 attachments->addColumn(tr("Filename"), 80); 69 attachments->addColumn(tr("Filename"), 80);
64 attachments->addColumn(tr("Size"), 80); 70 attachments->addColumn(tr("Size"), 80);
65 attachments->setSorting(-1); 71 attachments->setSorting(-1);
66 attachments->hide();
67 72
68 //header = new QTextBrowser(view);
69 browser = new QTextBrowser(view); 73 browser = new QTextBrowser(view);
70 74 adjustSize();
71// openDiag = new OpenDiag(view); 75 attachments->hide();
72// openDiag->hide();
73
74} 76}
75 77
76void ViewMailBase::slotChangeAttachview(bool state) 78void ViewMailBase::slotChangeAttachview(bool state)
diff --git a/noncore/net/mail/viewmailbase.h b/noncore/net/mail/viewmailbase.h
index 583b1f6..59179a4 100644
--- a/noncore/net/mail/viewmailbase.h
+++ b/noncore/net/mail/viewmailbase.h
@@ -19,7 +19,7 @@ public:
19 ViewMailBase(QWidget *parent = 0, const char *name = 0, WFlags fl = 0); 19 ViewMailBase(QWidget *parent = 0, const char *name = 0, WFlags fl = 0);
20 20
21protected: 21protected:
22 QAction *reply, *forward, *attachbutton, *deleteMail, *showHtml; 22 QAction *reply, *forward, *attachbutton, *deleteMail, *showHtml,*showPicsInline;
23 QListView *attachments; 23 QListView *attachments;
24 QToolBar *toolbar; 24 QToolBar *toolbar;
25 QTextBrowser *browser;//,*header; 25 QTextBrowser *browser;//,*header;