author | zautrix <zautrix> | 2005-10-28 03:41:01 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-10-28 03:41:01 (UTC) |
commit | d934f3fe2a62f6a696992335124c4434cd77d990 (patch) (unidiff) | |
tree | 88d33c54e3f8d08b09cf81f4cdbaeb7eb6a4bb9b /kabc | |
parent | f83a59cf4f9d0cff4111b6f5c88e88e6dc96e79e (diff) | |
download | kdepimpi-d934f3fe2a62f6a696992335124c4434cd77d990.zip kdepimpi-d934f3fe2a62f6a696992335124c4434cd77d990.tar.gz kdepimpi-d934f3fe2a62f6a696992335124c4434cd77d990.tar.bz2 |
and some bugs fixed
-rw-r--r-- | kabc/addressee.cpp | 4 | ||||
-rw-r--r-- | kabc/plugins/qtopia/qtopiaconverter.cpp | 8 | ||||
-rw-r--r-- | kabc/plugins/sharpdtm/sharpdtmconverter.cpp | 10 |
3 files changed, 11 insertions, 11 deletions
diff --git a/kabc/addressee.cpp b/kabc/addressee.cpp index 661bdf6..19c78ee 100644 --- a/kabc/addressee.cpp +++ b/kabc/addressee.cpp | |||
@@ -1050,51 +1050,51 @@ QString Addressee::homePhoneLabel() | |||
1050 | QString Addressee::businessPhoneLabel() | 1050 | QString Addressee::businessPhoneLabel() |
1051 | { | 1051 | { |
1052 | return i18n("Work Phone"); | 1052 | return i18n("Work Phone"); |
1053 | } | 1053 | } |
1054 | 1054 | ||
1055 | 1055 | ||
1056 | QString Addressee::mobilePhoneLabel() | 1056 | QString Addressee::mobilePhoneLabel() |
1057 | { | 1057 | { |
1058 | return i18n("Mobile Phone"); | 1058 | return i18n("Mobile Phone"); |
1059 | } | 1059 | } |
1060 | QString Addressee::mobileWorkPhoneLabel() | 1060 | QString Addressee::mobileWorkPhoneLabel() |
1061 | { | 1061 | { |
1062 | return i18n("Mobile2 (work)"); | 1062 | return i18n("Mobile2 (work)"); |
1063 | } | 1063 | } |
1064 | QString Addressee::mobileHomePhoneLabel() | 1064 | QString Addressee::mobileHomePhoneLabel() |
1065 | { | 1065 | { |
1066 | return i18n("Mobile"); | 1066 | return i18n("Mobile (Home)"); |
1067 | } | 1067 | } |
1068 | 1068 | ||
1069 | 1069 | ||
1070 | QString Addressee::homeFaxLabel() | 1070 | QString Addressee::homeFaxLabel() |
1071 | { | 1071 | { |
1072 | return i18n("Fax (Home)"); | 1072 | return i18n("Fax (Home)"); |
1073 | } | 1073 | } |
1074 | 1074 | ||
1075 | 1075 | ||
1076 | QString Addressee::businessFaxLabel() | 1076 | QString Addressee::businessFaxLabel() |
1077 | { | 1077 | { |
1078 | return i18n("Fax (Work)"); | 1078 | return i18n("Fax (Work)"); |
1079 | } | 1079 | } |
1080 | 1080 | ||
1081 | 1081 | ||
1082 | QString Addressee::carPhoneLabel() | 1082 | QString Addressee::carPhoneLabel() |
1083 | { | 1083 | { |
1084 | return i18n("Mobile2 (work)"); | 1084 | return i18n("Mobile2 (car)"); |
1085 | } | 1085 | } |
1086 | 1086 | ||
1087 | 1087 | ||
1088 | QString Addressee::isdnLabel() | 1088 | QString Addressee::isdnLabel() |
1089 | { | 1089 | { |
1090 | return i18n("ISDN"); | 1090 | return i18n("ISDN"); |
1091 | } | 1091 | } |
1092 | 1092 | ||
1093 | 1093 | ||
1094 | QString Addressee::pagerLabel() | 1094 | QString Addressee::pagerLabel() |
1095 | { | 1095 | { |
1096 | return i18n("Pager"); | 1096 | return i18n("Pager"); |
1097 | } | 1097 | } |
1098 | 1098 | ||
1099 | QString Addressee::sipLabel() | 1099 | QString Addressee::sipLabel() |
1100 | { | 1100 | { |
diff --git a/kabc/plugins/qtopia/qtopiaconverter.cpp b/kabc/plugins/qtopia/qtopiaconverter.cpp index 39d366b..9693a68 100644 --- a/kabc/plugins/qtopia/qtopiaconverter.cpp +++ b/kabc/plugins/qtopia/qtopiaconverter.cpp | |||
@@ -188,62 +188,62 @@ bool QtopiaConverter::qtopiaToAddressee( const QDomElement& el, Addressee &adr ) | |||
188 | adr.setGivenName( el.attribute( "FirstName" ) ); | 188 | adr.setGivenName( el.attribute( "FirstName" ) ); |
189 | adr.setAdditionalName( el.attribute( "MiddleName" ) ); | 189 | adr.setAdditionalName( el.attribute( "MiddleName" ) ); |
190 | adr.setSuffix( el.attribute( "Suffix" ) ); | 190 | adr.setSuffix( el.attribute( "Suffix" ) ); |
191 | adr.setNickName( el.attribute( "Nickname" ) ); | 191 | adr.setNickName( el.attribute( "Nickname" ) ); |
192 | 192 | ||
193 | QDate date = dateFromString( el.attribute( "Birthday" ) ); | 193 | QDate date = dateFromString( el.attribute( "Birthday" ) ); |
194 | if ( date.isValid() ) | 194 | if ( date.isValid() ) |
195 | adr.setBirthday( date ); | 195 | adr.setBirthday( date ); |
196 | 196 | ||
197 | adr.setRole( el.attribute( "JobTitle" ) ); | 197 | adr.setRole( el.attribute( "JobTitle" ) ); |
198 | if ( !el.attribute( "FileAs" ).isEmpty() ) | 198 | if ( !el.attribute( "FileAs" ).isEmpty() ) |
199 | adr.setFormattedName( el.attribute( "FileAs" ) ); | 199 | adr.setFormattedName( el.attribute( "FileAs" ) ); |
200 | 200 | ||
201 | adr.setOrganization( el.attribute( "Company" ) ); | 201 | adr.setOrganization( el.attribute( "Company" ) ); |
202 | 202 | ||
203 | KABC::PhoneNumber businessPhoneNum( el.attribute( "BusinessPhone" ), | 203 | KABC::PhoneNumber businessPhoneNum( el.attribute( "BusinessPhone" ), |
204 | KABC::PhoneNumber::Work ); | 204 | KABC::PhoneNumber::Work | KABC::PhoneNumber::Pref ); |
205 | KABC::PhoneNumber businessFaxNum( el.attribute( "BusinessFax" ), | 205 | KABC::PhoneNumber businessFaxNum( el.attribute( "BusinessFax" ), |
206 | KABC::PhoneNumber::Work | KABC::PhoneNumber::Fax ); | 206 | KABC::PhoneNumber::Work | KABC::PhoneNumber::Fax ); |
207 | KABC::PhoneNumber businessMobile( el.attribute( "BusinessMobile" ), | 207 | KABC::PhoneNumber businessMobile( el.attribute( "BusinessMobile" ), |
208 | KABC::PhoneNumber::Work | KABC::PhoneNumber::Cell ); | 208 | KABC::PhoneNumber::Car ); |
209 | KABC::PhoneNumber businessPager( el.attribute( "BusinessPager" ), | 209 | KABC::PhoneNumber businessPager( el.attribute( "BusinessPager" ), |
210 | KABC::PhoneNumber::Work | KABC::PhoneNumber::Pager ); | 210 | KABC::PhoneNumber::Pager ); |
211 | if ( !businessPhoneNum.number().isEmpty() ) | 211 | if ( !businessPhoneNum.number().isEmpty() ) |
212 | adr.insertPhoneNumber( businessPhoneNum ); | 212 | adr.insertPhoneNumber( businessPhoneNum ); |
213 | if ( !businessFaxNum.number().isEmpty() ) | 213 | if ( !businessFaxNum.number().isEmpty() ) |
214 | adr.insertPhoneNumber( businessFaxNum ); | 214 | adr.insertPhoneNumber( businessFaxNum ); |
215 | if ( !businessMobile.number().isEmpty() ) | 215 | if ( !businessMobile.number().isEmpty() ) |
216 | adr.insertPhoneNumber( businessMobile ); | 216 | adr.insertPhoneNumber( businessMobile ); |
217 | if ( !businessPager.number().isEmpty() ) | 217 | if ( !businessPager.number().isEmpty() ) |
218 | adr.insertPhoneNumber( businessPager ); | 218 | adr.insertPhoneNumber( businessPager ); |
219 | 219 | ||
220 | // Handle multiple mail addresses | 220 | // Handle multiple mail addresses |
221 | QString DefaultEmail = el.attribute( "DefaultEmail" ); | 221 | QString DefaultEmail = el.attribute( "DefaultEmail" ); |
222 | if ( !DefaultEmail.isEmpty() ) | 222 | if ( !DefaultEmail.isEmpty() ) |
223 | adr.insertEmail( DefaultEmail, true ); // preferred | 223 | adr.insertEmail( DefaultEmail, true ); // preferred |
224 | 224 | ||
225 | QStringList Emails = QStringList::split(" ",el.attribute("Emails")); | 225 | QStringList Emails = QStringList::split(" ",el.attribute("Emails")); |
226 | int i; | 226 | int i; |
227 | for (i = 0;i < Emails.count();++i) { | 227 | for (i = 0;i < Emails.count();++i) { |
228 | if ( Emails[i] != DefaultEmail ) | 228 | if ( Emails[i] != DefaultEmail ) |
229 | adr.insertEmail( Emails[i], false ); | 229 | adr.insertEmail( Emails[i], false ); |
230 | } | 230 | } |
231 | 231 | ||
232 | KABC::PhoneNumber homePhoneNum( el.attribute( "HomePhone" ), | 232 | KABC::PhoneNumber homePhoneNum( el.attribute( "HomePhone" ), |
233 | KABC::PhoneNumber::Home ); | 233 | KABC::PhoneNumber::Home | KABC::PhoneNumber::Pref); |
234 | KABC::PhoneNumber homeFax( el.attribute( "HomeFax" ), | 234 | KABC::PhoneNumber homeFax( el.attribute( "HomeFax" ), |
235 | KABC::PhoneNumber::Home | KABC::PhoneNumber::Fax ); | 235 | KABC::PhoneNumber::Home | KABC::PhoneNumber::Fax ); |
236 | 236 | ||
237 | KABC::PhoneNumber homeMobile( el.attribute( "HomeMobile" ), | 237 | KABC::PhoneNumber homeMobile( el.attribute( "HomeMobile" ), |
238 | KABC::PhoneNumber::Cell ); | 238 | KABC::PhoneNumber::Cell ); |
239 | 239 | ||
240 | if ( !homePhoneNum.number().isEmpty() ) | 240 | if ( !homePhoneNum.number().isEmpty() ) |
241 | adr.insertPhoneNumber( homePhoneNum ); | 241 | adr.insertPhoneNumber( homePhoneNum ); |
242 | if ( !homeFax.number().isEmpty() ) | 242 | if ( !homeFax.number().isEmpty() ) |
243 | adr.insertPhoneNumber( homeFax ); | 243 | adr.insertPhoneNumber( homeFax ); |
244 | if ( !homeMobile.number().isEmpty() ) | 244 | if ( !homeMobile.number().isEmpty() ) |
245 | adr.insertPhoneNumber( homeMobile ); | 245 | adr.insertPhoneNumber( homeMobile ); |
246 | 246 | ||
247 | KABC::Address business( KABC::Address::Work ); | 247 | KABC::Address business( KABC::Address::Work ); |
248 | business.setStreet( el.attribute( "BusinessStreet" ) ); | 248 | business.setStreet( el.attribute( "BusinessStreet" ) ); |
249 | business.setLocality( el.attribute( "BusinessCity" ) ); | 249 | business.setLocality( el.attribute( "BusinessCity" ) ); |
diff --git a/kabc/plugins/sharpdtm/sharpdtmconverter.cpp b/kabc/plugins/sharpdtm/sharpdtmconverter.cpp index 4adcae4..3d429fa 100644 --- a/kabc/plugins/sharpdtm/sharpdtmconverter.cpp +++ b/kabc/plugins/sharpdtm/sharpdtmconverter.cpp | |||
@@ -119,105 +119,105 @@ bool SharpDTMConverter::sharpToAddressee( const CardId &contact, const SlZDataBa | |||
119 | Address homeaddress; | 119 | Address homeaddress; |
120 | homeaddress.setType(Address::Home); | 120 | homeaddress.setType(Address::Home); |
121 | //US homeaddress.setPostOfficeBox( "" ); | 121 | //US homeaddress.setPostOfficeBox( "" ); |
122 | //US homeaddress.setExtended( "" ); | 122 | //US homeaddress.setExtended( "" ); |
123 | homeaddress.setStreet( db->readField(ZdbAdrs::HomeStreet).replace( QRegExp("\\r"), "")); | 123 | homeaddress.setStreet( db->readField(ZdbAdrs::HomeStreet).replace( QRegExp("\\r"), "")); |
124 | homeaddress.setLocality( db->readField(ZdbAdrs::HomeCity) ); | 124 | homeaddress.setLocality( db->readField(ZdbAdrs::HomeCity) ); |
125 | homeaddress.setRegion( db->readField(ZdbAdrs::HomeState) ); | 125 | homeaddress.setRegion( db->readField(ZdbAdrs::HomeState) ); |
126 | homeaddress.setPostalCode( db->readField(ZdbAdrs::HomeZip) ); | 126 | homeaddress.setPostalCode( db->readField(ZdbAdrs::HomeZip) ); |
127 | homeaddress.setCountry( db->readField(ZdbAdrs::HomeCountry) ); | 127 | homeaddress.setCountry( db->readField(ZdbAdrs::HomeCountry) ); |
128 | 128 | ||
129 | addr.insertAddress( homeaddress ); | 129 | addr.insertAddress( homeaddress ); |
130 | } | 130 | } |
131 | 131 | ||
132 | if (!db->readField(ZdbAdrs::HomePhone).isEmpty()) | 132 | if (!db->readField(ZdbAdrs::HomePhone).isEmpty()) |
133 | { | 133 | { |
134 | PhoneNumber homephone; | 134 | PhoneNumber homephone; |
135 | homephone.setType( PhoneNumber::Home ); | 135 | homephone.setType( PhoneNumber::Home | PhoneNumber::Pref ); |
136 | homephone.setNumber( db->readField(ZdbAdrs::HomePhone) ); | 136 | homephone.setNumber( db->readField(ZdbAdrs::HomePhone) ); |
137 | addr.insertPhoneNumber( homephone ); | 137 | addr.insertPhoneNumber( homephone ); |
138 | } | 138 | } |
139 | 139 | ||
140 | if (!db->readField(ZdbAdrs::HomeFax).isEmpty()) | 140 | if (!db->readField(ZdbAdrs::HomeFax).isEmpty()) |
141 | { | 141 | { |
142 | PhoneNumber homefax; | 142 | PhoneNumber homefax; |
143 | homefax.setType( PhoneNumber::Home | PhoneNumber::Fax ); | 143 | homefax.setType( PhoneNumber::Home | PhoneNumber::Fax ); |
144 | homefax.setNumber( db->readField(ZdbAdrs::HomeFax) ); | 144 | homefax.setNumber( db->readField(ZdbAdrs::HomeFax) ); |
145 | addr.insertPhoneNumber( homefax ); | 145 | addr.insertPhoneNumber( homefax ); |
146 | } | 146 | } |
147 | 147 | ||
148 | if (!db->readField(ZdbAdrs::HomeMobile).isEmpty()) | 148 | if (!db->readField(ZdbAdrs::HomeMobile).isEmpty()) |
149 | { | 149 | { |
150 | PhoneNumber homemobile; | 150 | PhoneNumber homemobile; |
151 | homemobile.setType( PhoneNumber::Home | PhoneNumber::Cell ); | 151 | homemobile.setType( PhoneNumber::Cell ); |
152 | homemobile.setNumber( db->readField(ZdbAdrs::HomeMobile) ); | 152 | homemobile.setNumber( db->readField(ZdbAdrs::HomeMobile) ); |
153 | addr.insertPhoneNumber( homemobile ); | 153 | addr.insertPhoneNumber( homemobile ); |
154 | } | 154 | } |
155 | 155 | ||
156 | addr.setUrl( db->readField(ZdbAdrs::HomeWebPage) ); | 156 | addr.setUrl( db->readField(ZdbAdrs::HomeWebPage) ); |
157 | 157 | ||
158 | 158 | ||
159 | // business | 159 | // business |
160 | if ((!db->readField(ZdbAdrs::BusinessStreet).isEmpty()) || | 160 | if ((!db->readField(ZdbAdrs::BusinessStreet).isEmpty()) || |
161 | (!db->readField(ZdbAdrs::BusinessCity).isEmpty()) || | 161 | (!db->readField(ZdbAdrs::BusinessCity).isEmpty()) || |
162 | (!db->readField(ZdbAdrs::BusinessState).isEmpty()) || | 162 | (!db->readField(ZdbAdrs::BusinessState).isEmpty()) || |
163 | (!db->readField(ZdbAdrs::BusinessZip).isEmpty()) || | 163 | (!db->readField(ZdbAdrs::BusinessZip).isEmpty()) || |
164 | (!db->readField(ZdbAdrs::BusinessCountry).isEmpty())) | 164 | (!db->readField(ZdbAdrs::BusinessCountry).isEmpty())) |
165 | { | 165 | { |
166 | Address businessaddress; | 166 | Address businessaddress; |
167 | businessaddress.setType(Address::Work); | 167 | businessaddress.setType(Address::Work); |
168 | //US businessaddress.setPostOfficeBox( "" ); | 168 | //US businessaddress.setPostOfficeBox( "" ); |
169 | //US businessaddress.setExtended( "" ); | 169 | //US businessaddress.setExtended( "" ); |
170 | businessaddress.setStreet( db->readField(ZdbAdrs::BusinessStreet).replace( QRegExp("\\r"), "") ); | 170 | businessaddress.setStreet( db->readField(ZdbAdrs::BusinessStreet).replace( QRegExp("\\r"), "") ); |
171 | businessaddress.setLocality( db->readField(ZdbAdrs::BusinessCity) ); | 171 | businessaddress.setLocality( db->readField(ZdbAdrs::BusinessCity) ); |
172 | businessaddress.setRegion( db->readField(ZdbAdrs::BusinessState) ); | 172 | businessaddress.setRegion( db->readField(ZdbAdrs::BusinessState) ); |
173 | businessaddress.setPostalCode( db->readField(ZdbAdrs::BusinessZip) ); | 173 | businessaddress.setPostalCode( db->readField(ZdbAdrs::BusinessZip) ); |
174 | businessaddress.setCountry( db->readField(ZdbAdrs::BusinessCountry) ); | 174 | businessaddress.setCountry( db->readField(ZdbAdrs::BusinessCountry) ); |
175 | 175 | ||
176 | addr.insertAddress( businessaddress ); | 176 | addr.insertAddress( businessaddress ); |
177 | } | 177 | } |
178 | 178 | ||
179 | 179 | ||
180 | if (!db->readField(ZdbAdrs::BusinessPhone).isEmpty()) | 180 | if (!db->readField(ZdbAdrs::BusinessPhone).isEmpty()) |
181 | { | 181 | { |
182 | PhoneNumber businessphone; | 182 | PhoneNumber businessphone; |
183 | businessphone.setType( PhoneNumber::Work ); | 183 | businessphone.setType( PhoneNumber::Work | PhoneNumber::Pref ); |
184 | businessphone.setNumber( db->readField(ZdbAdrs::BusinessPhone) ); | 184 | businessphone.setNumber( db->readField(ZdbAdrs::BusinessPhone) ); |
185 | addr.insertPhoneNumber( businessphone ); | 185 | addr.insertPhoneNumber( businessphone ); |
186 | } | 186 | } |
187 | 187 | ||
188 | if (!db->readField(ZdbAdrs::BusinessFax).isEmpty()) | 188 | if (!db->readField(ZdbAdrs::BusinessFax).isEmpty()) |
189 | { | 189 | { |
190 | PhoneNumber businessfax; | 190 | PhoneNumber businessfax; |
191 | businessfax.setType( PhoneNumber::Work | PhoneNumber::Fax ); | 191 | businessfax.setType( PhoneNumber::Work | PhoneNumber::Fax ); |
192 | businessfax.setNumber( db->readField(ZdbAdrs::BusinessFax) ); | 192 | businessfax.setNumber( db->readField(ZdbAdrs::BusinessFax) ); |
193 | addr.insertPhoneNumber( businessfax ); | 193 | addr.insertPhoneNumber( businessfax ); |
194 | } | 194 | } |
195 | 195 | ||
196 | if (!db->readField(ZdbAdrs::BusinessMobile).isEmpty()) | 196 | if (!db->readField(ZdbAdrs::BusinessMobile).isEmpty()) |
197 | { | 197 | { |
198 | PhoneNumber businessmobile; | 198 | PhoneNumber businessmobile; |
199 | businessmobile.setType( PhoneNumber::Work | PhoneNumber::Cell ); | 199 | businessmobile.setType( PhoneNumber::Car ); |
200 | businessmobile.setNumber( db->readField(ZdbAdrs::BusinessMobile) ); | 200 | businessmobile.setNumber( db->readField(ZdbAdrs::BusinessMobile) ); |
201 | addr.insertPhoneNumber( businessmobile ); | 201 | addr.insertPhoneNumber( businessmobile ); |
202 | } | 202 | } |
203 | 203 | ||
204 | if (!db->readField(ZdbAdrs::BusinessPager).isEmpty()) | 204 | if (!db->readField(ZdbAdrs::BusinessPager).isEmpty()) |
205 | { | 205 | { |
206 | PhoneNumber businesspager; | 206 | PhoneNumber businesspager; |
207 | businesspager.setType( PhoneNumber::Work | PhoneNumber::Pager ); | 207 | businesspager.setType( PhoneNumber::Pager ); |
208 | businesspager.setNumber( db->readField(ZdbAdrs::BusinessPager) ); | 208 | businesspager.setNumber( db->readField(ZdbAdrs::BusinessPager) ); |
209 | addr.insertPhoneNumber( businesspager ); | 209 | addr.insertPhoneNumber( businesspager ); |
210 | } | 210 | } |
211 | 211 | ||
212 | addr.setRole( db->readField(ZdbAdrs::JobTitle) ); | 212 | addr.setRole( db->readField(ZdbAdrs::JobTitle) ); |
213 | addr.setOrganization( db->readField(ZdbAdrs::Company) ); | 213 | addr.setOrganization( db->readField(ZdbAdrs::Company) ); |
214 | addr.insertCustom( "KADDRESSBOOK", "X-Profession", db->readField(ZdbAdrs::Profession) ); | 214 | addr.insertCustom( "KADDRESSBOOK", "X-Profession", db->readField(ZdbAdrs::Profession) ); |
215 | addr.insertCustom( "KADDRESSBOOK", "X-AssistantsName", db->readField(ZdbAdrs::Assistant) ); | 215 | addr.insertCustom( "KADDRESSBOOK", "X-AssistantsName", db->readField(ZdbAdrs::Assistant) ); |
216 | addr.insertCustom( "KADDRESSBOOK", "X-Department", db->readField(ZdbAdrs::Department) ); | 216 | addr.insertCustom( "KADDRESSBOOK", "X-Department", db->readField(ZdbAdrs::Department) ); |
217 | addr.insertCustom( "KADDRESSBOOK", "X-ManagersName", db->readField(ZdbAdrs::Manager) ); | 217 | addr.insertCustom( "KADDRESSBOOK", "X-ManagersName", db->readField(ZdbAdrs::Manager) ); |
218 | addr.insertCustom( "KADDRESSBOOK", "X-Office", db->readField(ZdbAdrs::Office) ); | 218 | addr.insertCustom( "KADDRESSBOOK", "X-Office", db->readField(ZdbAdrs::Office) ); |
219 | 219 | ||
220 | //personal | 220 | //personal |
221 | addr.insertCustom( "KADDRESSBOOK", "X-SpousesName", db->readField(ZdbAdrs::Spouse) ); | 221 | addr.insertCustom( "KADDRESSBOOK", "X-SpousesName", db->readField(ZdbAdrs::Spouse) ); |
222 | 222 | ||
223 | QString gen = db->readField(ZdbAdrs::Gender); | 223 | QString gen = db->readField(ZdbAdrs::Gender); |