summaryrefslogtreecommitdiffabout
path: root/kaddressbook
authorzautrix <zautrix>2004-10-29 23:13:22 (UTC)
committer zautrix <zautrix>2004-10-29 23:13:22 (UTC)
commitda80b510e4643fa3f78cf3f97af108e87097583d (patch) (side-by-side diff)
tree01c328362a6bf1898853ba26fd5d48eb5cff1e27 /kaddressbook
parentaafa695508796e86e9f267633ea5e6965d876031 (diff)
downloadkdepimpi-da80b510e4643fa3f78cf3f97af108e87097583d.zip
kdepimpi-da80b510e4643fa3f78cf3f97af108e87097583d.tar.gz
kdepimpi-da80b510e4643fa3f78cf3f97af108e87097583d.tar.bz2
added better category handling to kapi
Diffstat (limited to 'kaddressbook') (more/less context) (ignore whitespace changes)
-rw-r--r--kaddressbook/kabcore.cpp54
-rw-r--r--kaddressbook/kabcore.h5
2 files changed, 57 insertions, 2 deletions
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index e6bdde9..2c2f1a0 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -1873,21 +1873,29 @@ void KABCore::initActions()
mActionWhoAmI = new KAction( i18n( "Set Who Am I" ), "personal", 0, this,
SLOT( setWhoAmI() ), actionCollection(),
"set_personal" );
-
-
mActionCategories = new KAction( i18n( "Set Categories" ), 0, this,
SLOT( setCategories() ), actionCollection(),
"edit_set_categories" );
mActionRemoveVoice = new KAction( i18n( "Remove \"voice\"..." ), 0, this,
SLOT( removeVoice() ), actionCollection(),
"remove_voice" );
+
+ mActionSetCat= new KAction( i18n( "Set categories..." ), 0, this,
+ SLOT( setCat() ), 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" );
#ifdef KAB_EMBEDDED
mActionLicence = new KAction( i18n( "Licence" ), 0,
this, SLOT( showLicence() ), actionCollection(),
@@ -2011,12 +2019,14 @@ void KABCore::addActionsManually()
mActionPaste->plug( editMenu );
mActionDelete->plug( editMenu );
editMenu->insertSeparator();
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 !!!
mActionConfigResources->plug( settingsMenu );
settingsMenu->insertSeparator();
@@ -2093,12 +2103,52 @@ void KABCore::addActionsManually()
}
void KABCore::showLicence()
{
KApplication::showLicence();
}
+void KABCore::setCat()
+{
+ setCategories( true );
+}
+void KABCore::addCat()
+{
+ setCategories( false );
+}
+void KABCore::setCategories( bool removeOld )
+{
+ 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()
{
if ( KMessageBox::questionYesNo( this, i18n("After importing, phone numbers\nmay have two or more types.\n(E.g. work+voice)\nThese numbers are shown as \"other\".\nClick Yes to remove the voice type\nfrom numbers with more than one type.\n\nRemove voice type?") ) == KMessageBox::No )
return;
KABC::Addressee::List list = mViewManager->selectedAddressees();
KABC::Addressee::List::Iterator it;
diff --git a/kaddressbook/kabcore.h b/kaddressbook/kabcore.h
index c01d598..1bdae5f 100644
--- a/kaddressbook/kabcore.h
+++ b/kaddressbook/kabcore.h
@@ -367,12 +367,15 @@ class KABCore : public QWidget, public KSyncInterface
void extensionModified( const KABC::Addressee::List &list );
void extensionChanged( int id );
void clipboardDataChanged();
void updateActionMenu();
void configureKeyBindings();
void removeVoice();
+ void setCat();
+ void addCat();
+ void setCategories( bool removeOld );
#ifdef KAB_EMBEDDED
void configureResources();
#endif //KAB_EMBEDDED
void slotEditorDestroyed( const QString &uid );
void configurationChanged();
@@ -467,12 +470,14 @@ class KABCore : public QWidget, public KSyncInterface
QPopupMenu *changeMenu;
//US QAction *mActionSave;
QPopupMenu *ImportMenu;
QPopupMenu *ExportMenu;
//LR additional methods
KAction *mActionRemoveVoice;
+ KAction *mActionSetCat;
+ KAction *mActionAddCat;
KAction * mActionImportOL;
#ifndef KAB_EMBEDDED
KAddressBookService *mAddressBookService;
#endif //KAB_EMBEDDED