-rw-r--r-- | kabc/addressbook.cpp | 20 | ||||
-rw-r--r-- | kabc/addressbook.h | 1 | ||||
-rw-r--r-- | kabc/addressee.cpp | 75 | ||||
-rw-r--r-- | kabc/addressee.h | 4 | ||||
-rw-r--r-- | kabc/phonenumber.cpp | 24 | ||||
-rw-r--r-- | kaddressbook/kabcore.cpp | 96 | ||||
-rw-r--r-- | kaddressbook/kabcore.h | 5 | ||||
-rw-r--r-- | kaddressbook/kaimportoldialog.cpp | 712 | ||||
-rw-r--r-- | kaddressbook/kaimportoldialog.h | 63 | ||||
-rw-r--r-- | kaddressbook/phoneeditwidget.cpp | 11 | ||||
-rw-r--r-- | korganizer/journalentry.h | 1 | ||||
-rw-r--r-- | korganizer/kojournalview.cpp | 9 | ||||
-rw-r--r-- | libkdepim/externalapphandler.cpp | 2 | ||||
-rw-r--r-- | libkdepim/ksyncmanager.cpp | 71 | ||||
-rw-r--r-- | libkdepim/ksyncmanager.h | 3 | ||||
-rw-r--r-- | libkdepim/libkdepim.pro | 15 |
16 files changed, 319 insertions, 793 deletions
diff --git a/kabc/addressbook.cpp b/kabc/addressbook.cpp index f9e4387..fe59fcb 100644 --- a/kabc/addressbook.cpp +++ b/kabc/addressbook.cpp | |||
@@ -947,4 +947,21 @@ void AddressBook::preExternSync( AddressBook* aBook, const QString& csd , bool i | |||
947 | mergeAB( aBook ,csd, isSubset ); | 947 | mergeAB( aBook ,csd, isSubset ); |
948 | } | 948 | } |
949 | void AddressBook::preOLSync( AddressBook* aBook, const QString& csd ) | ||
950 | { | ||
951 | //qDebug("AddressBook::preExternSync "); | ||
952 | AddressBook::Iterator it; | ||
953 | for ( it = begin(); it != end(); ++it ) { | ||
954 | (*it).setID( csd, (*it).externalUID() ); | ||
955 | (*it).computeCsum( csd ); | ||
956 | } | ||
957 | |||
958 | Addressee ad; | ||
959 | for ( it = begin(); it != end(); ++it ) { | ||
960 | ad = aBook->findByExternUid( (*it).externalUID(), csd ); | ||
961 | if ( !ad.isEmpty() ) { | ||
962 | (*it).mergeOLContact( ad ); | ||
963 | } | ||
964 | } | ||
965 | } | ||
949 | void AddressBook::postExternSync( AddressBook* aBook , const QString& csd, bool setID) | 966 | void AddressBook::postExternSync( AddressBook* aBook , const QString& csd, bool setID) |
950 | { | 967 | { |
@@ -966,5 +983,6 @@ void AddressBook::postExternSync( AddressBook* aBook , const QString& csd, bool | |||
966 | if ( setID ) { | 983 | if ( setID ) { |
967 | if ( (*it).tempSyncStat() == SYNC_TEMPSTATE_NEW_ID ) | 984 | if ( (*it).tempSyncStat() == SYNC_TEMPSTATE_NEW_ID ) |
968 | ad.setID( csd, (*it).externalUID() ); | 985 | ad.setID( csd, (*it).externalUID() );{ |
986 | } | ||
969 | } else | 987 | } else |
970 | ad.setID( csd, (*it).uid() ); | 988 | ad.setID( csd, (*it).uid() ); |
diff --git a/kabc/addressbook.h b/kabc/addressbook.h index e6daa5e..a8a9fc1 100644 --- a/kabc/addressbook.h +++ b/kabc/addressbook.h | |||
@@ -309,4 +309,5 @@ class AddressBook : public QObject | |||
309 | 309 | ||
310 | void preExternSync( AddressBook* aBook, const QString& csd, bool isSubset ); | 310 | void preExternSync( AddressBook* aBook, const QString& csd, bool isSubset ); |
311 | void preOLSync( AddressBook* aBook, const QString& csd); | ||
311 | void postExternSync( AddressBook* aBook, const QString& csd , bool setID ); | 312 | void postExternSync( AddressBook* aBook, const QString& csd , bool setID ); |
312 | signals: | 313 | signals: |
diff --git a/kabc/addressee.cpp b/kabc/addressee.cpp index 6cfac80..e8e440c 100644 --- a/kabc/addressee.cpp +++ b/kabc/addressee.cpp | |||
@@ -33,4 +33,5 @@ $Id$ | |||
33 | #include <kapplication.h> | 33 | #include <kapplication.h> |
34 | #include <klocale.h> | 34 | #include <klocale.h> |
35 | #include <kmessagebox.h> | ||
35 | #include <kidmanager.h> | 36 | #include <kidmanager.h> |
36 | //US | 37 | //US |
@@ -212,5 +213,5 @@ void Addressee::computeCsum(const QString &dev) | |||
212 | QStringList l; | 213 | QStringList l; |
213 | //if ( !mData->name.isEmpty() ) l.append(mData->name); | 214 | //if ( !mData->name.isEmpty() ) l.append(mData->name); |
214 | //if ( !mData->formattedName.isEmpty() ) l.append(mData->formattedName ); | 215 | if ( !mData->formattedName.isEmpty() ) l.append(mData->formattedName ); |
215 | if ( !mData->familyName.isEmpty() ) l.append( mData->familyName ); | 216 | if ( !mData->familyName.isEmpty() ) l.append( mData->familyName ); |
216 | if ( !mData->givenName.isEmpty() ) l.append(mData->givenName ); | 217 | if ( !mData->givenName.isEmpty() ) l.append(mData->givenName ); |
@@ -333,4 +334,51 @@ bool Addressee::matchPhoneNumber( QRegExp* re ) const | |||
333 | 334 | ||
334 | } | 335 | } |
336 | void Addressee::mergeOLContact( const Addressee& ad ) | ||
337 | { | ||
338 | if ( mData->formattedName.isEmpty() ) mData->formattedName = ad.mData->formattedName; | ||
339 | if ( mData->mailer.isEmpty() ) mData->mailer = ad.mData->mailer; | ||
340 | if ( !mData->timeZone.isValid() ) mData->timeZone = ad.mData->timeZone; | ||
341 | if ( !mData->geo.isValid() ) mData->geo = ad.mData->geo; | ||
342 | if ( mData->logo.undefined() && !ad.mData->logo.undefined() ) mData->logo = ad.mData->logo; | ||
343 | if ( mData->photo.undefined() && !ad.mData->photo.undefined() ) mData->photo = ad.mData->photo; | ||
344 | if ( !mData->sound.isIntern() ) { | ||
345 | if ( mData->sound.url().isEmpty() ) { | ||
346 | mData->sound = ad.mData->sound; | ||
347 | } | ||
348 | } | ||
349 | if ( !mData->agent.isIntern() ) { | ||
350 | if ( mData->agent.url().isEmpty() ) { | ||
351 | mData->agent = ad.mData->agent; | ||
352 | } | ||
353 | } | ||
354 | { | ||
355 | Key::List::Iterator itA; | ||
356 | for( itA = ad.mData->keys.begin(); itA != ad.mData->keys.end(); ++itA ) { | ||
357 | bool found = false; | ||
358 | Key::List::Iterator it; | ||
359 | for( it = mData->keys.begin(); it != mData->keys.end(); ++it ) { | ||
360 | if ( (*it) == (*itA)) { | ||
361 | found = true; | ||
362 | break; | ||
363 | |||
364 | } | ||
365 | } | ||
366 | if ( ! found ) { | ||
367 | mData->keys.append( *itA ); | ||
368 | } | ||
369 | } | ||
370 | } | ||
371 | |||
372 | KABC::Address addthis = otherAddress(); | ||
373 | KABC::Address addother = ad.otherAddress(); | ||
374 | if ( !addthis.isEmpty() && !addother.isEmpty() ) | ||
375 | addthis.setType( addother.type() ); | ||
376 | //qDebug("merge contact %s ", ad.uid().latin1()); | ||
377 | setUid( ad.uid() ); | ||
378 | setRevision( ad.revision() ); | ||
379 | |||
380 | |||
381 | } | ||
382 | |||
335 | void Addressee::mergeContact( const Addressee& ad , bool isSubSet) // = false) | 383 | void Addressee::mergeContact( const Addressee& ad , bool isSubSet) // = false) |
336 | { | 384 | { |
@@ -1654,5 +1702,4 @@ void Addressee::insertPhoneNumber( const PhoneNumber &phoneNumber ) | |||
1654 | detach(); | 1702 | detach(); |
1655 | mData->empty = false; | 1703 | mData->empty = false; |
1656 | |||
1657 | PhoneNumber::List::Iterator it; | 1704 | PhoneNumber::List::Iterator it; |
1658 | for( it = mData->phoneNumbers.begin(); it != mData->phoneNumbers.end(); ++it ) { | 1705 | for( it = mData->phoneNumbers.begin(); it != mData->phoneNumbers.end(); ++it ) { |
@@ -1721,4 +1768,15 @@ PhoneNumber::List Addressee::phoneNumbers( int type ) const | |||
1721 | return list; | 1768 | return list; |
1722 | } | 1769 | } |
1770 | QString Addressee::phoneNumberString( int type ) const | ||
1771 | { | ||
1772 | |||
1773 | PhoneNumber::List::ConstIterator it; | ||
1774 | for( it = mData->phoneNumbers.begin(); it != mData->phoneNumbers.end(); ++it ) { | ||
1775 | if ((*it).type() == type ) { | ||
1776 | return ( *it ).number(); | ||
1777 | } | ||
1778 | } | ||
1779 | return ""; | ||
1780 | } | ||
1723 | 1781 | ||
1724 | PhoneNumber Addressee::findPhoneNumber( const QString &id ) const | 1782 | PhoneNumber Addressee::findPhoneNumber( const QString &id ) const |
@@ -1926,5 +1984,16 @@ void Addressee::removeAddress( const Address &address ) | |||
1926 | } | 1984 | } |
1927 | } | 1985 | } |
1928 | 1986 | Address Addressee::otherAddress() const | |
1987 | { | ||
1988 | Address::List::ConstIterator it; | ||
1989 | for( it = mData->addresses.begin(); it != mData->addresses.end(); ++it ) { | ||
1990 | if ( matchBinaryPatternA( (*it).type(), KABC::Address::Work ) ) | ||
1991 | continue; | ||
1992 | if ( matchBinaryPatternA( (*it).type(), KABC::Address::Home ) ) | ||
1993 | continue; | ||
1994 | return (*it); | ||
1995 | } | ||
1996 | return Address(); | ||
1997 | } | ||
1929 | Address Addressee::address( int type ) const | 1998 | Address Addressee::address( int type ) const |
1930 | { | 1999 | { |
diff --git a/kabc/addressee.h b/kabc/addressee.h index aac78dc..0ea1803 100644 --- a/kabc/addressee.h +++ b/kabc/addressee.h | |||
@@ -119,4 +119,5 @@ class Addressee | |||
119 | QString originalExternalUID() const; | 119 | QString originalExternalUID() const; |
120 | void mergeContact( const Addressee& ad, bool isSubSet ); | 120 | void mergeContact( const Addressee& ad, bool isSubSet ); |
121 | void mergeOLContact( const Addressee& ad ); | ||
121 | void simplifyEmails(); | 122 | void simplifyEmails(); |
122 | void simplifyAddresses(); | 123 | void simplifyAddresses(); |
@@ -648,4 +649,5 @@ class Addressee | |||
648 | */ | 649 | */ |
649 | PhoneNumber phoneNumber( int type ) const; | 650 | PhoneNumber phoneNumber( int type ) const; |
651 | QString phoneNumberString( int type ) const; | ||
650 | 652 | ||
651 | bool matchPhoneNumber( QRegExp* searchExp ) const; | 653 | bool matchPhoneNumber( QRegExp* searchExp ) const; |
@@ -732,5 +734,5 @@ class Addressee | |||
732 | */ | 734 | */ |
733 | Address::List addresses() const; | 735 | Address::List addresses() const; |
734 | 736 | Address otherAddress() const; | |
735 | /** | 737 | /** |
736 | Return list of addresses with a special type. | 738 | Return list of addresses with a special type. |
diff --git a/kabc/phonenumber.cpp b/kabc/phonenumber.cpp index 12b9b09..1752745 100644 --- a/kabc/phonenumber.cpp +++ b/kabc/phonenumber.cpp | |||
@@ -233,4 +233,28 @@ PhoneNumber::TypeList PhoneNumber::supportedTypeList() | |||
233 | return list; | 233 | return list; |
234 | } | 234 | } |
235 | |||
236 | #if 0 | ||
237 | Home| Pref i18n("Home") Home | ||
238 | Work| Pref i18n("Work") Business | ||
239 | Cell i18n("Mobile") Mobile | ||
240 | Pcs|Pref i18n("SiP") Radio | ||
241 | Pcs|Voice i18n("VoIP") TTY/TTD | ||
242 | Home i18n("Home2") Home 2 | ||
243 | Work i18n("Work2") Business 2 | ||
244 | Car i18n("Mobile2") Car | ||
245 | Pcs i18n("SiP2") Telex | ||
246 | Work| Msg | Voice i18n("Assistent") Assistent | ||
247 | Work| Msg i18n("Company") Company | ||
248 | Home | Fax i18n("Fax (Home)") Home Fax | ||
249 | Work| Fax i18n("Fax (Work)") Business Fax | ||
250 | Fax i18n("Fax (Other)") Other Fax | ||
251 | Pager i18n("Pager") Pager | ||
252 | Isdn i18n("ISDN") Isdn | ||
253 | Msg i18n("Callback") Callback | ||
254 | Pref i18n("Primary") Primary | ||
255 | Voice; i18n("Other") Other | ||
256 | |||
257 | #endif | ||
258 | |||
235 | QStringList PhoneNumber::supportedTypeListNames() | 259 | QStringList PhoneNumber::supportedTypeListNames() |
236 | { | 260 | { |
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index 7d8586a..ab2824c 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp | |||
@@ -159,4 +159,5 @@ $Id$ | |||
159 | #ifdef _OL_IMPORT_ | 159 | #ifdef _OL_IMPORT_ |
160 | #include "kaimportoldialog.h" | 160 | #include "kaimportoldialog.h" |
161 | #include <libkdepim/ol_access.h> | ||
161 | #endif | 162 | #endif |
162 | #else | 163 | #else |
@@ -1370,7 +1371,5 @@ void KABCore::importFromOL() | |||
1370 | { | 1371 | { |
1371 | #ifdef _OL_IMPORT_ | 1372 | #ifdef _OL_IMPORT_ |
1372 | KAImportOLdialog* idgl = new KAImportOLdialog( i18n("Import Contacts from OL"), mAddressBook, this ); | 1373 | KABC::Addressee::List list = OL_access::instance()->importOLcontacts(); |
1373 | idgl->exec(); | ||
1374 | KABC::Addressee::List list = idgl->getAddressList(); | ||
1375 | if ( list.count() > 0 ) { | 1374 | if ( list.count() > 0 ) { |
1376 | KABC::Addressee::List listNew; | 1375 | KABC::Addressee::List listNew; |
@@ -1384,6 +1383,9 @@ void KABCore::importFromOL() | |||
1384 | listExisting.append( (*it) ); | 1383 | listExisting.append( (*it) ); |
1385 | } | 1384 | } |
1385 | QString mess = i18n("%1 contacts read from OL.\n\n%2 contacts added to addressbook!").arg( list.count()).arg( listNew.count() ); | ||
1386 | if ( listExisting.count() > 0 ) | 1386 | if ( listExisting.count() > 0 ) |
1387 | KMessageBox::information( this, i18n("%1 contacts not added to addressbook\nbecause they were already in the addressbook!").arg( listExisting.count() )); | 1387 | mess += "\n\n"+ i18n("%1 contacts not added to addressbook\nbecause they were already in the addressbook!").arg( listExisting.count() ); |
1388 | |||
1389 | KMessageBox::information( this, mess ); | ||
1388 | if ( listNew.count() > 0 ) { | 1390 | if ( listNew.count() > 0 ) { |
1389 | pasteWithNewUid = false; | 1391 | pasteWithNewUid = false; |
@@ -1392,8 +1394,55 @@ void KABCore::importFromOL() | |||
1392 | } | 1394 | } |
1393 | } | 1395 | } |
1394 | delete idgl; | ||
1395 | #endif | 1396 | #endif |
1396 | } | 1397 | } |
1397 | 1398 | ||
1399 | bool KABCore::readOLdata( KABC::AddressBook* local ) | ||
1400 | { | ||
1401 | #ifdef _OL_IMPORT_ | ||
1402 | QStringList folderList = OL_access::instance()->getFolderSelection( OL_CONTACT_DATA , i18n("Select Folder to sync")); | ||
1403 | KABC::Addressee::List list; | ||
1404 | if ( folderList.count() ) { | ||
1405 | OL_access::instance()->readContactData( OL_access::instance()->getFolderFromID( 0, folderList[1] ) , &list, true ); | ||
1406 | KABC::Addressee::List::Iterator it; | ||
1407 | for ( it = list.begin(); it != list.end(); ++it ) { | ||
1408 | (*it).setExternalUID( (*it).uid() ); | ||
1409 | (*it).setOriginalExternalUID( (*it).uid() ); | ||
1410 | (*it).setTempSyncStat( SYNC_TEMPSTATE_NEW_EXTERNAL ); | ||
1411 | local->insertAddressee( (*it) , false, false ); | ||
1412 | } | ||
1413 | mOLsyncFolderID = folderList[1]; | ||
1414 | //KMessageBox::information( this, i18n("OLsync folder ID ") + mOLsyncFolderID ); | ||
1415 | } | ||
1416 | return list.count() > 0; | ||
1417 | #else | ||
1418 | return false; | ||
1419 | #endif | ||
1420 | } | ||
1421 | bool KABCore::writeOLdata( KABC::AddressBook* aBook ) | ||
1422 | { | ||
1423 | #ifdef _OL_IMPORT_ | ||
1424 | if ( !OL_access::instance()->setSelectedFolder( mOLsyncFolderID ) ) | ||
1425 | return false; | ||
1426 | KABC::AddressBook::Iterator it; | ||
1427 | for ( it = aBook->begin(); it != aBook->end(); ++it ) { | ||
1428 | if ( (*it).tempSyncStat() != SYNC_TEMPSTATE_NEW_EXTERNAL ) { | ||
1429 | KABC::Addressee addressee = (*it); | ||
1430 | if ( (*it).tempSyncStat() == SYNC_TEMPSTATE_ADDED_EXTERNAL ) { | ||
1431 | (*it) = OL_access::instance()->addAddressee( (*it) ); | ||
1432 | (*it).setTempSyncStat( SYNC_TEMPSTATE_NEW_ID ); | ||
1433 | } else if ( (*it).tempSyncStat() == SYNC_TEMPSTATE_DELETE ) { | ||
1434 | OL_access::instance()->deleteAddressee( (*it) ); | ||
1435 | } else if ( (*it).tempSyncStat() != SYNC_TEMPSTATE_NEW_EXTERNAL ) { | ||
1436 | //changed | ||
1437 | (*it) = OL_access::instance()->changeAddressee( (*it) ); | ||
1438 | (*it).setTempSyncStat( SYNC_TEMPSTATE_NEW_CSUM ); | ||
1439 | } | ||
1440 | } | ||
1441 | } | ||
1442 | return true; | ||
1443 | #else | ||
1444 | return false; | ||
1445 | #endif | ||
1446 | } | ||
1398 | void KABCore::importVCard( const QString &vCard, bool showPreview ) | 1447 | void KABCore::importVCard( const QString &vCard, bool showPreview ) |
1399 | { | 1448 | { |
@@ -3375,4 +3424,39 @@ void KABCore::removeSyncInfo( QString syncProfile) | |||
3375 | } | 3424 | } |
3376 | 3425 | ||
3426 | bool KABCore::syncOL() | ||
3427 | { | ||
3428 | disableBR( true ); | ||
3429 | QString mCurrentSyncDevice = syncManager->getCurrentSyncDevice(); | ||
3430 | AddressBook abLocal; | ||
3431 | if ( ! readOLdata( &abLocal ) ) | ||
3432 | return false; | ||
3433 | bool syncOK = false; | ||
3434 | message(i18n("Data from OL loaded..."), false); | ||
3435 | mGlobalSyncMode = SYNC_MODE_EXTERNAL; | ||
3436 | message(i18n("Sync preprocessing..."),false); | ||
3437 | abLocal.preOLSync( mAddressBook ,mCurrentSyncDevice ); | ||
3438 | message(i18n("Synchronizing..."),false); | ||
3439 | syncOK = synchronizeAddressbooks( mAddressBook, &abLocal, syncManager->mSyncAlgoPrefs ); | ||
3440 | syncManager->hideProgressBar(); | ||
3441 | if ( syncOK ) { | ||
3442 | if ( syncManager->mWriteBackFile ) { | ||
3443 | abLocal.removeSyncAddressees( false ); | ||
3444 | message(i18n("Saving address data to OL..."),false); | ||
3445 | //abLocal.saveAB(); | ||
3446 | writeOLdata( &abLocal ); | ||
3447 | message(i18n("Sync postprocessing..."),false); | ||
3448 | abLocal.postExternSync( mAddressBook,mCurrentSyncDevice, true ); | ||
3449 | } | ||
3450 | } else | ||
3451 | message( i18n("Sync cancelled or failed.") ); | ||
3452 | setModified(); | ||
3453 | abLocal.removeResources(); | ||
3454 | if ( syncOK ) { | ||
3455 | mViewManager->refreshView(); | ||
3456 | message(i18n("OL syncing finished.")); | ||
3457 | } | ||
3458 | disableBR( false ); | ||
3459 | return syncOK; | ||
3460 | } | ||
3377 | 3461 | ||
3378 | //this is a overwritten callbackmethods from the syncinterface | 3462 | //this is a overwritten callbackmethods from the syncinterface |
@@ -3381,4 +3465,6 @@ bool KABCore::syncExternal(KSyncManager* manager, QString resource) | |||
3381 | if ( resource == "phone" ) | 3465 | if ( resource == "phone" ) |
3382 | return syncPhone(); | 3466 | return syncPhone(); |
3467 | if ( resource == "ol" ) | ||
3468 | return syncOL(); | ||
3383 | disableBR( true ); | 3469 | disableBR( true ); |
3384 | if ( manager != syncManager ) | 3470 | if ( manager != syncManager ) |
diff --git a/kaddressbook/kabcore.h b/kaddressbook/kabcore.h index e69cb60..ec6a9ec 100644 --- a/kaddressbook/kabcore.h +++ b/kaddressbook/kabcore.h | |||
@@ -516,4 +516,7 @@ class KABCore : public QWidget, public KSyncInterface | |||
516 | virtual bool syncExternal(KSyncManager* manager, QString resource); | 516 | virtual bool syncExternal(KSyncManager* manager, QString resource); |
517 | virtual void removeSyncInfo( QString syncProfile); | 517 | virtual void removeSyncInfo( QString syncProfile); |
518 | bool readOLdata( KABC::AddressBook* local ); | ||
519 | bool writeOLdata( KABC::AddressBook* local ); | ||
520 | bool syncOL(); | ||
518 | bool syncPhone(); | 521 | bool syncPhone(); |
519 | void message( QString m , bool startTimer = true); | 522 | void message( QString m , bool startTimer = true); |
@@ -530,4 +533,6 @@ class KABCore : public QWidget, public KSyncInterface | |||
530 | int takeAddressee( KABC::Addressee* local, KABC::Addressee* remote, int mode , bool full ); | 533 | int takeAddressee( KABC::Addressee* local, KABC::Addressee* remote, int mode , bool full ); |
531 | // ********************* | 534 | // ********************* |
535 | //OL sync stuff | ||
536 | QString mOLsyncFolderID; | ||
532 | 537 | ||
533 | }; | 538 | }; |
diff --git a/kaddressbook/kaimportoldialog.cpp b/kaddressbook/kaimportoldialog.cpp index 2f794d6..6afc288 100644 --- a/kaddressbook/kaimportoldialog.cpp +++ b/kaddressbook/kaimportoldialog.cpp | |||
@@ -22,714 +22,2 @@ | |||
22 | */ | 22 | */ |
23 | 23 | ||
24 | #include <qtooltip.h> | ||
25 | #include <qframe.h> | ||
26 | #include <qpixmap.h> | ||
27 | #include <qlayout.h> | ||
28 | #include <qprogressbar.h> | ||
29 | #include <qprogressdialog.h> | ||
30 | #include <qwidgetstack.h> | ||
31 | #include <qdatetime.h> | ||
32 | #include <qdir.h> | ||
33 | #include <qregexp.h> | ||
34 | #include <qapplication.h> | ||
35 | #include <qhbox.h> | ||
36 | #include <qheader.h> | ||
37 | #include <qdatetime.h> | ||
38 | #include <qlistview.h> | ||
39 | |||
40 | #include <kdebug.h> | ||
41 | #include <klocale.h> | ||
42 | #include <kstandarddirs.h> | ||
43 | #include <kmessagebox.h> | ||
44 | #include <kfiledialog.h> | ||
45 | |||
46 | #include <libkdepim/categoryselectdialog.h> | ||
47 | #include <libkdepim/kinputdialog.h> | ||
48 | |||
49 | #include <libkcal/calendarlocal.h> | ||
50 | #include <libkcal/icalformat.h> | ||
51 | |||
52 | #include <kabc/addresseelist.h> | ||
53 | #include <kabc/phonenumber.h> | ||
54 | |||
55 | #include "kaimportoldialog.h" | ||
56 | |||
57 | #include "../outport/msoutl9.h" | ||
58 | #include <ole2.h> | ||
59 | #include <comutil.h> | ||
60 | _Application gOlAppAB; | ||
61 | |||
62 | QDateTime mDdate2Qdtr( DATE dt) | ||
63 | { | ||
64 | COleDateTime odt; | ||
65 | SYSTEMTIME st; | ||
66 | odt = dt; | ||
67 | if ( odt.GetStatus() != 0 ) | ||
68 | return QDateTime(); | ||
69 | odt.GetAsSystemTime(st); | ||
70 | if ( st.wYear > 4000 ) // this program as a year 4000 bug! | ||
71 | return QDateTime(); | ||
72 | // it seems so, that 1.1.4501 indicates: DATE invalid | ||
73 | QDateTime qdt (QDate(st.wYear, st.wMonth,st.wDay ),QTime( st.wHour, st.wMinute,st.wSecond ) ); | ||
74 | return qdt; | ||
75 | } | ||
76 | |||
77 | class OLEListViewItem : public QCheckListItem | ||
78 | { | ||
79 | public: | ||
80 | OLEListViewItem( QListView *parent, QString text ) : | ||
81 | QCheckListItem( parent, text, QCheckListItem::CheckBox ) { ; }; | ||
82 | OLEListViewItem( QListViewItem *after, QString text ) : | ||
83 | QCheckListItem( after, text, QCheckListItem::CheckBox ) { ; }; | ||
84 | ~OLEListViewItem() {}; | ||
85 | void setData( DWORD data ) {mData= data; }; | ||
86 | DWORD data() { return mData ;}; | ||
87 | private: | ||
88 | DWORD mData; | ||
89 | }; | ||
90 | |||
91 | KAImportOLdialog::KAImportOLdialog( const QString &caption, | ||
92 | KABC::AddressBook * aBook, QWidget *parent ) : | ||
93 | KDialogBase( Plain, caption, User1 | Close, Ok, | ||
94 | parent, caption, true, false, i18n("Import!") ) | ||
95 | { | ||
96 | QHBox * mw = new QHBox( this ); | ||
97 | setMainWidget( mw ); | ||
98 | mListView = new QListView( mw ); | ||
99 | mListView->addColumn(i18n("Select Folder to import")); | ||
100 | mListView->addColumn(i18n("Content Type")); | ||
101 | mABook = aBook; | ||
102 | connect( this, SIGNAL( user1Clicked() ),SLOT ( slotApply())); | ||
103 | setupFolderView(); | ||
104 | resize( sizeHint().width()+50, sizeHint().height()+50 ); | ||
105 | } | ||
106 | |||
107 | KAImportOLdialog::~KAImportOLdialog() | ||
108 | { | ||
109 | |||
110 | } | ||
111 | |||
112 | KABC::Addressee::List KAImportOLdialog::getAddressList() | ||
113 | { | ||
114 | return mAList; | ||
115 | } | ||
116 | void KAImportOLdialog::setupFolderView() | ||
117 | { | ||
118 | SCODE sc = ::OleInitialize(NULL); | ||
119 | if ( FAILED ( sc ) ) { | ||
120 | KMessageBox::information(this,"OLE initialisation failed"); | ||
121 | return; | ||
122 | } | ||
123 | |||
124 | if(!gOlAppAB.CreateDispatch(_T("Outlook.Application"),NULL)){ | ||
125 | KMessageBox::information(this,"Sorry, cannot access Outlook"); | ||
126 | return ; | ||
127 | } | ||
128 | MAPIFolder mfInbox; | ||
129 | MAPIFolder mfRoot; | ||
130 | CString szName; | ||
131 | _NameSpace olNS; | ||
132 | olNS = gOlAppAB.GetNamespace(_T("MAPI")); | ||
133 | mfInbox = olNS.GetDefaultFolder(6); | ||
134 | mfRoot = mfInbox.GetParent(); | ||
135 | szName = mfRoot.GetName(); | ||
136 | long iType = mfRoot.GetDefaultItemType(); | ||
137 | QString mes; | ||
138 | mes = QString::fromUcs2( szName.GetBuffer() ); | ||
139 | OLEListViewItem * root = new OLEListViewItem( mListView, mes ); | ||
140 | mfRoot.m_lpDispatch->AddRef(); | ||
141 | addFolder( root, mfRoot.m_lpDispatch ); | ||
142 | root->setOpen( true ); | ||
143 | mListView->setSortColumn( 0 ); | ||
144 | mListView->sort( ); | ||
145 | } | ||
146 | |||
147 | |||
148 | void KAImportOLdialog::addFolder(OLEListViewItem* iParent, LPDISPATCH dispParent) | ||
149 | { | ||
150 | MAPIFolder mfParent(dispParent), mfChild; | ||
151 | _Folders folders; | ||
152 | _variant_t fndx((long)0); | ||
153 | CString szName; | ||
154 | long iType; | ||
155 | OLEListViewItem* hChild; | ||
156 | |||
157 | folders = mfParent.GetFolders(); | ||
158 | for(int i=1; i <= folders.GetCount(); ++i) | ||
159 | { | ||
160 | fndx = (long)i; | ||
161 | mfChild = folders.Item(fndx.Detach()); | ||
162 | mfChild.m_lpDispatch->AddRef(); | ||
163 | szName = mfChild.GetName(); | ||
164 | iType = mfChild.GetDefaultItemType(); | ||
165 | hChild = new OLEListViewItem( iParent , QString::fromUcs2( szName.GetBuffer() ) ); | ||
166 | if ( iType != 2) | ||
167 | hChild->setEnabled( false ); | ||
168 | QString ts; | ||
169 | switch( iType ) { | ||
170 | case 0: | ||
171 | ts = i18n("Mail"); | ||
172 | break; | ||
173 | case 1: | ||
174 | ts = i18n("Calendar"); | ||
175 | break; | ||
176 | case 2: | ||
177 | ts = i18n("Contacts"); | ||
178 | break; | ||
179 | case 3: | ||
180 | ts = i18n("Todos"); | ||
181 | break; | ||
182 | case 4: | ||
183 | ts = i18n("Journals"); | ||
184 | break; | ||
185 | case 5: | ||
186 | ts = i18n("Notes"); | ||
187 | break; | ||
188 | default: | ||
189 | ts = i18n("Unknown"); | ||
190 | } | ||
191 | hChild->setText( 1,ts); | ||
192 | hChild->setData( (DWORD) mfChild.m_lpDispatch ); | ||
193 | mfChild.m_lpDispatch->AddRef(); | ||
194 | addFolder(hChild, mfChild.m_lpDispatch); | ||
195 | } | ||
196 | } | ||
197 | |||
198 | void KAImportOLdialog::slotApply() | ||
199 | { | ||
200 | importedItems = 0; | ||
201 | OLEListViewItem* child = (OLEListViewItem*) mListView->firstChild(); | ||
202 | while ( child ) { | ||
203 | if ( child->isOn() ) | ||
204 | readContactData( child->data() ); | ||
205 | child = (OLEListViewItem*) child->itemBelow(); | ||
206 | } | ||
207 | QString mes = i18n("Importing complete.\n\n%1 items imported.").arg( importedItems); | ||
208 | KMessageBox::information(this,mes); | ||
209 | } | ||
210 | void KAImportOLdialog::readContactData( DWORD folder ) | ||
211 | { | ||
212 | |||
213 | LPDISPATCH dispItem = (LPDISPATCH)folder; | ||
214 | dispItem->AddRef(); | ||
215 | MAPIFolder mf(dispItem); | ||
216 | mf.m_lpDispatch->AddRef(); | ||
217 | _Items folderItems; | ||
218 | _variant_t indx((long)0); | ||
219 | LPDISPATCH itm; | ||
220 | int i; | ||
221 | folderItems = mf.GetItems(); | ||
222 | QProgressDialog bar( i18n("Importing contact data"),i18n("Abort"), folderItems.GetCount(),this); | ||
223 | bar.setCaption (i18n("Importing!") ); | ||
224 | int h = bar.sizeHint().height() ; | ||
225 | int w = 300; | ||
226 | int dw = QApplication::desktop()->width(); | ||
227 | int dh = QApplication::desktop()->height(); | ||
228 | //bar.setGeometry( (dw-w)/2, (dh - h )/2 ,w,h ); | ||
229 | bar.show(); | ||
230 | for(i=1; i <= folderItems.GetCount(); ++i) | ||
231 | { | ||
232 | qApp->processEvents(); | ||
233 | if ( ! bar.isVisible() ) | ||
234 | return ; | ||
235 | bar.setProgress( i ); | ||
236 | indx = (long)i; | ||
237 | itm = folderItems.Item(indx.Detach()); | ||
238 | _ContactItem * pItem = (_ContactItem *)&itm; | ||
239 | ol2kapiContact( pItem ); | ||
240 | itm->Release(); | ||
241 | } | ||
242 | } | ||
243 | void KAImportOLdialog::slotOk() | ||
244 | { | ||
245 | QDialog::accept(); | ||
246 | } | ||
247 | |||
248 | void KAImportOLdialog::ol2kapiContact( _ContactItem * aItem ) | ||
249 | { | ||
250 | KABC::Addressee addressee; | ||
251 | |||
252 | addressee.setUid( QString::fromUcs2(aItem->GetEntryID().GetBuffer())); | ||
253 | //GetLastModificationTime() | ||
254 | //addressee.setName( const QString &name ); | ||
255 | //addressee.setFormattedName( const QString &formattedName ); | ||
256 | addressee.setFamilyName( QString::fromUcs2(aItem->GetLastName().GetBuffer()) ); | ||
257 | addressee.setGivenName( QString::fromUcs2(aItem->GetFirstName().GetBuffer()) ); | ||
258 | addressee.setAdditionalName( QString::fromUcs2(aItem->GetMiddleName().GetBuffer()) ); | ||
259 | addressee.setPrefix(QString::fromUcs2(aItem->GetTitle().GetBuffer()) ); | ||
260 | addressee.setSuffix( QString::fromUcs2(aItem->GetSuffix().GetBuffer()) ); | ||
261 | addressee.setNickName( QString::fromUcs2(aItem->GetNickName().GetBuffer()) ); | ||
262 | QDateTime dtb = mDdate2Qdtr(aItem->GetBirthday()); | ||
263 | if ( dtb.isValid() ) | ||
264 | addressee.setBirthday( mDdate2Qdtr(aItem->GetBirthday())); | ||
265 | |||
266 | //QString::fromUcs2(aItem->.GetBuffer()) | ||
267 | //addressee.setMailer( const QString &mailer ); | ||
268 | //addressee.setTimeZone( const TimeZone &timeZone ); | ||
269 | //addressee.setGeo( const Geo &geo ); | ||
270 | //addressee.setTitle( QString::fromUcs2(aItem->GetJobTitle().GetBuffer()) );// titel is the prefix | ||
271 | addressee.setRole( QString::fromUcs2(aItem->GetJobTitle().GetBuffer()) ); | ||
272 | addressee.setOrganization( QString::fromUcs2(aItem->GetCompanyName().GetBuffer()).replace( QRegExp("\\r"), "") ); | ||
273 | QString notesStr = QString::fromUcs2(aItem->GetBody().GetBuffer()); | ||
274 | notesStr.replace( QRegExp("\\r"), ""); | ||
275 | |||
276 | addressee.setProductId( QString::fromUcs2(aItem->GetCustomerID().GetBuffer()) ); | ||
277 | //addressee.setRevision( const QDateTime &revision ); | ||
278 | // addressee.setSortString( const QString &sortString ); | ||
279 | addressee.setUrl( QString::fromUcs2(aItem->GetWebPage().GetBuffer()) ); | ||
280 | |||
281 | QString tempS; | ||
282 | tempS = QString::fromUcs2(aItem->GetNetMeetingAlias().GetBuffer())+" AT SERVER: " +QString::fromUcs2(aItem->GetNetMeetingServer().GetBuffer()); | ||
283 | if ( tempS.length() > 12 ) | ||
284 | addressee.insertCustom( "KADDRESSBOOK", "X-IMAddress", tempS ); | ||
285 | tempS = QString::fromUcs2(aItem->GetSpouse().GetBuffer()); | ||
286 | if ( !tempS.isEmpty() ) | ||
287 | addressee.insertCustom( "KADDRESSBOOK", "X-SpousesName", tempS ); | ||
288 | tempS = QString::fromUcs2(aItem->GetManagerName().GetBuffer()); | ||
289 | if ( !tempS.isEmpty() ) | ||
290 | addressee.insertCustom( "KADDRESSBOOK", "X-ManagersName", tempS ); | ||
291 | tempS = QString::fromUcs2(aItem->GetAssistantName().GetBuffer()); | ||
292 | if ( !tempS.isEmpty() ) | ||
293 | addressee.insertCustom( "KADDRESSBOOK", "X-AssistantsName", tempS ); | ||
294 | tempS = QString::fromUcs2(aItem->GetDepartment().GetBuffer()); | ||
295 | if ( !tempS.isEmpty() ) | ||
296 | addressee.insertCustom( "KADDRESSBOOK", "X-Department", tempS ); | ||
297 | tempS = QString::fromUcs2(aItem->GetOfficeLocation().GetBuffer()).replace( QRegExp("\\r"), ""); | ||
298 | if ( !tempS.isEmpty() ) | ||
299 | addressee.insertCustom( "KADDRESSBOOK", "X-Office",tempS ); | ||
300 | tempS = QString::fromUcs2(aItem->GetProfession().GetBuffer()); | ||
301 | if ( !tempS.isEmpty() ) | ||
302 | addressee.insertCustom( "KADDRESSBOOK", "X-Profession", tempS ); | ||
303 | dtb = mDdate2Qdtr(aItem->GetAnniversary()); | ||
304 | if (dtb.isValid() ) { | ||
305 | QString dt = KGlobal::locale()->formatDate( dtb.date() , true, KLocale::ISODate); | ||
306 | addressee.insertCustom( "KADDRESSBOOK", "X-Anniversary", dt); | ||
307 | } | ||
308 | int sec = aItem->GetSensitivity() ; | ||
309 | if ( sec > 1 )// mapping pers -> private | ||
310 | --sec; | ||
311 | addressee.setSecrecy( sec ); | ||
312 | //addressee.setLogo( const Picture &logo ); | ||
313 | //addressee.setPhoto( const Picture &photo ); | ||
314 | //addressee.setSound( const Sound &sound ); | ||
315 | //addressee.setAgent( const Agent &agent ); | ||
316 | QString cat = QString::fromUcs2( aItem->GetCategories().GetBuffer()).replace( QRegExp("\\r"), ""); | ||
317 | cat = cat.replace( QRegExp("; "), ";"); | ||
318 | addressee.setCategories( QStringList::split( ";", cat )); | ||
319 | |||
320 | QString phoneS; | ||
321 | |||
322 | phoneS = QString::fromUcs2( aItem->GetAssistantTelephoneNumber().GetBuffer()); | ||
323 | if ( ! phoneS.isEmpty()) | ||
324 | addressee.insertPhoneNumber( KABC::PhoneNumber(phoneS ,KABC::PhoneNumber::Work + KABC::PhoneNumber::Voice ) ); | ||
325 | phoneS = QString::fromUcs2( aItem->GetBusinessTelephoneNumber().GetBuffer()); | ||
326 | if ( ! phoneS.isEmpty()) | ||
327 | addressee.insertPhoneNumber( KABC::PhoneNumber(phoneS ,KABC::PhoneNumber::Work ) ); | ||
328 | phoneS = QString::fromUcs2( aItem->GetBusiness2TelephoneNumber().GetBuffer()); | ||
329 | if ( ! phoneS.isEmpty()) | ||
330 | addressee.insertPhoneNumber( KABC::PhoneNumber(phoneS ,KABC::PhoneNumber::Work ) ); | ||
331 | phoneS = QString::fromUcs2( aItem->GetBusinessFaxNumber().GetBuffer()); | ||
332 | if ( ! phoneS.isEmpty()) | ||
333 | addressee.insertPhoneNumber( KABC::PhoneNumber(phoneS ,KABC::PhoneNumber::Work + KABC::PhoneNumber::Fax ) ); | ||
334 | phoneS = QString::fromUcs2( aItem->GetCarTelephoneNumber().GetBuffer()); | ||
335 | if ( ! phoneS.isEmpty()) | ||
336 | addressee.insertPhoneNumber( KABC::PhoneNumber(phoneS ,KABC::PhoneNumber::Car ) ); | ||
337 | phoneS = QString::fromUcs2( aItem->GetHomeTelephoneNumber().GetBuffer()); | ||
338 | if ( ! phoneS.isEmpty()) | ||
339 | addressee.insertPhoneNumber( KABC::PhoneNumber(phoneS ,KABC::PhoneNumber::Home ) ); | ||
340 | phoneS = QString::fromUcs2( aItem->GetHome2TelephoneNumber().GetBuffer()); | ||
341 | if ( ! phoneS.isEmpty()) | ||
342 | addressee.insertPhoneNumber( KABC::PhoneNumber(phoneS ,KABC::PhoneNumber::Home ) ); | ||
343 | phoneS = QString::fromUcs2( aItem->GetHomeFaxNumber().GetBuffer()); | ||
344 | if ( ! phoneS.isEmpty()) | ||
345 | addressee.insertPhoneNumber( KABC::PhoneNumber(phoneS ,KABC::PhoneNumber::Home + KABC::PhoneNumber::Fax ) ); | ||
346 | phoneS = QString::fromUcs2( aItem->GetISDNNumber().GetBuffer()); | ||
347 | if ( ! phoneS.isEmpty()) | ||
348 | addressee.insertPhoneNumber( KABC::PhoneNumber(phoneS ,KABC::PhoneNumber::Isdn ) ); | ||
349 | phoneS = QString::fromUcs2( aItem->GetMobileTelephoneNumber().GetBuffer()); | ||
350 | if ( ! phoneS.isEmpty()) | ||
351 | addressee.insertPhoneNumber( KABC::PhoneNumber(phoneS ,KABC::PhoneNumber::Cell ) ); | ||
352 | phoneS = QString::fromUcs2( aItem->GetOtherFaxNumber().GetBuffer()); | ||
353 | if ( ! phoneS.isEmpty()) | ||
354 | addressee.insertPhoneNumber( KABC::PhoneNumber(phoneS ,KABC::PhoneNumber::Fax ) ); | ||
355 | phoneS = QString::fromUcs2( aItem->GetOtherTelephoneNumber().GetBuffer()); | ||
356 | if ( ! phoneS.isEmpty()) | ||
357 | addressee.insertPhoneNumber( KABC::PhoneNumber(phoneS ,KABC::PhoneNumber::Voice ) ); | ||
358 | phoneS = QString::fromUcs2( aItem->GetPagerNumber().GetBuffer()); | ||
359 | if ( ! phoneS.isEmpty()) | ||
360 | addressee.insertPhoneNumber( KABC::PhoneNumber(phoneS ,KABC::PhoneNumber::Pager ) ); | ||
361 | phoneS = QString::fromUcs2( aItem->GetPrimaryTelephoneNumber().GetBuffer()); | ||
362 | if ( ! phoneS.isEmpty()) | ||
363 | addressee.insertPhoneNumber( KABC::PhoneNumber(phoneS ,KABC::PhoneNumber::Pref ) ); | ||
364 | phoneS = QString::fromUcs2( aItem->GetTTYTDDTelephoneNumber().GetBuffer()); | ||
365 | if ( ! phoneS.isEmpty()) | ||
366 | addressee.insertPhoneNumber( KABC::PhoneNumber(phoneS ,KABC::PhoneNumber::Modem ) ); | ||
367 | phoneS = QString::fromUcs2( aItem->GetTelexNumber().GetBuffer()); | ||
368 | if ( ! phoneS.isEmpty()) | ||
369 | addressee.insertPhoneNumber( KABC::PhoneNumber(phoneS ,KABC::PhoneNumber::Fax + KABC::PhoneNumber::Bbs ) ); | ||
370 | phoneS = QString::fromUcs2( aItem->GetCompanyMainTelephoneNumber().GetBuffer()); | ||
371 | if ( ! phoneS.isEmpty()) | ||
372 | addressee.insertPhoneNumber( KABC::PhoneNumber(phoneS ,KABC::PhoneNumber::Work + KABC::PhoneNumber::Pref ) ); | ||
373 | phoneS = QString::fromUcs2( aItem->GetRadioTelephoneNumber().GetBuffer()); | ||
374 | if ( ! phoneS.isEmpty()) | ||
375 | addressee.insertPhoneNumber( KABC::PhoneNumber(phoneS ,KABC::PhoneNumber::Video ) ); | ||
376 | phoneS = QString::fromUcs2( aItem->GetCallbackTelephoneNumber().GetBuffer()); | ||
377 | if ( ! phoneS.isEmpty()) | ||
378 | addressee.insertPhoneNumber( KABC::PhoneNumber(phoneS ,KABC::PhoneNumber::Voice + KABC::PhoneNumber::Pref ) ); | ||
379 | |||
380 | bool preferred = true; | ||
381 | phoneS = QString::fromUcs2( aItem->GetEmail1Address().GetBuffer()); | ||
382 | if ( ! phoneS.isEmpty()) { | ||
383 | addressee.insertEmail(phoneS , preferred ); | ||
384 | preferred = false; | ||
385 | } | ||
386 | phoneS = QString::fromUcs2( aItem->GetEmail2Address().GetBuffer()); | ||
387 | if ( ! phoneS.isEmpty()) { | ||
388 | addressee.insertEmail(phoneS , preferred ); | ||
389 | preferred = false; | ||
390 | } | ||
391 | phoneS = QString::fromUcs2( aItem->GetEmail3Address().GetBuffer()); | ||
392 | if ( ! phoneS.isEmpty()) { | ||
393 | addressee.insertEmail(phoneS , preferred ); | ||
394 | preferred = false; | ||
395 | } | ||
396 | // is this the number of the preferred email? | ||
397 | //long GetSelectedMailingAddress();??? | ||
398 | |||
399 | KABC::Address addressHome; | ||
400 | KABC::Address* addressAdd = &addressHome; | ||
401 | bool insert = false; | ||
402 | phoneS = QString::fromUcs2( aItem->GetHomeAddressCountry().GetBuffer()); | ||
403 | phoneS.replace( QRegExp("\\r"), ""); | ||
404 | if ( ! phoneS.isEmpty()) { | ||
405 | addressAdd->setCountry(phoneS ); | ||
406 | insert = true; | ||
407 | } | ||
408 | phoneS = QString::fromUcs2( aItem->GetHomeAddressState().GetBuffer()); | ||
409 | phoneS.replace( QRegExp("\\r"), ""); | ||
410 | if ( ! phoneS.isEmpty()) { | ||
411 | addressAdd->setRegion(phoneS ); | ||
412 | insert = true; | ||
413 | } | ||
414 | phoneS = QString::fromUcs2( aItem->GetHomeAddressCity().GetBuffer()); | ||
415 | phoneS.replace( QRegExp("\\r"), ""); | ||
416 | if ( ! phoneS.isEmpty()) { | ||
417 | addressAdd->setLocality(phoneS ); | ||
418 | insert = true; | ||
419 | } | ||
420 | phoneS = QString::fromUcs2( aItem->GetHomeAddressPostalCode().GetBuffer()); | ||
421 | phoneS.replace( QRegExp("\\r"), ""); | ||
422 | if ( ! phoneS.isEmpty()) { | ||
423 | addressAdd->setPostalCode(phoneS ); | ||
424 | insert = true; | ||
425 | } | ||
426 | phoneS = QString::fromUcs2( aItem->GetHomeAddressPostOfficeBox().GetBuffer()); | ||
427 | phoneS.replace( QRegExp("\\r"), ""); | ||
428 | if ( ! phoneS.isEmpty()) { | ||
429 | addressAdd->setPostOfficeBox(phoneS ); | ||
430 | insert = true; | ||
431 | } | ||
432 | phoneS = QString::fromUcs2( aItem->GetHomeAddressStreet().GetBuffer()); | ||
433 | phoneS.replace( QRegExp("\\r"), ""); | ||
434 | if ( ! phoneS.isEmpty()) { | ||
435 | addressAdd->setStreet(phoneS ); | ||
436 | insert = true; | ||
437 | } | ||
438 | phoneS = QString::fromUcs2( aItem->GetHomeAddress().GetBuffer()); | ||
439 | phoneS.replace( QRegExp("\\r"), ""); | ||
440 | if ( ! phoneS.isEmpty()) { | ||
441 | // redundant !addressAdd->setExtended(phoneS ); | ||
442 | // insert = true; | ||
443 | } | ||
444 | addressAdd->setType( KABC::Address::Home ); | ||
445 | if ( insert ) | ||
446 | addressee.insertAddress( *addressAdd ); | ||
447 | // ++++++++++++++++++++++ end of address | ||
448 | |||
449 | KABC::Address addressWork; | ||
450 | addressAdd = &addressWork; | ||
451 | insert = false; | ||
452 | phoneS = QString::fromUcs2( aItem->GetBusinessAddressCountry().GetBuffer()); | ||
453 | phoneS.replace( QRegExp("\\r"), ""); | ||
454 | if ( ! phoneS.isEmpty()) { | ||
455 | addressAdd->setCountry(phoneS ); | ||
456 | insert = true; | ||
457 | } | ||
458 | phoneS = QString::fromUcs2( aItem->GetBusinessAddressState().GetBuffer()); | ||
459 | phoneS.replace( QRegExp("\\r"), ""); | ||
460 | if ( ! phoneS.isEmpty()) { | ||
461 | addressAdd->setRegion(phoneS ); | ||
462 | insert = true; | ||
463 | } | ||
464 | phoneS = QString::fromUcs2( aItem->GetBusinessAddressCity().GetBuffer()); | ||
465 | phoneS.replace( QRegExp("\\r"), ""); | ||
466 | if ( ! phoneS.isEmpty()) { | ||
467 | addressAdd->setLocality(phoneS ); | ||
468 | insert = true; | ||
469 | } | ||
470 | phoneS = QString::fromUcs2( aItem->GetBusinessAddressPostalCode().GetBuffer()); | ||
471 | phoneS.replace( QRegExp("\\r"), ""); | ||
472 | if ( ! phoneS.isEmpty()) { | ||
473 | addressAdd->setPostalCode(phoneS ); | ||
474 | insert = true; | ||
475 | } | ||
476 | phoneS = QString::fromUcs2( aItem->GetBusinessAddressPostOfficeBox().GetBuffer()); | ||
477 | phoneS.replace( QRegExp("\\r"), ""); | ||
478 | if ( ! phoneS.isEmpty()) { | ||
479 | addressAdd->setPostOfficeBox(phoneS ); | ||
480 | insert = true; | ||
481 | } | ||
482 | phoneS = QString::fromUcs2( aItem->GetBusinessAddressStreet().GetBuffer()); | ||
483 | phoneS.replace( QRegExp("\\r"), ""); | ||
484 | if ( ! phoneS.isEmpty()) { | ||
485 | addressAdd->setStreet(phoneS ); | ||
486 | insert = true; | ||
487 | } | ||
488 | phoneS = QString::fromUcs2( aItem->GetBusinessAddress().GetBuffer()); | ||
489 | phoneS.replace( QRegExp("\\r"), ""); | ||
490 | if ( ! phoneS.isEmpty()) { | ||
491 | // redundant !addressAdd->setExtended(phoneS ); | ||
492 | // insert = true; | ||
493 | } | ||
494 | addressAdd->setType( KABC::Address::Work ); | ||
495 | if ( insert ) | ||
496 | addressee.insertAddress( *addressAdd ); | ||
497 | // ++++++++++++++++++++++ end of address | ||
498 | |||
499 | KABC::Address addressOther; | ||
500 | addressAdd = &addressOther; | ||
501 | insert = false; | ||
502 | phoneS = QString::fromUcs2( aItem->GetOtherAddressCountry().GetBuffer()); | ||
503 | phoneS.replace( QRegExp("\\r"), ""); | ||
504 | if ( ! phoneS.isEmpty()) { | ||
505 | addressAdd->setCountry(phoneS ); | ||
506 | insert = true; | ||
507 | } | ||
508 | phoneS = QString::fromUcs2( aItem->GetOtherAddressState().GetBuffer()); | ||
509 | phoneS.replace( QRegExp("\\r"), ""); | ||
510 | if ( ! phoneS.isEmpty()) { | ||
511 | addressAdd->setRegion(phoneS ); | ||
512 | insert = true; | ||
513 | } | ||
514 | phoneS = QString::fromUcs2( aItem->GetOtherAddressCity().GetBuffer()); | ||
515 | phoneS.replace( QRegExp("\\r"), ""); | ||
516 | if ( ! phoneS.isEmpty()) { | ||
517 | addressAdd->setLocality(phoneS ); | ||
518 | insert = true; | ||
519 | } | ||
520 | phoneS = QString::fromUcs2( aItem->GetOtherAddressPostalCode().GetBuffer()); | ||
521 | phoneS.replace( QRegExp("\\r"), ""); | ||
522 | if ( ! phoneS.isEmpty()) { | ||
523 | addressAdd->setPostalCode(phoneS ); | ||
524 | insert = true; | ||
525 | } | ||
526 | phoneS = QString::fromUcs2( aItem->GetOtherAddressPostOfficeBox().GetBuffer()); | ||
527 | phoneS.replace( QRegExp("\\r"), ""); | ||
528 | if ( ! phoneS.isEmpty()) { | ||
529 | addressAdd->setPostOfficeBox(phoneS ); | ||
530 | insert = true; | ||
531 | } | ||
532 | phoneS = QString::fromUcs2( aItem->GetOtherAddressStreet().GetBuffer()); | ||
533 | phoneS.replace( QRegExp("\\r"), ""); | ||
534 | if ( ! phoneS.isEmpty()) { | ||
535 | addressAdd->setStreet(phoneS ); | ||
536 | insert = true; | ||
537 | } | ||
538 | phoneS = QString::fromUcs2( aItem->GetOtherAddress().GetBuffer()); | ||
539 | if ( ! phoneS.isEmpty()) { | ||
540 | // redundant !addressAdd->setExtended(phoneS ); | ||
541 | //insert = true; | ||
542 | } | ||
543 | //addressAdd->setId( ); | ||
544 | if ( insert ) | ||
545 | addressee.insertAddress( *addressAdd ); | ||
546 | // ++++++++++++++++++++++ end of address | ||
547 | KABC::Address addressMail; | ||
548 | addressAdd = &addressMail; | ||
549 | insert = false; | ||
550 | phoneS = QString::fromUcs2( aItem->GetMailingAddressCountry().GetBuffer()); | ||
551 | phoneS.replace( QRegExp("\\r"), ""); | ||
552 | if ( ! phoneS.isEmpty()) { | ||
553 | addressAdd->setCountry(phoneS ); | ||
554 | insert = true; | ||
555 | } | ||
556 | phoneS = QString::fromUcs2( aItem->GetMailingAddressState().GetBuffer()); | ||
557 | phoneS.replace( QRegExp("\\r"), ""); | ||
558 | if ( ! phoneS.isEmpty()) { | ||
559 | addressAdd->setRegion(phoneS ); | ||
560 | insert = true; | ||
561 | } | ||
562 | phoneS = QString::fromUcs2( aItem->GetMailingAddressCity().GetBuffer()); | ||
563 | phoneS.replace( QRegExp("\\r"), ""); | ||
564 | if ( ! phoneS.isEmpty()) { | ||
565 | addressAdd->setLocality(phoneS ); | ||
566 | insert = true; | ||
567 | } | ||
568 | phoneS = QString::fromUcs2( aItem->GetMailingAddressPostalCode().GetBuffer()); | ||
569 | phoneS.replace( QRegExp("\\r"), ""); | ||
570 | if ( ! phoneS.isEmpty()) { | ||
571 | addressAdd->setPostalCode(phoneS ); | ||
572 | insert = true; | ||
573 | } | ||
574 | phoneS = QString::fromUcs2( aItem->GetMailingAddressPostOfficeBox().GetBuffer()); | ||
575 | phoneS.replace( QRegExp("\\r"), ""); | ||
576 | if ( ! phoneS.isEmpty()) { | ||
577 | addressAdd->setPostOfficeBox(phoneS ); | ||
578 | insert = true; | ||
579 | } | ||
580 | phoneS = QString::fromUcs2( aItem->GetMailingAddressStreet().GetBuffer()); | ||
581 | phoneS.replace( QRegExp("\\r"), ""); | ||
582 | if ( ! phoneS.isEmpty()) { | ||
583 | addressAdd->setStreet(phoneS ); | ||
584 | insert = true; | ||
585 | } | ||
586 | phoneS = QString::fromUcs2( aItem->GetMailingAddress().GetBuffer()); | ||
587 | phoneS.replace( QRegExp("\\r"), ""); | ||
588 | if ( ! phoneS.isEmpty()) { | ||
589 | // redundant ! addressAdd->setExtended(phoneS ); | ||
590 | // insert = true; | ||
591 | } | ||
592 | addressAdd->setType( KABC::Address::Postal ); | ||
593 | if ( insert ) { | ||
594 | addressee.insertAddress( *addressAdd ); | ||
595 | } | ||
596 | // the following code is disabled | ||
597 | // it does not seem to be useful | ||
598 | #if 0 | ||
599 | if ( insert ) { | ||
600 | addressAdd->setType( KABC::Address::Home ); | ||
601 | if ( addressMail == addressHome ) { | ||
602 | addressHome.setType( KABC::Address::Postal+ KABC::Address::Home ); | ||
603 | addressee.insertAddress( addressHome ); | ||
604 | } else { | ||
605 | addressAdd->setType( KABC::Address::Work ); | ||
606 | if ( addressMail == addressWork ){ | ||
607 | addressWork.setType( KABC::Address::Postal+ KABC::Address::Work ); | ||
608 | addressee.insertAddress( addressWork ); | ||
609 | |||
610 | } else { | ||
611 | addressAdd->setType( 0 ); | ||
612 | if ( addressOther == addressMail ){ | ||
613 | addressOther.setType( KABC::Address::Postal ); | ||
614 | addressee.insertAddress( addressOther ); | ||
615 | } else { | ||
616 | addressee.insertAddress( *addressAdd ); | ||
617 | } | ||
618 | } | ||
619 | } | ||
620 | } | ||
621 | #endif | ||
622 | // ++++++++++++++++++++++ end of ALL addresses | ||
623 | //GetUserProperties(); | ||
624 | tempS = QString::fromUcs2(aItem->GetInternetFreeBusyAddress().GetBuffer()); | ||
625 | phoneS.replace( QRegExp("\\r"), ""); | ||
626 | if ( !tempS.isEmpty() ) | ||
627 | addressee.insertCustom( "KADDRESSBOOK", "X-FreeBusyUrl", tempS ); | ||
628 | tempS = QString::fromUcs2(aItem->GetChildren().GetBuffer()); | ||
629 | if ( !tempS.isEmpty() ) | ||
630 | addressee.insertCustom( "KADDRESSBOOK", "X-Children", tempS ); | ||
631 | int gen = aItem->GetGender(); | ||
632 | if ( gen != 0 ) { // 0 undef - 1 female - 2 male | ||
633 | if ( gen == 1 ) | ||
634 | addressee.insertCustom( "KADDRESSBOOK", "X-Gender", "female" ); | ||
635 | else | ||
636 | addressee.insertCustom( "KADDRESSBOOK", "X-Gender", "male" ); | ||
637 | } | ||
638 | QString additionalInfo; | ||
639 | QString tempAdd; | ||
640 | tempAdd = QString::fromUcs2(aItem->GetLanguage().GetBuffer()); | ||
641 | if ( ! tempAdd.isEmpty() ) { | ||
642 | additionalInfo += i18n("\nLanguage: "); | ||
643 | additionalInfo += tempAdd; | ||
644 | } | ||
645 | tempAdd = QString::fromUcs2(aItem->GetHobby().GetBuffer()); | ||
646 | phoneS.replace( QRegExp("\\r"), ""); | ||
647 | if ( ! tempAdd.isEmpty() ) { | ||
648 | additionalInfo += i18n("\nHobby: "); | ||
649 | additionalInfo += tempAdd;; | ||
650 | } | ||
651 | tempAdd =QString::fromUcs2(aItem->GetPersonalHomePage().GetBuffer()); | ||
652 | phoneS.replace( QRegExp("\\r"), ""); | ||
653 | if ( ! tempAdd.isEmpty() ) { | ||
654 | additionalInfo += i18n("\nHomepage: "); | ||
655 | additionalInfo += tempAdd;; | ||
656 | } | ||
657 | tempAdd = QString::fromUcs2(aItem->GetBillingInformation().GetBuffer()); | ||
658 | phoneS.replace( QRegExp("\\r"), ""); | ||
659 | if ( ! tempAdd.isEmpty() ) { | ||
660 | additionalInfo += i18n("\nBilling information: "); | ||
661 | additionalInfo += tempAdd;; | ||
662 | } | ||
663 | tempAdd = QString::fromUcs2(aItem->GetCustomerID().GetBuffer()); | ||
664 | phoneS.replace( QRegExp("\\r"), ""); | ||
665 | if ( ! tempAdd.isEmpty() ) { | ||
666 | additionalInfo += i18n("\nCustomer ID: "); | ||
667 | additionalInfo += tempAdd;; | ||
668 | } | ||
669 | tempAdd = QString::fromUcs2(aItem->GetUser1().GetBuffer()); | ||
670 | phoneS.replace( QRegExp("\\r"), ""); | ||
671 | if ( ! tempAdd.isEmpty() ) { | ||
672 | additionalInfo += i18n("\nUser1: "); | ||
673 | additionalInfo += tempAdd;; | ||
674 | } | ||
675 | tempAdd = QString::fromUcs2(aItem->GetUser2().GetBuffer()); | ||
676 | phoneS.replace( QRegExp("\\r"), ""); | ||
677 | if ( ! tempAdd.isEmpty() ) { | ||
678 | additionalInfo += i18n("\nUser2: "); | ||
679 | additionalInfo += tempAdd;; | ||
680 | } | ||
681 | tempAdd = QString::fromUcs2(aItem->GetUser3().GetBuffer()); | ||
682 | phoneS.replace( QRegExp("\\r"), ""); | ||
683 | if ( ! tempAdd.isEmpty() ) { | ||
684 | additionalInfo += i18n("\nUser3: "); | ||
685 | additionalInfo += tempAdd;; | ||
686 | } | ||
687 | tempAdd = QString::fromUcs2(aItem->GetUser4().GetBuffer()); | ||
688 | phoneS.replace( QRegExp("\\r"), ""); | ||
689 | if ( ! tempAdd.isEmpty() ) { | ||
690 | additionalInfo += i18n("\nUser4: "); | ||
691 | additionalInfo += tempAdd;; | ||
692 | } | ||
693 | if (!additionalInfo.isEmpty() ) { | ||
694 | tempAdd = notesStr; | ||
695 | notesStr = "+++++++++++++++++++++++++++\n"; | ||
696 | notesStr += i18n("Additonal fields created\nby KA/Pi Outlook import:"); | ||
697 | notesStr += additionalInfo; | ||
698 | notesStr += i18n("\nEnd additonal fields created\nby KA/Pi Outlook import!\n"); | ||
699 | notesStr += "+++++++++++++++++++++++++++\n"; | ||
700 | notesStr += tempAdd; | ||
701 | } | ||
702 | addressee.setNote( notesStr ); | ||
703 | #if 0 | ||
704 | // pending | ||
705 | - IM address: no clue where to get info about the helper ID | ||
706 | -custom fields: difficult to implement - not implemented | ||
707 | -keys: makes no sense | ||
708 | #endif | ||
709 | |||
710 | if ( addAddressee( addressee )) | ||
711 | ++importedItems; | ||
712 | } | ||
713 | void KAImportOLdialog::slotCancel() | ||
714 | { | ||
715 | reject(); | ||
716 | } | ||
717 | |||
718 | bool KAImportOLdialog::addAddressee( KABC::Addressee a ) | ||
719 | { | ||
720 | bool add = true; | ||
721 | KABC::Addressee::List::Iterator it; | ||
722 | for ( it = mAList.begin(); it != mAList.end(); ++it ) { | ||
723 | if ( (*it).uid() == a.uid() ) { | ||
724 | add = false; | ||
725 | break; | ||
726 | } | ||
727 | } | ||
728 | if ( add ) { | ||
729 | if ( mABook->findByUid(a.uid() ).isEmpty()) | ||
730 | mAList.append ( a ); | ||
731 | else | ||
732 | add = false; | ||
733 | } | ||
734 | return add; | ||
735 | } | ||
diff --git a/kaddressbook/kaimportoldialog.h b/kaddressbook/kaimportoldialog.h index 41ea5f8..278935b 100644 --- a/kaddressbook/kaimportoldialog.h +++ b/kaddressbook/kaimportoldialog.h | |||
@@ -21,65 +21,2 @@ | |||
21 | without including the source code for Qt in the source distribution. | 21 | without including the source code for Qt in the source distribution. |
22 | */ | 22 | */ |
23 | #ifndef KOINCIDENCEEDITOR_H | ||
24 | #define KOINCIDENCEEDITOR_H | ||
25 | |||
26 | #include <kdialogbase.h> | ||
27 | |||
28 | #include <afxdisp.h> | ||
29 | |||
30 | #include <kabc/addressee.h> | ||
31 | #include <kabc/addressbook.h> | ||
32 | |||
33 | class QDateTime; | ||
34 | class QListView; | ||
35 | class OLEListViewItem; | ||
36 | class _ContactItem; | ||
37 | |||
38 | |||
39 | //using namespace KABC; | ||
40 | //class KABC::AddressBook; | ||
41 | |||
42 | /** | ||
43 | This is the base class for the calendar component editors. | ||
44 | */ | ||
45 | class KAImportOLdialog : public KDialogBase | ||
46 | { | ||
47 | Q_OBJECT | ||
48 | public: | ||
49 | /** | ||
50 | Construct new IncidenceEditor. | ||
51 | */ | ||
52 | KAImportOLdialog( const QString &caption, KABC::AddressBook * aBook, | ||
53 | QWidget *parent ); | ||
54 | ~KAImportOLdialog(); | ||
55 | |||
56 | /** Initialize editor. This function creates the tab widgets. */ | ||
57 | void init(); | ||
58 | KABC::Addressee::List getAddressList(); | ||
59 | public slots: | ||
60 | |||
61 | |||
62 | signals: | ||
63 | |||
64 | protected slots: | ||
65 | void slotApply(); | ||
66 | void slotOk(); | ||
67 | void slotCancel(); | ||
68 | |||
69 | protected: | ||
70 | void setupFolderView(); | ||
71 | void addFolder(OLEListViewItem* iParent, LPDISPATCH dispParent); | ||
72 | void readContactData( DWORD folder ); | ||
73 | void ol2kapiContact( _ContactItem * ); | ||
74 | |||
75 | KABC::AddressBook * mABook; | ||
76 | QListView * mListView; | ||
77 | KABC::Addressee::List mAList; | ||
78 | bool addAddressee( KABC::Addressee a ); | ||
79 | private: | ||
80 | int importedItems; | ||
81 | }; | ||
82 | |||
83 | #endif | ||
84 | |||
85 | |||
diff --git a/kaddressbook/phoneeditwidget.cpp b/kaddressbook/phoneeditwidget.cpp index 5639aa2..df3b551 100644 --- a/kaddressbook/phoneeditwidget.cpp +++ b/kaddressbook/phoneeditwidget.cpp | |||
@@ -41,4 +41,5 @@ | |||
41 | #include <qapplication.h> | 41 | #include <qapplication.h> |
42 | #include <kconfig.h> | 42 | #include <kconfig.h> |
43 | #include <kmessagebox.h> | ||
43 | #include <klineedit.h> | 44 | #include <klineedit.h> |
44 | #include <kcombobox.h> | 45 | #include <kcombobox.h> |
@@ -113,9 +114,11 @@ void PhoneEditWidget::setDefaults() | |||
113 | edit->setPhoneNumber( phoneNumber ); | 114 | edit->setPhoneNumber( phoneNumber ); |
114 | edit = appendEditCombo(); | 115 | edit = appendEditCombo(); |
115 | phoneNumber.setType( KABC::PhoneNumber::Work | KABC::PhoneNumber::Pref ); | 116 | KABC::PhoneNumber phoneNumber2; |
116 | edit->setPhoneNumber( phoneNumber ); | 117 | phoneNumber2.setType( KABC::PhoneNumber::Work | KABC::PhoneNumber::Pref ); |
118 | edit->setPhoneNumber( phoneNumber2 ); | ||
117 | edit = appendEditCombo(); | 119 | edit = appendEditCombo(); |
118 | phoneNumber.setType( KABC::PhoneNumber::Cell ); | 120 | KABC::PhoneNumber phoneNumber3; |
119 | edit->setPhoneNumber( phoneNumber ); | 121 | phoneNumber3.setType( KABC::PhoneNumber::Cell ); |
122 | edit->setPhoneNumber( phoneNumber3 ); | ||
120 | 123 | ||
121 | } | 124 | } |
diff --git a/korganizer/journalentry.h b/korganizer/journalentry.h index a69846c..ee17da8 100644 --- a/korganizer/journalentry.h +++ b/korganizer/journalentry.h | |||
@@ -57,4 +57,5 @@ class JournalEntry : public QFrame { | |||
57 | void fillCalendar( int id = 0 ); | 57 | void fillCalendar( int id = 0 ); |
58 | void resizeEvent(QResizeEvent* e ) ; | 58 | void resizeEvent(QResizeEvent* e ) ; |
59 | KTextEdit * editor() {return mEditor;}; | ||
59 | protected slots: | 60 | protected slots: |
60 | void slotSaveTemplate(); | 61 | void slotSaveTemplate(); |
diff --git a/korganizer/kojournalview.cpp b/korganizer/kojournalview.cpp index a23a3b2..406df5a 100644 --- a/korganizer/kojournalview.cpp +++ b/korganizer/kojournalview.cpp | |||
@@ -38,4 +38,5 @@ | |||
38 | #include "koprefs.h" | 38 | #include "koprefs.h" |
39 | #include <kglobal.h> | 39 | #include <kglobal.h> |
40 | #include <ktextedit.h> | ||
40 | 41 | ||
41 | #include <libkcal/calendar.h> | 42 | #include <libkcal/calendar.h> |
@@ -178,4 +179,5 @@ void KOJournalView::showList(QPtrList<Journal> jl) | |||
178 | int count = jl.count(); | 179 | int count = jl.count(); |
179 | int iii = 0; | 180 | int iii = 0; |
181 | QWidget* fw = qApp->focusWidget (); | ||
180 | while ( iii < count ) { | 182 | while ( iii < count ) { |
181 | if ( !mEntry ) { | 183 | if ( !mEntry ) { |
@@ -188,4 +190,8 @@ void KOJournalView::showList(QPtrList<Journal> jl) | |||
188 | mEntry = 0; | 190 | mEntry = 0; |
189 | } else { | 191 | } else { |
192 | int xxx = -1, yyy = -1; | ||
193 | if ( ((QWidget*) mEntry->editor() ) == fw ) { | ||
194 | mEntry->editor()->getCursorPosition( &xxx,&yyy); | ||
195 | } | ||
190 | mEntry->setVisibleMode( true ); | 196 | mEntry->setVisibleMode( true ); |
191 | mEntry->setDate(mDate); | 197 | mEntry->setDate(mDate); |
@@ -193,4 +199,7 @@ void KOJournalView::showList(QPtrList<Journal> jl) | |||
193 | mEntry->setVisibleMode( true ); | 199 | mEntry->setVisibleMode( true ); |
194 | mEntry->show(); | 200 | mEntry->show(); |
201 | if ( xxx > -1 && yyy > -1 ) { | ||
202 | mEntry->editor()->setCursorPosition( xxx, yyy ); | ||
203 | } | ||
195 | mEntry = jEntries.next(); | 204 | mEntry = jEntries.next(); |
196 | } | 205 | } |
diff --git a/libkdepim/externalapphandler.cpp b/libkdepim/externalapphandler.cpp index 59be506..f376e6c 100644 --- a/libkdepim/externalapphandler.cpp +++ b/libkdepim/externalapphandler.cpp | |||
@@ -848,4 +848,6 @@ bool ExternalAppHandler::mailToOneContact( const QString& name, const QString& e | |||
848 | } | 848 | } |
849 | parameters = translateMessage(parameters, name, emailadress); | 849 | parameters = translateMessage(parameters, name, emailadress); |
850 | |||
851 | //KMessageBox::information(0,parameters); | ||
850 | proc->addArgument( parameters ); | 852 | proc->addArgument( parameters ); |
851 | proc->launch(""); | 853 | proc->launch(""); |
diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp index b7929ec..5708dfc 100644 --- a/libkdepim/ksyncmanager.cpp +++ b/libkdepim/ksyncmanager.cpp | |||
@@ -113,5 +113,5 @@ void KSyncManager::fillSyncMenu() | |||
113 | #ifdef DESKTOP_VERSION | 113 | #ifdef DESKTOP_VERSION |
114 | #ifdef _WIN32_ | 114 | #ifdef _WIN32_ |
115 | externalName = "OutLook(not_implemented)"; | 115 | externalName = "OutLook"; |
116 | #else | 116 | #else |
117 | externalName = "KDE_Desktop"; | 117 | externalName = "KDE_Desktop"; |
@@ -144,5 +144,5 @@ void KSyncManager::fillSyncMenu() | |||
144 | #ifdef DESKTOP_VERSION | 144 | #ifdef DESKTOP_VERSION |
145 | #ifdef _WIN32_ | 145 | #ifdef _WIN32_ |
146 | insertText = "OutLook(not_implemented)"; | 146 | insertText = "OutLook"; |
147 | #else | 147 | #else |
148 | insertText = "KDE_Desktop"; | 148 | insertText = "KDE_Desktop"; |
@@ -935,6 +935,72 @@ void KSyncManager::confSync() | |||
935 | QTimer::singleShot ( 1, this, SLOT ( fillSyncMenu() ) ); | 935 | QTimer::singleShot ( 1, this, SLOT ( fillSyncMenu() ) ); |
936 | } | 936 | } |
937 | void KSyncManager::syncOL() | ||
938 | { | ||
939 | mSyncWithDesktop = true; | ||
940 | emit save(); | ||
941 | switch(mTargetApp) | ||
942 | { | ||
943 | case (KAPI): | ||
944 | { | ||
945 | syncExternalApplication("ol"); | ||
946 | } | ||
947 | break; | ||
948 | case (KOPI): | ||
949 | { | ||
950 | #ifdef DESKTOP_VERSION | ||
951 | QString command = "kdecaldump33"; | ||
952 | QString commandfile = "kdecaldump33"; | ||
953 | QString commandpath = qApp->applicationDirPath () + "/"; | ||
954 | #else | ||
955 | QString command = "kdecaldump33"; | ||
956 | QString commandfile = "kdecaldump33"; | ||
957 | QString commandpath = QDir::homeDirPath ()+"/"; | ||
958 | #endif | ||
959 | if ( ! QFile::exists ( commandpath+commandfile ) ) | ||
960 | command = commandfile; | ||
961 | else | ||
962 | command = commandpath+commandfile; | ||
963 | |||
964 | QString fileName = QDir::homeDirPath ()+"/.kdecalendardump.ics"; | ||
965 | int result = system ( command.latin1()); | ||
966 | qDebug("Cal dump 33 command call result result: %d ", result); | ||
967 | if ( result != 0 ) { | ||
968 | qDebug("Calling CAL dump version 33 failed. Trying 34... "); | ||
969 | commandfile = "kdecaldump34"; | ||
970 | if ( ! QFile::exists ( commandpath+commandfile ) ) | ||
971 | command = commandfile; | ||
972 | else | ||
973 | command = commandpath+commandfile; | ||
974 | result = system ( command.latin1()); | ||
975 | qDebug("Cal dump 34 command call result result: %d ", result); | ||
976 | if ( result != 0 ) { | ||
977 | KMessageBox::error( 0, i18n("Error accessing KDE calendar data.\nMake sure the file\n%1kdecaldump3x\nexists ( x = 3 or 4 ).\nSupported KDE versions are 3.3 and 3.4.\nUsed version should be auto detected.\n").arg( commandpath )); | ||
978 | return; | ||
979 | } | ||
980 | } | ||
981 | if ( syncWithFile( fileName,true ) ) { | ||
982 | if ( mWriteBackFile ) { | ||
983 | command += " --read"; | ||
984 | system ( command.latin1()); | ||
985 | } | ||
986 | } | ||
987 | |||
988 | } | ||
989 | break; | ||
990 | case (PWMPI): | ||
991 | |||
992 | break; | ||
993 | default: | ||
994 | qDebug("KSM::slotSyncMenu: invalid apptype selected"); | ||
995 | break; | ||
996 | |||
997 | } | ||
998 | } | ||
937 | void KSyncManager::syncKDE() | 999 | void KSyncManager::syncKDE() |
938 | { | 1000 | { |
1001 | #ifdef _WIN32_ | ||
1002 | syncOL(); | ||
1003 | #else | ||
1004 | |||
939 | mSyncWithDesktop = true; | 1005 | mSyncWithDesktop = true; |
940 | emit save(); | 1006 | emit save(); |
@@ -1033,4 +1099,5 @@ void KSyncManager::syncKDE() | |||
1033 | 1099 | ||
1034 | } | 1100 | } |
1101 | #endif | ||
1035 | } | 1102 | } |
1036 | 1103 | ||
diff --git a/libkdepim/ksyncmanager.h b/libkdepim/ksyncmanager.h index 04cdade..71d17e9 100644 --- a/libkdepim/ksyncmanager.h +++ b/libkdepim/ksyncmanager.h | |||
@@ -204,4 +204,5 @@ class KSyncManager : public QObject | |||
204 | void syncSharp(); | 204 | void syncSharp(); |
205 | void syncKDE(); | 205 | void syncKDE(); |
206 | void syncOL(); | ||
206 | bool syncExternalApplication(QString); | 207 | bool syncExternalApplication(QString); |
207 | int mCurrentSyncProfile ; | 208 | int mCurrentSyncProfile ; |
@@ -242,6 +243,4 @@ class KSyncInterface | |||
242 | return false; | 243 | return false; |
243 | } | 244 | } |
244 | |||
245 | |||
246 | }; | 245 | }; |
247 | 246 | ||
diff --git a/libkdepim/libkdepim.pro b/libkdepim/libkdepim.pro index 84af7ad..7160d0e 100644 --- a/libkdepim/libkdepim.pro +++ b/libkdepim/libkdepim.pro | |||
@@ -59,3 +59,18 @@ SOURCES = \ | |||
59 | phoneaccess.cpp | 59 | phoneaccess.cpp |
60 | 60 | ||
61 | win32: { | ||
61 | 62 | ||
63 | #olimport section | ||
64 | importol { | ||
65 | debug: { | ||
66 | LIBS += mfc71ud.lib | ||
67 | } | ||
68 | release: { | ||
69 | LIBS += mfc71u.lib | ||
70 | } | ||
71 | DEFINES += _OL_IMPORT_ | ||
72 | HEADERS += ol_access.h | ||
73 | SOURCES += ol_access.cpp | ||
74 | #olimport section end | ||
75 | } | ||
76 | } | ||