3 files changed, 13 insertions, 8 deletions

diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index e34951a..ce5c755 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -2472,140 +2472,143 @@ void KABCore::updateActionMenu()
 {
   UndoStack *undo = UndoStack::instance();
   RedoStack *redo = RedoStack::instance();
 
   if ( undo->isEmpty() )
     mActionUndo->setText( i18n( "Undo" ) );
   else
     mActionUndo->setText( i18n( "Undo %1" ).arg( undo->top()->name() ) );
 
   mActionUndo->setEnabled( !undo->isEmpty() );
 
   if ( !redo->top() )
     mActionRedo->setText( i18n( "Redo" ) );
   else
     mActionRedo->setText( i18n( "Redo %1" ).arg( redo->top()->name() ) );
 
   mActionRedo->setEnabled( !redo->isEmpty() );
 }
 
 void KABCore::configureKeyBindings()
 {
 #ifndef KAB_EMBEDDED
   KKeyDialog::configure( actionCollection(), true );
 #else //KAB_EMBEDDED
   qDebug("KABCore::configureKeyBindings() not implemented");
 #endif //KAB_EMBEDDED
 }
 
 #ifdef KAB_EMBEDDED
 void KABCore::configureResources()
 {
   KRES::KCMKResources dlg( this, "" , 0 );
 
   if ( !dlg.exec() )
     return;
   KMessageBox::information( this,  i18n("Please restart to get the \nchanged resources (re)loaded!\n") );
 }
 #endif //KAB_EMBEDDED
 
 
 /* this method will be called through the QCop interface from Ko/Pi to select addresses
  * for the attendees list of an event.
  */
 void KABCore::requestForNameEmailUidList(const QString& sourceChannel, const QString& uid)
 {
 
   bool ok = false;
   mEmailSourceChannel = sourceChannel;
+  mEmailSourceUID = uid; 
+  callContactdialog();
+#if 0
   int wid = uid.toInt( &ok );
   qDebug("UID %s ", uid.latin1());
   if ( ok ) {
       if ( wid != QApplication::desktop()->width() ) {
           qDebug("KA/Pi: Request from different desktop geometry. Resizing ...");
           message( i18n("Resizing, please wait...") );
           mMainWindow->showMinimized();
           /*
           {
               QCopEnvelope e("QPE/Application/kapi", "callContactdialog()");
           }
           */
           QTimer::singleShot( 1,this, SLOT ( resizeAndCallContactdialog() ) );
           return;
       }
 
   } else {
       qDebug("KABCore::requestForNameEmailUidList:: Got invalid uid ");
   }
   callContactdialog();
   //QCopEnvelope e("QPE/Application/kapi", "callContactdialog()");
-
+#endif
 }
 void KABCore::resizeAndCallContactdialog()
 {
     updateMainWindow();
     QTimer::singleShot( 100,this, SLOT ( callContactdialog() ) );
 }
 
 void KABCore::callContactdialog()
 {
     QStringList nameList;
   QStringList emailList;
   QStringList uidList; 
-  qDebug("WIDTH %d ",   QApplication::desktop()->width()       );
+  qDebug(" KABCore::callContactdialog:DESKTOP WIDTH %d ",   QApplication::desktop()->width()       );
   KABC::Addressee::List list = KABC::AddresseeDialog::getAddressees(this);
   uint i=0;
   for (i=0; i < list.count(); i++)
   {
         nameList.append(list[i].realName());
         emailList.append(list[i].preferredEmail());
         uidList.append(list[i].uid());
   }
-  QString uid = "unnamed";
+  QString uid = mEmailSourceUID;
   //qDebug("%s %s ", sourceChannel.latin1(), uid.latin1());
   bool res = ExternalAppHandler::instance()->returnNameEmailUidListFromKAPI(mEmailSourceChannel, uid, nameList, emailList, uidList);
 
 }
 /* this method will be called through the QCop interface from Ko/Pi to select birthdays
  * to put them into the calendar.
  */
 void KABCore::requestForBirthdayList(const QString& sourceChannel, const QString& uid)
 {
   //  qDebug("KABCore::requestForBirthdayList");
   QStringList birthdayList;
   QStringList anniversaryList;
   QStringList realNameList;
   QStringList preferredEmailList;
   QStringList assembledNameList;
   QStringList uidList;
 
   KABC::AddressBook::Iterator it;
 
     int count = 0;
     for( it = mAddressBook->begin(); it != mAddressBook->end(); ++it ) { 
         ++count;
     }
     QProgressBar bar(count,0 );
     int w = 300;
     if ( QApplication::desktop()->width() < 320 )
         w = 220;
     int h = bar.sizeHint().height() ;
     int dw = QApplication::desktop()->width();
     int dh = QApplication::desktop()->height();
     bar.setGeometry( (dw-w)/2, (dh - h )/2 ,w,h );
     bar.show();
     bar.setCaption (i18n("Collecting birthdays - close to abort!") );
     qApp->processEvents();
 
     QDate bday;
     QString anni;
     QString formattedbday;
 
   for( it = mAddressBook->begin(); it != mAddressBook->end(); ++it )  
   {
         if ( ! bar.isVisible() )
             return;
         bar.setProgress( count++ );
         qApp->processEvents();
         bday = (*it).birthday().date();
         anni = (*it).custom("KADDRESSBOOK", "X-Anniversary" );
 
diff --git a/kaddressbook/kabcore.h b/kaddressbook/kabcore.h
index d89daee..4cef73a 100644
--- a/kaddressbook/kabcore.h
+++ b/kaddressbook/kabcore.h
@@ -345,96 +345,97 @@ class KABCore : public QWidget, public KSyncInterface
 
    void requestForNameEmailUidList(const QString& sourceChannel, const QString& sessionuid);
    void requestForDetails(const QString& sourceChannel, const QString& sessionuid, const QString& name, const QString& email, const QString& uid);
    void requestForBirthdayList(const QString& sourceChannel, const QString& sessionuid);
 
 
   signals:
     void contactSelected( const QString &name );
     void contactSelected( const QPixmap &pixmap );
   public slots:
     void recieve(QString cmsg );
     void getFile( bool success );
     void syncFileRequest();
     void setDetailsVisible( bool visible );
     void setDetailsToState();
    
     void saveSettings();
 
   private slots:
     void updateToolBar();
     void updateMainWindow();
     void receive( const QCString& cmsg, const QByteArray& data );
     void toggleBeamReceive( );
     void disableBR(bool);
     void setJumpButtonBarVisible( bool visible );
     void setJumpButtonBar( bool visible );
     void setCaptionBack();
     void resizeAndCallContactdialog();
     void callContactdialog();
 
   void importFromOL();
     void extensionModified( const KABC::Addressee::List &list );
     void extensionChanged( int id );
     void clipboardDataChanged();
     void updateActionMenu();
     void configureKeyBindings();
     void removeVoice();
     void setFormattedName();
 #ifdef KAB_EMBEDDED
     void configureResources();
 #endif //KAB_EMBEDDED
 
     void slotEditorDestroyed( const QString &uid );
     void configurationChanged();
     void addressBookChanged();
 
   private:
     QString mEmailSourceChannel;
+    QString mEmailSourceUID;
     void resizeEvent(QResizeEvent* e );
     bool mBRdisabled;
 #ifndef DESKTOP_VERSION
     QCopChannel* infrared;
 #endif
     QTimer *mMessageTimer;
     void initGUI();
     void initActions();
     QString getPhoneFile();
 
     AddresseeEditorDialog *createAddresseeEditorDialog( QWidget *parent,
                                                         const char *name = 0 );
 
  KXMLGUIClient *mGUIClient;
 
   KABC::AddressBook *mAddressBook;
 
   ViewManager *mViewManager;
   // QSplitter *mDetailsSplitter;
   KDGanttMinimizeSplitter *mExtensionBarSplitter;
   ViewContainer *mDetails;
   KDGanttMinimizeSplitter* mMiniSplitter;
   XXPortManager *mXXPortManager;
   JumpButtonBar *mJumpButtonBar;
   IncSearchWidget *mIncSearchWidget;
   ExtensionManager *mExtensionManager;
 
   KCMultiDialog *mConfigureDialog;
 
 #ifndef KAB_EMBEDDED
     LDAPSearchDialog *mLdapSearchDialog;
 #endif //KAB_EMBEDDED
     // QDict<AddresseeEditorDialog> mEditorDict;
     AddresseeEditorDialog *mEditorDialog;
     bool mReadWrite;
     bool mModified;
     bool mIsPart;
     bool mMultipleViewsAtOnce;
 
 
     //US file menu
     KAction *mActionMail;
     KAction *mActionBeam;
     KToggleAction *mActionBR;
     KAction *mActionExport2phone;
     KAction* mActionPrint;
     KAction* mActionPrintDetails;
     KAction* mActionNewContact;
diff --git a/kaddressbook/xxportselectdialog.cpp b/kaddressbook/xxportselectdialog.cpp
index e7bc8c0..0127fc0 100644
--- a/kaddressbook/xxportselectdialog.cpp
+++ b/kaddressbook/xxportselectdialog.cpp
@@ -197,138 +197,139 @@ KABC::AddresseeList XXPortSelectDialog::contacts()
     uint pos = mFieldCombo->currentItem();
     if ( pos < mFields.count() )
       list.sortByField( mFields[ pos ] );
   }
 
   return list;
 }
 
 QStringList XXPortSelectDialog::categories() const
 {
   QStringList list;
 
   QListViewItemIterator it( mCategoriesView );
   for ( ; it.current(); ++it ) {
     QCheckListItem* qcli = static_cast<QCheckListItem*>(it.current());
     if ( qcli->isOn() )
       list.append( it.current()->text( 0 ) );
   }
 
   return list;
 }
 
 void XXPortSelectDialog::filterChanged( int )
 {
   mUseFilters->setChecked( true );
 }
 
 void XXPortSelectDialog::categoryClicked( QListViewItem *i )
 {
   QCheckListItem *qcli = static_cast<QCheckListItem*>( i );
   if ( qcli->isOn() )
     mUseCategories->setChecked( true );
 }
 
 void XXPortSelectDialog::slotHelp()
 {
 #ifndef KAB_EMBEDDED
   kapp->invokeHelp( "import-and-export" );
 #else //KAB_EMBEDDED
   qDebug("XXPortSelectDialog::slotHelp is not implemented yet");
 #endif //KAB_EMBEDDED
 
 }
 
 void XXPortSelectDialog::initGUI()
 {
   QFrame *page = plainPage();
 
-  QVBoxLayout *topLayout = new QVBoxLayout( page, KDialog::marginHint(),
-                                            KDialog::spacingHint() );
+  QVBoxLayout *topLayout = new QVBoxLayout( page, KDialog::marginHintSmall(),
+                                            KDialog::spacingHintSmall() );
 
   QLabel *label = new QLabel( i18n( "Which contacts do you want to select?" ), page );
   topLayout->addWidget( label );
 
   mButtonGroup = new QButtonGroup( i18n( "Contact Selection" ), page );
   mButtonGroup->setColumnLayout( 0, Qt::Vertical );
   mButtonGroup->layout()->setSpacing( KDialog::spacingHint() );
   mButtonGroup->layout()->setMargin( KDialog::marginHint() );
 
   QGridLayout *groupLayout = new QGridLayout( mButtonGroup->layout() );
   groupLayout->setAlignment( Qt::AlignTop );
 
   mUseWholeBook = new QRadioButton( i18n( "&All" ), mButtonGroup );
   mUseWholeBook->setChecked( true );
   QWhatsThis::add( mUseWholeBook, i18n( "Select the entire address book" ) );
   groupLayout->addWidget( mUseWholeBook, 0, 0 );
 
   mUseSelection = new QRadioButton( i18n( "&Selected" ), mButtonGroup );
   QWhatsThis::add( mUseSelection, i18n( "Only contacts selected in KAddressBook.\n"
                                         "This option is disabled if no contacts are selected." ) );
   groupLayout->addWidget( mUseSelection, 1, 0 );
 
   mUseFilters = new QRadioButton( i18n( "By matching &filter" ), mButtonGroup );
   QWhatsThis::add( mUseFilters, i18n( "Only contacts matching the selected filter.\n"
                                      "This option is disabled if you haven't defined any filters" ) );
   groupLayout->addWidget( mUseFilters, 2, 0 );
 
   mUseCategories = new QRadioButton( i18n( "By Cate&gories" ), mButtonGroup );
   QWhatsThis::add( mUseCategories, i18n( "Only contacts who are members of a category that is checked on the list to the left.\n"
                                        "This option is disabled if you have no categories." ) );
   groupLayout->addWidget( mUseCategories, 3, 0 );
 
   mFiltersCombo = new QComboBox( false, mButtonGroup );
+  mFiltersCombo->setSizePolicy(QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding ) );
   QWhatsThis::add( mFiltersCombo, i18n( "Select a filter to decide which contacts to select." ) );
   groupLayout->addWidget( mFiltersCombo, 2, 1 );
 
   mCategoriesView = new QListView( mButtonGroup );
   mCategoriesView->addColumn( "" );
   mCategoriesView->header()->hide();
   QWhatsThis::add( mCategoriesView, i18n( "Check the categories whose members you want to select." ) );
   groupLayout->addWidget( mCategoriesView, 3, 1 );
