more sync fixes

7 files changed, 38 insertions, 5 deletions

diff --git a/kabc/addressbook.cpp b/kabc/addressbook.cpp
index 8882259..592d78d 100644
--- a/kabc/addressbook.cpp
+++ b/kabc/addressbook.cpp
@@ -376,6 +376,7 @@ bool AddressBook::save( Ticket *ticket )
 
   return false;
 }
+// exports all Addressees, which are syncable
 void  AddressBook::export2File( QString fileName )
 {
   
@@ -391,6 +392,7 @@ void  AddressBook::export2File( QString fileName )
   KABC::VCardConverter::Version version;
   version = KABC::VCardConverter::v3_0;
   for ( it = begin(); it != end(); ++it ) {
+      if ( (*it).resource() && (*it).resource()->includeInSync() ) {
       if ( !(*it).IDStr().isEmpty() ) {
           (*it).insertCustom( "KADDRESSBOOK", "X-ExternalID", (*it).IDStr() );
       }
@@ -400,6 +402,7 @@ void  AddressBook::export2File( QString fileName )
     converter.addresseeToVCard( *it, vcard, version );
     t << vcard << "\r\n";
   }
+  }
   t <<  "\r\n\r\n";
   outFile.close(); 
 }
@@ -419,6 +422,8 @@ bool  AddressBook::export2PhoneFormat( QStringList uids ,QString fileName )
       KABC::Addressee a = ( *it );
       if ( a.isEmpty() )
           continue;
+      if ( all && a.resource() && !a.resource()->includeInSync() )
+          continue;
       a.simplifyEmails();
       a.simplifyPhoneNumbers();
       a.simplifyPhoneNumberTypes();
@@ -476,7 +481,7 @@ void  AddressBook::importFromFile( QString fileName, bool replaceLabel, bool rem
 {
 
     if ( removeOld )
-        setUntagged();
+        setUntagged( true );
     KABC::Addressee::List list;
     QFile file( fileName );
     file.open( IO_ReadOnly );
@@ -506,10 +511,16 @@ 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 ) {
+        if ( setNonSyncTagged ) {
+            if ( (*ait).resource() && ! (*ait).resource()->includeInSync() ) {
+                (*ait).setTagged( true );
+            } else
+                (*ait).setTagged( false );
+        } else
         (*ait).setTagged( false );
     }
 }
diff --git a/kabc/addressbook.h b/kabc/addressbook.h
index a6bf451..23bba02 100644
--- a/kabc/addressbook.h
+++ b/kabc/addressbook.h
@@ -148,7 +148,7 @@ class AddressBook : public QObject
     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  );
     /**
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index ea34be2..47ed858 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -2551,6 +2551,7 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo
             //inL.setResource( 0 );
             //inR.setResource( 0 );
             if ( !inL.isEmpty() ) { // maybe conflict - same uid in both calendars
+                if ( !inL.resource() || inL.resource()->includeInSync() ) {
                 if ( take = takeAddressee( &inL, &inR, mode, fullDateRange ) ) {
                     //qDebug("take %d %s ", take, inL.summary().latin1());
                     if ( take == 3 )
@@ -2595,6 +2596,7 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo
                         ++changedLocal;
                     }
                 }
+                }
             } else { //  no conflict
                 if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) {
                     QString des = addresseeLSync.note(); 
@@ -2645,6 +2647,7 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo
             skipIncidence = true;
         if ( !skipIncidence )  {
             inL = local->findByUid( uid );
+            if ( !inL.resource() || inL.resource()->includeInSync() ) {
             inR = remote->findByUid( uid );
             if ( inR.isEmpty() ) { 
                 if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) {
@@ -2682,6 +2685,7 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo
                 }
             }
         }
+        }
         ++incCounter;
     }
     el.clear();
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
@@ -75,8 +75,12 @@ 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() );
@@ -220,6 +224,7 @@ void ConfigDialog::accept()
   mResource->setResourceName( mName->text() );
   if (!mResource->isSyncable())
     mResource->setReadOnly( mReadOnly->isChecked() );
+    mResource->setIncludeInSync( mIncludeInSync->isChecked() );
 
   if ( mConfigWidget ) {
     // First save generic information
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
@@ -58,6 +58,7 @@ class ConfigDialog : public KDialogBase
 
     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
@@ -39,6 +39,7 @@ class Resource::ResourcePrivate
     QString mType;
     QString mIdentifier;
     bool mReadOnly;
+    bool mIncludeInSync;
     QString mName;
     bool mActive;
     bool mIsOpen;
@@ -63,12 +64,14 @@ Resource::Resource( const KConfig* config )
     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 );
   }
@@ -82,11 +85,10 @@ 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 );
 }
@@ -149,6 +151,14 @@ 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
@@ -310,6 +310,8 @@ class Resource : public QObject
      */
     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().