3 files changed, 39 insertions, 20 deletions

diff --git a/core/pim/addressbook/contacteditor.cpp b/core/pim/addressbook/contacteditor.cpp
index 5a7bf1a..7338eeb 100644
--- a/core/pim/addressbook/contacteditor.cpp
+++ b/core/pim/addressbook/contacteditor.cpp
@@ -58,4 +58,4 @@ void parseEmailFrom( const QString &txt, QString &strDefaultEmail,
 // helper convert from file format to comma delimited...
-void parseEmailTo( const QString &strDefaultEmail,
-                   const QString &strOtherEmail, QString &strBack );
+//void parseEmailTo( const QString &strDefaultEmail,
+        //         const QString &strOtherEmail, QString &strBack );
 
@@ -623,7 +623,6 @@ void ContactEditor::init() {
 
-void ContactEditor::slotChooser1Change( const QString &textChanged ) {
-
+void ContactEditor::defaultEmailChanged(int i){
+  qDebug("defaultEmailChanged");
         int index = cmbChooserField1->currentItem();
-
-        slChooserValues[index] = textChanged;
+        slChooserValues[index] = cmbDefaultEmail->text(i);
 
@@ -631,13 +630,19 @@ void ContactEditor::slotChooser1Change( const QString &textChanged ) {
 
-void ContactEditor::slotChooser2Change( const QString &textChanged ) {
+void ContactEditor::chooserChange( const QString &textChanged, int index, QLineEdit *inputWid ) {
 
-        int index = cmbChooserField2->currentItem();
-
-        slChooserValues[index] = textChanged;
+        if (slChooserNames[index] == "Default Email"){         
+          delete cmbDefaultEmail;
+                  cmbDefaultEmail = new QComboBox(inputWid->parentWidget());   
+          cmbDefaultEmail->setGeometry(inputWid->frameGeometry());        
+          cmbDefaultEmail->insertStringList(ent.emailList());
+          connect(cmbDefaultEmail,SIGNAL(activated(int)),
+                  SLOT(defaultEmailChanged(int))); 
+          QString demail = ent.defaultEmail();
+          for ( int i = 0; i < cmbDefaultEmail->count(); i++)
+            if ( cmbDefaultEmail->text( i ) == demail )
+              cmbDefaultEmail->setCurrentItem( i );
 
+          cmbDefaultEmail->show();
 }
 
-void ContactEditor::slotChooser3Change( const QString &textChanged ) {
-
-        int index = cmbChooserField3->currentItem();
 
@@ -647,8 +652,17 @@ void ContactEditor::slotChooser3Change( const QString &textChanged ) {
 
-void ContactEditor::slotChooser4Change( const QString &textChanged ) {
+void ContactEditor::slotChooser1Change( const QString &textChanged ) {
+        chooserChange( textChanged, cmbChooserField1->currentItem(), txtChooserField1);
+}
 
-        int index = cmbChooserField4->currentItem();
+void ContactEditor::slotChooser2Change( const QString &textChanged ) {
+        chooserChange( textChanged, cmbChooserField2->currentItem(), txtChooserField2);
 
-        slChooserValues[index] = textChanged;
+}
 
+void ContactEditor::slotChooser3Change( const QString &textChanged ) {
+        chooserChange( textChanged, cmbChooserField3->currentItem(), txtChooserField3);
+}
+
+void ContactEditor::slotChooser4Change( const QString &textChanged ) {
+        chooserChange( textChanged, cmbChooserField4->currentItem(), txtChooserField4);
 }
@@ -1377,3 +1391,3 @@ void ContactEditor::saveEntry() {
                         // ent.clearEmails();
-                        ent.setDefaultEmail(  defaultmail );
+        //              ent.setDefaultEmail(  defaultmail );
                         ent.setEmails( allemail );
@@ -1381,2 +1395,5 @@ void ContactEditor::saveEntry() {
 
+                if ( *it == "Default Email")
+                  ent.setDefaultEmail( *itV );
+
                 if ( *it == "Home Phone" )
diff --git a/core/pim/addressbook/contacteditor.h b/core/pim/addressbook/contacteditor.h
index 250b831..d4b7f27 100644
--- a/core/pim/addressbook/contacteditor.h
+++ b/core/pim/addressbook/contacteditor.h
@@ -102,6 +102,7 @@ class ContactEditor : public QDialog {
                 void slotRemoveAnniversary();
+                void defaultEmailChanged(int);
 
         private:
+                void chooserChange( const QString&, int , QLineEdit* );
                 bool useFullName;
-                        //      bool hasGender, hasTitle, hasCompany, hasNotes, hasStreet, hasStreet2, hasPOBox, hasCity, hasState, hasZip, hasCountry;
 
@@ -149,2 +150,3 @@ class ContactEditor : public QDialog {
                 QComboBox *cmbChooserField4;
+                QComboBox *cmbDefaultEmail;
                 QComboBox *cmbFileAs;
diff --git a/core/pim/addressbook/ocontactfields.cpp b/core/pim/addressbook/ocontactfields.cpp
index df57efa..7823a9c 100644
--- a/core/pim/addressbook/ocontactfields.cpp
+++ b/core/pim/addressbook/ocontactfields.cpp
@@ -44,3 +44,3 @@ QStringList OContactFields::trphonefields( bool sorted )
 
-    // list.append( QObject::tr( "Default Email" ) );
+    list.append( QObject::tr( "Default Email" ) );
     list.append( QObject::tr( "Emails" ) );
@@ -140,3 +140,3 @@ QStringList OContactFields::untrphonefields( bool sorted )
 
-    // list.append( "Default Email" );
+    list.append( "Default Email" );
     list.append( "Emails" );