From 138550be1394067d171140367222afe0dc037bdf Mon Sep 17 00:00:00 2001
From: Andrew Gvozdev <angvoz.dev@gmail.com>
Date: Mon, 19 Apr 2010 05:05:00 +0000
Subject: [PATCH] bug 309579: Organize Build Configuration items in context
 menu

---
 .../plugin.xml                                |  8 +--
 core/org.eclipse.cdt.ui/plugin.properties     |  5 +-
 core/org.eclipse.cdt.ui/plugin.xml            | 72 ++++++++++---------
 .../ui/actions/ActionMessages.properties      |  4 +-
 4 files changed, 48 insertions(+), 41 deletions(-)

diff --git a/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml b/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml
index 50d1c450b5a..a59a9eae21f 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml
+++ b/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml
@@ -100,24 +100,24 @@
               enablesFor="+"
               id="org.eclipse.cdt.managedbuilder.ui.rebuildConfigurationsAction"
               label="%RebuildConfigurationsMenu.label"
-              menubarPath="org.eclipse.cdt.ui.cfgmenu/gm1"/>
+              menubarPath="org.eclipse.cdt.ui.cfgmenu/build"/>
         <action
               class="org.eclipse.cdt.managedbuilder.internal.ui.actions.CleanAllConfigurationsAction"
               enablesFor="+"
               id="org.eclipse.cdt.managedbuilder.ui.cleanAllConfigurationsAction"
               label="%CleanAllConfigurationsMenu.label"
-              menubarPath="org.eclipse.cdt.ui.cfgmenu/gm1"/>
+              menubarPath="org.eclipse.cdt.ui.cfgmenu/build"/>
         <action
               class="org.eclipse.cdt.managedbuilder.internal.ui.actions.BuildAllConfigurationsAction"
               enablesFor="+"
               id="org.eclipse.cdt.managedbuilder.ui.buildAllConfigurationsAction"
               label="%BuildAllConfigurationsMenu.label"
-              menubarPath="org.eclipse.cdt.ui.cfgmenu/gm1"/>
+              menubarPath="org.eclipse.cdt.ui.cfgmenu/build"/>
         <visibility>
            <objectState
               name="projectNature"
               value="org.eclipse.cdt.managedbuilder.core.managedBuildNature"/>
-        </visibility>      
+        </visibility>
       </objectContribution>
       <objectContribution
            adaptable="true"
diff --git a/core/org.eclipse.cdt.ui/plugin.properties b/core/org.eclipse.cdt.ui/plugin.properties
index 0e7c811cde0..021fb4e8407 100644
--- a/core/org.eclipse.cdt.ui/plugin.properties
+++ b/core/org.eclipse.cdt.ui/plugin.properties
@@ -212,8 +212,8 @@ BuildActiveConfiguration.label=Build Active Configuration
 BuildActiveConfiguration.tooltip=Build the active configurations of selected projects
 
 ManageConfigAction.label=Manage...
-DeleteRcConfigAction.label=Delete resource cfgs...
-ExcludeAction.label=Exclude from build...
+DeleteRcConfigAction.label=Reset to Default...
+ExcludeAction.label=Exclude from Build...
 BuildConfigurationActionSet.descr=Build active configuration for the current project
 
 # Common Editor ruler actions
@@ -482,6 +482,7 @@ importWizard.CDTCategory.name = C/C++
 page.c.general=C/C++ General
 # menu labels
 Configurations.menu=Build Configurations
+ResourceConfigurations.menu=Resource Configurations
 Index.menu=Index
 CDTWizard=CDT New Project Wizard
 
diff --git a/core/org.eclipse.cdt.ui/plugin.xml b/core/org.eclipse.cdt.ui/plugin.xml
index 663420bb88b..151e931dd94 100644
--- a/core/org.eclipse.cdt.ui/plugin.xml
+++ b/core/org.eclipse.cdt.ui/plugin.xml
@@ -1017,68 +1017,74 @@
            adaptable="true"
            id="org.eclipse.cdt.ui.buildConfigContribution"
            objectClass="org.eclipse.core.resources.IResource">
