| -rw-r--r-- | kabc/addresseeview.cpp | 15 | ||||
| -rw-r--r-- | kaddressbook/kabcore.cpp | 29 |
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 @@ -412,31 +412,29 @@ AddresseeChooser::AddresseeChooser( KABC::Addressee loc, KABC::Addressee rem, bo findButton( Ok )->setText( i18n("Remote")); findButton( User1 )->setText( i18n("Local")); QWidget* topframe = new QWidget( this ); - //QVBox* topframe = new QVBox( this ); setMainWidget( topframe ); QBoxLayout* bl; if ( QApplication::desktop()->width() < 640 ) { bl = new QVBoxLayout( topframe ); - } else { bl = new QHBoxLayout( topframe ); - } QVBox* subframe = new QVBox( topframe ); bl->addWidget(subframe ); QLabel* lab = new QLabel( i18n("Local Addressee"), subframe ); + if ( takeloc ) + lab->setBackgroundColor(Qt::green.light() ); AddresseeView * av = new AddresseeView( subframe ); av->setAddressee( loc ); subframe = new QVBox( topframe ); bl->addWidget(subframe ); 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 showMaximized(); #else @@ -452,7 +450,6 @@ int AddresseeChooser::executeD( bool local ) else findButton( Ok )->setFocus(); exec(); - qDebug("returning %d ",mSyncResult ); return mSyncResult; } void AddresseeChooser::slot_remote() diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index b1a951c..cc8eb52 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp @@ -2627,35 +2627,17 @@ int KABCore::takeAddressee( KABC::Addressee* local, KABC::Addressee* remote, i return 2; break; 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() ) return 1; if ( lastSync > local->revision() ) 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; } break; case SYNC_PREF_FORCE_LOCAL: @@ -2974,7 +2956,6 @@ bool KABCore::syncAB(QString filename, int mode) #endif } - void KABCore::confSync() { static KSyncPrefsDialog* sp = 0; |