summaryrefslogtreecommitdiffabout
Unidiff
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
@@ -951,32 +951,34 @@ void KABCore::setWhoAmI()
951 KMessageBox::sorry( this, i18n( "Please select only one contact." ) ); 951 KMessageBox::sorry( this, i18n( "Please select only one contact." ) );
952 return; 952 return;
953 } 953 }
954 954
955 QString text( i18n( "<qt>Do you really want to use <b>%1</b> as your new personal contact?</qt>" ) ); 955 QString text( i18n( "<qt>Do you really want to use <b>%1</b> as your new personal contact?</qt>" ) );
956 if ( KMessageBox::questionYesNo( this, text.arg( addrList[ 0 ].assembledName() ) ) == KMessageBox::Yes ) 956 if ( KMessageBox::questionYesNo( this, text.arg( addrList[ 0 ].assembledName() ) ) == KMessageBox::Yes )
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
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 return; 964 message( i18n("Setting categories cancelled") );
965 965 return;
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 );
977 if ( !addr.isEmpty() ) { 979 if ( !addr.isEmpty() ) {
978 if ( !merge ) 980 if ( !merge )
979 addr.setCategories( categories ); 981 addr.setCategories( categories );
980 else { 982 else {
981 QStringList addrCategories = addr.categories(); 983 QStringList addrCategories = addr.categories();
982 QStringList::Iterator catIt; 984 QStringList::Iterator catIt;
@@ -984,24 +986,25 @@ void KABCore::setCategories()
984 if ( !addrCategories.contains( *catIt ) ) 986 if ( !addrCategories.contains( *catIt ) )
985 addrCategories.append( *catIt ); 987 addrCategories.append( *catIt );
986 } 988 }
987 addr.setCategories( addrCategories ); 989 addr.setCategories( addrCategories );
988 } 990 }
989 991
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
998void KABCore::setSearchFields( const KABC::Field::List &fields ) 1001void KABCore::setSearchFields( const KABC::Field::List &fields )
999{ 1002{
1000 mIncSearchWidget->setFields( fields ); 1003 mIncSearchWidget->setFields( fields );
1001} 1004}
1002 1005
1003void KABCore::incrementalSearch( const QString& text ) 1006void KABCore::incrementalSearch( const QString& text )
1004{ 1007{
1005 mViewManager->doSearch( text, mIncSearchWidget->currentField() ); 1008 mViewManager->doSearch( text, mIncSearchWidget->currentField() );
1006} 1009}
1007 1010
@@ -1875,33 +1878,29 @@ void KABCore::initActions()
1875 SLOT( setWhoAmI() ), actionCollection(), 1878 SLOT( setWhoAmI() ), actionCollection(),
1876 "set_personal" ); 1879 "set_personal" );
1877 1880
1878 1881
1879 mActionCategories = new KAction( i18n( "Set Categories" ), 0, this, 1882 mActionCategories = new KAction( i18n( "Set Categories" ), 0, this,
1880 SLOT( setCategories() ), actionCollection(), 1883 SLOT( setCategories() ), actionCollection(),
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(),
1902 "licence_about_data" ); 1901 "licence_about_data" );
1903 mActionFaq = new KAction( i18n( "Faq" ), 0, 1902 mActionFaq = new KAction( i18n( "Faq" ), 0,
1904 this, SLOT( faq() ), actionCollection(), 1903 this, SLOT( faq() ), actionCollection(),
1905 "faq_about_data" ); 1904 "faq_about_data" );
1906 mActionWN = new KAction( i18n( "What's New?" ), 0, 1905 mActionWN = new KAction( i18n( "What's New?" ), 0,
1907 this, SLOT( whatsnew() ), actionCollection(), 1906 this, SLOT( whatsnew() ), actionCollection(),
@@ -2013,26 +2012,24 @@ void KABCore::addActionsManually()
2013 // edit menu 2012 // edit menu
2014 mActionUndo->plug( editMenu ); 2013 mActionUndo->plug( editMenu );
2015 mActionRedo->plug( editMenu ); 2014 mActionRedo->plug( editMenu );
2016 editMenu->insertSeparator(); 2015 editMenu->insertSeparator();
2017 mActionCut->plug( editMenu ); 2016 mActionCut->plug( editMenu );
2018 mActionCopy->plug( editMenu ); 2017 mActionCopy->plug( editMenu );
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
2033 mActionConfigKAddressbook->plug( settingsMenu ); 2030 mActionConfigKAddressbook->plug( settingsMenu );
2034 2031
2035 if ( mIsPart ) { 2032 if ( mIsPart ) {
2036 //US not implemented yet 2033 //US not implemented yet
2037 //mActionConfigShortcuts->plug( settingsMenu ); 2034 //mActionConfigShortcuts->plug( settingsMenu );
2038 //mActionConfigureToolbars->plug( settingsMenu ); 2035 //mActionConfigureToolbars->plug( settingsMenu );
@@ -2045,24 +2042,25 @@ void KABCore::addActionsManually()
2045 settingsMenu->insertSeparator(); 2042 settingsMenu->insertSeparator();
2046 2043
2047 mActionJumpBar->plug( settingsMenu ); 2044 mActionJumpBar->plug( settingsMenu );
2048 mActionDetails->plug( settingsMenu ); 2045 mActionDetails->plug( settingsMenu );
2049 //if (!KABPrefs::instance()->mMultipleViewsAtOnce || KGlobal::getDesktopSize() == KGlobal::Desktop ) 2046 //if (!KABPrefs::instance()->mMultipleViewsAtOnce || KGlobal::getDesktopSize() == KGlobal::Desktop )
2050 mActionDetails->plug( tb ); 2047 mActionDetails->plug( tb );
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 );
2063 mActionFaq->plug( helpMenu ); 2061 mActionFaq->plug( helpMenu );
2064 mActionLicence->plug( helpMenu ); 2062 mActionLicence->plug( helpMenu );
2065 mActionAboutKAddressbook->plug( helpMenu ); 2063 mActionAboutKAddressbook->plug( helpMenu );
2066 2064
2067 if (KGlobal::getDesktopSize() > KGlobal::Small ) { 2065 if (KGlobal::getDesktopSize() > KGlobal::Small ) {
2068 2066
@@ -2097,63 +2095,28 @@ void KABCore::addActionsManually()
2097 2095
2098#endif //KAB_EMBEDDED 2096#endif //KAB_EMBEDDED
2099 2097
2100 mActionExport2phone->plug( ExportMenu ); 2098 mActionExport2phone->plug( ExportMenu );
2101 connect ( syncMenu, SIGNAL( activated ( int ) ), syncManager, SLOT (slotSyncMenu( int ) ) ); 2099 connect ( syncMenu, SIGNAL( activated ( int ) ), syncManager, SLOT (slotSyncMenu( int ) ) );
2102 syncManager->fillSyncMenu(); 2100 syncManager->fillSyncMenu();
2103 2101
2104} 2102}
2105void KABCore::showLicence() 2103void 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{
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();
2154 KABC::Addressee::List::Iterator it; 2117 KABC::Addressee::List::Iterator it;
2155 for ( it = list.begin(); it != list.end(); ++it ) { 2118 for ( it = list.begin(); it != list.end(); ++it ) {
2156 2119
2157 if ( (*it).removeVoice() ) 2120 if ( (*it).removeVoice() )
2158 contactModified((*it) ); 2121 contactModified((*it) );
2159 } 2122 }
diff --git a/kaddressbook/kabcore.h b/kaddressbook/kabcore.h
index 1bdae5f..bf5398b 100644
--- a/kaddressbook/kabcore.h
+++ b/kaddressbook/kabcore.h
@@ -234,24 +234,25 @@ class KABCore : public QWidget, public KSyncInterface
234 234
235 /** 235 /**
236 Sets the whoAmI contact, that is used by many other programs to 236 Sets the whoAmI contact, that is used by many other programs to
237 get personal information about the current user. 237 get personal information about the current user.
238 */ 238 */
239 void setWhoAmI(); 239 void setWhoAmI();
240 240
241 /** 241 /**
242 Displays the category dialog and applies the result to all 242 Displays the category dialog and applies the result to all
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.
249 */ 250 */
250 void setSearchFields( const KABC::Field::List &fields ); 251 void setSearchFields( const KABC::Field::List &fields );
251 252
252 /** 253 /**
253 Search with the current search field for a contact, that matches 254 Search with the current search field for a contact, that matches
254 the given text, and selects it in the view. 255 the given text, and selects it in the view.
255 */ 256 */
256 void incrementalSearch( const QString& text ); 257 void incrementalSearch( const QString& text );
257 258
@@ -361,27 +362,24 @@ class KABCore : public QWidget, public KSyncInterface
361 void receive( const QCString& cmsg, const QByteArray& data ); 362 void receive( const QCString& cmsg, const QByteArray& data );
362 void toggleBeamReceive( ); 363 void toggleBeamReceive( );
363 void disableBR(bool); 364 void disableBR(bool);
364 void setJumpButtonBarVisible( bool visible ); 365 void setJumpButtonBarVisible( bool visible );
365 void setCaptionBack(); 366 void setCaptionBack();
366 void importFromOL(); 367 void importFromOL();
367 void extensionModified( const KABC::Addressee::List &list ); 368 void extensionModified( const KABC::Addressee::List &list );
368 void extensionChanged( int id ); 369 void extensionChanged( int id );
369 void clipboardDataChanged(); 370 void clipboardDataChanged();
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
379 377
380 void slotEditorDestroyed( const QString &uid ); 378 void slotEditorDestroyed( const QString &uid );
381 void configurationChanged(); 379 void configurationChanged();
382 void addressBookChanged(); 380 void addressBookChanged();
383 381
384 private: 382 private:
385 bool mBRdisabled; 383 bool mBRdisabled;
386#ifndef DESKTOP_VERSION 384#ifndef DESKTOP_VERSION
387 QCopChannel* infrared; 385 QCopChannel* infrared;
@@ -445,45 +443,44 @@ class KABCore : public QWidget, public KSyncInterface
445 KAction *mActionDelete; 443 KAction *mActionDelete;
446 444
447 //US settings menu 445 //US settings menu
448 KAction *mActionConfigResources; 446 KAction *mActionConfigResources;
449 KAction *mActionConfigKAddressbook; 447 KAction *mActionConfigKAddressbook;
450 KAction *mActionConfigShortcuts; 448 KAction *mActionConfigShortcuts;
451 KAction *mActionConfigureToolbars; 449 KAction *mActionConfigureToolbars;
452 KAction *mActionKeyBindings; 450 KAction *mActionKeyBindings;
453 KToggleAction *mActionJumpBar; 451 KToggleAction *mActionJumpBar;
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;
460 KAction *mActionWN; 459 KAction *mActionWN;
461 KAction *mActionSyncHowto; 460 KAction *mActionSyncHowto;
462 KAction *mActionKdeSyncHowto; 461 KAction *mActionKdeSyncHowto;
463 KAction *mActionMultiSyncHowto; 462 KAction *mActionMultiSyncHowto;
464 463
465 KAction *mActionDeleteView; 464 KAction *mActionDeleteView;
466 465
467 QPopupMenu *viewMenu; 466 QPopupMenu *viewMenu;
468 QPopupMenu *filterMenu; 467 QPopupMenu *filterMenu;
469 QPopupMenu *settingsMenu; 468 QPopupMenu *settingsMenu;
470 QPopupMenu *changeMenu; 469 QPopupMenu *changeMenu;
471//US QAction *mActionSave; 470//US QAction *mActionSave;
472 QPopupMenu *ImportMenu; 471 QPopupMenu *ImportMenu;
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
481 KAddressBookService *mAddressBookService; 478 KAddressBookService *mAddressBookService;
482#endif //KAB_EMBEDDED 479#endif //KAB_EMBEDDED
483 480
484 class KABCorePrivate; 481 class KABCorePrivate;
485 KABCorePrivate *d; 482 KABCorePrivate *d;
486 //US bool mBlockSaveFlag; 483 //US bool mBlockSaveFlag;
487 484
488#ifdef KAB_EMBEDDED 485#ifdef KAB_EMBEDDED
489 KAddressBookMain *mMainWindow; // should be the same like mGUIClient 486 KAddressBookMain *mMainWindow; // should be the same like mGUIClient