Hope I fixed the default-email bugs..

3 files changed, 186 insertions, 42 deletions

diff --git a/core/pim/addressbook/TODO b/core/pim/addressbook/TODO
index 1eb537f..76247c1 100644
--- a/core/pim/addressbook/TODO
+++ b/core/pim/addressbook/TODO
@@ -1,88 +1,90 @@
 Stuff todo until OPIE 1.0 :
 ===========================
 
 Feature requests:
 -----------------
 - Dial by mobile phone by tapping the number.. 
   (Maybe using gsmtool. And we may
 	add a library class for this)
 - dial with dtmfdial incase it's installed and there's no mobile
 - 3rd column for 2. Contact
 - Implementing additional Views (Phonebook, ...)
 - Birthday & Anniversary Reminder
 - Plugin for Today for Birthdays and Anniversaries
 - Beaming of multiple contacts (current list/ by search or by category)
 
 Known Bugs:
 -----------
 
 
 Bugs but not in addressbook:
 -----------------------------
 - VCARD: If umlaut (äöüß) in address, the parser gets confused..
 
 - Exporting and reimporting of Jobtitle was reported to fail (Could not reproduce this ! (se))
 
 
 Urgent:
 --------
 ContactEditor:
 - Contact-Editor is temporarely reenabled. Wait for replacement.
 - Redesign of Contacteditor
 - Store last settings of combo-boxes
 - Category is on the wrong position after changing to personal and back to normal
 	( Temporarily workaround: Category is never deactivated.. :S )
 
 - Personal and Business Web-page is not editable 
 
 Important:
 ----------
 
