summaryrefslogtreecommitdiffabout
path: root/kaddressbook
Unidiff
Diffstat (limited to 'kaddressbook') (more/less context) (ignore whitespace changes)
-rw-r--r--kaddressbook/kabcore.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index c5a36e2..4098dda 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -2108,87 +2108,91 @@ void KABCore::addActionsManually()
2108 //mb->insertItem( i18n("&Change"), changeMenu ); 2108 //mb->insertItem( i18n("&Change"), changeMenu );
2109 mb->insertItem( i18n("&Help"), helpMenu ); 2109 mb->insertItem( i18n("&Help"), helpMenu );
2110 mIncSearchWidget = new IncSearchWidget( tb ); 2110 mIncSearchWidget = new IncSearchWidget( tb );
2111 // tb->insertWidget(-1, 0, mIncSearchWidget); 2111 // tb->insertWidget(-1, 0, mIncSearchWidget);
2112#ifndef DESKTOP_VERSION 2112#ifndef DESKTOP_VERSION
2113 } else { 2113 } else {
2114 //US setup toolbar 2114 //US setup toolbar
2115 QPEMenuBar *menuBarTB = new QPEMenuBar( tb ); 2115 QPEMenuBar *menuBarTB = new QPEMenuBar( tb );
2116 QPopupMenu *popupBarTB = new QPopupMenu( this ); 2116 QPopupMenu *popupBarTB = new QPopupMenu( this );
2117 menuBarTB->insertItem( "ME", popupBarTB); 2117 menuBarTB->insertItem( "ME", popupBarTB);
2118 tb->insertWidget(-1, 0, menuBarTB); 2118 tb->insertWidget(-1, 0, menuBarTB);
2119 mIncSearchWidget = new IncSearchWidget( tb ); 2119 mIncSearchWidget = new IncSearchWidget( tb );
2120 2120
2121 tb->enableMoving(false); 2121 tb->enableMoving(false);
2122 popupBarTB->insertItem( i18n("&File"), fileMenu ); 2122 popupBarTB->insertItem( i18n("&File"), fileMenu );
2123 popupBarTB->insertItem( i18n("&Edit"), editMenu ); 2123 popupBarTB->insertItem( i18n("&Edit"), editMenu );
2124 popupBarTB->insertItem( i18n("&View"), viewMenu ); 2124 popupBarTB->insertItem( i18n("&View"), viewMenu );
2125 popupBarTB->insertItem( i18n("&Settings"), settingsMenu ); 2125 popupBarTB->insertItem( i18n("&Settings"), settingsMenu );
2126 popupBarTB->insertItem( i18n("Synchronize"), syncMenu ); 2126 popupBarTB->insertItem( i18n("Synchronize"), syncMenu );
2127 mViewManager->getFilterAction()->plug ( popupBarTB); 2127 mViewManager->getFilterAction()->plug ( popupBarTB);
2128 //popupBarTB->insertItem( i18n("&Change selected"), changeMenu ); 2128 //popupBarTB->insertItem( i18n("&Change selected"), changeMenu );
2129 popupBarTB->insertItem( i18n("&Help"), helpMenu ); 2129 popupBarTB->insertItem( i18n("&Help"), helpMenu );
2130 if (QApplication::desktop()->width() > 320 ) { 2130 if (QApplication::desktop()->width() > 320 ) {
2131 // mViewManager->getFilterAction()->plug ( tb); 2131 // mViewManager->getFilterAction()->plug ( tb);
2132 } 2132 }
2133 } 2133 }
2134#endif 2134#endif
2135 // mActionQuit->plug ( mMainWindow->toolBar()); 2135 // mActionQuit->plug ( mMainWindow->toolBar());
2136 2136
2137 2137
2138 2138
2139 //US Now connect the actions with the menue entries. 2139 //US Now connect the actions with the menue entries.
2140#ifdef DESKTOP_VERSION
2140 mActionPrint->plug( fileMenu ); 2141 mActionPrint->plug( fileMenu );
2142#endif
2141 mActionMail->plug( fileMenu ); 2143 mActionMail->plug( fileMenu );
2142 fileMenu->insertSeparator(); 2144 fileMenu->insertSeparator();
2143 2145
2144 mActionNewContact->plug( fileMenu ); 2146 mActionNewContact->plug( fileMenu );
2145 mActionNewContact->plug( tb ); 2147 mActionNewContact->plug( tb );
2146 2148
2147 mActionEditAddressee->plug( fileMenu ); 2149 mActionEditAddressee->plug( fileMenu );
2148 // if ((KGlobal::getDesktopSize() > KGlobal::Small ) || 2150 // if ((KGlobal::getDesktopSize() > KGlobal::Small ) ||
2149 // (!KABPrefs::instance()->mMultipleViewsAtOnce )) 2151 // (!KABPrefs::instance()->mMultipleViewsAtOnce ))
2150 mActionEditAddressee->plug( tb ); 2152 mActionEditAddressee->plug( tb );
2151 2153
2152 fileMenu->insertSeparator(); 2154 fileMenu->insertSeparator();
2153 mActionSave->plug( fileMenu ); 2155 mActionSave->plug( fileMenu );
2154 fileMenu->insertItem( "&Import", ImportMenu ); 2156 fileMenu->insertItem( "&Import", ImportMenu );
2155 fileMenu->insertItem( "&Export", ExportMenu ); 2157 fileMenu->insertItem( "&Export", ExportMenu );
2156 fileMenu->insertItem( i18n("&Change"), changeMenu ); 2158 fileMenu->insertItem( i18n("&Change"), changeMenu );
2157#ifndef DESKTOP_VERSION 2159#ifndef DESKTOP_VERSION
2158 if ( Ir::supported() ) fileMenu->insertItem( i18n("&Beam"), beamMenu ); 2160 if ( Ir::supported() ) fileMenu->insertItem( i18n("&Beam"), beamMenu );
2159#endif 2161#endif
2160 2162#if 0
2163 // PENDING fix MailVCard
2161 fileMenu->insertSeparator(); 2164 fileMenu->insertSeparator();
2162 mActionMailVCard->plug( fileMenu ); 2165 mActionMailVCard->plug( fileMenu );
2166#endif
2163#ifndef DESKTOP_VERSION 2167#ifndef DESKTOP_VERSION
2164 if ( Ir::supported() ) mActionBR->plug( beamMenu ); 2168 if ( Ir::supported() ) mActionBR->plug( beamMenu );
2165 if ( Ir::supported() ) mActionBeamVCard->plug( beamMenu ); 2169 if ( Ir::supported() ) mActionBeamVCard->plug( beamMenu );
2166 if ( Ir::supported() ) mActionBeam->plug( beamMenu ); 2170 if ( Ir::supported() ) mActionBeam->plug( beamMenu );
2167#endif 2171#endif
2168 fileMenu->insertSeparator(); 2172 fileMenu->insertSeparator();
2169 mActionQuit->plug( fileMenu ); 2173 mActionQuit->plug( fileMenu );
2170#ifdef _WIN32_ 2174#ifdef _WIN32_
2171 mActionImportOL->plug( ImportMenu ); 2175 mActionImportOL->plug( ImportMenu );
2172#endif 2176#endif
2173 // edit menu 2177 // edit menu
2174 mActionUndo->plug( editMenu ); 2178 mActionUndo->plug( editMenu );
2175 mActionRedo->plug( editMenu ); 2179 mActionRedo->plug( editMenu );
2176 editMenu->insertSeparator(); 2180 editMenu->insertSeparator();
2177 mActionCut->plug( editMenu ); 2181 mActionCut->plug( editMenu );
2178 mActionCopy->plug( editMenu ); 2182 mActionCopy->plug( editMenu );
2179 mActionPaste->plug( editMenu ); 2183 mActionPaste->plug( editMenu );
2180 mActionDelete->plug( editMenu ); 2184 mActionDelete->plug( editMenu );
2181 editMenu->insertSeparator(); 2185 editMenu->insertSeparator();
2182 mActionSelectAll->plug( editMenu ); 2186 mActionSelectAll->plug( editMenu );
2183 2187
2184 mActionSetFormattedName->plug( changeMenu ); 2188 mActionSetFormattedName->plug( changeMenu );
2185 mActionRemoveVoice->plug( changeMenu ); 2189 mActionRemoveVoice->plug( changeMenu );
2186 // settings menu 2190 // settings menu
2187//US special menuentry to configure the addressbook resources. On KDE 2191//US special menuentry to configure the addressbook resources. On KDE
2188// you do that through the control center !!! 2192// you do that through the control center !!!
2189 mActionConfigResources->plug( settingsMenu ); 2193 mActionConfigResources->plug( settingsMenu );
2190 settingsMenu->insertSeparator(); 2194 settingsMenu->insertSeparator();
2191 2195
2192 mActionConfigKAddressbook->plug( settingsMenu ); 2196 mActionConfigKAddressbook->plug( settingsMenu );
2193 2197
2194 if ( mIsPart ) { 2198 if ( mIsPart ) {