small bugfix

author: alwin <alwin> 2005-03-09 14:59:26 (UTC)
committer: alwin <alwin> 2005-03-09 14:59:26 (UTC)
commit: 8e618d7a6d195cb737946e89370d5c60f92e8f86 (patch) (unidiff)
tree: a4cfada2c0420fb40c483ace4dc2a6fce4258d6a
parent: 84f237fb3b83400a031bf7c2d3025f78c02f28a8 (diff)
download: opie-8e618d7a6d195cb737946e89370d5c60f92e8f86.zip
opie-8e618d7a6d195cb737946e89370d5c60f92e8f86.tar.gz
opie-8e618d7a6d195cb737946e89370d5c60f92e8f86.tar.bz2
1 files changed, 2 insertions, 0 deletions
diff --git a/noncore/net/mail/viewmail.cpp b/noncore/net/mail/viewmail.cpp
index 5206220..a89393c 100644
--- a/noncore/net/mail/viewmail.cpp
+++ b/noncore/net/mail/viewmail.cpp
@@ -167,64 +167,65 @@ void ViewMail::setBody(const RecBodyP&body )
        case 2:
            q="M";
            break;
        default:
            q="";
            break;
        }
        QTextOStream o(&fsize);
        if (w>0) o.precision(2); else o.precision(0);
        o.setf(QTextStream::fixed);
        o << s << " " << q << "Byte";
        desc = body->Parts()[i]->Description();
        parentItem = searchParent(body->Parts()[i]->Positionlist());
        if (parentItem)
        {
            AttachItem*temp = lastChild(parentItem);
            if (temp) curItem = temp;
            curItem=new AttachItem(parentItem,curItem,type,desc,filename,fsize,i,body->Parts()[i]->Positionlist());
            attachments->setRootIsDecorated(true);
            curItem = parentItem;
        }
        else
        {
            curItem=new AttachItem(attachments,curItem,type,desc,filename,fsize,i,body->Parts()[i]->Positionlist());
        }
    }
 }
 void ViewMail::slotShowHtml( bool state )
 {
    m_showHtml = state;
+    m_lasttextpart=-2;
    setMainText();
 }
 void ViewMail::slotItemClicked( QListViewItem * item , const QPoint & point, int )
 {
    if (!item )
        return;
    if (  ( ( AttachItem* )item )->Partnumber() == -1 )
    {
        setMainText();
        return;
    }
    QPopupMenu *menu = new QPopupMenu();
    int ret=0;
    if ( item->text( 0 ).left( 5 ) == "text/" || item->text(0)=="message/rfc822" )
    {
        menu->insertItem( tr( "Show Text" ), 1 );
    }
    if (item->text(0).left(6)=="image/") {
        menu->insertItem(tr("Display image preview"),2);
    }
    menu->insertItem( tr( "Save Attachment" ),  0 );
    menu->insertSeparator(1);
    ret = menu->exec( point, 0 );
    switch(ret)
    {
    case 0:
        {
@@ -302,64 +303,65 @@ void ViewMail::slotItemClicked( QListViewItem * item , const QPoint & point, int
                    browser->show();
                }
                if (m_lasttextpart == ( ( AttachItem* )item )->Partnumber() ) return;
                m_lasttextpart = ( ( AttachItem* )item )->Partnumber();
                QString s = m_recMail->Wrapper()->fetchTextPart( m_recMail, m_body->Parts()[ ( ( AttachItem* )item )->Partnumber() ] );;
                if (item->text(0).right(4)!="html") {
                    s = QString("<html><body>\n<font face=fixed>%1</font></body></html>").arg(QStyleSheet::convertFromPlainText(s));
                }
                browser->setText(s);
            }
        }
        break;
    }
    delete menu;
 }
 void ViewMail::setMail(const RecMailP&mail )
 {
    m_recMail = mail;
    m_mail[0] = mail->getFrom();
    m_mail[1] = mail->getSubject();
    m_mail[3] = mail->getStringDate();
    m_mail[4] = mail->Msgid();
    m_mail2[0] = mail->To();
    m_mail2[1] = mail->CC();
    m_mail2[2] = mail->Bcc();
    setCaption(tr("E-Mail by %1").arg( m_mail[0] ) );
+    m_lasttextpart=-2;
    setMainText();
 }
 ViewMail::ViewMail( QWidget *parent, const char *name, WFlags fl)
        : ViewMailBase(parent, name, fl), _inLoop(false)
 {
    m_gotBody = false;
    deleted = false;
    connect( reply, SIGNAL(activated()), SLOT(slotReply()));
    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;
    m_lastimagepart = -1;
    m_lasttextpart = -2;
    readConfig();
    attachments->setSorting(-1);
 }
 void ViewMail::slotImageInline(bool how)
 {
    Config cfg( "mail" );
    cfg.writeEntry( "showPicsInline", how);
author	alwin <alwin>	2005-03-09 14:59:26 (UTC)
committer	alwin <alwin>	2005-03-09 14:59:26 (UTC)
commit	8e618d7a6d195cb737946e89370d5c60f92e8f86 (patch) (unidiff)
tree	a4cfada2c0420fb40c483ace4dc2a6fce4258d6a
parent	84f237fb3b83400a031bf7c2d3025f78c02f28a8 (diff)
download	opie-8e618d7a6d195cb737946e89370d5c60f92e8f86.zip opie-8e618d7a6d195cb737946e89370d5c60f92e8f86.tar.gz opie-8e618d7a6d195cb737946e89370d5c60f92e8f86.tar.bz2