3 files changed, 44 insertions, 25 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
@@ -57,6 +57,6 @@ 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 );
 
 ContactEditor::ContactEditor(	const OContact &entry,
@@ -622,15 +622,28 @@ 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);
 
 }
 
-void ContactEditor::slotChooser2Change( const QString &textChanged ) {
+void ContactEditor::chooserChange( const QString &textChanged, int index, QLineEdit *inputWid ) {
+
+        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();
+        }
 
-	int index = cmbChooserField2->currentItem();
 
 	slChooserValues[index] = textChanged;
@@ -638,18 +651,19 @@ void ContactEditor::slotChooser2Change( const QString &textChanged ) {
 }
 
-void ContactEditor::slotChooser3Change( const QString &textChanged ) {
+void ContactEditor::slotChooser1Change( const QString &textChanged ) {
+	chooserChange( textChanged, cmbChooserField1->currentItem(), txtChooserField1);
+}
 
-	int index = cmbChooserField3->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 ) {
-
-	int index = cmbChooserField4->currentItem();
-
-	slChooserValues[index] = textChanged;
-
+	chooserChange( textChanged, cmbChooserField4->currentItem(), txtChooserField4);
 }
 
@@ -1372,12 +1386,15 @@ void ContactEditor::saveEntry() {
 
 		if ( *it == "Emails" ){
-			QString allemail;
-			QString defaultmail;
-			parseEmailFrom( *itV, defaultmail, allemail );
-			// ent.clearEmails();
-			ent.setDefaultEmail(  defaultmail );
-			ent.setEmails( allemail );
+ 			QString allemail;
+ 			QString defaultmail;
+ 			parseEmailFrom( *itV, defaultmail, allemail );
+ 			// ent.clearEmails();
+// 			ent.setDefaultEmail(  defaultmail );
+ 			ent.setEmails( allemail );
 		}
 
+		if ( *it == "Default Email")
+		  ent.setDefaultEmail( *itV );
+
 		if ( *it == "Home Phone" )
 			ent.setHomePhone( *itV );
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
@@ -101,8 +101,9 @@ class ContactEditor : public QDialog {
 		void slotRemoveBirthday();
 		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;
 
 		OContact ent;
@@ -148,4 +149,5 @@ class ContactEditor : public QDialog {
 		QComboBox *cmbChooserField3;
 		QComboBox *cmbChooserField4;
+		QComboBox *cmbDefaultEmail;
 		QComboBox *cmbFileAs;
 		CategorySelect *cmbCat;
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
@@ -43,5 +43,5 @@ QStringList OContactFields::trphonefields( bool sorted )
     list.append( QObject::tr( "Business Mobile" ) );
 
-    // list.append( QObject::tr( "Default Email" ) );
+    list.append( QObject::tr( "Default Email" ) );
     list.append( QObject::tr( "Emails" ) );
 
@@ -139,5 +139,5 @@ QStringList OContactFields::untrphonefields( bool sorted )
     list.append( "Business Mobile" );
 
-    // list.append( "Default Email" );
+    list.append( "Default Email" );
     list.append( "Emails" );