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
@@ -25,12 +25,8 @@ ViewMailBase::ViewMailBase(QWidget *parent, const char *name, WFlags fl)
 
 	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);
 
@@ -47,12 +43,17 @@ ViewMailBase::ViewMailBase(QWidget *parent, const char *name, WFlags fl)
         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);