summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--kabc/addressbook.cpp70
-rw-r--r--kabc/addressbook.h5
-rw-r--r--kaddressbook/kabcore.cpp20
-rw-r--r--kaddressbook/kabcore.h2
-rw-r--r--kaddressbook/xxport/vcard_xxport.cpp1
-rw-r--r--libkdepim/ksyncmanager.cpp5
-rw-r--r--libkdepim/ksyncmanager.h5
7 files changed, 90 insertions, 18 deletions
diff --git a/kabc/addressbook.cpp b/kabc/addressbook.cpp
index 5fb49eb..295cf03 100644
--- a/kabc/addressbook.cpp
+++ b/kabc/addressbook.cpp
@@ -40,5 +40,8 @@ $Id$
#include <qptrlist.h>
+#include <qtextstream.h>
+#include <qfile.h>
#include <kglobal.h>
-#include <klocale.h>
+#include <klocale.h>>
+#include <kmessagebox.h>
#include <kdebug.h>
@@ -47,2 +50,4 @@ $Id$
#include "resource.h"
+#include "vcardconverter.h"
+#include "vcardparser/vcardtool.h"
@@ -372,2 +377,50 @@ bool AddressBook::save( Ticket *ticket )
}
+void AddressBook::export2File( QString fileName )
+{
+
+ QFile outFile( fileName );
+ if ( !outFile.open( IO_WriteOnly ) ) {
+ QString text = i18n( "<qt>Unable to open file <b>%1</b> for export.</qt>" );
+ KMessageBox::error( 0, text.arg( fileName ) );
+ return ;
+ }
+ QTextStream t( &outFile );
+ t.setEncoding( QTextStream::UnicodeUTF8 );
+ Iterator it;
+ KABC::VCardConverter::Version version;
+ version = KABC::VCardConverter::v3_0;
+ for ( it = begin(); it != end(); ++it ) {
+ if ( !(*it).IDStr().isEmpty() ) {
+ (*it).insertCustom( "KADDRESSBOOK", "X-ExternalID", (*it).IDStr() );
+ }
+ KABC::VCardConverter converter;
+ QString vcard;
+ //Resource *resource() const;
+ converter.addresseeToVCard( *it, vcard, version );
+ t << vcard << "\r\n";
+ }
+ outFile.close();
+}
+void AddressBook::importFromFile( QString fileName )
+{
+
+ KABC::Addressee::List list;
+ QFile file( fileName );
+
+ file.open( IO_ReadOnly );
+ QByteArray rawData = file.readAll();
+ file.close();
+
+ QString data = QString::fromUtf8( rawData.data(), rawData.size() + 1 );
+ KABC::VCardTool tool;
+ list = tool.parseVCards( data );
+
+ KABC::Addressee::List::Iterator it;
+ for ( it = list.begin(); it != list.end(); ++it ) {
+ (*it).setResource( 0 );
+ insertAddressee( (*it), false, true );
+ }
+
+}
+
bool AddressBook::saveAB()
@@ -463,3 +516,3 @@ Ticket *AddressBook::requestSaveTicket( Resource *resource )
-void AddressBook::insertAddressee( const Addressee &a, bool setRev )
+void AddressBook::insertAddressee( const Addressee &a, bool setRev, bool takeResource )
{
@@ -480,6 +533,11 @@ void AddressBook::insertAddressee( const Addressee &a, bool setRev )
- (*it) = a;
- if ( (*it).resource() == 0 )
- (*it).setResource( standardResource() );
-
+ if ( takeResource ) {
+ Resource * res = (*it).resource();
+ (*it) = a;
+ (*it).setResource( res );
+ } else {
+ (*it) = a;
+ if ( (*it).resource() == 0 )
+ (*it).setResource( standardResource() );
+ }
if ( changed ) {
diff --git a/kabc/addressbook.h b/kabc/addressbook.h
index 8f62f0d..3603ec1 100644
--- a/kabc/addressbook.h
+++ b/kabc/addressbook.h
@@ -144,3 +144,4 @@ class AddressBook : public QObject
bool saveAB( );
-
+ void export2File( QString fileName );
+ void importFromFile( QString fileName );
/**
@@ -175,3 +176,3 @@ class AddressBook : public QObject
*/
- void insertAddressee( const Addressee &, bool setRev = true );
+ void insertAddressee( const Addressee &, bool setRev = true, bool takeResource = false);
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index 83fede4..6404410 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -1685,5 +1685,5 @@ void KABCore::initGUI()
- connect(syncManager , SIGNAL( save() ), this, SLOT( save() ) );
+ connect(syncManager , SIGNAL( request_file() ), this, SLOT( syncFileRequest() ) );
connect(syncManager , SIGNAL( getFile( bool )), this, SLOT(getFile( bool ) ) );
- syncManager->setDefaultFileName(locateLocal( "apps","kabc/std.vcf") );
+ syncManager->setDefaultFileName( sentSyncFile());
//connect(syncManager , SIGNAL( ), this, SLOT( ) );
@@ -2864,7 +2864,17 @@ void KABCore::getFile( bool success )
}
- //mView->watchSavedFile();
- //mView->openCalendar( defaultFileName() );
- // pending: reload received file!
+ mAddressBook->importFromFile( sentSyncFile() );
setCaption( i18n("Pi-Sync successful!") );
}
+void KABCore::syncFileRequest()
+{
+ mAddressBook->export2File( sentSyncFile() );
+}
+QString KABCore::sentSyncFile()
+{
+#ifdef _WIN32_
+ return locateLocal( "tmp", "syncab.ics" );
+#else
+ return QString( "/tmp/kapitempfile.vcf" );
+#endif
+}
diff --git a/kaddressbook/kabcore.h b/kaddressbook/kabcore.h
index 355e828..987369d 100644
--- a/kaddressbook/kabcore.h
+++ b/kaddressbook/kabcore.h
@@ -345,2 +345,3 @@ class KABCore : public QWidget, public KSyncInterface
void getFile( bool success );
+ void syncFileRequest();
void setDetailsVisible( bool visible );
@@ -467,2 +468,3 @@ class KABCore : public QWidget, public KSyncInterface
// sync stuff!
+ QString sentSyncFile();
QPopupMenu *syncMenu;
diff --git a/kaddressbook/xxport/vcard_xxport.cpp b/kaddressbook/xxport/vcard_xxport.cpp
index acf6419..3079d42 100644
--- a/kaddressbook/xxport/vcard_xxport.cpp
+++ b/kaddressbook/xxport/vcard_xxport.cpp
@@ -123,2 +123,3 @@ bool VCardXXPort::exportContacts( const KABC::AddresseeList &list, const QString
+ version = KABC::VCardConverter::v2_1;
converter.addresseeToVCard( *it, vcard, version );
diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp
index 5d48884..ea543dd 100644
--- a/libkdepim/ksyncmanager.cpp
+++ b/libkdepim/ksyncmanager.cpp
@@ -277,3 +277,4 @@ void KSyncManager::enableQuick()
}
- connect( mServerSocket, SIGNAL ( saveFile() ),this, SIGNAL ( save() ) );
+ //connect( mServerSocket, SIGNAL ( saveFile() ),this, SIGNAL ( save() ) );
+ connect( mServerSocket, SIGNAL ( request_file() ),this, SIGNAL ( request_file() ) );
connect( mServerSocket, SIGNAL ( file_received( bool ) ), this, SIGNAL ( getFile( bool ) ) );
@@ -930,3 +931,3 @@ void KServerSocket::send_file()
qDebug("KSS::saving ... ");
- emit saveFile();
+ emit request_file();
qApp->processEvents();
diff --git a/libkdepim/ksyncmanager.h b/libkdepim/ksyncmanager.h
index 52e2772..0eb3323 100644
--- a/libkdepim/ksyncmanager.h
+++ b/libkdepim/ksyncmanager.h
@@ -52,6 +52,4 @@ public:
signals:
- //void sendFile(QSocket*);
- //void getFile(QSocket*);
void file_received( bool );
- //void file_sent();
+ void request_file();
void saveFile();
@@ -158,2 +156,3 @@ class KSyncManager : public QObject
void save();
+ void request_file();
void getFile( bool );