| -rw-r--r-- | noncore/net/mailit/emailclient.cpp | 130 | ||||
| -rw-r--r-- | noncore/net/mailit/emailclient.h | 11 | ||||
| -rw-r--r-- | noncore/net/mailit/emailhandler.cpp | 4 | ||||
| -rw-r--r-- | noncore/net/mailit/emailhandler.h | 1 | ||||
| -rw-r--r-- | noncore/net/mailit/mailitwindow.cpp | 3 | ||||
| -rw-r--r-- | noncore/net/mailit/popclient.cpp | 4 | ||||
| -rw-r--r-- | noncore/net/mailit/readmail.cpp | 62 | ||||
| -rw-r--r-- | noncore/net/mailit/readmail.h | 8 | ||||
| -rw-r--r-- | noncore/net/mailit/writemail.cpp | 31 | ||||
| -rw-r--r-- | noncore/unsupported/mailit/emailclient.cpp | 130 | ||||
| -rw-r--r-- | noncore/unsupported/mailit/emailclient.h | 11 | ||||
| -rw-r--r-- | noncore/unsupported/mailit/emailhandler.cpp | 4 | ||||
| -rw-r--r-- | noncore/unsupported/mailit/emailhandler.h | 1 | ||||
| -rw-r--r-- | noncore/unsupported/mailit/mailitwindow.cpp | 3 | ||||
| -rw-r--r-- | noncore/unsupported/mailit/popclient.cpp | 4 | ||||
| -rw-r--r-- | noncore/unsupported/mailit/readmail.cpp | 62 | ||||
| -rw-r--r-- | noncore/unsupported/mailit/readmail.h | 8 | ||||
| -rw-r--r-- | noncore/unsupported/mailit/writemail.cpp | 31 |
18 files changed, 386 insertions, 122 deletions
diff --git a/noncore/net/mailit/emailclient.cpp b/noncore/net/mailit/emailclient.cpp index dff1888..2cedc51 100644 --- a/noncore/net/mailit/emailclient.cpp +++ b/noncore/net/mailit/emailclient.cpp @@ -20,4 +20,5 @@ #include <qapplication.h> #include <qmessagebox.h> +#include <qvbox.h> #include <qfile.h> #include <qcheckbox.h> @@ -27,4 +28,5 @@ #include <qpe/resource.h> #include "emailclient.h" +#include "writemail.h" QCollection::Item AccountList::newItem(QCollection::Item d) @@ -54,4 +56,6 @@ EmailClient::EmailClient( QWidget* parent, const char* name, WFlags fl ) init(); + + connect(emailHandler, SIGNAL(mailSent()), this, SLOT(mailSent()) ); @@ -67,5 +71,4 @@ EmailClient::EmailClient( QWidget* parent, const char* name, WFlags fl ) connect(inboxView, SIGNAL(clicked(QListViewItem *)), this, SLOT(inboxItemReleased()) ); - connect(emailHandler, SIGNAL(mailArrived(const Email &, bool)), this, SLOT(mailArrived(const Email &, bool)) ); @@ -85,4 +88,9 @@ EmailClient::EmailClient( QWidget* parent, const char* name, WFlags fl ) mailboxView->setCurrentTab(0); //ensure that inbox has focus + + /*channel = new QCopChannel( "QPE/Application/mailit", this ); + connect( channel, SIGNAL(received(const QCString&, const QByteArray&)), + this, SLOT(receive(const QCString&, const QByteArray&)) );*/ + } @@ -105,26 +113,5 @@ EmailClient::~EmailClient() void EmailClient::init() { - statusBar = new QStatusBar(this); - statusBar->setSizeGripEnabled(FALSE); - - status1Label = new QLabel( tr("Idle"), statusBar); - status2Label = new QLabel("", statusBar); - connect(emailHandler, SIGNAL(updatePopStatus(const QString &)), - status2Label, SLOT(setText(const QString &)) ); - connect(emailHandler, SIGNAL(updateSmtpStatus(const QString &)), - status2Label, SLOT(setText(const QString &)) ); - - progressBar = new QProgressBar(statusBar); - - connect(emailHandler, SIGNAL(mailboxSize(int)), - this, SLOT(setTotalSize(int)) ); - connect(emailHandler, SIGNAL(currentMailSize(int)), - this, SLOT(setMailSize(int)) ); - connect(emailHandler, SIGNAL(downloadedSize(int)), - this, SLOT(setDownloadedSize(int)) ); - - statusBar->addWidget(status1Label); - statusBar->addWidget(progressBar); - statusBar->addWidget(status2Label); + initStatusBar(this); setToolBarsMovable(FALSE); @@ -195,6 +182,9 @@ void EmailClient::init() inboxView->setMinimumSize( QSize( 0, 0 ) ); inboxView->setAllColumnsShowFocus(TRUE); - QWhatsThis::add(inboxView,QWidget::tr("This is the inbox view.\n It keeps the fetched mail which can be viewed by double clicking the entry.\n" - " A blue attachment icon shows whether this mail has attachments.")); + QWhatsThis::add(inboxView,QWidget::tr("This is the inbox view.\n" + "It keeps the fetched mail which can be \n" + "viewed by double clicking the entry.\n" + "blue attachment icon shows whether this \n" + "mailhas attachments.\n")); grid_2->addWidget( inboxView, 2, 0 ); @@ -211,5 +201,7 @@ void EmailClient::init() outboxView->setAllColumnsShowFocus(TRUE); - QWhatsThis::add(outboxView,QWidget::tr("This is the oubox view.\n It keeps the queued mails to send which can be reviewed by double clicking the entry.")); + QWhatsThis::add(outboxView,QWidget::tr("This is the outbox view.\n" + "It keeps the queued mails to send which can be \n" + "reviewed by double clicking the entry.")); grid_3->addWidget( outboxView, 0, 0 ); mailboxView->addTab( widget_2,"mailit/outbox", tr( "Outbox" ) ); @@ -219,4 +211,31 @@ void EmailClient::init() } +void EmailClient::initStatusBar(QWidget* parent) +{ + statusBar = new QStatusBar(parent); + statusBar->setSizeGripEnabled(FALSE); + + status1Label = new QLabel( tr("Idle"), statusBar); + status2Label = new QLabel("", statusBar); + connect(emailHandler, SIGNAL(updatePopStatus(const QString &)), + status2Label, SLOT(setText(const QString &)) ); + connect(emailHandler, SIGNAL(updateSmtpStatus(const QString &)), + status2Label, SLOT(setText(const QString &)) ); + + progressBar = new QProgressBar(statusBar); + + connect(emailHandler, SIGNAL(mailboxSize(int)), + this, SLOT(setTotalSize(int)) ); + connect(emailHandler, SIGNAL(currentMailSize(int)), + this, SLOT(setMailSize(int)) ); + connect(emailHandler, SIGNAL(downloadedSize(int)), + this, SLOT(setDownloadedSize(int)) ); + + statusBar->addWidget(status1Label); + statusBar->addWidget(progressBar); + statusBar->addWidget(status2Label); + +} + void EmailClient::compose() { @@ -320,5 +339,5 @@ void EmailClient::getNewMail() { //get any previous mails not downloaded and add to queue - mailDownloadList.clear(); + /*mailDownloadList.clear(); Email *mailPtr; item = (EmailListItem *) inboxView->firstChild(); @@ -329,5 +348,5 @@ void EmailClient::getNewMail() { } item = (EmailListItem *) item->nextSibling(); - } + }*/ emailHandler->getMailHeaders(); @@ -352,4 +371,5 @@ void EmailClient::mailArrived(const Email &mail, bool fromDisk) if (fromDisk) { + newMail.downloaded = mailconf->readBoolEntry("downloaded"); newMail.size = mailconf->readNumEntry("size"); @@ -359,4 +379,5 @@ void EmailClient::mailArrived(const Email &mail, bool fromDisk) else { //mail arrived from server + newMail.serverId = mail.serverId; newMail.size = mail.size; @@ -919,5 +940,5 @@ void EmailClient::inboxItemReleased() } -void EmailClient::timerEvent(QTimerEvent *e) +/*void EmailClient::timerEvent(QTimerEvent *e) { /*killTimer(timerID); @@ -936,6 +957,6 @@ void EmailClient::timerEvent(QTimerEvent *e) if (action) delete action; - */ -} + +}*/ Email* EmailClient::getCurrentMail() @@ -954,6 +975,4 @@ void EmailClient::download(Email* mail) tempMailDownloadList.clear(); tempMailDownloadList.sizeInsert(mail->serverId, mail->size); - if (accountList.count()>0) - qDebug("Accounts present"); acc=accountList.at(mail->fromAccountId-1); @@ -967,2 +986,47 @@ void EmailClient::download(Email* mail) tr("No account associated"), tr("There is no active account \nassociated to this mail\n it can not be downloaded"), "Abort\n"); } + +void EmailClient::receive(const QCString& msg, const QByteArray& data) +{ + /*if (msg=="getMail()") + { + /*QDialog qd(qApp->activeWindow(),"Getting mail",true); + QVBoxLayout *vbProg = new QVBoxLayout( &qd ); + + initStatusBar(&qd); + + if (statusBar==0) + { + qDebug("No Bar ..."); + //statusBar=new ProgressBar(&qd); + } + statusBar->show(); + vbProg->addWidget(statusBar); + qd.showMaximized(); + qd.show(); + emit getAllNewMail(); + //qd.exec(); + } + else if (msg=="compose()") + { + QDialog qd(qApp->activeWindow(),"Getting mail",true); + + WriteMail wm(&qd,"write new mail"); + QVBoxLayout vbProg( &qd ); + + wm.showMaximized(); + vbProg.addWidget(&wm); + + qd.showMaximized(); + + emit composeRequested(); + qd.exec(); + + QMessageBox::warning(qApp->activeWindow(),tr("Info"), tr("Info"), "OK\n"); + } + + else if (msg=="dialog()") + { + QMessageBox::warning(qApp->activeWindow(),tr("Info"), tr("Info"), "OK\n"); + }*/ +} diff --git a/noncore/net/mailit/emailclient.h b/noncore/net/mailit/emailclient.h index 549683b..994fec5 100644 --- a/noncore/net/mailit/emailclient.h +++ b/noncore/net/mailit/emailclient.h @@ -42,4 +42,5 @@ #include <stdlib.h> #include <opie/otabwidget.h> +#include <qpe/qcopenvelope_qws.h> #include <qtimer.h> @@ -71,8 +72,7 @@ public: ~EmailClient(); AddressList* getAdrListRef(); - void download(Email*); protected: - void timerEvent(QTimerEvent*); + //void timerEvent(QTimerEvent*); signals: @@ -117,4 +117,5 @@ public slots: void setDownloadedSize(int); void moveMailFront(Email *mailPtr); + void download(Email*); /* void reply(); void replyAll(); @@ -122,6 +123,10 @@ public slots: void remove();*/ +private slots: + void receive(const QCString&, const QByteArray&); + private: void init(); + void initStatusBar(QWidget*); void readMail(); QString getPath(bool enclosurePath); @@ -147,4 +152,6 @@ private: MailAccount account, *currentAccount; + QCopChannel* channel; + QToolBar *bar; QProgressBar *progressBar; diff --git a/noncore/net/mailit/emailhandler.cpp b/noncore/net/mailit/emailhandler.cpp index fbbada7..c7b27a0 100644 --- a/noncore/net/mailit/emailhandler.cpp +++ b/noncore/net/mailit/emailhandler.cpp @@ -40,4 +40,6 @@ Enclosure* EnclosureList::dupl(Enclosure *in) EmailHandler::EmailHandler() { + qDebug("EMailHandler::EmailHandler"); + smtpClient = new SmtpClient(); popClient = new PopClient(); @@ -116,4 +118,5 @@ void EmailHandler::getMailHeaders() headers = TRUE; popClient->headersOnly(headers, mailAccount.syncLimit); //less than requested syncLimit, download all + qDebug("Initiating connection"); popClient->newConnection(mailAccount.popServer, 110); } @@ -627,2 +630,3 @@ void EmailHandler::cancel() smtpClient->errorHandling(ErrCancel); } + diff --git a/noncore/net/mailit/emailhandler.h b/noncore/net/mailit/emailhandler.h index b645868..5b59f65 100644 --- a/noncore/net/mailit/emailhandler.h +++ b/noncore/net/mailit/emailhandler.h @@ -29,4 +29,5 @@ #include <qstringlist.h> #include <qcollection.h> +#include <qpe/qcopenvelope_qws.h> #include "smtpclient.h" diff --git a/noncore/net/mailit/mailitwindow.cpp b/noncore/net/mailit/mailitwindow.cpp index ffee67e..a111241 100644 --- a/noncore/net/mailit/mailitwindow.cpp +++ b/noncore/net/mailit/mailitwindow.cpp @@ -62,4 +62,7 @@ MailItWindow::MailItWindow(QWidget *parent, const char *name, WFlags fl) connect(emailClient, SIGNAL(newCaption(const QString &)), this, SLOT(updateCaption(const QString &)) ); + + connect(readMail, SIGNAL(download(Email *)), emailClient, SLOT(download(Email*)) ); + viewingMail = FALSE; } diff --git a/noncore/net/mailit/popclient.cpp b/noncore/net/mailit/popclient.cpp index 6105d09..fedc4e2 100644 --- a/noncore/net/mailit/popclient.cpp +++ b/noncore/net/mailit/popclient.cpp @@ -30,4 +30,5 @@ extern "C" { PopClient::PopClient() { + socket = new QSocket(this, "popClient"); connect(socket, SIGNAL(error(int)), this, SLOT(errorHandling(int))); @@ -119,4 +120,5 @@ void PopClient::incomingData() // return; + response = socket->readLine(); @@ -158,4 +160,5 @@ void PopClient::incomingData() *stream << "PASS " << popPassword << "\r\n"; status = Stat; + break; } @@ -274,5 +277,4 @@ void PopClient::incomingData() break; } else { //message reach entire size - if ( (selected)||(mailSize <= headerLimit)) //mail size limit is not used if late download is active { diff --git a/noncore/net/mailit/readmail.cpp b/noncore/net/mailit/readmail.cpp index 4eae7f6..1682675 100644 --- a/noncore/net/mailit/readmail.cpp +++ b/noncore/net/mailit/readmail.cpp @@ -20,6 +20,8 @@ #include "readmail.h" #include <qimage.h> +#include <qwhatsthis.h> #include <qmime.h> #include <qaction.h> +#include <qpopupmenu.h> #include <qpe/resource.h> @@ -43,4 +45,6 @@ void ReadMail::init() setToolBarsMovable(FALSE); + QPopupMenu* mailaction=new QPopupMenu(this); + bar = new QToolBar(this); bar->setHorizontalStretchable( TRUE ); @@ -56,14 +60,8 @@ void ReadMail::init() bar = new QToolBar(this); - //reply dependant on viewing inbox - replyButton = new QAction( tr( "Reply" ), Resource::loadPixmap( "mailit/reply" ), - QString::null, 0, this, 0 ); - connect(replyButton, SIGNAL(activated()), this, SLOT(reply()) ); - replyButton->setWhatsThis(tr("Click here to reply to the selected mail")); + downloadButton = new QAction( tr( "Download" ), Resource::loadPixmap( "mailit/download" ),QString::null, 0, this, 0 ); + connect(downloadButton, SIGNAL(activated()), this, SLOT(download()) ); + downloadButton->setWhatsThis(tr("Click here to download the selected mail")); - forwardButton = new QAction( tr( "Forward" ), Resource::loadPixmap( "mailit/forward" ), - QString::null, 0, this, 0 ); - connect(forwardButton, SIGNAL(activated()), this, SLOT(forward()) ); - forwardButton->setWhatsThis(tr("Click here to forward the selected mail")); previousButton = new QAction( tr( "Previous" ), Resource::loadPixmap( "back" ), QString::null, 0, this, 0 ); @@ -95,4 +93,21 @@ void ReadMail::init() "Click here to switch between those view modes" )); + //reply dependant on viewing inbox + replyButton = new QToolButton(Resource::loadPixmap("mailit/reply"),tr("reply"),tr("reply to mail"), this,SLOT(reply()),bar); + QWhatsThis::add(replyButton,tr("Click here to reply to the selected mail\nPress and hold for more options.")); + replyButton->setPopup(mailaction); + + replyAllButton = new QAction( tr( "Reply all" ), Resource::loadPixmap( "mailit/reply" ),QString::null, 0, this, 0 ); + connect(replyAllButton, SIGNAL(activated()), this, SLOT(replyAll())); + replyAllButton->setWhatsThis(tr("Click here to reply to the selected mail to CC: addresses also")); + replyAllButton->addTo(mailaction); + + forwardButton = new QAction( tr( "Forward" ), Resource::loadPixmap( "mailit/forward" ), + QString::null, 0, this, 0 ); + connect(forwardButton, SIGNAL(activated()), this, SLOT(forward())); + forwardButton->setWhatsThis(tr("Click here to forward the selected mail")); + forwardButton->addTo(mailaction); + + deleteButton = new QAction( tr( "Delete" ), Resource::loadPixmap( "trash" ), QString::null, 0, this, 0 ); connect( deleteButton, SIGNAL( activated() ), this, SLOT( deleteItem() ) ); @@ -120,17 +135,24 @@ void ReadMail::updateView() inbox = mail->received; - replyButton->removeFrom(mailMenu); - replyButton->removeFrom(bar); + replyButton->setEnabled(false); + /*replyButton->removeFrom(bar); forwardButton->removeFrom(mailMenu); - forwardButton->removeFrom(bar); + forwardButton->removeFrom(bar);*/ + downloadButton->removeFrom(bar); + + //downloadButton->setEnabled(!mail->downloaded); + if (inbox == TRUE) { - replyButton->addTo(bar); - replyButton->addTo(mailMenu); + replyButton->setEnabled(true); + /*replyButton->addTo(mailMenu); forwardButton->addTo(bar); - forwardButton->addTo(mailMenu); + forwardButton->addTo(mailMenu);*/ if (!mail->downloaded) { + + downloadButton->addTo(bar); + //report currently viewed mail so that it will be //placed first in the queue of new mails to download @@ -358,4 +380,9 @@ void ReadMail::viewAttachments() void ReadMail::reply() { + emit replyRequested(*mail, (bool&)FALSE); +} + +void ReadMail::replyAll() +{ emit replyRequested(*mail, (bool&)TRUE); } @@ -366,2 +393,7 @@ void ReadMail::forward() } +void ReadMail::download() +{ + emit download(mail); +} + diff --git a/noncore/net/mailit/readmail.h b/noncore/net/mailit/readmail.h index df32c34..6700595 100644 --- a/noncore/net/mailit/readmail.h +++ b/noncore/net/mailit/readmail.h @@ -29,4 +29,5 @@ #include <qlayout.h> #include <qtextview.h> +#include <qtoolbutton.h> #include "emailhandler.h" @@ -51,4 +52,5 @@ signals: void removeItem(EmailListItem *, bool &); void viewingMail(Email *); + void download (Email*); public slots: @@ -60,5 +62,7 @@ public slots: void viewAttachments(); void reply(); + void replyAll(); void forward(); + void download(); private: @@ -83,6 +87,8 @@ private: QAction *attachmentButton; QAction *previousButton; - QAction *replyButton; + QToolButton *replyButton; QAction *forwardButton; + QAction *replyAllButton; + QAction *downloadButton; }; diff --git a/noncore/net/mailit/writemail.cpp b/noncore/net/mailit/writemail.cpp index dcf0c6e..c75494e 100644 --- a/noncore/net/mailit/writemail.cpp +++ b/noncore/net/mailit/writemail.cpp @@ -23,6 +23,5 @@ #include <qpe/resource.h> -WriteMail::WriteMail( QWidget* parent, const char* name, WFlags fl ) - : QMainWindow( parent, name, fl ) +WriteMail::WriteMail( QWidget* parent, const char* name, WFlags fl ):QMainWindow( parent, name, fl ) { showingAddressList = FALSE; @@ -269,9 +268,15 @@ void WriteMail::reply(Email replyMail, bool replyAll) ccInput->setText(ccRecipients); } - - addRecipients(replyAll); + else ccInput->clear(); subjectInput->setText(tr("Re: ") + mail.subject); + QString citation=mail.fromMail; + citation.append(tr(" wrote on ")); + citation.append(mail.date); + citation.append(":\n"); + + + //mail.body.insert(0,tr("On")); pos = 0; mail.body.insert(pos, ">"); @@ -281,5 +286,5 @@ void WriteMail::reply(Email replyMail, bool replyAll) mail.body.insert(++pos, ">>"); } - + mail.body.insert(0,citation); emailInput->setText(mail.body); } @@ -309,7 +314,14 @@ bool WriteMail::getRecipients(bool ccField) int pos = 0; + if (ccField) + { + mail.carbonCopies.clear(); + temp = ccInput->text(); + } + else + { mail.recipients.clear(); - - ccField ? temp = ccInput->text() : temp=toInput->text() ; + temp=toInput->text() ; + } while ( (pos = temp.find(';')) != -1) { @@ -319,5 +331,5 @@ bool WriteMail::getRecipients(bool ccField) return false; ccField ? mail.carbonCopies.append(str) : mail.recipients.append(str); - addressList->addContact(str, ""); + //addressList->addContact(str, ""); } temp = temp.stripWhiteSpace(); @@ -325,5 +337,5 @@ bool WriteMail::getRecipients(bool ccField) return false; ccField ? mail.carbonCopies.append(temp) : mail.recipients.append(temp); - addressList->addContact(temp, ""); + //addressList->addContact(temp, ""); return TRUE; @@ -384,4 +396,5 @@ void WriteMail::newMail() { toInput->clear(); + ccInput->clear(); subjectInput->clear(); emailInput->clear(); diff --git a/noncore/unsupported/mailit/emailclient.cpp b/noncore/unsupported/mailit/emailclient.cpp index dff1888..2cedc51 100644 --- a/noncore/unsupported/mailit/emailclient.cpp +++ b/noncore/unsupported/mailit/emailclient.cpp @@ -20,4 +20,5 @@ #include <qapplication.h> #include <qmessagebox.h> +#include <qvbox.h> #include <qfile.h> #include <qcheckbox.h> @@ -27,4 +28,5 @@ #include <qpe/resource.h> #include "emailclient.h" +#include "writemail.h" QCollection::Item AccountList::newItem(QCollection::Item d) @@ -54,4 +56,6 @@ EmailClient::EmailClient( QWidget* parent, const char* name, WFlags fl ) init(); + + connect(emailHandler, SIGNAL(mailSent()), this, SLOT(mailSent()) ); @@ -67,5 +71,4 @@ EmailClient::EmailClient( QWidget* parent, const char* name, WFlags fl ) connect(inboxView, SIGNAL(clicked(QListViewItem *)), this, SLOT(inboxItemReleased()) ); - connect(emailHandler, SIGNAL(mailArrived(const Email &, bool)), this, SLOT(mailArrived(const Email &, bool)) ); @@ -85,4 +88,9 @@ EmailClient::EmailClient( QWidget* parent, const char* name, WFlags fl ) mailboxView->setCurrentTab(0); //ensure that inbox has focus + + /*channel = new QCopChannel( "QPE/Application/mailit", this ); + connect( channel, SIGNAL(received(const QCString&, const QByteArray&)), + this, SLOT(receive(const QCString&, const QByteArray&)) );*/ + } @@ -105,26 +113,5 @@ EmailClient::~EmailClient() void EmailClient::init() { - statusBar = new QStatusBar(this); - statusBar->setSizeGripEnabled(FALSE); - - status1Label = new QLabel( tr("Idle"), statusBar); - status2Label = new QLabel("", statusBar); - connect(emailHandler, SIGNAL(updatePopStatus(const QString &)), - status2Label, SLOT(setText(const QString &)) ); - connect(emailHandler, SIGNAL(updateSmtpStatus(const QString &)), - status2Label, SLOT(setText(const QString &)) ); - - progressBar = new QProgressBar(statusBar); - - connect(emailHandler, SIGNAL(mailboxSize(int)), - this, SLOT(setTotalSize(int)) ); - connect(emailHandler, SIGNAL(currentMailSize(int)), - this, SLOT(setMailSize(int)) ); - connect(emailHandler, SIGNAL(downloadedSize(int)), - this, SLOT(setDownloadedSize(int)) ); - - statusBar->addWidget(status1Label); - statusBar->addWidget(progressBar); - statusBar->addWidget(status2Label); + initStatusBar(this); setToolBarsMovable(FALSE); @@ -195,6 +182,9 @@ void EmailClient::init() inboxView->setMinimumSize( QSize( 0, 0 ) ); inboxView->setAllColumnsShowFocus(TRUE); - QWhatsThis::add(inboxView,QWidget::tr("This is the inbox view.\n It keeps the fetched mail which can be viewed by double clicking the entry.\n" - " A blue attachment icon shows whether this mail has attachments.")); + QWhatsThis::add(inboxView,QWidget::tr("This is the inbox view.\n" + "It keeps the fetched mail which can be \n" + "viewed by double clicking the entry.\n" + "blue attachment icon shows whether this \n" + "mailhas attachments.\n")); grid_2->addWidget( inboxView, 2, 0 ); @@ -211,5 +201,7 @@ void EmailClient::init() outboxView->setAllColumnsShowFocus(TRUE); - QWhatsThis::add(outboxView,QWidget::tr("This is the oubox view.\n It keeps the queued mails to send which can be reviewed by double clicking the entry.")); + QWhatsThis::add(outboxView,QWidget::tr("This is the outbox view.\n" + "It keeps the queued mails to send which can be \n" + "reviewed by double clicking the entry.")); grid_3->addWidget( outboxView, 0, 0 ); mailboxView->addTab( widget_2,"mailit/outbox", tr( "Outbox" ) ); @@ -219,4 +211,31 @@ void EmailClient::init() } +void EmailClient::initStatusBar(QWidget* parent) +{ + statusBar = new QStatusBar(parent); + statusBar->setSizeGripEnabled(FALSE); + + status1Label = new QLabel( tr("Idle"), statusBar); + status2Label = new QLabel("", statusBar); + connect(emailHandler, SIGNAL(updatePopStatus(const QString &)), + status2Label, SLOT(setText(const QString &)) ); + connect(emailHandler, SIGNAL(updateSmtpStatus(const QString &)), + status2Label, SLOT(setText(const QString &)) ); + + progressBar = new QProgressBar(statusBar); + + connect(emailHandler, SIGNAL(mailboxSize(int)), + this, SLOT(setTotalSize(int)) ); + connect(emailHandler, SIGNAL(currentMailSize(int)), + this, SLOT(setMailSize(int)) ); + connect(emailHandler, SIGNAL(downloadedSize(int)), + this, SLOT(setDownloadedSize(int)) ); + + statusBar->addWidget(status1Label); + statusBar->addWidget(progressBar); + statusBar->addWidget(status2Label); + +} + void EmailClient::compose() { @@ -320,5 +339,5 @@ void EmailClient::getNewMail() { //get any previous mails not downloaded and add to queue - mailDownloadList.clear(); + /*mailDownloadList.clear(); Email *mailPtr; item = (EmailListItem *) inboxView->firstChild(); @@ -329,5 +348,5 @@ void EmailClient::getNewMail() { } item = (EmailListItem *) item->nextSibling(); - } + }*/ emailHandler->getMailHeaders(); @@ -352,4 +371,5 @@ void EmailClient::mailArrived(const Email &mail, bool fromDisk) if (fromDisk) { + newMail.downloaded = mailconf->readBoolEntry("downloaded"); newMail.size = mailconf->readNumEntry("size"); @@ -359,4 +379,5 @@ void EmailClient::mailArrived(const Email &mail, bool fromDisk) else { //mail arrived from server + newMail.serverId = mail.serverId; newMail.size = mail.size; @@ -919,5 +940,5 @@ void EmailClient::inboxItemReleased() } -void EmailClient::timerEvent(QTimerEvent *e) +/*void EmailClient::timerEvent(QTimerEvent *e) { /*killTimer(timerID); @@ -936,6 +957,6 @@ void EmailClient::timerEvent(QTimerEvent *e) if (action) delete action; - */ -} + +}*/ Email* EmailClient::getCurrentMail() @@ -954,6 +975,4 @@ void EmailClient::download(Email* mail) tempMailDownloadList.clear(); tempMailDownloadList.sizeInsert(mail->serverId, mail->size); - if (accountList.count()>0) - qDebug("Accounts present"); acc=accountList.at(mail->fromAccountId-1); @@ -967,2 +986,47 @@ void EmailClient::download(Email* mail) tr("No account associated"), tr("There is no active account \nassociated to this mail\n it can not be downloaded"), "Abort\n"); } + +void EmailClient::receive(const QCString& msg, const QByteArray& data) +{ + /*if (msg=="getMail()") + { + /*QDialog qd(qApp->activeWindow(),"Getting mail",true); + QVBoxLayout *vbProg = new QVBoxLayout( &qd ); + + initStatusBar(&qd); + + if (statusBar==0) + { + qDebug("No Bar ..."); + //statusBar=new ProgressBar(&qd); + } + statusBar->show(); + vbProg->addWidget(statusBar); + qd.showMaximized(); + qd.show(); + emit getAllNewMail(); + //qd.exec(); + } + else if (msg=="compose()") + { + QDialog qd(qApp->activeWindow(),"Getting mail",true); + + WriteMail wm(&qd,"write new mail"); + QVBoxLayout vbProg( &qd ); + + wm.showMaximized(); + vbProg.addWidget(&wm); + + qd.showMaximized(); + + emit composeRequested(); + qd.exec(); + + QMessageBox::warning(qApp->activeWindow(),tr("Info"), tr("Info"), "OK\n"); + } + + else if (msg=="dialog()") + { + QMessageBox::warning(qApp->activeWindow(),tr("Info"), tr("Info"), "OK\n"); + }*/ +} diff --git a/noncore/unsupported/mailit/emailclient.h b/noncore/unsupported/mailit/emailclient.h index 549683b..994fec5 100644 --- a/noncore/unsupported/mailit/emailclient.h +++ b/noncore/unsupported/mailit/emailclient.h @@ -42,4 +42,5 @@ #include <stdlib.h> #include <opie/otabwidget.h> +#include <qpe/qcopenvelope_qws.h> #include <qtimer.h> @@ -71,8 +72,7 @@ public: ~EmailClient(); AddressList* getAdrListRef(); - void download(Email*); protected: - void timerEvent(QTimerEvent*); + //void timerEvent(QTimerEvent*); signals: @@ -117,4 +117,5 @@ public slots: void setDownloadedSize(int); void moveMailFront(Email *mailPtr); + void download(Email*); /* void reply(); void replyAll(); @@ -122,6 +123,10 @@ public slots: void remove();*/ +private slots: + void receive(const QCString&, const QByteArray&); + private: void init(); + void initStatusBar(QWidget*); void readMail(); QString getPath(bool enclosurePath); @@ -147,4 +152,6 @@ private: MailAccount account, *currentAccount; + QCopChannel* channel; + QToolBar *bar; QProgressBar *progressBar; diff --git a/noncore/unsupported/mailit/emailhandler.cpp b/noncore/unsupported/mailit/emailhandler.cpp index fbbada7..c7b27a0 100644 --- a/noncore/unsupported/mailit/emailhandler.cpp +++ b/noncore/unsupported/mailit/emailhandler.cpp @@ -40,4 +40,6 @@ Enclosure* EnclosureList::dupl(Enclosure *in) EmailHandler::EmailHandler() { + qDebug("EMailHandler::EmailHandler"); + smtpClient = new SmtpClient(); popClient = new PopClient(); @@ -116,4 +118,5 @@ void EmailHandler::getMailHeaders() headers = TRUE; popClient->headersOnly(headers, mailAccount.syncLimit); //less than requested syncLimit, download all + qDebug("Initiating connection"); popClient->newConnection(mailAccount.popServer, 110); } @@ -627,2 +630,3 @@ void EmailHandler::cancel() smtpClient->errorHandling(ErrCancel); } + diff --git a/noncore/unsupported/mailit/emailhandler.h b/noncore/unsupported/mailit/emailhandler.h index b645868..5b59f65 100644 --- a/noncore/unsupported/mailit/emailhandler.h +++ b/noncore/unsupported/mailit/emailhandler.h @@ -29,4 +29,5 @@ #include <qstringlist.h> #include <qcollection.h> +#include <qpe/qcopenvelope_qws.h> #include "smtpclient.h" diff --git a/noncore/unsupported/mailit/mailitwindow.cpp b/noncore/unsupported/mailit/mailitwindow.cpp index ffee67e..a111241 100644 --- a/noncore/unsupported/mailit/mailitwindow.cpp +++ b/noncore/unsupported/mailit/mailitwindow.cpp @@ -62,4 +62,7 @@ MailItWindow::MailItWindow(QWidget *parent, const char *name, WFlags fl) connect(emailClient, SIGNAL(newCaption(const QString &)), this, SLOT(updateCaption(const QString &)) ); + + connect(readMail, SIGNAL(download(Email *)), emailClient, SLOT(download(Email*)) ); + viewingMail = FALSE; } diff --git a/noncore/unsupported/mailit/popclient.cpp b/noncore/unsupported/mailit/popclient.cpp index 6105d09..fedc4e2 100644 --- a/noncore/unsupported/mailit/popclient.cpp +++ b/noncore/unsupported/mailit/popclient.cpp @@ -30,4 +30,5 @@ extern "C" { PopClient::PopClient() { + socket = new QSocket(this, "popClient"); connect(socket, SIGNAL(error(int)), this, SLOT(errorHandling(int))); @@ -119,4 +120,5 @@ void PopClient::incomingData() // return; + response = socket->readLine(); @@ -158,4 +160,5 @@ void PopClient::incomingData() *stream << "PASS " << popPassword << "\r\n"; status = Stat; + break; } @@ -274,5 +277,4 @@ void PopClient::incomingData() break; } else { //message reach entire size - if ( (selected)||(mailSize <= headerLimit)) //mail size limit is not used if late download is active { diff --git a/noncore/unsupported/mailit/readmail.cpp b/noncore/unsupported/mailit/readmail.cpp index 4eae7f6..1682675 100644 --- a/noncore/unsupported/mailit/readmail.cpp +++ b/noncore/unsupported/mailit/readmail.cpp @@ -20,6 +20,8 @@ #include "readmail.h" #include <qimage.h> +#include <qwhatsthis.h> #include <qmime.h> #include <qaction.h> +#include <qpopupmenu.h> #include <qpe/resource.h> @@ -43,4 +45,6 @@ void ReadMail::init() setToolBarsMovable(FALSE); + QPopupMenu* mailaction=new QPopupMenu(this); + bar = new QToolBar(this); bar->setHorizontalStretchable( TRUE ); @@ -56,14 +60,8 @@ void ReadMail::init() bar = new QToolBar(this); - //reply dependant on viewing inbox - replyButton = new QAction( tr( "Reply" ), Resource::loadPixmap( "mailit/reply" ), - QString::null, 0, this, 0 ); - connect(replyButton, SIGNAL(activated()), this, SLOT(reply()) ); - replyButton->setWhatsThis(tr("Click here to reply to the selected mail")); + downloadButton = new QAction( tr( "Download" ), Resource::loadPixmap( "mailit/download" ),QString::null, 0, this, 0 ); + connect(downloadButton, SIGNAL(activated()), this, SLOT(download()) ); + downloadButton->setWhatsThis(tr("Click here to download the selected mail")); - forwardButton = new QAction( tr( "Forward" ), Resource::loadPixmap( "mailit/forward" ), - QString::null, 0, this, 0 ); - connect(forwardButton, SIGNAL(activated()), this, SLOT(forward()) ); - forwardButton->setWhatsThis(tr("Click here to forward the selected mail")); previousButton = new QAction( tr( "Previous" ), Resource::loadPixmap( "back" ), QString::null, 0, this, 0 ); @@ -95,4 +93,21 @@ void ReadMail::init() "Click here to switch between those view modes" )); + //reply dependant on viewing inbox + replyButton = new QToolButton(Resource::loadPixmap("mailit/reply"),tr("reply"),tr("reply to mail"), this,SLOT(reply()),bar); + QWhatsThis::add(replyButton,tr("Click here to reply to the selected mail\nPress and hold for more options.")); + replyButton->setPopup(mailaction); + + replyAllButton = new QAction( tr( "Reply all" ), Resource::loadPixmap( "mailit/reply" ),QString::null, 0, this, 0 ); + connect(replyAllButton, SIGNAL(activated()), this, SLOT(replyAll())); + replyAllButton->setWhatsThis(tr("Click here to reply to the selected mail to CC: addresses also")); + replyAllButton->addTo(mailaction); + + forwardButton = new QAction( tr( "Forward" ), Resource::loadPixmap( "mailit/forward" ), + QString::null, 0, this, 0 ); + connect(forwardButton, SIGNAL(activated()), this, SLOT(forward())); + forwardButton->setWhatsThis(tr("Click here to forward the selected mail")); + forwardButton->addTo(mailaction); + + deleteButton = new QAction( tr( "Delete" ), Resource::loadPixmap( "trash" ), QString::null, 0, this, 0 ); connect( deleteButton, SIGNAL( activated() ), this, SLOT( deleteItem() ) ); @@ -120,17 +135,24 @@ void ReadMail::updateView() inbox = mail->received; - replyButton->removeFrom(mailMenu); - replyButton->removeFrom(bar); + replyButton->setEnabled(false); + /*replyButton->removeFrom(bar); forwardButton->removeFrom(mailMenu); - forwardButton->removeFrom(bar); + forwardButton->removeFrom(bar);*/ + downloadButton->removeFrom(bar); + + //downloadButton->setEnabled(!mail->downloaded); + if (inbox == TRUE) { - replyButton->addTo(bar); - replyButton->addTo(mailMenu); + replyButton->setEnabled(true); + /*replyButton->addTo(mailMenu); forwardButton->addTo(bar); - forwardButton->addTo(mailMenu); + forwardButton->addTo(mailMenu);*/ if (!mail->downloaded) { + + downloadButton->addTo(bar); + //report currently viewed mail so that it will be //placed first in the queue of new mails to download @@ -358,4 +380,9 @@ void ReadMail::viewAttachments() void ReadMail::reply() { + emit replyRequested(*mail, (bool&)FALSE); +} + +void ReadMail::replyAll() +{ emit replyRequested(*mail, (bool&)TRUE); } @@ -366,2 +393,7 @@ void ReadMail::forward() } +void ReadMail::download() +{ + emit download(mail); +} + diff --git a/noncore/unsupported/mailit/readmail.h b/noncore/unsupported/mailit/readmail.h index df32c34..6700595 100644 --- a/noncore/unsupported/mailit/readmail.h +++ b/noncore/unsupported/mailit/readmail.h @@ -29,4 +29,5 @@ #include <qlayout.h> #include <qtextview.h> +#include <qtoolbutton.h> #include "emailhandler.h" @@ -51,4 +52,5 @@ signals: void removeItem(EmailListItem *, bool &); void viewingMail(Email *); + void download (Email*); public slots: @@ -60,5 +62,7 @@ public slots: void viewAttachments(); void reply(); + void replyAll(); void forward(); + void download(); private: @@ -83,6 +87,8 @@ private: QAction *attachmentButton; QAction *previousButton; - QAction *replyButton; + QToolButton *replyButton; QAction *forwardButton; + QAction *replyAllButton; + QAction *downloadButton; }; diff --git a/noncore/unsupported/mailit/writemail.cpp b/noncore/unsupported/mailit/writemail.cpp index dcf0c6e..c75494e 100644 --- a/noncore/unsupported/mailit/writemail.cpp +++ b/noncore/unsupported/mailit/writemail.cpp @@ -23,6 +23,5 @@ #include <qpe/resource.h> -WriteMail::WriteMail( QWidget* parent, const char* name, WFlags fl ) - : QMainWindow( parent, name, fl ) +WriteMail::WriteMail( QWidget* parent, const char* name, WFlags fl ):QMainWindow( parent, name, fl ) { showingAddressList = FALSE; @@ -269,9 +268,15 @@ void WriteMail::reply(Email replyMail, bool replyAll) ccInput->setText(ccRecipients); } - - addRecipients(replyAll); + else ccInput->clear(); subjectInput->setText(tr("Re: ") + mail.subject); + QString citation=mail.fromMail; + citation.append(tr(" wrote on ")); + citation.append(mail.date); + citation.append(":\n"); + + + //mail.body.insert(0,tr("On")); pos = 0; mail.body.insert(pos, ">"); @@ -281,5 +286,5 @@ void WriteMail::reply(Email replyMail, bool replyAll) mail.body.insert(++pos, ">>"); } - + mail.body.insert(0,citation); emailInput->setText(mail.body); } @@ -309,7 +314,14 @@ bool WriteMail::getRecipients(bool ccField) int pos = 0; + if (ccField) + { + mail.carbonCopies.clear(); + temp = ccInput->text(); + } + else + { mail.recipients.clear(); - - ccField ? temp = ccInput->text() : temp=toInput->text() ; + temp=toInput->text() ; + } while ( (pos = temp.find(';')) != -1) { @@ -319,5 +331,5 @@ bool WriteMail::getRecipients(bool ccField) return false; ccField ? mail.carbonCopies.append(str) : mail.recipients.append(str); - addressList->addContact(str, ""); + //addressList->addContact(str, ""); } temp = temp.stripWhiteSpace(); @@ -325,5 +337,5 @@ bool WriteMail::getRecipients(bool ccField) return false; ccField ? mail.carbonCopies.append(temp) : mail.recipients.append(temp); - addressList->addContact(temp, ""); + //addressList->addContact(temp, ""); return TRUE; @@ -384,4 +396,5 @@ void WriteMail::newMail() { toInput->clear(); + ccInput->clear(); subjectInput->clear(); emailInput->clear(); |