4 files changed, 64 insertions, 19 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
@@ -252,5 +252,5 @@ void ViewMail::slotItemClicked( QListViewItem * item , const QPoint & point, int
         {
-            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);
@@ -260,6 +260,19 @@ void ViewMail::slotItemClicked( QListViewItem * item , const QPoint & point, int
                 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"));
             }
@@ -315,2 +328,3 @@ ViewMail::ViewMail( QWidget *parent, const char *name, WFlags fl)
     connect( showHtml, SIGNAL( toggled(bool) ), SLOT( slotShowHtml(bool) ) );
+    connect( showPicsInline, SIGNAL( toggled(bool) ), SLOT( slotImageInline(bool) ) );
 
@@ -318,2 +332,4 @@ ViewMail::ViewMail( QWidget *parent, const char *name, WFlags fl)
     connect( attachments,  SIGNAL( clicked(QListViewItem*,const QPoint&, int) ), SLOT( slotItemClicked(QListViewItem*,const QPoint&, int) ) );
+    m_lastdlg = 0;
+    _icounter = 0;
 
@@ -323,2 +339,16 @@ ViewMail::ViewMail( QWidget *parent, const char *name, WFlags fl)
 
+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()
@@ -328,2 +358,4 @@ void ViewMail::readConfig()
     m_showHtml =  cfg.readBoolEntry( "showHtml", false );
+    m_PicsInline = cfg.readBoolEntry( "showPicsInline", true );
+    showPicsInline->setOn(m_PicsInline);
     showHtml->setOn( m_showHtml );
@@ -338,2 +370,6 @@ void ViewMail::setText()
 
+    if (m_lastdlg) {
+        m_lastdlg->hide();
+    }
+    browser->show();
     for ( QStringList::Iterator it = ( m_mail2[0] ).begin(); it != ( m_mail2[0] ).end(); ++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
@@ -13,2 +13,4 @@
 
+class MailImageDlg;
+
 namespace Opie { namespace MM { class OImageScrollView; } }
@@ -50,2 +52,4 @@ protected:
 
+    Opie::MM::OImageScrollView*m_lastdlg;
+
 protected slots:
@@ -57,2 +61,3 @@ protected slots:
     void slotShowHtml( bool );
+    void slotImageInline(bool);
 
@@ -66,3 +71,5 @@ private:
     RecMailP m_recMail;
-    bool m_showHtml;
+    bool m_showHtml:1;
+    bool m_PicsInline:1;
+    unsigned int _icounter;
 
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
@@ -7,2 +7,3 @@
 #include <qtoolbar.h>
+#include <qlayout.h>
 #include <qmenubar.h>
@@ -23,6 +24,4 @@ ViewMailBase::ViewMailBase(QWidget *parent, const char *name, WFlags fl)
     menubar->insertItem( tr( "Mail" ), mailmenu );
-
     toolbar->setHorizontalStretchable(true);
     addToolBar(toolbar);
-
     QLabel *spacer = new QLabel(toolbar);
@@ -45,5 +44,10 @@ ViewMailBase::ViewMailBase(QWidget *parent, const char *name, WFlags fl)
 
-        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);
 
@@ -53,3 +57,5 @@ ViewMailBase::ViewMailBase(QWidget *parent, const char *name, WFlags fl)
 
-    QVBox *view = new QVBox(this);
+    QVBox * view = new QVBox(this);
+    view->setSpacing(1);
+    view->setMargin(0);
     setCentralWidget(view);
@@ -65,10 +71,6 @@ ViewMailBase::ViewMailBase(QWidget *parent, const char *name, WFlags fl)
     attachments->setSorting(-1);
-    attachments->hide();
 
-    //header = new QTextBrowser(view);
     browser = new QTextBrowser(view);
-
-//  openDiag = new OpenDiag(view);
-//  openDiag->hide();
-
+    adjustSize();
+    attachments->hide();
 }
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
@@ -21,3 +21,3 @@ public:
 protected:
-    QAction *reply, *forward, *attachbutton, *deleteMail, *showHtml;
+    QAction *reply, *forward, *attachbutton, *deleteMail, *showHtml,*showPicsInline;
     QListView *attachments;