fix for email <-> default email bug

2 files changed, 41 insertions, 14 deletions

diff --git a/core/pim/addressbook/contacteditor.cpp b/core/pim/addressbook/contacteditor.cpp
index cc3908a..4e73114 100644
--- a/core/pim/addressbook/contacteditor.cpp
+++ b/core/pim/addressbook/contacteditor.cpp
@@ -51,18 +51,18 @@ static inline bool containsAlphaNum( const QString &str );
 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 ),
 	  m_personalView ( false )
 	  
@@ -591,18 +591,16 @@ void ContactEditor::init() {
 	connect( txtChooserField2, SIGNAL(textChanged(const QString &)),
                  this, SLOT(slotChooser2Change(const QString &)) );
 	connect( txtChooserField3, SIGNAL(textChanged(const QString &)),
                  this, SLOT(slotChooser3Change(const QString &)) );
 	connect( txtChooserField4, SIGNAL(textChanged(const QString &)),
                  this, SLOT(slotChooser4Change(const QString &)) );
 	connect( txtAddress, SIGNAL(textChanged(const QString &)),
                  this, SLOT(slotAddressChange(const QString &)) );
-	//connect( txtAddress2, SIGNAL(textChanged(const QString &)), this, SLOT(slotAddress2Change(const QString &)) );
-	//connect( txtPOBox, SIGNAL(textChanged(const QString &)), this, SLOT(slotPOBoxChange(const QString &)) );
 	connect( txtCity, SIGNAL(textChanged(const QString &)),
                  this, SLOT(slotCityChange(const QString &)) );
 	connect( txtState, SIGNAL(textChanged(const QString &)),
                  this, SLOT(slotStateChange(const QString &)) );
 	connect( txtZip, SIGNAL(textChanged(const QString &)),
                  this, SLOT(slotZipChange(const QString &)) );
 	connect( cmbCountry, SIGNAL(textChanged(const QString &)),
                  this, SLOT(slotCountryChange(const QString &)) );
@@ -626,39 +624,55 @@ void ContactEditor::init() {
 
 void ContactEditor::defaultEmailChanged(int i){
   qDebug("defaultEmailChanged");
 	int index = cmbChooserField1->currentItem();
 	slChooserValues[index] = cmbDefaultEmail->text(i);
 
 }
 
-void ContactEditor::chooserChange( const QString &textChanged, int index, QLineEdit *inputWid, int widgetPos ) {
+void ContactEditor::populateDefaultEmailCmb(){       
+	cmbDefaultEmail->clear();    
+	cmbDefaultEmail->insertStringList(emails);
+	for ( int i = 0; i < cmbDefaultEmail->count(); i++){
+	  qDebug(" populateDefaultEmailCmb text >%s< defaultEmail >%s<",cmbDefaultEmail->text( i ).latin1(),defaultEmail.latin1());
+	  if ( cmbDefaultEmail->text( i ).stripWhiteSpace() == defaultEmail.stripWhiteSpace() ){
+	      cmbDefaultEmail->setCurrentItem( i );
+		qDebug("set");
+		}
+	}
+}
 
-	qDebug("defaultEmailChooserPosition %i, widgetPos %i ",defaultEmailChooserPosition,widgetPos);
-        if (slChooserNames[index] == "Default Email"){         
+void ContactEditor::chooserChange( const QString &textChanged, int index, QLineEdit *inputWid, int widgetPos ) {
+	QString type = slChooserNames[index];
+	qDebug("ContactEditor::chooserChange( type=>%s<, textChanged=>%s< index=%i, widgetPos=%i",type.latin1(),textChanged.latin1(), index,  widgetPos );
+        if ( type == "Default Email"){         
+	  defaultEmail = textChanged;
 	  if (cmbDefaultEmail) delete cmbDefaultEmail;
 	  cmbDefaultEmail = new QComboBox(inputWid->parentWidget());	   
 	  cmbDefaultEmail->setGeometry(inputWid->frameGeometry());        
-	  cmbDefaultEmail->insertStringList(ent.emailList());
+	  cmbDefaultEmail->show();
+	  populateDefaultEmailCmb();
 	  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();
 	  defaultEmailChooserPosition = widgetPos;
         }else if (defaultEmailChooserPosition == widgetPos){
 	qDebug("cmbDefaultEmail->hide()");
 	  if (cmbDefaultEmail) cmbDefaultEmail->hide();
+	  widgetPos=-1;
+	}else if (type == "Emails"){
+	  qDebug("emails");
+	  QString de;
+	  emails = QStringList::split (",", textChanged );
+
+	  populateDefaultEmailCmb();
 	}
 
 
+
 	slChooserValues[index] = textChanged;
 
 }
 
 void ContactEditor::slotChooser1Change( const QString &textChanged ) {
 	chooserChange( textChanged, cmbChooserField1->currentItem(), txtChooserField1, 1);
 }
 
@@ -734,16 +748,17 @@ void ContactEditor::slotCountryChange( const QString &textChanged ) {
 
 	if ( cmbAddress->currentItem() == 0 ) {
 		slBusinessAddress[6] = textChanged;
 	} else {
 		slHomeAddress[6] = textChanged;
 	}
 }
 
+
 void ContactEditor::slotCmbChooser1Change( int index ) {
 
 	txtChooserField1->setText( slChooserValues[index] );
         txtChooserField1->setFocus();
 }
 
 void ContactEditor::slotCmbChooser2Change( int index ) {
 
@@ -1055,16 +1070,17 @@ QString ContactEditor::parseName( const QString fullName, int type ) {
 			return strSuffix;
 
 	}
 	return QString::null;
 }
 
 void ContactEditor::cleanupFields() {
 	QStringList::Iterator it = slChooserValues.begin();
+
 	for ( int i = 0; it != slChooserValues.end(); i++, ++it ) {
 		(*it) = "";
 	}
 
 	for ( int i = 0; i < 7; i++ ) {
 		slHomeAddress[i] = "";
 		slBusinessAddress[i] = "";
 	}
@@ -1097,16 +1113,23 @@ void ContactEditor::cleanupFields() {
 }
 
 void ContactEditor::setEntry( const OContact &entry ) {
 
 	cleanupFields();
 
 	ent = entry;
 
+
+
+	emails = QStringList(ent.emailList());
+	defaultEmail = ent.defaultEmail();
+	if (defaultEmail.isEmpty()) defaultEmail = emails[0];
+	qDebug("default email=%s",defaultEmail.latin1());
+
 	useFullName = false;
 	txtFirstName->setText( ent.firstName() );
 	txtMiddleName->setText( ent.middleName() );
 	txtLastName->setText( ent.lastName() );
 	txtSuffix->setText( ent.suffix() );
 
 	QString *tmpString = new QString;
 	*tmpString = ent.firstName() + " " + ent.middleName() +
diff --git a/core/pim/addressbook/contacteditor.h b/core/pim/addressbook/contacteditor.h
index 63257f8..bcef679 100644
--- a/core/pim/addressbook/contacteditor.h
+++ b/core/pim/addressbook/contacteditor.h
@@ -99,17 +99,19 @@ class ContactEditor : public QDialog {
 		void slotAnniversaryDateChanged( int year, int month, int day);
 		void slotBirthdayDateChanged( int year, int month, int day);
 		void slotRemoveBirthday();
 		void slotRemoveAnniversary();
 		void defaultEmailChanged(int);
 
 	private:
 		int defaultEmailChooserPosition;
+		void populateDefaultEmailCmb();
 		void chooserChange( const QString&, int , QLineEdit*, int );
+
 		bool useFullName;
 
 		OContact ent;
 
 		QDialog *dlgNote;
 		QDialog *dlgName;
 
 		QList<QLineEdit> listValue;
@@ -119,16 +121,18 @@ class ContactEditor : public QDialog {
 		QStringList trlDynamicEntries;
 
 		bool m_personalView;
 
 		QStringList slHomeAddress;
 		QStringList slBusinessAddress;
 		QStringList slChooserNames;
 		QStringList slChooserValues;
+		QStringList emails;
+		QString defaultEmail;
 
 		QMultiLineEdit *txtNote;
 		QLabel *lblNote;
 
 		//QLineEdit *txtTitle;
 		QLineEdit *txtFirstName;
 		QLineEdit *txtMiddleName;
 		QLineEdit *txtLastName;