-rw-r--r-- | kaddressbook/kabcore.cpp | 41 | ||||
-rw-r--r-- | kaddressbook/kabcore.h | 2 |
2 files changed, 19 insertions, 24 deletions
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index dae9cd2..087e9e3 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp | |||
@@ -690,37 +690,34 @@ void KABCore::export2phone() | |||
690 | KPimGlobalPrefs::instance()->mEx2PhoneModel ); | 690 | KPimGlobalPrefs::instance()->mEx2PhoneModel ); |
691 | 691 | ||
692 | QStringList uids = mViewManager->selectedUids(); | 692 | QStringList uids = mViewManager->selectedUids(); |
693 | if ( uids.isEmpty() ) | 693 | if ( uids.isEmpty() ) |
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() |
723 | { | 720 | { |
724 | QStringList uids = mViewManager->selectedUids(); | 721 | QStringList uids = mViewManager->selectedUids(); |
725 | if ( !uids.isEmpty() ) | 722 | if ( !uids.isEmpty() ) |
726 | beamVCard( uids ); | 723 | beamVCard( uids ); |
@@ -831,12 +828,13 @@ void KABCore::beamVCard(const QStringList& uids) | |||
831 | void KABCore::beamDone( Ir *ir ) | 828 | void KABCore::beamDone( Ir *ir ) |
832 | { | 829 | { |
833 | #ifndef DESKTOP_VERSION | 830 | #ifndef DESKTOP_VERSION |
834 | delete ir; | 831 | delete ir; |
835 | #endif | 832 | #endif |
836 | topLevelWidget()->raise(); | 833 | topLevelWidget()->raise(); |
834 | message( i18n("Beaming successful!") ); | ||
837 | } | 835 | } |
838 | 836 | ||
839 | 837 | ||
840 | void KABCore::browse( const QString& url ) | 838 | void KABCore::browse( const QString& url ) |
841 | { | 839 | { |
842 | #ifndef KAB_EMBEDDED | 840 | #ifndef KAB_EMBEDDED |
@@ -2815,18 +2813,13 @@ void KABCore::message( QString m ) | |||
2815 | topLevelWidget()->setCaption( m ); | 2813 | topLevelWidget()->setCaption( m ); |
2816 | QTimer::singleShot( 15000, this , SLOT ( setCaptionBack())); | 2814 | QTimer::singleShot( 15000, this , SLOT ( setCaptionBack())); |
2817 | } | 2815 | } |
2818 | bool KABCore::syncPhone() | 2816 | 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!")); |
2829 | return false; | 2822 | return false; |
2830 | } | 2823 | } |
2831 | AddressBook abLocal( fileName,"syncContact"); | 2824 | AddressBook abLocal( fileName,"syncContact"); |
2832 | bool syncOK = false; | 2825 | bool syncOK = false; |
diff --git a/kaddressbook/kabcore.h b/kaddressbook/kabcore.h index 3c33923..5871d39 100644 --- a/kaddressbook/kabcore.h +++ b/kaddressbook/kabcore.h | |||
@@ -145,12 +145,13 @@ class KABCore : public QWidget, public KSyncInterface | |||
145 | 145 | ||
146 | void statusMessage(QString, int time = 0 ); | 146 | void statusMessage(QString, int time = 0 ); |
147 | void showLicence(); | 147 | void showLicence(); |
148 | void faq(); | 148 | void faq(); |
149 | void whatsnew() ; | 149 | void whatsnew() ; |
150 | void synchowto() ; | 150 | void synchowto() ; |
151 | void writeToPhone(); | ||
151 | 152 | ||
152 | /** | 153 | /** |
153 | Is called whenever a contact is selected in the view. | 154 | Is called whenever a contact is selected in the view. |
154 | */ | 155 | */ |
155 | void setContactSelected( const QString &uid ); | 156 | void setContactSelected( const QString &uid ); |
156 | 157 | ||
@@ -368,12 +369,13 @@ class KABCore : public QWidget, public KSyncInterface | |||
368 | void configurationChanged(); | 369 | void configurationChanged(); |
369 | void addressBookChanged(); | 370 | void addressBookChanged(); |
370 | 371 | ||
371 | private: | 372 | private: |
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, |
376 | const char *name = 0 ); | 378 | const char *name = 0 ); |
377 | 379 | ||
378 | KXMLGUIClient *mGUIClient; | 380 | KXMLGUIClient *mGUIClient; |
379 | 381 | ||