-rw-r--r-- | noncore/unsupported/mail2/mainwindow.cpp | 7 | ||||
-rw-r--r-- | noncore/unsupported/mail2/mainwindowbase.cpp | 9 | ||||
-rw-r--r-- | noncore/unsupported/mail2/mainwindowbase.h | 4 |
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 | |||
@@ -2,2 +2,3 @@ | |||
2 | #include <qmessagebox.h> | 2 | #include <qmessagebox.h> |
3 | #include <qtoolbutton.h> | ||
3 | #include <qaction.h> | 4 | #include <qaction.h> |
@@ -17,3 +18,3 @@ MainWindow::MainWindow(QWidget *parent, const char *name, WFlags fl) | |||
17 | { | 18 | { |
18 | stop->setEnabled(false); | 19 | stopButton->setEnabled(false); |
19 | 20 | ||
@@ -27,5 +28,5 @@ MainWindow::MainWindow(QWidget *parent, const char *name, WFlags fl) | |||
27 | connect(mailView, SIGNAL(resetProgress()), statusProgress, SLOT(reset())); | 28 | connect(mailView, SIGNAL(resetProgress()), statusProgress, SLOT(reset())); |
28 | connect(mailView, SIGNAL(stopEnabled(bool)), stop, SLOT(setEnabled(bool))); | 29 | connect(mailView, SIGNAL(stopEnabled(bool)), stopButton, SLOT(setEnabled(bool))); |
29 | 30 | ||
30 | connect(stop, SIGNAL(activated()), mailView, SLOT(stop())); | 31 | connect(stopButton, SIGNAL(clicked()), mailView, SLOT(stop())); |
31 | 32 | ||
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 | |||
@@ -54,8 +54,4 @@ MainWindowBase::MainWindowBase(QWidget *parent, const char *name, WFlags fl) | |||
54 | configure = new QAction(tr("Configuration"), QIconSet(Resource::loadPixmap("mail/configure")), 0, 0, this); | 54 | configure = new QAction(tr("Configuration"), QIconSet(Resource::loadPixmap("mail/configure")), 0, 0, this); |
55 | configure->addTo(toolbar); | ||
56 | configure->addTo(servermenu); | 55 | configure->addTo(servermenu); |
57 | 56 | ||
58 | stop = new QAction(tr("Abort"), QIconSet(Resource::loadPixmap("mail/abort")), 0, 0, this); | ||
59 | stop->addTo(toolbar); | ||
60 | |||
61 | QVBox *view = new QVBox(this); | 57 | QVBox *view = new QVBox(this); |
@@ -78,2 +74,7 @@ MainWindowBase::MainWindowBase(QWidget *parent, const char *name, WFlags fl) | |||
78 | 74 | ||
75 | stopButton = new QToolButton(status); | ||
76 | stopButton->setText(" X "); | ||
77 | stopButton->setMaximumHeight(15); | ||
78 | stopButton->setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed)); | ||
79 | |||
79 | statusProgress = new QProgressBar(status); | 80 | 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; | |||
8 | class FolderWidget; | 8 | class FolderWidget; |
9 | class QToolButton; | ||
9 | class QPEToolBar; | 10 | class QPEToolBar; |
@@ -29,2 +30,3 @@ protected: | |||
29 | FolderWidget *folderView; | 30 | FolderWidget *folderView; |
31 | QToolButton *stopButton; | ||
30 | QPEToolBar *toolbar; | 32 | QPEToolBar *toolbar; |
@@ -33,3 +35,3 @@ protected: | |||
33 | MailTable *mailView; | 35 | MailTable *mailView; |
34 | QAction *compose, *sendQueue, *folders, *findmails, *configure, *stop; | 36 | QAction *compose, *sendQueue, *folders, *findmails, *configure; |
35 | QLabel *statusLabel; | 37 | QLabel *statusLabel; |