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
@@ -1820,9 +1820,10 @@ void KABCore::initActions()
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 );
@@ -1831,7 +1832,8 @@ void KABCore::initActions()
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,
@@ -2004,11 +2006,13 @@ void KABCore::addActionsManually()
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();