MENU CLEANUP

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
@@ -2132,3 +2132,3 @@ void KABCore::addActionsManually()
   KToolBar* tb =  mMainWindow->toolBar();
-
+  mMainWindow->setToolBarsMovable (false ); 
 #ifndef DESKTOP_VERSION
@@ -2188,6 +2188,7 @@ void KABCore::addActionsManually()
 
-  mActionNewContact->plug( fileMenu );
+  mActionNewContact->plug( editMenu );
   mActionNewContact->plug( tb );
 
-  mActionEditAddressee->plug( fileMenu );
+  mActionEditAddressee->plug( editMenu );
+  editMenu->insertSeparator();
   // if ((KGlobal::getDesktopSize() > KGlobal::Small ) ||
@@ -2196,3 +2197,3 @@ void KABCore::addActionsManually()
 
-  fileMenu->insertSeparator();
+    // fileMenu->insertSeparator();
   mActionSave->plug( fileMenu );
@@ -2200,3 +2201,4 @@ void KABCore::addActionsManually()
   fileMenu->insertItem( "&Export", ExportMenu );
-  fileMenu->insertItem( i18n("&Change"), changeMenu );
+  editMenu->insertItem( i18n("&Change"), changeMenu );
+  editMenu->insertSeparator();
 #ifndef DESKTOP_VERSION
@@ -2251,6 +2253,6 @@ void KABCore::addActionsManually()
 
-  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  )
@@ -2264,9 +2266,7 @@ void KABCore::addActionsManually()
   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 );