summaryrefslogtreecommitdiff
Unidiff
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
@@ -19,6 +19,7 @@ QStringList OContactFields::untrdetailsfields( bool sorted )
19 list.append( "Profession" ); 19 list.append( "Profession" );
20 list.append( "Assistant" ); 20 list.append( "Assistant" );
21 list.append( "Manager" ); 21 list.append( "Manager" );
22
22 list.append( "Spouse" ); 23 list.append( "Spouse" );
23 list.append( "Gender" ); 24 list.append( "Gender" );
24 list.append( "Birthday" ); 25 list.append( "Birthday" );
@@ -27,10 +28,34 @@ QStringList OContactFields::untrdetailsfields( bool sorted )
27 list.append( "Children" ); 28 list.append( "Children" );
28 29
29 if (sorted) list.sort(); 30 if (sorted) list.sort();
31 return list;
32}
33
34/*!
35 \internal
36 Returns a translated list of details field names for a contact.
37*/
38QStringList OContactFields::trdetailsfields( bool sorted )
39{
40 QStringList list;
41
42 list.append( QObject::tr( "Office" ) );
43 list.append( QObject::tr( "Profession" ) );
44 list.append( QObject::tr( "Assistant" ) );
45 list.append( QObject::tr( "Manager" ) );
46
47 list.append( QObject::tr( "Spouse" ) );
48 list.append( QObject::tr( "Gender" ) );
49 list.append( QObject::tr( "Birthday" ) );
50 list.append( QObject::tr( "Anniversary" ) );
51 list.append( QObject::tr( "Nickname" ) );
52 list.append( QObject::tr( "Children" ) );
30 53
54 if (sorted) list.sort();
31 return list; 55 return list;
32} 56}
33 57
58
34/*! 59/*!
35 \internal 60 \internal
36 Returns a translated list of phone field names for a contact. 61 Returns a translated list of phone field names for a contact.
@@ -57,25 +82,25 @@ QStringList OContactFields::trphonefields( bool sorted )
57 82
58/*! 83/*!
59 \internal 84 \internal
60 Returns a translated list of details field names for a contact. 85 Returns a list of phone field names for a contact.
61*/ 86*/
62QStringList OContactFields::trdetailsfields( bool sorted ) 87QStringList OContactFields::untrphonefields( bool sorted )
63{ 88{
64 QStringList list; 89 QStringList list;
65 90
66 list.append( QObject::tr( "Office" ) ); 91 list.append( "Business Phone" );
67 list.append( QObject::tr( "Profession" ) ); 92 list.append( "Business Fax" );
68 list.append( QObject::tr( "Assistant" ) ); 93 list.append( "Business Mobile" );
69 list.append( QObject::tr( "Manager" ) );
70 94
71 list.append( QObject::tr( "Spouse" ) ); 95 list.append( "Default Email" );
72 list.append( QObject::tr( "Gender" ) ); 96 list.append( "Emails" );
73 list.append( QObject::tr( "Birthday" ) ); 97
74 list.append( QObject::tr( "Anniversary" ) ); 98 list.append( "Home Phone" );
75 list.append( QObject::tr( "Nickname" ) ); 99 list.append( "Home Fax" );
76 list.append( QObject::tr( "Children" ) ); 100 list.append( "Home Mobile" );
77 101
78 if (sorted) list.sort(); 102 if (sorted) list.sort();
103
79 return list; 104 return list;
80} 105}
81 106
@@ -128,30 +153,6 @@ QStringList OContactFields::trfields( bool sorted )
128 153
129/*! 154/*!
130 \internal 155 \internal
131 Returns a list of phone field names for a contact.
132*/
133QStringList OContactFields::untrphonefields( bool sorted )
134{
135 QStringList list;
136
137 list.append( "Business Phone" );
138 list.append( "Business Fax" );
139 list.append( "Business Mobile" );
140
141 list.append( "Default Email" );
142 list.append( "Emails" );
143
144 list.append( "Home Phone" );
145 list.append( "Home Fax" );
146 list.append( "Home Mobile" );
147
148 if (sorted) list.sort();
149
150 return list;
151}
152
153/*!
154 \internal
155 Returns an untranslated list of field names for a contact. 156 Returns an untranslated list of field names for a contact.
156*/ 157*/
157QStringList OContactFields::untrfields( bool sorted ) 158QStringList OContactFields::untrfields( bool sorted )
@@ -179,11 +180,6 @@ QStringList OContactFields::untrfields( bool sorted )
179 list.append( "Business Pager" ); 180 list.append( "Business Pager" );
180 list.append( "Business WebPage" ); 181 list.append( "Business WebPage" );
181 182
182 list.append( "Office" );
183 list.append( "Profession" );
184 list.append( "Assistant" );
185 list.append( "Manager" );
186
187 list.append( "Home Street" ); 183 list.append( "Home Street" );
188 list.append( "Home City" ); 184 list.append( "Home City" );
189 list.append( "Home State" ); 185 list.append( "Home State" );
@@ -191,12 +187,7 @@ QStringList OContactFields::untrfields( bool sorted )
191 list.append( "Home Country" ); 187 list.append( "Home Country" );
192 list.append( "Home Web Page" ); 188 list.append( "Home Web Page" );
193 189
194 list.append( "Spouse" ); 190 list += untrdetailsfields( sorted );
195 list.append( "Gender" );
196 list.append( "Birthday" );
197 list.append( "Anniversary" );
198 list.append( "Nickname" );
199 list.append( "Children" );
200 191
201 list.append( "Notes" ); 192 list.append( "Notes" );
202 list.append( "Groups" ); 193 list.append( "Groups" );