| -rw-r--r-- | core/pim/addressbook/addressbook.cpp | 3 | ||||
| -rw-r--r-- | core/pim/addressbook/contacteditor.cpp | 88 |
2 files changed, 53 insertions, 38 deletions
diff --git a/core/pim/addressbook/addressbook.cpp b/core/pim/addressbook/addressbook.cpp index 472b13e..2eb9ddf 100644 --- a/core/pim/addressbook/addressbook.cpp +++ b/core/pim/addressbook/addressbook.cpp @@ -32,5 +32,5 @@ #include <qpe/qpeapplication.h> #include <qpe/config.h> -#include <qpe/contact.h> +#include <opie/ocontact.h> #ifndef MAKE_FOR_SHARP_ROM @@ -858,4 +858,5 @@ void AddressbookWindow::initFields() QFile::remove( str ); } + if ( slOrderedFields.count() > 0 ) { for( QStringList::ConstIterator it = slOrderedFields.begin(); diff --git a/core/pim/addressbook/contacteditor.cpp b/core/pim/addressbook/contacteditor.cpp index b01583f..bae3a2b 100644 --- a/core/pim/addressbook/contacteditor.cpp +++ b/core/pim/addressbook/contacteditor.cpp @@ -85,4 +85,6 @@ void ContactEditor::init() { //*slDynamicEntries = *slOrdered; + QStringList trlChooserNames; + for (i = 0; i <= 6; i++) { slHomeAddress.append( "" ); @@ -104,8 +106,10 @@ void ContactEditor::init() { QStringList::ConstIterator it = slOrdered.begin(); + for ( i = 0; it != slOrdered.end(); i++, ++it ) { if ( (*it) == "Business Fax" ) { - slChooserNames.append( tr( "Business Fax" ) ); + trlChooserNames.append( tr( "Business Fax" ) ); + slChooserNames.append( *it ); slChooserValues.append("" ); //slDynamicEntries->remove( it ); @@ -114,5 +118,6 @@ void ContactEditor::init() { if ( (*it) == "Home Fax" ) { - slChooserNames.append( tr( "Home Fax" ) ); + trlChooserNames.append( tr( "Home Fax" ) ); + slChooserNames.append( *it ); slChooserValues.append("" ); //slDynamicEntries->remove( it ); @@ -122,5 +127,6 @@ void ContactEditor::init() { if ( (*it) == "Business Phone" ) { - slChooserNames.append( tr( "Business Phone" ) ); + trlChooserNames.append( tr( "Business Phone" ) ); + slChooserNames.append( *it ); slChooserValues.append( "" ); //slDynamicEntries->remove( it ); @@ -129,5 +135,6 @@ void ContactEditor::init() { if ( (*it) == "Home Phone" ) { - slChooserNames.append( tr( "Home Phone" ) ); + trlChooserNames.append( tr( "Home Phone" ) ); + slChooserNames.append( *it ); slChooserValues.append( "" ); //slDynamicEntries->remove( it ); @@ -144,5 +151,6 @@ void ContactEditor::init() { if ( (*it) == "Business Mobile" ) { - slChooserNames.append( tr( "Business Mobile" ) ); + trlChooserNames.append( tr( "Business Mobile" ) ); + slChooserNames.append( *it ); slChooserValues.append( "" ); //slDynamicEntries->remove( it ); @@ -151,5 +159,6 @@ void ContactEditor::init() { if ( (*it) == "Home Mobile" ) { - slChooserNames.append( tr( "Home Mobile" ) ); + trlChooserNames.append( tr( "Home Mobile" ) ); + slChooserNames.append( *it ); slChooserValues.append( "" ); //slDynamicEntries->remove( it ); @@ -159,5 +168,6 @@ void ContactEditor::init() { if ( (*it) == "Business WebPage" ) { - slChooserNames.append( tr( "Business WebPage" ) ); + trlChooserNames.append( tr( "Business WebPage" ) ); + slChooserNames.append( *it ); slChooserValues.append( "" ); //slDynamicEntries->remove( it ); @@ -166,5 +176,6 @@ void ContactEditor::init() { if ( (*it) == "Home Web Page" ) { - slChooserNames.append( tr( "Home Web Page" ) ); + trlChooserNames.append( tr( "Home Web Page" ) ); + slChooserNames.append( *it ); slChooserValues.append( "" ); //slDynamicEntries->remove( it ); @@ -173,5 +184,6 @@ void ContactEditor::init() { if ( (*it) == "Business Pager" ) { - slChooserNames.append( tr( "Business Pager" ) ); + trlChooserNames.append( tr( "Business Pager" ) ); + slChooserNames.append( *it ); slChooserValues.append( "" ); //slDynamicEntries->remove( it ); @@ -180,5 +192,6 @@ void ContactEditor::init() { if ( *it == "Default Email" ) { - slChooserNames.append( tr( "Default Email" ) ); + trlChooserNames.append( tr( "Default Email" ) ); + slChooserNames.append( *it ); slChooserValues.append( "" ); //slDynamicEntries->remove( it ); @@ -187,5 +200,6 @@ void ContactEditor::init() { if ( *it == "Emails" ) { - slChooserNames.append( tr( "Emails" ) ); + trlChooserNames.append( tr( "Emails" ) ); + slChooserNames.append( *it ); slChooserValues.append( "" ); //slDynamicEntries->remove( it ); @@ -750,8 +764,8 @@ void ContactEditor::init() { gl->addItem( space, 4, 0 ); - cmbChooserField1->insertStringList( slChooserNames ); - cmbChooserField2->insertStringList( slChooserNames ); - cmbChooserField3->insertStringList( slChooserNames ); - cmbChooserField4->insertStringList( slChooserNames ); + cmbChooserField1->insertStringList( trlChooserNames ); + cmbChooserField2->insertStringList( trlChooserNames ); + cmbChooserField3->insertStringList( trlChooserNames ); + cmbChooserField4->insertStringList( trlChooserNames ); cmbChooserField1->setCurrentItem( 0 ); @@ -1361,35 +1375,35 @@ void ContactEditor::setEntry( const OContact &entry ) { QListIterator<QLineEdit> itLE( listValue ); 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() ); @@ -1559,35 +1573,35 @@ void ContactEditor::saveEntry() { QListIterator<QLineEdit> itLE( listValue ); 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() ); |