summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--kaddressbook/kabcore.cpp59
-rw-r--r--kaddressbook/kabcore.h7
2 files changed, 13 insertions, 53 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()
960void KABCore::setCategories() 960void KABCore::setCategories()
961{ 961{
962 KPIM::CategorySelectDialog dlg( KABPrefs::instance(), this, "", true ); 962 KPIM::CategorySelectDialog dlg( KABPrefs::instance(), this, "", true );
963 if ( !dlg.exec() ) 963 if ( !dlg.exec() ) {
964 message( i18n("Setting categories cancelled") );
964 return; 965 return;
965 966 }
966 bool merge = false; 967 bool merge = false;
967 QString msg = i18n( "Merge with existing categories?" ); 968 QString msg = i18n( "Merge with existing categories?" );
968 if ( KMessageBox::questionYesNo( this, msg ) == KMessageBox::Yes ) 969 if ( KMessageBox::questionYesNo( this, msg ) == KMessageBox::Yes )
969 merge = true; 970 merge = true;
970 971
972 message( i18n("Setting categories ... please wait!") );
971 QStringList categories = dlg.selectedCategories(); 973 QStringList categories = dlg.selectedCategories();
972 974
973 QStringList uids = mViewManager->selectedUids(); 975 QStringList uids = mViewManager->selectedUids();
@@ -993,6 +995,7 @@ void KABCore::setCategories()
993 995
994 if ( uids.count() > 0 ) 996 if ( uids.count() > 0 )
995 setModified( true ); 997 setModified( true );
998 message( i18n("Setting categories completed!") );
996} 999}
997 1000
998void KABCore::setSearchFields( const KABC::Field::List &fields ) 1001void KABCore::setSearchFields( const KABC::Field::List &fields )
@@ -1884,15 +1887,11 @@ void KABCore::initActions()
1884 SLOT( removeVoice() ), actionCollection(), 1887 SLOT( removeVoice() ), actionCollection(),
1885 "remove_voice" ); 1888 "remove_voice" );
1886 1889
1887 mActionSetCat= new KAction( i18n( "Set categories..." ), 0, this, 1890 mActionManageCategories= new KAction( i18n( "Manage new categories..." ), 0, this,
1888 SLOT( setCat() ), actionCollection(), 1891 SLOT( manageCategories() ), actionCollection(),
1889 "remove_voice" ); 1892 "remove_voice" );
1890 1893
1891 1894
1892 mActionAddCat= new KAction( i18n( "Add categories..." ), 0, this,
1893 SLOT( addCat() ), actionCollection(),
1894 "remove_voice" );
1895
1896 mActionImportOL = new KAction( i18n( "Import from Outlook..." ), 0, this, 1895 mActionImportOL = new KAction( i18n( "Import from Outlook..." ), 0, this,
1897 SLOT( importFromOL() ), actionCollection(), 1896 SLOT( importFromOL() ), actionCollection(),
1898 "import_OL" ); 1897 "import_OL" );
@@ -2022,8 +2021,6 @@ void KABCore::addActionsManually()
2022 mActionSelectAll->plug( editMenu ); 2021 mActionSelectAll->plug( editMenu );
2023 2022
2024 mActionRemoveVoice->plug( changeMenu ); 2023 mActionRemoveVoice->plug( changeMenu );
2025 mActionSetCat->plug( changeMenu );
2026 mActionAddCat->plug( changeMenu );
2027 // settings menu 2024 // settings menu
2028//US special menuentry to configure the addressbook resources. On KDE 2025//US special menuentry to configure the addressbook resources. On KDE
2029// you do that through the control center !!! 2026// you do that through the control center !!!
@@ -2054,6 +2051,7 @@ void KABCore::addActionsManually()
2054 2051
2055 mActionWhoAmI->plug( settingsMenu ); 2052 mActionWhoAmI->plug( settingsMenu );
2056 mActionCategories->plug( settingsMenu ); 2053 mActionCategories->plug( settingsMenu );
2054 mActionManageCategories->plug( settingsMenu );
2057 2055
2058 2056
2059 mActionWN->plug( helpMenu ); 2057 mActionWN->plug( helpMenu );
@@ -2106,45 +2104,10 @@ void KABCore::showLicence()
2106{ 2104{
2107 KApplication::showLicence(); 2105 KApplication::showLicence();
2108} 2106}
2109void KABCore::setCat() 2107
2110{ 2108void KABCore::manageCategories( )
2111 setCategories( true );
2112}
2113void KABCore::addCat()
2114{
2115 setCategories( false );
2116}
2117void KABCore::setCategories( bool removeOld )
2118{ 2109{
2119 KPIM::CategorySelectDialog* csd = new KPIM::CategorySelectDialog( KABPrefs::instance(), 0 ); 2110
2120 if (! csd->exec()) {
2121 message( i18n("Setting categories cancelled") );
2122 delete csd;
2123 return;
2124 }
2125 message( i18n("Setting categories ... please wait!") );
2126 QStringList catList = csd->selectedCategories();
2127 delete csd;
2128 catList.sort();
2129 QStringList newList;
2130 KABC::Addressee::List list = mViewManager->selectedAddressees();
2131 KABC::Addressee::List::Iterator it;
2132 for ( it = list.begin(); it != list.end(); ++it ) {
2133 if ( removeOld ) {
2134 (*it).setCategories( catList );
2135 } else {
2136 newList = (*it).categories();
2137 int i;
2138 for( i = 0; i< catList.count(); ++i ) {
2139 if ( !newList.contains (catList[i]))
2140 newList.append( catList[i] );
2141 }
2142 newList.sort();
2143 (*it).setCategories( newList );
2144 }
2145 contactModified((*it) );
2146 }
2147 message( i18n("Setting categories completed!") );
2148} 2111}
2149void KABCore::removeVoice() 2112void KABCore::removeVoice()
2150{ 2113{
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
243 selected contacts. 243 selected contacts.
244 */ 244 */
245 void setCategories(); 245 void setCategories();
246 void manageCategories();
246 247
247 /** 248 /**
248 Sets the field list of the Incremental Search Widget. 249 Sets the field list of the Incremental Search Widget.
@@ -370,9 +371,6 @@ class KABCore : public QWidget, public KSyncInterface
370 void updateActionMenu(); 371 void updateActionMenu();
371 void configureKeyBindings(); 372 void configureKeyBindings();
372 void removeVoice(); 373 void removeVoice();
373 void setCat();
374 void addCat();
375 void setCategories( bool removeOld );
376#ifdef KAB_EMBEDDED 374#ifdef KAB_EMBEDDED
377 void configureResources(); 375 void configureResources();
378#endif //KAB_EMBEDDED 376#endif //KAB_EMBEDDED
@@ -454,6 +452,7 @@ class KABCore : public QWidget, public KSyncInterface
454 KToggleAction *mActionDetails; 452 KToggleAction *mActionDetails;
455 KAction *mActionWhoAmI; 453 KAction *mActionWhoAmI;
456 KAction *mActionCategories; 454 KAction *mActionCategories;
455 KAction *mActionManageCategories;
457 KAction *mActionAboutKAddressbook; 456 KAction *mActionAboutKAddressbook;
458 KAction *mActionLicence; 457 KAction *mActionLicence;
459 KAction *mActionFaq; 458 KAction *mActionFaq;
@@ -473,8 +472,6 @@ class KABCore : public QWidget, public KSyncInterface
473 QPopupMenu *ExportMenu; 472 QPopupMenu *ExportMenu;
474 //LR additional methods 473 //LR additional methods
475 KAction *mActionRemoveVoice; 474 KAction *mActionRemoveVoice;
476 KAction *mActionSetCat;
477 KAction *mActionAddCat;
478 KAction * mActionImportOL; 475 KAction * mActionImportOL;
479 476
480#ifndef KAB_EMBEDDED 477#ifndef KAB_EMBEDDED