summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--kaddressbook/kabcore.cpp18
1 files changed, 11 insertions, 7 deletions
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index 4c1d5da..2a3334e 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -1791,76 +1791,78 @@ void KABCore::initActions()
1791 this, SLOT( redo() ), actionCollection(), 1791 this, SLOT( redo() ), actionCollection(),
1792 "kaddressbook_redo" ); 1792 "kaddressbook_redo" );
1793 } else { 1793 } else {
1794 mActionCopy = KStdAction::copy( this, SLOT( copyContacts() ), actionCollection() ); 1794 mActionCopy = KStdAction::copy( this, SLOT( copyContacts() ), actionCollection() );
1795 mActionCut = KStdAction::cut( this, SLOT( cutContacts() ), actionCollection() ); 1795 mActionCut = KStdAction::cut( this, SLOT( cutContacts() ), actionCollection() );
1796 mActionPaste = KStdAction::paste( this, SLOT( pasteContacts() ), actionCollection() ); 1796 mActionPaste = KStdAction::paste( this, SLOT( pasteContacts() ), actionCollection() );
1797 mActionSelectAll = KStdAction::selectAll( this, SLOT( selectAllContacts() ), actionCollection() ); 1797 mActionSelectAll = KStdAction::selectAll( this, SLOT( selectAllContacts() ), actionCollection() );
1798 mActionUndo = KStdAction::undo( this, SLOT( undo() ), actionCollection() ); 1798 mActionUndo = KStdAction::undo( this, SLOT( undo() ), actionCollection() );
1799 mActionRedo = KStdAction::redo( this, SLOT( redo() ), actionCollection() ); 1799 mActionRedo = KStdAction::redo( this, SLOT( redo() ), actionCollection() );
1800 } 1800 }
1801 1801
1802 mActionDelete = new KAction( i18n( "&Delete Contact" ), "editdelete", 1802 mActionDelete = new KAction( i18n( "&Delete Contact" ), "editdelete",
1803 Key_Delete, this, SLOT( deleteContacts() ), 1803 Key_Delete, this, SLOT( deleteContacts() ),
1804 actionCollection(), "edit_delete" ); 1804 actionCollection(), "edit_delete" );
1805 1805
1806 mActionUndo->setEnabled( false ); 1806 mActionUndo->setEnabled( false );
1807 mActionRedo->setEnabled( false ); 1807 mActionRedo->setEnabled( false );
1808 1808
1809 // settings menu 1809 // settings menu
1810#ifdef KAB_EMBEDDED 1810#ifdef KAB_EMBEDDED
1811//US special menuentry to configure the addressbook resources. On KDE 1811//US special menuentry to configure the addressbook resources. On KDE
1812// you do that through the control center !!! 1812// you do that through the control center !!!
1813 mActionConfigResources = new KAction( i18n( "Configure &Resources..." ), "configure_resources", 0, this, 1813 mActionConfigResources = new KAction( i18n( "Configure &Resources..." ), "configure_resources", 0, this,
1814 SLOT( configureResources() ), actionCollection(), 1814 SLOT( configureResources() ), actionCollection(),
1815 "kaddressbook_configure_resources" ); 1815 "kaddressbook_configure_resources" );
1816#endif //KAB_EMBEDDED 1816#endif //KAB_EMBEDDED
1817 1817
1818 if ( mIsPart ) { 1818 if ( mIsPart ) {
1819 mActionConfigKAddressbook = new KAction( i18n( "&Configure KAddressBook..." ), "configure", 0, this, 1819 mActionConfigKAddressbook = new KAction( i18n( "&Configure KAddressBook..." ), "configure", 0, this,
1820 SLOT( openConfigDialog() ), actionCollection(), 1820 SLOT( openConfigDialog() ), actionCollection(),
1821 "kaddressbook_configure" ); 1821 "kaddressbook_configure" );
1822 1822
1823 mActionConfigShortcuts = new KAction( i18n( "Configure S&hortcuts..." ), "configure_shortcuts", 0, 1823 //US not implemented yet
1824 this, SLOT( configureKeyBindings() ), actionCollection(), 1824 //mActionConfigShortcuts = new KAction( i18n( "Configure S&hortcuts..." ), "configure_shortcuts", 0,
1825 "kaddressbook_configure_shortcuts" ); 1825 // this, SLOT( configureKeyBindings() ), actionCollection(),
1826 // "kaddressbook_configure_shortcuts" );
1826#ifdef KAB_EMBEDDED 1827#ifdef KAB_EMBEDDED
1827 mActionConfigureToolbars = KStdAction::configureToolbars( this, SLOT( mMainWindow->configureToolbars() ), actionCollection() ); 1828 mActionConfigureToolbars = KStdAction::configureToolbars( this, SLOT( mMainWindow->configureToolbars() ), actionCollection() );
1828 mActionConfigureToolbars->setEnabled( false ); 1829 mActionConfigureToolbars->setEnabled( false );
1829#endif //KAB_EMBEDDED 1830#endif //KAB_EMBEDDED
1830 1831
1831 } else { 1832 } else {
1832 mActionConfigKAddressbook = KStdAction::preferences( this, SLOT( openConfigDialog() ), actionCollection() ); 1833 mActionConfigKAddressbook = KStdAction::preferences( this, SLOT( openConfigDialog() ), actionCollection() );
1833 1834
1834 mActionKeyBindings = KStdAction::keyBindings( this, SLOT( configureKeyBindings() ), actionCollection() ); 1835 //US not implemented yet
1836 //mActionKeyBindings = KStdAction::keyBindings( this, SLOT( configureKeyBindings() ), actionCollection() );
1835 } 1837 }
1836 1838
1837 mActionJumpBar = new KToggleAction( i18n( "Show Jump Bar" ), 0, 0, 1839 mActionJumpBar = new KToggleAction( i18n( "Show Jump Bar" ), 0, 0,
1838 actionCollection(), "options_show_jump_bar" ); 1840 actionCollection(), "options_show_jump_bar" );
1839 connect( mActionJumpBar, SIGNAL( toggled( bool ) ), SLOT( setJumpButtonBarVisible( bool ) ) ); 1841 connect( mActionJumpBar, SIGNAL( toggled( bool ) ), SLOT( setJumpButtonBarVisible( bool ) ) );
1840 1842
1841 mActionDetails = new KToggleAction( i18n( "Show Details" ), "listview", 0, 1843 mActionDetails = new KToggleAction( i18n( "Show Details" ), "listview", 0,
1842 actionCollection(), "options_show_details" ); 1844 actionCollection(), "options_show_details" );
1843 connect( mActionDetails, SIGNAL( toggled( bool ) ), SLOT( setDetailsVisible( bool ) ) ); 1845 connect( mActionDetails, SIGNAL( toggled( bool ) ), SLOT( setDetailsVisible( bool ) ) );
1844 1846
1845 1847
1846 mActionBR = new KToggleAction( i18n( "Beam receive enabled" ), "beam", 0, this, 1848 mActionBR = new KToggleAction( i18n( "Beam receive enabled" ), "beam", 0, this,
1847 SLOT( toggleBeamReceive() ), actionCollection(), 1849 SLOT( toggleBeamReceive() ), actionCollection(),
1848 "kaddressbook_beam_rec" ); 1850 "kaddressbook_beam_rec" );
1849 1851
1850 1852
1851 // misc 1853 // misc
1852 // only enable LDAP lookup if we can handle the protocol 1854 // only enable LDAP lookup if we can handle the protocol
1853#ifndef KAB_EMBEDDED 1855#ifndef KAB_EMBEDDED
1854 if ( KProtocolInfo::isKnownProtocol( KURL( "ldap://localhost" ) ) ) { 1856 if ( KProtocolInfo::isKnownProtocol( KURL( "ldap://localhost" ) ) ) {
1855 new KAction( i18n( "&Lookup Addresses in Directory" ), "find", 0, 1857 new KAction( i18n( "&Lookup Addresses in Directory" ), "find", 0,
1856 this, SLOT( openLDAPDialog() ), actionCollection(), 1858 this, SLOT( openLDAPDialog() ), actionCollection(),
1857 "ldap_lookup" ); 1859 "ldap_lookup" );
1858 } 1860 }
1859#else //KAB_EMBEDDED 1861#else //KAB_EMBEDDED
1860 //qDebug("KABCore::initActions() LDAP has to be implemented"); 1862 //qDebug("KABCore::initActions() LDAP has to be implemented");
1861#endif //KAB_EMBEDDED 1863#endif //KAB_EMBEDDED
1862 1864
1863 1865
1864 mActionWhoAmI = new KAction( i18n( "Set Who Am I" ), "personal", 0, this, 1866 mActionWhoAmI = new KAction( i18n( "Set Who Am I" ), "personal", 0, this,
1865 SLOT( setWhoAmI() ), actionCollection(), 1867 SLOT( setWhoAmI() ), actionCollection(),
1866 "set_personal" ); 1868 "set_personal" );
@@ -1975,69 +1977,71 @@ void KABCore::addActionsManually()
1975 fileMenu->insertSeparator(); 1977 fileMenu->insertSeparator();
1976 mActionMailVCard->plug( fileMenu ); 1978 mActionMailVCard->plug( fileMenu );
1977#ifndef DESKTOP_VERSION 1979#ifndef DESKTOP_VERSION
1978 if ( Ir::supported() ) mActionBeamVCard->plug( fileMenu ); 1980 if ( Ir::supported() ) mActionBeamVCard->plug( fileMenu );
1979 if ( Ir::supported() ) mActionBeam->plug(fileMenu ); 1981 if ( Ir::supported() ) mActionBeam->plug(fileMenu );
1980#endif 1982#endif
1981 fileMenu->insertSeparator(); 1983 fileMenu->insertSeparator();
1982 mActionQuit->plug( fileMenu ); 1984 mActionQuit->plug( fileMenu );
1983#ifdef _WIN32_ 1985#ifdef _WIN32_
1984 mActionImportOL->plug( ImportMenu ); 1986 mActionImportOL->plug( ImportMenu );
1985#endif 1987#endif
1986 // edit menu 1988 // edit menu
1987 mActionUndo->plug( editMenu ); 1989 mActionUndo->plug( editMenu );
1988 mActionRedo->plug( editMenu ); 1990 mActionRedo->plug( editMenu );
1989 editMenu->insertSeparator(); 1991 editMenu->insertSeparator();
1990 mActionCut->plug( editMenu ); 1992 mActionCut->plug( editMenu );
1991 mActionCopy->plug( editMenu ); 1993 mActionCopy->plug( editMenu );
1992 mActionPaste->plug( editMenu ); 1994 mActionPaste->plug( editMenu );
1993 mActionDelete->plug( editMenu ); 1995 mActionDelete->plug( editMenu );
1994 editMenu->insertSeparator(); 1996 editMenu->insertSeparator();
1995 mActionSelectAll->plug( editMenu ); 1997 mActionSelectAll->plug( editMenu );
1996 1998
1997 mActionRemoveVoice->plug( changeMenu ); 1999 mActionRemoveVoice->plug( changeMenu );
1998 // settings menu 2000 // settings menu
1999//US special menuentry to configure the addressbook resources. On KDE 2001//US special menuentry to configure the addressbook resources. On KDE
2000// you do that through the control center !!! 2002// you do that through the control center !!!
2001 mActionConfigResources->plug( settingsMenu ); 2003 mActionConfigResources->plug( settingsMenu );
2002 settingsMenu->insertSeparator(); 2004 settingsMenu->insertSeparator();
2003 2005
2004 mActionConfigKAddressbook->plug( settingsMenu ); 2006 mActionConfigKAddressbook->plug( settingsMenu );
2005 2007
2006 if ( mIsPart ) { 2008 if ( mIsPart ) {
2007 mActionConfigShortcuts->plug( settingsMenu ); 2009 //US not implemented yet
2008 mActionConfigureToolbars->plug( settingsMenu ); 2010 //mActionConfigShortcuts->plug( settingsMenu );
2011 //mActionConfigureToolbars->plug( settingsMenu );
2009 2012
2010 } else { 2013 } else {
2011 mActionKeyBindings->plug( settingsMenu ); 2014 //US not implemented yet
2015 //mActionKeyBindings->plug( settingsMenu );
2012 } 2016 }
2013 2017
2014 settingsMenu->insertSeparator(); 2018 settingsMenu->insertSeparator();
2015 2019
2016 mActionJumpBar->plug( settingsMenu ); 2020 mActionJumpBar->plug( settingsMenu );
2017 mActionDetails->plug( settingsMenu ); 2021 mActionDetails->plug( settingsMenu );
2018 if (!KABPrefs::instance()->mMultipleViewsAtOnce || KGlobal::getDesktopSize() == KGlobal::Desktop ) 2022 if (!KABPrefs::instance()->mMultipleViewsAtOnce || KGlobal::getDesktopSize() == KGlobal::Desktop )
2019 mActionDetails->plug( tb ); 2023 mActionDetails->plug( tb );
2020 settingsMenu->insertSeparator(); 2024 settingsMenu->insertSeparator();
2021 mActionBR->plug(settingsMenu ); 2025 mActionBR->plug(settingsMenu );
2022 settingsMenu->insertSeparator(); 2026 settingsMenu->insertSeparator();
2023 2027
2024 mActionWhoAmI->plug( settingsMenu ); 2028 mActionWhoAmI->plug( settingsMenu );
2025 mActionCategories->plug( settingsMenu ); 2029 mActionCategories->plug( settingsMenu );
2026 2030
2027 2031
2028 mActionWN->plug( helpMenu ); 2032 mActionWN->plug( helpMenu );
2029 mActionSyncHowto->plug( helpMenu ); 2033 mActionSyncHowto->plug( helpMenu );
2030 mActionLicence->plug( helpMenu ); 2034 mActionLicence->plug( helpMenu );
2031 mActionFaq->plug( helpMenu ); 2035 mActionFaq->plug( helpMenu );
2032 mActionAboutKAddressbook->plug( helpMenu ); 2036 mActionAboutKAddressbook->plug( helpMenu );
2033 2037
2034 if (KGlobal::getDesktopSize() > KGlobal::Small ) { 2038 if (KGlobal::getDesktopSize() > KGlobal::Small ) {
2035 2039
2036 mActionSave->plug( tb ); 2040 mActionSave->plug( tb );
2037 mViewManager->getFilterAction()->plug ( tb); 2041 mViewManager->getFilterAction()->plug ( tb);
2038 if (KGlobal::getDesktopSize() == KGlobal::Desktop ) { 2042 if (KGlobal::getDesktopSize() == KGlobal::Desktop ) {
2039 mActionUndo->plug( tb ); 2043 mActionUndo->plug( tb );
2040 mActionDelete->plug( tb ); 2044 mActionDelete->plug( tb );
2041 mActionRedo->plug( tb ); 2045 mActionRedo->plug( tb );
2042 } 2046 }
2043 } 2047 }