Usebility enhancement:Removed trash from toolbar, added exit button

1 files changed, 7 insertions, 6 deletions

diff --git a/kmicromail/viewmailbase.cpp b/kmicromail/viewmailbase.cpp
index 2590481..584a0ac 100644
--- a/kmicromail/viewmailbase.cpp
+++ b/kmicromail/viewmailbase.cpp
@@ -17,50 +17,51 @@ ViewMailBase::ViewMailBase(QWidget *parent, const char *name, WFlags fl)
 {
 
         setToolBarsMovable(false);
 
         toolbar = new QToolBar(this);
   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);
-
         reply = new QAction(tr("Reply"),SmallIcon("reply"), 0, 0, this);
         reply->addTo(toolbar);
          reply->addTo(mailmenu);
 
         forward = new QAction(tr("Forward"),SmallIcon("forward"), 0, 0, this);
         forward->addTo(toolbar);
         forward->addTo(mailmenu);
 
         attachbutton = new QAction(tr("Attachments"),SmallIcon("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" ), SmallIcon(  "html" ), 0, 0, this, 0, true );
         showHtml->addTo( toolbar );
         showHtml->addTo( mailmenu );
 
-        deleteMail = new QAction(tr("Delete Mail"),SmallIcon("trash"), 0, 0, this);
+    deleteMail = new QAction(tr("Delete Mail"),SmallIcon("trash"), 0, 0, this);
         deleteMail->addTo(toolbar);
         deleteMail->addTo(mailmenu);
-
+          closeMail = new QAction(tr("Close"),SmallIcon("exit"), 0, 0, this);
+        QLabel *spacer = new QLabel(toolbar);
+        spacer->setBackgroundMode(QWidget::PaletteButton);
+        toolbar->setStretchableWidget(spacer);
+        closeMail->addTo(toolbar);
+        closeMail->addTo(mailmenu);
         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->addColumn(tr("Size"), 80);
     attachments->setSorting(-1);