+- If new contact is added (contacteditor closed): focus (table, card) to
+  this entry !
 - Implement a picker/combo for the default email.
 - After search (Started with Return): KeyFocus should be on Tabelle
 
 - "What's this" should be added (Deleyed after Feature Freeze)
 
 Less important:
 ---------------
 - Reload if contacts were changed externally
 - Overview window cleanup needed..
 - The picker (alphabetical sort widget) should be
    placed verticaly or horizontally (configurable)
 - Find a smart solution for activating/deactivating the "send email" event
 
 Should be Fixed (not absolute sure, need further validation):
 -------------------------------------------------------------
 
 
 Fixed:
 -------
 - Syncing: abtable not reloaded after sync.
 - Find widget should be replaced by something like 
   qpdf has.
 - Adding a configuration dialog
 - Picker: Activated letter schould be more visible
 - Advanced handling of cursor keys (search..)
 - Mail-Icon is missing
 - Use opie-mail insted of qt-mail if possible.
 - Font menu is invisible using german translation
 - Personal contact editor: Disable categories
 - "Nonenglish" translation bug has to be fixed.
 - contacteditor: Birthday, annyversary, ... : Use Dateselector
 - The names of the countries are sorted by there english names, only..
   Even if they are translated.. :S
 - Cursor keys should work in detail-view (ablabel)
   -> Ablabel should be removed and Abtable should be increased with
 	different views (as started by darwin zins)..
 - Use advanced database functions in abtable to decrease
   memory footprint and to make everything more easy !
 	(abtable should store Iterator for selected Category)
 - Abtable: Configure Contact column (internally already available, 
 	need configuration)
 - Select of primary contact (see #274 on mantis)
 - Category-select does not work completely: "Unfiled" is always in listview ..
 - Return from Contacteditor: Category resettet to all
 - Personal Details not working
 - If category changed, the letterpicker should be resetted
 - There should be some icons for List and Cardview
 - If in Cardview and a category change removes all entries: 
diff --git a/core/pim/addressbook/contacteditor.cpp b/core/pim/addressbook/contacteditor.cpp
index c5ad0c4..37e3a54 100644
--- a/core/pim/addressbook/contacteditor.cpp
+++ b/core/pim/addressbook/contacteditor.cpp
@@ -1,96 +1,97 @@
 /*
  * Copyright (c) 2002 Michael R. Crawford <mike@tuxnami.org>
  * Copyright (C) 2002 by Stefan Eilers (eilers.stefan@epost.de)
  *
  * This file is an add-on for the OPIE Palmtop Environment
  *
  * This file may be distributed and/or modified under the terms of the
  * GNU General Public License version 2 as published by the Free Software
  * Foundation and appearing in the file LICENSE.GPL included in the pacakaging
  * of this file.
  *
  * This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
  * WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
  *
  * This is a rewrite of the abeditor.h file, modified to provide a more
  * intuitive interface to TrollTech's original Address Book editor.  This
  * is made to operate exactly in interface with the exception of name.
  *
  */
 
 #include "contacteditor.h"
 #include "addresspicker.h"
 #include "ocontactfields.h"
 
 #include <qpe/categoryselect.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/qpedialog.h>
 #include <qpe/timeconversion.h>
 #include <opie/ocontact.h>
 #include <qpe/resource.h>
 
 #include <qcombobox.h>
 #include <qlabel.h>
 #include <qtabwidget.h>
 #include <qlayout.h>
 #include <qlineedit.h>
 #include <qmultilineedit.h>
 #include <qscrollview.h>
 #include <qtoolbutton.h>
 #include <qpushbutton.h>
 #include <qmainwindow.h>
 #include <qvaluelist.h>
 #include <qpopupmenu.h> 
 #include <qlistbox.h> 
 #include <qhbox.h>
 #include <qaction.h>
 #include <qiconset.h> 
+#include <qmessagebox.h> 
 
 #include <assert.h>
 
 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 );
 
 ContactEditor::ContactEditor(	const OContact &entry,
 				QWidget *parent,
 				const char *name,
 				WFlags fl )
 	: QDialog( parent, name, TRUE, fl ),
 	  m_personalView ( false )
 	  
 {
 
 	init();
 	setEntry( entry );
 	cmbDefaultEmail = 0;
 	defaultEmailChooserPosition = -1;
 }
 
 ContactEditor::~ContactEditor() {
 }
 
 void ContactEditor::init() {
 	
 	useFullName = true;
 
 	uint i = 0;
 
 	QStringList trlChooserNames;
 
 	for (i = 0; i <= 6; i++) {
 		slHomeAddress.append( "" );
 		slBusinessAddress.append( "" );
 	}
 
 	trlChooserNames   = OContactFields::trphonefields( false );
 	slChooserNames    = OContactFields::untrphonefields( false );
@@ -599,255 +600,391 @@ void ContactEditor::init() {
 	cmbChooserField3->insertStringList( trlChooserNames );
 	cmbChooserField4->insertStringList( trlChooserNames );
 
 	cmbChooserField1->setCurrentItem( 0 );
 	cmbChooserField2->setCurrentItem( 1 );
 	cmbChooserField3->setCurrentItem( 2 );
 
 	connect( btnFullName, SIGNAL(clicked()), this, SLOT(slotName()) );
 
 	connect( txtFullName, SIGNAL(textChanged(const QString &)), this, SLOT(slotFullNameChange(const QString &)) );
 
 	connect( txtChooserField1, SIGNAL(textChanged(const QString &)),
                  this, SLOT(slotChooser1Change(const QString &)) );
 	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( 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 &)) );
 	connect( cmbCountry, SIGNAL(activated(const QString &)),
                  this, SLOT(slotCountryChange(const QString &)) );
 	connect( cmbChooserField1, SIGNAL(activated(int)),
                  this, SLOT(slotCmbChooser1Change(int)) );
 	connect( cmbChooserField2, SIGNAL(activated(int)),
                  this, SLOT(slotCmbChooser2Change(int)) );
 	connect( cmbChooserField3, SIGNAL(activated(int)),
                  this, SLOT(slotCmbChooser3Change(int)) );
 	connect( cmbChooserField4, SIGNAL(activated(int)),
                  this, SLOT(slotCmbChooser4Change(int)) );
 	connect( cmbAddress, SIGNAL(activated(int)),
                  this, SLOT(slotAddressTypeChange(int)) );
 
 	new QPEDialogListener(this);
 
 	setPersonalView ( m_personalView );
 }
 
 void ContactEditor::defaultEmailChanged(int i){
-  qDebug("defaultEmailChanged");
+	qDebug("defaultEmailChanged");
+
 	int index = cmbChooserField1->currentItem();
 	slChooserValues[index] = cmbDefaultEmail->text(i);
 
+	defaultEmail = cmbDefaultEmail->text(i);
+	qDebug ("Changed to: %s", defaultEmail.latin1());
+
 }
 
 void ContactEditor::populateDefaultEmailCmb(){       
+
+	// if the default-email combo was not selected and therfore not created
+	// we get a lot of trouble.. Therfore create an invisible one..
+	if ( !cmbDefaultEmail ){
+		cmbDefaultEmail = new QComboBox(this);	
+		cmbDefaultEmail -> hide();
+	}
 	cmbDefaultEmail->clear();    
-	cmbDefaultEmail->insertStringList(emails);
+	cmbDefaultEmail->insertStringList( emails );
+	// cmbDefaultEmail->show();
+
+	// Select default email in combo..
+	bool found = false;
 	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(" populateDefaultEmailCmb text >%s< defaultEmail >%s<",
+		       cmbDefaultEmail->text( i ).latin1(), defaultEmail.latin1());
+
+		if ( cmbDefaultEmail->text( i ).stripWhiteSpace() == defaultEmail.stripWhiteSpace() ){
+			cmbDefaultEmail->setCurrentItem( i );
+			qDebug("set");
+			found = true;
 		}
 	}