-        <action
-              class="org.eclipse.cdt.ui.actions.ChangeBuildConfigContextAction"
-              enablesFor="+"
-              id="org.eclipse.cdt.ui.buildConfigPulldownAction"
-              label="%BuildConfigContextAction.label"
-              menubarPath="org.eclipse.cdt.ui.cfgmenu/gm1"
-              style="pulldown"
-              tooltip="%BuildConfigAction.tooltip"/>
+        <visibility>
+           <and>
+              <objectState
+                 name="projectNature"
+                 value="org.eclipse.cdt.core.cnature"/>
+              <objectClass name="org.eclipse.core.resources.IProject"/>
+           </and>
+        </visibility>
         <action
               class="org.eclipse.cdt.ui.actions.ManageConfigsAction"
               enablesFor="+"
               id="org.eclipse.cdt.ui.manageConfigsAction0"
               label="%ManageConfigAction.label"
-              menubarPath="org.eclipse.cdt.ui.cfgmenu/gm2"
+              menubarPath="org.eclipse.cdt.ui.cfgmenu/manage"
               />
+        <action
+              class="org.eclipse.cdt.ui.actions.ChangeBuildConfigContextAction"
+              enablesFor="+"
+              id="org.eclipse.cdt.ui.buildConfigPulldownAction"
+              label="%BuildConfigContextAction.label"
+              menubarPath="org.eclipse.cdt.ui.cfgmenu/manage"
+              style="pulldown"
+              tooltip="%BuildConfigAction.tooltip"/>
         <menu
               id="org.eclipse.cdt.ui.cfgmenu"
               label="%Configurations.menu"
               path="buildGroup">
-           <groupMarker name="gm1"/>
-           <groupMarker name="gm3"/>
-           <separator
-                 name="sep1">
-           </separator>
-           <groupMarker
-                 name="gm2">
-           </groupMarker>
+           <groupMarker name="manage"/>
+           <separator name="sep1"/>
+           <groupMarker name="build"/>
         </menu>
-        
-        <visibility>
-              <objectState
-                 name="projectNature"
-                 value="org.eclipse.cdt.core.cnature"/>
-        </visibility>
      </objectContribution>
-
      <objectContribution
            adaptable="true"
            id="org.eclipse.cdt.ui.buildConfigContributionM"
            objectClass="org.eclipse.core.resources.IResource">
+        <visibility>
+           <and>
+              <objectState
+                 name="projectNature"
+                 value="org.eclipse.cdt.core.cnature"/>
+              <or>
+                 <objectClass name="org.eclipse.core.resources.IFolder"/>
+                 <objectClass name="org.eclipse.core.resources.IFile"/>
+              </or>
+           </and>
+        </visibility>
         <action
               class="org.eclipse.cdt.ui.actions.DeleteResConfigsAction"
               enablesFor="+"
               id="org.eclipse.cdt.ui.deleteConfigsAction0"
               label="%DeleteRcConfigAction.label"
-              menubarPath="org.eclipse.cdt.ui.cfgmenu/gm3"
+              menubarPath="org.eclipse.cdt.ui.rescfgmenu/gm1"
               />
         <action
               class="org.eclipse.cdt.ui.actions.ExcludeFromBuildAction"
               enablesFor="+"
               id="org.eclipse.cdt.ui.excludeAction0"
               label="%ExcludeAction.label"
-              menubarPath="buildGroup"
+              menubarPath="org.eclipse.cdt.ui.rescfgmenu/gm1"
               />
-        
-        <visibility>
-              <objectState
-                 name="projectNature"
-                 value="org.eclipse.cdt.managedbuilder.core.managedBuildNature"/>
-        </visibility>
+        <menu
+              id="org.eclipse.cdt.ui.rescfgmenu"
+              label="%ResourceConfigurations.menu"
+              path="buildGroup">
+           <groupMarker name="gm1"/>
+        </menu>
      </objectContribution>
-     
    </extension>
    
    <extension
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/ActionMessages.properties b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/ActionMessages.properties
index 02016aa57d1..5bef07c16f7 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/ActionMessages.properties
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/ActionMessages.properties
@@ -76,8 +76,8 @@ ChangeBuildConfigMenuAction.text=No way to manage configurations for selected ob
 CreateParserLogAction.existingFile=''{0}'' already exists.\nDo you want to replace it?
 CreateParserLogAction.readOnlyFile=''{0}'' cannot be modified\!
 
-DeleteResConfigsAction.0=Select configurations to delete
-DeleteResConfigsAction.1=Delete resource configurations
+DeleteResConfigsAction.0=Select resource configurations to restore default settings
+DeleteResConfigsAction.1=Reset Resource Configurations
 
 ExcludeFromBuildAction.0=Exclude object(s) from build in the following configurations
 ExcludeFromBuildAction.1=Exclude from build