2 files changed, 25 insertions, 10 deletions

diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index d99a9cd..7be5db8 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -682,3 +682,2 @@ void KABCore::setContactSelected( const QString &uid )
   mActionWhoAmI->setEnabled( selected );
-  mActionCategories->setEnabled( selected );
 }
@@ -1015,2 +1014,14 @@ void KABCore::setCategories()
 {
+
+    QStringList uids;
+    XXPortSelectDialog dlgx( this, false, this );
+    if ( dlgx.exec() )
+        uids = dlgx.uids();
+    else
+        return;
+    if ( uids.isEmpty() )
+        return;
+    // qDebug("count %d ", uids.count());
+
+
   KPIM::CategorySelectDialog dlg( KABPrefs::instance(), this, "", true );
@@ -1028,3 +1039,3 @@ void KABCore::setCategories()
 
-  QStringList uids = mViewManager->selectedUids();
+  //QStringList uids = mViewManager->selectedUids();
   QStringList::Iterator it;
@@ -2110,2 +2121,6 @@ void KABCore::addActionsManually()
   mActionEditCategories->plug( settingsMenu );
+  mActionEditCategories->plug( changeMenu );
+  mActionCategories->plug( changeMenu );
+  mActionManageCategories->plug( changeMenu );
+
   mActionCategories->plug( settingsMenu );
diff --git a/kaddressbook/xxportselectdialog.cpp b/kaddressbook/xxportselectdialog.cpp
index be254c0..ab95d5f 100644
--- a/kaddressbook/xxportselectdialog.cpp
+++ b/kaddressbook/xxportselectdialog.cpp
@@ -55,3 +55,3 @@ XXPortSelectDialog::XXPortSelectDialog( KABCore *core, bool sort,
                                         QWidget* parent, const char* name )
-    : KDialogBase( Plain, i18n( "Choose which contacts to export" ), Help | Ok | Cancel,
+    : KDialogBase( Plain, i18n( "Choose which contacts to select" ), Help | Ok | Cancel,
                    Ok, parent, name, true, true ), mCore( core ),
@@ -206,3 +206,3 @@ void XXPortSelectDialog::initGUI()
 
-  QLabel *label = new QLabel( i18n( "Which contacts do you want to export?" ), page );
+  QLabel *label = new QLabel( i18n( "Which contacts do you want to select?" ), page );
   topLayout->addWidget( label );
@@ -219,3 +219,3 @@ void XXPortSelectDialog::initGUI()
   mUseWholeBook->setChecked( true );
-  QWhatsThis::add( mUseWholeBook, i18n( "Export the entire address book" ) );
+  QWhatsThis::add( mUseWholeBook, i18n( "Select the entire address book" ) );
   groupLayout->addWidget( mUseWholeBook, 0, 0 );
@@ -223,3 +223,3 @@ void XXPortSelectDialog::initGUI()
   mUseSelection = new QRadioButton( i18n( "&Selected" ), mButtonGroup );
-  QWhatsThis::add( mUseSelection, i18n( "Only export contacts selected in KAddressBook.\n"
+  QWhatsThis::add( mUseSelection, i18n( "Only contacts selected in KAddressBook.\n"
                                         "This option is disabled if no contacts are selected." ) );
@@ -228,3 +228,3 @@ void XXPortSelectDialog::initGUI()
   mUseFilters = new QRadioButton( i18n( "By matching &filter" ), mButtonGroup );
-  QWhatsThis::add( mUseFilters, i18n( "Only export contacts matching the selected filter.\n"
+  QWhatsThis::add( mUseFilters, i18n( "Only contacts matching the selected filter.\n"
                                      "This option is disabled if you haven't defined any filters" ) );
@@ -233,3 +233,3 @@ void XXPortSelectDialog::initGUI()
   mUseCategories = new QRadioButton( i18n( "By Cate&gories" ), mButtonGroup );
-  QWhatsThis::add( mUseCategories, i18n( "Only export contacts who are members of a category that is checked on the list to the left.\n"
+  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." ) );
@@ -238,3 +238,3 @@ void XXPortSelectDialog::initGUI()
   mFiltersCombo = new QComboBox( false, mButtonGroup );
-  QWhatsThis::add( mFiltersCombo, i18n( "Select a filter to decide which contacts to export." ) );
+  QWhatsThis::add( mFiltersCombo, i18n( "Select a filter to decide which contacts to select." ) );
   groupLayout->addWidget( mFiltersCombo, 2, 1 );
@@ -244,3 +244,3 @@ void XXPortSelectDialog::initGUI()
   mCategoriesView->header()->hide();
-  QWhatsThis::add( mCategoriesView, i18n( "Check the categories whose members you want to export." ) );
+  QWhatsThis::add( mCategoriesView, i18n( "Check the categories whose members you want to select." ) );
   groupLayout->addWidget( mCategoriesView, 3, 1 );