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
@@ -2130,7 +2130,7 @@ void KABCore::addActionsManually()
   QPopupMenu *helpMenu = new QPopupMenu( this );
 
   KToolBar* tb =  mMainWindow->toolBar();
-
+  mMainWindow->setToolBarsMovable (false ); 
 #ifndef DESKTOP_VERSION
   if ( KABPrefs::instance()->mFullMenuBarVisible ) {
 #endif
@@ -2186,19 +2186,21 @@ void KABCore::addActionsManually()
   mActionMail->plug( fileMenu );
   fileMenu->insertSeparator();
 
-  mActionNewContact->plug( fileMenu );
+  mActionNewContact->plug( editMenu );
   mActionNewContact->plug( tb );
 
-  mActionEditAddressee->plug( fileMenu );
+  mActionEditAddressee->plug( editMenu );
+  editMenu->insertSeparator();
   // if ((KGlobal::getDesktopSize() > KGlobal::Small ) ||
   //  (!KABPrefs::instance()->mMultipleViewsAtOnce ))
     mActionEditAddressee->plug( tb );
 
-  fileMenu->insertSeparator();
+    // fileMenu->insertSeparator();
   mActionSave->plug( fileMenu );
   fileMenu->insertItem( "&Import", ImportMenu );
   fileMenu->insertItem( "&Export", ExportMenu );
-  fileMenu->insertItem( i18n("&Change"), changeMenu );
+  editMenu->insertItem( i18n("&Change"), changeMenu );
+  editMenu->insertSeparator();
 #ifndef DESKTOP_VERSION
   if ( Ir::supported() )  fileMenu->insertItem( i18n("&Beam"), beamMenu );
 #endif
@@ -2249,10 +2251,10 @@ void KABCore::addActionsManually()
     //mActionKeyBindings->plug( settingsMenu );
   }
 
-  settingsMenu->insertSeparator();
-
-  mActionJumpBar->plug( settingsMenu );
-  mActionDetails->plug( settingsMenu );
+  mActionEditCategories->plug( settingsMenu );
+  mActionManageCategories->plug( settingsMenu );
+  mActionJumpBar->plug( viewMenu,0 );
+  mActionDetails->plug( viewMenu,0 );
   //if (!KABPrefs::instance()->mMultipleViewsAtOnce || KGlobal::getDesktopSize() == KGlobal::Desktop  )
   mActionDetails->plug( tb );
   settingsMenu->insertSeparator();
@@ -2262,13 +2264,11 @@ void KABCore::addActionsManually()
 #endif
 
   mActionWhoAmI->plug( settingsMenu );
-  mActionEditCategories->plug( settingsMenu );
-  mActionEditCategories->plug( changeMenu );
+  //mActionEditCategories->plug( changeMenu );
   mActionCategories->plug( changeMenu );
-  mActionManageCategories->plug( changeMenu );
+  //mActionManageCategories->plug( changeMenu );
 
-  mActionCategories->plug( settingsMenu );
-  mActionManageCategories->plug( settingsMenu );
+  //mActionCategories->plug( settingsMenu );
 
      
   mActionWN->plug( helpMenu );