Better phone export contact selection

3 files changed, 21 insertions, 6 deletions

diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index c339244..755da11 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -117,2 +117,3 @@ $Id$
 #include "externalapphandler.h"
+#include "xxportselectdialog.h"
 
@@ -680,3 +681,2 @@ void KABCore::setContactSelected( const QString &uid )
 
-  mActionExport2phone->setEnabled( selected );
   mActionWhoAmI->setEnabled( selected );
@@ -782,2 +782,11 @@ 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());
 
@@ -800,6 +809,2 @@ void KABCore::export2phone()
 
-    QStringList uids = mViewManager->selectedUids();
-    if ( uids.isEmpty() )
-        return;
-
     QString  fileName = getPhoneFile();
@@ -1801,3 +1806,3 @@ void KABCore::initActions()
 
-  mActionExport2phone = new KAction( i18n( "Selected to phone" ), "ex2phone", 0, this,
+  mActionExport2phone = new KAction( i18n( "Export to phone" ), "ex2phone", 0, this,
                                SLOT( export2phone() ), actionCollection(),
diff --git a/kaddressbook/xxportselectdialog.cpp b/kaddressbook/xxportselectdialog.cpp
index 41c999b..be254c0 100644
--- a/kaddressbook/xxportselectdialog.cpp
+++ b/kaddressbook/xxportselectdialog.cpp
@@ -101,2 +101,11 @@ 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
@@ -50,2 +50,3 @@ class XXPortSelectDialog : public KDialogBase
     KABC::AddresseeList contacts();
+    QStringList uids();