summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/unsupported/mail2/composer.cpp150
-rw-r--r--noncore/unsupported/mail2/composer.h7
-rw-r--r--noncore/unsupported/mail2/composerbase.cpp3
-rw-r--r--noncore/unsupported/mail2/composerbase.h2
-rw-r--r--noncore/unsupported/mail2/mainwindow.cpp10
-rw-r--r--noncore/unsupported/mail2/mainwindow.h1
-rw-r--r--noncore/unsupported/mail2/mainwindowbase.cpp3
-rw-r--r--noncore/unsupported/mail2/mainwindowbase.h2
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
@@ -9,6 +9,7 @@
#include <qapplication.h>
#include <qpe/resource.h>
+#include <qpe/config.h>
#include "addresspicker.h"
#include "listviewplus.h"
@@ -25,13 +26,15 @@ AttachViewItem::AttachViewItem(QListView *parent, Attachment &attachment)
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()));
@@ -42,6 +45,7 @@ Composer::Composer(QWidget *parent, const char *name, WFlags fl)
QTimer::singleShot(0, this, SLOT(slotFillStuff()));
QTimer::singleShot(0, this, SLOT(slotResizing()));
+
}
Composer::~Composer()
@@ -90,6 +94,11 @@ void Composer::slotResizing()
{
from->setMaximumWidth(width() - fromBox->width());
from->resize(width() - fromBox->width(), y());
+ if (_sendQueued)
+ {
+ slotSendQueued();
+ close();
+ }
}
void Composer::slotPopupHandler(int itemid)
@@ -156,6 +165,144 @@ void Composer::slotSendMail()
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>"));
@@ -241,4 +388,3 @@ 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
@@ -25,7 +25,7 @@ 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();
@@ -33,9 +33,13 @@ public:
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();
@@ -49,6 +53,7 @@ protected:
QValueList<Account> accountsLoaded;
private:
+ bool _sendQueued;
bool _inLoop;
QString _inReplyTo;
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
@@ -26,6 +26,9 @@ ComposerBase::ComposerBase(QWidget *parent, const char *name, WFlags fl)
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)));
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
@@ -41,7 +41,7 @@ protected:
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:
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
@@ -30,6 +30,7 @@ MainWindow::MainWindow(QWidget *parent, const char *name, WFlags fl)
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()));
}
@@ -41,6 +42,15 @@ void MainWindow::slotCompose()
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);
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
@@ -15,6 +15,7 @@ public:
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
@@ -26,6 +26,9 @@ MainWindowBase::MainWindowBase(QWidget *parent, const char *name, WFlags fl)
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)));
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
@@ -27,7 +27,7 @@ protected:
FolderWidget *folderView;
QPEToolBar *toolbar;
MailTable *mailView;
- QAction *compose, *folders, *findmails, *configure, *stop;
+ QAction *compose, *sendQueue, *folders, *findmails, *configure, *stop;
QLabel *statusLabel;
};