+	
+	// If the current default email is not found in the list, we choose the
+	// first one..
+	if ( !found )
+		defaultEmail = cmbDefaultEmail->text(0);
+}
+
+// Called when any combobox was changed.
+// "true" returned if the change was chandled by this function, else it should
+// be handled by something else..
+bool ContactEditor::cmbChooserChange( int index, QLineEdit *inputWid, int widgetPos ) {
+	QString type = slChooserNames[index];
+	qWarning("ContactEditor::cmbChooserChange -> Type: %s", type.latin1() );
+
+	// Create and connect combobox for selecting the default email 
+        if ( type == "Default Email"){         
+		qWarning("Choosing default-email ");
+		
+		// More than one defaul-email chooser is not allowed !
+		if ( ( defaultEmailChooserPosition != -1 ) && 
+		     defaultEmailChooserPosition != widgetPos ){
+			chooserError( widgetPos );
+			return true;
+		}
+
+		if ( cmbDefaultEmail ){  
+			delete cmbDefaultEmail;
+			cmbDefaultEmail = 0l;
+		}
+		cmbDefaultEmail = new QComboBox(inputWid->parentWidget());	   
+		cmbDefaultEmail->setGeometry(inputWid->frameGeometry()); 
+		
+		connect( cmbDefaultEmail,SIGNAL( activated(int) ),
+			 SLOT( defaultEmailChanged(int) ) ); 
+
+		cmbDefaultEmail->clear();    
+		cmbDefaultEmail->insertStringList( emails );
+		cmbDefaultEmail->show();
+
+		defaultEmailChooserPosition = widgetPos;
+
+		// Set current default email
+		populateDefaultEmailCmb();
+
+		
+	} else {
+		// Something else was selected: Hide combo..
+		qWarning(" Hiding default-email combo" );
+		if ( defaultEmailChooserPosition == widgetPos ){
+			defaultEmailChooserPosition = -1;
+			if ( cmbDefaultEmail )
+				cmbDefaultEmail->hide();
+
+		} 
+
+		// Caller should initialize the responsible textfield, therefore
+		// "false" is returned
+		return false;
+	}
+
+	// Everything is worked off ..
+	return true;
+
+}
+
+// Currently accessed when we select default-email more than once !
+void ContactEditor::chooserError( int index )
+{
+	qWarning("ContactEditor::chooserError( %d )", index); 
+	QMessageBox::warning( this, "Chooser Error",
+			      "Multiple selection of this\n"
+			      "Item is not allowed !\n\n"
+			      "First deselect the previous one !",
+			      "&OK", 0, 0,
+			      0, 0 );
+
+	// Reset the selected Chooser. Unfortunately the chooser
+	// generates no signal, therfore we have to 
+	// call the cmbChooserChange function manually..
+	switch( index ){
+	case 1:
+		cmbChooserField1 -> setCurrentItem( 0 );
+		slotCmbChooser1Change( 0 );
+		break;
+	case 2: 
+		cmbChooserField2 -> setCurrentItem( 0 );
+		slotCmbChooser2Change( 0 );
+		break;
+	case 3: 
+		cmbChooserField3 -> setCurrentItem( 0 );
+		slotCmbChooser3Change( 0 );
+		break;
+	case 4: 
+		cmbChooserField4 -> setCurrentItem( 0 );
+		slotCmbChooser4Change( 0 );
+		break;
+	}
 }
 
