From b0e68cbd536b432a760bdd0d64cb97f9eab51bcc Mon Sep 17 00:00:00 2001
From: Oleg Krasilnikov <oleg.krasilnikov@intel.com>
Date: Tue, 10 Apr 2007 13:55:35 +0000
Subject: [PATCH] Bug #181025: menus are modified according to last discussion
 results.

---
 .../plugin.properties                         |  2 +-
 .../plugin.xml                                | 24 -------------------
 core/org.eclipse.cdt.ui/plugin.xml            | 23 +++++++++++-------
 3 files changed, 15 insertions(+), 34 deletions(-)

diff --git a/build/org.eclipse.cdt.managedbuilder.ui/plugin.properties b/build/org.eclipse.cdt.managedbuilder.ui/plugin.properties
index 9e6c20ccbbf..6e68c1506c8 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/plugin.properties
+++ b/build/org.eclipse.cdt.managedbuilder.ui/plugin.properties
@@ -53,7 +53,7 @@ Discovery.options=Discovery options
 Environment=Environment
 
 BuildCfgMenu.label=Build configurations
-BuildMenu.label=Build...
+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 91f488664b3..b5aca0e687e 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml
+++ b/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml
@@ -175,33 +175,9 @@
            </and>
         </visibility>
      </objectContribution>
-      
    </extension>
   <extension
         point="org.eclipse.ui.actionSets">
-     <actionSet
-           id="org.eclipse.cdt.managedbuilder.ui.buildSelectedFilesActionSet"
-           label="%BuildSelectedFilesActionSet.label"
-           visible="false">
-        <action
-              class="org.eclipse.cdt.managedbuilder.ui.actions.BuildFilesAction"
-              enablesFor="+"
-              id="org.eclipse.cdt.managedbuilder.ui.buildFilesAction"
-              label="%BuildSelectedFiles.label"
-              menubarPath="project/build"
-              style="push"
-              tooltip="%buildSelectedFiles.tooltip">
-        </action>
-        <action
-              class="org.eclipse.cdt.managedbuilder.ui.actions.CleanFilesAction"
-              enablesFor="+"
-              id="org.eclipse.cdt.managedbuilder.ui.cleanFilesAction"
-              label="%CleanSelectedFiles.label"
-              menubarPath="project/build"
-              style="push"
-              tooltip="%cleanFilesAction.tooltip">
-        </action>
-     </actionSet>
      <actionSet
            id="org.eclipse.cdt.managedbuilder.ui.BuildAllActionSet"
            label="%BuildCfgMenu.label"
diff --git a/core/org.eclipse.cdt.ui/plugin.xml b/core/org.eclipse.cdt.ui/plugin.xml
index 7379921ac03..3e337d9ee9d 100644
--- a/core/org.eclipse.cdt.ui/plugin.xml
+++ b/core/org.eclipse.cdt.ui/plugin.xml
@@ -831,7 +831,7 @@
               enablesFor="+"
               id="org.eclipse.cdt.ui.manageConfigsAction0"
               label="%ManageConfigAction.label"
-              menubarPath="org.eclipse.cdt.ui.cfgmenu/gm1"
+              menubarPath="org.eclipse.cdt.ui.cfgmenu/gm2"
               />
         <action
               class="org.eclipse.cdt.ui.actions.DeleteResConfigsAction"
@@ -854,6 +854,12 @@
            <groupMarker
                  name="gm1">
            </groupMarker>
+           <separator
+                 name="sep1">
+           </separator>
+           <groupMarker
+                 name="gm2">
+           </groupMarker>
         </menu>
         
         <visibility>
@@ -994,7 +1000,7 @@
               enablesFor="+"
               id="org.eclipse.cdt.ui.manageConfigsAction2"
               label="%ManageConfigAction.label"
-              menubarPath="project/org.eclipse.cdt.ui.prjmenu/gm1"
+              menubarPath="project/org.eclipse.cdt.ui.prjmenu/gm2"
               />
         <action
               class="org.eclipse.cdt.ui.actions.DeleteResConfigsAction"
@@ -1003,13 +1009,6 @@
               label="%DeleteRcConfigAction.label"
               menubarPath="project/org.eclipse.cdt.ui.prjmenu/gm1"
               />
-        <action
-              class="org.eclipse.cdt.ui.actions.ExcludeFromBuildAction"
-              enablesFor="+"
-              id="org.eclipse.cdt.ui.excludeAction2"
-              label="%ExcludeAction.label"
-              menubarPath="project/build"
-              />
         <menu
               id="org.eclipse.cdt.ui.prjmenu"
               label="%Configurations.menu"
@@ -1017,6 +1016,12 @@
            <groupMarker
                  name="gm1">
            </groupMarker>
+           <separator
+                 name="s2">
+           </separator>
+           <groupMarker
+                 name="gm2">
+           </groupMarker>
         </menu>
      </actionSet>
      <actionSet