Better phone export contact selection

4 files changed, 23 insertions, 8 deletions

diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index c339244..755da11 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -116,4 +116,5 @@ $Id$
 #include "kpimglobalprefs.h"
 #include "externalapphandler.h"
+#include "xxportselectdialog.h"
 
 
@@ -679,5 +680,4 @@ void KABCore::setContactSelected( const QString &uid )
    mActionBeamVCard->setEnabled( selected );
 
-  mActionExport2phone->setEnabled( selected );
   mActionWhoAmI->setEnabled( selected );
   mActionCategories->setEnabled( selected );
@@ -781,5 +781,14 @@ 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 );
@@ -799,8 +808,4 @@ void KABCore::export2phone()
                               KPimGlobalPrefs::instance()->mEx2PhoneModel );
 
-    QStringList uids = mViewManager->selectedUids();
-    if ( uids.isEmpty() )
-        return;
-
     QString  fileName = getPhoneFile();
     if ( ! mAddressBook->export2PhoneFormat( uids ,fileName ) )
@@ -1800,5 +1805,5 @@ void KABCore::initActions()
                                  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" );
diff --git a/kaddressbook/xxportselectdialog.cpp b/kaddressbook/xxportselectdialog.cpp
index 41c999b..be254c0 100644
--- a/kaddressbook/xxportselectdialog.cpp
+++ b/kaddressbook/xxportselectdialog.cpp
@@ -100,4 +100,13 @@ XXPortSelectDialog::XXPortSelectDialog( KABCore *core, bool sort,
 }
 
+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()
 {
diff --git a/kaddressbook/xxportselectdialog.h b/kaddressbook/xxportselectdialog.h
index 8d56f66..3bb696f 100644
--- a/kaddressbook/xxportselectdialog.h
+++ b/kaddressbook/xxportselectdialog.h
@@ -49,4 +49,5 @@ class XXPortSelectDialog : public KDialogBase
 
     KABC::AddresseeList contacts();
+    QStringList uids();
 
   private slots:
diff --git a/version b/version
index 4368d49..c4fe6e2 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-version = "1.9.12";
+version = "1.9.13";