MENU CLEANUP

3 files changed, 17 insertions, 17 deletions

diff --git a/kaddressbook/extensionmanager.cpp b/kaddressbook/extensionmanager.cpp
index efbdf17..46defa1 100644
--- a/kaddressbook/extensionmanager.cpp
+++ b/kaddressbook/extensionmanager.cpp
@@ -43,20 +43,20 @@
 ExtensionManager::ExtensionManager( KABCore *core, QWidget *parent,
                                     const char *name )
   : QScrollView( parent, name ), mCore( core ), mCurrentExtensionWidget( 0 )
 {
 #ifdef KAB_EMBEDDED
 //US  QPopupMenu *settingsmenu = (QPopupMenu*)mCore->getSettingsMenu();
-  QWidget *settingsmenu = (QWidget*)mCore->getSettingsMenu();
+  QWidget *settingsmenu = (QWidget*)mCore->getViewMenu();
 #endif //KAB_EMBEDDED
 
   mActionExtensions = new KSelectAction( i18n( "Show Extension Bar" ), 0,
                                          mCore->actionCollection(),
                                          "options_show_extensions" );
 
-  mActionExtensions->plug( settingsmenu );
+  mActionExtensions->plug( settingsmenu ,0);
 
   connect( mActionExtensions, SIGNAL( activated( int ) ),
            SLOT( setActiveExtension( int ) ) );
   mWidgetBox = new QWidget( viewport() );
   new QHBoxLayout (mWidgetBox  );
   addChild( mWidgetBox );
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index 1433568..5ef61b1 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -2127,13 +2127,13 @@ void KABCore::addActionsManually()
 #ifdef KAB_EMBEDDED
   QPopupMenu *fileMenu = new QPopupMenu( this );
   QPopupMenu *editMenu = new QPopupMenu( this );
   QPopupMenu *helpMenu = new QPopupMenu( this );
 
   KToolBar* tb =  mMainWindow->toolBar();
-
+  mMainWindow->setToolBarsMovable (false ); 
 #ifndef DESKTOP_VERSION
   if ( KABPrefs::instance()->mFullMenuBarVisible ) {
 #endif
       QMenuBar* mb = mMainWindow->menuBar();
 
       //US setup menubar.
@@ -2183,25 +2183,27 @@ void KABCore::addActionsManually()
   mActionPrintDetails->plug( fileMenu );
   fileMenu->insertSeparator();
 #endif
   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
 #if 0 
   // PENDING fix MailVCard
   fileMenu->insertSeparator();
@@ -2246,32 +2248,30 @@ void KABCore::addActionsManually()
 
   } else {
     //US not implemented yet
     //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();
 #ifndef DESKTOP_VERSION
   if ( Ir::supported() ) mActionBR->plug(settingsMenu );
   settingsMenu->insertSeparator();
 #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 );
   mActionSyncHowto->plug( helpMenu );
   mActionKdeSyncHowto->plug( helpMenu );
   mActionMultiSyncHowto->plug( helpMenu );
diff --git a/kaddressbook/viewmanager.cpp b/kaddressbook/viewmanager.cpp
index c2b1bb0..86f0f3d 100644
--- a/kaddressbook/viewmanager.cpp
+++ b/kaddressbook/viewmanager.cpp
@@ -717,13 +717,13 @@ void ViewManager::initActions()
 #endif
   connect( mActionSelectFilter, SIGNAL( activated( int ) ),
            SLOT( setActiveFilter( int ) ) );
 
 #ifdef KAB_EMBEDDED
   action->plug(settingsmenu);
-  mActionSelectFilter->plug(viewmenu);
+  mActionSelectFilter->plug(viewmenu,0);
 #endif //KAB_EMBEDDED
 
 }
 
 void ViewManager::initGUI()
 {