-rw-r--r-- | kabc/converter/opie/opieconverter.cpp | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/kabc/converter/opie/opieconverter.cpp b/kabc/converter/opie/opieconverter.cpp index 0b6a55e..46e14dd 100644 --- a/kabc/converter/opie/opieconverter.cpp +++ b/kabc/converter/opie/opieconverter.cpp | |||
@@ -195,17 +195,20 @@ bool OpieConverter::opieToAddressee( const OContact &contact, Addressee &addr ) | |||
195 | addr.insertCustom( "KADDRESSBOOK", "X-Profession", contact.profession() ); | 195 | addr.insertCustom( "KADDRESSBOOK", "X-Profession", contact.profession() ); |
196 | addr.insertCustom( "KADDRESSBOOK", "X-AssistantsName", contact.assistant() ); | 196 | addr.insertCustom( "KADDRESSBOOK", "X-AssistantsName", contact.assistant() ); |
197 | addr.insertCustom( "KADDRESSBOOK", "X-Department", contact.department() ); | 197 | addr.insertCustom( "KADDRESSBOOK", "X-Department", contact.department() ); |
198 | addr.insertCustom( "KADDRESSBOOK", "X-ManagersName", contact.manager() ); | 198 | addr.insertCustom( "KADDRESSBOOK", "X-ManagersName", contact.manager() ); |
199 | addr.insertCustom( "KADDRESSBOOK", "X-Office", contact.office() ); | 199 | addr.insertCustom( "KADDRESSBOOK", "X-Office", contact.office() ); |
200 | 200 | ||
201 | //personal | 201 | //personal |
202 | addr.insertCustom( "KADDRESSBOOK", "X-SpousesName", contact.spouse() ); | 202 | addr.insertCustom( "KADDRESSBOOK", "X-SpousesName", contact.spouse() ); |
203 | addr.insertCustom( "KADDRESSBOOK", "X-Gender", contact.gender() ); | 203 | if (contact.gender() == 1) |
204 | addr.insertCustom( "KADDRESSBOOK", "X-Gender", "female" ); | ||
205 | else if (contact.gender() == 2) | ||
206 | addr.insertCustom( "KADDRESSBOOK", "X-Gender", "male" ); | ||
204 | 207 | ||
205 | if (contact.anniversary().isValid()) { | 208 | if (contact.anniversary().isValid()) { |
206 | QString dt = KGlobal::locale()->formatDate(contact.anniversary(), true, KLocale::ISODate); | 209 | QString dt = KGlobal::locale()->formatDate(contact.anniversary(), true, KLocale::ISODate); |
207 | //US | 210 | //US |
208 | qDebug("OpieConverter::opieToAddressee found:%s", dt.latin1()); | 211 | qDebug("OpieConverter::opieToAddressee found:%s", dt.latin1()); |
209 | addr.insertCustom( "KADDRESSBOOK", "X-Anniversary", dt); | 212 | addr.insertCustom( "KADDRESSBOOK", "X-Anniversary", dt); |
210 | } | 213 | } |
211 | 214 | ||
@@ -314,18 +317,22 @@ bool OpieConverter::addresseeToOpie( const Addressee &addr, OContact &contact ) | |||
314 | contact.setProfession(addr.custom( "KADDRESSBOOK", "X-Profession" )); | 317 | contact.setProfession(addr.custom( "KADDRESSBOOK", "X-Profession" )); |
315 | contact.setAssistant(addr.custom( "KADDRESSBOOK", "X-AssistantsName" )); | 318 | contact.setAssistant(addr.custom( "KADDRESSBOOK", "X-AssistantsName" )); |
316 | contact.setDepartment(addr.custom( "KADDRESSBOOK", "X-Department" )); | 319 | contact.setDepartment(addr.custom( "KADDRESSBOOK", "X-Department" )); |
317 | contact.setManager(addr.custom( "KADDRESSBOOK", "X-ManagersName" )); | 320 | contact.setManager(addr.custom( "KADDRESSBOOK", "X-ManagersName" )); |
318 | contact.setOffice(addr.custom( "KADDRESSBOOK", "X-Office" )); | 321 | contact.setOffice(addr.custom( "KADDRESSBOOK", "X-Office" )); |
319 | 322 | ||
320 | //personal | 323 | //personal |
321 | contact.setSpouse(addr.custom( "KADDRESSBOOK", "X-Spouse" )); | 324 | contact.setSpouse(addr.custom( "KADDRESSBOOK", "X-Spouse" )); |
322 | contact.setGender(addr.custom( "KADDRESSBOOK", "X-Gender" )); | 325 | QString gend = addr.custom( "KADDRESSBOOK", "X-Gender" ); |
323 | 326 | if (gend == "female") | |
327 | contact.setGender("1"); | ||
328 | else if (gend == "male") | ||
329 | contact.setGender("2"); | ||
330 | |||
324 | QDate dt = KGlobal::locale()->readDate( | 331 | QDate dt = KGlobal::locale()->readDate( |
325 | addr.custom("KADDRESSBOOK", "X-Anniversary" ), "%Y-%m-%d"); // = Qt::ISODate | 332 | addr.custom("KADDRESSBOOK", "X-Anniversary" ), "%Y-%m-%d"); // = Qt::ISODate |
326 | contact.setAnniversary( dt ); | 333 | contact.setAnniversary( dt ); |
327 | 334 | ||
328 | contact.setChildren(addr.custom( "KADDRESSBOOK", "X-Children" )); | 335 | contact.setChildren(addr.custom( "KADDRESSBOOK", "X-Children" )); |
329 | 336 | ||
330 | contact.setBirthday(addr.birthday().date()); | 337 | contact.setBirthday(addr.birthday().date()); |
331 | contact.setNickname(addr.nickName()); | 338 | contact.setNickname(addr.nickName()); |