1 files changed, 156 insertions, 62 deletions

diff --git a/core/pim/addressbook/contacteditor.cpp b/core/pim/addressbook/contacteditor.cpp
index fa60f98..d419142 100644
--- a/core/pim/addressbook/contacteditor.cpp
+++ b/core/pim/addressbook/contacteditor.cpp
@@ -107,3 +107,3 @@ void ContactEditor::init() {
 
-                        if ( (*it).right( 3 ) == tr( "Fax" ) ) {
+                        if ( (*it) == tr( "Business Fax" ) ) {
                                 slChooserNames.append( *it );
@@ -113,4 +113,12 @@ void ContactEditor::init() {
                         }
+                        
+                        if ( (*it) == tr( "Home Fax" ) ) {
+                                slChooserNames.append( *it );
+                                slChooserValues.append("" );
+                                //slDynamicEntries->remove( it );
+                                continue;
+                        }
+
 
-                        if ( (*it).right( 5 ) == tr( "Phone" ) ) {
+                        if ( (*it) == tr( "Business Phone" ) ) {
                                 slChooserNames.append( *it );
@@ -121,2 +129,10 @@ void ContactEditor::init() {
 
+                        if ( (*it) == tr( "Home Phone" ) ) {
+                                slChooserNames.append( *it );
+                                slChooserValues.append( "" );
+                                //slDynamicEntries->remove( it );
+                                continue;
+                        }
+
+/*
                         if ( (*it).right( 2 ) == tr( "IM" ) ) {
@@ -126,5 +142,20 @@ void ContactEditor::init() {
                                 continue;
+                        } */
+
+                        if ( (*it) == tr( "Business Mobile" ) ) {
+                                slChooserNames.append( *it );
+                                slChooserValues.append( "" );
+                                //slDynamicEntries->remove( it );
+                                continue;
+                        }
+
+                        if ( (*it) == tr( "Home Mobile" ) ) {
+                                slChooserNames.append( *it );
+                                slChooserValues.append( "" );
+                                //slDynamicEntries->remove( it );
+                                continue;
                         }
 
-                        if ( (*it).right( 6 ) == tr( "Mobile" ) ) {
+
+                        if ( (*it) == tr( "Business WebPage" ) ) {
                                 slChooserNames.append( *it );
@@ -135,3 +166,3 @@ void ContactEditor::init() {
 
-                        if ( (*it).right( 4 ) == tr( "Page" ) ) {
+                        if ( (*it) == tr( "Home Web Page" ) ) {
                                 slChooserNames.append( *it );
@@ -142,3 +173,3 @@ void ContactEditor::init() {
 
-                        if ( (*it).right( 5 ) == tr( "Pager" ) ) {
+                        if ( (*it) == tr( "Business Pager" ) ) {
                                 slChooserNames.append( *it );
@@ -162,2 +193,5 @@ void ContactEditor::init() {
                         }
+                        
+                        if ( *it == "Name Title" || *it == "First Name" || *it == "Middle Name" || *it == "Last Name" || *it == "File As" || *it == "Default Email" || *it == "Emails" || *it == "Groups" )
+                                continue;
 
@@ -205,3 +239,3 @@ void ContactEditor::init() {
 
-                        if ( *it == tr( "Company" ) ) {
+                        if ( *it == tr( "Company") || *it == tr( "Organization" ) ) {
                                 hasCompany = TRUE;
@@ -222,3 +256,3 @@ void ContactEditor::init() {
 
-                        if ( (*it).right( 6 ) == tr( "Street" ) ) {
+                        if ( (*it) == tr( "Business Street" ) ) {
                                 hasStreet = TRUE;
@@ -228,2 +262,8 @@ void ContactEditor::init() {
 
+                        if ( (*it) == tr( "Home Street" ) ) {
+                                hasStreet = TRUE;
+                                //slDynamicEntries->remove( it );
+                                continue;
+                        }
+/*
                         if ( (*it).right( 8 ) == tr( "Street 2" ) ) {
@@ -232,3 +272,3 @@ void ContactEditor::init() {
                                 continue;
-                        }
+                        } 
 
@@ -238,5 +278,29 @@ void ContactEditor::init() {
                                 continue;
+                        } */
+
+                        if ( (*it) == tr( "Business City" ) ) {
+                                hasCity = TRUE;
+                                //slDynamicEntries->remove( it );
+                                continue;
+                        }
+
+                        if ( (*it) == tr( "Business State" ) ) {
+                                hasState = TRUE;
+                                //slDynamicEntries->remove( it );
+                                continue;
+                        }
+
+                        if ( (*it) == tr( "Business Zip" ) ) {
+                                hasZip = TRUE;
+                                //slDynamicEntries->remove( it );
+                                continue;
+                        }
+
+                        if ( (*it) == tr( "Business Country" ) ) {
+                                hasCountry = TRUE;
+                                //slDynamicEntries->remove( it );
+                                continue;
                         }
 
-                        if ( (*it).right( 4 ) == tr( "City" ) ) {
+                        if ( (*it) == tr( "Home City" ) ) {
                                 hasCity = TRUE;
@@ -246,3 +310,3 @@ void ContactEditor::init() {
 
-                        if ( (*it).right( 5 ) == tr( "State" ) ) {
+                        if ( (*it) == tr( "Home State" ) ) {
                                 hasState = TRUE;
@@ -252,3 +316,3 @@ void ContactEditor::init() {
 
-                        if ( (*it).right( 3 ) == tr( "Zip" ) ) {
+                        if ( (*it) == tr( "Home Zip" ) ) {
                                 hasZip = TRUE;
@@ -258,3 +322,3 @@ void ContactEditor::init() {
 
-                        if ( (*it).right( 7 ) == tr( "Country" ) ) {
+                        if ( (*it) == tr( "Home Country" ) ) {
                                 hasCountry = TRUE;
@@ -264,2 +328,3 @@ void ContactEditor::init() {
 
+
                         slDynamicEntries.append( *it );
@@ -962,3 +1027,4 @@ void ContactEditor::slotName() {
 
-        if (useFullName = TRUE) {
+        QString tmpName;
+        if (useFullName == TRUE) {
                 txtFirstName->setText( parseName(txtFullName->text(), NAME_F) );
@@ -968,6 +1034,7 @@ void ContactEditor::slotName() {
         }
-
         dlgName->showMaximized();
         if ( dlgName->exec() ) {
-                txtFullName->setText( txtFirstName->text() + " " + txtMiddleName->text() + " " + txtLastName->text() + " " + txtSuffix->text() );
+                
+                tmpName = txtFirstName->text() + " " + txtMiddleName->text() + " " + txtLastName->text() + " " + txtSuffix->text();
+                txtFullName->setText( tmpName.simplifyWhiteSpace() );
                 slotFullNameChange( txtFullName->text() );
@@ -1021,3 +1088,17 @@ QString ContactEditor::parseName( const QString fullName, int type ) {
                         case 0:
-                                return simplifiedName;
+                                //return simplifiedName;
+                                if (txtLastName->text() != "") {
+                                        strLastName = simplifiedName;
+                                        break;
+                                }
+                                if (txtMiddleName->text() != "") {
+                                        strMiddleName = simplifiedName;
+                                        break;
+                                }
+                                if (txtSuffix->text() != "") {
+                                        strSuffix = simplifiedName;
+                                        break;
+                                }
+                                strFirstName = simplifiedName;
+                                break;
 
@@ -1077,3 +1158,17 @@ QString ContactEditor::parseName( const QString fullName, int type ) {
                         case 0:
-                                return simplifiedName;
+                                //return simplifiedName;
+                                if (txtLastName->text() != "") {
+                                        strLastName = simplifiedName;
+                                        break;
+                                }
+                                if (txtMiddleName->text() != "") {
+                                        strMiddleName = simplifiedName;
+                                        break;
+                                }
+                                if (txtSuffix->text() != "") {
+                                        strSuffix = simplifiedName;
+                                        break;
+                                }
+                                strFirstName = simplifiedName;
+                                break;
 
@@ -1128,3 +1223,2 @@ QString ContactEditor::parseName( const QString fullName, int type ) {
         }
-
         switch (type) {
@@ -1268,33 +1362,33 @@ void ContactEditor::setEntry( const Contact &entry ) {
         for ( it = slDynamicEntries.begin(); it != slDynamicEntries.end(); ++it, ++itLE) {
-                if ( *it == "Department" )
+                if ( *it == tr("Department") )
                         (*itLE)->setText( ent.department() );
 
-                if ( *it == "Company" )
+                if ( *it == tr("Company" ))
                         (*itLE)->setText( ent.company() );
 
-                if ( *it == "Office" )
+                if ( *it == tr("Office" ))
                         (*itLE)->setText( ent.office() );
 
-                if ( *it == "Profession" )
+                if ( *it == tr("Profession" ))
                         (*itLE)->setText( ent.profession() );
 
-                if ( *it == "Assistant" )
+                if ( *it == tr("Assistant" ))
                         (*itLE)->setText( ent.assistant() );
 
-                if ( *it == "Manager" )
+                if ( *it == tr("Manager" ))
                         (*itLE)->setText( ent.manager() );
 
-                if ( *it == "Spouse" )
+                if ( *it == tr("Spouse" ))
                         (*itLE)->setText( ent.spouse() );
 
-                if ( *it == "Birthday" )
+                if ( *it == tr("Birthday" ))
                         (*itLE)->setText( ent.birthday() );
 
-                if ( *it == "Anniversary" )
+                if ( *it == tr("Anniversary" ))
                         (*itLE)->setText( ent.anniversary() );
 
-                if ( *it == "Nickname" )
+                if ( *it == tr("Nickname" ))
                         (*itLE)->setText( ent.nickname() );
 
-                if ( *it == "Children" )
+                if ( *it == tr("Children" ))
                         (*itLE)->setText( ent.children() );
@@ -1306,3 +1400,3 @@ void ContactEditor::setEntry( const Contact &entry ) {
 
-                if ( *it == "Business Phone" || *it == "Work Phone" )
+                if ( *it == tr("Business Phone") || *it == tr("Work Phone" ))
                         *itV = ent.businessPhone();
@@ -1312,6 +1406,6 @@ void ContactEditor::setEntry( const Contact &entry ) {
 */
-                if ( *it == "Business Fax" || *it == "Work Fax" )
+                if ( *it == tr("Business Fax") || *it == tr("Work Fax" ))
                         *itV = ent.businessFax();
 
-                if ( *it == "Business Mobile" || *it == "work Mobile" )
+                if ( *it == tr("Business Mobile") || *it == tr("work Mobile" ))
                         *itV = ent.businessMobile();
@@ -1321,9 +1415,9 @@ void ContactEditor::setEntry( const Contact &entry ) {
 */
-                if ( *it == "Default Email" )
+                if ( *it == tr("Default Email" ))
                         *itV = ent.defaultEmail();
 
-                if ( *it == "Emails" )
+                if ( *it == tr("Emails" ))
                         *itV = ent.emails();
 
-                if ( *it == "Home Phone" )
+                if ( *it == tr("Home Phone" ))
                         *itV = ent.homePhone();
@@ -1333,6 +1427,6 @@ void ContactEditor::setEntry( const Contact &entry ) {
 */
-                if ( *it == "Home Fax" )
+                if ( *it == tr("Home Fax" ))
                         *itV = ent.homeFax();
 
-                if ( *it == "Home Mobile" )
+                if ( *it == tr("Home Mobile" ))
                         *itV = ent.homeMobile();
@@ -1348,3 +1442,3 @@ void ContactEditor::setEntry( const Contact &entry ) {
 */
-                if ( *it == "Business Pager" || *it == "Work Pager" )
+                if ( *it == tr("Business Pager") || *it == tr("Work Pager" ))
                         *itV = ent.businessPager();
@@ -1369,5 +1463,5 @@ void ContactEditor::setEntry( const Contact &entry ) {
 */
-                if ( *it == "Home Web Page" )
+                if ( *it == tr("Home Web Page") )
                         *itV = ent.homeWebpage();
-                if ( *it == "Business Web Page" || *it == "Work Web Page" )
+                if ( *it == tr("Business WebPage") || *it == tr("Work Web Page") )
                         *itV = ent.businessWebpage();
@@ -1465,33 +1559,33 @@ void ContactEditor::saveEntry() {
         for ( it = slDynamicEntries.begin(); it != slDynamicEntries.end(); ++it, ++itLE) {
-                if ( *it == "Department" )
+                if ( *it == tr("Department" ))
                         ent.setDepartment( (*itLE)->text() );
 
-                if ( *it == "Company" )
+                if ( *it == tr("Company" ))
                         ent.setCompany( (*itLE)->text() );
 
-                if ( *it == "Office" )
+                if ( *it == tr("Office" ))
                         ent.setOffice( (*itLE)->text() );
 
-                if ( *it == "Profession" )
+                if ( *it == tr("Profession" ))
                         ent.setProfession( (*itLE)->text() );
 
-                if ( *it == "Assistant" )
+                if ( *it == tr("Assistant" ))
                         ent.setAssistant( (*itLE)->text() );
 
-                if ( *it == "Manager" )
+                if ( *it == tr("Manager" ))
                         ent.setManager( (*itLE)->text() );
 
-                if ( *it == "Spouse" )
+                if ( *it == tr("Spouse" ))
                         ent.setSpouse( (*itLE)->text() );
 
-                if ( *it == "Birthday" )
+                if ( *it == tr("Birthday" ))
                         ent.setBirthday( (*itLE)->text() );
 
-                if ( *it == "Anniversary" )
+                if ( *it == tr("Anniversary" ))
                         ent.setAnniversary( (*itLE)->text() );
 
-                if ( *it == "Nickname" )
+                if ( *it == tr("Nickname" ))
                         ent.setNickname( (*itLE)->text() );
 
-                if ( *it == "Children" )
+                if ( *it == tr("Children" ))
                         ent.setChildren( (*itLE)->text() );
@@ -1503,12 +1597,12 @@ void ContactEditor::saveEntry() {
 
-                if ( *it == "Business Phone" || *it == "Work Phone" )
+                if ( *it == tr("Business Phone") || *it == tr("Work Phone" ))
                         ent.setBusinessPhone( *itV );
 /*
-                if ( *it == "Business 2 Phone" )
+                if ( *it == tr("Business 2 Phone" )
                         ent.setBusiness2Phone( *itV );
 */
-                if ( *it == "Business Fax" || *it == "Work Fax" )
+                if ( *it == tr("Business Fax") || *it == tr("Work Fax" ))
                         ent.setBusinessFax( *itV );
 
-                if ( *it == "Business Mobile" || *it == "Work Mobile" )
+                if ( *it == tr("Business Mobile") || *it == tr("Work Mobile" ))
                         ent.setBusinessMobile( *itV );
@@ -1521,3 +1615,3 @@ void ContactEditor::saveEntry() {
 
-                if ( *it == "Emails" ) {
+                if ( *it == tr("Emails" )) {
                         QString allemail;
@@ -1529,3 +1623,3 @@ void ContactEditor::saveEntry() {
 
-                if ( *it == "Home Phone" )
+                if ( *it == tr("Home Phone" ))
                         ent.setHomePhone( *itV );
@@ -1535,6 +1629,6 @@ void ContactEditor::saveEntry() {
 */
-                if ( *it == "Home Fax" )
+                if ( *it == tr("Home Fax" ))
                         ent.setHomeFax( *itV );
 
-                if ( *it == "Home Mobile" )
+                if ( *it == tr("Home Mobile" ))
                         ent.setHomeMobile( *itV );
@@ -1550,3 +1644,3 @@ void ContactEditor::saveEntry() {
 */
-                if ( *it == "Business Pager" || *it == "Work Pager" )
+                if ( *it == tr("Business Pager") || *it == tr("Work Pager") )
                         ent.setBusinessPager( *itV );
@@ -1571,5 +1665,5 @@ void ContactEditor::saveEntry() {
 */
-                if ( *it == "Home Web Page" )
+                if ( *it == tr("Home Web Page") )
                         ent.setHomeWebpage( *itV );
-                if ( *it == "Business Web Page" || *it == "Work Web Page" )
+                if ( *it == tr("Business WebPage") || *it == tr("Work Web Page" ))
                         ent.setBusinessWebpage( *itV );