summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2004-10-30 01:00:42 (UTC)
committer zautrix <zautrix>2004-10-30 01:00:42 (UTC)
commitc477fa8ba7eacfaba3d154a72153acc7bc46abdc (patch) (unidiff)
tree0ba938ac70b5f878515432a7ba36525f6167be3f
parentaf857a738da80e9eb68cf311832d44ecb9caf1dd (diff)
downloadkdepimpi-c477fa8ba7eacfaba3d154a72153acc7bc46abdc.zip
kdepimpi-c477fa8ba7eacfaba3d154a72153acc7bc46abdc.tar.gz
kdepimpi-c477fa8ba7eacfaba3d154a72153acc7bc46abdc.tar.bz2
AARGG. I just noticed, that set categories was alreday there. removed my second implementation
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
@@ -931,97 +931,100 @@ void KABCore::pasteContacts()
931 931
932void KABCore::pasteContacts( KABC::Addressee::List &list ) 932void KABCore::pasteContacts( KABC::Addressee::List &list )
933{ 933{
934 KABC::Resource *resource = requestResource( this ); 934 KABC::Resource *resource = requestResource( this );
935 KABC::Addressee::List::Iterator it; 935 KABC::Addressee::List::Iterator it;
936 for ( it = list.begin(); it != list.end(); ++it ) 936 for ( it = list.begin(); it != list.end(); ++it )
937 (*it).setResource( resource ); 937 (*it).setResource( resource );
938 938
939 PwPasteCommand *command = new PwPasteCommand( this, list ); 939 PwPasteCommand *command = new PwPasteCommand( this, list );
940 UndoStack::instance()->push( command ); 940 UndoStack::instance()->push( command );
941 RedoStack::instance()->clear(); 941 RedoStack::instance()->clear();
942 942
943 setModified( true ); 943 setModified( true );
944} 944}
945 945
946void KABCore::setWhoAmI() 946void KABCore::setWhoAmI()
947{ 947{
948 KABC::Addressee::List addrList = mViewManager->selectedAddressees(); 948 KABC::Addressee::List addrList = mViewManager->selectedAddressees();
949 949
950 if ( addrList.count() > 1 ) { 950 if ( addrList.count() > 1 ) {
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;
983 for ( catIt = categories.begin(); catIt != categories.end(); ++catIt ) { 985 for ( catIt = categories.begin(); catIt != categories.end(); ++catIt ) {
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
1008void KABCore::setModified() 1011void KABCore::setModified()
1009{ 1012{
1010 setModified( true ); 1013 setModified( true );
1011} 1014}
1012 1015
1013void KABCore::setModifiedWOrefresh() 1016void KABCore::setModifiedWOrefresh()
1014{ 1017{
1015 // qDebug("KABCore::setModifiedWOrefresh() "); 1018 // qDebug("KABCore::setModifiedWOrefresh() ");
1016 mModified = true; 1019 mModified = true;
1017 mActionSave->setEnabled( mModified ); 1020 mActionSave->setEnabled( mModified );
1018#ifdef DESKTOP_VERSION 1021#ifdef DESKTOP_VERSION
1019 mDetails->refreshView(); 1022 mDetails->refreshView();
1020#endif 1023#endif
1021 1024
1022} 1025}
1023void KABCore::setModified( bool modified ) 1026void KABCore::setModified( bool modified )
1024{ 1027{
1025 mModified = modified; 1028 mModified = modified;
1026 mActionSave->setEnabled( mModified ); 1029 mActionSave->setEnabled( mModified );
1027 1030
@@ -1855,73 +1858,69 @@ void KABCore::initActions()
1855 1858
1856 mActionBR = new KToggleAction( i18n( "Beam receive enabled" ), "beam", 0, this, 1859 mActionBR = new KToggleAction( i18n( "Beam receive enabled" ), "beam", 0, this,
1857 SLOT( toggleBeamReceive() ), actionCollection(), 1860 SLOT( toggleBeamReceive() ), actionCollection(),
1858 "kaddressbook_beam_rec" ); 1861 "kaddressbook_beam_rec" );
1859 1862
1860 1863
1861 // misc 1864 // misc
1862 // only enable LDAP lookup if we can handle the protocol 1865 // only enable LDAP lookup if we can handle the protocol
1863#ifndef KAB_EMBEDDED 1866#ifndef KAB_EMBEDDED
1864 if ( KProtocolInfo::isKnownProtocol( KURL( "ldap://localhost" ) ) ) { 1867 if ( KProtocolInfo::isKnownProtocol( KURL( "ldap://localhost" ) ) ) {
1865 new KAction( i18n( "&Lookup Addresses in Directory" ), "find", 0, 1868 new KAction( i18n( "&Lookup Addresses in Directory" ), "find", 0,
1866 this, SLOT( openLDAPDialog() ), actionCollection(), 1869 this, SLOT( openLDAPDialog() ), actionCollection(),
1867 "ldap_lookup" ); 1870 "ldap_lookup" );
1868 } 1871 }
1869#else //KAB_EMBEDDED 1872#else //KAB_EMBEDDED
1870 //qDebug("KABCore::initActions() LDAP has to be implemented"); 1873 //qDebug("KABCore::initActions() LDAP has to be implemented");
1871#endif //KAB_EMBEDDED 1874#endif //KAB_EMBEDDED
1872 1875
1873 1876
1874 mActionWhoAmI = new KAction( i18n( "Set Who Am I" ), "personal", 0, this, 1877 mActionWhoAmI = new KAction( i18n( "Set Who Am I" ), "personal", 0, this,
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(),
1908 "wn" ); 1907 "wn" );
1909 mActionSyncHowto = new KAction( i18n( "Sync HowTo" ), 0, 1908 mActionSyncHowto = new KAction( i18n( "Sync HowTo" ), 0,
1910 this, SLOT( synchowto() ), actionCollection(), 1909 this, SLOT( synchowto() ), actionCollection(),
1911 "sync" ); 1910 "sync" );
1912 mActionKdeSyncHowto = new KAction( i18n( "Kde Sync HowTo" ), 0, 1911 mActionKdeSyncHowto = new KAction( i18n( "Kde Sync HowTo" ), 0,
1913 this, SLOT( kdesynchowto() ), actionCollection(), 1912 this, SLOT( kdesynchowto() ), actionCollection(),
1914 "kdesync" ); 1913 "kdesync" );
1915 mActionMultiSyncHowto = new KAction( i18n( "Multi Sync HowTo" ), 0, 1914 mActionMultiSyncHowto = new KAction( i18n( "Multi Sync HowTo" ), 0,
1916 this, SLOT( multisynchowto() ), actionCollection(), 1915 this, SLOT( multisynchowto() ), actionCollection(),
1917 "multisync" ); 1916 "multisync" );
1918 1917
1919 mActionAboutKAddressbook = new KAction( i18n( "&About KAddressBook" ), "kaddressbook2", 0, 1918 mActionAboutKAddressbook = new KAction( i18n( "&About KAddressBook" ), "kaddressbook2", 0,
1920 this, SLOT( createAboutData() ), actionCollection(), 1919 this, SLOT( createAboutData() ), actionCollection(),
1921 "kaddressbook_about_data" ); 1920 "kaddressbook_about_data" );
1922#endif //KAB_EMBEDDED 1921#endif //KAB_EMBEDDED
1923 1922
1924 clipboardDataChanged(); 1923 clipboardDataChanged();
1925 connect( UndoStack::instance(), SIGNAL( changed() ), SLOT( updateActionMenu() ) ); 1924 connect( UndoStack::instance(), SIGNAL( changed() ), SLOT( updateActionMenu() ) );
1926 connect( RedoStack::instance(), SIGNAL( changed() ), SLOT( updateActionMenu() ) ); 1925 connect( RedoStack::instance(), SIGNAL( changed() ), SLOT( updateActionMenu() ) );
1927} 1926}
@@ -1993,187 +1992,151 @@ void KABCore::addActionsManually()
1993 mActionEditAddressee->plug( fileMenu ); 1992 mActionEditAddressee->plug( fileMenu );
1994 // if ((KGlobal::getDesktopSize() > KGlobal::Small ) || 1993 // if ((KGlobal::getDesktopSize() > KGlobal::Small ) ||
1995 // (!KABPrefs::instance()->mMultipleViewsAtOnce )) 1994 // (!KABPrefs::instance()->mMultipleViewsAtOnce ))
1996 mActionEditAddressee->plug( tb ); 1995 mActionEditAddressee->plug( tb );
1997 1996
1998 fileMenu->insertSeparator(); 1997 fileMenu->insertSeparator();
1999 mActionSave->plug( fileMenu ); 1998 mActionSave->plug( fileMenu );
2000 fileMenu->insertItem( "&Import", ImportMenu ); 1999 fileMenu->insertItem( "&Import", ImportMenu );
2001 fileMenu->insertItem( "&Export", ExportMenu ); 2000 fileMenu->insertItem( "&Export", ExportMenu );
2002 fileMenu->insertSeparator(); 2001 fileMenu->insertSeparator();
2003 mActionMailVCard->plug( fileMenu ); 2002 mActionMailVCard->plug( fileMenu );
2004#ifndef DESKTOP_VERSION 2003#ifndef DESKTOP_VERSION
2005 if ( Ir::supported() ) mActionBeamVCard->plug( fileMenu ); 2004 if ( Ir::supported() ) mActionBeamVCard->plug( fileMenu );
2006 if ( Ir::supported() ) mActionBeam->plug(fileMenu ); 2005 if ( Ir::supported() ) mActionBeam->plug(fileMenu );
2007#endif 2006#endif
2008 fileMenu->insertSeparator(); 2007 fileMenu->insertSeparator();
2009 mActionQuit->plug( fileMenu ); 2008 mActionQuit->plug( fileMenu );
2010#ifdef _WIN32_ 2009#ifdef _WIN32_
2011 mActionImportOL->plug( ImportMenu ); 2010 mActionImportOL->plug( ImportMenu );
2012#endif 2011#endif
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 );
2039 2036
2040 } else { 2037 } else {
2041 //US not implemented yet 2038 //US not implemented yet
2042 //mActionKeyBindings->plug( settingsMenu ); 2039 //mActionKeyBindings->plug( settingsMenu );
2043 } 2040 }
2044 2041
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
2069 mActionSave->plug( tb ); 2067 mActionSave->plug( tb );
2070 mViewManager->getFilterAction()->plug ( tb); 2068 mViewManager->getFilterAction()->plug ( tb);
2071 if (KGlobal::getDesktopSize() == KGlobal::Desktop ) { 2069 if (KGlobal::getDesktopSize() == KGlobal::Desktop ) {
2072 mActionUndo->plug( tb ); 2070 mActionUndo->plug( tb );
2073 mActionDelete->plug( tb ); 2071 mActionDelete->plug( tb );
2074 mActionRedo->plug( tb ); 2072 mActionRedo->plug( tb );
2075 } 2073 }
2076 } else { 2074 } else {
2077 mActionSave->plug( tb ); 2075 mActionSave->plug( tb );
2078 tb->enableMoving(false); 2076 tb->enableMoving(false);
2079 } 2077 }
2080 //mActionQuit->plug ( tb ); 2078 //mActionQuit->plug ( tb );
2081 // tb->insertWidget(-1, 0, mIncSearchWidget, 6); 2079 // tb->insertWidget(-1, 0, mIncSearchWidget, 6);
2082 2080
2083 //US link the searchwidget first to this. 2081 //US link the searchwidget first to this.
2084 // The real linkage to the toolbar happens later. 2082 // The real linkage to the toolbar happens later.
2085//US mIncSearchWidget->reparent(tb, 0, QPoint(50,0), TRUE); 2083//US mIncSearchWidget->reparent(tb, 0, QPoint(50,0), TRUE);
2086//US tb->insertItem( mIncSearchWidget ); 2084//US tb->insertItem( mIncSearchWidget );
2087/*US 2085/*US
2088 mIncSearchWidget = new IncSearchWidget( tb ); 2086 mIncSearchWidget = new IncSearchWidget( tb );
2089 connect( mIncSearchWidget, SIGNAL( doSearch( const QString& ) ), 2087 connect( mIncSearchWidget, SIGNAL( doSearch( const QString& ) ),
2090 SLOT( incrementalSearch( const QString& ) ) ); 2088 SLOT( incrementalSearch( const QString& ) ) );
2091 2089
2092 mJumpButtonBar = new JumpButtonBar( this, this ); 2090 mJumpButtonBar = new JumpButtonBar( this, this );
2093 2091
2094//US topLayout->addWidget( mJumpButtonBar ); 2092//US topLayout->addWidget( mJumpButtonBar );
2095 this->layout()->add( mJumpButtonBar ); 2093 this->layout()->add( mJumpButtonBar );
2096*/ 2094*/
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 }
2160} 2123}
2161 2124
2162 2125
2163 2126
2164void KABCore::clipboardDataChanged() 2127void KABCore::clipboardDataChanged()
2165{ 2128{
2166 2129
2167 if ( mReadWrite ) 2130 if ( mReadWrite )
2168 mActionPaste->setEnabled( !QApplication::clipboard()->text().isEmpty() ); 2131 mActionPaste->setEnabled( !QApplication::clipboard()->text().isEmpty() );
2169 2132
2170} 2133}
2171 2134
2172void KABCore::updateActionMenu() 2135void KABCore::updateActionMenu()
2173{ 2136{
2174 UndoStack *undo = UndoStack::instance(); 2137 UndoStack *undo = UndoStack::instance();
2175 RedoStack *redo = RedoStack::instance(); 2138 RedoStack *redo = RedoStack::instance();
2176 2139
2177 if ( undo->isEmpty() ) 2140 if ( undo->isEmpty() )
2178 mActionUndo->setText( i18n( "Undo" ) ); 2141 mActionUndo->setText( i18n( "Undo" ) );
2179 else 2142 else
diff --git a/kaddressbook/kabcore.h b/kaddressbook/kabcore.h
index 1bdae5f..bf5398b 100644
--- a/kaddressbook/kabcore.h
+++ b/kaddressbook/kabcore.h
@@ -214,64 +214,65 @@ class KABCore : public QWidget, public KSyncInterface
214 Copys the selected contacts into clipboard for later pasting. 214 Copys the selected contacts into clipboard for later pasting.
215 */ 215 */
216 void copyContacts(); 216 void copyContacts();
217 217
218 /** 218 /**
219 Cuts the selected contacts and stores them for later pasting. 219 Cuts the selected contacts and stores them for later pasting.
220 */ 220 */
221 void cutContacts(); 221 void cutContacts();
222 222
223 /** 223 /**
224 Paste contacts from clipboard into the address book. 224 Paste contacts from clipboard into the address book.
225 */ 225 */
226 void pasteContacts(); 226 void pasteContacts();
227 227
228 /** 228 /**
229 Paste given contacts into the address book. 229 Paste given contacts into the address book.
230 230
231 @param list The list of addressee, which shall be pasted. 231 @param list The list of addressee, which shall be pasted.
232 */ 232 */
233 void pasteContacts( KABC::Addressee::List &list ); 233 void pasteContacts( KABC::Addressee::List &list );
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
258 /** 259 /**
259 Marks the address book as modified. 260 Marks the address book as modified.
260 */ 261 */
261 void setModified(); 262 void setModified();
262 /** 263 /**
263 Marks the address book as modified without refreshing the view. 264 Marks the address book as modified without refreshing the view.
264 */ 265 */
265 void setModifiedWOrefresh(); 266 void setModifiedWOrefresh();
266 267
267 /** 268 /**
268 Marks the address book as modified concerning the argument. 269 Marks the address book as modified concerning the argument.
269 */ 270 */
270 void setModified( bool modified ); 271 void setModified( bool modified );
271 272
272 /** 273 /**
273 Returns whether the address book is modified. 274 Returns whether the address book is modified.
274 */ 275 */
275 bool modified() const; 276 bool modified() const;
276 277
277 /** 278 /**
@@ -341,67 +342,64 @@ class KABCore : public QWidget, public KSyncInterface
341 Registers a new GUI client, so plugins can register its actions. 342 Registers a new GUI client, so plugins can register its actions.
342 */ 343 */
343 void addGUIClient( KXMLGUIClient *client ); 344 void addGUIClient( KXMLGUIClient *client );
344 345
345 void requestForNameEmailUidList(const QString& sourceChannel, const QString& sessionuid); 346 void requestForNameEmailUidList(const QString& sourceChannel, const QString& sessionuid);
346 void requestForDetails(const QString& sourceChannel, const QString& sessionuid, const QString& name, const QString& email, const QString& uid); 347 void requestForDetails(const QString& sourceChannel, const QString& sessionuid, const QString& name, const QString& email, const QString& uid);
347 void requestForBirthdayList(const QString& sourceChannel, const QString& sessionuid); 348 void requestForBirthdayList(const QString& sourceChannel, const QString& sessionuid);
348 349
349 350
350 signals: 351 signals:
351 void contactSelected( const QString &name ); 352 void contactSelected( const QString &name );
352 void contactSelected( const QPixmap &pixmap ); 353 void contactSelected( const QPixmap &pixmap );
353 public slots: 354 public slots:
354 void recieve(QString cmsg ); 355 void recieve(QString cmsg );
355 void getFile( bool success ); 356 void getFile( bool success );
356 void syncFileRequest(); 357 void syncFileRequest();
357 void setDetailsVisible( bool visible ); 358 void setDetailsVisible( bool visible );
358 void setDetailsToState(); 359 void setDetailsToState();
359 // void slotSyncMenu( int ); 360 // void slotSyncMenu( int );
360 private slots: 361 private slots:
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;
388#endif 386#endif
389 QTimer *mMessageTimer; 387 QTimer *mMessageTimer;
390 void initGUI(); 388 void initGUI();
391 void initActions(); 389 void initActions();
392 QString getPhoneFile(); 390 QString getPhoneFile();
393 391
394 AddresseeEditorDialog *createAddresseeEditorDialog( QWidget *parent, 392 AddresseeEditorDialog *createAddresseeEditorDialog( QWidget *parent,
395 const char *name = 0 ); 393 const char *name = 0 );
396 394
397 KXMLGUIClient *mGUIClient; 395 KXMLGUIClient *mGUIClient;
398 396
399 KABC::AddressBook *mAddressBook; 397 KABC::AddressBook *mAddressBook;
400 398
401 ViewManager *mViewManager; 399 ViewManager *mViewManager;
402 // QSplitter *mDetailsSplitter; 400 // QSplitter *mDetailsSplitter;
403 KDGanttMinimizeSplitter *mExtensionBarSplitter; 401 KDGanttMinimizeSplitter *mExtensionBarSplitter;
404 ViewContainer *mDetails; 402 ViewContainer *mDetails;
405 KDGanttMinimizeSplitter* mMiniSplitter; 403 KDGanttMinimizeSplitter* mMiniSplitter;
406 XXPortManager *mXXPortManager; 404 XXPortManager *mXXPortManager;
407 JumpButtonBar *mJumpButtonBar; 405 JumpButtonBar *mJumpButtonBar;
@@ -425,85 +423,84 @@ class KABCore : public QWidget, public KSyncInterface
425 KAction *mActionMail; 423 KAction *mActionMail;
426 KAction *mActionBeam; 424 KAction *mActionBeam;
427 KToggleAction *mActionBR; 425 KToggleAction *mActionBR;
428 KAction *mActionExport2phone; 426 KAction *mActionExport2phone;
429 KAction* mActionPrint; 427 KAction* mActionPrint;
430 KAction* mActionNewContact; 428 KAction* mActionNewContact;
431 KAction *mActionSave; 429 KAction *mActionSave;
432 KAction *mActionEditAddressee; 430 KAction *mActionEditAddressee;
433 KAction *mActionMailVCard; 431 KAction *mActionMailVCard;
434 KAction *mActionBeamVCard; 432 KAction *mActionBeamVCard;
435 433
436 KAction *mActionQuit; 434 KAction *mActionQuit;
437 435
438 //US edit menu 436 //US edit menu
439 KAction *mActionCopy; 437 KAction *mActionCopy;
440 KAction *mActionCut; 438 KAction *mActionCut;
441 KAction *mActionPaste; 439 KAction *mActionPaste;
442 KAction *mActionSelectAll; 440 KAction *mActionSelectAll;
443 KAction *mActionUndo; 441 KAction *mActionUndo;
444 KAction *mActionRedo; 442 KAction *mActionRedo;
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
490#endif //KAB_EMBEDDED 487#endif //KAB_EMBEDDED
491 488
492 //this are the overwritten callbackmethods from the syncinterface 489 //this are the overwritten callbackmethods from the syncinterface
493 virtual bool sync(KSyncManager* manager, QString filename, int mode); 490 virtual bool sync(KSyncManager* manager, QString filename, int mode);
494 virtual bool syncExternal(KSyncManager* manager, QString resource); 491 virtual bool syncExternal(KSyncManager* manager, QString resource);
495 virtual void removeSyncInfo( QString syncProfile); 492 virtual void removeSyncInfo( QString syncProfile);
496 bool syncPhone(); 493 bool syncPhone();
497 void message( QString m ); 494 void message( QString m );
498 495
499 // LR ******************************* 496 // LR *******************************
500 // sync stuff! 497 // sync stuff!
501 QString sentSyncFile(); 498 QString sentSyncFile();
502 QPopupMenu *syncMenu; 499 QPopupMenu *syncMenu;
503 KSyncManager* syncManager; 500 KSyncManager* syncManager;
504 int mGlobalSyncMode; 501 int mGlobalSyncMode;
505 bool synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBook* remote,int mode); 502 bool synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBook* remote,int mode);
506 KABC::Addressee getLastSyncAddressee(); 503 KABC::Addressee getLastSyncAddressee();
507 QDateTime mLastAddressbookSync; 504 QDateTime mLastAddressbookSync;
508 int takeAddressee( KABC::Addressee* local, KABC::Addressee* remote, int mode , bool full ); 505 int takeAddressee( KABC::Addressee* local, KABC::Addressee* remote, int mode , bool full );
509 // ********************* 506 // *********************