1 files changed, 4 insertions, 4 deletions

diff --git a/core/pim/addressbook/contacteditor.cpp b/core/pim/addressbook/contacteditor.cpp
index 97573af..b60f2dd 100644
--- a/core/pim/addressbook/contacteditor.cpp
+++ b/core/pim/addressbook/contacteditor.cpp
@@ -1446,100 +1446,100 @@ void ContactEditor::setEntry( const OContact &entry ) {
 /*
                 if ( *it == "Home Pager")
                         *itV = ent.homePager();
 
                 if ( *it == "AIM IM" )
                         *itV = ent.AIMIM();
 
                 if ( *it == "ICQ IM" )
                         *itV = ent.ICQIM();
 
                 if ( *it == "Jabber IM" )
                         *itV = ent.jabberIM();
 
                 if ( *it == "MSN IM" )
                         *itV = ent.MSNIM();
 
                 if ( *it == "Yahoo IM" )
                         *itV = ent.yahooIM();
 */
                 if ( *it == "Home Web Page" )
                         *itV = ent.homeWebpage();
 
                 if ( ( *it == "Business WebPage" ) || ( *it == "Work Web Page" ) )
                         *itV = ent.businessWebpage();
 
 
         }
 
         
         cmbCat->setCategories( ent.categories(), "Contacts", tr("Contacts") );
 
         QString gender = ent.gender();
         cmbGender->setCurrentItem( gender.toInt() );
 
         txtNote->setText( ent.notes() );
 
         slotAddressTypeChange( cmbAddress->currentItem() );
 
         // Calling "show()" to arrange all widgets. Otherwise we will get
         // a wrong position of the textfields and are unable to put our
         // default-email combo over it.. This is very ugly !
         // Does anybody has a better solution ? 
         // Basically we should rethink the strategy to hide
         // a textfield with overwriting.. (se)
         show();
 
         // Get combo-settings from contact and set preset..
         contactfields.loadFromRecord( ent );
-        cmbChooserField1->setCurrentItem( contactfields.getFieldOrder(0, 0) );
-        cmbChooserField2->setCurrentItem( contactfields.getFieldOrder(1, 1) );
-        cmbChooserField3->setCurrentItem( contactfields.getFieldOrder(2, 2) );
-        cmbChooserField4->setCurrentItem( contactfields.getFieldOrder(3, 5) );
+        cmbChooserField1->setCurrentItem( contactfields.getFieldOrder(0, 7) );
+        cmbChooserField2->setCurrentItem( contactfields.getFieldOrder(1, 9) );
+        cmbChooserField3->setCurrentItem( contactfields.getFieldOrder(2, 0) );
+        cmbChooserField4->setCurrentItem( contactfields.getFieldOrder(3, 6) );
         cmbAddress->setCurrentItem( contactfields.getFieldOrder(4, 1) );
         slotCmbChooser1Change( cmbChooserField1->currentItem() );
         slotCmbChooser2Change( cmbChooserField2->currentItem() );
         slotCmbChooser3Change( cmbChooserField3->currentItem() );
         slotCmbChooser4Change( cmbChooserField4->currentItem() );
         slotAddressTypeChange( cmbAddress->currentItem() );
 
         updateDatePicker();
 
         initializing = false;
 }
 void ContactEditor::updateDatePicker()
 {
         // Set DatePicker
         if ( !ent.birthday().isNull() ){
                 birthdayButton->setText( TimeString::numberDateString( ent.birthday() ) );
                 birthdayPicker->setDate( ent.birthday() );
         } else
                 birthdayButton->setText( tr ("Unknown") );
                 
         if ( !ent.anniversary().isNull() ){
                 anniversaryButton->setText( TimeString::numberDateString( ent.anniversary() ) );
                 anniversaryPicker->setDate( ent.anniversary() );
         } else
                 anniversaryButton->setText( tr ("Unknown") );
 
 }
 
 void ContactEditor::saveEntry() {
 
         // Store current combo into contact
         contactfields.saveToRecord( ent );
  
         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 ) );
 
                 useFullName = false;
         }
 
         ent.setFirstName( txtFirstName->text() );
         ent.setLastName( txtLastName->text() );
         ent.setMiddleName( txtMiddleName->text() );
         ent.setSuffix( txtSuffix->text() );
 
         ent.setFileAs( cmbFileAs->currentText() );