Diffstat (limited to 'core/pim/addressbook/addressbook.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | core/pim/addressbook/addressbook.cpp | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/core/pim/addressbook/addressbook.cpp b/core/pim/addressbook/addressbook.cpp index cf2eddf..472b13e 100644 --- a/core/pim/addressbook/addressbook.cpp +++ b/core/pim/addressbook/addressbook.cpp | |||
@@ -812,10 +812,12 @@ void AddressbookWindow::initFields() | |||
812 | // Call the contact functions that correspond to these old functions... | 812 | // Call the contact functions that correspond to these old functions... |
813 | 813 | ||
814 | QStringList xmlFields = OContact::fields(); | 814 | QStringList xmlFields = OContact::fields(); |
815 | QStringList visibleFields = OContact::trfields(); | 815 | QStringList visibleFields = OContact::untrfields(); |
816 | // QStringList trFields = OContact::trfields(); | ||
817 | |||
816 | xmlFields.remove( "Title" ); | 818 | xmlFields.remove( "Title" ); |
817 | visibleFields.remove( tr("Name Title") ); | 819 | visibleFields.remove( "Name Title" ); |
818 | visibleFields.remove( tr("Notes") ); | 820 | visibleFields.remove( "Notes" ); |
819 | 821 | ||
820 | int i, version; | 822 | int i, version; |
821 | Config cfg( "AddressBook" ); | 823 | Config cfg( "AddressBook" ); |
@@ -838,7 +840,7 @@ void AddressbookWindow::initFields() | |||
838 | 840 | ||
839 | zn = cfg.readEntry( "Category" + QString::number(i), QString::null ); | 841 | zn = cfg.readEntry( "Category" + QString::number(i), QString::null ); |
840 | while ( !zn.isNull() ) { | 842 | while ( !zn.isNull() ) { |
841 | if ( zn.contains( tr("Work") ) || zn.contains( tr("Mb") ) ) { | 843 | if ( zn.contains( "Work" ) || zn.contains( "Mb" ) ) { |
842 | slOrderedFields.clear(); | 844 | slOrderedFields.clear(); |
843 | break; | 845 | break; |
844 | } | 846 | } |
@@ -885,13 +887,13 @@ void AddressbookWindow::initFields() | |||
885 | orderedFields.remove( Qtopia::FileAs ); | 887 | orderedFields.remove( Qtopia::FileAs ); |
886 | orderedFields.remove( Qtopia::Notes ); | 888 | orderedFields.remove( Qtopia::Notes ); |
887 | orderedFields.remove( Qtopia::Gender ); | 889 | orderedFields.remove( Qtopia::Gender ); |
888 | slOrderedFields.remove( tr("Name Title") ); | 890 | slOrderedFields.remove( "Name Title" ); |
889 | slOrderedFields.remove( tr("First Name") ); | 891 | slOrderedFields.remove( "First Name" ); |
890 | slOrderedFields.remove( tr("Last Name") ); | 892 | slOrderedFields.remove( "Last Name" ); |
891 | slOrderedFields.remove( tr("File As") ); | 893 | slOrderedFields.remove( "File As" ); |
892 | slOrderedFields.remove( tr("Default Email") ); | 894 | slOrderedFields.remove( "Default Email" ); |
893 | slOrderedFields.remove( tr("Notes") ); | 895 | slOrderedFields.remove( "Notes" ); |
894 | slOrderedFields.remove( tr("Gender") ); | 896 | slOrderedFields.remove( "Gender" ); |
895 | 897 | ||
896 | } | 898 | } |
897 | } | 899 | } |