-void ContactEditor::chooserChange( const QString &textChanged, int index, QLineEdit *inputWid, int widgetPos ) {
+// Called when something was changed in a textfield (shouldn't it called textchanged? (se))
+void ContactEditor::chooserChange( const QString &textChanged, int index, 
+				   QLineEdit* , int widgetPos ) {
+
 	QString type = slChooserNames[index];
-	qDebug("ContactEditor::chooserChange( type=>%s<, textChanged=>%s< index=%i, widgetPos=%i",type.latin1(),textChanged.latin1(), index,  widgetPos );
+	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 = 0l;
-	  }
-	  cmbDefaultEmail = new QComboBox(inputWid->parentWidget());	   
-	  cmbDefaultEmail->setGeometry(inputWid->frameGeometry()); 
-	  cmbDefaultEmail->show();
-	  populateDefaultEmailCmb();
- 	  connect(cmbDefaultEmail,SIGNAL(activated(int)),
-		  SLOT(defaultEmailChanged(int))); 
-	  defaultEmailChooserPosition = widgetPos;
+		qWarning ("??? Wozu??: %s", textChanged.latin1());
+		defaultEmail = textChanged;
+
+		populateDefaultEmailCmb();
+
         }else if (defaultEmailChooserPosition == widgetPos){
-	qDebug("cmbDefaultEmail->hide()");
-	  if (cmbDefaultEmail) cmbDefaultEmail->hide();
-	  widgetPos=-1;
+		qDebug("cmbDefaultEmail->hide()");
+
+		if (cmbDefaultEmail) cmbDefaultEmail->hide();
+		widgetPos=-1;
+
 	}else if (type == "Emails"){
-	  qDebug("emails");
-	  QString de;
-	  emails = QStringList::split (",", textChanged );
+		qDebug("emails");
+
+		QString de;
+		emails = QStringList::split (",", textChanged );
 
-	  if ( cmbDefaultEmail )
-		  populateDefaultEmailCmb();
+		populateDefaultEmailCmb();
 	}
 	
