author | conber <conber> | 2002-08-06 16:32:49 (UTC) |
---|---|---|
committer | conber <conber> | 2002-08-06 16:32:49 (UTC) |
commit | 8084d002de5e310491eec7fac0713ef29d0cf30f (patch) (unidiff) | |
tree | fe74e3cf2ee2f7d87e74910fbf4bfa34b9a439a0 | |
parent | e6a512dc2e0602298f8a745036d25eb171ced977 (diff) | |
download | opie-8084d002de5e310491eec7fac0713ef29d0cf30f.zip opie-8084d002de5e310491eec7fac0713ef29d0cf30f.tar.gz opie-8084d002de5e310491eec7fac0713ef29d0cf30f.tar.bz2 |
ui improvements
-rw-r--r-- | noncore/unsupported/mail2/composer.cpp | 18 | ||||
-rw-r--r-- | noncore/unsupported/mail2/composerbase.cpp | 14 | ||||
-rw-r--r-- | noncore/unsupported/mail2/composerbase.h | 4 | ||||
-rw-r--r-- | noncore/unsupported/mail2/mail.pro | 2 | ||||
-rw-r--r-- | noncore/unsupported/mail2/mailstatusbar.cpp | 58 | ||||
-rw-r--r-- | noncore/unsupported/mail2/mailstatusbar.h | 38 | ||||
-rw-r--r-- | noncore/unsupported/mail2/mainwindow.cpp | 20 | ||||
-rw-r--r-- | noncore/unsupported/mail2/mainwindowbase.cpp | 20 | ||||
-rw-r--r-- | noncore/unsupported/mail2/mainwindowbase.h | 8 |
9 files changed, 127 insertions, 55 deletions
diff --git a/noncore/unsupported/mail2/composer.cpp b/noncore/unsupported/mail2/composer.cpp index 52ebbdd..cb80299 100644 --- a/noncore/unsupported/mail2/composer.cpp +++ b/noncore/unsupported/mail2/composer.cpp | |||
@@ -14,4 +14,4 @@ | |||
14 | #include <opie/ofiledialog.h> | 14 | #include <opie/ofiledialog.h> |
15 | //#include "attachdiag.h" | ||
16 | 15 | ||
16 | #include "mailstatusbar.h" | ||
17 | #include "addresspicker.h" | 17 | #include "addresspicker.h" |
@@ -34,3 +34,3 @@ Composer::Composer(QWidget *parent, const char *name, WFlags fl, bool sendQueue) | |||
34 | _sendQueued = sendQueue; | 34 | _sendQueued = sendQueue; |
35 | abort->setEnabled(false); | 35 | status->setStopEnabled(false); |
36 | to->setFocus(); | 36 | to->setFocus(); |
@@ -156,3 +156,3 @@ void Composer::slotSendMail() | |||
156 | 156 | ||
157 | abort->setEnabled(true); | 157 | status->setStopEnabled(true); |
158 | 158 | ||
@@ -161,3 +161,3 @@ void Composer::slotSendMail() | |||
161 | connect(handler, SIGNAL(error(const QString &)), SLOT(slotSendError(const QString &))); | 161 | connect(handler, SIGNAL(error(const QString &)), SLOT(slotSendError(const QString &))); |
162 | connect(handler, SIGNAL(status(const QString &)), status, SLOT(setText(const QString &))); | 162 | connect(handler, SIGNAL(status(const QString &)), status, SLOT(setStatusText(const QString &))); |
163 | } | 163 | } |
@@ -250,3 +250,3 @@ void Composer::slotSendQueued() | |||
250 | connect(handler, SIGNAL(error(const QString &)), SLOT(slotSendQueuedError(const QString &))); | 250 | connect(handler, SIGNAL(error(const QString &)), SLOT(slotSendQueuedError(const QString &))); |
251 | connect(handler, SIGNAL(status(const QString &)), status, SLOT(setText(const QString &))); | 251 | connect(handler, SIGNAL(status(const QString &)), status, SLOT(setStatusText(const QString &))); |
252 | 252 | ||
@@ -307,3 +307,3 @@ void Composer::slotSendError(const QString &error) | |||
307 | { | 307 | { |
308 | status->setText(tr("<font color=#ff0000>Error occoured during sending.</font>")); | 308 | status->setStatusText(tr("<font color=#ff0000>Error occoured during sending.</font>")); |
309 | QMessageBox::warning(this, tr("Error"), tr("<p>%1</p").arg(error), tr("Ok")); | 309 | QMessageBox::warning(this, tr("Error"), tr("<p>%1</p").arg(error), tr("Ok")); |
@@ -315,3 +315,3 @@ void Composer::slotSendQueuedError(const QString &error) | |||
315 | qDebug("error send mail %i",_sendCount); | 315 | qDebug("error send mail %i",_sendCount); |
316 | status->setText(tr("<font color=#ff0000>Error occoured during sending.</font>")); | 316 | status->setStatusText(tr("<font color=#ff0000>Error occoured during sending.</font>")); |
317 | QMessageBox::warning(this, tr("Error"), tr("<p>%1</p").arg(error), tr("Ok")); | 317 | QMessageBox::warning(this, tr("Error"), tr("<p>%1</p").arg(error), tr("Ok")); |
@@ -323,4 +323,4 @@ void Composer::slotSendFinished() | |||
323 | 323 | ||
324 | status->setText(QString(0)); | 324 | status->setStatusText(QString(0)); |
325 | abort->setEnabled(false); | 325 | status->setStopEnabled(false); |
326 | } | 326 | } |
diff --git a/noncore/unsupported/mail2/composerbase.cpp b/noncore/unsupported/mail2/composerbase.cpp index c456ae5..6f6ab8e 100644 --- a/noncore/unsupported/mail2/composerbase.cpp +++ b/noncore/unsupported/mail2/composerbase.cpp | |||
@@ -13,2 +13,3 @@ | |||
13 | 13 | ||
14 | #include "mailstatusbar.h" | ||
14 | #include "listviewplus.h" | 15 | #include "listviewplus.h" |
@@ -50,6 +51,2 @@ ComposerBase::ComposerBase(QWidget *parent, const char *name, WFlags fl) | |||
50 | 51 | ||
51 | abort = new QAction(tr("Abort sending"), QIconSet(Resource::loadPixmap("mail/abort")), 0, 0, this); | ||
52 | abort->addTo(toolbar); | ||
53 | abort->addTo(mailmenu); | ||
54 | |||
55 | QWidget *main = new QWidget(this); | 52 | QWidget *main = new QWidget(this); |
@@ -125,4 +122,4 @@ ComposerBase::ComposerBase(QWidget *parent, const char *name, WFlags fl) | |||
125 | attachWindow = new QMainWindow(view, 0, 0); | 122 | attachWindow = new QMainWindow(view, 0, 0); |
126 | attachWindow->setMinimumHeight(100); | 123 | attachWindow->setMinimumHeight(80); |
127 | attachWindow->setMaximumHeight(100); | 124 | attachWindow->setMaximumHeight(80); |
128 | attachWindow->setToolBarsMovable(false); | 125 | attachWindow->setToolBarsMovable(false); |
@@ -158,6 +155,3 @@ ComposerBase::ComposerBase(QWidget *parent, const char *name, WFlags fl) | |||
158 | 155 | ||
159 | status = new QLabel(view); | 156 | status = new MailStatusBar(view); |
160 | QFont tmpFont = status->font(); | ||
161 | tmpFont.setPixelSize(8); | ||
162 | status->setFont(tmpFont); | ||
163 | } | 157 | } |
diff --git a/noncore/unsupported/mail2/composerbase.h b/noncore/unsupported/mail2/composerbase.h index d832623..58f1157 100644 --- a/noncore/unsupported/mail2/composerbase.h +++ b/noncore/unsupported/mail2/composerbase.h | |||
@@ -6,2 +6,3 @@ | |||
6 | class QMultiLineEdit; | 6 | class QMultiLineEdit; |
7 | class MailStatusBar; | ||
7 | class ListViewPlus; | 8 | class ListViewPlus; |
@@ -39,2 +40,3 @@ protected: | |||
39 | QMultiLineEdit *message; | 40 | QMultiLineEdit *message; |
41 | MailStatusBar *status; | ||
40 | ListViewPlus *attachView; | 42 | ListViewPlus *attachView; |
@@ -48,3 +50,3 @@ protected: | |||
48 | QAction *sendmail, *queuemail, *attachfile, *addressbook, *abort, *addattach, *delattach; | 50 | QAction *sendmail, *queuemail, *attachfile, *addressbook, *abort, *addattach, *delattach; |
49 | QLabel *fromLabel, *status; | 51 | QLabel *fromLabel; |
50 | 52 | ||
diff --git a/noncore/unsupported/mail2/mail.pro b/noncore/unsupported/mail2/mail.pro index 985a6fb..177509d 100644 --- a/noncore/unsupported/mail2/mail.pro +++ b/noncore/unsupported/mail2/mail.pro | |||
@@ -10,2 +10,3 @@ HEADERS = accounteditor.h \ | |||
10 | listviewplus.h \ | 10 | listviewplus.h \ |
11 | mailstatusbar.h \ | ||
11 | mailtable.h \ | 12 | mailtable.h \ |
@@ -25,2 +26,3 @@ SOURCES = accounteditor.cpp \ | |||
25 | listviewplus.cpp \ | 26 | listviewplus.cpp \ |
27 | mailstatusbar.cpp \ | ||
26 | mailtable.cpp \ | 28 | mailtable.cpp \ |
diff --git a/noncore/unsupported/mail2/mailstatusbar.cpp b/noncore/unsupported/mail2/mailstatusbar.cpp new file mode 100644 index 0000000..470ea4f --- a/dev/null +++ b/noncore/unsupported/mail2/mailstatusbar.cpp | |||
@@ -0,0 +1,58 @@ | |||
1 | #include <qprogressbar.h> | ||
2 | #include <qtoolbutton.h> | ||
3 | #include <qlabel.h> | ||
4 | |||
5 | #include "mailstatusbar.h" | ||
6 | |||
7 | MailStatusBar::MailStatusBar(QWidget *parent, const char *name, WFlags fl) | ||
8 | : QHBox(parent, name, fl) | ||
9 | { | ||
10 | label = new QLabel(this); | ||
11 | QFont tmpFont = label->font(); | ||
12 | tmpFont.setPixelSize(8); | ||
13 | label->setFont(tmpFont); | ||
14 | |||
15 | stopButton = new QToolButton(this); | ||
16 | stopButton->setText(" X "); | ||
17 | stopButton->setMaximumHeight(15); | ||
18 | stopButton->setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed)); | ||
19 | connect(stopButton, SIGNAL(clicked()), SLOT(stopClicked())); | ||
20 | |||
21 | progress = new QProgressBar(this); | ||
22 | progress->setCenterIndicator(true); | ||
23 | progress->setMinimumHeight(15); | ||
24 | progress->setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed)); | ||
25 | progress->setFrameShape(QFrame::Box); | ||
26 | progress->setFrameShadow(QFrame::Raised); | ||
27 | } | ||
28 | |||
29 | void MailStatusBar::setStatusText(const QString &text) | ||
30 | { | ||
31 | label->setText(text); | ||
32 | } | ||
33 | |||
34 | void MailStatusBar::setStopEnabled(bool enabled) | ||
35 | { | ||
36 | stopButton->setEnabled(enabled); | ||
37 | } | ||
38 | |||
39 | void MailStatusBar::setProgressTotalSteps(int steps) | ||
40 | { | ||
41 | progress->setTotalSteps(steps); | ||
42 | } | ||
43 | |||
44 | void MailStatusBar::setProgress(int pg) | ||
45 | { | ||
46 | progress->setProgress(pg); | ||
47 | } | ||
48 | |||
49 | void MailStatusBar::resetProgress() | ||
50 | { | ||
51 | progress->reset(); | ||
52 | } | ||
53 | |||
54 | void MailStatusBar::stopClicked() | ||
55 | { | ||
56 | emit stop(); | ||
57 | } | ||
58 | |||
diff --git a/noncore/unsupported/mail2/mailstatusbar.h b/noncore/unsupported/mail2/mailstatusbar.h new file mode 100644 index 0000000..11cd538 --- a/dev/null +++ b/noncore/unsupported/mail2/mailstatusbar.h | |||
@@ -0,0 +1,38 @@ | |||
1 | #ifndef MAILSTATUSBAR_H | ||
2 | #define MAILSTATUSBAR_H | ||
3 | |||
4 | #include <qhbox.h> | ||
5 | |||
6 | class QLabel; | ||
7 | class QToolButton; | ||
8 | class QProgressBar; | ||
9 | |||
10 | class MailStatusBar : public QHBox | ||
11 | { | ||
12 | Q_OBJECT | ||
13 | |||
14 | public: | ||
15 | MailStatusBar(QWidget *parent = 0, const char *name = 0, WFlags fl = 0); | ||
16 | |||
17 | public slots: | ||
18 | void setStatusText(const QString &text); | ||
19 | void setStopEnabled(bool enabled); | ||
20 | void setProgressTotalSteps(int steps); | ||
21 | void setProgress(int progress); | ||
22 | void resetProgress(); | ||
23 | |||
24 | signals: | ||
25 | void stop(); | ||
26 | |||
27 | protected slots: | ||
28 | void stopClicked(); | ||
29 | |||
30 | private: | ||
31 | QLabel *label; | ||
32 | QToolButton *stopButton; | ||
33 | QProgressBar *progress; | ||
34 | |||
35 | }; | ||
36 | |||
37 | #endif | ||
38 | |||
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,7 +1,5 @@ | |||
1 | #include <qprogressbar.h> | ||
2 | #include <qmessagebox.h> | 1 | #include <qmessagebox.h> |
3 | #include <qtoolbutton.h> | ||
4 | #include <qaction.h> | 2 | #include <qaction.h> |
5 | #include <qlabel.h> | ||
6 | 3 | ||
4 | #include "mailstatusbar.h" | ||
7 | #include "folderwidget.h" | 5 | #include "folderwidget.h" |
@@ -18,5 +16,5 @@ MainWindow::MainWindow(QWidget *parent, const char *name, WFlags fl) | |||
18 | { | 16 | { |
19 | stopButton->setEnabled(false); | 17 | status->setStopEnabled(false); |
20 | 18 | ||
21 | connect(folderView, SIGNAL(status(const QString &)), statusLabel, SLOT(setText(const QString &))); | 19 | connect(folderView, SIGNAL(status(const QString &)), status, SLOT(setStatusText(const QString &))); |
22 | connect(folderView, SIGNAL(folderSelected(Folder)), mailView, SLOT(setFolder(Folder))); | 20 | connect(folderView, SIGNAL(folderSelected(Folder)), mailView, SLOT(setFolder(Folder))); |
@@ -24,9 +22,9 @@ MainWindow::MainWindow(QWidget *parent, const char *name, WFlags fl) | |||
24 | connect(mailView, SIGNAL(mailClicked(IMAPResponseFETCH, IMAPHandler *)), SLOT(mailClicked(IMAPResponseFETCH, IMAPHandler *))); | 22 | connect(mailView, SIGNAL(mailClicked(IMAPResponseFETCH, IMAPHandler *)), SLOT(mailClicked(IMAPResponseFETCH, IMAPHandler *))); |
25 | connect(mailView, SIGNAL(status(const QString &)), statusLabel, SLOT(setText(const QString &))); | 23 | connect(mailView, SIGNAL(status(const QString &)), status, SLOT(setStatusText(const QString &))); |
26 | connect(mailView, SIGNAL(totalSteps(int)), statusProgress, SLOT(setTotalSteps(int))); | 24 | connect(mailView, SIGNAL(totalSteps(int)), status, SLOT(setProgressTotalSteps(int))); |
27 | connect(mailView, SIGNAL(progress(int)), statusProgress, SLOT(setProgress(int))); | 25 | connect(mailView, SIGNAL(progress(int)), status, SLOT(setProgress(int))); |
28 | connect(mailView, SIGNAL(resetProgress()), statusProgress, SLOT(reset())); | 26 | connect(mailView, SIGNAL(resetProgress()), status, SLOT(resetProgress())); |
29 | connect(mailView, SIGNAL(stopEnabled(bool)), stopButton, SLOT(setEnabled(bool))); | 27 | connect(mailView, SIGNAL(stopEnabled(bool)), status, SLOT(setStopEnabled(bool))); |
30 | 28 | ||
31 | connect(stopButton, SIGNAL(clicked()), mailView, SLOT(stop())); | 29 | connect(status, SIGNAL(stop()), mailView, SLOT(stop())); |
32 | 30 | ||
diff --git a/noncore/unsupported/mail2/mainwindowbase.cpp b/noncore/unsupported/mail2/mainwindowbase.cpp index bffe8b3..e35d489 100644 --- a/noncore/unsupported/mail2/mainwindowbase.cpp +++ b/noncore/unsupported/mail2/mainwindowbase.cpp | |||
@@ -1,3 +1 @@ | |||
1 | #include <qprogressbar.h> | ||
2 | #include <qtoolbutton.h> | ||
3 | #include <qpopupmenu.h> | #include <qpopupmenu.h> | |
@@ -13,2 +11,3 @@ | |||
13 | #include "mainwindowbase.h" | 11 | #include "mainwindowbase.h" |
12 | #include "mailstatusbar.h" | ||
14 | #include "folderwidget.h" | 13 | #include "folderwidget.h" |
@@ -67,18 +66,3 @@ MainWindowBase::MainWindowBase(QWidget *parent, const char *name, WFlags fl) | |||
67 | 66 | ||
68 | QHBox *status = new QHBox(view); | 67 | status = new MailStatusBar(view); |
69 | |||
70 | statusLabel = new QLabel(status); | ||
71 | QFont tmpFont = statusLabel->font(); | ||
72 | tmpFont.setPixelSize(8); | ||
73 | statusLabel->setFont(tmpFont); | ||
74 | |||
75 | stopButton = new QToolButton(status); | ||
76 | stopButton->setText(" X "); | ||
77 | stopButton->setMaximumHeight(15); | ||
78 | stopButton->setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed)); | ||
79 | |||
80 | statusProgress = new QProgressBar(status); | ||
81 | statusProgress->setCenterIndicator(true); | ||
82 | statusProgress->setMaximumHeight(15); | ||
83 | statusProgress->setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed)); | ||
84 | } | 68 | } |
diff --git a/noncore/unsupported/mail2/mainwindowbase.h b/noncore/unsupported/mail2/mainwindowbase.h index 702933a..11c5ea0 100644 --- a/noncore/unsupported/mail2/mainwindowbase.h +++ b/noncore/unsupported/mail2/mainwindowbase.h | |||
@@ -6,5 +6,4 @@ | |||
6 | class ServerConnection; | 6 | class ServerConnection; |
7 | class QProgressBar; | 7 | class MailStatusBar; |
8 | class FolderWidget; | 8 | class FolderWidget; |
9 | class QToolButton; | ||
10 | class QPEToolBar; | 9 | class QPEToolBar; |
@@ -14,3 +13,2 @@ class MailTable; | |||
14 | class QAction; | 13 | class QAction; |
15 | class QLabel; | ||
16 | 14 | ||
@@ -28,5 +26,4 @@ protected: | |||
28 | ServerConnection *serverConnection; | 26 | ServerConnection *serverConnection; |
29 | QProgressBar *statusProgress; | 27 | MailStatusBar *status; |
30 | FolderWidget *folderView; | 28 | FolderWidget *folderView; |
31 | QToolButton *stopButton; | ||
32 | QPEToolBar *toolbar; | 29 | QPEToolBar *toolbar; |
@@ -36,3 +33,2 @@ protected: | |||
36 | QAction *compose, *sendQueue, *folders, *findmails, *configure; | 33 | QAction *compose, *sendQueue, *folders, *findmails, *configure; |
37 | QLabel *statusLabel; | ||
38 | 34 | ||