summaryrefslogtreecommitdiff
authorconber <conber>2002-07-10 15:58:52 (UTC)
committer conber <conber>2002-07-10 15:58:52 (UTC)
commitc182d037fe82b7a7fc8adbc493eff9057d29a02d (patch) (side-by-side diff)
tree6553b5138914978000ed1286b2f588037d6d92e4
parent0439137e4c18ad7d10002e2da6bea20b57ae1dec (diff)
downloadopie-c182d037fe82b7a7fc8adbc493eff9057d29a02d.zip
opie-c182d037fe82b7a7fc8adbc493eff9057d29a02d.tar.gz
opie-c182d037fe82b7a7fc8adbc493eff9057d29a02d.tar.bz2
ui improvements
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/unsupported/mail2/mainwindow.cpp7
-rw-r--r--noncore/unsupported/mail2/mainwindowbase.cpp9
-rw-r--r--noncore/unsupported/mail2/mainwindowbase.h4
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 @@
#include <qprogressbar.h>
#include <qmessagebox.h>
+#include <qtoolbutton.h>
#include <qaction.h>
#include <qlabel.h>
@@ -15,7 +16,7 @@
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)));
@@ -25,9 +26,9 @@ MainWindow::MainWindow(QWidget *parent, const char *name, WFlags fl)
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()));
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)
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);
@@ -76,6 +72,11 @@ MainWindowBase::MainWindowBase(QWidget *parent, const char *name, WFlags fl)
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);
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 @@
class ServerConnection;
class QProgressBar;
class FolderWidget;
+class QToolButton;
class QPEToolBar;
class QPEMenuBar;
class QPopupMenu;
@@ -27,11 +28,12 @@ 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;
};