Diffstat (limited to 'noncore/net/mail/composemail.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/net/mail/composemail.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/noncore/net/mail/composemail.cpp b/noncore/net/mail/composemail.cpp index 13c7900..5e823e8 100644 --- a/noncore/net/mail/composemail.cpp +++ b/noncore/net/mail/composemail.cpp | |||
@@ -4,13 +4,14 @@ | |||
4 | #include <qpe/resource.h> | 4 | #include <qpe/resource.h> |
5 | #include <qpe/config.h> | 5 | #include <qpe/config.h> |
6 | #include <qpe/global.h> | 6 | #include <qpe/global.h> |
7 | #include <qpe/contact.h> | 7 | #include <qpe/contact.h> |
8 | 8 | ||
9 | #include "composemail.h" | 9 | #include "composemail.h" |
10 | #include "smtpwrapper.h" | 10 | |
11 | #include <libmailwrapper/smtpwrapper.h> | ||
11 | 12 | ||
12 | ComposeMail::ComposeMail( Settings *s, QWidget *parent, const char *name, bool modal, WFlags flags ) | 13 | ComposeMail::ComposeMail( Settings *s, QWidget *parent, const char *name, bool modal, WFlags flags ) |
13 | : ComposeMailUI( parent, name, modal, flags ) | 14 | : ComposeMailUI( parent, name, modal, flags ) |
14 | { | 15 | { |
15 | settings = s; | 16 | settings = s; |
16 | 17 | ||
@@ -20,13 +21,13 @@ ComposeMail::ComposeMail( Settings *s, QWidget *parent, const char *name, bool m | |||
20 | if (QFile::exists(vfilename)) { | 21 | if (QFile::exists(vfilename)) { |
21 | c = Contact::readVCard( vfilename )[0]; | 22 | c = Contact::readVCard( vfilename )[0]; |
22 | } | 23 | } |
23 | 24 | ||
24 | QStringList mails = c.emailList(); | 25 | QStringList mails = c.emailList(); |
25 | QString defmail = c.defaultEmail(); | 26 | QString defmail = c.defaultEmail(); |
26 | 27 | ||
27 | if (defmail.length()!=0) { | 28 | if (defmail.length()!=0) { |
28 | fromBox->insertItem(defmail); | 29 | fromBox->insertItem(defmail); |
29 | } | 30 | } |
30 | QStringList::ConstIterator sit = mails.begin(); | 31 | QStringList::ConstIterator sit = mails.begin(); |
31 | for (;sit!=mails.end();++sit) { | 32 | for (;sit!=mails.end();++sit) { |
32 | if ( (*sit)==defmail) | 33 | if ( (*sit)==defmail) |
@@ -39,13 +40,13 @@ ComposeMail::ComposeMail( Settings *s, QWidget *parent, const char *name, bool m | |||
39 | checkBoxLater->setChecked( cfg.readBoolEntry( "sendLater", false ) ); | 40 | checkBoxLater->setChecked( cfg.readBoolEntry( "sendLater", false ) ); |
40 | 41 | ||
41 | attList->addColumn( tr( "Name" ) ); | 42 | attList->addColumn( tr( "Name" ) ); |
42 | attList->addColumn( tr( "Size" ) ); | 43 | attList->addColumn( tr( "Size" ) ); |
43 | 44 | ||
44 | QList<Account> accounts = settings->getAccounts(); | 45 | QList<Account> accounts = settings->getAccounts(); |
45 | 46 | ||
46 | Account *it; | 47 | Account *it; |
47 | for ( it = accounts.first(); it; it = accounts.next() ) { | 48 | for ( it = accounts.first(); it; it = accounts.next() ) { |
48 | if ( it->getType().compare( "SMTP" ) == 0 ) { | 49 | if ( it->getType().compare( "SMTP" ) == 0 ) { |
49 | SMTPaccount *smtp = static_cast<SMTPaccount *>(it); | 50 | SMTPaccount *smtp = static_cast<SMTPaccount *>(it); |
50 | smtpAccountBox->insertItem( smtp->getAccountName() ); | 51 | smtpAccountBox->insertItem( smtp->getAccountName() ); |
51 | smtpAccounts.append( smtp ); | 52 | smtpAccounts.append( smtp ); |
@@ -188,13 +189,13 @@ void ComposeMail::accept() | |||
188 | 189 | ||
189 | #if 0 | 190 | #if 0 |
190 | qDebug( "Sending Mail with " + | 191 | qDebug( "Sending Mail with " + |
191 | smtpAccounts.at( smtpAccountBox->currentItem() )->getAccountName() ); | 192 | smtpAccounts.at( smtpAccountBox->currentItem() )->getAccountName() ); |
192 | #endif | 193 | #endif |
193 | Mail *mail = new Mail(); | 194 | Mail *mail = new Mail(); |
194 | 195 | ||
195 | SMTPaccount *smtp = smtpAccounts.at( smtpAccountBox->currentItem() ); | 196 | SMTPaccount *smtp = smtpAccounts.at( smtpAccountBox->currentItem() ); |
196 | mail->setMail(fromBox->currentText()); | 197 | mail->setMail(fromBox->currentText()); |
197 | 198 | ||
198 | if ( !toLine->text().isEmpty() ) { | 199 | if ( !toLine->text().isEmpty() ) { |
199 | mail->setTo( toLine->text() ); | 200 | mail->setTo( toLine->text() ); |
200 | } else { | 201 | } else { |
@@ -218,13 +219,13 @@ void ComposeMail::accept() | |||
218 | mail->addAttachment( it->getAttachment() ); | 219 | mail->addAttachment( it->getAttachment() ); |
219 | it = (AttachViewItem *) it->nextSibling(); | 220 | it = (AttachViewItem *) it->nextSibling(); |
220 | } | 221 | } |
221 | 222 | ||
222 | SMTPwrapper wrapper( settings ); | 223 | SMTPwrapper wrapper( settings ); |
223 | wrapper.sendMail( *mail,smtp,checkBoxLater->isChecked() ); | 224 | wrapper.sendMail( *mail,smtp,checkBoxLater->isChecked() ); |
224 | 225 | ||
225 | QDialog::accept(); | 226 | QDialog::accept(); |
226 | } | 227 | } |
227 | 228 | ||
228 | AttachViewItem::AttachViewItem( QListView *parent, Attachment *att ) | 229 | AttachViewItem::AttachViewItem( QListView *parent, Attachment *att ) |
229 | : QListViewItem( parent ) | 230 | : QListViewItem( parent ) |
230 | { | 231 | { |