more sync fixes

7 files changed, 119 insertions, 86 deletions

diff --git a/kabc/addressbook.cpp b/kabc/addressbook.cpp
index 8882259..592d78d 100644
--- a/kabc/addressbook.cpp
+++ b/kabc/addressbook.cpp
@@ -375,8 +375,9 @@ bool AddressBook::save( Ticket *ticket )
   }
 
   return false;
 }
+// exports all Addressees, which are syncable
 void  AddressBook::export2File( QString fileName )
 {
   
   QFile outFile( fileName );
@@ -389,17 +390,19 @@ void  AddressBook::export2File( QString fileName )
   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() );
+  for ( it = begin(); it != end(); ++it ) { 
+      if ( (*it).resource() && (*it).resource()->includeInSync() ) {
+          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";
       }
-    KABC::VCardConverter converter;
-    QString vcard; 
-    //Resource *resource() const;
-    converter.addresseeToVCard( *it, vcard, version );
-    t << vcard << "\r\n";
   }
   t <<  "\r\n\r\n";
   outFile.close(); 
 }
@@ -414,12 +417,14 @@ bool  AddressBook::export2PhoneFormat( QStringList uids ,QString fileName )
       // for( QStringList::ConstIterator it = uids.begin(); it != uids.end(); ++it ) {
       if ( ! all ) {
           if ( ! ( uids.contains((*it).uid() ) ))
               continue;
-      }
+      } 
       KABC::Addressee a = ( *it );
       if ( a.isEmpty() )
           continue;
+      if ( all && a.resource() && !a.resource()->includeInSync() )
+          continue;
       a.simplifyEmails();
       a.simplifyPhoneNumbers();
       a.simplifyPhoneNumberTypes();
       a.simplifyAddresses();
@@ -475,9 +480,9 @@ bool  AddressBook::export2PhoneFormat( QStringList uids ,QString fileName )
 void  AddressBook::importFromFile( QString fileName, bool replaceLabel, bool removeOld  )
 {
 
     if ( removeOld )
-        setUntagged();
+        setUntagged( true );
     KABC::Addressee::List list;
     QFile file( fileName );
     file.open( IO_ReadOnly );
     QByteArray rawData = file.readAll();
@@ -505,13 +510,19 @@ void  AddressBook::importFromFile( QString fileName, bool replaceLabel, bool rem
     }
     if ( removeOld )
         removeUntagged();
 }
