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
@@ -11,98 +11,98 @@
  *
  * 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> 
 
 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 )
 {
 
         init();
         setEntry( entry );
 }
 
 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();
         slChooserNames    = OContactFields::untrphonefields();
         slDynamicEntries  = OContactFields::untrdetailsfields();
         trlDynamicEntries = OContactFields::trdetailsfields();
         for (i = 0; i < slChooserNames.count(); i++)
           slChooserValues.append("");
 
 
         QVBoxLayout *vb = new QVBoxLayout( this );
 
         tabMain = new QTabWidget( this );
         vb->addWidget( tabMain );
 
         QWidget *tabViewport = new QWidget ( tabMain );
 
         vb = new QVBoxLayout( tabViewport );
 
         svGeneral = new QScrollView( tabViewport );
         vb->addWidget( svGeneral, 0, 0 );
@@ -576,126 +576,140 @@ void ContactEditor::init() {
         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( 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 &)) );
         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::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;
         } 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;
         }
 }
 
@@ -1326,104 +1340,107 @@ void ContactEditor::saveEntry() {
 
         QStringList::ConstIterator it;
         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 );
-                        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 );
 
                 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(" ");
             start = where;
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
@@ -55,118 +55,120 @@ class ContactEditor : public QDialog {
 
         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 );
         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:
+                void chooserChange( const QString&, int , QLineEdit* );
                 bool useFullName;
