1 files changed, 66 insertions, 0 deletions

diff --git a/kabc/addresseeview.cpp b/kabc/addresseeview.cpp
index b4717d7..487e8a5 100644
--- a/kabc/addresseeview.cpp
+++ b/kabc/addresseeview.cpp
@@ -32,3 +32,8 @@
 #include <qfile.h>
+#include <qvbox.h>
+#include <qlabel.h>
+#include <qwidget.h>
+#include <qlayout.h>
 #include <qapplication.h>
+#include <qpushbutton.h>
 
@@ -401 +406,62 @@ void AddresseeView::addTag(const QString & tag,const QString & text)
 }
+
+AddresseeChooser::AddresseeChooser( KABC::Addressee loc, KABC::Addressee rem, bool takeloc, QWidget *parent, const char *name ) : KDialogBase(parent,name,
+                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 ); 
+    AddresseeView * av = new AddresseeView( subframe );
+    av->setAddressee( loc );
+    subframe = new QVBox( topframe );
+    bl->addWidget(subframe  );
+    lab = new QLabel( i18n("Remote Addressee"), subframe  ); 
+    av = new AddresseeView( subframe );
+    av->setAddressee( rem );
+
+    QObject::connect(findButton( Ok ),SIGNAL(clicked()),
+                     SLOT(slot_remote())); 
+    QObject::connect(this,SIGNAL(user1Clicked()),
+                     SLOT(slot_local())); 
+#ifndef DESKTOP_VERSION
+    showMaximized();
+#else
+    resize ( 640, 400 );
+#endif
+}
+
+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();
+}
+void AddresseeChooser::slot_local()
+{
+    mSyncResult = 1;
+    accept();
+}