1 files changed, 2 insertions, 18 deletions

diff --git a/noncore/unsupported/mail2/mainwindowbase.cpp b/noncore/unsupported/mail2/mainwindowbase.cpp
index bffe8b3..e35d489 100644
--- a/noncore/unsupported/mail2/mainwindowbase.cpp
+++ b/noncore/unsupported/mail2/mainwindowbase.cpp
@@ -1,37 +1,36 @@
-#include <qprogressbar.h>
-#include <qtoolbutton.h>
 #include <qpopupmenu.h>
 #include <qaction.h>
 #include <qheader.h>
 #include <qlabel.h>
 #include <qvbox.h>
 
 #include <qpe/qpetoolbar.h>
 #include <qpe/qpemenubar.h>
 #include <qpe/resource.h>
 
 #include "mainwindowbase.h"
+#include "mailstatusbar.h"
 #include "folderwidget.h"
 #include "mailtable.h"
 
 MainWindowBase::MainWindowBase(QWidget *parent, const char *name, WFlags fl)
 	: QMainWindow(parent, name, fl)
 {
 	setCaption(tr("E-Mail"));
 	setToolBarsMovable(false);
 
 	toolbar = new QPEToolBar(this);
 	menubar = new QPEMenuBar( toolbar );
 	mailmenu = new QPopupMenu( menubar );
 	servermenu = new QPopupMenu( menubar );
 	menubar->insertItem( tr( "Mail" ), mailmenu );
 	menubar->insertItem( tr( "Servers" ), servermenu );
 
 	addToolBar(toolbar);
 	toolbar->setHorizontalStretchable(true);
 
 	QLabel *spacer = new QLabel(toolbar);
 	spacer->setBackgroundMode(QWidget::PaletteButton);
 	toolbar->setStretchableWidget(spacer);
 
 	compose = new QAction(tr("Compose new mail"), QIconSet(Resource::loadPixmap("mail/newmail")), 0, 0, this);
@@ -44,48 +43,33 @@ MainWindowBase::MainWindowBase(QWidget *parent, const char *name, WFlags fl)
 
 	folders = new QAction(tr("Show/hide folders"), QIconSet(Resource::loadPixmap("mail/folder")), 0, 0, this, 0, true);
 	folders->addTo(toolbar);
 	folders->addTo(servermenu);
 	connect(folders, SIGNAL(toggled(bool)), SLOT(slotFoldersToggled(bool)));
 
 	findmails = new QAction(tr("Search mails"), QIconSet(Resource::loadPixmap("mail/find")), 0, 0, this); 
 	findmails->addTo(toolbar);
 	findmails->addTo(mailmenu);
 
 	configure = new QAction(tr("Configuration"), QIconSet(Resource::loadPixmap("mail/configure")), 0, 0, this);
 	configure->addTo(servermenu);
 
 	QVBox *view = new QVBox(this);
 	setCentralWidget(view);
 
 	folderView = new FolderWidget(view);
 	folderView->setMinimumHeight(90);
 	folderView->setMaximumHeight(90);
 	folderView->hide();
 
 	mailView = new MailTable(view);
 	mailView->setMinimumHeight(50);
 
-	QHBox *status = new QHBox(view);
-
-	statusLabel = new QLabel(status);
-	QFont tmpFont = statusLabel->font();
-	tmpFont.setPixelSize(8);
-	statusLabel->setFont(tmpFont);
-
-	stopButton = new QToolButton(status);
-	stopButton->setText(" X ");
-	stopButton->setMaximumHeight(15);
-	stopButton->setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed));
-
-	statusProgress = new QProgressBar(status);
-	statusProgress->setCenterIndicator(true);
-	statusProgress->setMaximumHeight(15);
-	statusProgress->setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed));
+	status = new MailStatusBar(view);
 }
 
 void MainWindowBase::slotFoldersToggled(bool toggled)
 {
 	if (folderView->isHidden() && toggled) folderView->show();
 	if (!folderView->isHidden() && !toggled) folderView->hide();
 }