Usebility enhancement:Removed trash from toolbar, added exit button

4 files changed, 22 insertions, 14 deletions

diff --git a/kmicromail/mainwindow.cpp b/kmicromail/mainwindow.cpp
index ddc7b3e..a500dec 100644
--- a/kmicromail/mainwindow.cpp
+++ b/kmicromail/mainwindow.cpp
@@ -34,5 +34,3 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
 
-    QLabel *spacer = new QLabel( toolBar );
-    spacer->setBackgroundMode( QWidget::PaletteButton );
-    toolBar->setStretchableWidget( spacer );
+  
 
@@ -135,4 +133,4 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
     connect( editAccounts, SIGNAL( activated() ), SLOT( slotEditAccounts() ) );
-    mailView->setMultiSelection ( true );
-    //mailView->setSelectionMode( QListView::Extended );
+    //mailView->setMultiSelection ( true );
+    mailView->setSelectionMode( QListView::Extended );
     QValueList<int> list;
@@ -146,2 +144,10 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
     mailView->setShowSortIndicator ( true );
+    QLabel *spacer = new QLabel( toolBar );
+    spacer->setBackgroundMode( QWidget::PaletteButton );
+    toolBar->setStretchableWidget( spacer );
+
+    QAction* closeMail = new QAction(tr("Close"),SmallIcon("exit"), 0, 0, this); 
+    connect( closeMail, SIGNAL( activated() ), SLOT( close() ) );
+    closeMail->addTo(toolBar);
+	closeMail->addTo(mailMenu);
 }
@@ -178,6 +184,6 @@ void MainWindow::slotAdjustColumns()
     mailView->setColumnWidth( 0, 10 );
-    mailView->setColumnWidth( 1, 80 );
-    mailView->setColumnWidth( 2, 80 );
+    mailView->setColumnWidth( 1, 100 );
+    mailView->setColumnWidth( 2, 100 );
     mailView->setColumnWidth( 3, 50 );
-    mailView->setColumnWidth( 4, 50 );
+    mailView->setColumnWidth( 4, 120 );
 }
diff --git a/kmicromail/viewmail.cpp b/kmicromail/viewmail.cpp
index b434318..703711d 100644
--- a/kmicromail/viewmail.cpp
+++ b/kmicromail/viewmail.cpp
@@ -316,2 +316,3 @@ ViewMail::ViewMail( QWidget *parent, const char *name, WFlags fl)
     connect( showHtml, SIGNAL( toggled(bool) ), SLOT( slotShowHtml(bool) ) );
+    connect( closeMail, SIGNAL( activated() ), SLOT( close() ) );
 
diff --git a/kmicromail/viewmailbase.cpp b/kmicromail/viewmailbase.cpp
index 2590481..584a0ac 100644
--- a/kmicromail/viewmailbase.cpp
+++ b/kmicromail/viewmailbase.cpp
@@ -28,6 +28,2 @@ ViewMailBase::ViewMailBase(QWidget *parent, const char *name, WFlags fl)
 
-	QLabel *spacer = new QLabel(toolbar);
-	spacer->setBackgroundMode(QWidget::PaletteButton);
-	toolbar->setStretchableWidget(spacer);
-
 	reply = new QAction(tr("Reply"),SmallIcon("reply"), 0, 0, this);
@@ -53,3 +49,8 @@ ViewMailBase::ViewMailBase(QWidget *parent, const char *name, WFlags fl)
 	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);
diff --git a/kmicromail/viewmailbase.h b/kmicromail/viewmailbase.h
index fdaad2a..c29d143 100644
--- a/kmicromail/viewmailbase.h
+++ b/kmicromail/viewmailbase.h
@@ -21,3 +21,3 @@ public:
 protected:
-	QAction *reply, *forward, *attachbutton, *deleteMail, *showHtml;
+	QAction *reply, *forward, *attachbutton, *deleteMail, *showHtml, *closeMail;
 	QListView *attachments;