summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--kaddressbook/kabcore.cpp61
-rw-r--r--kaddressbook/kabcore.h7
2 files changed, 14 insertions, 54 deletions
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index 2c2f1a0..83027ac 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -960,14 +960,16 @@ void KABCore::setWhoAmI()
void KABCore::setCategories()
{
KPIM::CategorySelectDialog dlg( KABPrefs::instance(), this, "", true );
- if ( !dlg.exec() )
- return;
-
+ if ( !dlg.exec() ) {
+ message( i18n("Setting categories cancelled") );
+ return;
+ }
bool merge = false;
QString msg = i18n( "Merge with existing categories?" );
if ( KMessageBox::questionYesNo( this, msg ) == KMessageBox::Yes )
merge = true;
+ message( i18n("Setting categories ... please wait!") );
QStringList categories = dlg.selectedCategories();
QStringList uids = mViewManager->selectedUids();
@@ -993,6 +995,7 @@ void KABCore::setCategories()
if ( uids.count() > 0 )
setModified( true );
+ message( i18n("Setting categories completed!") );
}
void KABCore::setSearchFields( const KABC::Field::List &fields )
@@ -1884,15 +1887,11 @@ void KABCore::initActions()
SLOT( removeVoice() ), actionCollection(),
"remove_voice" );
- mActionSetCat= new KAction( i18n( "Set categories..." ), 0, this,
- SLOT( setCat() ), actionCollection(),
+ mActionManageCategories= new KAction( i18n( "Manage new categories..." ), 0, this,
+ SLOT( manageCategories() ), actionCollection(),
"remove_voice" );
- mActionAddCat= new KAction( i18n( "Add categories..." ), 0, this,
- SLOT( addCat() ), actionCollection(),
- "remove_voice" );
-
mActionImportOL = new KAction( i18n( "Import from Outlook..." ), 0, this,
SLOT( importFromOL() ), actionCollection(),
"import_OL" );
@@ -2022,8 +2021,6 @@ void KABCore::addActionsManually()
mActionSelectAll->plug( editMenu );
mActionRemoveVoice->plug( changeMenu );
- mActionSetCat->plug( changeMenu );
- mActionAddCat->plug( changeMenu );
// settings menu
//US special menuentry to configure the addressbook resources. On KDE
// you do that through the control center !!!
@@ -2054,6 +2051,7 @@ void KABCore::addActionsManually()
mActionWhoAmI->plug( settingsMenu );
mActionCategories->plug( settingsMenu );
+ mActionManageCategories->plug( settingsMenu );
mActionWN->plug( helpMenu );
@@ -2106,45 +2104,10 @@ void KABCore::showLicence()
{
KApplication::showLicence();
}
-void KABCore::setCat()
-{
- setCategories( true );
-}
-void KABCore::addCat()
-{
- setCategories( false );
-}
-void KABCore::setCategories( bool removeOld )
+
+void KABCore::manageCategories( )
{
- KPIM::CategorySelectDialog* csd = new KPIM::CategorySelectDialog( KABPrefs::instance(), 0 );
- if (! csd->exec()) {
- message( i18n("Setting categories cancelled") );
- delete csd;
- return;
- }
- message( i18n("Setting categories ... please wait!") );
- QStringList catList = csd->selectedCategories();
- delete csd;
- catList.sort();
- QStringList newList;
- KABC::Addressee::List list = mViewManager->selectedAddressees();
- KABC::Addressee::List::Iterator it;
- for ( it = list.begin(); it != list.end(); ++it ) {
- if ( removeOld ) {
- (*it).setCategories( catList );
- } else {
- newList = (*it).categories();
- int i;
- for( i = 0; i< catList.count(); ++i ) {
- if ( !newList.contains (catList[i]))
- newList.append( catList[i] );
- }
- newList.sort();
- (*it).setCategories( newList );
- }
- contactModified((*it) );
- }
- message( i18n("Setting categories completed!") );
+
}
void KABCore::removeVoice()
{
diff --git a/kaddressbook/kabcore.h b/kaddressbook/kabcore.h
index 1bdae5f..bf5398b 100644
--- a/kaddressbook/kabcore.h
+++ b/kaddressbook/kabcore.h
@@ -243,6 +243,7 @@ class KABCore : public QWidget, public KSyncInterface
selected contacts.
*/
void setCategories();
+ void manageCategories();
/**
Sets the field list of the Incremental Search Widget.
@@ -370,9 +371,6 @@ class KABCore : public QWidget, public KSyncInterface
void updateActionMenu();
void configureKeyBindings();
void removeVoice();
- void setCat();
- void addCat();
- void setCategories( bool removeOld );
#ifdef KAB_EMBEDDED
void configureResources();
#endif //KAB_EMBEDDED
@@ -454,6 +452,7 @@ class KABCore : public QWidget, public KSyncInterface
KToggleAction *mActionDetails;
KAction *mActionWhoAmI;
KAction *mActionCategories;
+ KAction *mActionManageCategories;
KAction *mActionAboutKAddressbook;
KAction *mActionLicence;
KAction *mActionFaq;
@@ -473,8 +472,6 @@ class KABCore : public QWidget, public KSyncInterface
QPopupMenu *ExportMenu;
//LR additional methods
KAction *mActionRemoveVoice;
- KAction *mActionSetCat;
- KAction *mActionAddCat;
KAction * mActionImportOL;
#ifndef KAB_EMBEDDED