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
@@ -1815,28 +1815,30 @@ void KABCore::initActions()
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" );
@@ -1999,21 +2001,23 @@ void KABCore::addActionsManually()
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 );