author | tille <tille> | 2002-06-18 13:49:13 (UTC) |
---|---|---|
committer | tille <tille> | 2002-06-18 13:49:13 (UTC) |
commit | 99cf287037a0d9f99e4fc035d1b9f6db08bb6583 (patch) (side-by-side diff) | |
tree | 6c4707892003f6bfb1b4b088d57aba109ef63a4a | |
parent | 1e6635662a329dc8f7958b29044e1ce843ff7208 (diff) | |
download | opie-99cf287037a0d9f99e4fc035d1b9f6db08bb6583.zip opie-99cf287037a0d9f99e4fc035d1b9f6db08bb6583.tar.gz opie-99cf287037a0d9f99e4fc035d1b9f6db08bb6583.tar.bz2 |
added queue mail support
-rw-r--r-- | noncore/unsupported/mail2/composer.cpp | 150 | ||||
-rw-r--r-- | noncore/unsupported/mail2/composer.h | 7 | ||||
-rw-r--r-- | noncore/unsupported/mail2/composerbase.cpp | 3 | ||||
-rw-r--r-- | noncore/unsupported/mail2/composerbase.h | 2 | ||||
-rw-r--r-- | noncore/unsupported/mail2/mainwindow.cpp | 10 | ||||
-rw-r--r-- | noncore/unsupported/mail2/mainwindow.h | 1 | ||||
-rw-r--r-- | noncore/unsupported/mail2/mainwindowbase.cpp | 3 | ||||
-rw-r--r-- | noncore/unsupported/mail2/mainwindowbase.h | 2 |
8 files changed, 173 insertions, 5 deletions
diff --git a/noncore/unsupported/mail2/composer.cpp b/noncore/unsupported/mail2/composer.cpp index c36d973..cabffe5 100644 --- a/noncore/unsupported/mail2/composer.cpp +++ b/noncore/unsupported/mail2/composer.cpp @@ -6,12 +6,13 @@ #include <qaction.h> #include <qtimer.h> #include <qlabel.h> #include <qapplication.h> #include <qpe/resource.h> +#include <qpe/config.h> #include "addresspicker.h" #include "listviewplus.h" #include "smtphandler.h" #include "attachdiag.h" #include "composer.h" @@ -22,29 +23,32 @@ AttachViewItem::AttachViewItem(QListView *parent, Attachment &attachment) { setPixmap(0, _attachment.docLnk().pixmap().isNull() ? Resource::loadPixmap("UnknownDocument-14") : _attachment.docLnk().pixmap()); setText(0, _attachment.newName().isEmpty() ? _attachment.fileName() : _attachment.newName()); setText(1, _attachment.description()); } -Composer::Composer(QWidget *parent, const char *name, WFlags fl) +Composer::Composer(QWidget *parent, const char *name, WFlags fl, bool sendQueue) : ComposerBase(parent, name, fl), _inLoop(false) { + _sendQueued = sendQueue; abort->setEnabled(false); to->setFocus(); connect(sendmail, SIGNAL(activated()), SLOT(slotSendMail())); + connect(queuemail, SIGNAL(activated()), SLOT(slotQueueMail())); connect(addressbook, SIGNAL(activated()), SLOT(slotOpenAddressPicker())); connect(addattach, SIGNAL(activated()), SLOT(slotAddAttach())); connect(delattach, SIGNAL(activated()), SLOT(slotDelAttach())); connect(from, SIGNAL(activated(int)), SLOT(slotFromChanged(int))); connect(attachPopup, SIGNAL(activated(int)), SLOT(slotPopupHandler(int))); QTimer::singleShot(0, this, SLOT(slotFillStuff())); QTimer::singleShot(0, this, SLOT(slotResizing())); + } Composer::~Composer() { hide(); } @@ -87,12 +91,17 @@ void Composer::setSendMail(SendMail &sendMail) } void Composer::slotResizing() { from->setMaximumWidth(width() - fromBox->width()); from->resize(width() - fromBox->width(), y()); + if (_sendQueued) + { + slotSendQueued(); + close(); + } } void Composer::slotPopupHandler(int itemid) { if (attachView->currentItem() == NULL) { QMessageBox::information(this, tr("Error"), tr("Please select an entry first."), tr("Ok")); @@ -153,12 +162,150 @@ void Composer::slotSendMail() 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 &))); } +void Composer::slotSendQueued() +{ + + qDebug("Sending queued messages"); + Config cfg( "mailqueue", Config::User ); + cfg.setGroup( "Settings" ); + int count = cfg.readNumEntry( "count", 0 ); + // tille: should not be here + // but no error checking for the moment + cfg.writeEntry( "count", 0 ); + + + qDebug("%i messages to send", count); + QString str; + for (int i=1;i<=count;i++) + { + qDebug("sending message %i",i); + cfg.setGroup( "Mail_" + QString::number(i) ); + SendMail smail; + str = cfg.readEntry("from"); + qDebug("setFrom %s",str.latin1()); + smail.setFrom( str ); + str = cfg.readEntry("reply"); + qDebug("setReplyTo %s",str.latin1()); + smail.setReplyTo( str ); + QString toAdr = cfg.readEntry("to"); + qDebug("to %s",toAdr.latin1()); + smail.setTo( toAdr ); //to->text()); + str = cfg.readEntry("cc"); + qDebug("setCc %s",str.latin1()); + smail.setCc( str ); //cc->text()); + smail.setBcc( cfg.readEntry("bcc") ); //bcc->text()); + str = cfg.readEntry("subject"); + qDebug("setSubject %s",str.latin1()); + smail.setSubject( str ); //subject->text()); + str = cfg.readEntryCrypt("message"); + qDebug("setMessage %s",str.latin1()); + smail.setMessage( str ); //message->text()); + smail.setNeedsMime( cfg.readBoolEntry("mime") ); //attachView->childCount() == 0 ? false : true); + + qDebug("setting account [%i]",cfg.readNumEntry("account")); + Account accnt = accountsLoaded[ cfg.readNumEntry("account") ]; + smail.setAccount( accnt ); //accountsLoaded[from->currentItem()]); + + + int prio = cfg.readNumEntry( "priority" ); + qDebug("setting priority %i",prio); + if (prio == POPUP_PRIO_LOW) { + smail.setPriority("Low"); // No i18n on purpose + } else if (prio == POPUP_PRIO_NORMAL) { + smail.setPriority("Normal"); // No i18n on purpose + } else if (prio == POPUP_PRIO_HIGH) { + smail.setPriority("High"); // No i18n on purpose + } + + QValueList<Attachment> attachments; + Attachment a; + QString an; + + int ac = cfg.readNumEntry( "attachments", 0 ); + qDebug("%i Attachments",ac); + for (int j = 0; i < ac; ac++) { + an = "Attachment_" + QString::number( j ); + qDebug(an.latin1()); + a.setFileName(cfg.readEntry( an + "fileName" )); + a.setNewName(cfg.readEntry( an + "newName" )); + a.setDescription(cfg.readEntry( an + "description" )); + a.setDocLnk( DocLnk( cfg.readEntry( an + "docLnk" )) ); + attachments.append( a ); + } + + smail.setAttachments(attachments); + + qDebug("putting mail together"); + + QString header, message; + MailFactory::genMail(header, message, smail, this); + if (header.isNull() || message.isNull()) continue;//return; // Aborted. + + // abort->setEnabled(true); + + qDebug("Sending to %s",toAdr.latin1()); + SmtpHandler *handler = new SmtpHandler(header, message, accnt ,toAdr); + + 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 &))); + + qDebug("remove mail %i", i); + cfg.clearGroup(); + cfg.removeEntry( "Mail_" + QString::number(i) ); + } +} + +void Composer::slotQueueMail() +{ + if (to->text().find(QRegExp(".*\\@.*\\..*")) == -1) { + QMessageBox::information(this, tr("Error"), tr("<p>You have to specify a recipient.<br>(eg: foo@bar.org)</p>"), tr("Ok")); + return; + } + + Config cfg( "mailqueue", Config::User ); + + cfg.setGroup( "Settings" ); + int count = cfg.readNumEntry( "count", 0 ); + count++; + cfg.writeEntry( "count", count ); + qDebug("queueing mail %i",count); + + cfg.setGroup( "Mail_" + QString::number( count )); + cfg.writeEntry( "from", from->currentText() ); + cfg.writeEntry( "reply", replyto->text()); + cfg.writeEntry( "to", to->text()); + cfg.writeEntry( "cc", cc->text()); + cfg.writeEntry( "bcc", bcc->text()); + cfg.writeEntry( "subject", subject->text()); + cfg.writeEntryCrypt( "message", message->text()); + cfg.writeEntry( "mime", attachView->childCount() == 0 ); + cfg.writeEntry( "account", from->currentItem()); + cfg.writeEntry( "priority", priority->currentItem() ); + cfg.writeEntry( "attachments", attachView->childCount() ); + + Attachment a; + QListViewItem *item; + QString an; + int i = 0; + for (item = attachView->firstChild(); item != 0; item = item->itemBelow()) { + a = ((AttachViewItem *)item)->attachment(); + an = "Attachment_" + QString::number( i++ ); + cfg.writeEntry( an + "fileName", a.fileName() ); + cfg.writeEntry( an + "newName", a.newName() ); + cfg.writeEntry( an + "description", a.description() ); + cfg.writeEntry( an + "docLnk", a.docLnk().file() ); + } + + // cfg.close(); +} + void Composer::slotSendError(const QString &error) { status->setText(tr("<font color=#ff0000>Error occoured during sending.</font>")); QMessageBox::warning(this, tr("Error"), tr("<p>%1</p").arg(error), tr("Ok")); } @@ -238,7 +385,6 @@ void Composer::slotAddAttach() void Composer::slotDelAttach() { if (attachView->currentItem() == NULL) return; attachView->takeItem(attachView->currentItem()); } - diff --git a/noncore/unsupported/mail2/composer.h b/noncore/unsupported/mail2/composer.h index 2640d7e..00235bf 100644 --- a/noncore/unsupported/mail2/composer.h +++ b/noncore/unsupported/mail2/composer.h @@ -22,23 +22,27 @@ private: class Composer : public ComposerBase { Q_OBJECT public: - Composer(QWidget *parent = 0, const char *name = 0, WFlags fl = Qt::WType_Modal); + Composer(QWidget *parent = 0, const char *name = 0, WFlags fl = Qt::WType_Modal, bool sendQueue = false); ~Composer(); void hide(); void exec(); void setSendMail(SendMail &sendMail); +public slots: + void slotSendQueued(); + protected slots: void slotPopupHandler(int itemid); void slotSendMail(); + void slotQueueMail(); void slotSendError(const QString &); void slotSendFinished(); void slotResizing(); void slotFillStuff(); void slotFromChanged(int id); void slotOpenAddressPicker(); @@ -46,12 +50,13 @@ protected slots: void slotDelAttach(); protected: QValueList<Account> accountsLoaded; private: + bool _sendQueued; bool _inLoop; QString _inReplyTo; }; #endif diff --git a/noncore/unsupported/mail2/composerbase.cpp b/noncore/unsupported/mail2/composerbase.cpp index 10d567d..6627701 100644 --- a/noncore/unsupported/mail2/composerbase.cpp +++ b/noncore/unsupported/mail2/composerbase.cpp @@ -23,12 +23,15 @@ ComposerBase::ComposerBase(QWidget *parent, const char *name, WFlags fl) addToolBar(toolbar); toolbar->setHorizontalStretchable(true); sendmail = new QAction(tr("Send the mail"), QIconSet(Resource::loadPixmap("mail/sendmail")), 0, 0, this); sendmail->addTo(toolbar); + queuemail = new QAction(tr("Queue the mail"), QIconSet(Resource::loadPixmap("mail/sendall")), 0, 0, this); + queuemail->addTo(toolbar); + attachfile = new QAction(tr("Attach a file"), QIconSet(Resource::loadPixmap("mail/attach")), 0, 0, this, 0, true); attachfile->addTo(toolbar); connect(attachfile, SIGNAL(toggled(bool)), SLOT(slotAttachfileChanged(bool))); addressbook = new QAction(tr("Addressbook"), QIconSet(Resource::loadPixmap("mail/addbook")), 0, 0, this); addressbook->addTo(toolbar); diff --git a/noncore/unsupported/mail2/composerbase.h b/noncore/unsupported/mail2/composerbase.h index 75b77f4..9d3e4fc 100644 --- a/noncore/unsupported/mail2/composerbase.h +++ b/noncore/unsupported/mail2/composerbase.h @@ -38,13 +38,13 @@ protected: ListViewPlus *attachView; QMainWindow *attachWindow; QPopupMenu *attachPopup; QPEToolBar *toolbar, *attachToolbar; QComboBox *fromBox, *from, *receiversBox, *subjectBox, *priority; QLineEdit *replyto, *to, *cc, *bcc, *subject; - QAction *sendmail, *attachfile, *addressbook, *abort, *addattach, *delattach; + QAction *sendmail, *queuemail, *attachfile, *addressbook, *abort, *addattach, *delattach; QLabel *fromLabel, *status; protected slots: void slotAttachfileChanged(bool toggled); void slotFromMenuChanged(int id); void slotReceiverMenuChanged(int id); diff --git a/noncore/unsupported/mail2/mainwindow.cpp b/noncore/unsupported/mail2/mainwindow.cpp index 2230dc0..652db94 100644 --- a/noncore/unsupported/mail2/mainwindow.cpp +++ b/noncore/unsupported/mail2/mainwindow.cpp @@ -27,23 +27,33 @@ MainWindow::MainWindow(QWidget *parent, const char *name, WFlags fl) connect(mailView, SIGNAL(resetProgress()), statusProgress, SLOT(reset())); connect(mailView, SIGNAL(stopEnabled(bool)), stop, SLOT(setEnabled(bool))); connect(stop, SIGNAL(activated()), mailView, SLOT(stop())); connect(compose, SIGNAL(activated()), SLOT(slotCompose())); + connect(sendQueue, SIGNAL(activated()), SLOT(slotSendQueued())); connect(findmails, SIGNAL(activated()), SLOT(slotSearch())); connect(configure, SIGNAL(activated()), SLOT(slotConfigure())); } void MainWindow::slotCompose() { Composer composer(this, 0, true); composer.showMaximized(); composer.exec(); } +void MainWindow::slotSendQueued() +{ + Composer composer(this, 0, true, true); +// composer.sendQueue(); + composer.showMaximized(); + composer.exec(); +// composer.close(); +} + void MainWindow::slotSearch() { SearchDiag searchDiag(this, 0, true); searchDiag.showMaximized(); searchDiag.exec(); } diff --git a/noncore/unsupported/mail2/mainwindow.h b/noncore/unsupported/mail2/mainwindow.h index 1edf10b..27b527d 100644 --- a/noncore/unsupported/mail2/mainwindow.h +++ b/noncore/unsupported/mail2/mainwindow.h @@ -12,12 +12,13 @@ class MainWindow : public MainWindowBase public: MainWindow(QWidget *parent = 0, const char *name = 0, WFlags fl = 0); protected slots: void slotCompose(); + void slotSendQueued(); void slotSearch(); void slotConfigure(); void mailClicked(IMAPResponseFETCH mail, IMAPHandler *handler); }; diff --git a/noncore/unsupported/mail2/mainwindowbase.cpp b/noncore/unsupported/mail2/mainwindowbase.cpp index c55bd90..24f030f 100644 --- a/noncore/unsupported/mail2/mainwindowbase.cpp +++ b/noncore/unsupported/mail2/mainwindowbase.cpp @@ -23,12 +23,15 @@ MainWindowBase::MainWindowBase(QWidget *parent, const char *name, WFlags fl) addToolBar(toolbar); toolbar->setHorizontalStretchable(true); compose = new QAction(tr("Compose new mail"), QIconSet(Resource::loadPixmap("mail/newmail")), 0, 0, this); compose->addTo(toolbar); + sendQueue = new QAction(tr("Send queued mails"), QIconSet(Resource::loadPixmap("mail/sendqueue")), 0, 0, this); + sendQueue->addTo(toolbar); + folders = new QAction(tr("Show/hide folders"), QIconSet(Resource::loadPixmap("mail/folder")), 0, 0, this, 0, true); folders->addTo(toolbar); connect(folders, SIGNAL(toggled(bool)), SLOT(slotFoldersToggled(bool))); findmails = new QAction(tr("Search mails"), QIconSet(Resource::loadPixmap("mail/find")), 0, 0, this); findmails->addTo(toolbar); diff --git a/noncore/unsupported/mail2/mainwindowbase.h b/noncore/unsupported/mail2/mainwindowbase.h index 0776f02..232d656 100644 --- a/noncore/unsupported/mail2/mainwindowbase.h +++ b/noncore/unsupported/mail2/mainwindowbase.h @@ -24,12 +24,12 @@ protected slots: protected: ServerConnection *serverConnection; QProgressBar *statusProgress; FolderWidget *folderView; QPEToolBar *toolbar; MailTable *mailView; - QAction *compose, *folders, *findmails, *configure, *stop; + QAction *compose, *sendQueue, *folders, *findmails, *configure, *stop; QLabel *statusLabel; }; #endif |