| -rw-r--r-- | kabc/addressbook.cpp | 10 | ||||
| -rw-r--r-- | kabc/addressbook.h | 2 | ||||
| -rw-r--r-- | kaddressbook/kabcore.cpp | 9 | ||||
| -rw-r--r-- | kaddressbook/kabcore.h | 2 | ||||
| -rw-r--r-- | libkdepim/ksyncmanager.cpp | 2 |
5 files changed, 18 insertions, 7 deletions
diff --git a/kabc/addressbook.cpp b/kabc/addressbook.cpp index f3744bc..e04f4b1 100644 --- a/kabc/addressbook.cpp +++ b/kabc/addressbook.cpp @@ -376,9 +376,9 @@ bool AddressBook::save( Ticket *ticket ) return false; } // exports all Addressees, which are syncable -void AddressBook::export2File( QString fileName ) +void AddressBook::export2File( QString fileName, QString resourceName ) { QFile outFile( fileName ); if ( !outFile.open( IO_WriteOnly ) ) { @@ -391,9 +391,14 @@ void AddressBook::export2File( QString fileName ) Iterator it; KABC::VCardConverter::Version version; version = KABC::VCardConverter::v3_0; for ( it = begin(); it != end(); ++it ) { - if ( (*it).resource() && (*it).resource()->includeInSync() ) { + if ( (*it).resource() ) { + bool include = (*it).resource()->includeInSync(); + if ( !resourceName.isEmpty() ) + include = (resourceName == (*it).resource()->name() ); + if ( include ) { + qDebug(QString ("Exporting resource %1 to file %2").arg( (*it).resource()->name() ).arg( fileName ) ); if ( !(*it).IDStr().isEmpty() ) { (*it).insertCustom( "KADDRESSBOOK", "X-ExternalID", (*it).IDStr() ); } KABC::VCardConverter converter; @@ -402,8 +407,9 @@ void AddressBook::export2File( QString fileName ) converter.addresseeToVCard( *it, vcard, version ); t << vcard << "\r\n"; } } + } t << "\r\n\r\n"; outFile.close(); } // if QStringList uids is empty, all are exported diff --git a/kabc/addressbook.h b/kabc/addressbook.h index 18c03b5..4a0d0a3 100644 --- a/kabc/addressbook.h +++ b/kabc/addressbook.h @@ -145,9 +145,9 @@ class AddressBook : public QObject bool saveABphone( QString fileName ); void smplifyAddressees(); void removeSyncInfo( QString syncProfile); void preparePhoneSync( QString currentSyncDevice, bool isPreSync ); - void export2File( QString fileName ); + void export2File( QString fileName, QString resourceName = "" ); bool export2PhoneFormat( QStringList uids ,QString fileName ); int importFromFile( QString fileName, bool replaceLabel = false, bool removeOld = false ); void setUntagged( bool setNonSyncTagged = false ); void removeUntagged(); diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index 2dea619..5d377bf 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp @@ -1935,9 +1935,9 @@ void KABCore::initGUI() syncManager = new KSyncManager((QWidget*)this, (KSyncInterface*)this, KSyncManager::KAPI, KABPrefs::instance(), syncMenu); syncManager->setBlockSave(false); - connect(syncManager , SIGNAL( request_file() ), this, SLOT( syncFileRequest() ) ); + connect(syncManager , SIGNAL( request_file(const QString &) ), this, SLOT( syncFileRequest(const QString &) ) ); connect(syncManager , SIGNAL( getFile( bool )), this, SLOT(getFile( bool ) ) ); QString sync_file = sentSyncFile(); //qDebug("KABCore::initGUI()::setting tmp sync file to:%s ",sync_file.latin1()); syncManager->setDefaultFileName( sync_file ); @@ -3471,15 +3471,20 @@ void KABCore::getFile( bool success ) setModified( true ); message( i18n("Pi-Sync successful!") ); mViewManager->refreshView(); } -void KABCore::syncFileRequest() +void KABCore::syncFileRequest(const QString & resource) { if ( KABPrefs::instance()->mPassiveSyncWithDesktop ) { syncManager->slotSyncMenu( 999 ); } + + if ( resource == "ALL" ) { mAddressBook->export2File( sentSyncFile() ); } + else + mAddressBook->export2File( sentSyncFile(), resource); +} QString KABCore::sentSyncFile() { #ifdef DESKTOP_VERSION return locateLocal( "tmp", "copysyncab.vcf" ); diff --git a/kaddressbook/kabcore.h b/kaddressbook/kabcore.h index c4a0b3b..2d1505f 100644 --- a/kaddressbook/kabcore.h +++ b/kaddressbook/kabcore.h @@ -356,9 +356,9 @@ class KABCore : public QWidget, public KSyncInterface public slots: void loadDataAfterStart(); void recieve(QString cmsg ); void getFile( bool success ); - void syncFileRequest(); + void syncFileRequest(const QString &); void setDetailsVisible( bool visible ); void setDetailsToState(); void saveSettings(); diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp index f80c2a6..e615cbe 100644 --- a/libkdepim/ksyncmanager.cpp +++ b/libkdepim/ksyncmanager.cpp @@ -1463,9 +1463,9 @@ void KServerSocket::send_file() mSyncActionDialog->setFixedSize( 230, 120); mSyncActionDialog->show(); mSyncActionDialog->raise(); emit request_file(mResource); - emit request_file(); + //emit request_file(); qApp->processEvents(); QString fileName = mFileName; QFile file( fileName ); if (!file.open( IO_ReadOnly ) ) { |