summaryrefslogtreecommitdiffabout
path: root/kaddressbook/kabcore.cpp
Unidiff
Diffstat (limited to 'kaddressbook/kabcore.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--kaddressbook/kabcore.cpp28
1 files changed, 14 insertions, 14 deletions
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index 1433568..5ef61b1 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -2121,25 +2121,25 @@ void KABCore::initActions()
2121//US we need this function, to plug all actions into the correct menues. 2121//US we need this function, to plug all actions into the correct menues.
2122// KDE uses a XML format to plug the actions, but we work her without this overhead. 2122// KDE uses a XML format to plug the actions, but we work her without this overhead.
2123void KABCore::addActionsManually() 2123void KABCore::addActionsManually()
2124{ 2124{
2125//US qDebug("KABCore::initActions(): mIsPart %i", mIsPart); 2125//US qDebug("KABCore::initActions(): mIsPart %i", mIsPart);
2126 2126
2127#ifdef KAB_EMBEDDED 2127#ifdef KAB_EMBEDDED
2128 QPopupMenu *fileMenu = new QPopupMenu( this ); 2128 QPopupMenu *fileMenu = new QPopupMenu( this );
2129 QPopupMenu *editMenu = new QPopupMenu( this ); 2129 QPopupMenu *editMenu = new QPopupMenu( this );
2130 QPopupMenu *helpMenu = new QPopupMenu( this ); 2130 QPopupMenu *helpMenu = new QPopupMenu( this );
2131 2131
2132 KToolBar* tb = mMainWindow->toolBar(); 2132 KToolBar* tb = mMainWindow->toolBar();
2133 2133 mMainWindow->setToolBarsMovable (false );
2134#ifndef DESKTOP_VERSION 2134#ifndef DESKTOP_VERSION
2135 if ( KABPrefs::instance()->mFullMenuBarVisible ) { 2135 if ( KABPrefs::instance()->mFullMenuBarVisible ) {
2136#endif 2136#endif
2137 QMenuBar* mb = mMainWindow->menuBar(); 2137 QMenuBar* mb = mMainWindow->menuBar();
2138 2138
2139 //US setup menubar. 2139 //US setup menubar.
2140 //Disable the following block if you do not want to have a menubar. 2140 //Disable the following block if you do not want to have a menubar.
2141 mb->insertItem( i18n("&File"), fileMenu ); 2141 mb->insertItem( i18n("&File"), fileMenu );
2142 mb->insertItem( i18n("&Edit"), editMenu ); 2142 mb->insertItem( i18n("&Edit"), editMenu );
2143 mb->insertItem( i18n("&View"), viewMenu ); 2143 mb->insertItem( i18n("&View"), viewMenu );
2144 mb->insertItem( i18n("&Settings"), settingsMenu ); 2144 mb->insertItem( i18n("&Settings"), settingsMenu );
2145#ifdef DESKTOP_VERSION 2145#ifdef DESKTOP_VERSION
@@ -2177,37 +2177,39 @@ void KABCore::addActionsManually()
2177 2177
2178 2178
2179 2179
2180 //US Now connect the actions with the menue entries. 2180 //US Now connect the actions with the menue entries.
2181#ifdef DESKTOP_VERSION 2181#ifdef DESKTOP_VERSION
2182 mActionPrint->plug( fileMenu ); 2182 mActionPrint->plug( fileMenu );
2183 mActionPrintDetails->plug( fileMenu ); 2183 mActionPrintDetails->plug( fileMenu );
2184 fileMenu->insertSeparator(); 2184 fileMenu->insertSeparator();
2185#endif 2185#endif
2186 mActionMail->plug( fileMenu ); 2186 mActionMail->plug( fileMenu );
2187 fileMenu->insertSeparator(); 2187 fileMenu->insertSeparator();
2188 2188
2189 mActionNewContact->plug( fileMenu ); 2189 mActionNewContact->plug( editMenu );
2190 mActionNewContact->plug( tb ); 2190 mActionNewContact->plug( tb );
2191 2191
2192 mActionEditAddressee->plug( fileMenu ); 2192 mActionEditAddressee->plug( editMenu );
2193 editMenu->insertSeparator();
2193 // if ((KGlobal::getDesktopSize() > KGlobal::Small ) || 2194 // if ((KGlobal::getDesktopSize() > KGlobal::Small ) ||
2194 // (!KABPrefs::instance()->mMultipleViewsAtOnce )) 2195 // (!KABPrefs::instance()->mMultipleViewsAtOnce ))
2195 mActionEditAddressee->plug( tb ); 2196 mActionEditAddressee->plug( tb );
2196 2197
2197 fileMenu->insertSeparator(); 2198 // fileMenu->insertSeparator();
2198 mActionSave->plug( fileMenu ); 2199 mActionSave->plug( fileMenu );
2199 fileMenu->insertItem( "&Import", ImportMenu ); 2200 fileMenu->insertItem( "&Import", ImportMenu );
2200 fileMenu->insertItem( "&Export", ExportMenu ); 2201 fileMenu->insertItem( "&Export", ExportMenu );
2201 fileMenu->insertItem( i18n("&Change"), changeMenu ); 2202 editMenu->insertItem( i18n("&Change"), changeMenu );
2203 editMenu->insertSeparator();
2202#ifndef DESKTOP_VERSION 2204#ifndef DESKTOP_VERSION
2203 if ( Ir::supported() ) fileMenu->insertItem( i18n("&Beam"), beamMenu ); 2205 if ( Ir::supported() ) fileMenu->insertItem( i18n("&Beam"), beamMenu );
2204#endif 2206#endif
2205#if 0 2207#if 0
2206 // PENDING fix MailVCard 2208 // PENDING fix MailVCard
2207 fileMenu->insertSeparator(); 2209 fileMenu->insertSeparator();
2208 mActionMailVCard->plug( fileMenu ); 2210 mActionMailVCard->plug( fileMenu );
2209#endif 2211#endif
2210#ifndef DESKTOP_VERSION 2212#ifndef DESKTOP_VERSION
2211 if ( Ir::supported() ) mActionBR->plug( beamMenu ); 2213 if ( Ir::supported() ) mActionBR->plug( beamMenu );
2212 if ( Ir::supported() ) mActionBeamVCard->plug( beamMenu ); 2214 if ( Ir::supported() ) mActionBeamVCard->plug( beamMenu );
2213 if ( Ir::supported() ) mActionBeam->plug( beamMenu ); 2215 if ( Ir::supported() ) mActionBeam->plug( beamMenu );
@@ -2240,44 +2242,42 @@ void KABCore::addActionsManually()
2240 settingsMenu->insertSeparator(2); 2242 settingsMenu->insertSeparator(2);
2241 2243
2242 if ( mIsPart ) { 2244 if ( mIsPart ) {
2243 //US not implemented yet 2245 //US not implemented yet
2244 //mActionConfigShortcuts->plug( settingsMenu ); 2246 //mActionConfigShortcuts->plug( settingsMenu );
2245 //mActionConfigureToolbars->plug( settingsMenu ); 2247 //mActionConfigureToolbars->plug( settingsMenu );
2246 2248
2247 } else { 2249 } else {
2248 //US not implemented yet 2250 //US not implemented yet
2249 //mActionKeyBindings->plug( settingsMenu ); 2251 //mActionKeyBindings->plug( settingsMenu );
2250 } 2252 }
2251 2253
2252 settingsMenu->insertSeparator(); 2254 mActionEditCategories->plug( settingsMenu );
2253 2255 mActionManageCategories->plug( settingsMenu );
2254 mActionJumpBar->plug( settingsMenu ); 2256 mActionJumpBar->plug( viewMenu,0 );
2255 mActionDetails->plug( settingsMenu ); 2257 mActionDetails->plug( viewMenu,0 );
2256 //if (!KABPrefs::instance()->mMultipleViewsAtOnce || KGlobal::getDesktopSize() == KGlobal::Desktop ) 2258 //if (!KABPrefs::instance()->mMultipleViewsAtOnce || KGlobal::getDesktopSize() == KGlobal::Desktop )
2257 mActionDetails->plug( tb ); 2259 mActionDetails->plug( tb );
2258 settingsMenu->insertSeparator(); 2260 settingsMenu->insertSeparator();
2259#ifndef DESKTOP_VERSION 2261#ifndef DESKTOP_VERSION
2260 if ( Ir::supported() ) mActionBR->plug(settingsMenu ); 2262 if ( Ir::supported() ) mActionBR->plug(settingsMenu );
2261 settingsMenu->insertSeparator(); 2263 settingsMenu->insertSeparator();
2262#endif 2264#endif
2263 2265
2264 mActionWhoAmI->plug( settingsMenu ); 2266 mActionWhoAmI->plug( settingsMenu );
2265 mActionEditCategories->plug( settingsMenu ); 2267 //mActionEditCategories->plug( changeMenu );
2266 mActionEditCategories->plug( changeMenu );
2267 mActionCategories->plug( changeMenu ); 2268 mActionCategories->plug( changeMenu );
2268 mActionManageCategories->plug( changeMenu ); 2269 //mActionManageCategories->plug( changeMenu );
2269 2270
2270 mActionCategories->plug( settingsMenu ); 2271 //mActionCategories->plug( settingsMenu );
2271 mActionManageCategories->plug( settingsMenu );
2272 2272
2273 2273
2274 mActionWN->plug( helpMenu ); 2274 mActionWN->plug( helpMenu );
2275 mActionSyncHowto->plug( helpMenu ); 2275 mActionSyncHowto->plug( helpMenu );
2276 mActionKdeSyncHowto->plug( helpMenu ); 2276 mActionKdeSyncHowto->plug( helpMenu );
2277 mActionMultiSyncHowto->plug( helpMenu ); 2277 mActionMultiSyncHowto->plug( helpMenu );
2278 mActionFaq->plug( helpMenu ); 2278 mActionFaq->plug( helpMenu );
2279 mActionLicence->plug( helpMenu ); 2279 mActionLicence->plug( helpMenu );
2280 mActionAboutKAddressbook->plug( helpMenu ); 2280 mActionAboutKAddressbook->plug( helpMenu );
2281 2281
2282 if (KGlobal::getDesktopSize() > KGlobal::Small ) { 2282 if (KGlobal::getDesktopSize() > KGlobal::Small ) {
2283 2283