ui improvements

3 files changed, 12 insertions, 8 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,6 +1,7 @@
 #include <qprogressbar.h>
 #include <qmessagebox.h>
+#include <qtoolbutton.h>
 #include <qaction.h>
 #include <qlabel.h>
 
 #include "folderwidget.h"
@@ -14,9 +15,9 @@
 
 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)));
 
@@ -24,11 +25,11 @@ MainWindow::MainWindow(QWidget *parent, const char *name, WFlags fl)
 	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()));
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
@@ -51,14 +51,10 @@ MainWindowBase::MainWindowBase(QWidget *parent, const char *name, WFlags fl)
 	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);
@@ -75,8 +71,13 @@ MainWindowBase::MainWindowBase(QWidget *parent, const char *name, WFlags fl)
 	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
@@ -5,8 +5,9 @@
 
 class ServerConnection;
 class QProgressBar;
 class FolderWidget;
+class QToolButton;
 class QPEToolBar;
 class QPEMenuBar;
 class QPopupMenu;
 class MailTable;
@@ -26,13 +27,14 @@ protected slots:
 protected:
 	ServerConnection *serverConnection;
 	QProgressBar *statusProgress;
 	FolderWidget *folderView;
+	QToolButton *stopButton;
 	QPEToolBar *toolbar;
  	QPEMenuBar *menubar;
   QPopupMenu *mailmenu, *servermenu;
 	MailTable *mailView;
-	QAction *compose, *sendQueue, *folders, *findmails, *configure, *stop;
+	QAction *compose, *sendQueue, *folders, *findmails, *configure;
 	QLabel *statusLabel;
 
 };