author | conber <conber> | 2002-07-10 15:58:52 (UTC) |
---|---|---|
committer | conber <conber> | 2002-07-10 15:58:52 (UTC) |
commit | c182d037fe82b7a7fc8adbc493eff9057d29a02d (patch) (unidiff) | |
tree | 6553b5138914978000ed1286b2f588037d6d92e4 /noncore/unsupported/mail2 | |
parent | 0439137e4c18ad7d10002e2da6bea20b57ae1dec (diff) | |
download | opie-c182d037fe82b7a7fc8adbc493eff9057d29a02d.zip opie-c182d037fe82b7a7fc8adbc493eff9057d29a02d.tar.gz opie-c182d037fe82b7a7fc8adbc493eff9057d29a02d.tar.bz2 |
ui improvements
-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 | |||
@@ -1,5 +1,6 @@ | |||
1 | #include <qprogressbar.h> | 1 | #include <qprogressbar.h> |
2 | #include <qmessagebox.h> | 2 | #include <qmessagebox.h> |
3 | #include <qtoolbutton.h> | ||
3 | #include <qaction.h> | 4 | #include <qaction.h> |
4 | #include <qlabel.h> | 5 | #include <qlabel.h> |
5 | 6 | ||
@@ -15,7 +16,7 @@ | |||
15 | MainWindow::MainWindow(QWidget *parent, const char *name, WFlags fl) | 16 | MainWindow::MainWindow(QWidget *parent, const char *name, WFlags fl) |
16 | : MainWindowBase(parent, name, fl) | 17 | : MainWindowBase(parent, name, fl) |
17 | { | 18 | { |
18 | stop->setEnabled(false); | 19 | stopButton->setEnabled(false); |
19 | 20 | ||
20 | connect(folderView, SIGNAL(status(const QString &)), statusLabel, SLOT(setText(const QString &))); | 21 | connect(folderView, SIGNAL(status(const QString &)), statusLabel, SLOT(setText(const QString &))); |
21 | connect(folderView, SIGNAL(folderSelected(Folder)), mailView, SLOT(setFolder(Folder))); | 22 | connect(folderView, SIGNAL(folderSelected(Folder)), mailView, SLOT(setFolder(Folder))); |
@@ -25,9 +26,9 @@ MainWindow::MainWindow(QWidget *parent, const char *name, WFlags fl) | |||
25 | connect(mailView, SIGNAL(totalSteps(int)), statusProgress, SLOT(setTotalSteps(int))); | 26 | connect(mailView, SIGNAL(totalSteps(int)), statusProgress, SLOT(setTotalSteps(int))); |
26 | connect(mailView, SIGNAL(progress(int)), statusProgress, SLOT(setProgress(int))); | 27 | connect(mailView, SIGNAL(progress(int)), statusProgress, SLOT(setProgress(int))); |
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 | ||
32 | connect(compose, SIGNAL(activated()), SLOT(slotCompose())); | 33 | connect(compose, SIGNAL(activated()), SLOT(slotCompose())); |
33 | connect(sendQueue, SIGNAL(activated()), SLOT(slotSendQueued())); | 34 | connect(sendQueue, SIGNAL(activated()), SLOT(slotSendQueued())); |
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 | |||
@@ -52,12 +52,8 @@ MainWindowBase::MainWindowBase(QWidget *parent, const char *name, WFlags fl) | |||
52 | findmails->addTo(mailmenu); | 52 | findmails->addTo(mailmenu); |
53 | 53 | ||
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); |
62 | setCentralWidget(view); | 58 | setCentralWidget(view); |
63 | 59 | ||
@@ -76,6 +72,11 @@ MainWindowBase::MainWindowBase(QWidget *parent, const char *name, WFlags fl) | |||
76 | tmpFont.setPixelSize(8); | 72 | tmpFont.setPixelSize(8); |
77 | statusLabel->setFont(tmpFont); | 73 | statusLabel->setFont(tmpFont); |
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); |
80 | statusProgress->setCenterIndicator(true); | 81 | statusProgress->setCenterIndicator(true); |
81 | statusProgress->setMaximumHeight(15); | 82 | statusProgress->setMaximumHeight(15); |
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 | |||
@@ -6,6 +6,7 @@ | |||
6 | class ServerConnection; | 6 | class ServerConnection; |
7 | class QProgressBar; | 7 | class QProgressBar; |
8 | class FolderWidget; | 8 | class FolderWidget; |
9 | class QToolButton; | ||
9 | class QPEToolBar; | 10 | class QPEToolBar; |
10 | class QPEMenuBar; | 11 | class QPEMenuBar; |
11 | class QPopupMenu; | 12 | class QPopupMenu; |
@@ -27,11 +28,12 @@ protected: | |||
27 | ServerConnection *serverConnection; | 28 | ServerConnection *serverConnection; |
28 | QProgressBar *statusProgress; | 29 | QProgressBar *statusProgress; |
29 | FolderWidget *folderView; | 30 | FolderWidget *folderView; |
31 | QToolButton *stopButton; | ||
30 | QPEToolBar *toolbar; | 32 | QPEToolBar *toolbar; |
31 | QPEMenuBar *menubar; | 33 | QPEMenuBar *menubar; |
32 | QPopupMenu *mailmenu, *servermenu; | 34 | QPopupMenu *mailmenu, *servermenu; |
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; |
36 | 38 | ||
37 | }; | 39 | }; |