1 files changed, 21 insertions, 3 deletions

diff --git a/noncore/net/mail/mainwindow.cpp b/noncore/net/mail/mainwindow.cpp
index 9a37510..d3b9c34 100644
--- a/noncore/net/mail/mainwindow.cpp
+++ b/noncore/net/mail/mainwindow.cpp
@@ -13,2 +13,3 @@
 #include "mainwindow.h"
+#include "settingsdialog.h"
 #include "viewmail.h"
@@ -17,2 +18,3 @@
 
+
 MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
@@ -47,2 +49,3 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
 
+    /*
     syncFolders = new QAction( tr( "Sync mailfolders" ), ICON_SYNC,
@@ -51,2 +54,3 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
     syncFolders->addTo( mailMenu );
+    */
 
@@ -60,3 +64,4 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
 
-    searchMails = new QAction( tr( "Search mails" ), ICON_SEARCHMAILS,
+    /*
+      searchMails = new QAction( tr( "Search mails" ), ICON_SEARCHMAILS,
                                0, 0, this );
@@ -64,2 +69,3 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
     searchMails->addTo( mailMenu );
+    */
 
@@ -74,2 +80,4 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
     editSettings->addTo( settingsMenu );
+    connect( editSettings, SIGNAL( activated() ),
+             SLOT( slotEditSettings() ) );
 
@@ -79,3 +87,3 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
 
-    QWidget *view = new QWidget(  this );
+    QWidget *view = new QWidget( this );
     setCentralWidget( view );
@@ -101,3 +109,6 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
 
+    statusWidget = new StatusWidget( view );
+
     layout->addWidget( mailView );
+    layout->addWidget( statusWidget );
     layout->setStretchFactor( folderView, 1 );
@@ -105,2 +116,3 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
 
+
     slotAdjustLayout();
@@ -143,2 +155,8 @@ void MainWindow::slotAdjustColumns()
 
+void MainWindow::slotEditSettings() {
+    SettingsDialog settingsDialog( this,  0, true );
+    settingsDialog.showMaximized();
+    settingsDialog.exec();
+}
+
 void MainWindow::slotShowFolders( bool show )
@@ -181,3 +199,3 @@ void MainWindow::displayMail(QListViewItem*item)
     } else {
-        ( (MailListViewItem*)item )->setPixmap( 0, Resource::loadPixmap( "mail/kmmsgunseen") );
+        ( (MailListViewItem*)item )->setPixmap( 0, Resource::loadPixmap( "") );
     }