more sync

5 files changed, 36 insertions, 12 deletions

diff --git a/kabc/addressbook.cpp b/kabc/addressbook.cpp
index e04f4b1..bdc2762 100644
--- a/kabc/addressbook.cpp
+++ b/kabc/addressbook.cpp
@@ -485,3 +485,3 @@ bool  AddressBook::export2PhoneFormat( QStringList uids ,QString fileName )
 }
-int  AddressBook::importFromFile( QString fileName, bool replaceLabel, bool removeOld  )
+int  AddressBook::importFromFile( QString fileName, bool replaceLabel, bool removeOld, QString resource   )
 {
@@ -489,3 +489,3 @@ int  AddressBook::importFromFile( QString fileName, bool replaceLabel, bool remo
     if ( removeOld )
-        setUntagged( true );
+        setUntagged( true, resource );
     KABC::Addressee::List list;
@@ -505,2 +505,16 @@ int  AddressBook::importFromFile( QString fileName, bool replaceLabel, bool remo
     KABC::Addressee::List::Iterator it;
+
+    Resource * setRes = 0;
+    if ( !resource.isEmpty() ) {
+        KRES::Manager<Resource>::ActiveIterator it;
+        KRES::Manager<Resource> *manager = d->mManager;
+        for ( it = manager->activeBegin(); it != manager->activeEnd(); ++it ) {
+            qDebug("SaveAB::checking resource..." );
+            if ( (*it)->name() == resource  ) {
+                setRes = (*it);
+                qDebug("Inserting imported contacs to resource %s", resource.latin1());
+                break;
+            }
+        }
+    }
     for ( it = list.begin(); it != list.end(); ++it ) {
@@ -509,3 +523,3 @@ int  AddressBook::importFromFile( QString fileName, bool replaceLabel, bool remo
             (*it).setIDStr(id );
-        (*it).setResource( 0 );
+        (*it).setResource(  setRes );
         if ( replaceLabel )
@@ -520,5 +534,14 @@ int  AddressBook::importFromFile( QString fileName, bool replaceLabel, bool remo
 }
-void AddressBook::setUntagged(bool setNonSyncTagged) // = false)
+void AddressBook::setUntagged(bool setNonSyncTagged, QString resource) // = false , "")
 {
     Iterator ait;
+    if ( !resource.isEmpty() ) {
+        for ( ait = begin(); ait != end(); ++ait ) {
+            if ( (*ait).resource() && (*ait).resource()->name() == resource ) {
+                (*ait).setTagged( false );
+            }
+            else
+                (*ait).setTagged( true );
+        }
+    } else {
     for ( ait = begin(); ait != end(); ++ait ) {
@@ -533,2 +556,3 @@ void AddressBook::setUntagged(bool setNonSyncTagged) // = false)
 }
+}
 void AddressBook::removeUntagged()
diff --git a/kabc/addressbook.h b/kabc/addressbook.h
index 4a0d0a3..e6daa5e 100644
--- a/kabc/addressbook.h
+++ b/kabc/addressbook.h
@@ -150,4 +150,4 @@ class AddressBook : public QObject
     bool export2PhoneFormat(  QStringList uids ,QString fileName );
-    int importFromFile( QString fileName,  bool replaceLabel = false, bool removeOld = false );
-    void setUntagged( bool setNonSyncTagged = false );
+    int importFromFile( QString fileName,  bool replaceLabel = false, bool removeOld = false, QString resource = "" );
+    void setUntagged( bool setNonSyncTagged = false, QString resource = "" );
     void removeUntagged();
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index 5d377bf..7d8586a 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -1939,3 +1939,3 @@ void KABCore::initGUI()
     connect(syncManager , SIGNAL( request_file(const QString &) ), this, SLOT( syncFileRequest(const QString &) ) );
-    connect(syncManager , SIGNAL( getFile( bool )), this, SLOT(getFile( bool ) ) );
+    connect(syncManager , SIGNAL( getFile( bool ,const QString &)), this, SLOT(getFile( bool ,const QString &) ) );
     QString sync_file = sentSyncFile();
@@ -3462,3 +3462,3 @@ bool KABCore::syncPhone()
 }
-void KABCore::getFile( bool success )
+void KABCore::getFile( bool success ,const QString & resource)
 {
@@ -3468,3 +3468,3 @@ void KABCore::getFile( bool success )
     }
-    int count = mAddressBook->importFromFile( sentSyncFile() , false, true );
+    int count = mAddressBook->importFromFile( sentSyncFile() , false, true ,resource);
     if ( count )
diff --git a/kaddressbook/kabcore.h b/kaddressbook/kabcore.h
index 2d1505f..e69cb60 100644
--- a/kaddressbook/kabcore.h
+++ b/kaddressbook/kabcore.h
@@ -358,3 +358,3 @@ class KABCore : public QWidget, public KSyncInterface
     void recieve(QString cmsg );
-    void getFile( bool success );
+    void getFile( bool success,const QString & );
     void syncFileRequest(const QString &);
diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp
index e615cbe..7197b30 100644
--- a/libkdepim/ksyncmanager.cpp
+++ b/libkdepim/ksyncmanager.cpp
@@ -443,4 +443,4 @@ void KSyncManager::enableQuick( bool ask )
     }
-    connect( mServerSocket, SIGNAL ( request_file() ),this, SIGNAL  ( request_file() ) );
-    connect( mServerSocket, SIGNAL ( file_received( bool ) ), this,  SIGNAL  ( getFile( bool ) ) );
+    //connect( mServerSocket, SIGNAL ( request_file() ),this, SIGNAL  ( request_file() ) );
+    //connect( mServerSocket, SIGNAL ( file_received( bool ) ), this,  SIGNAL  ( getFile( bool ) ) );
     connect( mServerSocket, SIGNAL ( request_file(const QString &) ),this, SIGNAL  ( request_file(const QString &) ) );