| -rw-r--r-- | kabc/addresseeview.cpp | 15 |
1 files changed, 6 insertions, 9 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(); |