author | zautrix <zautrix> | 2004-09-18 19:07:00 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-09-18 19:07:00 (UTC) |
commit | 28f894fd2a0dfbd5f09f9e530f359981efe0198c (patch) (side-by-side diff) | |
tree | 426565d2716916f48b0c3e68b41e963fd10a3463 | |
parent | ec8099bf369e5b8327ca6cfd78b34366353e3abf (diff) | |
download | kdepimpi-28f894fd2a0dfbd5f09f9e530f359981efe0198c.zip kdepimpi-28f894fd2a0dfbd5f09f9e530f359981efe0198c.tar.gz kdepimpi-28f894fd2a0dfbd5f09f9e530f359981efe0198c.tar.bz2 |
more AB sync
-rw-r--r-- | kabc/addresseeview.cpp | 15 | ||||
-rw-r--r-- | kaddressbook/kabcore.cpp | 23 |
2 files changed, 8 insertions, 30 deletions
diff --git a/kabc/addresseeview.cpp b/kabc/addresseeview.cpp index 487e8a5..2dda968 100644 --- a/kabc/addresseeview.cpp +++ b/kabc/addresseeview.cpp @@ -409,37 +409,35 @@ AddresseeChooser::AddresseeChooser( KABC::Addressee loc, KABC::Addressee rem, bo true ,i18n("Conflict! Please choose Adressee!"),Ok|User1|Close,Close, false) { findButton( Close )->setText( i18n("Cancel Sync")); 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 resize ( 640, 400 ); #endif } @@ -449,13 +447,12 @@ int AddresseeChooser::executeD( bool local ) mSyncResult = 3; if ( local ) findButton( User1 )->setFocus(); else findButton( Ok )->setFocus(); exec(); - qDebug("returning %d ",mSyncResult ); return mSyncResult; } void AddresseeChooser::slot_remote() { mSyncResult = 2; accept(); diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index b1a951c..cc8eb52 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp @@ -2624,37 +2624,19 @@ int KABCore::takeAddressee( KABC::Addressee* local, KABC::Addressee* remote, i if ( local->revision() > remote->revision() ) return 1; else 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; } break; @@ -2971,13 +2953,12 @@ bool KABCore::syncAB(QString filename, int mode) setModified(); } #endif } - void KABCore::confSync() { static KSyncPrefsDialog* sp = 0; if ( ! sp ) { sp = new KSyncPrefsDialog( this, "syncprefs", true ); } |