fixed some problems when displaying mails

but it should reworked cause sometimes there are problems with html
mails.

1 files changed, 41 insertions, 40 deletions

diff --git a/noncore/net/mail/viewmailbase.cpp b/noncore/net/mail/viewmailbase.cpp
index cbb98cc..49a0e6a 100644
--- a/noncore/net/mail/viewmailbase.cpp
+++ b/noncore/net/mail/viewmailbase.cpp
@@ -12,70 +12,71 @@
 //#include "opendiag.h"
 
 ViewMailBase::ViewMailBase(QWidget *parent, const char *name, WFlags fl)
-        : QMainWindow(parent, name, fl)
+    : QMainWindow(parent, name, fl)
 {
-        setCaption(tr("E-Mail by %1"));
-        setToolBarsMovable(false);
+    setCaption(tr("E-Mail view"));
+    setToolBarsMovable(false);
 
-        toolbar = new QToolBar(this);
-  menubar = new QMenuBar( toolbar );
-  mailmenu = new QPopupMenu( menubar );
-  menubar->insertItem( tr( "Mail" ), mailmenu );
+    toolbar = new QToolBar(this);
+    menubar = new QMenuBar( toolbar );
+    mailmenu = new QPopupMenu( menubar );
+    menubar->insertItem( tr( "Mail" ), mailmenu );
 
-        toolbar->setHorizontalStretchable(true);
-        addToolBar(toolbar);
+    toolbar->setHorizontalStretchable(true);
+    addToolBar(toolbar);
 
-        QLabel *spacer = new QLabel(toolbar);
-        spacer->setBackgroundMode(QWidget::PaletteButton);
-        toolbar->setStretchableWidget(spacer);
+    QLabel *spacer = new QLabel(toolbar);
+    spacer->setBackgroundMode(QWidget::PaletteButton);
+    toolbar->setStretchableWidget(spacer);
 
-        reply = new QAction(tr("Reply"), QIconSet(Resource::loadPixmap("mail/reply")), 0, 0, this);
-        reply->addTo(toolbar);
-         reply->addTo(mailmenu);
+    reply = new QAction(tr("Reply"), QIconSet(Resource::loadPixmap("mail/reply")), 0, 0, this);
+    reply->addTo(toolbar);
+    reply->addTo(mailmenu);
 
-        forward = new QAction(tr("Forward"), QIconSet(Resource::loadPixmap("mail/forward")), 0, 0, this);
-        forward->addTo(toolbar);
-        forward->addTo(mailmenu);
+    forward = new QAction(tr("Forward"), QIconSet(Resource::loadPixmap("mail/forward")), 0, 0, this);
+    forward->addTo(toolbar);
+    forward->addTo(mailmenu);
 
-        attachbutton = new QAction(tr("Attachments"), QIconSet(Resource::loadPixmap("mail/attach")), 0, 0, this, 0, true);
-        attachbutton->addTo(toolbar);
-        attachbutton->addTo(mailmenu);
-        connect(attachbutton, SIGNAL(toggled(bool)), SLOT(slotChangeAttachview(bool)));
+    attachbutton = new QAction(tr("Attachments"), QIconSet(Resource::loadPixmap("mail/attach")), 0, 0, this, 0, true);
+    attachbutton->addTo(toolbar);
+    attachbutton->addTo(mailmenu);
+    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 );
 
-        deleteMail = new QAction(tr("Delete Mail"), QIconSet(Resource::loadPixmap("trash")), 0, 0, this);
-        deleteMail->addTo(toolbar);
-        deleteMail->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);
-        setCentralWidget(view);
+    QVBox *view = new QVBox(this);
+    setCentralWidget(view);
 
-        attachments = new QListView(view);
-        attachments->setMinimumHeight(90);
-        attachments->setMaximumHeight(90);
-        attachments->setAllColumnsShowFocus(true);
-        attachments->addColumn("Mime Type", 60);
-        attachments->addColumn(tr("Description"), 100);
-        attachments->addColumn(tr("Filename"), 80);
+    attachments = new QListView(view);
+    attachments->setMinimumHeight(90);
+    attachments->setMaximumHeight(90);
+    attachments->setAllColumnsShowFocus(true);
+    attachments->addColumn("Mime Type", 60);
+    attachments->addColumn(tr("Description"), 100);
+    attachments->addColumn(tr("Filename"), 80);
     attachments->addColumn(tr("Size"), 80);
     attachments->setSorting(-1);
-        attachments->hide();
+    attachments->hide();
 
-        browser = new QTextBrowser(view);
+    //header = new QTextBrowser(view);
+    browser = new QTextBrowser(view);
 
-        //openDiag = new OpenDiag(view);
-        //openDiag->hide();
+//  openDiag = new OpenDiag(view);
+//  openDiag->hide();
 
 }
 
 void ViewMailBase::slotChangeAttachview(bool state)
 {
-        if (state) attachments->show();
-        else attachments->hide();
+    if (state) attachments->show();
+    else attachments->hide();
 }
 
 void ViewMailBase::keyPressEvent ( QKeyEvent * e )