1 files changed, 39 insertions, 22 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
@@ -53,14 +53,14 @@ static inline bool constainsWhiteSpace( const QString &str );
 // helper functions, convert our comma delimited list to proper
 // file format...
 void parseEmailFrom( const QString &txt, QString &strDefaultEmail,
 		     QString &strAll );
 
 // 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,
 				QWidget *parent,
 				const char *name,
 				WFlags fl )
 	: QDialog( parent, name, TRUE, fl ),
@@ -618,42 +618,56 @@ void ContactEditor::init() {
 
 	new QPEDialogListener(this);
 
 	setPersonalView ( m_personalView );
 }
 
-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;
 
 }
 
-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);
 }
 
 void ContactEditor::slotAddressChange( const QString &textChanged ) {
 
 	if ( cmbAddress->currentItem() == 0 ) {
 		slBusinessAddress[0] = textChanged;
@@ -1368,20 +1382,23 @@ void ContactEditor::saveEntry() {
 			ent.setBusinessFax( *itV );
 
 		if ( ( *it == "Business Mobile" ) || ( *it == "Work Mobile" ) )
 			ent.setBusinessMobile( *itV );
 
 		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 );
 
 		if ( *it == "Home Fax" )
 			ent.setHomeFax( *itV );