-rw-r--r-- | kabc/addressee.cpp | 25 | ||||
-rw-r--r-- | kabc/addressee.h | 5 | ||||
-rw-r--r-- | kabc/field.cpp | 20 | ||||
-rw-r--r-- | kabc/phonenumber.cpp | 13 |
4 files changed, 55 insertions, 8 deletions
diff --git a/kabc/addressee.cpp b/kabc/addressee.cpp index 39d14bb..7f592e9 100644 --- a/kabc/addressee.cpp +++ b/kabc/addressee.cpp | |||
@@ -30,48 +30,49 @@ $Id$ | |||
30 | 30 | ||
31 | #include <ksharedptr.h> | 31 | #include <ksharedptr.h> |
32 | #include <kdebug.h> | 32 | #include <kdebug.h> |
33 | #include <kapplication.h> | 33 | #include <kapplication.h> |
34 | #include <klocale.h> | 34 | #include <klocale.h> |
35 | #include <kidmanager.h> | 35 | #include <kidmanager.h> |
36 | //US | 36 | //US |
37 | #include <kstandarddirs.h> | 37 | #include <kstandarddirs.h> |
38 | #include <libkcal/syncdefines.h> | 38 | #include <libkcal/syncdefines.h> |
39 | 39 | ||
40 | //US #include "resource.h" | 40 | //US #include "resource.h" |
41 | #include "addressee.h" | 41 | #include "addressee.h" |
42 | 42 | ||
43 | using namespace KABC; | 43 | using namespace KABC; |
44 | 44 | ||
45 | static bool matchBinaryPattern( int value, int pattern ); | 45 | static bool matchBinaryPattern( int value, int pattern ); |
46 | static bool matchBinaryPatternA( int value, int pattern ); | 46 | static bool matchBinaryPatternA( int value, int pattern ); |
47 | static bool matchBinaryPatternP( int value, int pattern ); | 47 | static bool matchBinaryPatternP( int value, int pattern ); |
48 | 48 | ||
49 | struct Addressee::AddresseeData : public KShared | 49 | struct Addressee::AddresseeData : public KShared |
50 | { | 50 | { |
51 | QString uid; | 51 | QString uid; |
52 | QString name; | 52 | QString name; |
53 | QString formattedName; | 53 | QString formattedName; |
54 | QString defaultFormattedName; | ||
54 | QString familyName; | 55 | QString familyName; |
55 | QString givenName; | 56 | QString givenName; |
56 | QString additionalName; | 57 | QString additionalName; |
57 | QString prefix; | 58 | QString prefix; |
58 | QString suffix; | 59 | QString suffix; |
59 | QString nickName; | 60 | QString nickName; |
60 | QDateTime birthday; | 61 | QDateTime birthday; |
61 | QString mailer; | 62 | QString mailer; |
62 | TimeZone timeZone; | 63 | TimeZone timeZone; |
63 | Geo geo; | 64 | Geo geo; |
64 | QString title; | 65 | QString title; |
65 | QString role; | 66 | QString role; |
66 | QString organization; | 67 | QString organization; |
67 | QString note; | 68 | QString note; |
68 | QString productId; | 69 | QString productId; |
69 | QDateTime revision; | 70 | QDateTime revision; |
70 | QString sortString; | 71 | QString sortString; |
71 | QString externalUID; | 72 | QString externalUID; |
72 | QString originalExternalUID; | 73 | QString originalExternalUID; |
73 | KURL url; | 74 | KURL url; |
74 | Secrecy secrecy; | 75 | Secrecy secrecy; |
75 | Picture logo; | 76 | Picture logo; |
76 | Picture photo; | 77 | Picture photo; |
77 | Sound sound; | 78 | Sound sound; |
@@ -726,59 +727,75 @@ void Addressee::setName( const QString &name ) | |||
726 | if ( name == mData->name ) return; | 727 | if ( name == mData->name ) return; |
727 | detach(); | 728 | detach(); |
728 | mData->empty = false; | 729 | mData->empty = false; |
729 | mData->name = name; | 730 | mData->name = name; |
730 | } | 731 | } |
731 | 732 | ||
732 | QString Addressee::name() const | 733 | QString Addressee::name() const |
733 | { | 734 | { |
734 | return mData->name; | 735 | return mData->name; |
735 | } | 736 | } |
736 | 737 | ||
737 | QString Addressee::nameLabel() | 738 | QString Addressee::nameLabel() |
738 | { | 739 | { |
739 | return i18n("Name"); | 740 | return i18n("Name"); |
740 | } | 741 | } |
741 | 742 | ||
742 | 743 | ||
743 | void Addressee::setFormattedName( const QString &formattedName ) | 744 | void Addressee::setFormattedName( const QString &formattedName ) |
744 | { | 745 | { |
745 | if ( formattedName == mData->formattedName ) return; | 746 | if ( formattedName == mData->formattedName ) return; |
746 | detach(); | 747 | detach(); |
747 | mData->empty = false; | 748 | mData->empty = false; |
748 | mData->formattedName = formattedName; | 749 | mData->formattedName = formattedName; |
749 | } | 750 | } |
751 | void Addressee::setDefaultFormattedName( const QString &formattedName ) | ||
752 | { | ||
753 | if ( formattedName == mData->defaultFormattedName ) return; | ||
754 | detach(); | ||
755 | mData->empty = false; | ||
756 | mData->defaultFormattedName = formattedName; | ||
757 | } | ||
750 | 758 | ||
751 | QString Addressee::formattedName() const | 759 | QString Addressee::formattedName() const |
752 | { | 760 | { |
753 | return mData->formattedName; | 761 | return mData->formattedName; |
754 | } | 762 | } |
763 | QString Addressee::defaultFormattedName() const | ||
764 | { | ||
765 | return mData->defaultFormattedName; | ||
766 | } | ||
755 | 767 | ||
756 | QString Addressee::formattedNameLabel() | 768 | QString Addressee::formattedNameLabel() |
757 | { | 769 | { |
758 | return i18n("Formatted Name"); | 770 | return i18n("Formatted Name"); |
759 | } | 771 | } |
760 | 772 | ||
773 | QString Addressee::defaultFormattedNameLabel() | ||
774 | { | ||
775 | return i18n("Def.Formatted Name"); | ||
776 | } | ||
777 | |||
761 | 778 | ||
762 | void Addressee::setFamilyName( const QString &familyName ) | 779 | void Addressee::setFamilyName( const QString &familyName ) |
763 | { | 780 | { |
764 | if ( familyName == mData->familyName ) return; | 781 | if ( familyName == mData->familyName ) return; |
765 | detach(); | 782 | detach(); |
766 | mData->empty = false; | 783 | mData->empty = false; |
767 | mData->familyName = familyName; | 784 | mData->familyName = familyName; |
768 | } | 785 | } |
769 | 786 | ||
770 | QString Addressee::familyName() const | 787 | QString Addressee::familyName() const |
771 | { | 788 | { |
772 | return mData->familyName; | 789 | return mData->familyName; |
773 | } | 790 | } |
774 | 791 | ||
775 | QString Addressee::familyNameLabel() | 792 | QString Addressee::familyNameLabel() |
776 | { | 793 | { |
777 | return i18n("Family Name"); | 794 | return i18n("Family Name"); |
778 | } | 795 | } |
779 | 796 | ||
780 | 797 | ||
781 | void Addressee::setGivenName( const QString &givenName ) | 798 | void Addressee::setGivenName( const QString &givenName ) |
782 | { | 799 | { |
783 | if ( givenName == mData->givenName ) return; | 800 | if ( givenName == mData->givenName ) return; |
784 | detach(); | 801 | detach(); |
@@ -959,48 +976,56 @@ QString Addressee::businessAddressCountryLabel() | |||
959 | 976 | ||
960 | 977 | ||
961 | QString Addressee::businessAddressLabelLabel() | 978 | QString Addressee::businessAddressLabelLabel() |
962 | { | 979 | { |
963 | return i18n("Business Address Label"); | 980 | return i18n("Business Address Label"); |
964 | } | 981 | } |
965 | 982 | ||
966 | 983 | ||
967 | QString Addressee::homePhoneLabel() | 984 | QString Addressee::homePhoneLabel() |
968 | { | 985 | { |
969 | return i18n("Home Phone"); | 986 | return i18n("Home Phone"); |
970 | } | 987 | } |
971 | 988 | ||
972 | 989 | ||
973 | QString Addressee::businessPhoneLabel() | 990 | QString Addressee::businessPhoneLabel() |
974 | { | 991 | { |
975 | return i18n("Business Phone"); | 992 | return i18n("Business Phone"); |
976 | } | 993 | } |
977 | 994 | ||
978 | 995 | ||
979 | QString Addressee::mobilePhoneLabel() | 996 | QString Addressee::mobilePhoneLabel() |
980 | { | 997 | { |
981 | return i18n("Mobile Phone"); | 998 | return i18n("Mobile Phone"); |
982 | } | 999 | } |
1000 | QString Addressee::mobileWorkPhoneLabel() | ||
1001 | { | ||
1002 | return i18n("Mobile (work)"); | ||
1003 | } | ||
1004 | QString Addressee::mobileHomePhoneLabel() | ||
1005 | { | ||
1006 | return i18n("Mobile (home)"); | ||
1007 | } | ||
983 | 1008 | ||
984 | 1009 | ||
985 | QString Addressee::homeFaxLabel() | 1010 | QString Addressee::homeFaxLabel() |
986 | { | 1011 | { |
987 | return i18n("Home Fax"); | 1012 | return i18n("Home Fax"); |
988 | } | 1013 | } |
989 | 1014 | ||
990 | 1015 | ||
991 | QString Addressee::businessFaxLabel() | 1016 | QString Addressee::businessFaxLabel() |
992 | { | 1017 | { |
993 | return i18n("Business Fax"); | 1018 | return i18n("Business Fax"); |
994 | } | 1019 | } |
995 | 1020 | ||
996 | 1021 | ||
997 | QString Addressee::carPhoneLabel() | 1022 | QString Addressee::carPhoneLabel() |
998 | { | 1023 | { |
999 | return i18n("Car Phone"); | 1024 | return i18n("Car Phone"); |
1000 | } | 1025 | } |
1001 | 1026 | ||
1002 | 1027 | ||
1003 | QString Addressee::isdnLabel() | 1028 | QString Addressee::isdnLabel() |
1004 | { | 1029 | { |
1005 | return i18n("ISDN"); | 1030 | return i18n("ISDN"); |
1006 | } | 1031 | } |
diff --git a/kabc/addressee.h b/kabc/addressee.h index 8051fec..0d688f8 100644 --- a/kabc/addressee.h +++ b/kabc/addressee.h | |||
@@ -133,56 +133,59 @@ class Addressee | |||
133 | */ | 133 | */ |
134 | const QString uid() const; | 134 | const QString uid() const; |
135 | /** | 135 | /** |
136 | Return translated label for uid field. | 136 | Return translated label for uid field. |
137 | */ | 137 | */ |
138 | static QString uidLabel(); | 138 | static QString uidLabel(); |
139 | 139 | ||
140 | /** | 140 | /** |
141 | Set name. | 141 | Set name. |
142 | */ | 142 | */ |
143 | void setName( const QString &name ); | 143 | void setName( const QString &name ); |
144 | /** | 144 | /** |
145 | Return name. | 145 | Return name. |
146 | */ | 146 | */ |
147 | QString name() const; | 147 | QString name() const; |
148 | /** | 148 | /** |
149 | Return translated label for name field. | 149 | Return translated label for name field. |
150 | */ | 150 | */ |
151 | static QString nameLabel(); | 151 | static QString nameLabel(); |
152 | 152 | ||
153 | /** | 153 | /** |
154 | Set formatted name. | 154 | Set formatted name. |
155 | */ | 155 | */ |
156 | void setFormattedName( const QString &formattedName ); | 156 | void setFormattedName( const QString &formattedName ); |
157 | void setDefaultFormattedName( const QString &formattedName ); | ||
157 | /** | 158 | /** |
158 | Return formatted name. | 159 | Return formatted name. |
159 | */ | 160 | */ |
160 | QString formattedName() const; | 161 | QString formattedName() const; |
162 | QString defaultFormattedName() const; | ||
161 | /** | 163 | /** |
162 | Return translated label for formattedName field. | 164 | Return translated label for formattedName field. |
163 | */ | 165 | */ |
164 | static QString formattedNameLabel(); | 166 | static QString formattedNameLabel(); |
167 | static QString defaultFormattedNameLabel(); | ||
165 | 168 | ||
166 | /** | 169 | /** |
167 | Set family name. | 170 | Set family name. |
168 | */ | 171 | */ |
169 | void setFamilyName( const QString &familyName ); | 172 | void setFamilyName( const QString &familyName ); |
170 | /** | 173 | /** |
171 | Return family name. | 174 | Return family name. |
172 | */ | 175 | */ |
173 | QString familyName() const; | 176 | QString familyName() const; |
174 | /** | 177 | /** |
175 | Return translated label for familyName field. | 178 | Return translated label for familyName field. |
176 | */ | 179 | */ |
177 | static QString familyNameLabel(); | 180 | static QString familyNameLabel(); |
178 | 181 | ||
179 | /** | 182 | /** |
180 | Set given name. | 183 | Set given name. |
181 | */ | 184 | */ |
182 | void setGivenName( const QString &givenName ); | 185 | void setGivenName( const QString &givenName ); |
183 | /** | 186 | /** |
184 | Return given name. | 187 | Return given name. |
185 | */ | 188 | */ |
186 | QString givenName() const; | 189 | QString givenName() const; |
187 | /** | 190 | /** |
188 | Return translated label for givenName field. | 191 | Return translated label for givenName field. |
@@ -307,48 +310,50 @@ class Addressee | |||
307 | /** | 310 | /** |
308 | Return translated label for businessAddressCountry field. | 311 | Return translated label for businessAddressCountry field. |
309 | */ | 312 | */ |
310 | static QString businessAddressCountryLabel(); | 313 | static QString businessAddressCountryLabel(); |
311 | 314 | ||
312 | /** | 315 | /** |
313 | Return translated label for businessAddressLabel field. | 316 | Return translated label for businessAddressLabel field. |
314 | */ | 317 | */ |
315 | static QString businessAddressLabelLabel(); | 318 | static QString businessAddressLabelLabel(); |
316 | 319 | ||
317 | /** | 320 | /** |
318 | Return translated label for homePhone field. | 321 | Return translated label for homePhone field. |
319 | */ | 322 | */ |
320 | static QString homePhoneLabel(); | 323 | static QString homePhoneLabel(); |
321 | 324 | ||
322 | /** | 325 | /** |
323 | Return translated label for businessPhone field. | 326 | Return translated label for businessPhone field. |
324 | */ | 327 | */ |
325 | static QString businessPhoneLabel(); | 328 | static QString businessPhoneLabel(); |
326 | 329 | ||
327 | /** | 330 | /** |
328 | Return translated label for mobilePhone field. | 331 | Return translated label for mobilePhone field. |
329 | */ | 332 | */ |
330 | static QString mobilePhoneLabel(); | 333 | static QString mobilePhoneLabel(); |
334 | static QString mobileWorkPhoneLabel(); | ||
335 | static QString mobileHomePhoneLabel(); | ||
331 | 336 | ||
332 | /** | 337 | /** |
333 | Return translated label for homeFax field. | 338 | Return translated label for homeFax field. |
334 | */ | 339 | */ |
335 | static QString homeFaxLabel(); | 340 | static QString homeFaxLabel(); |
336 | 341 | ||
337 | /** | 342 | /** |
338 | Return translated label for businessFax field. | 343 | Return translated label for businessFax field. |
339 | */ | 344 | */ |
340 | static QString businessFaxLabel(); | 345 | static QString businessFaxLabel(); |
341 | 346 | ||
342 | /** | 347 | /** |
343 | Return translated label for carPhone field. | 348 | Return translated label for carPhone field. |
344 | */ | 349 | */ |
345 | static QString carPhoneLabel(); | 350 | static QString carPhoneLabel(); |
346 | 351 | ||
347 | /** | 352 | /** |
348 | Return translated label for isdn field. | 353 | Return translated label for isdn field. |
349 | */ | 354 | */ |
350 | static QString isdnLabel(); | 355 | static QString isdnLabel(); |
351 | 356 | ||
352 | /** | 357 | /** |
353 | Return translated label for pager field. | 358 | Return translated label for pager field. |
354 | */ | 359 | */ |
diff --git a/kabc/field.cpp b/kabc/field.cpp index 89d0b77..5c561c3 100644 --- a/kabc/field.cpp +++ b/kabc/field.cpp | |||
@@ -65,132 +65,141 @@ class Field::FieldImpl | |||
65 | HomeAddressCountry, | 65 | HomeAddressCountry, |
66 | HomeAddressLabel, | 66 | HomeAddressLabel, |
67 | BusinessAddressStreet, | 67 | BusinessAddressStreet, |
68 | BusinessAddressLocality, | 68 | BusinessAddressLocality, |
69 | BusinessAddressRegion, | 69 | BusinessAddressRegion, |
70 | BusinessAddressPostalCode, | 70 | BusinessAddressPostalCode, |
71 | BusinessAddressCountry, | 71 | BusinessAddressCountry, |
72 | BusinessAddressLabel, | 72 | BusinessAddressLabel, |
73 | HomePhone, | 73 | HomePhone, |
74 | BusinessPhone, | 74 | BusinessPhone, |
75 | MobilePhone, | 75 | MobilePhone, |
76 | HomeFax, | 76 | HomeFax, |
77 | BusinessFax, | 77 | BusinessFax, |
78 | CarPhone, | 78 | CarPhone, |
79 | Isdn, | 79 | Isdn, |
80 | Pager, | 80 | Pager, |
81 | Email, | 81 | Email, |
82 | Mailer, | 82 | Mailer, |
83 | Title, | 83 | Title, |
84 | Role, | 84 | Role, |
85 | Organization, | 85 | Organization, |
86 | Note, | 86 | Note, |
87 | Url, | 87 | Url, |
88 | Resource, | 88 | Resource, |
89 | Sip | 89 | Sip, |
90 | DefaultFormattedName, | ||
91 | MobileWorkPhone, | ||
92 | MobileHomePhone | ||
90 | }; | 93 | }; |
91 | 94 | ||
92 | int fieldId() { return mFieldId; } | 95 | int fieldId() { return mFieldId; } |
93 | int category() { return mCategory; } | 96 | int category() { return mCategory; } |
94 | 97 | ||
95 | QString label() { return mLabel; } | 98 | QString label() { return mLabel; } |
96 | QString key() { return mKey; } | 99 | QString key() { return mKey; } |
97 | QString app() { return mApp; } | 100 | QString app() { return mApp; } |
98 | 101 | ||
99 | private: | 102 | private: |
100 | int mFieldId; | 103 | int mFieldId; |
101 | int mCategory; | 104 | int mCategory; |
102 | 105 | ||
103 | QString mLabel; | 106 | QString mLabel; |
104 | QString mKey; | 107 | QString mKey; |
105 | QString mApp; | 108 | QString mApp; |
106 | }; | 109 | }; |
107 | 110 | ||
108 | 111 | ||
109 | Field::List Field::mAllFields; | 112 | Field::List Field::mAllFields; |
110 | Field::List Field::mDefaultFields; | 113 | Field::List Field::mDefaultFields; |
111 | Field::List Field::mCustomFields; | 114 | Field::List Field::mCustomFields; |
112 | 115 | ||
113 | 116 | ||
114 | Field::Field( FieldImpl *impl ) | 117 | Field::Field( FieldImpl *impl ) |
115 | { | 118 | { |
116 | mImpl = impl; | 119 | mImpl = impl; |
117 | } | 120 | } |
118 | 121 | ||
119 | Field::~Field() | 122 | Field::~Field() |
120 | { | 123 | { |
121 | delete mImpl; | 124 | delete mImpl; |
122 | } | 125 | } |
123 | 126 | ||
124 | QString Field::label() | 127 | QString Field::label() |
125 | { | 128 | { |
126 | switch ( mImpl->fieldId() ) { | 129 | switch ( mImpl->fieldId() ) { |
127 | case FieldImpl::FormattedName: | 130 | case FieldImpl::FormattedName: |
128 | return Addressee::formattedNameLabel(); | 131 | return Addressee::formattedNameLabel(); |
132 | case FieldImpl::DefaultFormattedName: | ||
133 | return Addressee::defaultFormattedNameLabel(); | ||
129 | case FieldImpl::FamilyName: | 134 | case FieldImpl::FamilyName: |
130 | return Addressee::familyNameLabel(); | 135 | return Addressee::familyNameLabel(); |
131 | case FieldImpl::GivenName: | 136 | case FieldImpl::GivenName: |
132 | return Addressee::givenNameLabel(); | 137 | return Addressee::givenNameLabel(); |
133 | case FieldImpl::AdditionalName: | 138 | case FieldImpl::AdditionalName: |
134 | return Addressee::additionalNameLabel(); | 139 | return Addressee::additionalNameLabel(); |
135 | case FieldImpl::Prefix: | 140 | case FieldImpl::Prefix: |
136 | return Addressee::prefixLabel(); | 141 | return Addressee::prefixLabel(); |
137 | case FieldImpl::Suffix: | 142 | case FieldImpl::Suffix: |
138 | return Addressee::suffixLabel(); | 143 | return Addressee::suffixLabel(); |
139 | case FieldImpl::NickName: | 144 | case FieldImpl::NickName: |
140 | return Addressee::nickNameLabel(); | 145 | return Addressee::nickNameLabel(); |
141 | case FieldImpl::Birthday: | 146 | case FieldImpl::Birthday: |
142 | return Addressee::birthdayLabel(); | 147 | return Addressee::birthdayLabel(); |
143 | case FieldImpl::HomeAddressStreet: | 148 | case FieldImpl::HomeAddressStreet: |
144 | return Addressee::homeAddressStreetLabel(); | 149 | return Addressee::homeAddressStreetLabel(); |
145 | case FieldImpl::HomeAddressLocality: | 150 | case FieldImpl::HomeAddressLocality: |
146 | return Addressee::homeAddressLocalityLabel(); | 151 | return Addressee::homeAddressLocalityLabel(); |
147 | case FieldImpl::HomeAddressRegion: | 152 | case FieldImpl::HomeAddressRegion: |
148 | return Addressee::homeAddressRegionLabel(); | 153 | return Addressee::homeAddressRegionLabel(); |
149 | case FieldImpl::HomeAddressPostalCode: | 154 | case FieldImpl::HomeAddressPostalCode: |
150 | return Addressee::homeAddressPostalCodeLabel(); | 155 | return Addressee::homeAddressPostalCodeLabel(); |
151 | case FieldImpl::HomeAddressCountry: | 156 | case FieldImpl::HomeAddressCountry: |
152 | return Addressee::homeAddressCountryLabel(); | 157 | return Addressee::homeAddressCountryLabel(); |
153 | case FieldImpl::HomeAddressLabel: | 158 | case FieldImpl::HomeAddressLabel: |
154 | return Addressee::homeAddressLabelLabel(); | 159 | return Addressee::homeAddressLabelLabel(); |
155 | case FieldImpl::BusinessAddressStreet: | 160 | case FieldImpl::BusinessAddressStreet: |
156 | return Addressee::businessAddressStreetLabel(); | 161 | return Addressee::businessAddressStreetLabel(); |
157 | case FieldImpl::BusinessAddressLocality: | 162 | case FieldImpl::BusinessAddressLocality: |
158 | return Addressee::businessAddressLocalityLabel(); | 163 | return Addressee::businessAddressLocalityLabel(); |
159 | case FieldImpl::BusinessAddressRegion: | 164 | case FieldImpl::BusinessAddressRegion: |
160 | return Addressee::businessAddressRegionLabel(); | 165 | return Addressee::businessAddressRegionLabel(); |
161 | case FieldImpl::BusinessAddressPostalCode: | 166 | case FieldImpl::BusinessAddressPostalCode: |
162 | return Addressee::businessAddressPostalCodeLabel(); | 167 | return Addressee::businessAddressPostalCodeLabel(); |
163 | case FieldImpl::BusinessAddressCountry: | 168 | case FieldImpl::BusinessAddressCountry: |
164 | return Addressee::businessAddressCountryLabel(); | 169 | return Addressee::businessAddressCountryLabel(); |
165 | case FieldImpl::BusinessAddressLabel: | 170 | case FieldImpl::BusinessAddressLabel: |
166 | return Addressee::businessAddressLabelLabel(); | 171 | return Addressee::businessAddressLabelLabel(); |
167 | case FieldImpl::HomePhone: | 172 | case FieldImpl::HomePhone: |
168 | return Addressee::homePhoneLabel(); | 173 | return Addressee::homePhoneLabel(); |
169 | case FieldImpl::BusinessPhone: | 174 | case FieldImpl::BusinessPhone: |
170 | return Addressee::businessPhoneLabel(); | 175 | return Addressee::businessPhoneLabel(); |
171 | case FieldImpl::MobilePhone: | 176 | case FieldImpl::MobilePhone: |
172 | return Addressee::mobilePhoneLabel(); | 177 | return Addressee::mobilePhoneLabel(); |
178 | case FieldImpl::MobileHomePhone: | ||
179 | return Addressee::mobileHomePhoneLabel(); | ||
180 | case FieldImpl::MobileWorkPhone: | ||
181 | return Addressee::mobileWorkPhoneLabel(); | ||
173 | case FieldImpl::HomeFax: | 182 | case FieldImpl::HomeFax: |
174 | return Addressee::homeFaxLabel(); | 183 | return Addressee::homeFaxLabel(); |
175 | case FieldImpl::BusinessFax: | 184 | case FieldImpl::BusinessFax: |
176 | return Addressee::businessFaxLabel(); | 185 | return Addressee::businessFaxLabel(); |
177 | case FieldImpl::CarPhone: | 186 | case FieldImpl::CarPhone: |
178 | return Addressee::carPhoneLabel(); | 187 | return Addressee::carPhoneLabel(); |
179 | case FieldImpl::Isdn: | 188 | case FieldImpl::Isdn: |
180 | return Addressee::isdnLabel(); | 189 | return Addressee::isdnLabel(); |
181 | case FieldImpl::Pager: | 190 | case FieldImpl::Pager: |
182 | return Addressee::pagerLabel(); | 191 | return Addressee::pagerLabel(); |
183 | case FieldImpl::Email: | 192 | case FieldImpl::Email: |
184 | return Addressee::emailLabel(); | 193 | return Addressee::emailLabel(); |
185 | case FieldImpl::Mailer: | 194 | case FieldImpl::Mailer: |
186 | return Addressee::mailerLabel(); | 195 | return Addressee::mailerLabel(); |
187 | case FieldImpl::Title: | 196 | case FieldImpl::Title: |
188 | return Addressee::titleLabel(); | 197 | return Addressee::titleLabel(); |
189 | case FieldImpl::Role: | 198 | case FieldImpl::Role: |
190 | return Addressee::roleLabel(); | 199 | return Addressee::roleLabel(); |
191 | case FieldImpl::Organization: | 200 | case FieldImpl::Organization: |
192 | return Addressee::organizationLabel(); | 201 | return Addressee::organizationLabel(); |
193 | case FieldImpl::Note: | 202 | case FieldImpl::Note: |
194 | return Addressee::noteLabel(); | 203 | return Addressee::noteLabel(); |
195 | case FieldImpl::Url: | 204 | case FieldImpl::Url: |
196 | return Addressee::urlLabel(); | 205 | return Addressee::urlLabel(); |
@@ -218,48 +227,50 @@ QString Field::categoryLabel( int category ) | |||
218 | case All: | 227 | case All: |
219 | return i18n("All"); | 228 | return i18n("All"); |
220 | case Frequent: | 229 | case Frequent: |
221 | return i18n("Frequent"); | 230 | return i18n("Frequent"); |
222 | case Address: | 231 | case Address: |
223 | return i18n("Address"); | 232 | return i18n("Address"); |
224 | case Email: | 233 | case Email: |
225 | return i18n("Email"); | 234 | return i18n("Email"); |
226 | case Personal: | 235 | case Personal: |
227 | return i18n("Personal"); | 236 | return i18n("Personal"); |
228 | case Organization: | 237 | case Organization: |
229 | return i18n("Organization"); | 238 | return i18n("Organization"); |
230 | case CustomCategory: | 239 | case CustomCategory: |
231 | return i18n("Custom"); | 240 | return i18n("Custom"); |
232 | default: | 241 | default: |
233 | return i18n("Undefined"); | 242 | return i18n("Undefined"); |
234 | } | 243 | } |
235 | } | 244 | } |
236 | 245 | ||
237 | QString Field::value( const KABC::Addressee &a ) | 246 | QString Field::value( const KABC::Addressee &a ) |
238 | { | 247 | { |
239 | switch ( mImpl->fieldId() ) { | 248 | switch ( mImpl->fieldId() ) { |
240 | case FieldImpl::FormattedName: | 249 | case FieldImpl::FormattedName: |
241 | return a.formattedName(); | 250 | return a.formattedName(); |
251 | case FieldImpl::DefaultFormattedName: | ||
252 | return a.defaultFormattedName(); | ||
242 | case FieldImpl::FamilyName: | 253 | case FieldImpl::FamilyName: |
243 | return a.familyName(); | 254 | return a.familyName(); |
244 | case FieldImpl::GivenName: | 255 | case FieldImpl::GivenName: |
245 | return a.givenName(); | 256 | return a.givenName(); |
246 | case FieldImpl::AdditionalName: | 257 | case FieldImpl::AdditionalName: |
247 | return a.additionalName(); | 258 | return a.additionalName(); |
248 | case FieldImpl::Prefix: | 259 | case FieldImpl::Prefix: |
249 | return a.prefix(); | 260 | return a.prefix(); |
250 | case FieldImpl::Suffix: | 261 | case FieldImpl::Suffix: |
251 | return a.suffix(); | 262 | return a.suffix(); |
252 | case FieldImpl::NickName: | 263 | case FieldImpl::NickName: |
253 | return a.nickName(); | 264 | return a.nickName(); |
254 | case FieldImpl::Mailer: | 265 | case FieldImpl::Mailer: |
255 | return a.mailer(); | 266 | return a.mailer(); |
256 | case FieldImpl::Title: | 267 | case FieldImpl::Title: |
257 | return a.title(); | 268 | return a.title(); |
258 | case FieldImpl::Role: | 269 | case FieldImpl::Role: |
259 | return a.role(); | 270 | return a.role(); |
260 | case FieldImpl::Organization: | 271 | case FieldImpl::Organization: |
261 | return a.organization(); | 272 | return a.organization(); |
262 | case FieldImpl::Note: | 273 | case FieldImpl::Note: |
263 | return a.note(); | 274 | return a.note(); |
264 | case FieldImpl::Email: | 275 | case FieldImpl::Email: |
265 | return a.preferredEmail(); | 276 | return a.preferredEmail(); |
@@ -267,48 +278,52 @@ QString Field::value( const KABC::Addressee &a ) | |||
267 | if ( a.birthday().isValid() ) { | 278 | if ( a.birthday().isValid() ) { |
268 | //the generated code had the following format: return a.birthday().date().toString( Qt::ISODate ); | 279 | //the generated code had the following format: return a.birthday().date().toString( Qt::ISODate ); |
269 | // But Qt::IsoDate was not specified. | 280 | // But Qt::IsoDate was not specified. |
270 | // QString _oldFormat = KGlobal::locale()->dateFormat(); | 281 | // QString _oldFormat = KGlobal::locale()->dateFormat(); |
271 | // KGlobal::locale()->setDateFormat("%Y-%m-%d"); // = Qt::ISODate | 282 | // KGlobal::locale()->setDateFormat("%Y-%m-%d"); // = Qt::ISODate |
272 | QString dt = KGlobal::locale()->formatDate(a.birthday().date(), false, KLocale::ISODate); | 283 | QString dt = KGlobal::locale()->formatDate(a.birthday().date(), false, KLocale::ISODate); |
273 | // KGlobal::locale()->setDateFormat(_oldFormat); | 284 | // KGlobal::locale()->setDateFormat(_oldFormat); |
274 | return dt; | 285 | return dt; |
275 | } | 286 | } |
276 | else | 287 | else |
277 | return QString::null; | 288 | return QString::null; |
278 | case FieldImpl::Url: | 289 | case FieldImpl::Url: |
279 | return a.url().prettyURL(); | 290 | return a.url().prettyURL(); |
280 | //US | 291 | //US |
281 | case FieldImpl::Resource: | 292 | case FieldImpl::Resource: |
282 | return a.resource()->resourceName(); | 293 | return a.resource()->resourceName(); |
283 | case FieldImpl::Category: | 294 | case FieldImpl::Category: |
284 | return a.categories().join(","); | 295 | return a.categories().join(","); |
285 | case FieldImpl::HomePhone: | 296 | case FieldImpl::HomePhone: |
286 | return a.phoneNumber( PhoneNumber::Home ).number(); | 297 | return a.phoneNumber( PhoneNumber::Home ).number(); |
287 | case FieldImpl::BusinessPhone: | 298 | case FieldImpl::BusinessPhone: |
288 | return a.phoneNumber( PhoneNumber::Work ).number(); | 299 | return a.phoneNumber( PhoneNumber::Work ).number(); |
289 | case FieldImpl::MobilePhone: | 300 | case FieldImpl::MobilePhone: |
290 | return a.phoneNumber( PhoneNumber::Cell ).number(); | 301 | return a.phoneNumber( PhoneNumber::Cell ).number(); |
302 | case FieldImpl::MobileWorkPhone: | ||
303 | return a.phoneNumber( PhoneNumber::Cell | PhoneNumber::Work ).number(); | ||
304 | case FieldImpl::MobileHomePhone: | ||
305 | return a.phoneNumber( PhoneNumber::Cell | PhoneNumber::Home ).number(); | ||
291 | case FieldImpl::HomeFax: | 306 | case FieldImpl::HomeFax: |
292 | return a.phoneNumber( PhoneNumber::Home | PhoneNumber::Fax ).number(); | 307 | return a.phoneNumber( PhoneNumber::Home | PhoneNumber::Fax ).number(); |
293 | case FieldImpl::BusinessFax: | 308 | case FieldImpl::BusinessFax: |
294 | return a.phoneNumber( PhoneNumber::Work | PhoneNumber::Fax ).number(); | 309 | return a.phoneNumber( PhoneNumber::Work | PhoneNumber::Fax ).number(); |
295 | case FieldImpl::CarPhone: | 310 | case FieldImpl::CarPhone: |
296 | return a.phoneNumber( PhoneNumber::Car ).number(); | 311 | return a.phoneNumber( PhoneNumber::Car ).number(); |
297 | case FieldImpl::Isdn: | 312 | case FieldImpl::Isdn: |
298 | return a.phoneNumber( PhoneNumber::Isdn ).number(); | 313 | return a.phoneNumber( PhoneNumber::Isdn ).number(); |
299 | case FieldImpl::Pager: | 314 | case FieldImpl::Pager: |
300 | return a.phoneNumber( PhoneNumber::Pager ).number(); | 315 | return a.phoneNumber( PhoneNumber::Pager ).number(); |
301 | case FieldImpl::Sip: | 316 | case FieldImpl::Sip: |
302 | return a.phoneNumber( PhoneNumber::Sip ).number(); | 317 | return a.phoneNumber( PhoneNumber::Sip ).number(); |
303 | case FieldImpl::HomeAddressStreet: | 318 | case FieldImpl::HomeAddressStreet: |
304 | return a.address( Address::Home ).street(); | 319 | return a.address( Address::Home ).street(); |
305 | case FieldImpl::HomeAddressLocality: | 320 | case FieldImpl::HomeAddressLocality: |
306 | return a.address( Address::Home ).locality(); | 321 | return a.address( Address::Home ).locality(); |
307 | case FieldImpl::HomeAddressRegion: | 322 | case FieldImpl::HomeAddressRegion: |
308 | return a.address( Address::Home ).region(); | 323 | return a.address( Address::Home ).region(); |
309 | case FieldImpl::HomeAddressPostalCode: | 324 | case FieldImpl::HomeAddressPostalCode: |
310 | return a.address( Address::Home ).postalCode(); | 325 | return a.address( Address::Home ).postalCode(); |
311 | case FieldImpl::HomeAddressCountry: | 326 | case FieldImpl::HomeAddressCountry: |
312 | return a.address( Address::Home ).country(); | 327 | return a.address( Address::Home ).country(); |
313 | case FieldImpl::BusinessAddressStreet: | 328 | case FieldImpl::BusinessAddressStreet: |
314 | return a.address( Address::Work ).street(); | 329 | return a.address( Address::Work ).street(); |
@@ -372,71 +387,74 @@ bool Field::setValue( KABC::Addressee &a, const QString &value ) | |||
372 | // But Qt::IsoDate and QDate::fromString was not specified. Do I have the wrong QT version ? | 387 | // But Qt::IsoDate and QDate::fromString was not specified. Do I have the wrong QT version ? |
373 | { | 388 | { |
374 | QDate dt = KGlobal::locale()->readDate( value, "%Y-%m-%d"); // = Qt::ISODate | 389 | QDate dt = KGlobal::locale()->readDate( value, "%Y-%m-%d"); // = Qt::ISODate |
375 | a.setBirthday(dt); | 390 | a.setBirthday(dt); |
376 | } | 391 | } |
377 | return true; | 392 | return true; |
378 | case FieldImpl::CustomField: | 393 | case FieldImpl::CustomField: |
379 | a.insertCustom( mImpl->app(), mImpl->key(), value ); | 394 | a.insertCustom( mImpl->app(), mImpl->key(), value ); |
380 | //US never copy the resourcename back to the adressee. | 395 | //US never copy the resourcename back to the adressee. |
381 | case FieldImpl::Resource: | 396 | case FieldImpl::Resource: |
382 | default: | 397 | default: |
383 | return false; | 398 | return false; |
384 | } | 399 | } |
385 | } | 400 | } |
386 | 401 | ||
387 | bool Field::isCustom() | 402 | bool Field::isCustom() |
388 | { | 403 | { |
389 | return mImpl->fieldId() == FieldImpl::CustomField; | 404 | return mImpl->fieldId() == FieldImpl::CustomField; |
390 | } | 405 | } |
391 | 406 | ||
392 | Field::List Field::allFields() | 407 | Field::List Field::allFields() |
393 | { | 408 | { |
394 | if ( mAllFields.isEmpty() ) { | 409 | if ( mAllFields.isEmpty() ) { |
395 | createField( FieldImpl::FormattedName, Frequent ); | 410 | createField( FieldImpl::FormattedName, Frequent ); |
411 | createField( FieldImpl::DefaultFormattedName, Frequent ); | ||
396 | createField( FieldImpl::FamilyName, Frequent ); | 412 | createField( FieldImpl::FamilyName, Frequent ); |
397 | createField( FieldImpl::GivenName, Frequent ); | 413 | createField( FieldImpl::GivenName, Frequent ); |
398 | createField( FieldImpl::AdditionalName ); | 414 | createField( FieldImpl::AdditionalName ); |
399 | createField( FieldImpl::Prefix ); | 415 | createField( FieldImpl::Prefix ); |
400 | createField( FieldImpl::Suffix ); | 416 | createField( FieldImpl::Suffix ); |
401 | createField( FieldImpl::NickName, Personal ); | 417 | createField( FieldImpl::NickName, Personal ); |
402 | createField( FieldImpl::Birthday, Personal ); | 418 | createField( FieldImpl::Birthday, Personal ); |
403 | createField( FieldImpl::Category ); | 419 | createField( FieldImpl::Category ); |
404 | createField( FieldImpl::HomeAddressStreet, Address|Personal ); | 420 | createField( FieldImpl::HomeAddressStreet, Address|Personal ); |
405 | createField( FieldImpl::HomeAddressLocality, Address|Personal ); | 421 | createField( FieldImpl::HomeAddressLocality, Address|Personal ); |
406 | createField( FieldImpl::HomeAddressRegion, Address|Personal ); | 422 | createField( FieldImpl::HomeAddressRegion, Address|Personal ); |
407 | createField( FieldImpl::HomeAddressPostalCode, Address|Personal ); | 423 | createField( FieldImpl::HomeAddressPostalCode, Address|Personal ); |
408 | createField( FieldImpl::HomeAddressCountry, Address|Personal ); | 424 | createField( FieldImpl::HomeAddressCountry, Address|Personal ); |
409 | createField( FieldImpl::HomeAddressLabel, Address|Personal ); | 425 | createField( FieldImpl::HomeAddressLabel, Address|Personal ); |
410 | createField( FieldImpl::BusinessAddressStreet, Address|Organization ); | 426 | createField( FieldImpl::BusinessAddressStreet, Address|Organization ); |
411 | createField( FieldImpl::BusinessAddressLocality, Address|Organization ); | 427 | createField( FieldImpl::BusinessAddressLocality, Address|Organization ); |
412 | createField( FieldImpl::BusinessAddressRegion, Address|Organization ); | 428 | createField( FieldImpl::BusinessAddressRegion, Address|Organization ); |
413 | createField( FieldImpl::BusinessAddressPostalCode, Address|Organization ); | 429 | createField( FieldImpl::BusinessAddressPostalCode, Address|Organization ); |
414 | createField( FieldImpl::BusinessAddressCountry, Address|Organization ); | 430 | createField( FieldImpl::BusinessAddressCountry, Address|Organization ); |
415 | createField( FieldImpl::BusinessAddressLabel, Address|Organization ); | 431 | createField( FieldImpl::BusinessAddressLabel, Address|Organization ); |
416 | createField( FieldImpl::HomePhone, Personal|Frequent ); | 432 | createField( FieldImpl::HomePhone, Personal|Frequent ); |
417 | createField( FieldImpl::BusinessPhone, Organization|Frequent ); | 433 | createField( FieldImpl::BusinessPhone, Organization|Frequent ); |
418 | createField( FieldImpl::MobilePhone, Frequent ); | 434 | createField( FieldImpl::MobilePhone, Frequent ); |
435 | createField( FieldImpl::MobileHomePhone, Frequent ); | ||
436 | createField( FieldImpl::MobileWorkPhone, Frequent ); | ||
419 | createField( FieldImpl::HomeFax ); | 437 | createField( FieldImpl::HomeFax ); |
420 | createField( FieldImpl::BusinessFax ); | 438 | createField( FieldImpl::BusinessFax ); |
421 | createField( FieldImpl::CarPhone ); | 439 | createField( FieldImpl::CarPhone ); |
422 | createField( FieldImpl::Isdn ); | 440 | createField( FieldImpl::Isdn ); |
423 | createField( FieldImpl::Pager ); | 441 | createField( FieldImpl::Pager ); |
424 | createField( FieldImpl::Email, Email|Frequent ); | 442 | createField( FieldImpl::Email, Email|Frequent ); |
425 | createField( FieldImpl::Mailer, Email ); | 443 | createField( FieldImpl::Mailer, Email ); |
426 | createField( FieldImpl::Title, Organization ); | 444 | createField( FieldImpl::Title, Organization ); |
427 | createField( FieldImpl::Role, Organization ); | 445 | createField( FieldImpl::Role, Organization ); |
428 | createField( FieldImpl::Organization, Organization ); | 446 | createField( FieldImpl::Organization, Organization ); |
429 | createField( FieldImpl::Note ); | 447 | createField( FieldImpl::Note ); |
430 | createField( FieldImpl::Url ); | 448 | createField( FieldImpl::Url ); |
431 | createField( FieldImpl::Resource ); | 449 | createField( FieldImpl::Resource ); |
432 | createField( FieldImpl::Sip ); | 450 | createField( FieldImpl::Sip ); |
433 | } | 451 | } |
434 | 452 | ||
435 | return mAllFields; | 453 | return mAllFields; |
436 | } | 454 | } |
437 | 455 | ||
438 | Field::List Field::defaultFields() | 456 | Field::List Field::defaultFields() |
439 | { | 457 | { |
440 | if ( mDefaultFields.isEmpty() ) { | 458 | if ( mDefaultFields.isEmpty() ) { |
441 | createDefaultField( FieldImpl::GivenName ); | 459 | createDefaultField( FieldImpl::GivenName ); |
442 | createDefaultField( FieldImpl::FamilyName ); | 460 | createDefaultField( FieldImpl::FamilyName ); |
diff --git a/kabc/phonenumber.cpp b/kabc/phonenumber.cpp index 041effc..4c6231d 100644 --- a/kabc/phonenumber.cpp +++ b/kabc/phonenumber.cpp | |||
@@ -156,58 +156,57 @@ QString PhoneNumber::typeLabel() const | |||
156 | QString PhoneNumber::label() const | 156 | QString PhoneNumber::label() const |
157 | { | 157 | { |
158 | return typeLabel( type() ); | 158 | return typeLabel( type() ); |
159 | } | 159 | } |
160 | 160 | ||
161 | PhoneNumber::TypeList PhoneNumber::typeList() | 161 | PhoneNumber::TypeList PhoneNumber::typeList() |
162 | { | 162 | { |
163 | TypeList list; | 163 | TypeList list; |
164 | 164 | ||
165 | list << Home << Work << Msg << Pref << Voice << Fax << Cell << Video | 165 | list << Home << Work << Msg << Pref << Voice << Fax << Cell << Video |
166 | << Bbs << Modem << Car << Isdn << Pcs << Pager << Sip; | 166 | << Bbs << Modem << Car << Isdn << Pcs << Pager << Sip; |
167 | 167 | ||
168 | return list; | 168 | return list; |
169 | } | 169 | } |
170 | 170 | ||
171 | QString PhoneNumber::label( int type ) | 171 | QString PhoneNumber::label( int type ) |
172 | { | 172 | { |
173 | return typeLabel( type ); | 173 | return typeLabel( type ); |
174 | } | 174 | } |
175 | 175 | ||
176 | QString PhoneNumber::typeLabel( int type ) | 176 | QString PhoneNumber::typeLabel( int type ) |
177 | { | 177 | { |
178 | QString typeString; | 178 | QString typeString; |
179 | 179 | ||
180 | |||
181 | if ((type & Cell) == Cell) | ||
182 | typeString += i18n("Mobile") +" "; | ||
180 | if ((type & Home) == Home) | 183 | if ((type & Home) == Home) |
181 | typeString += i18n("Home"); | 184 | typeString += i18n("Home")+" "; |
182 | else if ((type & Work) == Work) | 185 | else if ((type & Work) == Work) |
183 | typeString += i18n("Work"); | 186 | typeString += i18n("Work")+" "; |
184 | 187 | ||
185 | if (!typeString.isEmpty()) | 188 | if ((type & Sip) == Sip) |
186 | typeString += " "; | ||
187 | if ((type & Cell) == Cell) | ||
188 | typeString += i18n("Mobile") +" "; | ||
189 | if ((type & Sip) == Sip) | ||
190 | typeString += i18n("SIP")+" "; | 189 | typeString += i18n("SIP")+" "; |
191 | if ((type & Car) == Car) | 190 | if ((type & Car) == Car) |
192 | typeString += i18n("Car")+" "; | 191 | typeString += i18n("Car")+" "; |
193 | 192 | ||
194 | if ((type & Fax) == Fax) | 193 | if ((type & Fax) == Fax) |
195 | typeString += i18n("Fax"); | 194 | typeString += i18n("Fax"); |
196 | else if ((type & Msg) == Msg) | 195 | else if ((type & Msg) == Msg) |
197 | typeString += i18n("Messenger"); | 196 | typeString += i18n("Messenger"); |
198 | else if ((type & Video) == Video) | 197 | else if ((type & Video) == Video) |
199 | typeString += i18n("Video"); | 198 | typeString += i18n("Video"); |
200 | else if ((type & Bbs) == Bbs) | 199 | else if ((type & Bbs) == Bbs) |
201 | typeString += i18n("Mailbox"); | 200 | typeString += i18n("Mailbox"); |
202 | else if ((type & Modem) == Modem) | 201 | else if ((type & Modem) == Modem) |
203 | typeString += i18n("Modem"); | 202 | typeString += i18n("Modem"); |
204 | else if ((type & Isdn) == Isdn) | 203 | else if ((type & Isdn) == Isdn) |
205 | typeString += i18n("ISDN"); | 204 | typeString += i18n("ISDN"); |
206 | else if ((type & Pcs) == Pcs) | 205 | else if ((type & Pcs) == Pcs) |
207 | typeString += i18n("PCS"); | 206 | typeString += i18n("PCS"); |
208 | else if ((type & Pager) == Pager) | 207 | else if ((type & Pager) == Pager) |
209 | typeString += i18n("Pager"); | 208 | typeString += i18n("Pager"); |
210 | // add the prefered flag | 209 | // add the prefered flag |
211 | /* | 210 | /* |
212 | if ((type & Pref) == Pref) | 211 | if ((type & Pref) == Pref) |
213 | typeString += i18n("(p)"); | 212 | typeString += i18n("(p)"); |