-                        //      bool hasGender, hasTitle, hasCompany, hasNotes, hasStreet, hasStreet2, hasPOBox, hasCity, hasState, hasZip, hasCountry;
 
                 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;
 
                 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;
                 QComboBox *cmbFileAs;
                 CategorySelect *cmbCat;
                 QLabel *labCat;
 
                 QScrollView *svAddress;
                 QLineEdit *txtAddress;
                 //QLineEdit *txtAddress2;
                 //QLineEdit *txtPOBox;
                 QLineEdit *txtCity;
                 QLineEdit *txtState;
                 QLineEdit *txtZip;
                 QComboBox *cmbAddress;
                 QComboBox *cmbCountry;
 
                 QScrollView *svDetails;
                 QComboBox *cmbGender;
                 DateBookMonth* birthdayPicker;
                 QToolButton* birthdayButton;
                 DateBookMonth* anniversaryPicker;
                 QToolButton* anniversaryButton;
         };
 
 #endif
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
@@ -1,189 +1,189 @@
 
 #include "ocontactfields.h"
 
 #include <qstringlist.h>
 #include <qobject.h>
 
 // We should use our own enum in the future ..
 #include <qpe/recordfields.h>
 
 /*!
   \internal
   Returns a  list of details field names for a contact.
 */
 QStringList OContactFields::untrdetailsfields( bool sorted )
 {
     QStringList list;
 
     list.append( "Office" );
     list.append( "Profession" );
     list.append( "Assistant" );
     list.append( "Manager" );
     list.append( "Spouse" );
     list.append( "Gender" );
     list.append( "Birthday" );
     list.append( "Anniversary" );
     list.append( "Nickname" );
     list.append( "Children" );
 
     if (sorted) list.sort();
 
     return list;
 }
 
 /*!
   \internal
   Returns a translated list of phone field names for a contact.
 */
 QStringList OContactFields::trphonefields( bool sorted )
 {
     QStringList list;
     list.append( QObject::tr( "Business Phone" ) );
     list.append( QObject::tr( "Business Fax" ) );
     list.append( QObject::tr( "Business Mobile" ) );
 
-    // list.append( QObject::tr( "Default Email" ) );
+    list.append( QObject::tr( "Default Email" ) );
     list.append( QObject::tr( "Emails" ) );
 
     list.append( QObject::tr( "Home Phone" ) );
     list.append( QObject::tr( "Home Fax" ) );
     list.append( QObject::tr( "Home Mobile" ) );
 
     if (sorted) list.sort();
 
     return list;
 }
 
 
 /*!
   \internal
   Returns a translated list of details field names for a contact.
 */
 QStringList OContactFields::trdetailsfields( bool sorted )
 {
     QStringList list;
 
     list.append( QObject::tr( "Office" ) );
     list.append( QObject::tr( "Profession" ) );
     list.append( QObject::tr( "Assistant" ) );
     list.append( QObject::tr( "Manager" ) );
 
     list.append( QObject::tr( "Spouse" ) );
     list.append( QObject::tr( "Gender" ) );
     list.append( QObject::tr( "Birthday" ) );
     list.append( QObject::tr( "Anniversary" ) );
     list.append( QObject::tr( "Nickname" ) );
     list.append( QObject::tr( "Children" ) );
 
     if (sorted) list.sort();
     return list;
 }
 
 
 /*!
   \internal
   Returns a translated list of field names for a contact.
 */
 QStringList OContactFields::trfields( bool sorted )
 {
     QStringList list;
 
     list.append( QObject::tr( "Name Title") );
     list.append( QObject::tr( "First Name" ) );
     list.append( QObject::tr( "Middle Name" ) );
     list.append( QObject::tr( "Last Name" ) );
     list.append( QObject::tr( "Suffix" ) );
     list.append( QObject::tr( "File As" ) );
 
     list.append( QObject::tr( "Job Title" ) );
     list.append( QObject::tr( "Department" ) );
     list.append( QObject::tr( "Company" ) );
 
     list += trphonefields( sorted );
 
     list.append( QObject::tr( "Business Street" ) );
     list.append( QObject::tr( "Business City" ) );
     list.append( QObject::tr( "Business State" ) );
     list.append( QObject::tr( "Business Zip" ) );
     list.append( QObject::tr( "Business Country" ) );
     list.append( QObject::tr( "Business Pager" ) );
     list.append( QObject::tr( "Business WebPage" ) );
 
     list.append( QObject::tr( "Home Street" ) );
     list.append( QObject::tr( "Home City" ) );
     list.append( QObject::tr( "Home State" ) );
     list.append( QObject::tr( "Home Zip" ) );
     list.append( QObject::tr( "Home Country" ) );
     list.append( QObject::tr( "Home Web Page" ) );
 
     list += trdetailsfields( sorted );
 
     list.append( QObject::tr( "Notes" ) );
     list.append( QObject::tr( "Groups" ) );
 
     if (sorted) list.sort();
 
     return list;
 }
 
 /*!
   \internal
   Returns a list of phone field names for a contact.
 */
 QStringList OContactFields::untrphonefields( bool sorted )
 {
     QStringList list;
 
     list.append( "Business Phone" );
     list.append( "Business Fax" );
     list.append( "Business Mobile" );
 
-    // list.append( "Default Email" );
+    list.append( "Default Email" );
     list.append( "Emails" );
 
     list.append( "Home Phone" );
     list.append( "Home Fax" );
     list.append( "Home Mobile" );
 
     if (sorted) list.sort();
 
     return list;
 }
 
 /*!
   \internal
   Returns an untranslated list of field names for a contact.
 */
 QStringList OContactFields::untrfields( bool sorted )
 {
     QStringList list;
 
     list.append( "Name Title" );
     list.append( "First Name" );
     list.append( "Middle Name" );
     list.append( "Last Name" );
     list.append( "Suffix" );
     list.append( "File As" );
 
     list.append( "Job Title" );
     list.append( "Department" );
     list.append( "Company" );
 
     list += untrphonefields( sorted );
 
     list.append( "Business Street" );
     list.append( "Business City" );
     list.append( "Business State" );
     list.append( "Business Zip" );
     list.append( "Business Country" );
     list.append( "Business Pager" );
     list.append( "Business WebPage" );
 
     list.append( "Office" );
     list.append( "Profession" );
     list.append( "Assistant" );
     list.append( "Manager" );
 
     list.append( "Home Street" );
     list.append( "Home City" );
     list.append( "Home State" );