Better phone export contact selection

3 files changed, 22 insertions, 7 deletions

diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index c339244..755da11 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -112,12 +112,13 @@ $Id$
 
 #endif // KAB_EMBEDDED
 #include "kcmconfigs/kcmkabconfig.h"
 #include "kcmconfigs/kcmkdepimconfig.h"
 #include "kpimglobalprefs.h"
 #include "externalapphandler.h"
+#include "xxportselectdialog.h"
 
 
 #include <kresources/selectdialog.h>
 #include <kmessagebox.h>
 
 #include <picture.h>
@@ -675,13 +676,12 @@ void KABCore::setContactSelected( const QString &uid )
   //if (mActionBeam)
   //mActionBeam->setEnabled( selected );
 
   if (mActionBeamVCard)
    mActionBeamVCard->setEnabled( selected );
 
-  mActionExport2phone->setEnabled( selected );
   mActionWhoAmI->setEnabled( selected );
   mActionCategories->setEnabled( selected );
 }
 
 void KABCore::sendMail()
 {
@@ -777,13 +777,22 @@ void KABCore::beamMySelf()
 
   }
 }
 
 void KABCore::export2phone()
 {
-
+    QStringList uids;
+    XXPortSelectDialog dlg( this, false, this );
+    if ( dlg.exec() )
+        uids = dlg.uids();
+    else
+        return;
+    if ( uids.isEmpty() )
+        return;
+    // qDebug("count %d ", uids.count());
+   
     KAex2phonePrefs ex2phone;
     ex2phone.mPhoneConnection->setText( KPimGlobalPrefs::instance()->mEx2PhoneConnection );
     ex2phone.mPhoneDevice->setText( KPimGlobalPrefs::instance()->mEx2PhoneDevice );
     ex2phone.mPhoneModel->setText( KPimGlobalPrefs::instance()->mEx2PhoneModel );
 
     if ( !ex2phone.exec() ) {
@@ -795,16 +804,12 @@ void KABCore::export2phone()
 
 
     PhoneAccess::writeConfig( KPimGlobalPrefs::instance()->mEx2PhoneDevice,
                               KPimGlobalPrefs::instance()->mEx2PhoneConnection,
                               KPimGlobalPrefs::instance()->mEx2PhoneModel );
 
-    QStringList uids = mViewManager->selectedUids();
-    if ( uids.isEmpty() )
-        return;
-
     QString  fileName = getPhoneFile();
     if ( ! mAddressBook->export2PhoneFormat( uids ,fileName ) )
         return;
     
     message(i18n("Exporting to phone..."));
     QTimer::singleShot( 1, this , SLOT ( writeToPhone()));
@@ -1796,13 +1801,13 @@ void KABCore::initActions()
                              SLOT( newContact() ), actionCollection(), "file_new_contact" );
 
   mActionMailVCard = new KAction(i18n("Mail &vCard..."), "mail_post_to", 0,
                                  this, SLOT( mailVCard() ),
                                  actionCollection(), "file_mail_vcard");
 
-  mActionExport2phone = new KAction( i18n( "Selected to phone" ), "ex2phone", 0, this,
+  mActionExport2phone = new KAction( i18n( "Export to phone" ), "ex2phone", 0, this,
                                SLOT( export2phone() ), actionCollection(),
                                "kaddressbook_ex2phone" );
 
   mActionBeamVCard = 0;
  mActionBeam = 0;
 
diff --git a/kaddressbook/xxportselectdialog.cpp b/kaddressbook/xxportselectdialog.cpp
index 41c999b..be254c0 100644
--- a/kaddressbook/xxportselectdialog.cpp
+++ b/kaddressbook/xxportselectdialog.cpp
@@ -96,12 +96,21 @@ XXPortSelectDialog::XXPortSelectDialog( KABCore *core, bool sort,
   mFields = mCore->addressBook()->fields( KABC::Field::All );
   KABC::Field::List::Iterator fieldIt;
   for ( fieldIt = mFields.begin(); fieldIt != mFields.end(); ++fieldIt )
     mFieldCombo->insertItem( (*fieldIt)->label() );
 }
 
+QStringList XXPortSelectDialog::uids()
+{
+    QStringList uidlist;
+    KABC::AddresseeList list = contacts();
+    KABC::Addressee::List::Iterator it;
+    for ( it = list.begin(); it != list.end(); ++it )
+        uidlist.append((*it).uid());
+    return uidlist;
+}
 KABC::AddresseeList XXPortSelectDialog::contacts()
 {
   QStringList selection = mCore->selectedUIDs();
 
   KABC::AddresseeList list;
   if ( mUseSelection->isChecked() ) {
diff --git a/kaddressbook/xxportselectdialog.h b/kaddressbook/xxportselectdialog.h
index 8d56f66..3bb696f 100644
--- a/kaddressbook/xxportselectdialog.h
+++ b/kaddressbook/xxportselectdialog.h
@@ -45,12 +45,13 @@ class XXPortSelectDialog : public KDialogBase
 
   public:
     XXPortSelectDialog( KABCore *core, bool sort, QWidget* parent,
                         const char* name = 0 );
 
     KABC::AddresseeList contacts();
+    QStringList uids();
 
   private slots:
     void filterChanged( int );
     void categoryClicked( QListViewItem * i );
 
   protected slots: