summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/addressbook/ocontactfields.cpp85
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
@@ -20,4 +20,5 @@ QStringList OContactFields::untrdetailsfields( bool sorted )
list.append( "Assistant" );
list.append( "Manager" );
+
list.append( "Spouse" );
list.append( "Gender" );
@@ -28,8 +29,32 @@ QStringList OContactFields::untrdetailsfields( bool sorted )
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
@@ -58,23 +83,23 @@ QStringList OContactFields::trphonefields( bool sorted )
/*!
\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;
}
@@ -129,28 +154,4 @@ QStringList OContactFields::trfields( bool sorted )
/*!
\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.
*/
@@ -180,9 +181,4 @@ QStringList OContactFields::untrfields( bool sorted )
list.append( "Business WebPage" );
- list.append( "Office" );
- list.append( "Profession" );
- list.append( "Assistant" );
- list.append( "Manager" );
-
list.append( "Home Street" );
list.append( "Home City" );
@@ -192,10 +188,5 @@ QStringList OContactFields::untrfields( bool sorted )
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" );