more AB sync

2 files changed, 11 insertions, 33 deletions

diff --git a/kabc/addresseeview.cpp b/kabc/addresseeview.cpp
index 487e8a5..2dda968 100644
--- a/kabc/addresseeview.cpp
+++ b/kabc/addresseeview.cpp
@@ -414,3 +414,2 @@ AddresseeChooser::AddresseeChooser( KABC::Addressee loc, KABC::Addressee rem, bo
     QWidget* topframe = new QWidget( this );
-    //QVBox* topframe = new QVBox( this );
     setMainWidget( topframe );
@@ -419,6 +418,4 @@ AddresseeChooser::AddresseeChooser( KABC::Addressee loc, KABC::Addressee rem, bo
         bl = new QVBoxLayout( topframe  );
-
     } else {
         bl = new QHBoxLayout( topframe  );
-
     }
@@ -427,2 +424,4 @@ AddresseeChooser::AddresseeChooser( KABC::Addressee loc, KABC::Addressee rem, bo
     QLabel* lab = new QLabel( i18n("Local Addressee"), subframe ); 
+    if ( takeloc )
+        lab->setBackgroundColor(Qt::green.light() );
     AddresseeView * av = new AddresseeView( subframe );
@@ -432,9 +431,8 @@ AddresseeChooser::AddresseeChooser( KABC::Addressee loc, KABC::Addressee rem, bo
     lab = new QLabel( i18n("Remote Addressee"), subframe  ); 
+    if ( !takeloc )
+        lab->setBackgroundColor(Qt::green.light() );
     av = new AddresseeView( subframe );
     av->setAddressee( rem );
-
-    QObject::connect(findButton( Ok ),SIGNAL(clicked()),
-                     SLOT(slot_remote())); 
-    QObject::connect(this,SIGNAL(user1Clicked()),
-                     SLOT(slot_local())); 
+    QObject::connect(findButton( Ok ),SIGNAL(clicked()),this, SLOT(slot_remote())); 
+    QObject::connect(this,SIGNAL(user1Clicked()),this, SLOT(slot_local())); 
 #ifndef DESKTOP_VERSION
@@ -454,3 +452,2 @@ int AddresseeChooser::executeD( bool local )
     exec();
-    qDebug("returning %d ",mSyncResult );
     return mSyncResult;  
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index b1a951c..cc8eb52 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -2629,3 +2629,3 @@ int  KABCore::takeAddressee( KABC::Addressee* local,  KABC::Addressee* remote, i
     case SYNC_PREF_ASK: 
-        qDebug("lsy %s  ---  lo %s  --- re %s ", lastSync.toString().latin1(), local->revision().toString().latin1(), remote->revision().toString().latin1()  );
+        //qDebug("lsy %s  ---  lo %s  --- re %s ", lastSync.toString().latin1(), local->revision().toString().latin1(), remote->revision().toString().latin1()  );
         if ( lastSync > remote->revision() )
@@ -2634,26 +2634,8 @@ int  KABCore::takeAddressee( KABC::Addressee* local,  KABC::Addressee* remote, i
             return 2;
-        //qDebug("lsy %s  ---  lo %s  --- re %s ", lastSync.toString().latin1(), local->revision().toString().latin1(), remote->revision().toString().latin1()  );
         localIsNew = local->revision() >= remote->revision();
-#if 0
-        if ( localIsNew )
-            getEventViewerDialog()->setColorMode( 1 );
-         else 
-            getEventViewerDialog()->setColorMode( 2 );
-        getEventViewerDialog()->setIncidence(local);
-        if ( localIsNew )
-            getEventViewerDialog()->setColorMode( 2 );
-         else 
-            getEventViewerDialog()->setColorMode( 1 );
-        getEventViewerDialog()->addIncidence(remote);
-        getEventViewerDialog()->setColorMode( 0 );
-        //qDebug("local %d remote %d ",local->relatedTo(),remote->relatedTo()  );
-        getEventViewerDialog()->setCaption( mCurrentSyncDevice +i18n(" : Conflict! Please choose entry!"));
-        getEventViewerDialog()->showMe();
-        result = getEventViewerDialog()->executeS( localIsNew );
-#endif
-        qDebug("conflict! ************************************** ");
+        //qDebug("conflict! ************************************** ");
         {
-        KPIM::AddresseeChooser acd ( *local,*remote, localIsNew , this );
-        result = acd.executeD(localIsNew);
-        return result;
+            KPIM::AddresseeChooser acd ( *local,*remote, localIsNew , this );
+            result = acd.executeD(localIsNew);
+            return result;
         }
@@ -2976,3 +2958,2 @@ bool KABCore::syncAB(QString filename, int mode)
 
-
 void KABCore::confSync()