author | zautrix <zautrix> | 2004-10-08 12:32:04 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-10-08 12:32:04 (UTC) |
commit | 38e390e51967b34d53e19bd275efd1760572cdfb (patch) (unidiff) | |
tree | 6a740469de2ade16f6e5ff3c3b1ff51a95fb157d | |
parent | 1f050320cfec5fd7d32ff5bb8216780b94d5a56a (diff) | |
download | kdepimpi-38e390e51967b34d53e19bd275efd1760572cdfb.zip kdepimpi-38e390e51967b34d53e19bd275efd1760572cdfb.tar.gz kdepimpi-38e390e51967b34d53e19bd275efd1760572cdfb.tar.bz2 |
changes
-rw-r--r-- | libkdepim/ksyncmanager.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp index 0faa24d..08b1a3d 100644 --- a/libkdepim/ksyncmanager.cpp +++ b/libkdepim/ksyncmanager.cpp | |||
@@ -392,65 +392,65 @@ void KSyncManager::multiSync( bool askforPrefs ) | |||
392 | edit_sync_options(); | 392 | edit_sync_options(); |
393 | mPrefs->mRingSyncAlgoPrefs = mSyncAlgoPrefs; | 393 | mPrefs->mRingSyncAlgoPrefs = mSyncAlgoPrefs; |
394 | } | 394 | } |
395 | mParent->topLevelWidget()->setCaption(i18n("Multiple sync started.") ); | 395 | mParent->topLevelWidget()->setCaption(i18n("Multiple sync started.") ); |
396 | qApp->processEvents(); | 396 | qApp->processEvents(); |
397 | int num = ringSync() ; | 397 | int num = ringSync() ; |
398 | if ( num > 1 ) | 398 | if ( num > 1 ) |
399 | ringSync(); | 399 | ringSync(); |
400 | setBlockSave(false); | 400 | setBlockSave(false); |
401 | if ( num ) | 401 | if ( num ) |
402 | emit save(); | 402 | emit save(); |
403 | if ( num ) | 403 | if ( num ) |
404 | mParent->topLevelWidget()->setCaption(i18n("%1 profiles synced. Multiple sync complete!").arg(num) ); | 404 | mParent->topLevelWidget()->setCaption(i18n("%1 profiles synced. Multiple sync complete!").arg(num) ); |
405 | else | 405 | else |
406 | mParent->topLevelWidget()->setCaption(i18n("Nothing synced! No profiles defined for multisync!")); | 406 | mParent->topLevelWidget()->setCaption(i18n("Nothing synced! No profiles defined for multisync!")); |
407 | return; | 407 | return; |
408 | } | 408 | } |
409 | 409 | ||
410 | int KSyncManager::ringSync() | 410 | int KSyncManager::ringSync() |
411 | { | 411 | { |
412 | int syncedProfiles = 0; | 412 | int syncedProfiles = 0; |
413 | unsigned int i; | 413 | unsigned int i; |
414 | QTime timer; | 414 | QTime timer; |
415 | KConfig config ( locateLocal( "config","ksyncprofilesrc" ) ); | 415 | KConfig config ( locateLocal( "config","ksyncprofilesrc" ) ); |
416 | QStringList syncProfileNames = mSyncProfileNames; | 416 | QStringList syncProfileNames = mSyncProfileNames; |
417 | KSyncProfile* temp = new KSyncProfile (); | 417 | KSyncProfile* temp = new KSyncProfile (); |
418 | mAskForPreferences = false; | 418 | mAskForPreferences = false; |
419 | for ( i = 0; i < syncProfileNames.count(); ++i ) { | 419 | for ( i = 0; i < syncProfileNames.count(); ++i ) { |
420 | mCurrentSyncProfile = i; | 420 | mCurrentSyncProfile = i; |
421 | temp->setName(syncProfileNames[mCurrentSyncProfile]); | 421 | temp->setName(syncProfileNames[mCurrentSyncProfile]); |
422 | temp->readConfig(&config); | 422 | temp->readConfig(&config); |
423 | 423 | ||
424 | QString includeInRingSync; | 424 | bool includeInRingSync; |
425 | switch(mTargetApp) | 425 | switch(mTargetApp) |
426 | { | 426 | { |
427 | case (KAPI): | 427 | case (KAPI): |
428 | includeInRingSync = temp->getIncludeInRingSyncAB(); | 428 | includeInRingSync = temp->getIncludeInRingSyncAB(); |
429 | break; | 429 | break; |
430 | case (KOPI): | 430 | case (KOPI): |
431 | includeInRingSync = temp->getIncludeInRingSync(); | 431 | includeInRingSync = temp->getIncludeInRingSync(); |
432 | break; | 432 | break; |
433 | case (PWMPI): | 433 | case (PWMPI): |
434 | includeInRingSync = temp->getIncludeInRingSyncPWM(); | 434 | includeInRingSync = temp->getIncludeInRingSyncPWM(); |
435 | break; | 435 | break; |
436 | default: | 436 | default: |
437 | qDebug("KSyncManager::ringSync: invalid apptype selected"); | 437 | qDebug("KSyncManager::ringSync: invalid apptype selected"); |
438 | break; | 438 | break; |
439 | 439 | ||
440 | } | 440 | } |
441 | 441 | ||
442 | 442 | ||
443 | if ( includeInRingSync && ( i < 1 || i > 2 )) { | 443 | if ( includeInRingSync && ( i < 1 || i > 2 )) { |
444 | mParent->topLevelWidget()->setCaption(i18n("Profile ")+syncProfileNames[mCurrentSyncProfile]+ i18n(" is synced ... ")); | 444 | mParent->topLevelWidget()->setCaption(i18n("Profile ")+syncProfileNames[mCurrentSyncProfile]+ i18n(" is synced ... ")); |
445 | ++syncedProfiles; | 445 | ++syncedProfiles; |
446 | // mAskForPreferences = temp->getAskForPreferences(); | 446 | // mAskForPreferences = temp->getAskForPreferences(); |
447 | mWriteBackFile = temp->getWriteBackFile(); | 447 | mWriteBackFile = temp->getWriteBackFile(); |
448 | mWriteBackExistingOnly = temp->getWriteBackExisting(); | 448 | mWriteBackExistingOnly = temp->getWriteBackExisting(); |
449 | mWriteBackInFuture = 0; | 449 | mWriteBackInFuture = 0; |
450 | if ( temp->getWriteBackFuture() ) | 450 | if ( temp->getWriteBackFuture() ) |
451 | mWriteBackInFuture = temp->getWriteBackFutureWeeks( ); | 451 | mWriteBackInFuture = temp->getWriteBackFutureWeeks( ); |
452 | mShowSyncSummary = false; | 452 | mShowSyncSummary = false; |
453 | mCurrentSyncDevice = syncProfileNames[i] ; | 453 | mCurrentSyncDevice = syncProfileNames[i] ; |
454 | mCurrentSyncName = mLocalMachineName; | 454 | mCurrentSyncName = mLocalMachineName; |
455 | if ( i == 0 ) { | 455 | if ( i == 0 ) { |
456 | syncSharp(); | 456 | syncSharp(); |