3 files changed, 20 insertions, 16 deletions

diff --git a/noncore/unsupported/mail2/mainwindow.cpp b/noncore/unsupported/mail2/mainwindow.cpp
index 652db94..0044693 100644
--- a/noncore/unsupported/mail2/mainwindow.cpp
+++ b/noncore/unsupported/mail2/mainwindow.cpp
@@ -1,8 +1,9 @@
 #include <qprogressbar.h>
 #include <qmessagebox.h>
+#include <qtoolbutton.h>
 #include <qaction.h>
 #include <qlabel.h>
 
 #include "folderwidget.h"
 #include "mainwindow.h"
 #include "configdiag.h"
@@ -12,25 +13,25 @@
 #include "composer.h"
 #include "viewmail.h"
 
 MainWindow::MainWindow(QWidget *parent, const char *name, WFlags fl)
 	: MainWindowBase(parent, name, fl)
 {
-	stop->setEnabled(false);
+	stopButton->setEnabled(false);
 
 	connect(folderView, SIGNAL(status(const QString &)), statusLabel, SLOT(setText(const QString &)));
 	connect(folderView, SIGNAL(folderSelected(Folder)), mailView, SLOT(setFolder(Folder)));
 
 	connect(mailView, SIGNAL(mailClicked(IMAPResponseFETCH, IMAPHandler *)), SLOT(mailClicked(IMAPResponseFETCH, IMAPHandler *)));
 	connect(mailView, SIGNAL(status(const QString &)), statusLabel, SLOT(setText(const QString &)));
 	connect(mailView, SIGNAL(totalSteps(int)), statusProgress, SLOT(setTotalSteps(int)));
 	connect(mailView, SIGNAL(progress(int)), statusProgress, SLOT(setProgress(int)));
 	connect(mailView, SIGNAL(resetProgress()), statusProgress, SLOT(reset()));
-	connect(mailView, SIGNAL(stopEnabled(bool)), stop, SLOT(setEnabled(bool)));
+	connect(mailView, SIGNAL(stopEnabled(bool)), stopButton, SLOT(setEnabled(bool)));
 
-	connect(stop, SIGNAL(activated()), mailView, SLOT(stop()));
+	connect(stopButton, SIGNAL(clicked()), mailView, SLOT(stop()));
 
 	connect(compose, SIGNAL(activated()), SLOT(slotCompose()));
 	connect(sendQueue, SIGNAL(activated()), SLOT(slotSendQueued()));
 	connect(findmails, SIGNAL(activated()), SLOT(slotSearch()));
 	connect(configure, SIGNAL(activated()), SLOT(slotConfigure()));
 }
diff --git a/noncore/unsupported/mail2/mainwindowbase.cpp b/noncore/unsupported/mail2/mainwindowbase.cpp
index d61899b..bffe8b3 100644
--- a/noncore/unsupported/mail2/mainwindowbase.cpp
+++ b/noncore/unsupported/mail2/mainwindowbase.cpp
@@ -18,17 +18,17 @@ 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 );
+	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);
@@ -36,31 +36,27 @@ MainWindowBase::MainWindowBase(QWidget *parent, const char *name, WFlags fl)
 
 	compose = new QAction(tr("Compose new mail"), QIconSet(Resource::loadPixmap("mail/newmail")), 0, 0, this);
 	compose->addTo(toolbar);
 	compose->addTo(mailmenu);
 
  	sendQueue = new QAction(tr("Send queued mails"), QIconSet(Resource::loadPixmap("mail/sendqueue")), 0, 0, this);
-  sendQueue->addTo(toolbar);
-  sendQueue->addTo(mailmenu);
+	sendQueue->addTo(toolbar);
+	sendQueue->addTo(mailmenu);
 
 	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(toolbar);
 	configure->addTo(servermenu);
 
-	stop = new QAction(tr("Abort"), QIconSet(Resource::loadPixmap("mail/abort")), 0, 0, this);
-	stop->addTo(toolbar);
-
 	QVBox *view = new QVBox(this);
 	setCentralWidget(view);
 
 	folderView = new FolderWidget(view);
 	folderView->setMinimumHeight(90);
 	folderView->setMaximumHeight(90);
@@ -73,12 +69,17 @@ MainWindowBase::MainWindowBase(QWidget *parent, const char *name, WFlags fl)
 
 	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));
 }
 
diff --git a/noncore/unsupported/mail2/mainwindowbase.h b/noncore/unsupported/mail2/mainwindowbase.h
index d8faeba..702933a 100644
--- a/noncore/unsupported/mail2/mainwindowbase.h
+++ b/noncore/unsupported/mail2/mainwindowbase.h
@@ -3,12 +3,13 @@
 
 #include <qmainwindow.h>
 
 class ServerConnection;
 class QProgressBar;
 class FolderWidget;
+class QToolButton;
 class QPEToolBar;
 class QPEMenuBar;
 class QPopupMenu;
 class MailTable;
 class QAction;
 class QLabel;
@@ -24,16 +25,17 @@ protected slots:
 	void slotFoldersToggled(bool toggled);
 
 protected:
 	ServerConnection *serverConnection;
 	QProgressBar *statusProgress;
 	FolderWidget *folderView;
+	QToolButton *stopButton;
 	QPEToolBar *toolbar;
  	QPEMenuBar *menubar;
-  QPopupMenu *mailmenu, *servermenu;
+	QPopupMenu *mailmenu, *servermenu;
 	MailTable *mailView;
-	QAction *compose, *sendQueue, *folders, *findmails, *configure, *stop;
+	QAction *compose, *sendQueue, *folders, *findmails, *configure;
 	QLabel *statusLabel;
 
 };
 
 #endif