From 49d9af779dc8e9c5e3776da637b83a46ae42c2e9 Mon Sep 17 00:00:00 2001
From: Oleg Krasilnikov <oleg.krasilnikov@intel.com>
Date: Mon, 9 Apr 2007 13:38:17 +0000
Subject: [PATCH] Bug #181025: Context menu items should be grouped/reduced in
 project view

---
 .../plugin.properties                              |  8 +-------
 build/org.eclipse.cdt.managedbuilder.ui/plugin.xml |  6 +++---
 core/org.eclipse.cdt.ui/plugin.properties          |  8 ++++----
 core/org.eclipse.cdt.ui/plugin.xml                 | 14 +++++++++++---
 4 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/build/org.eclipse.cdt.managedbuilder.ui/plugin.properties b/build/org.eclipse.cdt.managedbuilder.ui/plugin.properties
index 4b6335f3fd3..9e6c20ccbbf 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/plugin.properties
+++ b/build/org.eclipse.cdt.managedbuilder.ui/plugin.properties
@@ -35,13 +35,6 @@ MngResourceProp.name=C/C++ Build
 #The Project Converter page
 ConvertTargetAction.label=Convert To...
 
-# Build configuration actions
-BuildConfigActionSet.label=Build Configuration
-BuildConfigToolbarAction.label=Active Build Configuration
-BuildConfigMenuAction.label=Active Buil&d Configuration
-BuildConfigContextAction.label=Active Bui&ld Configuration
-BuildConfigAction.tooltip=Change active build configuration for the current project
-
 # Build/clean selected files actions
 BuildSelectedFiles.label=Build Selected &File(s)
 CleanSelectedFiles.label=C&lean Selected File(s)
@@ -60,6 +53,7 @@ Discovery.options=Discovery options
 Environment=Environment
 
 BuildCfgMenu.label=Build configurations
+BuildMenu.label=Build...
 
 Build.System.Wizard=Build System Wizard
 Make.Project.Wizard=Make Project Wizard
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml b/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml
index d9dfb2be617..bfb1aeaf822 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml
+++ b/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml
@@ -141,7 +141,7 @@
               class="org.eclipse.cdt.managedbuilder.ui.actions.BuildAllAction"
               enablesFor="+"
               id="org.eclipse.cdt.managedbuilder.ui.buildAllAction1"
-              label="%BuildCfgMenu.label"
+              label="%BuildMenu.label"
               menubarPath="org.eclipse.cdt.ui.cfgmenu/gm1"
               style="pulldown"/>
       </objectContribution>
@@ -210,8 +210,8 @@
               class="org.eclipse.cdt.managedbuilder.ui.actions.BuildAllAction"
               enablesFor="+"
               id="org.eclipse.cdt.managedbuilder.ui.buildAllAction0"
-              label="%BuildCfgMenu.label"
-              menubarPath="project/build"
+              label="%BuildMenu.label"
+              menubarPath="project/org.eclipse.cdt.ui.prjmenu/gm1"
               style="pulldown"
         />
      </actionSet>
diff --git a/core/org.eclipse.cdt.ui/plugin.properties b/core/org.eclipse.cdt.ui/plugin.properties
index 60f6c525bcd..1f7c284be28 100644
--- a/core/org.eclipse.cdt.ui/plugin.properties
+++ b/core/org.eclipse.cdt.ui/plugin.properties
@@ -149,13 +149,13 @@ OpenExternalProblemAction.label=Open external location
 # Build configuration actions
 BuildConfigActionSet.label=Build Configuration
 BuildConfigToolbarAction.label=Active Build Configuration
-BuildConfigMenuAction.label=Active Buil&d Configuration
-BuildConfigContextAction.label=Active Bui&ld Configuration
+BuildConfigMenuAction.label=Set Active
+BuildConfigContextAction.label=Set Active
 BuildConfigAction.tooltip=Change active build configuration for project(s)
 BuildConfigAction.tooltip2=Manage configurations for the current project
 
-ManageConfigAction.label=Manage configurations...
-DeleteRcConfigAction.label=Delete resource configs...
+ManageConfigAction.label=Manage...
+DeleteRcConfigAction.label=Delete resource cfgs...
 ExcludeAction.label=Exclude from build...
 BuildConfigurationActionSet.descr=Build active configuration for the current project
 
diff --git a/core/org.eclipse.cdt.ui/plugin.xml b/core/org.eclipse.cdt.ui/plugin.xml
index 165ba28886b..b455bd47318 100644
--- a/core/org.eclipse.cdt.ui/plugin.xml
+++ b/core/org.eclipse.cdt.ui/plugin.xml
@@ -980,7 +980,7 @@
               enablesFor="+"
               id="org.eclipse.cdt.ui.buildConfigMenuAction"
               label="%BuildConfigMenuAction.label"
-              menubarPath="project/build"
+              menubarPath="project/org.eclipse.cdt.ui.prjmenu/gm1"
               style="pulldown"
               tooltip="%BuildConfigAction.tooltip"/>
 
@@ -989,14 +989,14 @@
               enablesFor="+"
               id="org.eclipse.cdt.ui.manageConfigsAction2"
               label="%ManageConfigAction.label"
-              menubarPath="project/build"
+              menubarPath="project/org.eclipse.cdt.ui.prjmenu/gm1"
               />
         <action
               class="org.eclipse.cdt.ui.actions.DeleteResConfigsAction"
               enablesFor="+"
               id="org.eclipse.cdt.ui.deleteConfigsAction2"
               label="%DeleteRcConfigAction.label"
-              menubarPath="project/build"
+              menubarPath="project/org.eclipse.cdt.ui.prjmenu/gm1"
               />
         <action
               class="org.eclipse.cdt.ui.actions.ExcludeFromBuildAction"
@@ -1005,6 +1005,14 @@
               label="%ExcludeAction.label"
               menubarPath="project/build"
               />
+        <menu
+              id="org.eclipse.cdt.ui.prjmenu"
+              label="%Configurations.menu"
+              path="project/build">
+           <groupMarker
+                 name="gm1">
+           </groupMarker>
+        </menu>
      </actionSet>
      <actionSet
             label="%CElementCreationActionSet.label"