2 files changed, 11 insertions, 5 deletions

diff --git a/core/pim/addressbook/contacteditor.cpp b/core/pim/addressbook/contacteditor.cpp
index c4a7b10..75dd2c1 100644
--- a/core/pim/addressbook/contacteditor.cpp
+++ b/core/pim/addressbook/contacteditor.cpp
@@ -584,128 +584,130 @@ void ContactEditor::init() {
           if (((*it) == "Anniversary") || 
               ((*it) == "Birthday")|| ((*it) == "Gender")) continue;
 
           l = new QLabel( mapIdToStr[mapStrToID[*it]].utf8() , container );
                 listName.append( l );
                 gl->addWidget( l, i, 0 );
                 QLineEdit *e = new QLineEdit( container );
                 listValue.append( e );
                 gl->addWidget( e, i, 1);
         }
         // Fill labels with names..
                 //loadFields();
 
 
         tabMain->insertTab( tabViewport, tr( "Details" ) );
 
         dlgNote = new QDialog( this, "Note Dialog", TRUE );
         dlgNote->setCaption( tr("Enter Note") );
         QVBoxLayout *vbNote = new QVBoxLayout( dlgNote );
         txtNote = new QMultiLineEdit( dlgNote );
         vbNote->addWidget( txtNote );
         connect( btnNote, SIGNAL(clicked()), this, SLOT(slotNote()) );
 
         dlgName = new QDialog( this, "Name Dialog", TRUE );
         dlgName->setCaption( tr("Edit Name") );
         gl = new QGridLayout( dlgName, 5, 2, 2, 3 );
 
         l = new QLabel( tr("First Name"), dlgName );
         gl->addWidget( l, 0, 0 );
         txtFirstName = new QLineEdit( dlgName );
         gl->addWidget( txtFirstName, 0, 1 );
 
         l = new QLabel( tr("Middle Name"), dlgName );
         gl->addWidget( l, 1, 0 );
         txtMiddleName = new QLineEdit( dlgName );
         gl->addWidget( txtMiddleName, 1, 1 );
 
         l = new QLabel( tr("Last Name"), dlgName );
         gl->addWidget( l, 2, 0 );
         txtLastName = new QLineEdit( dlgName );
         gl->addWidget( txtLastName, 2, 1 );
 
         // l = new QLabel( tr("Suffix"), dlgName );
         // gl->addWidget( l, 3, 0 );
         // txtSuffix = new QLineEdit( dlgName );
         // gl->addWidget( txtSuffix, 3, 1 );
         space = new QSpacerItem(1,1,
                                 QSizePolicy::Maximum,
                                 QSizePolicy::MinimumExpanding );
         gl->addItem( space, 4,  0 );
 
         cmbChooserField1->insertStringList( trlChooserNames );
         cmbChooserField2->insertStringList( trlChooserNames );
         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( txtSuffix, SIGNAL(textChanged(const QString &)), this, SLOT(slotSuffixChange(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 );
 
         qWarning("init() END");
 }
 
 void ContactEditor::defaultEmailChanged(int i){
         qDebug("defaultEmailChanged");
 
         // was sollte das ? (se)
         // 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->show();
 
         // Select default email in combo..
         bool found = false;
@@ -976,279 +978,282 @@ void ContactEditor::slotCmbChooser3Change( int index ) {
 
 void ContactEditor::slotCmbChooser4Change( int index ) {
         qWarning("ContactEditor::slotCmbChooser4Change( %d )", index);
 
         if ( !cmbChooserChange( cmbChooserField4->currentItem(), m_widgetStack4, 4) ){
 
                 txtChooserField4->setText( slChooserValues[index] );
                 txtChooserField4->setFocus();
 
         }
 }
 
 void ContactEditor::slotAddressTypeChange( int index ) {
 
 
         if ( !initializing )
                 contactfields.setFieldOrder( 4, 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 ) {
 
         qWarning( "ContactEditor::slotFullNameChange( %s )", textChanged.latin1() );
 
         int index = cmbFileAs->currentItem();
 
         cmbFileAs->clear();
 
         cmbFileAs->insertItem( parseName( textChanged, NAME_LF ) );
         cmbFileAs->insertItem( parseName( textChanged, NAME_LFM ) );
         cmbFileAs->insertItem( parseName( textChanged, NAME_FL ) );
         cmbFileAs->insertItem( parseName( textChanged, NAME_FMLS ) );
 
         cmbFileAs->setCurrentItem( index );
 
         useFullName = true;
 
 }
 
+void ContactEditor::slotSuffixChange( const QString& ) {
+        // Just want to update the FileAs combo if the suffix was changed..
+        slotFullNameChange( txtFullName->text() );
+}
+
 void ContactEditor::accept() {
 
         if ( isEmpty() ) {
                 cleanupFields();
                 reject();
         } else {
                 saveEntry();
                 cleanupFields();
                 QDialog::accept();
         }
 
 }
 
 void ContactEditor::slotNote() {
 
         dlgNote->showMaximized();
         if ( !dlgNote->exec() ) {
                 txtNote->setText( ent.notes() );
         }
 }
 
 void ContactEditor::slotName() {
 
         QString tmpName;
         if (useFullName) {
                 txtFirstName->setText( parseName(txtFullName->text(), NAME_F) );
                 txtMiddleName->setText( parseName(txtFullName->text(), NAME_M) );
                 txtLastName->setText( parseName(txtFullName->text(), NAME_L) );
                 // txtSuffix->setText( parseName(txtFullName->text(), NAME_S) );
         }
         dlgName->showMaximized();
         if ( dlgName->exec() ) {
 
-                tmpName = txtFirstName->text() + " " + txtMiddleName->text() + " " + txtLastName->text() + " " + txtSuffix->text();
+                tmpName = txtFirstName->text() + " " + txtMiddleName->text() + " " + txtLastName->text();
                 txtFullName->setText( tmpName.simplifyWhiteSpace() );
                 slotFullNameChange( txtFullName->text() );
                 useFullName = false;
         }
 
 }
 
 void ContactEditor::setNameFocus() {
 
         txtFullName->setFocus();
 
 }
 
 bool ContactEditor::isEmpty() {
         // Test and see if the record should be saved.
         // More strict than the original qtopia, needs name or fileas to save
 
         QString t = txtFullName->text();
         if ( !t.isEmpty() && containsAlphaNum( t ) )
                 return false;
 
         t = cmbFileAs->currentText();
         if ( !t.isEmpty() && containsAlphaNum( t ) )
                 return false;
 
         return true;
 
 }
 
 QString ContactEditor::parseName( const QString fullName, int type ) {
 
         QString simplifiedName( fullName.simplifyWhiteSpace() );
         QString strFirstName;
         QString strMiddleName;
         QString strLastName;
-        QString strSuffix;
         QString strTitle;
         int commapos;
         bool haveLastName = false;
 
         qWarning("Fullname: %s", simplifiedName.latin1());
 
         commapos = simplifiedName.find( ',', 0, TRUE);
         if ( commapos >= 0 ) {
                 qWarning(" Commapos: %d", commapos );
 
                 // A comma (",") separates the lastname from one or
                 // many first names. Thus, remove the lastname from the 
                 // String and parse the firstnames.
 
                 strLastName = simplifiedName.left( commapos );
                 simplifiedName= simplifiedName.mid( commapos + 1 );
                 haveLastName = true;
                 qWarning("Fullname without ',': %s", simplifiedName.latin1());
 
                 // If we have any lastname, we should now split all first names.
                 // The first one will be the used as first, the rest as "middle names"
 
                 QStringList allFirstNames = QStringList::split(" ", simplifiedName);
                 QStringList::Iterator it = allFirstNames.begin();
                 strFirstName = *it++;
                 QStringList allSecondNames;
                 for ( ; it != allFirstNames.end(); ++it )
                         allSecondNames.append( *it );
                 
                 strMiddleName = allSecondNames.join(" ");
 
         } else {
 
                 // No comma separator used: We use the first word as firstname, the 
                 // last as second/lastname and everything in the middle as middlename
 
                 QStringList allNames = QStringList::split(" ", simplifiedName);
                 QStringList::Iterator it = allNames.begin();
                 strFirstName = *it++;
                 QStringList allSecondNames;
                 for ( ; it != --allNames.end(); ++it )
                         allSecondNames.append( *it );
                 
                 strMiddleName = allSecondNames.join(" ");
                 strLastName = *(--allNames.end());
                 
         }
 
         if ( strFirstName == strLastName )
                 strFirstName = "";
 
         qWarning(" strFirstName: %s",  strFirstName.latin1());
         qWarning(" strMiddleName: %s",  strMiddleName.latin1());
         qWarning(" strLastName: %s",  strLastName.latin1());
-        qWarning(" strSuffix: %s",  strSuffix.latin1());
         qWarning(" strTitle: %s",  strTitle.latin1());
 
         switch (type) {
         case NAME_FL:
                 return strFirstName + " " + strLastName;
                 
         case NAME_LF:
                 return strLastName + ", " + strFirstName;
                 
         case NAME_LFM:
                 return strLastName + ", " + strFirstName + " " + strMiddleName;
                 
         case NAME_FMLS:
-                return strFirstName + " " + strMiddleName + " " + strLastName + " " + strSuffix;
+                return strFirstName + " " + strMiddleName + " " + strLastName + " " + txtSuffix->text();
                 
         case NAME_F:
                 return strFirstName;
                 
         case NAME_M:
                 return strMiddleName;
                 
         case NAME_L:
                 return strLastName;
                 
         case NAME_S:
-                return strSuffix;
+                return txtSuffix->text();
                 
         }
         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] = "";
         }
         
         QListIterator<QLineEdit> itLV( listValue );
         for ( ; itLV.current(); ++itLV ) {
                 (*itLV)->setText( "" );
         } 
         
         txtFirstName->setText("");
         txtMiddleName->setText("");
         txtLastName->setText("");
         txtSuffix->setText("");
         txtNote->setText("");
         txtFullName->setText("");
         txtJobTitle->setText("");
         txtOrganization->setText("");
         txtChooserField1->setText("");
         txtChooserField2->setText("");
         txtChooserField3->setText("");
         txtAddress->setText("");
         txtCity->setText("");
         txtState->setText("");
         txtZip->setText("");
         QLineEdit *txtTmp = cmbCountry->lineEdit();
         txtTmp->setText("");
         txtTmp = cmbFileAs->lineEdit();
         txtTmp->setText("");
         
 }
 
 void ContactEditor::setEntry( const OContact &entry ) {
         
         initializing = true;
         
         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;
diff --git a/core/pim/addressbook/contacteditor.h b/core/pim/addressbook/contacteditor.h
index 703e702..954c77e 100644
--- a/core/pim/addressbook/contacteditor.h
+++ b/core/pim/addressbook/contacteditor.h
@@ -39,128 +39,129 @@ 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 slotSuffixChange( 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:
                 enum StackWidgets { TextField = 1, Combo };
                 int defaultEmailChooserPosition;
                 void populateDefaultEmailCmb();
                 void chooserChange( const QString&, int , QLineEdit*, int );
                 bool cmbChooserChange( int , QWidgetStack*, int );
                 OContactFields contactfields;
 
                 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;
                 QWidgetStack* m_widgetStack1;
                 QWidgetStack* m_widgetStack2;
                 QWidgetStack* m_widgetStack3;
                 QWidgetStack* m_widgetStack4;
                 QComboBox *cmbChooserField1;
                 QComboBox *cmbChooserField2;
                 QComboBox *cmbChooserField3;
                 QComboBox *cmbChooserField4;