summaryrefslogtreecommitdiff
path: root/noncore/unsupported/mail2/composer.cpp
Side-by-side diff
Diffstat (limited to 'noncore/unsupported/mail2/composer.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/unsupported/mail2/composer.cpp18
1 files changed, 9 insertions, 9 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
@@ -13,6 +13,6 @@
#include <opie/ofiledialog.h>
-//#include "attachdiag.h"
+#include "mailstatusbar.h"
#include "addresspicker.h"
#include "listviewplus.h"
@@ -33,5 +33,5 @@ Composer::Composer(QWidget *parent, const char *name, WFlags fl, bool sendQueue)
{
_sendQueued = sendQueue;
- abort->setEnabled(false);
+ status->setStopEnabled(false);
to->setFocus();
@@ -155,10 +155,10 @@ void Composer::slotSendMail()
if (header.isNull() || message.isNull()) return; // Aborted.
- abort->setEnabled(true);
+ status->setStopEnabled(true);
SmtpHandler *handler = new SmtpHandler(header, message, accountsLoaded[from->currentItem()], to->text());
connect(handler, SIGNAL(finished()), SLOT(slotSendFinished()));
connect(handler, SIGNAL(error(const QString &)), SLOT(slotSendError(const QString &)));
- connect(handler, SIGNAL(status(const QString &)), status, SLOT(setText(const QString &)));
+ connect(handler, SIGNAL(status(const QString &)), status, SLOT(setStatusText(const QString &)));
}
@@ -249,5 +249,5 @@ void Composer::slotSendQueued()
connect(handler, SIGNAL(finished()), SLOT(slotSendQueuedFinished()));
connect(handler, SIGNAL(error(const QString &)), SLOT(slotSendQueuedError(const QString &)));
- connect(handler, SIGNAL(status(const QString &)), status, SLOT(setText(const QString &)));
+ connect(handler, SIGNAL(status(const QString &)), status, SLOT(setStatusText(const QString &)));
}
@@ -306,5 +306,5 @@ void Composer::slotQueueMail()
void Composer::slotSendError(const QString &error)
{
- status->setText(tr("<font color=#ff0000>Error occoured during sending.</font>"));
+ status->setStatusText(tr("<font color=#ff0000>Error occoured during sending.</font>"));
QMessageBox::warning(this, tr("Error"), tr("<p>%1</p").arg(error), tr("Ok"));
}
@@ -314,5 +314,5 @@ void Composer::slotSendQueuedError(const QString &error)
_sendError++;
qDebug("error send mail %i",_sendCount);
- status->setText(tr("<font color=#ff0000>Error occoured during sending.</font>"));
+ status->setStatusText(tr("<font color=#ff0000>Error occoured during sending.</font>"));
QMessageBox::warning(this, tr("Error"), tr("<p>%1</p").arg(error), tr("Ok"));
}
@@ -322,6 +322,6 @@ void Composer::slotSendFinished()
QMessageBox::information(this, tr("Success"), tr("<p>The mail was sent successfully.</p>"), tr("Ok"));
- status->setText(QString(0));
- abort->setEnabled(false);
+ status->setStatusText(QString(0));
+ status->setStopEnabled(false);
}