Minor changes for Sharp rom compatability, fixed an annoying bug with edit and the chooser fields.

1 files changed, 39 insertions, 17 deletions

diff --git a/core/pim/addressbook/contacteditor.cpp b/core/pim/addressbook/contacteditor.cpp
index 66e94ef..6d92ac3 100644
--- a/core/pim/addressbook/contacteditor.cpp
+++ b/core/pim/addressbook/contacteditor.cpp
@@ -448,11 +448,11 @@ void ContactEditor::init() {
 	cmbChooserField1->insertStringList( *slChooserNames );
 	cmbChooserField2->insertStringList( *slChooserNames );
 	cmbChooserField3->insertStringList( *slChooserNames );
 
-	cmbChooserField1->setCurrentItem( 1 );
-	cmbChooserField2->setCurrentItem( 2 );
-	cmbChooserField3->setCurrentItem( 3 );
+	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 &)) );
@@ -958,8 +958,9 @@ void ContactEditor::cleanupFields() {
 void ContactEditor::setEntry( const Contact &entry ) {
 
 	cleanupFields();
 
+	
 	ent = entry;
 
 	useFullName = FALSE;
 	txtFirstName->setText( ent.firstName() );
@@ -1013,8 +1014,13 @@ void ContactEditor::setEntry( const Contact &entry ) {
 		(*slHomeAddress)[5] = ent.homeZip();
 		(*slBusinessAddress)[5] = ent.businessZip();
 	}
 
+	if (hasCountry) {
+		(*slHomeAddress)[6] = ent.homeCountry();
+		(*slBusinessAddress)[6] = ent.businessCountry();
+	}
+
 	QStringList::ConstIterator it;
 	QListIterator<QLineEdit> itLE( listValue );
 	for ( it = slDynamicEntries->begin(); it != slDynamicEntries->end(); ++it, ++itLE) {
 		if ( *it == "Department" )
@@ -1054,18 +1060,18 @@ void ContactEditor::setEntry( const Contact &entry ) {
 
 	QStringList::Iterator itV;
 	for ( it = slChooserNames->begin(), itV = slChooserValues->begin(); it != slChooserNames->end(); ++it, ++itV ) {
 
-		if ( *it == "Business Phone" )
+		if ( *it == "Business Phone" || *it == "Work Phone" )
 			*itV = ent.businessPhone();
 /*
 		if ( *it == "Business 2 Phone" )
 			*itV = ent.business2Phone();
 */
-		if ( *it == "Business Fax" )
+		if ( *it == "Business Fax" || *it == "Work Fax" )
 			*itV = ent.businessFax();
 
-		if ( *it == "Business Mobile" )
+		if ( *it == "Business Mobile" || *it == "work Mobile" )
 			*itV = ent.businessMobile();
 /*
 		if ( *it == "Company Phone" )
 			*itV = ent.companyPhone();
@@ -1096,9 +1102,9 @@ void ContactEditor::setEntry( const Contact &entry ) {
 
 		if ( *it == "Other Phone" )
 			*itV = ent.otherPhone();
 */
-		if ( *it == "Business Pager" )
+		if ( *it == "Business Pager" || *it == "Work Pager" )
 			*itV = ent.businessPager();
 /*
 		if ( *it == "Home Pager")
 			*itV = ent.homePager();
@@ -1119,9 +1125,9 @@ void ContactEditor::setEntry( const Contact &entry ) {
 			*itV = ent.yahooIM();
 */
 		if ( *it == "Home Web Page" )
 			*itV = ent.homeWebpage();
-		if ( *it == "Business Web Page" )
+		if ( *it == "Business Web Page" || *it == "Work Web Page" )
 			*itV = ent.businessWebpage();
 
 
 	}
@@ -1132,8 +1138,14 @@ void ContactEditor::setEntry( const Contact &entry ) {
 	cmbGender->setCurrentItem( gender.toInt() );
 
 	txtNote->setText( ent.notes() );
 
+	slotCmbChooser1Change( cmbChooserField1->currentItem() );
+	slotCmbChooser2Change( cmbChooserField2->currentItem() );
+	slotCmbChooser3Change( cmbChooserField3->currentItem() );
+
+	slotAddressTypeChange( cmbAddress->currentItem() );
+
 }
 
 void ContactEditor::saveEntry() {
 
@@ -1197,8 +1209,13 @@ void ContactEditor::saveEntry() {
 	if (hasZip) {
 		ent.setHomeZip( (*slHomeAddress)[5] );
 		ent.setBusinessZip( (*slBusinessAddress)[5] );
 	}
+	
+	if (hasCountry) {
+		ent.setHomeCountry( (*slHomeAddress)[6] );
+		ent.setBusinessCountry( (*slBusinessAddress)[6] );
+	}
 
 	QStringList::ConstIterator it;
 	QListIterator<QLineEdit> itLE( listValue );
 	for ( it = slDynamicEntries->begin(); it != slDynamicEntries->end(); ++it, ++itLE) {
@@ -1239,28 +1256,33 @@ void ContactEditor::saveEntry() {
 
 	QStringList::ConstIterator itV;
 	for ( it = slChooserNames->begin(), itV = slChooserValues->begin(); it != slChooserNames->end(); ++it, ++itV ) {
 
-		if ( *it == "Business Phone" )
+		if ( *it == "Business Phone" || *it == "Work Phone" )
 			ent.setBusinessPhone( *itV );
 /*
 		if ( *it == "Business 2 Phone" )
 			ent.setBusiness2Phone( *itV );
 */
-		if ( *it == "Business Fax" )
+		if ( *it == "Business Fax" || *it == "Work Fax" )
 			ent.setBusinessFax( *itV );
 
-		if ( *it == "Business Mobile" )
+		if ( *it == "Business Mobile" || *it == "Work Mobile" )
 			ent.setBusinessMobile( *itV );
 /*
 		if ( *it == "Company Phone" )
 			ent.setCompanyPhone( *itV );
 */
-		if ( *it == "Default Email" )
-			ent.setDefaultEmail( *itV );
-
-		if ( *it == "Emails" )
+		//if ( *it == "Default Email" )
+			//ent.setDefaultEmail( *itV );
+
+		if ( *it == "Emails" ) {
+			QString allemail;
+			QString defaultmail;
+			parseEmailFrom( *itV, defaultmail, allemail );
+			ent.setDefaultEmail(  defaultmail );
 			ent.setEmails( *itV );
+		}
 
 		if ( *it == "Home Phone" )
 			ent.setHomePhone( *itV );
 /*
@@ -1281,9 +1303,9 @@ void ContactEditor::saveEntry() {
 
 		if ( *it == "Other Phone" )
 			ent.setOtherPhone( *itV );
 */
-		if ( *it == "Business Pager" )
+		if ( *it == "Business Pager" || *it == "Work Pager" )
 			ent.setBusinessPager( *itV );
 /*
 		if ( *it == "Home Pager" )
 			ent.setHomePager( *itV );
@@ -1304,9 +1326,9 @@ void ContactEditor::saveEntry() {
 			ent.setYahooIM( *itV );
 */
 		if ( *it == "Home Web Page" )
 			ent.setHomeWebpage( *itV );
-		if ( *it == "Business Web Page" )
+		if ( *it == "Business Web Page" || *it == "Work Web Page" )
 			ent.setBusinessWebpage( *itV );
 
 
 	}