author | zautrix <zautrix> | 2004-10-14 07:24:50 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-10-14 07:24:50 (UTC) |
commit | 57bd80b04dddd40a897dce8b6902d1046d71c631 (patch) (unidiff) | |
tree | c51cb1985344173951109f4bffb12bb6a68ea7f7 | |
parent | a6dff815a9c6d3a91094573d23c28a8553fc7cc2 (diff) | |
download | kdepimpi-57bd80b04dddd40a897dce8b6902d1046d71c631.zip kdepimpi-57bd80b04dddd40a897dce8b6902d1046d71c631.tar.gz kdepimpi-57bd80b04dddd40a897dce8b6902d1046d71c631.tar.bz2 |
phone fixes
-rw-r--r-- | kabc/addressee.cpp | 22 | ||||
-rw-r--r-- | kaddressbook/kabcore.cpp | 41 | ||||
-rw-r--r-- | kaddressbook/kabcore.h | 2 |
3 files changed, 39 insertions, 26 deletions
diff --git a/kabc/addressee.cpp b/kabc/addressee.cpp index 295ee4f..2564894 100644 --- a/kabc/addressee.cpp +++ b/kabc/addressee.cpp | |||
@@ -448,4 +448,24 @@ bool Addressee::containsAdr(const Addressee& ad ) | |||
448 | void Addressee::simplifyAddresses() | 448 | void Addressee::simplifyAddresses() |
449 | { | 449 | { |
450 | |||
451 | |||
452 | Address::List list; | ||
453 | Address::List::Iterator it; | ||
454 | Address::List::Iterator it2; | ||
455 | for( it = mData->addresses.begin(); it != mData->addresses.end(); ++it ) { | ||
456 | it2 = it; | ||
457 | ++it2; | ||
458 | for( ; it2 != mData->addresses.end(); ++it2 ) { | ||
459 | if ( (*it) == (*it2) ) { | ||
460 | list.append( *it ); | ||
461 | break; | ||
462 | } | ||
463 | } | ||
464 | } | ||
465 | for( it = list.begin(); it != list.end(); ++it ) { | ||
466 | removeAddress( (*it) ); | ||
467 | } | ||
468 | |||
469 | list.clear(); | ||
450 | int max = 2; | 470 | int max = 2; |
451 | if ( mData->url.isValid() ) | 471 | if ( mData->url.isValid() ) |
@@ -453,6 +473,4 @@ void Addressee::simplifyAddresses() | |||
453 | if ( mData->addresses.count() <= max ) return ; | 473 | if ( mData->addresses.count() <= max ) return ; |
454 | int count = 0; | 474 | int count = 0; |
455 | Address::List list; | ||
456 | Address::List::Iterator it; | ||
457 | for( it = mData->addresses.begin(); it != mData->addresses.end(); ++it ) { | 475 | for( it = mData->addresses.begin(); it != mData->addresses.end(); ++it ) { |
458 | if ( count >= max ) | 476 | if ( count >= max ) |
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index dae9cd2..087e9e3 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp | |||
@@ -694,29 +694,26 @@ void KABCore::export2phone() | |||
694 | return; | 694 | return; |
695 | 695 | ||
696 | QString fileName = getPhoneFile(); | ||
697 | if ( ! mAddressBook->export2PhoneFormat( uids ,fileName ) ) | ||
698 | return; | ||
699 | |||
700 | QTimer::singleShot( 1, this , SLOT ( writeToPhone())); | ||
701 | |||
702 | } | ||
703 | QString KABCore::getPhoneFile() | ||
704 | { | ||
696 | #ifdef _WIN32_ | 705 | #ifdef _WIN32_ |
697 | QString fileName = locateLocal("tmp", "phonefile.vcf"); | 706 | return locateLocal("tmp", "phonefile.vcf"); |
698 | #else | 707 | #else |
699 | QString fileName = "/tmp/phonefile.vcf"; | 708 | return "/tmp/phonefile.vcf"; |
700 | #endif | 709 | #endif |
701 | 710 | ||
702 | if ( ! mAddressBook->export2PhoneFormat( uids ,fileName ) ) | 711 | } |
703 | return; | 712 | void KABCore::writeToPhone( ) |
704 | 713 | { | |
705 | if ( PhoneAccess::writeToPhone( fileName ) ) | 714 | if ( PhoneAccess::writeToPhone( getPhoneFile() ) ) |
706 | qDebug("Export okay "); | 715 | qDebug("Export okay "); |
707 | else | 716 | else |
708 | qDebug("Error export contacts "); | 717 | qDebug("Error export contacts "); |
709 | |||
710 | |||
711 | #if 0 | ||
712 | |||
713 | setCaption( i18n("Writing to phone...")); | ||
714 | if ( PhoneFormat::writeToPhone( cal ) ) | ||
715 | setCaption( i18n("Export to phone successful!")); | ||
716 | else | ||
717 | setCaption( i18n("Error exporting to phone!")); | ||
718 | #endif | ||
719 | |||
720 | |||
721 | } | 718 | } |
722 | void KABCore::beamVCard() | 719 | void KABCore::beamVCard() |
@@ -835,4 +832,5 @@ void KABCore::beamDone( Ir *ir ) | |||
835 | #endif | 832 | #endif |
836 | topLevelWidget()->raise(); | 833 | topLevelWidget()->raise(); |
834 | message( i18n("Beaming successful!") ); | ||
837 | } | 835 | } |
838 | 836 | ||
@@ -2819,10 +2817,5 @@ bool KABCore::syncPhone() | |||
2819 | { | 2817 | { |
2820 | QString mCurrentSyncDevice = syncManager->getCurrentSyncDevice(); | 2818 | QString mCurrentSyncDevice = syncManager->getCurrentSyncDevice(); |
2821 | QString fileName; | 2819 | QString fileName = getPhoneFile(); |
2822 | #ifdef _WIN32_ | ||
2823 | fileName = locateLocal("tmp", "phonefile.vcf"); | ||
2824 | #else | ||
2825 | fileName = "/tmp/phonefile.vcf"; | ||
2826 | #endif | ||
2827 | if ( !PhoneAccess::readFromPhone( fileName) ) { | 2820 | if ( !PhoneAccess::readFromPhone( fileName) ) { |
2828 | message(i18n("Phone access failed!")); | 2821 | message(i18n("Phone access failed!")); |
diff --git a/kaddressbook/kabcore.h b/kaddressbook/kabcore.h index 3c33923..5871d39 100644 --- a/kaddressbook/kabcore.h +++ b/kaddressbook/kabcore.h | |||
@@ -149,4 +149,5 @@ class KABCore : public QWidget, public KSyncInterface | |||
149 | void whatsnew() ; | 149 | void whatsnew() ; |
150 | void synchowto() ; | 150 | void synchowto() ; |
151 | void writeToPhone(); | ||
151 | 152 | ||
152 | /** | 153 | /** |
@@ -372,4 +373,5 @@ class KABCore : public QWidget, public KSyncInterface | |||
372 | void initGUI(); | 373 | void initGUI(); |
373 | void initActions(); | 374 | void initActions(); |
375 | QString getPhoneFile(); | ||
374 | 376 | ||
375 | AddresseeEditorDialog *createAddresseeEditorDialog( QWidget *parent, | 377 | AddresseeEditorDialog *createAddresseeEditorDialog( QWidget *parent, |