summaryrefslogtreecommitdiffabout
path: root/kaddressbook
Unidiff
Diffstat (limited to 'kaddressbook') (more/less context) (show whitespace changes)
-rw-r--r--kaddressbook/kabcore.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index 3c97ce9..76f9ab6 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -2061,97 +2061,100 @@ void KABCore::addActionsManually()
2061 mb->insertItem( i18n("&Help"), helpMenu ); 2061 mb->insertItem( i18n("&Help"), helpMenu );
2062 mIncSearchWidget = new IncSearchWidget( tb ); 2062 mIncSearchWidget = new IncSearchWidget( tb );
2063 // tb->insertWidget(-1, 0, mIncSearchWidget); 2063 // tb->insertWidget(-1, 0, mIncSearchWidget);
2064#ifndef DESKTOP_VERSION 2064#ifndef DESKTOP_VERSION
2065 } else { 2065 } else {
2066 //US setup toolbar 2066 //US setup toolbar
2067 QPEMenuBar *menuBarTB = new QPEMenuBar( tb ); 2067 QPEMenuBar *menuBarTB = new QPEMenuBar( tb );
2068 QPopupMenu *popupBarTB = new QPopupMenu( this ); 2068 QPopupMenu *popupBarTB = new QPopupMenu( this );
2069 menuBarTB->insertItem( "ME", popupBarTB); 2069 menuBarTB->insertItem( "ME", popupBarTB);
2070 tb->insertWidget(-1, 0, menuBarTB); 2070 tb->insertWidget(-1, 0, menuBarTB);
2071 mIncSearchWidget = new IncSearchWidget( tb ); 2071 mIncSearchWidget = new IncSearchWidget( tb );
2072 2072
2073 tb->enableMoving(false); 2073 tb->enableMoving(false);
2074 popupBarTB->insertItem( i18n("&File"), fileMenu ); 2074 popupBarTB->insertItem( i18n("&File"), fileMenu );
2075 popupBarTB->insertItem( i18n("&Edit"), editMenu ); 2075 popupBarTB->insertItem( i18n("&Edit"), editMenu );
2076 popupBarTB->insertItem( i18n("&View"), viewMenu ); 2076 popupBarTB->insertItem( i18n("&View"), viewMenu );
2077 popupBarTB->insertItem( i18n("&Settings"), settingsMenu ); 2077 popupBarTB->insertItem( i18n("&Settings"), settingsMenu );
2078 popupBarTB->insertItem( i18n("Synchronize"), syncMenu ); 2078 popupBarTB->insertItem( i18n("Synchronize"), syncMenu );
2079 mViewManager->getFilterAction()->plug ( popupBarTB); 2079 mViewManager->getFilterAction()->plug ( popupBarTB);
2080 //popupBarTB->insertItem( i18n("&Change selected"), changeMenu ); 2080 //popupBarTB->insertItem( i18n("&Change selected"), changeMenu );
2081 popupBarTB->insertItem( i18n("&Help"), helpMenu ); 2081 popupBarTB->insertItem( i18n("&Help"), helpMenu );
2082 if (QApplication::desktop()->width() > 320 ) { 2082 if (QApplication::desktop()->width() > 320 ) {
2083 // mViewManager->getFilterAction()->plug ( tb); 2083 // mViewManager->getFilterAction()->plug ( tb);
2084 } 2084 }
2085 } 2085 }
2086#endif 2086#endif
2087 // mActionQuit->plug ( mMainWindow->toolBar()); 2087 // mActionQuit->plug ( mMainWindow->toolBar());
2088 2088
2089 2089
2090 2090
2091 //US Now connect the actions with the menue entries. 2091 //US Now connect the actions with the menue entries.
2092 mActionPrint->plug( fileMenu ); 2092 mActionPrint->plug( fileMenu );
2093 mActionMail->plug( fileMenu ); 2093 mActionMail->plug( fileMenu );
2094 fileMenu->insertSeparator(); 2094 fileMenu->insertSeparator();
2095 2095
2096 mActionNewContact->plug( fileMenu ); 2096 mActionNewContact->plug( fileMenu );
2097 mActionNewContact->plug( tb ); 2097 mActionNewContact->plug( tb );
2098 2098
2099 mActionEditAddressee->plug( fileMenu ); 2099 mActionEditAddressee->plug( fileMenu );
2100 // if ((KGlobal::getDesktopSize() > KGlobal::Small ) || 2100 // if ((KGlobal::getDesktopSize() > KGlobal::Small ) ||
2101 // (!KABPrefs::instance()->mMultipleViewsAtOnce )) 2101 // (!KABPrefs::instance()->mMultipleViewsAtOnce ))
2102 mActionEditAddressee->plug( tb ); 2102 mActionEditAddressee->plug( tb );
2103 2103
2104 fileMenu->insertSeparator(); 2104 fileMenu->insertSeparator();
2105 mActionSave->plug( fileMenu ); 2105 mActionSave->plug( fileMenu );
2106 fileMenu->insertItem( "&Import", ImportMenu ); 2106 fileMenu->insertItem( "&Import", ImportMenu );
2107 fileMenu->insertItem( "&Export", ExportMenu ); 2107 fileMenu->insertItem( "&Export", ExportMenu );
2108 fileMenu->insertItem( i18n("&Change"), changeMenu ); 2108 fileMenu->insertItem( i18n("&Change"), changeMenu );
2109 fileMenu->insertItem( i18n("&Beam"), beamMenu ); 2109#ifndef DESKTOP_VERSION
2110 if ( Ir::supported() ) fileMenu->insertItem( i18n("&Beam"), beamMenu );
2111#endif
2112
2110 fileMenu->insertSeparator(); 2113 fileMenu->insertSeparator();
2111 mActionMailVCard->plug( fileMenu ); 2114 mActionMailVCard->plug( fileMenu );
2112#ifndef DESKTOP_VERSION 2115#ifndef DESKTOP_VERSION
2113 if ( Ir::supported() ) mActionBR->plug( beamMenu ); 2116 if ( Ir::supported() ) mActionBR->plug( beamMenu );
2114 if ( Ir::supported() ) mActionBeamVCard->plug( beamMenu ); 2117 if ( Ir::supported() ) mActionBeamVCard->plug( beamMenu );
2115 if ( Ir::supported() ) mActionBeam->plug( beamMenu ); 2118 if ( Ir::supported() ) mActionBeam->plug( beamMenu );
2116#endif 2119#endif
2117 fileMenu->insertSeparator(); 2120 fileMenu->insertSeparator();
2118 mActionQuit->plug( fileMenu ); 2121 mActionQuit->plug( fileMenu );
2119#ifdef _WIN32_ 2122#ifdef _WIN32_
2120 mActionImportOL->plug( ImportMenu ); 2123 mActionImportOL->plug( ImportMenu );
2121#endif 2124#endif
2122 // edit menu 2125 // edit menu
2123 mActionUndo->plug( editMenu ); 2126 mActionUndo->plug( editMenu );
2124 mActionRedo->plug( editMenu ); 2127 mActionRedo->plug( editMenu );
2125 editMenu->insertSeparator(); 2128 editMenu->insertSeparator();
2126 mActionCut->plug( editMenu ); 2129 mActionCut->plug( editMenu );
2127 mActionCopy->plug( editMenu ); 2130 mActionCopy->plug( editMenu );
2128 mActionPaste->plug( editMenu ); 2131 mActionPaste->plug( editMenu );
2129 mActionDelete->plug( editMenu ); 2132 mActionDelete->plug( editMenu );
2130 editMenu->insertSeparator(); 2133 editMenu->insertSeparator();
2131 mActionSelectAll->plug( editMenu ); 2134 mActionSelectAll->plug( editMenu );
2132 2135
2133 mActionRemoveVoice->plug( changeMenu ); 2136 mActionRemoveVoice->plug( changeMenu );
2134 // settings menu 2137 // settings menu
2135//US special menuentry to configure the addressbook resources. On KDE 2138//US special menuentry to configure the addressbook resources. On KDE
2136// you do that through the control center !!! 2139// you do that through the control center !!!
2137 mActionConfigResources->plug( settingsMenu ); 2140 mActionConfigResources->plug( settingsMenu );
2138 settingsMenu->insertSeparator(); 2141 settingsMenu->insertSeparator();
2139 2142
2140 mActionConfigKAddressbook->plug( settingsMenu ); 2143 mActionConfigKAddressbook->plug( settingsMenu );
2141 2144
2142 if ( mIsPart ) { 2145 if ( mIsPart ) {
2143 //US not implemented yet 2146 //US not implemented yet
2144 //mActionConfigShortcuts->plug( settingsMenu ); 2147 //mActionConfigShortcuts->plug( settingsMenu );
2145 //mActionConfigureToolbars->plug( settingsMenu ); 2148 //mActionConfigureToolbars->plug( settingsMenu );
2146 2149
2147 } else { 2150 } else {
2148 //US not implemented yet 2151 //US not implemented yet
2149 //mActionKeyBindings->plug( settingsMenu ); 2152 //mActionKeyBindings->plug( settingsMenu );
2150 } 2153 }
2151 2154
2152 settingsMenu->insertSeparator(); 2155 settingsMenu->insertSeparator();
2153 2156
2154 mActionJumpBar->plug( settingsMenu ); 2157 mActionJumpBar->plug( settingsMenu );
2155 mActionDetails->plug( settingsMenu ); 2158 mActionDetails->plug( settingsMenu );
2156 //if (!KABPrefs::instance()->mMultipleViewsAtOnce || KGlobal::getDesktopSize() == KGlobal::Desktop ) 2159 //if (!KABPrefs::instance()->mMultipleViewsAtOnce || KGlobal::getDesktopSize() == KGlobal::Desktop )
2157 mActionDetails->plug( tb ); 2160 mActionDetails->plug( tb );