-
-  if (QApplication::desktop()->height() == 480 )
-     mCategoriesView->setMaximumHeight( 240 );
+  mCategoriesView->setSizePolicy(QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding ) );
+  //if (QApplication::desktop()->height() == 480 )
+  // mCategoriesView->setMaximumHeight( 240 );
   topLayout->addWidget( mButtonGroup );
 
   QButtonGroup *sortingGroup = new QButtonGroup( i18n( "Sorting" ), page );
   sortingGroup->setColumnLayout( 0, Qt::Vertical );
   QGridLayout *sortLayout = new QGridLayout( sortingGroup->layout(), 2, 2,
                                              KDialog::spacingHint() );
   sortLayout->setAlignment( Qt::AlignTop );
 
   label = new QLabel( i18n( "Criterion:" ), sortingGroup );
   sortLayout->addWidget( label, 0, 0 );
 
 #ifndef KAB_EMBEDDED
   mFieldCombo = new KComboBox( false, sortingGroup );
 #else //KAB_EMBEDDED
   //US Combobox is not editable anyway
   mFieldCombo = new KComboBox( sortingGroup );
 #endif //KAB_EMBEDDED
   sortLayout->addWidget( mFieldCombo, 0, 1 );
 
   label = new QLabel( i18n( "Order:" ), sortingGroup );
   sortLayout->addWidget( label, 1, 0 );
 
 #ifndef KAB_EMBEDDED
   mSortTypeCombo = new KComboBox( false, sortingGroup );
 #else //KAB_EMBEDDED
   //US Combobox is not editable anyway
   mSortTypeCombo = new KComboBox( sortingGroup );
 #endif //KAB_EMBEDDED
   sortLayout->addWidget( mSortTypeCombo, 1, 1 );
 
   topLayout->addWidget( sortingGroup );
 
   if ( !mUseSorting )
     sortingGroup->hide(); 
 #ifndef DESKTOP_VERSION
   hideButtons();
 #endif
 }
 
 #ifndef KAB_EMBEDDED
 #include "xxportselectdialog.moc"
 #endif //KAB_EMBEDDED