-
-
 	slChooserValues[index] = textChanged;
 
 }
 
 void ContactEditor::slotChooser1Change( const QString &textChanged ) {
+	qWarning("ContactEditor::slotChooser1Change( %s )", textChanged.latin1());
 	chooserChange( textChanged, cmbChooserField1->currentItem(), txtChooserField1, 1);
 }
 
 void ContactEditor::slotChooser2Change( const QString &textChanged ) {
+	qWarning("ContactEditor::slotChooser2Change( %s )", textChanged.latin1());
 	chooserChange( textChanged, cmbChooserField2->currentItem(), txtChooserField2, 2);
 
 }
 
 void ContactEditor::slotChooser3Change( const QString &textChanged ) {
+	qWarning("ContactEditor::slotChooser3Change( %s )", textChanged.latin1());
 	chooserChange( textChanged, cmbChooserField3->currentItem(), txtChooserField3, 3);
 }
 
 void ContactEditor::slotChooser4Change( const QString &textChanged ) {
+	qWarning("ContactEditor::slotChooser4Change( %s )", textChanged.latin1());
 	chooserChange( textChanged, cmbChooserField4->currentItem(), txtChooserField4, 4);
 }
 
 void ContactEditor::slotAddressChange( const QString &textChanged ) {
 
 	if ( cmbAddress->currentItem() == 0 ) {
 		slBusinessAddress[0] = textChanged;
 	} else {
 		slHomeAddress[0] = textChanged;
 	}
 }
 
 void ContactEditor::slotAddress2Change( const QString &textChanged ) {
 
 	if ( cmbAddress->currentItem() == 0 ) {
 		slBusinessAddress[1] = textChanged;
 	} else {
 		slHomeAddress[1] = textChanged;
 	}
 }
 
 void ContactEditor::slotPOBoxChange( const QString &textChanged ) {
 
 	if ( cmbAddress->currentItem() == 0 ) {
 		slBusinessAddress[2] = textChanged;
 	} else {
 		slHomeAddress[2] = textChanged;
 	}
 }
 
 void ContactEditor::slotCityChange( const QString &textChanged ) {
 
 	if ( cmbAddress->currentItem() == 0 ) {
 		slBusinessAddress[3] = textChanged;
 	} else {
 		slHomeAddress[3] = textChanged;
 	}
 }
 
 void ContactEditor::slotStateChange( const QString &textChanged ) {
 
 
 	if ( cmbAddress->currentItem() == 0 ) {
 		slBusinessAddress[4] = textChanged;
 	} else {
 		slHomeAddress[4] = textChanged;
 	}
 }
 
 void ContactEditor::slotZipChange( const QString &textChanged ) {
 
 	if ( cmbAddress->currentItem() == 0 ) {
 		slBusinessAddress[5] = textChanged;
 	} else {
 		slHomeAddress[5] = textChanged;
 	}
 }
 
 void ContactEditor::slotCountryChange( const QString &textChanged ) {
 
 	if ( cmbAddress->currentItem() == 0 ) {
 		slBusinessAddress[6] = textChanged;
 	} else {
 		slHomeAddress[6] = textChanged;
 	}
 }
 
 
 void ContactEditor::slotCmbChooser1Change( int index ) {
+	qWarning("ContactEditor::slotCmbChooser1Change( %d )", index);
+
+	if ( !cmbChooserChange( cmbChooserField1->currentItem(), txtChooserField1, 1) ){
+
+		txtChooserField1->setText( slChooserValues[index] );
+		txtChooserField1->setFocus();
+
+	}
 
-	txtChooserField1->setText( slChooserValues[index] );
-        txtChooserField1->setFocus();
 }
 
 void ContactEditor::slotCmbChooser2Change( int index ) {
+	qWarning("ContactEditor::slotCmbChooser2Change( %d )", index);
+
+	if ( !cmbChooserChange( cmbChooserField2->currentItem(), txtChooserField2, 2) ){
 
-	txtChooserField2->setText( slChooserValues[index] );
-        txtChooserField2->setFocus();
+		txtChooserField2->setText( slChooserValues[index] );
+		txtChooserField2->setFocus();
+
+	}
 }
 
 void ContactEditor::slotCmbChooser3Change( int index ) {
+	qWarning("ContactEditor::slotCmbChooser3Change( %d )", index);
+
+	if ( !cmbChooserChange( cmbChooserField3->currentItem(), txtChooserField3, 3) ){
 
-	txtChooserField3->setText( slChooserValues[index] );
-        txtChooserField3->setFocus();
+		txtChooserField3->setText( slChooserValues[index] );
+		txtChooserField3->setFocus();
 
+	}
 }
 
 void ContactEditor::slotCmbChooser4Change( int index ) {
+	qWarning("ContactEditor::slotCmbChooser4Change( %d )", index);
+
+	if ( !cmbChooserChange( cmbChooserField4->currentItem(), txtChooserField4, 4) ){
 
-	txtChooserField4->setText( slChooserValues[index] );
-        txtChooserField4->setFocus();
+		txtChooserField4->setText( slChooserValues[index] );
+		txtChooserField4->setFocus();
 
+	}
 }
 
 void ContactEditor::slotAddressTypeChange( int index ) {
 
 	if ( index == 0 ) {
 
 		txtAddress->setText( slBusinessAddress[0] );
 		//txtAddress2->setText( (*slBusinessAddress)[1] );
 		//txtPOBox->setText( (*slBusinessAddress)[2] );
 		txtCity->setText( slBusinessAddress[3] );
 		txtState->setText( slBusinessAddress[4] );
 		txtZip->setText( slBusinessAddress[5] );
 		QLineEdit *txtTmp = cmbCountry->lineEdit();
 		txtTmp->setText( slBusinessAddress[6] );
 
 	} else {
 
 		txtAddress->setText( slHomeAddress[0] );
 		//txtAddress2->setText( (*slHomeAddress)[1] );
 		//txtPOBox->setText( (*slHomeAddress)[2] );
 		txtCity->setText( slHomeAddress[3] );
 		txtState->setText( slHomeAddress[4] );
 		txtZip->setText( slHomeAddress[5] );
 		QLineEdit *txtTmp = cmbCountry->lineEdit();
 		txtTmp->setText( slHomeAddress[6] );
 
 	}
 
 }
 
 void ContactEditor::slotFullNameChange( const QString &textChanged ) {
 
 	int index = cmbFileAs->currentItem();
 
 	cmbFileAs->clear();
 
 	cmbFileAs->insertItem( parseName( textChanged, 0 ) );
 	cmbFileAs->insertItem( parseName( textChanged, 1 ) );
 	cmbFileAs->insertItem( parseName( textChanged, 2 ) );
 	cmbFileAs->insertItem( parseName( textChanged, 3 ) );
 
 	cmbFileAs->setCurrentItem( index );
 
 	useFullName = true;
 
 }
 
 void ContactEditor::accept() {
@@ -1403,104 +1540,107 @@ void ContactEditor::saveEntry() {
 	QListIterator<QLineEdit> itLE( listValue );
 	for ( it = slDynamicEntries.begin(); itLE.current() && it != slDynamicEntries.end(); ++it, ++itLE) {
 
 		if ( *it == "Department" )
 			ent.setDepartment( (*itLE)->text() );
 
 		if ( *it == "Company" )
 			ent.setCompany( (*itLE)->text() );
 
 		if ( *it == "Office" )
 			ent.setOffice( (*itLE)->text() );
 
 		if ( *it == "Profession" )
 			ent.setProfession( (*itLE)->text() );
 
 		if ( *it == "Assistant" )
 			ent.setAssistant( (*itLE)->text() );
 
 		if ( *it == "Manager" )
 			ent.setManager( (*itLE)->text() );
 
 		if ( *it == "Spouse" )
 			ent.setSpouse( (*itLE)->text() );
 
 		if ( *it == "Nickname" )
 			ent.setNickname( (*itLE)->text() );
 
 		if ( *it == "Children" )
 			ent.setChildren( (*itLE)->text() );
 
 	}
 
 	 
 	QStringList::ConstIterator itV;
 	for ( it = slChooserNames.begin(), itV = slChooserValues.begin(); it != slChooserNames.end(); ++it, ++itV ) {
 
 		if ( ( *it == "Business Phone" ) || ( *it == "Work Phone"  ) )
 			ent.setBusinessPhone( *itV );
 
 		if ( ( *it == "Business Fax" ) || ( *it == "Work Fax" ) )
 			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 );
+			parseEmailFrom( emails.join(","), defaultmail, allemail );
+			if ( defaultEmail.isEmpty() ){
+				qWarning("Default email was not set by user!");
+				qWarning("Using first email in list: %s", defaultmail.latin1());
+				ent.setDefaultEmail( defaultmail );
+			}
  			ent.setEmails( allemail );
 		}
 
 		if ( *it == "Default Email")
-		  ent.setDefaultEmail( *itV );
+			ent.setDefaultEmail( defaultEmail /* *itV */ );
 
 		if ( *it == "Home Phone" )
 			ent.setHomePhone( *itV );
 
 		if ( *it == "Home Fax" )
 			ent.setHomeFax( *itV );
 
 		if ( *it == "Home Mobile" )
 			ent.setHomeMobile( *itV );
 
 		if ( ( *it == "Business Pager" ) || ( *it == "Work Pager" ) )
 			ent.setBusinessPager( *itV );
 
 		if ( *it == "Home Web Page" )
 			ent.setHomeWebpage( *itV );
 
 		if ( ( *it == "Business WebPage" ) || ( *it == "Work Web Page" ) )
 			ent.setBusinessWebpage( *itV );
 
 
 	}
 
 	int gender = cmbGender->currentItem();
 	ent.setGender( QString::number( gender ) );
 
 	QString str = txtNote->text();
 	if ( !str.isNull() )
 		ent.setNotes( str );
 
 }
 
 void parseEmailFrom( const QString &txt, QString &strDefaultEmail,
 		     QString &strAll )
 {
     int where,
 	start;
     if ( txt.isEmpty() )
 	return;
     // find the first
     where = txt.find( ',' );
     if ( where < 0 ) {
 	strDefaultEmail = txt;
 	strAll = txt;
     } else {
 	strDefaultEmail = txt.left( where ).stripWhiteSpace();
 	strAll = strDefaultEmail;
 	while ( where > -1 ) {
 	    strAll.append(" ");
diff --git a/core/pim/addressbook/contacteditor.h b/core/pim/addressbook/contacteditor.h
index bcef679..4fa48d1 100644
--- a/core/pim/addressbook/contacteditor.h
+++ b/core/pim/addressbook/contacteditor.h
@@ -33,124 +33,126 @@
 const int NAME_LF = 0;
 const int NAME_LFM = 1;
 const int NAME_FL = 2;
 const int NAME_FMLS = 3;
 
 const int NAME_F = 4;
 const int NAME_M = 5;
 const int NAME_L = 6;
 const int NAME_S = 7;
 
 
 class QScrollView;
 class QTabWidget;
 class QMultiLineEdit;
 class QLineEdit;
 class QComboBox;
 class QPushButton;
 class CategorySelect;
 class QLabel;
 
 class ContactEditor : public QDialog {
 	Q_OBJECT
 
 	public:
 		ContactEditor(	const OContact &entry,
 				QWidget *parent = 0,
 				const char *name = 0,
 				WFlags fl = 0 );
 		~ContactEditor();
 		void setNameFocus();
 		void setPersonalView( bool personal = true );
 		OContact entry() const { return ent; }
 
 	public slots:
 		void slotNote();
 		void slotName();
 		void setEntry(const OContact &entry);
 
 	protected slots:
 		void accept();
 
 	private:
 		void init();
 		void saveEntry();
 		bool isEmpty();
 		void cleanupFields();
 		void updateDatePicker();
 		QString parseName( QString fullName, int type );
+		void chooserError( int index );
 	private slots:
 		void slotChooser1Change( const QString &textChanged );
 		void slotChooser2Change( const QString &textChanged );
 		void slotChooser3Change( const QString &textChanged );
 		void slotChooser4Change( const QString &textChanged );
 		void slotCmbChooser1Change( int index );
 		void slotCmbChooser2Change( int index );
 		void slotCmbChooser3Change( int index );
 		void slotCmbChooser4Change( int index );
 		void slotAddressTypeChange( int index );
 		void slotAddressChange( const QString &textChanged );
 		void slotAddress2Change( const QString &textChanged );
 		void slotPOBoxChange( const QString &textChanged );
 		void slotCityChange( const QString &textChanged );
 		void slotStateChange( const QString &textChanged );
 		void slotZipChange( const QString &textChanged );
 		void slotCountryChange( const QString &textChanged );
 		void slotFullNameChange( const QString &textChanged );
 		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 cmbChooserChange( int , QLineEdit*, int );
 
 		bool useFullName;
 
 		OContact ent;
 
 		QDialog *dlgNote;
 		QDialog *dlgName;
 
 		QList<QLineEdit> listValue;
 		QList<QLabel> listName;
 
 		QStringList slDynamicEntries;
 		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;
 		QLineEdit *txtSuffix;
 
 		QTabWidget *tabMain;
 		QScrollView *svGeneral;
 		QPushButton *btnFullName;
 		QPushButton *btnNote;
 		QLineEdit *txtFullName;
 		QLineEdit *txtJobTitle;
 		QLineEdit *txtOrganization;
 		QLineEdit *txtChooserField1;
 		QLineEdit *txtChooserField2;
 		QLineEdit *txtChooserField3;
 		QLineEdit *txtChooserField4;
 		QComboBox *cmbChooserField1;
 		QComboBox *cmbChooserField2;
 		QComboBox *cmbChooserField3;
 		QComboBox *cmbChooserField4;
 		QComboBox *cmbDefaultEmail;