author | zautrix <zautrix> | 2005-04-19 15:19:29 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-04-19 15:19:29 (UTC) |
commit | b36bdf88fbf3cc78e4bf072b5eb3ec16bd8ec235 (patch) (unidiff) | |
tree | c1d6a10633c0b57f68c6d5e10e1f427b96dee0c5 | |
parent | da4130c979ec1ea278183ef7697777cb4d1f5101 (diff) | |
download | kdepimpi-b36bdf88fbf3cc78e4bf072b5eb3ec16bd8ec235.zip kdepimpi-b36bdf88fbf3cc78e4bf072b5eb3ec16bd8ec235.tar.gz kdepimpi-b36bdf88fbf3cc78e4bf072b5eb3ec16bd8ec235.tar.bz2 |
fix
-rw-r--r-- | bin/kdepim/WhatsNew.txt | 6 | ||||
-rw-r--r-- | kaddressbook/kaimportoldialog.cpp | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt index 0474b0c..89a6d7f 100644 --- a/bin/kdepim/WhatsNew.txt +++ b/bin/kdepim/WhatsNew.txt | |||
@@ -1,34 +1,40 @@ | |||
1 | Info about the changes in new versions of KDE-Pim/Pi | 1 | Info about the changes in new versions of KDE-Pim/Pi |
2 | 2 | ||
3 | ********** VERSION 2.1.2 ************ | ||
4 | |||
5 | Fixed a problem closing the alarm dialog on Zaurus with "OK" button. | ||
6 | |||
7 | Fixed a problem when importing data from Outlook with mutiple categories set. | ||
8 | |||
3 | 9 | ||
4 | ********** VERSION 2.1.1 ************ | 10 | ********** VERSION 2.1.1 ************ |
5 | 11 | ||
6 | Stable release 2.1.1! | 12 | Stable release 2.1.1! |
7 | 13 | ||
8 | KO/Pi: | 14 | KO/Pi: |
9 | Fixed one problem in the layout of the edit dialogs on the Zaurus with 640x480 display. | 15 | Fixed one problem in the layout of the edit dialogs on the Zaurus with 640x480 display. |
10 | 16 | ||
11 | ********** VERSION 2.1.0 ************ | 17 | ********** VERSION 2.1.0 ************ |
12 | 18 | ||
13 | Stable release 2.1.0! | 19 | Stable release 2.1.0! |
14 | 20 | ||
15 | Summary of changes/fixes compared to version 2.0.6: | 21 | Summary of changes/fixes compared to version 2.0.6: |
16 | 22 | ||
17 | Many bugs of version 2.0.6 fixed. | 23 | Many bugs of version 2.0.6 fixed. |
18 | Most of them were small bugs, but some of them were important. | 24 | Most of them were small bugs, but some of them were important. |
19 | It is recommended to use version 2.1.0 and not version 2.0.6. | 25 | It is recommended to use version 2.1.0 and not version 2.0.6. |
20 | 26 | ||
21 | Important changes: | 27 | Important changes: |
22 | 28 | ||
23 | Added recurring todos to KO/Pi. | 29 | Added recurring todos to KO/Pi. |
24 | 30 | ||
25 | Added global application font settings (for all KDE-Pim/Pi apps) to the general settings. | 31 | Added global application font settings (for all KDE-Pim/Pi apps) to the general settings. |
26 | 32 | ||
27 | Made Passwordmanager PwM/Pi more userfriendly: Rearranged some toolbar icons, optimized setting of focus, fixed layout problems and more. | 33 | Made Passwordmanager PwM/Pi more userfriendly: Rearranged some toolbar icons, optimized setting of focus, fixed layout problems and more. |
28 | 34 | ||
29 | Datenavigator can now display many months. Very useful on the desktop. | 35 | Datenavigator can now display many months. Very useful on the desktop. |
30 | 36 | ||
31 | KO/Pi alarm applet changed: Made buttons in alarm dialog much bigger and other usebility enhancements. | 37 | KO/Pi alarm applet changed: Made buttons in alarm dialog much bigger and other usebility enhancements. |
32 | 38 | ||
33 | Made alarm sound working on Linux desktop. | 39 | Made alarm sound working on Linux desktop. |
34 | 40 | ||
diff --git a/kaddressbook/kaimportoldialog.cpp b/kaddressbook/kaimportoldialog.cpp index 848d8af..7bb8bd8 100644 --- a/kaddressbook/kaimportoldialog.cpp +++ b/kaddressbook/kaimportoldialog.cpp | |||
@@ -284,64 +284,65 @@ void KAImportOLdialog::ol2kapiContact( _ContactItem * aItem ) | |||
284 | tempS = QString::fromUcs2(aItem->GetSpouse().GetBuffer()); | 284 | tempS = QString::fromUcs2(aItem->GetSpouse().GetBuffer()); |
285 | if ( !tempS.isEmpty() ) | 285 | if ( !tempS.isEmpty() ) |
286 | addressee.insertCustom( "KADDRESSBOOK", "X-SpousesName", tempS ); | 286 | addressee.insertCustom( "KADDRESSBOOK", "X-SpousesName", tempS ); |
287 | tempS = QString::fromUcs2(aItem->GetManagerName().GetBuffer()); | 287 | tempS = QString::fromUcs2(aItem->GetManagerName().GetBuffer()); |
288 | if ( !tempS.isEmpty() ) | 288 | if ( !tempS.isEmpty() ) |
289 | addressee.insertCustom( "KADDRESSBOOK", "X-ManagersName", tempS ); | 289 | addressee.insertCustom( "KADDRESSBOOK", "X-ManagersName", tempS ); |
290 | tempS = QString::fromUcs2(aItem->GetAssistantName().GetBuffer()); | 290 | tempS = QString::fromUcs2(aItem->GetAssistantName().GetBuffer()); |
291 | if ( !tempS.isEmpty() ) | 291 | if ( !tempS.isEmpty() ) |
292 | addressee.insertCustom( "KADDRESSBOOK", "X-AssistantsName", tempS ); | 292 | addressee.insertCustom( "KADDRESSBOOK", "X-AssistantsName", tempS ); |
293 | tempS = QString::fromUcs2(aItem->GetDepartment().GetBuffer()); | 293 | tempS = QString::fromUcs2(aItem->GetDepartment().GetBuffer()); |
294 | if ( !tempS.isEmpty() ) | 294 | if ( !tempS.isEmpty() ) |
295 | addressee.insertCustom( "KADDRESSBOOK", "X-Department", tempS ); | 295 | addressee.insertCustom( "KADDRESSBOOK", "X-Department", tempS ); |
296 | tempS = QString::fromUcs2(aItem->GetOfficeLocation().GetBuffer()).replace( QRegExp("\\r"), ""); | 296 | tempS = QString::fromUcs2(aItem->GetOfficeLocation().GetBuffer()).replace( QRegExp("\\r"), ""); |
297 | if ( !tempS.isEmpty() ) | 297 | if ( !tempS.isEmpty() ) |
298 | addressee.insertCustom( "KADDRESSBOOK", "X-Office",tempS ); | 298 | addressee.insertCustom( "KADDRESSBOOK", "X-Office",tempS ); |
299 | tempS = QString::fromUcs2(aItem->GetProfession().GetBuffer()); | 299 | tempS = QString::fromUcs2(aItem->GetProfession().GetBuffer()); |
300 | if ( !tempS.isEmpty() ) | 300 | if ( !tempS.isEmpty() ) |
301 | addressee.insertCustom( "KADDRESSBOOK", "X-Profession", tempS ); | 301 | addressee.insertCustom( "KADDRESSBOOK", "X-Profession", tempS ); |
302 | dtb = mDdate2Qdtr(aItem->GetAnniversary()); | 302 | dtb = mDdate2Qdtr(aItem->GetAnniversary()); |
303 | if (dtb.isValid() ) { | 303 | if (dtb.isValid() ) { |
304 | QString dt = KGlobal::locale()->formatDate( dtb.date() , true, KLocale::ISODate); | 304 | QString dt = KGlobal::locale()->formatDate( dtb.date() , true, KLocale::ISODate); |
305 | addressee.insertCustom( "KADDRESSBOOK", "X-Anniversary", dt); | 305 | addressee.insertCustom( "KADDRESSBOOK", "X-Anniversary", dt); |
306 | } | 306 | } |
307 | int sec = aItem->GetSensitivity() ; | 307 | int sec = aItem->GetSensitivity() ; |
308 | if ( sec > 1 )// mapping pers -> private | 308 | if ( sec > 1 )// mapping pers -> private |
309 | --sec; | 309 | --sec; |
310 | addressee.setSecrecy( sec ); | 310 | addressee.setSecrecy( sec ); |
311 | //addressee.setLogo( const Picture &logo ); | 311 | //addressee.setLogo( const Picture &logo ); |
312 | //addressee.setPhoto( const Picture &photo ); | 312 | //addressee.setPhoto( const Picture &photo ); |
313 | //addressee.setSound( const Sound &sound ); | 313 | //addressee.setSound( const Sound &sound ); |
314 | //addressee.setAgent( const Agent &agent ); | 314 | //addressee.setAgent( const Agent &agent ); |
315 | QString cat = QString::fromUcs2( aItem->GetCategories().GetBuffer()).replace( QRegExp("\\r"), ""); | 315 | QString cat = QString::fromUcs2( aItem->GetCategories().GetBuffer()).replace( QRegExp("\\r"), ""); |
316 | cat = cat.replace( QRegExp("; "), ";"); | ||
316 | addressee.setCategories( QStringList::split( ";", cat )); | 317 | addressee.setCategories( QStringList::split( ";", cat )); |
317 | 318 | ||
318 | QString phoneS; | 319 | QString phoneS; |
319 | 320 | ||
320 | phoneS = QString::fromUcs2( aItem->GetAssistantTelephoneNumber().GetBuffer()); | 321 | phoneS = QString::fromUcs2( aItem->GetAssistantTelephoneNumber().GetBuffer()); |
321 | if ( ! phoneS.isEmpty()) | 322 | if ( ! phoneS.isEmpty()) |
322 | addressee.insertPhoneNumber( KABC::PhoneNumber(phoneS ,KABC::PhoneNumber::Work + KABC::PhoneNumber::Voice ) ); | 323 | addressee.insertPhoneNumber( KABC::PhoneNumber(phoneS ,KABC::PhoneNumber::Work + KABC::PhoneNumber::Voice ) ); |
323 | phoneS = QString::fromUcs2( aItem->GetBusinessTelephoneNumber().GetBuffer()); | 324 | phoneS = QString::fromUcs2( aItem->GetBusinessTelephoneNumber().GetBuffer()); |
324 | if ( ! phoneS.isEmpty()) | 325 | if ( ! phoneS.isEmpty()) |
325 | addressee.insertPhoneNumber( KABC::PhoneNumber(phoneS ,KABC::PhoneNumber::Work ) ); | 326 | addressee.insertPhoneNumber( KABC::PhoneNumber(phoneS ,KABC::PhoneNumber::Work ) ); |
326 | phoneS = QString::fromUcs2( aItem->GetBusiness2TelephoneNumber().GetBuffer()); | 327 | phoneS = QString::fromUcs2( aItem->GetBusiness2TelephoneNumber().GetBuffer()); |
327 | if ( ! phoneS.isEmpty()) | 328 | if ( ! phoneS.isEmpty()) |
328 | addressee.insertPhoneNumber( KABC::PhoneNumber(phoneS ,KABC::PhoneNumber::Work ) ); | 329 | addressee.insertPhoneNumber( KABC::PhoneNumber(phoneS ,KABC::PhoneNumber::Work ) ); |
329 | phoneS = QString::fromUcs2( aItem->GetBusinessFaxNumber().GetBuffer()); | 330 | phoneS = QString::fromUcs2( aItem->GetBusinessFaxNumber().GetBuffer()); |
330 | if ( ! phoneS.isEmpty()) | 331 | if ( ! phoneS.isEmpty()) |
331 | addressee.insertPhoneNumber( KABC::PhoneNumber(phoneS ,KABC::PhoneNumber::Work + KABC::PhoneNumber::Fax ) ); | 332 | addressee.insertPhoneNumber( KABC::PhoneNumber(phoneS ,KABC::PhoneNumber::Work + KABC::PhoneNumber::Fax ) ); |
332 | phoneS = QString::fromUcs2( aItem->GetCarTelephoneNumber().GetBuffer()); | 333 | phoneS = QString::fromUcs2( aItem->GetCarTelephoneNumber().GetBuffer()); |
333 | if ( ! phoneS.isEmpty()) | 334 | if ( ! phoneS.isEmpty()) |
334 | addressee.insertPhoneNumber( KABC::PhoneNumber(phoneS ,KABC::PhoneNumber::Car ) ); | 335 | addressee.insertPhoneNumber( KABC::PhoneNumber(phoneS ,KABC::PhoneNumber::Car ) ); |
335 | phoneS = QString::fromUcs2( aItem->GetHomeTelephoneNumber().GetBuffer()); | 336 | phoneS = QString::fromUcs2( aItem->GetHomeTelephoneNumber().GetBuffer()); |
336 | if ( ! phoneS.isEmpty()) | 337 | if ( ! phoneS.isEmpty()) |
337 | addressee.insertPhoneNumber( KABC::PhoneNumber(phoneS ,KABC::PhoneNumber::Home ) ); | 338 | addressee.insertPhoneNumber( KABC::PhoneNumber(phoneS ,KABC::PhoneNumber::Home ) ); |
338 | phoneS = QString::fromUcs2( aItem->GetHome2TelephoneNumber().GetBuffer()); | 339 | phoneS = QString::fromUcs2( aItem->GetHome2TelephoneNumber().GetBuffer()); |
339 | if ( ! phoneS.isEmpty()) | 340 | if ( ! phoneS.isEmpty()) |
340 | addressee.insertPhoneNumber( KABC::PhoneNumber(phoneS ,KABC::PhoneNumber::Home ) ); | 341 | addressee.insertPhoneNumber( KABC::PhoneNumber(phoneS ,KABC::PhoneNumber::Home ) ); |
341 | phoneS = QString::fromUcs2( aItem->GetHomeFaxNumber().GetBuffer()); | 342 | phoneS = QString::fromUcs2( aItem->GetHomeFaxNumber().GetBuffer()); |
342 | if ( ! phoneS.isEmpty()) | 343 | if ( ! phoneS.isEmpty()) |
343 | addressee.insertPhoneNumber( KABC::PhoneNumber(phoneS ,KABC::PhoneNumber::Home + KABC::PhoneNumber::Fax ) ); | 344 | addressee.insertPhoneNumber( KABC::PhoneNumber(phoneS ,KABC::PhoneNumber::Home + KABC::PhoneNumber::Fax ) ); |
344 | phoneS = QString::fromUcs2( aItem->GetISDNNumber().GetBuffer()); | 345 | phoneS = QString::fromUcs2( aItem->GetISDNNumber().GetBuffer()); |
345 | if ( ! phoneS.isEmpty()) | 346 | if ( ! phoneS.isEmpty()) |
346 | addressee.insertPhoneNumber( KABC::PhoneNumber(phoneS ,KABC::PhoneNumber::Isdn ) ); | 347 | addressee.insertPhoneNumber( KABC::PhoneNumber(phoneS ,KABC::PhoneNumber::Isdn ) ); |
347 | phoneS = QString::fromUcs2( aItem->GetMobileTelephoneNumber().GetBuffer()); | 348 | phoneS = QString::fromUcs2( aItem->GetMobileTelephoneNumber().GetBuffer()); |