-rw-r--r-- | kaddressbook/kabcore.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index 1074a62..c4382d6 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp | |||
@@ -343,96 +343,98 @@ void KABCore::receive( const QCString& cmsg, const QByteArray& data ) | |||
343 | QString fileName; | 343 | QString fileName; |
344 | stream >> fileName; | 344 | stream >> fileName; |
345 | recieve( fileName ); | 345 | recieve( fileName ); |
346 | return; | 346 | return; |
347 | } | 347 | } |
348 | } | 348 | } |
349 | void KABCore::toggleBeamReceive( ) | 349 | void KABCore::toggleBeamReceive( ) |
350 | { | 350 | { |
351 | if ( mBRdisabled ) | 351 | if ( mBRdisabled ) |
352 | return; | 352 | return; |
353 | #ifndef DESKTOP_VERSION | 353 | #ifndef DESKTOP_VERSION |
354 | if ( infrared ) { | 354 | if ( infrared ) { |
355 | qDebug("AB disable BeamReceive "); | 355 | qDebug("AB disable BeamReceive "); |
356 | delete infrared; | 356 | delete infrared; |
357 | infrared = 0; | 357 | infrared = 0; |
358 | mActionBR->setChecked(false); | 358 | mActionBR->setChecked(false); |
359 | return; | 359 | return; |
360 | } | 360 | } |
361 | qDebug("AB enable BeamReceive "); | 361 | qDebug("AB enable BeamReceive "); |
362 | mActionBR->setChecked(true); | 362 | mActionBR->setChecked(true); |
363 | 363 | ||
364 | infrared = new QCopChannel("QPE/Application/addressbook",this, "channelAB" ) ; | 364 | infrared = new QCopChannel("QPE/Application/addressbook",this, "channelAB" ) ; |
365 | QObject::connect( infrared, SIGNAL (received ( const QCString &, const QByteArray & )),this, SLOT(receive( const QCString&, const QByteArray& ))); | 365 | QObject::connect( infrared, SIGNAL (received ( const QCString &, const QByteArray & )),this, SLOT(receive( const QCString&, const QByteArray& ))); |
366 | #endif | 366 | #endif |
367 | } | 367 | } |
368 | 368 | ||
369 | 369 | ||
370 | void KABCore::disableBR(bool b) | 370 | void KABCore::disableBR(bool b) |
371 | { | 371 | { |
372 | #ifndef DESKTOP_VERSION | 372 | #ifndef DESKTOP_VERSION |
373 | if ( b ) { | 373 | if ( b ) { |
374 | if ( infrared ) { | 374 | if ( infrared ) { |
375 | toggleBeamReceive( ); | 375 | toggleBeamReceive( ); |
376 | } | 376 | } |
377 | mBRdisabled = true; | 377 | mBRdisabled = true; |
378 | } else { | 378 | } else { |
379 | if ( mBRdisabled ) { | 379 | if ( mBRdisabled ) { |
380 | mBRdisabled = false; | 380 | mBRdisabled = false; |
381 | //toggleBeamReceive( ); | 381 | //toggleBeamReceive( ); |
382 | } | 382 | } |
383 | } | 383 | } |
384 | #endif | 384 | #endif |
385 | 385 | ||
386 | } | 386 | } |
387 | void KABCore::recieve( QString fn ) | 387 | void KABCore::recieve( QString fn ) |
388 | { | 388 | { |
389 | //qDebug("KABCore::recieve "); | 389 | //qDebug("KABCore::recieve "); |
390 | int count = mAddressBook->importFromFile( fn, true ); | 390 | int count = mAddressBook->importFromFile( fn, true ); |
391 | if ( count ) | ||
392 | setModified( true ); | ||
391 | mViewManager->refreshView(); | 393 | mViewManager->refreshView(); |
392 | message(i18n("%1 contact(s) received!").arg( count )); | 394 | message(i18n("%1 contact(s) received!").arg( count )); |
393 | topLevelWidget()->showMaximized(); | 395 | topLevelWidget()->showMaximized(); |
394 | topLevelWidget()->raise(); | 396 | topLevelWidget()->raise(); |
395 | } | 397 | } |
396 | void KABCore::restoreSettings() | 398 | void KABCore::restoreSettings() |
397 | { | 399 | { |
398 | mMultipleViewsAtOnce = KABPrefs::instance()->mMultipleViewsAtOnce; | 400 | mMultipleViewsAtOnce = KABPrefs::instance()->mMultipleViewsAtOnce; |
399 | 401 | ||
400 | bool state; | 402 | bool state; |
401 | 403 | ||
402 | if (mMultipleViewsAtOnce) | 404 | if (mMultipleViewsAtOnce) |
403 | state = KABPrefs::instance()->mDetailsPageVisible; | 405 | state = KABPrefs::instance()->mDetailsPageVisible; |
404 | else | 406 | else |
405 | state = false; | 407 | state = false; |
406 | 408 | ||
407 | mActionDetails->setChecked( state ); | 409 | mActionDetails->setChecked( state ); |
408 | setDetailsVisible( state ); | 410 | setDetailsVisible( state ); |
409 | 411 | ||
410 | state = KABPrefs::instance()->mJumpButtonBarVisible; | 412 | state = KABPrefs::instance()->mJumpButtonBarVisible; |
411 | 413 | ||
412 | mActionJumpBar->setChecked( state ); | 414 | mActionJumpBar->setChecked( state ); |
413 | setJumpButtonBarVisible( state ); | 415 | setJumpButtonBarVisible( state ); |
414 | /*US | 416 | /*US |
415 | QValueList<int> splitterSize = KABPrefs::instance()->mDetailsSplitter; | 417 | QValueList<int> splitterSize = KABPrefs::instance()->mDetailsSplitter; |
416 | if ( splitterSize.count() == 0 ) { | 418 | if ( splitterSize.count() == 0 ) { |
417 | splitterSize.append( width() / 2 ); | 419 | splitterSize.append( width() / 2 ); |
418 | splitterSize.append( width() / 2 ); | 420 | splitterSize.append( width() / 2 ); |
419 | } | 421 | } |
420 | mMiniSplitter->setSizes( splitterSize ); | 422 | mMiniSplitter->setSizes( splitterSize ); |
421 | if ( mExtensionBarSplitter ) { | 423 | if ( mExtensionBarSplitter ) { |
422 | splitterSize = KABPrefs::instance()->mExtensionsSplitter; | 424 | splitterSize = KABPrefs::instance()->mExtensionsSplitter; |
423 | if ( splitterSize.count() == 0 ) { | 425 | if ( splitterSize.count() == 0 ) { |
424 | splitterSize.append( width() / 2 ); | 426 | splitterSize.append( width() / 2 ); |
425 | splitterSize.append( width() / 2 ); | 427 | splitterSize.append( width() / 2 ); |
426 | } | 428 | } |
427 | mExtensionBarSplitter->setSizes( splitterSize ); | 429 | mExtensionBarSplitter->setSizes( splitterSize ); |
428 | 430 | ||
429 | } | 431 | } |
430 | */ | 432 | */ |
431 | mViewManager->restoreSettings(); | 433 | mViewManager->restoreSettings(); |
432 | mIncSearchWidget->setCurrentItem( KABPrefs::instance()->mCurrentIncSearchField ); | 434 | mIncSearchWidget->setCurrentItem( KABPrefs::instance()->mCurrentIncSearchField ); |
433 | mExtensionManager->restoreSettings(); | 435 | mExtensionManager->restoreSettings(); |
434 | #ifdef DESKTOP_VERSION | 436 | #ifdef DESKTOP_VERSION |
435 | int wid = width(); | 437 | int wid = width(); |
436 | if ( wid < 10 ) | 438 | if ( wid < 10 ) |
437 | wid = 400; | 439 | wid = 400; |
438 | #else | 440 | #else |
@@ -2834,70 +2836,72 @@ bool KABCore::syncExternal(KSyncManager* manager, QString resource) | |||
2834 | mViewManager->refreshView(); | 2836 | mViewManager->refreshView(); |
2835 | disableBR( false ); | 2837 | disableBR( false ); |
2836 | return syncOK; | 2838 | return syncOK; |
2837 | 2839 | ||
2838 | } | 2840 | } |
2839 | void KABCore::message( QString m ) | 2841 | void KABCore::message( QString m ) |
2840 | { | 2842 | { |
2841 | topLevelWidget()->setCaption( m ); | 2843 | topLevelWidget()->setCaption( m ); |
2842 | mMessageTimer->start( 15000, true ); | 2844 | mMessageTimer->start( 15000, true ); |
2843 | } | 2845 | } |
2844 | bool KABCore::syncPhone() | 2846 | bool KABCore::syncPhone() |
2845 | { | 2847 | { |
2846 | QString mCurrentSyncDevice = syncManager->getCurrentSyncDevice(); | 2848 | QString mCurrentSyncDevice = syncManager->getCurrentSyncDevice(); |
2847 | QString fileName = getPhoneFile(); | 2849 | QString fileName = getPhoneFile(); |
2848 | if ( !PhoneAccess::readFromPhone( fileName) ) { | 2850 | if ( !PhoneAccess::readFromPhone( fileName) ) { |
2849 | message(i18n("Phone access failed!")); | 2851 | message(i18n("Phone access failed!")); |
2850 | return false; | 2852 | return false; |
2851 | } | 2853 | } |
2852 | AddressBook abLocal( fileName,"syncContact"); | 2854 | AddressBook abLocal( fileName,"syncContact"); |
2853 | bool syncOK = false; | 2855 | bool syncOK = false; |
2854 | { | 2856 | { |
2855 | abLocal.importFromFile( fileName ); | 2857 | abLocal.importFromFile( fileName ); |
2856 | qDebug("AB phone loaded ,sync device %s",mCurrentSyncDevice.latin1()); | 2858 | qDebug("AB phone loaded ,sync device %s",mCurrentSyncDevice.latin1()); |
2857 | mGlobalSyncMode = SYNC_MODE_EXTERNAL; | 2859 | mGlobalSyncMode = SYNC_MODE_EXTERNAL; |
2858 | abLocal.preparePhoneSync( mCurrentSyncDevice, true ); | 2860 | abLocal.preparePhoneSync( mCurrentSyncDevice, true ); |
2859 | abLocal.preExternSync( mAddressBook ,mCurrentSyncDevice, true ); | 2861 | abLocal.preExternSync( mAddressBook ,mCurrentSyncDevice, true ); |
2860 | syncOK = synchronizeAddressbooks( mAddressBook, &abLocal, syncManager->mSyncAlgoPrefs ); | 2862 | syncOK = synchronizeAddressbooks( mAddressBook, &abLocal, syncManager->mSyncAlgoPrefs ); |
2861 | if ( syncOK ) { | 2863 | if ( syncOK ) { |
2862 | if ( syncManager->mWriteBackFile ) { | 2864 | if ( syncManager->mWriteBackFile ) { |
2863 | abLocal.removeSyncAddressees( true ); | 2865 | abLocal.removeSyncAddressees( true ); |
2864 | abLocal.saveABphone( fileName ); | 2866 | abLocal.saveABphone( fileName ); |
2865 | abLocal.findNewExtIds( fileName, mCurrentSyncDevice ); | 2867 | abLocal.findNewExtIds( fileName, mCurrentSyncDevice ); |
2866 | //abLocal.preparePhoneSync( mCurrentSyncDevice, false ); | 2868 | //abLocal.preparePhoneSync( mCurrentSyncDevice, false ); |
2867 | abLocal.postExternSync( mAddressBook,mCurrentSyncDevice ); | 2869 | abLocal.postExternSync( mAddressBook,mCurrentSyncDevice ); |
2868 | } | 2870 | } |
2869 | } | 2871 | } |
2870 | setModified(); | 2872 | setModified(); |
2871 | } | 2873 | } |
2872 | if ( syncOK ) | 2874 | if ( syncOK ) |
2873 | mViewManager->refreshView(); | 2875 | mViewManager->refreshView(); |
2874 | return syncOK; | 2876 | return syncOK; |
2875 | } | 2877 | } |
2876 | void KABCore::getFile( bool success ) | 2878 | void KABCore::getFile( bool success ) |
2877 | { | 2879 | { |
2878 | if ( ! success ) { | 2880 | if ( ! success ) { |
2879 | message( i18n("Error receiving file. Nothing changed!") ); | 2881 | message( i18n("Error receiving file. Nothing changed!") ); |
2880 | return; | 2882 | return; |
2881 | } | 2883 | } |
2882 | mAddressBook->importFromFile( sentSyncFile() , false, true ); | 2884 | int count = mAddressBook->importFromFile( sentSyncFile() , false, true ); |
2885 | if ( count ) | ||
2886 | setModified( true ); | ||
2883 | message( i18n("Pi-Sync successful!") ); | 2887 | message( i18n("Pi-Sync successful!") ); |
2884 | mViewManager->refreshView(); | 2888 | mViewManager->refreshView(); |
2885 | } | 2889 | } |
2886 | void KABCore::syncFileRequest() | 2890 | void KABCore::syncFileRequest() |
2887 | { | 2891 | { |
2888 | mAddressBook->export2File( sentSyncFile() ); | 2892 | mAddressBook->export2File( sentSyncFile() ); |
2889 | } | 2893 | } |
2890 | QString KABCore::sentSyncFile() | 2894 | QString KABCore::sentSyncFile() |
2891 | { | 2895 | { |
2892 | #ifdef DESKTOP_VERSION | 2896 | #ifdef DESKTOP_VERSION |
2893 | return locateLocal( "tmp", "copysyncab.vcf" ); | 2897 | return locateLocal( "tmp", "copysyncab.vcf" ); |
2894 | #else | 2898 | #else |
2895 | return QString( "/tmp/copysyncab.vcf" ); | 2899 | return QString( "/tmp/copysyncab.vcf" ); |
2896 | #endif | 2900 | #endif |
2897 | } | 2901 | } |
2898 | 2902 | ||
2899 | void KABCore::setCaptionBack() | 2903 | void KABCore::setCaptionBack() |
2900 | { | 2904 | { |
2901 | mMessageTimer->stop(); | 2905 | mMessageTimer->stop(); |
2902 | topLevelWidget()->setCaption( i18n("KAddressbook/Pi") ); | 2906 | topLevelWidget()->setCaption( i18n("KAddressbook/Pi") ); |
2903 | } | 2907 | } |