ui improvements

1 files changed, 9 insertions, 11 deletions

diff --git a/noncore/unsupported/mail2/mainwindow.cpp b/noncore/unsupported/mail2/mainwindow.cpp
index 0044693..047c54b 100644
--- a/noncore/unsupported/mail2/mainwindow.cpp
+++ b/noncore/unsupported/mail2/mainwindow.cpp
@@ -1,43 +1,41 @@
-#include <qprogressbar.h>
 #include <qmessagebox.h>
-#include <qtoolbutton.h>
 #include <qaction.h>
-#include <qlabel.h>
 
+#include "mailstatusbar.h"
 #include "folderwidget.h"
 #include "mainwindow.h"
 #include "configdiag.h"
 #include "configfile.h"
 #include "searchdiag.h"
 #include "mailtable.h"
 #include "composer.h"
 #include "viewmail.h"
 
 MainWindow::MainWindow(QWidget *parent, const char *name, WFlags fl)
         : MainWindowBase(parent, name, fl)
 {
-        stopButton->setEnabled(false);
+        status->setStopEnabled(false);
 
-        connect(folderView, SIGNAL(status(const QString &)), statusLabel, SLOT(setText(const QString &)));
+        connect(folderView, SIGNAL(status(const QString &)), status, SLOT(setStatusText(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)), stopButton, SLOT(setEnabled(bool)));
+        connect(mailView, SIGNAL(status(const QString &)), status, SLOT(setStatusText(const QString &)));
+        connect(mailView, SIGNAL(totalSteps(int)), status, SLOT(setProgressTotalSteps(int)));
+        connect(mailView, SIGNAL(progress(int)), status, SLOT(setProgress(int)));
+        connect(mailView, SIGNAL(resetProgress()), status, SLOT(resetProgress()));
+        connect(mailView, SIGNAL(stopEnabled(bool)), status, SLOT(setStopEnabled(bool)));
 
-        connect(stopButton, SIGNAL(clicked()), mailView, SLOT(stop()));
+        connect(status, SIGNAL(stop()), 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()));
 }
 
 void MainWindow::slotCompose()
 {
         Composer composer(this, 0, true);
         composer.showMaximized();
         composer.exec();