From 7e44f77d3749db2f43a1313d835a06684ecc1cd6 Mon Sep 17 00:00:00 2001 From: alwin Date: Sun, 06 Mar 2005 00:09:33 +0000 Subject: attached images may views inside the mailview and not as extra dialog --- (limited to 'noncore/net') 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 case 2: { - QString tmpfile = "/tmp/opiemail-image"; + QString tmpfile = QString("/tmp/opiemail-image-%1").arg(_icounter++); encodedString*content = m_recMail->Wrapper()->fetchDecodedPart( m_recMail, m_body->Parts()[ ( ( AttachItem* )item )->Partnumber() ] ); - if (content) { + if (content && content->Length()) { QFile output(tmpfile); output.open(IO_WriteOnly); output.writeBlock(content->Content(),content->Length()); output.close(); delete content; - MailImageDlg iview(""); - iview.setName(tmpfile); - QPEApplication::execDialog(&iview); + if (!m_PicsInline) { + MailImageDlg iview(""); + iview.setName(tmpfile); + QPEApplication::execDialog(&iview); + } else { + if (!m_lastdlg) { + m_lastdlg=new Opie::MM::OImageScrollView("",browser->parentWidget(),false); + m_lastdlg->setAutoScale(true); + } + //m_lastdlg->setImage(""); + m_lastdlg->setImage(tmpfile); + browser->hide(); + m_lastdlg->show(); + } output.remove(); + } else { + QMessageBox::critical(this, tr("Reading attachment"), tr("Could not read content of attachment")); } } break; @@ -313,19 +326,38 @@ ViewMail::ViewMail( QWidget *parent, const char *name, WFlags fl) connect( forward, SIGNAL(activated()), SLOT(slotForward())); connect( deleteMail, SIGNAL( activated() ), SLOT( slotDeleteMail() ) ); connect( showHtml, SIGNAL( toggled(bool) ), SLOT( slotShowHtml(bool) ) ); + connect( showPicsInline, SIGNAL( toggled(bool) ), SLOT( slotImageInline(bool) ) ); attachments->setEnabled(m_gotBody); connect( attachments, SIGNAL( clicked(QListViewItem*,const QPoint&, int) ), SLOT( slotItemClicked(QListViewItem*,const QPoint&, int) ) ); + m_lastdlg = 0; + _icounter = 0; readConfig(); attachments->setSorting(-1); } +void ViewMail::slotImageInline(bool how) +{ + Config cfg( "mail" ); + cfg.writeEntry( "showPicsInline", how); + m_PicsInline = how; + if (m_lastdlg&&!how) { + browser->show(); + m_lastdlg->hide(); + m_lastdlg->reparent(0,QPoint(0,0),false); + delete m_lastdlg; + m_lastdlg = 0; + } +} + void ViewMail::readConfig() { Config cfg( "mail" ); cfg.setGroup( "Settings" ); m_showHtml = cfg.readBoolEntry( "showHtml", false ); + m_PicsInline = cfg.readBoolEntry( "showPicsInline", true ); + showPicsInline->setOn(m_PicsInline); showHtml->setOn( m_showHtml ); } @@ -336,6 +368,10 @@ void ViewMail::setText() QString bccString; QString mailHtml; + if (m_lastdlg) { + m_lastdlg->hide(); + } + browser->show(); for ( QStringList::Iterator it = ( m_mail2[0] ).begin(); it != ( m_mail2[0] ).end(); ++it ) { 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 @@ #include #include +class MailImageDlg; + namespace Opie { namespace MM { class OImageScrollView; } } class AttachItem : public QListViewItem @@ -48,6 +50,8 @@ protected: AttachItem* searchParent(const QValueList&path); AttachItem* lastChild(AttachItem*parent); + Opie::MM::OImageScrollView*m_lastdlg; + protected slots: void slotReply(); void slotForward(); @@ -55,6 +59,7 @@ protected slots: void slotItemClicked( QListViewItem * item , const QPoint & point, int c ); void slotDeleteMail( ); void slotShowHtml( bool ); + void slotImageInline(bool); private: void readConfig(); @@ -64,7 +69,9 @@ private: bool m_gotBody; RecBodyP m_body; RecMailP m_recMail; - bool m_showHtml; + bool m_showHtml:1; + bool m_PicsInline:1; + unsigned int _icounter; // 0 from 1 subject 2 bodytext 3 date QMap 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 @@ #include #include +#include #include #include @@ -21,10 +22,8 @@ ViewMailBase::ViewMailBase(QWidget *parent, const char *name, WFlags fl) menubar = new QMenuBar( toolbar ); mailmenu = new QPopupMenu( menubar ); menubar->insertItem( tr( "Mail" ), mailmenu ); - toolbar->setHorizontalStretchable(true); addToolBar(toolbar); - QLabel *spacer = new QLabel(toolbar); spacer->setBackgroundMode(QWidget::PaletteButton); toolbar->setStretchableWidget(spacer); @@ -43,15 +42,22 @@ ViewMailBase::ViewMailBase(QWidget *parent, const char *name, WFlags fl) connect(attachbutton, SIGNAL(toggled(bool)), SLOT(slotChangeAttachview(bool))); - showHtml = new QAction( tr( "Show Html" ), QIconSet( Resource::loadPixmap( "mail/html" ) ), 0, 0, this, 0, true ); - showHtml->addTo( toolbar ); - showHtml->addTo( mailmenu ); + showHtml = new QAction( tr( "Show Html" ), QIconSet( Resource::loadPixmap( "mail/html" ) ), 0, 0, this, 0, true ); + showHtml->addTo( toolbar ); + showHtml->addTo( mailmenu ); + + showPicsInline= new QAction(tr("Show image preview inline"), QIconSet(Resource::loadPixmap("pixmap")), 0, 0, this); + showPicsInline->setToggleAction(true); + showPicsInline->addTo(toolbar); + showPicsInline->addTo(mailmenu); deleteMail = new QAction(tr("Delete Mail"), QIconSet(Resource::loadPixmap("trash")), 0, 0, this); deleteMail->addTo(toolbar); deleteMail->addTo(mailmenu); - QVBox *view = new QVBox(this); + QVBox * view = new QVBox(this); + view->setSpacing(1); + view->setMargin(0); setCentralWidget(view); attachments = new QListView(view); @@ -63,14 +69,10 @@ ViewMailBase::ViewMailBase(QWidget *parent, const char *name, WFlags fl) attachments->addColumn(tr("Filename"), 80); attachments->addColumn(tr("Size"), 80); attachments->setSorting(-1); - attachments->hide(); - //header = new QTextBrowser(view); browser = new QTextBrowser(view); - -// openDiag = new OpenDiag(view); -// openDiag->hide(); - + adjustSize(); + attachments->hide(); } void 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: ViewMailBase(QWidget *parent = 0, const char *name = 0, WFlags fl = 0); protected: - QAction *reply, *forward, *attachbutton, *deleteMail, *showHtml; + QAction *reply, *forward, *attachbutton, *deleteMail, *showHtml,*showPicsInline; QListView *attachments; QToolBar *toolbar; QTextBrowser *browser;//,*header; -- cgit v0.9.0.2