-rw-r--r-- | kaddressbook/kabcore.cpp | 59 |
1 files changed, 11 insertions, 48 deletions
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index 2c2f1a0..83027ac 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp | |||
@@ -957,20 +957,22 @@ void KABCore::setWhoAmI() | |||
957 | static_cast<KABC::StdAddressBook*>( KABC::StdAddressBook::self() )->setWhoAmI( addrList[ 0 ] ); | 957 | static_cast<KABC::StdAddressBook*>( KABC::StdAddressBook::self() )->setWhoAmI( addrList[ 0 ] ); |
958 | } | 958 | } |
959 | 959 | ||
960 | void KABCore::setCategories() | 960 | void 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(); |
974 | QStringList::Iterator it; | 976 | QStringList::Iterator it; |
975 | for ( it = uids.begin(); it != uids.end(); ++it ) { | 977 | for ( it = uids.begin(); it != uids.end(); ++it ) { |
976 | KABC::Addressee addr = mAddressBook->findByUid( *it ); | 978 | KABC::Addressee addr = mAddressBook->findByUid( *it ); |
@@ -990,12 +992,13 @@ void KABCore::setCategories() | |||
990 | mAddressBook->insertAddressee( addr ); | 992 | mAddressBook->insertAddressee( addr ); |
991 | } | 993 | } |
992 | } | 994 | } |
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 | ||
998 | void KABCore::setSearchFields( const KABC::Field::List &fields ) | 1001 | void KABCore::setSearchFields( const KABC::Field::List &fields ) |
999 | { | 1002 | { |
1000 | mIncSearchWidget->setFields( fields ); | 1003 | mIncSearchWidget->setFields( fields ); |
1001 | } | 1004 | } |
@@ -1881,21 +1884,17 @@ void KABCore::initActions() | |||
1881 | "edit_set_categories" ); | 1884 | "edit_set_categories" ); |
1882 | 1885 | ||
1883 | mActionRemoveVoice = new KAction( i18n( "Remove \"voice\"..." ), 0, this, | 1886 | mActionRemoveVoice = new KAction( i18n( "Remove \"voice\"..." ), 0, this, |
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" ); |
1899 | #ifdef KAB_EMBEDDED | 1898 | #ifdef KAB_EMBEDDED |
1900 | mActionLicence = new KAction( i18n( "Licence" ), 0, | 1899 | mActionLicence = new KAction( i18n( "Licence" ), 0, |
1901 | this, SLOT( showLicence() ), actionCollection(), | 1900 | this, SLOT( showLicence() ), actionCollection(), |
@@ -2019,14 +2018,12 @@ void KABCore::addActionsManually() | |||
2019 | mActionPaste->plug( editMenu ); | 2018 | mActionPaste->plug( editMenu ); |
2020 | mActionDelete->plug( editMenu ); | 2019 | mActionDelete->plug( editMenu ); |
2021 | editMenu->insertSeparator(); | 2020 | editMenu->insertSeparator(); |
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 !!! |
2030 | mActionConfigResources->plug( settingsMenu ); | 2027 | mActionConfigResources->plug( settingsMenu ); |
2031 | settingsMenu->insertSeparator(); | 2028 | settingsMenu->insertSeparator(); |
2032 | 2029 | ||
@@ -2051,12 +2048,13 @@ void KABCore::addActionsManually() | |||
2051 | settingsMenu->insertSeparator(); | 2048 | settingsMenu->insertSeparator(); |
2052 | mActionBR->plug(settingsMenu ); | 2049 | mActionBR->plug(settingsMenu ); |
2053 | settingsMenu->insertSeparator(); | 2050 | settingsMenu->insertSeparator(); |
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 ); |
2060 | mActionSyncHowto->plug( helpMenu ); | 2058 | mActionSyncHowto->plug( helpMenu ); |
2061 | mActionKdeSyncHowto->plug( helpMenu ); | 2059 | mActionKdeSyncHowto->plug( helpMenu ); |
2062 | mActionMultiSyncHowto->plug( helpMenu ); | 2060 | mActionMultiSyncHowto->plug( helpMenu ); |
@@ -2103,51 +2101,16 @@ void KABCore::addActionsManually() | |||
2103 | 2101 | ||
2104 | } | 2102 | } |
2105 | void KABCore::showLicence() | 2103 | void KABCore::showLicence() |
2106 | { | 2104 | { |
2107 | KApplication::showLicence(); | 2105 | KApplication::showLicence(); |
2108 | } | 2106 | } |
2109 | void KABCore::setCat() | 2107 | |
2110 | { | 2108 | void KABCore::manageCategories( ) |
2111 | setCategories( true ); | ||
2112 | } | ||
2113 | void KABCore::addCat() | ||
2114 | { | ||
2115 | setCategories( false ); | ||
2116 | } | ||
2117 | void 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 | } |
2149 | void KABCore::removeVoice() | 2112 | void KABCore::removeVoice() |
2150 | { | 2113 | { |
2151 | 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 ) | 2114 | 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 ) |
2152 | return; | 2115 | return; |
2153 | KABC::Addressee::List list = mViewManager->selectedAddressees(); | 2116 | KABC::Addressee::List list = mViewManager->selectedAddressees(); |