-rw-r--r-- | kaddressbook/kabcore.cpp | 19 | ||||
-rw-r--r-- | kaddressbook/xxportselectdialog.cpp | 9 | ||||
-rw-r--r-- | kaddressbook/xxportselectdialog.h | 1 | ||||
-rw-r--r-- | version | 2 |
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 | |||
@@ -117,2 +117,3 @@ $Id$ | |||
117 | #include "externalapphandler.h" | 117 | #include "externalapphandler.h" |
118 | #include "xxportselectdialog.h" | ||
118 | 119 | ||
@@ -680,3 +681,2 @@ void KABCore::setContactSelected( const QString &uid ) | |||
680 | 681 | ||
681 | mActionExport2phone->setEnabled( selected ); | ||
682 | mActionWhoAmI->setEnabled( selected ); | 682 | mActionWhoAmI->setEnabled( selected ); |
@@ -782,3 +782,12 @@ void KABCore::export2phone() | |||
782 | { | 782 | { |
783 | 783 | QStringList uids; | |
784 | XXPortSelectDialog dlg( this, false, this ); | ||
785 | if ( dlg.exec() ) | ||
786 | uids = dlg.uids(); | ||
787 | else | ||
788 | return; | ||
789 | if ( uids.isEmpty() ) | ||
790 | return; | ||
791 | // qDebug("count %d ", uids.count()); | ||
792 | |||
784 | KAex2phonePrefs ex2phone; | 793 | KAex2phonePrefs ex2phone; |
@@ -800,6 +809,2 @@ void KABCore::export2phone() | |||
800 | 809 | ||
801 | QStringList uids = mViewManager->selectedUids(); | ||
802 | if ( uids.isEmpty() ) | ||
803 | return; | ||
804 | |||
805 | QString fileName = getPhoneFile(); | 810 | QString fileName = getPhoneFile(); |
@@ -1801,3 +1806,3 @@ void KABCore::initActions() | |||
1801 | 1806 | ||
1802 | mActionExport2phone = new KAction( i18n( "Selected to phone" ), "ex2phone", 0, this, | 1807 | mActionExport2phone = new KAction( i18n( "Export to phone" ), "ex2phone", 0, this, |
1803 | SLOT( export2phone() ), actionCollection(), | 1808 | 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, | |||
101 | 101 | ||
102 | QStringList XXPortSelectDialog::uids() | ||
103 | { | ||
104 | QStringList uidlist; | ||
105 | KABC::AddresseeList list = contacts(); | ||
106 | KABC::Addressee::List::Iterator it; | ||
107 | for ( it = list.begin(); it != list.end(); ++it ) | ||
108 | uidlist.append((*it).uid()); | ||
109 | return uidlist; | ||
110 | } | ||
102 | KABC::AddresseeList XXPortSelectDialog::contacts() | 111 | 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 | |||
50 | KABC::AddresseeList contacts(); | 50 | KABC::AddresseeList contacts(); |
51 | QStringList uids(); | ||
51 | 52 | ||
@@ -1 +1 @@ | |||
version = "1.9.12"; | version = "1.9.13"; | ||