reduced to the max...

- from address isn't setup any longer within the smtp account (it makes realy no
  sense, a smtp account describes the connection to a smtp server, not the
  identity of the sender)
- from address is taken from the personal info of the addressbook (thats why this
  info exists). Of course the user can change it when sending an email.
- user can select a from with a selection of the mails given in their personal
  infos.
- in addresspicker: use "<Firstname> <Lastname>" instead of "Filename"
- settings ui: switched of the part within the smtp accounts describing the
  identitiy of user
ToDo: a dialog setting up a default signature

1 files changed, 37 insertions, 13 deletions

diff --git a/noncore/net/mail/composemail.cpp b/noncore/net/mail/composemail.cpp
index 73d1a43..13c7900 100644
--- a/noncore/net/mail/composemail.cpp
+++ b/noncore/net/mail/composemail.cpp
@@ -5,2 +5,4 @@
 #include <qpe/config.h>
+#include <qpe/global.h>
+#include <qpe/contact.h>
 
@@ -14,2 +16,22 @@ ComposeMail::ComposeMail( Settings *s, QWidget *parent, const char *name, bool m
 
+    QString vfilename = Global::applicationFileName("addressbook",
+                "businesscard.vcf");
+    Contact c;
+    if (QFile::exists(vfilename)) {
+        c = Contact::readVCard( vfilename )[0];
+    }
+
+    QStringList mails = c.emailList();
+    QString defmail = c.defaultEmail();
+    
+    if (defmail.length()!=0) {
+        fromBox->insertItem(defmail);
+    }
+    QStringList::ConstIterator sit = mails.begin();
+    for (;sit!=mails.end();++sit) {
+        if ( (*sit)==defmail)
+            continue;
+        fromBox->insertItem((*sit));
+    }
+    senderNameEdit->setText(c.firstName()+" "+c.lastName());
     Config cfg( "mail" );
@@ -22,2 +44,3 @@ ComposeMail::ComposeMail( Settings *s, QWidget *parent, const char *name, bool m
     QList<Account> accounts = settings->getAccounts();
+    
     Account *it;
@@ -26,3 +49,3 @@ ComposeMail::ComposeMail( Settings *s, QWidget *parent, const char *name, bool m
            SMTPaccount *smtp = static_cast<SMTPaccount *>(it);
-           fromBox->insertItem( smtp->getMail() );
+           smtpAccountBox->insertItem( smtp->getAccountName() );
            smtpAccounts.append( smtp );
@@ -32,3 +55,3 @@ ComposeMail::ComposeMail( Settings *s, QWidget *parent, const char *name, bool m
     if ( smtpAccounts.count() > 0 ) {
-        fillValues( fromBox->currentItem() );
+        fillValues( smtpAccountBox->currentItem() );
     } else {
@@ -40,3 +63,3 @@ ComposeMail::ComposeMail( Settings *s, QWidget *parent, const char *name, bool m
 
-    connect( fromBox, SIGNAL( activated( int ) ), SLOT( fillValues( int ) ) );
+    connect( smtpAccountBox, SIGNAL( activated( int ) ), SLOT( fillValues( int ) ) );
     connect( toButton, SIGNAL( clicked() ), SLOT( pickAddressTo() ) );
@@ -110,4 +133,4 @@ void ComposeMail::fillValues( int current )
 {
+#if 0
     SMTPaccount *smtp = smtpAccounts.at( current );
-
     ccLine->clear();
@@ -124,4 +147,4 @@ void ComposeMail::fillValues( int current )
     }
-
     sigMultiLine->setText( smtp->getSignature() );
+#endif
 }
@@ -165,10 +188,10 @@ void ComposeMail::accept()
 
-
+#if 0
     qDebug( "Sending Mail with " +
-            smtpAccounts.at( fromBox->currentItem() )->getAccountName() );
+            smtpAccounts.at( smtpAccountBox->currentItem() )->getAccountName() );
+#endif
     Mail *mail = new Mail();
-    SMTPaccount *smtp = smtpAccounts.at( fromBox->currentItem() );
     
-    mail->setMail( smtp->getMail() );
-    mail->setName( smtp->getName() );
+    SMTPaccount *smtp = smtpAccounts.at( smtpAccountBox->currentItem() );
+    mail->setMail(fromBox->currentText());
 
@@ -180,3 +203,3 @@ void ComposeMail::accept()
     }
-
+    mail->setName(senderNameEdit->text());
     mail->setCC( ccLine->text() );
@@ -190,2 +213,3 @@ void ComposeMail::accept()
     }
+    qDebug(txt);
     mail->setMessage( txt );
@@ -198,4 +222,4 @@ void ComposeMail::accept()
     SMTPwrapper wrapper( settings );
-    wrapper.sendMail( *mail,checkBoxLater->isChecked() );
-
+    wrapper.sendMail( *mail,smtp,checkBoxLater->isChecked() );
+    
     QDialog::accept();