author | zautrix <zautrix> | 2005-04-04 11:29:55 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-04-04 11:29:55 (UTC) |
commit | 23db4aa99cb7a5feb540b6be578efaee8ec6ef80 (patch) (unidiff) | |
tree | f60d08e53dc09cf8a9ca901697797de9cf5dc669 /kaddressbook | |
parent | 69a388bdef8d4a31063f983735d2b7d25775f3cf (diff) | |
download | kdepimpi-23db4aa99cb7a5feb540b6be578efaee8ec6ef80.zip kdepimpi-23db4aa99cb7a5feb540b6be578efaee8ec6ef80.tar.gz kdepimpi-23db4aa99cb7a5feb540b6be578efaee8ec6ef80.tar.bz2 |
sync fixes
-rw-r--r-- | kaddressbook/kabcore.cpp | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index 20b107e..fa9f130 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp | |||
@@ -2436,14 +2436,18 @@ void KABCore::setFormattedName() | |||
2436 | if ( !dlg.exec() ) | 2436 | if ( !dlg.exec() ) |
2437 | return; | 2437 | return; |
2438 | mAddressBook->setUntagged(); | 2438 | mAddressBook->setUntagged(); |
2439 | dlg.tagSelected(); | 2439 | dlg.tagSelected(); |
2440 | int count = 0; | 2440 | int count = 0; |
2441 | KABC::AddressBook::Iterator it; | 2441 | KABC::AddressBook::Iterator it; |
2442 | bool modified = false; | ||
2442 | for ( it = mAddressBook->begin(); it != mAddressBook->end(); ++it ) { | 2443 | for ( it = mAddressBook->begin(); it != mAddressBook->end(); ++it ) { |
2443 | if ( (*it).tagged() ) { | 2444 | if ( (*it).tagged() ) { |
2445 | if ( (*it).uid().left( 2 ) == "la" ) | ||
2446 | if ( (*it).uid().left( 19 ) == QString("last-syncAddressee-") ) | ||
2447 | continue; | ||
2444 | ++count; | 2448 | ++count; |
2445 | if ( count %10 == 0 ) | 2449 | if ( count %10 == 0 ) |
2446 | message(i18n("Changing contact #%1").arg( count ) ); | 2450 | message(i18n("Changing contact #%1").arg( count ) ); |
2447 | qApp->processEvents(); | 2451 | qApp->processEvents(); |
2448 | QString fName; | 2452 | QString fName; |
2449 | if ( setpref.simple->isChecked() ) | 2453 | if ( setpref.simple->isChecked() ) |
@@ -2455,20 +2459,27 @@ void KABCore::setFormattedName() | |||
2455 | else | 2459 | else |
2456 | fName = (*it).organization(); | 2460 | fName = (*it).organization(); |
2457 | if ( setpref.setCompany->isChecked() ) | 2461 | if ( setpref.setCompany->isChecked() ) |
2458 | if ( fName.isEmpty() || fName =="," ) | 2462 | if ( fName.isEmpty() || fName =="," ) |
2459 | fName = (*it).organization(); | 2463 | fName = (*it).organization(); |
2460 | (*it).setFormattedName( fName ); | 2464 | (*it).setFormattedName( fName ); |
2465 | (*it).setChanged( true ); | ||
2466 | modified = true; | ||
2467 | (*it).setRevision( QDateTime::currentDateTime() ); | ||
2461 | } | 2468 | } |
2462 | } | 2469 | } |
2463 | message(i18n("Refreshing view...") ); | 2470 | message(i18n("Refreshing view...") ); |
2464 | qApp->processEvents(); | 2471 | qApp->processEvents(); |
2465 | mViewManager->refreshView( "" ); | 2472 | if ( modified ) |
2473 | setModified( true ); | ||
2466 | Addressee add; | 2474 | Addressee add; |
2467 | mDetails->setAddressee( add ); | 2475 | mDetails->setAddressee( add ); |
2468 | message(i18n("Setting formatted name completed!") ); | 2476 | if ( count == 0 ) |
2477 | message(i18n("No contact changed!") ); | ||
2478 | else | ||
2479 | message(i18n("%1 contacts changed!").arg( count ) ); | ||
2469 | } | 2480 | } |
2470 | 2481 | ||
2471 | void KABCore::clipboardDataChanged() | 2482 | void KABCore::clipboardDataChanged() |
2472 | { | 2483 | { |
2473 | 2484 | ||
2474 | if ( mReadWrite ) | 2485 | if ( mReadWrite ) |