1 files changed, 24 insertions, 41 deletions

diff --git a/kabc/addresseedialog.cpp b/kabc/addresseedialog.cpp
index 0cf75a0..671787e 100644
--- a/kabc/addresseedialog.cpp
+++ b/kabc/addresseedialog.cpp
@@ -51,81 +51,64 @@ QString AddresseeItem::key( int column, bool ) const
 {
 
   if (column == Email) {
     QString value = text(Email);
     int val = value.findRev("@");
     return value.mid( val) + value.left( val );
   }
   return text(column).lower();
 }
 
 AddresseeDialog::AddresseeDialog( QWidget *parent, bool multiple ) :
   KDialogBase( KDialogBase::Plain, i18n("Select Addressee"),
                Ok|Cancel, No, parent ), mMultiple( multiple )
 {
     qDebug("NEW AddresseeDialog ");
     
-  QWidget *topWidget = plainPage();
 
-  QBoxLayout *topLayout = new QHBoxLayout( topWidget );
-
-
-  KDGanttMinimizeSplitter* mMiniSplitter = new KDGanttMinimizeSplitter( Qt::Horizontal, topWidget);
+  KDGanttMinimizeSplitter* mMiniSplitter = new KDGanttMinimizeSplitter( Qt::Horizontal, this );
   mMiniSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Right );
-
-  topLayout->addWidget(mMiniSplitter );
+  setMainWidget( mMiniSplitter );
 
   QWidget *listWidget = new QWidget( mMiniSplitter );
 
   QVBoxLayout *listLayout = new QVBoxLayout (listWidget) ;
   //topLayout->addLayout( listLayout );
 
   mAddresseeList = new KListView( listWidget );
   mAddresseeList->addColumn( i18n("Name") );
   mAddresseeList->addColumn( i18n("Email") );
   mAddresseeList->addColumn( i18n("Category") );
   mAddresseeList->setAllColumnsShowFocus( true );
   mAddresseeList->setFullWidth( true );
   listLayout->addWidget( mAddresseeList );
   connect( mAddresseeList, SIGNAL( doubleClicked( QListViewItem * ) ),
            SLOT( slotOk() ) );
-
   //QHBox* searchBox = new QHBox ( listWidget );
-  mAddresseeEdit = new QLineEdit(  listWidget );
+  QHBox * hb = new QHBox ( listWidget );
+  listLayout->addWidget (  hb );
+  mAddresseeEdit = new QLineEdit(  hb );
   connect( mAddresseeEdit, SIGNAL( returnPressed() ),
            SLOT( loadAddressBook() ) );
   mAddresseeEdit->setFocus();
-  QPushButton *searchButton = new QPushButton( i18n("Search!"),  listWidget ); 
+  QPushButton *searchButton = new QPushButton( i18n("Search!"),   hb ); 
   connect ( searchButton, SIGNAL( clicked() ), SLOT( loadAddressBook() ) );
- 
-  QHBoxLayout *searchLayout = new QHBoxLayout (listLayout) ;
-  searchLayout->addWidget( mAddresseeEdit );
-  searchLayout->addWidget( searchButton );
-  //listLayout->addWidget( searchBox );
-
-  if ( mMultiple ) {
-      //QBoxLayout *selectedLayout = new QVBoxLayout;
-      //topLayout->addLayout( selectedLayout );
-      //topLayout->setSpacing( spacingHint() );
-
-     QVBox *selectedGroup = new QVBox( mMiniSplitter );
-    new QLabel ( i18n("Selected:"), selectedGroup );
-    //selectedLayout->addWidget( selectedGroup );
-
-    mSelectedList = new KListView( selectedGroup );
-    mSelectedList->addColumn( i18n("Name") );
+   if ( mMultiple ) {
+     
+    mSelectedList = new KListView( mMiniSplitter );
+    mSelectedList->addColumn( i18n("Selected Name") );
     mSelectedList->addColumn( i18n("Email") );
     mSelectedList->setAllColumnsShowFocus( true );
     mSelectedList->setFullWidth( true );
     //connect( mSelectedList, SIGNAL( doubleClicked( QListViewItem * ) ),
     //       SLOT( removeSelected() ) );
     connect( mSelectedList, SIGNAL( clicked( QListViewItem * ) ),
              SLOT( removeSelected() ) );
     connect( mSelectedList, SIGNAL( returnPressed( QListViewItem *) ),
              SLOT( removeSelected() ) );
 
 #if 0
     QPushButton *unselectButton = new QPushButton( i18n("Unselect"), selectedGroup ); 
     connect ( unselectButton, SIGNAL( clicked() ), SLOT( removeSelected() ) );
 
 #endif
     connect( mAddresseeList, SIGNAL( clicked( QListViewItem * ) ),
@@ -317,52 +300,52 @@ Addressee AddresseeDialog::getAddressee( QWidget *parent )
 #endif
     if ( result == QDialog::Accepted ) {
         addressee =  dlg->addressee();
     }
 
     delete dlg;
     return addressee;
 }
 
 Addressee::List AddresseeDialog::getAddressees( QWidget *parent )
 {
     Addressee::List addressees;
     static bool running = false;
     if ( running ) return addressees;
     running = true;
     AddresseeDialog *dlg = new AddresseeDialog( parent, true );
+#ifdef DESKTOP_VERSION
     static int geoX = 0;
     static int geoY = 0;
     static int geoW = 0;
     static int geoH = 0;
-    if ( QApplication::desktop()->width() <= 640 )
-        dlg->showMaximized();
-    else {
-        if ( !geoX  && ! geoY && !geoW &&!geoH ) {
-            geoX = dlg->geometry().x();
-            geoY = dlg->geometry().y();
-            geoW = dlg->width();
-            geoH = dlg->height();
-        } else {
-            dlg->show();
-            dlg->setGeometry(geoX , geoY,geoW , geoH  );
-
-        }
-    }
+    if ( !geoX  && ! geoY && !geoW &&!geoH ) {
+        geoX = dlg->geometry().x();
+        geoY = dlg->geometry().y();
+        geoW = dlg->width();
+        geoH = dlg->height();
+    } 
+    dlg->show();
+    dlg->setGeometry(geoX , geoY,geoW , geoH  );
+#else
+    dlg->showMaximized();
+#endif
     int result = dlg->exec();
+#ifdef DESKTOP_VERSION
     geoX = dlg->geometry().x();
     geoY = dlg->geometry().y();
     geoW = dlg->width();
     geoH = dlg->height();
+#endif
     if ( result == QDialog::Accepted ) {
         addressees =  dlg->addressees();
     }
 
     delete dlg;
     running = false;
     return addressees;
 }
 
 void AddresseeDialog::addressBookChanged()
 {
   loadAddressBook();
 }