Usebility enhancement:Removed trash from toolbar, added exit button

1 files changed, 15 insertions, 9 deletions

diff --git a/kmicromail/mainwindow.cpp b/kmicromail/mainwindow.cpp
index ddc7b3e..a500dec 100644
--- a/kmicromail/mainwindow.cpp
+++ b/kmicromail/mainwindow.cpp
@@ -32,9 +32,7 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
     addToolBar( toolBar );
     toolBar->setHorizontalStretchable( true );
 
-    QLabel *spacer = new QLabel( toolBar );
-    spacer->setBackgroundMode( QWidget::PaletteButton );
-    toolBar->setStretchableWidget( spacer );
+  
 
     composeMail = new QAction( tr( "Compose new mail" ), SmallIcon("composemail"),
                                0, 0, this );
@@ -133,8 +131,8 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
     connect( sendQueued, SIGNAL( activated() ), SLOT( slotSendQueued() ) );
 //    connect( searchMails, SIGNAL( activated() ), SLOT( slotSearchMails() ) );
     connect( editAccounts, SIGNAL( activated() ), SLOT( slotEditAccounts() ) );
-    mailView->setMultiSelection ( true );
-    //mailView->setSelectionMode( QListView::Extended );
+    //mailView->setMultiSelection ( true );
+    mailView->setSelectionMode( QListView::Extended );
     QValueList<int> list;
     int fw = 100;
     if ( QApplication::desktop()->width() > 320 )
@@ -143,7 +141,15 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
     list.append( 100 );
     split->setSizes( list );
     QTimer::singleShot( 1000, this, SLOT( slotAdjustColumns() ) );
-    mailView->setShowSortIndicator ( true );
+    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);
 }
 
 MainWindow::~MainWindow()
@@ -176,10 +182,10 @@ void MainWindow::slotAdjustColumns()
     if ( hidden ) folderView->hide();
 
     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 );
 }
 
 void MainWindow::slotEditSettings()