Hotfix for bug #537

1 files changed, 38 insertions, 47 deletions

diff --git a/core/pim/addressbook/ocontactfields.cpp b/core/pim/addressbook/ocontactfields.cpp
index 7823a9c..0da6a4f 100644
--- a/core/pim/addressbook/ocontactfields.cpp
+++ b/core/pim/addressbook/ocontactfields.cpp
@@ -6,89 +6,114 @@
 
 // We should use our own enum in the future ..
 #include <qpe/recordfields.h>
 
 /*!
   \internal
   Returns a  list of details field names for a contact.
 */
 QStringList OContactFields::untrdetailsfields( bool sorted )
 {
     QStringList list;
 
     list.append( "Office" );
     list.append( "Profession" );
     list.append( "Assistant" );
     list.append( "Manager" );
+
     list.append( "Spouse" );
     list.append( "Gender" );
     list.append( "Birthday" );
     list.append( "Anniversary" );
     list.append( "Nickname" );
     list.append( "Children" );
 
     if (sorted) list.sort();
+    return list;
+}
+
+/*!
+  \internal
+  Returns a translated list of details field names for a contact.
+*/
+QStringList OContactFields::trdetailsfields( bool sorted )
+{
+    QStringList list;
+
+    list.append( QObject::tr( "Office" ) );
+    list.append( QObject::tr( "Profession" ) );
+    list.append( QObject::tr( "Assistant" ) );
+    list.append( QObject::tr( "Manager" ) );
+
+    list.append( QObject::tr( "Spouse" ) );
+    list.append( QObject::tr( "Gender" ) );
+    list.append( QObject::tr( "Birthday" ) );
+    list.append( QObject::tr( "Anniversary" ) );
+    list.append( QObject::tr( "Nickname" ) );
+    list.append( QObject::tr( "Children" ) );
 
+    if (sorted) list.sort();
     return list;
 }
 
+
 /*!
   \internal
   Returns a translated list of phone field names for a contact.
 */
 QStringList OContactFields::trphonefields( bool sorted )
 {
     QStringList list;
     list.append( QObject::tr( "Business Phone" ) );
     list.append( QObject::tr( "Business Fax" ) );
     list.append( QObject::tr( "Business Mobile" ) );
 
     list.append( QObject::tr( "Default Email" ) );
     list.append( QObject::tr( "Emails" ) );
 
     list.append( QObject::tr( "Home Phone" ) );
     list.append( QObject::tr( "Home Fax" ) );
     list.append( QObject::tr( "Home Mobile" ) );
 
     if (sorted) list.sort();
 
     return list;
 }
 
 
 /*!
   \internal
-  Returns a translated list of details field names for a contact.
+  Returns a list of phone field names for a contact.
 */
-QStringList OContactFields::trdetailsfields( bool sorted )
+QStringList OContactFields::untrphonefields( bool sorted )
 {
     QStringList list;
 
-    list.append( QObject::tr( "Office" ) );
-    list.append( QObject::tr( "Profession" ) );
-    list.append( QObject::tr( "Assistant" ) );
-    list.append( QObject::tr( "Manager" ) );
+    list.append( "Business Phone" );
+    list.append( "Business Fax" );
+    list.append( "Business Mobile" );
 
-    list.append( QObject::tr( "Spouse" ) );
-    list.append( QObject::tr( "Gender" ) );
-    list.append( QObject::tr( "Birthday" ) );
-    list.append( QObject::tr( "Anniversary" ) );
-    list.append( QObject::tr( "Nickname" ) );
-    list.append( QObject::tr( "Children" ) );
+    list.append( "Default Email" );
+    list.append( "Emails" );
+
+    list.append( "Home Phone" );
+    list.append( "Home Fax" );
+    list.append( "Home Mobile" );
 
     if (sorted) list.sort();
+
     return list;
 }
 
 
 /*!
   \internal
   Returns a translated list of field names for a contact.
 */
 QStringList OContactFields::trfields( bool sorted )
 {
     QStringList list;
 
     list.append( QObject::tr( "Name Title") );
     list.append( QObject::tr( "First Name" ) );
     list.append( QObject::tr( "Middle Name" ) );
     list.append( QObject::tr( "Last Name" ) );
@@ -115,101 +140,67 @@ QStringList OContactFields::trfields( bool sorted )
     list.append( QObject::tr( "Home Zip" ) );
     list.append( QObject::tr( "Home Country" ) );
     list.append( QObject::tr( "Home Web Page" ) );
 
     list += trdetailsfields( sorted );
 
     list.append( QObject::tr( "Notes" ) );
     list.append( QObject::tr( "Groups" ) );
 
     if (sorted) list.sort();
 
     return list;
 }
 
 /*!
   \internal
-  Returns a list of phone field names for a contact.
-*/
-QStringList OContactFields::untrphonefields( bool sorted )
-{
-    QStringList list;
-
-    list.append( "Business Phone" );
-    list.append( "Business Fax" );
-    list.append( "Business Mobile" );
-
-    list.append( "Default Email" );
-    list.append( "Emails" );
-
-    list.append( "Home Phone" );
-    list.append( "Home Fax" );
-    list.append( "Home Mobile" );
-
-    if (sorted) list.sort();
-
-    return list;
-}
-
-/*!
-  \internal
   Returns an untranslated list of field names for a contact.
 */
 QStringList OContactFields::untrfields( bool sorted )
 {
     QStringList list;
 
     list.append( "Name Title" );
     list.append( "First Name" );
     list.append( "Middle Name" );
     list.append( "Last Name" );
     list.append( "Suffix" );
     list.append( "File As" );
 
     list.append( "Job Title" );
     list.append( "Department" );
     list.append( "Company" );
 
     list += untrphonefields( sorted );
 
     list.append( "Business Street" );
     list.append( "Business City" );
     list.append( "Business State" );
     list.append( "Business Zip" );
     list.append( "Business Country" );
     list.append( "Business Pager" );
     list.append( "Business WebPage" );
 
-    list.append( "Office" );
-    list.append( "Profession" );
-    list.append( "Assistant" );
-    list.append( "Manager" );
-
     list.append( "Home Street" );
     list.append( "Home City" );
     list.append( "Home State" );
     list.append( "Home Zip" );
     list.append( "Home Country" );
     list.append( "Home Web Page" );
 
-    list.append( "Spouse" );
-    list.append( "Gender" );
-    list.append( "Birthday" );
-    list.append( "Anniversary" );
-    list.append( "Nickname" );
-    list.append( "Children" );
+    list += untrdetailsfields( sorted );
 
     list.append( "Notes" );
     list.append( "Groups" );
 
     if (sorted) list.sort();
 
     return list;
 }
 QMap<int, QString> OContactFields::idToTrFields()
 {
 	QMap<int, QString> ret_map;
 	
 	ret_map.insert( Qtopia::Title, QObject::tr( "Name Title") );
 	ret_map.insert( Qtopia::FirstName, QObject::tr( "First Name" ) );
 	ret_map.insert( Qtopia::MiddleName, QObject::tr( "Middle Name" ) );
 	ret_map.insert( Qtopia::LastName, QObject::tr( "Last Name" ) );