-rw-r--r-- | libkdepim/ksyncmanager.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp index 17e6c75..9857e3e 100644 --- a/libkdepim/ksyncmanager.cpp +++ b/libkdepim/ksyncmanager.cpp | |||
@@ -459,83 +459,83 @@ bool KSyncManager::syncWithFile( QString fn , bool quick ) | |||
459 | int result = QMessageBox::warning( mParent, i18n("Warning!"), | 459 | int result = QMessageBox::warning( mParent, i18n("Warning!"), |
460 | mess ); | 460 | mess ); |
461 | return ret; | 461 | return ret; |
462 | } | 462 | } |
463 | int result = 0; | 463 | int result = 0; |
464 | if ( !quick ) { | 464 | if ( !quick ) { |
465 | mess = i18n("Sync with file \n...%1\nfrom:\n%2\n").arg(fn.right( 25)).arg(KGlobal::locale()->formatDateTime(info.lastModified (), true, false )); | 465 | mess = i18n("Sync with file \n...%1\nfrom:\n%2\n").arg(fn.right( 25)).arg(KGlobal::locale()->formatDateTime(info.lastModified (), true, false )); |
466 | result = QMessageBox::warning( mParent, i18n("Warning!"), | 466 | result = QMessageBox::warning( mParent, i18n("Warning!"), |
467 | mess, | 467 | mess, |
468 | i18n("Sync"), i18n("Cancel"), 0, | 468 | i18n("Sync"), i18n("Cancel"), 0, |
469 | 0, 1 ); | 469 | 0, 1 ); |
470 | if ( result ) | 470 | if ( result ) |
471 | return false; | 471 | return false; |
472 | } | 472 | } |
473 | if ( mAskForPreferences ) | 473 | if ( mAskForPreferences ) |
474 | if ( !edit_sync_options()) { | 474 | if ( !edit_sync_options()) { |
475 | mParent->topLevelWidget()->setCaption( i18n("Syncing aborted. Nothing synced.") ); | 475 | mParent->topLevelWidget()->setCaption( i18n("Syncing aborted. Nothing synced.") ); |
476 | return false; | 476 | return false; |
477 | } | 477 | } |
478 | if ( result == 0 ) { | 478 | if ( result == 0 ) { |
479 | //qDebug("Now sycing ... "); | 479 | //qDebug("Now sycing ... "); |
480 | if ( ret = mImplementation->sync( this, fn, mSyncAlgoPrefs ) ) | 480 | if ( ret = mImplementation->sync( this, fn, mSyncAlgoPrefs ) ) |
481 | mParent->topLevelWidget()->setCaption( i18n("Synchronization successful") ); | 481 | mParent->topLevelWidget()->setCaption( i18n("Synchronization successful") ); |
482 | else | 482 | else |
483 | mParent->topLevelWidget()->setCaption( i18n("Sync cancelled or failed. Nothing synced.") ); | 483 | mParent->topLevelWidget()->setCaption( i18n("Sync cancelled or failed.") ); |
484 | if ( ! quick ) | 484 | if ( ! quick ) |
485 | mPrefs->mLastSyncedLocalFile = fn; | 485 | mPrefs->mLastSyncedLocalFile = fn; |
486 | } | 486 | } |
487 | return ret; | 487 | return ret; |
488 | } | 488 | } |
489 | 489 | ||
490 | void KSyncManager::quickSyncLocalFile() | 490 | void KSyncManager::quickSyncLocalFile() |
491 | { | 491 | { |
492 | 492 | ||
493 | if ( syncWithFile( mPrefs->mLastSyncedLocalFile, true ) ) { | 493 | if ( syncWithFile( mPrefs->mLastSyncedLocalFile, true ) ) { |
494 | qDebug("quick syncLocalFile() successful "); | 494 | qDebug("quick syncLocalFile() successful "); |
495 | 495 | ||
496 | } | 496 | } |
497 | } | 497 | } |
498 | 498 | ||
499 | void KSyncManager::multiSync( bool askforPrefs ) | 499 | void KSyncManager::multiSync( bool askforPrefs ) |
500 | { | 500 | { |
501 | if (blockSave()) | 501 | if (blockSave()) |
502 | return; | 502 | return; |
503 | setBlockSave(true); | 503 | setBlockSave(true); |
504 | QString question = i18n("Do you really want\nto multiple sync\nwith all checked profiles?\nSyncing takes some\ntime - all profiles\nare synced twice!"); | 504 | QString question = i18n("Do you really want\nto multiple sync\nwith all checked profiles?\nSyncing takes some\ntime - all profiles\nare synced twice!"); |
505 | if ( QMessageBox::information( mParent, i18n("KDE-Pim Sync"), | 505 | if ( QMessageBox::information( mParent, i18n("KDE-Pim Sync"), |
506 | question, | 506 | question, |
507 | i18n("Yes"), i18n("No"), | 507 | i18n("Yes"), i18n("No"), |
508 | 0, 0 ) != 0 ) { | 508 | 0, 0 ) != 0 ) { |
509 | setBlockSave(false); | 509 | setBlockSave(false); |
510 | mParent->topLevelWidget()->setCaption(i18n("Aborted! Nothing synced!")); | 510 | mParent->topLevelWidget()->setCaption(i18n("Aborted! Nothing synced!")); |
511 | return; | 511 | return; |
512 | } | 512 | } |
513 | mCurrentSyncDevice = i18n("Multiple profiles") ; | 513 | mCurrentSyncDevice = i18n("Multiple profiles") ; |
514 | mSyncAlgoPrefs = mPrefs->mRingSyncAlgoPrefs; | 514 | mSyncAlgoPrefs = mPrefs->mRingSyncAlgoPrefs; |
515 | if ( askforPrefs ) { | 515 | if ( askforPrefs ) { |
516 | if ( !edit_sync_options()) { | 516 | if ( !edit_sync_options()) { |
517 | mParent->topLevelWidget()->setCaption( i18n("Syncing aborted. Nothing synced.") ); | 517 | mParent->topLevelWidget()->setCaption( i18n("Syncing aborted.") ); |
518 | return; | 518 | return; |
519 | } | 519 | } |
520 | mPrefs->mRingSyncAlgoPrefs = mSyncAlgoPrefs; | 520 | mPrefs->mRingSyncAlgoPrefs = mSyncAlgoPrefs; |
521 | } | 521 | } |
522 | mParent->topLevelWidget()->setCaption(i18n("Multiple sync started.") ); | 522 | mParent->topLevelWidget()->setCaption(i18n("Multiple sync started.") ); |
523 | qApp->processEvents(); | 523 | qApp->processEvents(); |
524 | int num = ringSync() ; | 524 | int num = ringSync() ; |
525 | if ( num > 1 ) | 525 | if ( num > 1 ) |
526 | ringSync(); | 526 | ringSync(); |
527 | setBlockSave(false); | 527 | setBlockSave(false); |
528 | if ( num ) | 528 | if ( num ) |
529 | emit save(); | 529 | emit save(); |
530 | if ( num ) | 530 | if ( num ) |
531 | mParent->topLevelWidget()->setCaption(i18n("%1 profiles synced. Multiple sync complete!").arg(num) ); | 531 | mParent->topLevelWidget()->setCaption(i18n("%1 profiles synced. Multiple sync complete!").arg(num) ); |
532 | else | 532 | else |
533 | mParent->topLevelWidget()->setCaption(i18n("Nothing synced! No profiles defined for multisync!")); | 533 | mParent->topLevelWidget()->setCaption(i18n("Nothing synced! No profiles defined for multisync!")); |
534 | return; | 534 | return; |
535 | } | 535 | } |
536 | 536 | ||
537 | int KSyncManager::ringSync() | 537 | int KSyncManager::ringSync() |
538 | { | 538 | { |
539 | int syncedProfiles = 0; | 539 | int syncedProfiles = 0; |
540 | unsigned int i; | 540 | unsigned int i; |
541 | QTime timer; | 541 | QTime timer; |