-rw-r--r-- | noncore/unsupported/mail2/mainwindow.cpp | 7 | ||||
-rw-r--r-- | noncore/unsupported/mail2/mainwindowbase.cpp | 23 | ||||
-rw-r--r-- | noncore/unsupported/mail2/mainwindowbase.h | 6 |
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 @@ -2,2 +2,3 @@ #include <qmessagebox.h> +#include <qtoolbutton.h> #include <qaction.h> @@ -17,3 +18,3 @@ MainWindow::MainWindow(QWidget *parent, const char *name, WFlags fl) { - stop->setEnabled(false); + stopButton->setEnabled(false); @@ -27,5 +28,5 @@ MainWindow::MainWindow(QWidget *parent, const char *name, WFlags fl) 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())); 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 @@ -23,7 +23,7 @@ MainWindowBase::MainWindowBase(QWidget *parent, const char *name, WFlags fl) 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 ); @@ -41,4 +41,4 @@ MainWindowBase::MainWindowBase(QWidget *parent, const char *name, WFlags fl) 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); @@ -54,8 +54,4 @@ MainWindowBase::MainWindowBase(QWidget *parent, const char *name, WFlags fl) 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); @@ -78,2 +74,7 @@ MainWindowBase::MainWindowBase(QWidget *parent, const char *name, WFlags fl) + stopButton = new QToolButton(status); + stopButton->setText(" X "); + stopButton->setMaximumHeight(15); + stopButton->setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed)); + statusProgress = new QProgressBar(status); 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 @@ -8,2 +8,3 @@ class QProgressBar; class FolderWidget; +class QToolButton; class QPEToolBar; @@ -29,7 +30,8 @@ protected: 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; |