author | eilers <eilers> | 2002-12-23 12:20:52 (UTC) |
---|---|---|
committer | eilers <eilers> | 2002-12-23 12:20:52 (UTC) |
commit | 8e5f0da214b389213ab9c00e7c5e93e0a9fbac46 (patch) (unidiff) | |
tree | 78293a0d1b5f92f0dd8291efd9d34422e8d54089 /core | |
parent | 6ba71719cecedbbc39380da760e695c44f9a1975 (diff) | |
download | opie-8e5f0da214b389213ab9c00e7c5e93e0a9fbac46.zip opie-8e5f0da214b389213ab9c00e7c5e93e0a9fbac46.tar.gz opie-8e5f0da214b389213ab9c00e7c5e93e0a9fbac46.tar.bz2 |
Hotfix for bug #537
-rw-r--r-- | core/pim/addressbook/ocontactfields.cpp | 85 |
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 | |||
@@ -21,2 +21,3 @@ QStringList OContactFields::untrdetailsfields( bool sorted ) | |||
21 | list.append( "Manager" ); | 21 | list.append( "Manager" ); |
22 | |||
22 | list.append( "Spouse" ); | 23 | list.append( "Spouse" ); |
@@ -29,3 +30,26 @@ QStringList OContactFields::untrdetailsfields( bool sorted ) | |||
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 | */ | ||
38 | QStringList 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; |
@@ -33,2 +57,3 @@ QStringList OContactFields::untrdetailsfields( bool sorted ) | |||
33 | 57 | ||
58 | |||
34 | /*! | 59 | /*! |
@@ -59,5 +84,5 @@ QStringList OContactFields::trphonefields( bool sorted ) | |||
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 | */ |
62 | QStringList OContactFields::trdetailsfields( bool sorted ) | 87 | QStringList OContactFields::untrphonefields( bool sorted ) |
63 | { | 88 | { |
@@ -65,15 +90,15 @@ QStringList OContactFields::trdetailsfields( bool sorted ) | |||
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; |
@@ -130,26 +155,2 @@ QStringList OContactFields::trfields( bool sorted ) | |||
130 | \internal | 155 | \internal |
131 | Returns a list of phone field names for a contact. | ||
132 | */ | ||
133 | QStringList 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. |
@@ -181,7 +182,2 @@ QStringList OContactFields::untrfields( bool sorted ) | |||
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" ); |
@@ -193,8 +189,3 @@ QStringList OContactFields::untrfields( bool sorted ) | |||
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 | ||