-void AddressBook::setUntagged()
+void AddressBook::setUntagged(bool setNonSyncTagged) // = false)
 {
     Iterator ait;
     for ( ait = begin(); ait != end(); ++ait ) {
-        (*ait).setTagged( false );
+        if ( setNonSyncTagged ) {
+            if ( (*ait).resource() && ! (*ait).resource()->includeInSync() ) {
+                (*ait).setTagged( true );
+            } else
+                (*ait).setTagged( false );
+        } else
+            (*ait).setTagged( false );
     }
 }
 void AddressBook::removeUntagged()
 {
diff --git a/kabc/addressbook.h b/kabc/addressbook.h
index a6bf451..23bba02 100644
--- a/kabc/addressbook.h
+++ b/kabc/addressbook.h
@@ -147,9 +147,9 @@ class AddressBook : public QObject
     void preparePhoneSync( QString currentSyncDevice, bool isPreSync );
     void export2File( QString fileName );
     bool export2PhoneFormat(  QStringList uids ,QString fileName );
     void importFromFile( QString fileName,  bool replaceLabel = false, bool removeOld = false );
-    void setUntagged();
+    void setUntagged( bool setNonSyncTagged = false );
     void removeUntagged();
     void findNewExtIds(  QString fileName, QString currentSyncDevice  );
     /**
       Returns a iterator for first entry of address book.
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index ea34be2..47ed858 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -2550,50 +2550,52 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo
             inR = remote->findByUid( uid );
             //inL.setResource( 0 );
             //inR.setResource( 0 );
             if ( !inL.isEmpty() ) { // maybe conflict - same uid in both calendars
-                if ( take = takeAddressee( &inL, &inR, mode, fullDateRange ) ) {
-                    //qDebug("take %d %s ", take, inL.summary().latin1());
-                    if ( take == 3 )
-                        return false;
-                    if ( take == 1  ) {// take local
-                        if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) {
-                            inL.setCsum( mCurrentSyncDevice, inR.getCsum(mCurrentSyncDevice) );
-                            inL.setID( mCurrentSyncDevice, inR.getID(mCurrentSyncDevice) );
-                            local->insertAddressee(  inL, false );
-                            idS = inR.externalUID();
-                            OidS = inR.originalExternalUID();
-                        }
-                        else
-                            idS = inR.IDStr();
-                        remote->removeAddressee( inR );
-                        inR = inL;
-                        inR.setTempSyncStat( SYNC_TEMPSTATE_INITIAL );
-                        if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) {
-                            inR.setOriginalExternalUID( OidS );
-                            inR.setExternalUID( idS );
-                        } else {
-                            inR.setIDStr( idS );
-                        }
-                        inR.setResource( 0 );
-                        remote->insertAddressee(  inR , false);
-                        ++changedRemote;
-                    } else { // take == 2  take remote
-                        if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) {
-                            if ( inR.revision().date().year() < 2004 )
-                                inR.setRevision( modifiedCalendar );
-                        }
-                        idS = inL.IDStr();
-                        local->removeAddressee( inL );
-                        inL = inR;
-                        inL.setIDStr( idS );
-                        if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) {
-                            inL.setCsum( mCurrentSyncDevice, inR.getCsum(mCurrentSyncDevice) );
-                            inL.setID( mCurrentSyncDevice, inR.getID(mCurrentSyncDevice) );
+                if ( !inL.resource() || inL.resource()->includeInSync() ) {
+                    if ( take = takeAddressee( &inL, &inR, mode, fullDateRange ) ) {
+                        //qDebug("take %d %s ", take, inL.summary().latin1());
+                        if ( take == 3 )
+                            return false;
+                        if ( take == 1  ) {// take local
+                            if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) {
+                                inL.setCsum( mCurrentSyncDevice, inR.getCsum(mCurrentSyncDevice) );
+                                inL.setID( mCurrentSyncDevice, inR.getID(mCurrentSyncDevice) );
+                                local->insertAddressee(  inL, false );
+                                idS = inR.externalUID();
+                                OidS = inR.originalExternalUID();
+                            }
+                            else
+                                idS = inR.IDStr();
+                            remote->removeAddressee( inR );
+                            inR = inL;
+                            inR.setTempSyncStat( SYNC_TEMPSTATE_INITIAL );
+                            if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) {
+                                inR.setOriginalExternalUID( OidS );
+                                inR.setExternalUID( idS );
+                            } else {
+                                inR.setIDStr( idS );
+                            }
+                            inR.setResource( 0 );
+                            remote->insertAddressee(  inR , false);
+                            ++changedRemote;
+                        } else { // take == 2  take remote
+                            if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) {
+                                if ( inR.revision().date().year() < 2004 )
+                                    inR.setRevision( modifiedCalendar );
+                            }
+                            idS = inL.IDStr();
+                            local->removeAddressee( inL );
+                            inL = inR;
+                            inL.setIDStr( idS );
+                            if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) {
+                                inL.setCsum( mCurrentSyncDevice, inR.getCsum(mCurrentSyncDevice) );
+                                inL.setID( mCurrentSyncDevice, inR.getID(mCurrentSyncDevice) );
+                            }
+                            inL.setResource( 0 );
+                            local->insertAddressee(  inL , false );
+                            ++changedLocal;
                         }
-                        inL.setResource( 0 );
-                        local->insertAddressee(  inL , false );
-                        ++changedLocal;
                     }
                 }
             } else { //  no conflict
                 if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) {
@@ -2644,40 +2646,42 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo
         if ( uid.left(19) == QString("last-syncAddressee-") )
             skipIncidence = true;
         if ( !skipIncidence )  {
             inL = local->findByUid( uid );
-            inR = remote->findByUid( uid );
-            if ( inR.isEmpty() ) { 
-                if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) {
-                    if ( !inL.getID(mCurrentSyncDevice).isEmpty() && mode != 4 ) {
-                        // pending checkExternSyncAddressee(addresseeLSyncSharp, inL);
-                        local->removeAddressee( inL );
-                        ++deletedAddresseeL; 
-                    } else {
-                        if ( ! syncManager->mWriteBackExistingOnly ) {
-                            inL.removeID(mCurrentSyncDevice );
-                            ++addedAddresseeR;
-                            inL.setRevision( modifiedCalendar );
-                            local->insertAddressee( inL, false );
-                            inR = inL;
-                            inR.setTempSyncStat( SYNC_TEMPSTATE_ADDED_EXTERNAL );
-                            inR.setResource( 0 );
-                            remote->insertAddressee( inR, false );
+            if ( !inL.resource() || inL.resource()->includeInSync() ) {
+                inR = remote->findByUid( uid );
+                if ( inR.isEmpty() ) { 
+                    if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) {
+                        if ( !inL.getID(mCurrentSyncDevice).isEmpty() && mode != 4 ) {
+                            // pending checkExternSyncAddressee(addresseeLSyncSharp, inL);
+                            local->removeAddressee( inL );
+                            ++deletedAddresseeL; 
+                        } else {
+                            if ( ! syncManager->mWriteBackExistingOnly ) {
+                                inL.removeID(mCurrentSyncDevice );
+                                ++addedAddresseeR;
+                                inL.setRevision( modifiedCalendar );
+                                local->insertAddressee( inL, false );
+                                inR = inL;
+                                inR.setTempSyncStat( SYNC_TEMPSTATE_ADDED_EXTERNAL );
+                                inR.setResource( 0 );
+                                remote->insertAddressee( inR, false );
+                            }
                         }
-                    }
-                } else {
-                    if ( inL.revision() < mLastAddressbookSync && mode != 4 ) {
-                        // pending checkExternSyncAddressee(addresseeLSyncSharp, inL);
-                        local->removeAddressee( inL );
-                        ++deletedAddresseeL; 
                     } else {
-                        if ( ! syncManager->mWriteBackExistingOnly ) {
-                            ++addedAddresseeR; 
-                            inL.setRevision( modifiedCalendar );
-                            local->insertAddressee( inL, false );
-                            inR = inL;
-                            inR.setResource( 0 );
-                            remote->insertAddressee( inR, false );
+                        if ( inL.revision() < mLastAddressbookSync && mode != 4 ) {
+                            // pending checkExternSyncAddressee(addresseeLSyncSharp, inL);
+                            local->removeAddressee( inL );
+                            ++deletedAddresseeL; 
+                        } else {
+                            if ( ! syncManager->mWriteBackExistingOnly ) {
+                                ++addedAddresseeR; 
+                                inL.setRevision( modifiedCalendar );
+                                local->insertAddressee( inL, false );
+                                inR = inL;
+                                inR.setResource( 0 );
+                                remote->insertAddressee( inR, false );
+                            }
                         }
                     }
                 }
             }
diff --git a/microkde/kresources/configdialog.cpp b/microkde/kresources/configdialog.cpp
index f8240f9..030b547 100644
--- a/microkde/kresources/configdialog.cpp
+++ b/microkde/kresources/configdialog.cpp
@@ -74,10 +74,14 @@ ConfigDialog::ConfigDialog( QWidget *parent, const QString& resourceFamily,
 
   mName = new KLineEdit( generalGroupBox );
 
   if (!mResource->isSyncable()) {
+    new QLabel("", generalGroupBox );
           mReadOnly = new QCheckBox( i18n( "Read-only" ), generalGroupBox );
     mReadOnly->setChecked( mResource->readOnly() );
+    new QLabel("", generalGroupBox );
+          mIncludeInSync = new QCheckBox( i18n( "Include in sync" ), generalGroupBox );
+    mIncludeInSync->setChecked( mResource->includeInSync() );
   }
 
   mName->setText( mResource->resourceName() );
 
@@ -219,8 +223,9 @@ void ConfigDialog::accept()
 
   mResource->setResourceName( mName->text() );
   if (!mResource->isSyncable())
     mResource->setReadOnly( mReadOnly->isChecked() );
+    mResource->setIncludeInSync( mIncludeInSync->isChecked() );
 
   if ( mConfigWidget ) {
     // First save generic information
     // Also save setting of specific resource type
diff --git a/microkde/kresources/configdialog.h b/microkde/kresources/configdialog.h
index 63cd4e9..ed3ecab 100644
--- a/microkde/kresources/configdialog.h
+++ b/microkde/kresources/configdialog.h
@@ -57,8 +57,9 @@ class ConfigDialog : public KDialogBase
     Resource* mResource;
 
     KLineEdit *mName;
     QCheckBox *mReadOnly;
+    QCheckBox *mIncludeInSync;
 //US add a persistent readonly flag. We need that for opie and qtopia addressbooks.
     bool mPersistentReadOnly;
 };
 
diff --git a/microkde/kresources/resource.cpp b/microkde/kresources/resource.cpp
index 4f69540..f79bcd0 100644
--- a/microkde/kresources/resource.cpp
+++ b/microkde/kresources/resource.cpp
@@ -38,8 +38,9 @@ class Resource::ResourcePrivate
     int mOpenCount;
     QString mType;
     QString mIdentifier;
     bool mReadOnly;
+    bool mIncludeInSync;
     QString mName;
     bool mActive;
     bool mIsOpen;
 };
@@ -62,14 +63,16 @@ Resource::Resource( const KConfig* config )
 #endif
     d->mType = cfg->readEntry( "ResourceType" );
     d->mName = cfg->readEntry( "ResourceName" );
     d->mReadOnly = cfg->readBoolEntry( "ResourceIsReadOnly", false );
+    d->mIncludeInSync = cfg->readBoolEntry( "ResourceIncludeInSync", true );;
     d->mActive = cfg->readBoolEntry( "ResourceIsActive", true );
     d->mIdentifier = cfg->readEntry( "ResourceIdentifier" );
   } else {
     d->mType = "type";
     d->mName = "resource-name";
     d->mReadOnly = false;
+    d->mIncludeInSync = true;
     d->mActive = true;
     d->mIdentifier = KApplication::randomString( 10 );
   }
 }
@@ -81,13 +84,12 @@ Resource::~Resource()
 }
 
 void Resource::writeConfig( KConfig* config )
 {
-
-
   config->writeEntry( "ResourceType", d->mType );
   config->writeEntry( "ResourceName", d->mName );
   config->writeEntry( "ResourceIsReadOnly", d->mReadOnly );
+  config->writeEntry( "ResourceIncludeInSync", d->mIncludeInSync );
   config->writeEntry( "ResourceIsActive", d->mActive );
   config->writeEntry( "ResourceIdentifier", d->mIdentifier );
 }
 
@@ -148,8 +150,16 @@ QString Resource::type() const
 {
   return d->mType;
 }
 
+void Resource::setIncludeInSync( bool value )
+{
+    d->mIncludeInSync = value;
+}
+bool Resource::includeInSync() const
+{
+   return  d->mIncludeInSync;
+}
 void Resource::setReadOnly( bool value )
 {
   d->mReadOnly = value;
 }
diff --git a/microkde/kresources/resource.h b/microkde/kresources/resource.h
index 580b5d1..70b5613 100644
--- a/microkde/kresources/resource.h
+++ b/microkde/kresources/resource.h
@@ -309,8 +309,10 @@ class Resource : public QObject
      * Returns, if the resource is read-only.
      */
     virtual bool readOnly() const;
 
+    void setIncludeInSync( bool value );
+    bool includeInSync() const;
     /**
      * Set the name of resource.You can override this method,
      * but also remember to call Resource::setResourceName().
      */