| -rw-r--r-- | bin/kdepim/kaddressbook/germantranslation.txt | 4 | ||||
| -rw-r--r-- | kabc/plugins/file/resourcefile.cpp | 2 | ||||
| -rw-r--r-- | kaddressbook/kabcore.cpp | 15 |
3 files changed, 18 insertions, 3 deletions
diff --git a/bin/kdepim/kaddressbook/germantranslation.txt b/bin/kdepim/kaddressbook/germantranslation.txt index 7879194..e54e140 100644 --- a/bin/kdepim/kaddressbook/germantranslation.txt +++ b/bin/kdepim/kaddressbook/germantranslation.txt @@ -752,4 +752,8 @@ { "Edit new contact","Bearbeite neuen Kontakt" },
{ "Edit ","Bearbeite " },
+{ "No contact changed!","Kein Kontakt verändert" },
+{ "%1 contacts changed!","%1 Kontakte geändert!" },
+{ "","" },
+{ "","" },
{ "","" },
{ "","" },
diff --git a/kabc/plugins/file/resourcefile.cpp b/kabc/plugins/file/resourcefile.cpp index af76558..2bd9e71 100644 --- a/kabc/plugins/file/resourcefile.cpp +++ b/kabc/plugins/file/resourcefile.cpp @@ -202,5 +202,5 @@ bool ResourceFile::doOpen() return false; - if ( file.size() == 0 ) { + if ( file.size() < 10 ) { file.close(); return true; diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index 20b107e..fa9f130 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp @@ -2440,6 +2440,10 @@ void KABCore::setFormattedName() int count = 0; KABC::AddressBook::Iterator it; + bool modified = false; for ( it = mAddressBook->begin(); it != mAddressBook->end(); ++it ) { if ( (*it).tagged() ) { + if ( (*it).uid().left( 2 ) == "la" ) + if ( (*it).uid().left( 19 ) == QString("last-syncAddressee-") ) + continue; ++count; if ( count %10 == 0 ) @@ -2459,12 +2463,19 @@ void KABCore::setFormattedName() fName = (*it).organization(); (*it).setFormattedName( fName ); + (*it).setChanged( true ); + modified = true; + (*it).setRevision( QDateTime::currentDateTime() ); } } message(i18n("Refreshing view...") ); qApp->processEvents(); - mViewManager->refreshView( "" ); + if ( modified ) + setModified( true ); Addressee add; mDetails->setAddressee( add ); - message(i18n("Setting formatted name completed!") ); + if ( count == 0 ) + message(i18n("No contact changed!") ); + else + message(i18n("%1 contacts changed!").arg( count ) ); } |