-rw-r--r-- | kaddressbook/kabcore.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index 9505a23..4445310 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp | |||
@@ -1968,75 +1968,75 @@ void KABCore::initActions() | |||
1968 | connect( UndoStack::instance(), SIGNAL( changed() ), SLOT( updateActionMenu() ) ); | 1968 | connect( UndoStack::instance(), SIGNAL( changed() ), SLOT( updateActionMenu() ) ); |
1969 | connect( RedoStack::instance(), SIGNAL( changed() ), SLOT( updateActionMenu() ) ); | 1969 | connect( RedoStack::instance(), SIGNAL( changed() ), SLOT( updateActionMenu() ) ); |
1970 | } | 1970 | } |
1971 | 1971 | ||
1972 | //US we need this function, to plug all actions into the correct menues. | 1972 | //US we need this function, to plug all actions into the correct menues. |
1973 | // KDE uses a XML format to plug the actions, but we work her without this overhead. | 1973 | // KDE uses a XML format to plug the actions, but we work her without this overhead. |
1974 | void KABCore::addActionsManually() | 1974 | void KABCore::addActionsManually() |
1975 | { | 1975 | { |
1976 | //US qDebug("KABCore::initActions(): mIsPart %i", mIsPart); | 1976 | //US qDebug("KABCore::initActions(): mIsPart %i", mIsPart); |
1977 | 1977 | ||
1978 | #ifdef KAB_EMBEDDED | 1978 | #ifdef KAB_EMBEDDED |
1979 | QPopupMenu *fileMenu = new QPopupMenu( this ); | 1979 | QPopupMenu *fileMenu = new QPopupMenu( this ); |
1980 | QPopupMenu *editMenu = new QPopupMenu( this ); | 1980 | QPopupMenu *editMenu = new QPopupMenu( this ); |
1981 | QPopupMenu *helpMenu = new QPopupMenu( this ); | 1981 | QPopupMenu *helpMenu = new QPopupMenu( this ); |
1982 | 1982 | ||
1983 | KToolBar* tb = mMainWindow->toolBar(); | 1983 | KToolBar* tb = mMainWindow->toolBar(); |
1984 | 1984 | ||
1985 | #ifndef DESKTOP_VERSION | 1985 | #ifndef DESKTOP_VERSION |
1986 | if ( KABPrefs::instance()->mFullMenuBarVisible ) { | 1986 | if ( KABPrefs::instance()->mFullMenuBarVisible ) { |
1987 | #endif | 1987 | #endif |
1988 | QMenuBar* mb = mMainWindow->menuBar(); | 1988 | QMenuBar* mb = mMainWindow->menuBar(); |
1989 | 1989 | ||
1990 | //US setup menubar. | 1990 | //US setup menubar. |
1991 | //Disable the following block if you do not want to have a menubar. | 1991 | //Disable the following block if you do not want to have a menubar. |
1992 | mb->insertItem( "&File", fileMenu ); | 1992 | mb->insertItem( i18n("&File"), fileMenu ); |
1993 | mb->insertItem( "&Edit", editMenu ); | 1993 | mb->insertItem( i18n("&Edit"), editMenu ); |
1994 | mb->insertItem( "&View", viewMenu ); | 1994 | mb->insertItem( i18n("&View"), viewMenu ); |
1995 | mb->insertItem( "&Settings", settingsMenu ); | 1995 | mb->insertItem( i18n("&Settings"), settingsMenu ); |
1996 | mb->insertItem( i18n("Synchronize"), syncMenu ); | 1996 | mb->insertItem( i18n("Synchronize"), syncMenu ); |
1997 | mb->insertItem( "&Change selected", changeMenu ); | 1997 | mb->insertItem( i18n("&Change selected"), changeMenu ); |
1998 | mb->insertItem( "&Help", helpMenu ); | 1998 | mb->insertItem( i18n("&Help"), helpMenu ); |
1999 | mIncSearchWidget = new IncSearchWidget( tb ); | 1999 | mIncSearchWidget = new IncSearchWidget( tb ); |
2000 | // tb->insertWidget(-1, 0, mIncSearchWidget); | 2000 | // tb->insertWidget(-1, 0, mIncSearchWidget); |
2001 | #ifndef DESKTOP_VERSION | 2001 | #ifndef DESKTOP_VERSION |
2002 | } else { | 2002 | } else { |
2003 | //US setup toolbar | 2003 | //US setup toolbar |
2004 | QPEMenuBar *menuBarTB = new QPEMenuBar( tb ); | 2004 | QPEMenuBar *menuBarTB = new QPEMenuBar( tb ); |
2005 | QPopupMenu *popupBarTB = new QPopupMenu( this ); | 2005 | QPopupMenu *popupBarTB = new QPopupMenu( this ); |
2006 | menuBarTB->insertItem( "ME", popupBarTB); | 2006 | menuBarTB->insertItem( "ME", popupBarTB); |
2007 | tb->insertWidget(-1, 0, menuBarTB); | 2007 | tb->insertWidget(-1, 0, menuBarTB); |
2008 | mIncSearchWidget = new IncSearchWidget( tb ); | 2008 | mIncSearchWidget = new IncSearchWidget( tb ); |
2009 | 2009 | ||
2010 | tb->enableMoving(false); | 2010 | tb->enableMoving(false); |
2011 | popupBarTB->insertItem( "&File", fileMenu ); | 2011 | popupBarTB->insertItem( i18n("&File"), fileMenu ); |
2012 | popupBarTB->insertItem( "&Edit", editMenu ); | 2012 | popupBarTB->insertItem( i18n("&Edit"), editMenu ); |
2013 | popupBarTB->insertItem( "&View", viewMenu ); | 2013 | popupBarTB->insertItem( i18n("&View"), viewMenu ); |
2014 | popupBarTB->insertItem( "&Settings", settingsMenu ); | 2014 | popupBarTB->insertItem( i18n("&Settings"), settingsMenu ); |
2015 | popupBarTB->insertItem( i18n("Synchronize"), syncMenu ); | 2015 | popupBarTB->insertItem( i18n("Synchronize"), syncMenu ); |
2016 | mViewManager->getFilterAction()->plug ( popupBarTB); | 2016 | mViewManager->getFilterAction()->plug ( popupBarTB); |
2017 | popupBarTB->insertItem( "&Change selected", changeMenu ); | 2017 | popupBarTB->insertItem( i18n("&Change selected"), changeMenu ); |
2018 | popupBarTB->insertItem( "&Help", helpMenu ); | 2018 | popupBarTB->insertItem( i18n("&Help"), helpMenu ); |
2019 | if (QApplication::desktop()->width() > 320 ) { | 2019 | if (QApplication::desktop()->width() > 320 ) { |
2020 | // mViewManager->getFilterAction()->plug ( tb); | 2020 | // mViewManager->getFilterAction()->plug ( tb); |
2021 | } | 2021 | } |
2022 | } | 2022 | } |
2023 | #endif | 2023 | #endif |
2024 | // mActionQuit->plug ( mMainWindow->toolBar()); | 2024 | // mActionQuit->plug ( mMainWindow->toolBar()); |
2025 | 2025 | ||
2026 | 2026 | ||
2027 | 2027 | ||
2028 | //US Now connect the actions with the menue entries. | 2028 | //US Now connect the actions with the menue entries. |
2029 | mActionPrint->plug( fileMenu ); | 2029 | mActionPrint->plug( fileMenu ); |
2030 | mActionMail->plug( fileMenu ); | 2030 | mActionMail->plug( fileMenu ); |
2031 | fileMenu->insertSeparator(); | 2031 | fileMenu->insertSeparator(); |
2032 | 2032 | ||
2033 | mActionNewContact->plug( fileMenu ); | 2033 | mActionNewContact->plug( fileMenu ); |
2034 | mActionNewContact->plug( tb ); | 2034 | mActionNewContact->plug( tb ); |
2035 | 2035 | ||
2036 | mActionEditAddressee->plug( fileMenu ); | 2036 | mActionEditAddressee->plug( fileMenu ); |
2037 | // if ((KGlobal::getDesktopSize() > KGlobal::Small ) || | 2037 | // if ((KGlobal::getDesktopSize() > KGlobal::Small ) || |
2038 | // (!KABPrefs::instance()->mMultipleViewsAtOnce )) | 2038 | // (!KABPrefs::instance()->mMultipleViewsAtOnce )) |
2039 | mActionEditAddressee->plug( tb ); | 2039 | mActionEditAddressee->plug( tb ); |
2040 | 2040 | ||
2041 | fileMenu->insertSeparator(); | 2041 | fileMenu->insertSeparator(); |
2042 | mActionSave->plug( fileMenu ); | 2042 | mActionSave->plug( fileMenu ); |