Bug #181023: group property pages

Bug #181025: group context menu items

core/org.eclipse.cdt.ui/plugin.properties

@@ -258,11 +258,11 @@ WorkInProgress.name=Work In Progress
 
 CDTSearch.name=Search
 
-CDTIndexerProperty.name=C/C++ Indexer
+CDTIndexerProperty.name=Indexer
 
-CDTHelpProperty.name=C/C++ Documentation
+CDTHelpProperty.name=Documentation
 
-CDTFileTypesProperty.name=C/C++ File Types
+CDTFileTypesProperty.name=File Types
 
 CDTLanguagesProperty.name=Language Mappings
 
@@ -356,7 +356,7 @@ CDTIndexer.nullindexer=No Indexer (search based features will not work correctly
 CDTIndexer.fastindexer=Fast C/C++ Indexer (recommended)
 
 IndexView.name=C/C++ Index
-RebuildIndex.name=Rebuild Index
+RebuildIndex.name=Rebuild
 
 indexerPage.name = Indexer Page
 proposalFilter.name = Code Completion Proposal Filter
@@ -390,4 +390,9 @@ cViewScope.description = In C/C++ Views
 NewCfgDialog.name = newCfgDialog
 teamProjectIndexExportWizard.name = Team Shared Index
 teamProjectIndexExportWizard.description = Exports C/C++ index for use in other workspaces.
-exportWizard.CDTCategory.name = C/C++
+exportWizard.CDTCategory.name = C/C++
+
+page.c.general=C/C++ General
+# menu labels
+Configurations.menu=Build configurations
+Index.menu=Index

core/org.eclipse.cdt.ui/plugin.xml

@@ -723,7 +723,15 @@
              class="org.eclipse.cdt.internal.ui.indexview.RebuildIndexActionDelegate"
              id="org.eclipse.cdt.ui.rebuildIndexAction"
              label="%RebuildIndex.name"
-             menubarPath="buildGroup"/>
+             menubarPath="org.eclipse.cdt.ui.indexmenu/gm1"/>
+         <menu
+               id="org.eclipse.cdt.ui.indexmenu"
+               label="%Index.menu"
+               path="buildGroup">
+            <groupMarker
+                  name="gm1">
+            </groupMarker>
+         </menu>
       </objectContribution>
       <objectContribution
             objectClass="org.eclipse.core.resources.IMarker"
@@ -815,7 +823,7 @@
               enablesFor="+"
               id="org.eclipse.cdt.ui.buildConfigPulldownAction"
               label="%BuildConfigContextAction.label"
-              menubarPath="buildGroup"
+              menubarPath="org.eclipse.cdt.ui.cfgmenu/gm1"
               style="pulldown"
               tooltip="%BuildConfigAction.tooltip"/>
         <action
@@ -823,14 +831,14 @@
               enablesFor="+"
               id="org.eclipse.cdt.ui.manageConfigsAction0"
               label="%ManageConfigAction.label"
-              menubarPath="buildGroup"
+              menubarPath="org.eclipse.cdt.ui.cfgmenu/gm1"
               />
         <action
               class="org.eclipse.cdt.ui.actions.DeleteResConfigsAction"
               enablesFor="+"
               id="org.eclipse.cdt.ui.deleteConfigsAction0"
               label="%DeleteRcConfigAction.label"
-              menubarPath="buildGroup"
+              menubarPath="org.eclipse.cdt.ui.cfgmenu/gm1"
               />
         <action
               class="org.eclipse.cdt.ui.actions.ExcludeFromBuildAction"
@@ -839,6 +847,15 @@
               label="%ExcludeAction.label"
               menubarPath="buildGroup"
               />
+        <menu
+              id="org.eclipse.cdt.ui.cfgmenu"
+              label="%Configurations.menu"
+              path="buildGroup">
+           <groupMarker
+                 name="gm1">
+           </groupMarker>
+        </menu>
+              
      </objectContribution>
    </extension>
    
@@ -1427,9 +1444,39 @@
    
    <extension
          point="org.eclipse.ui.propertyPages">
+      <page
+            class="org.eclipse.cdt.ui.newui.Page_head_general"
+            id="org.eclipse.cdt.ui.newui.Page_head_general"
+            name="%page.c.general"
+            >
+         <filter
+               name="projectNature"
+               value="org.eclipse.cdt.managedbuilder.core.managedBuildNature">
+         </filter>            
+         <enabledWhen>
+            <or>
+		     <instanceof value="org.eclipse.core.resources.IProject"/>
+		     <instanceof value="org.eclipse.cdt.core.model.ICProject"/>
+		     
+		     <instanceof value="org.eclipse.core.resources.IFolder"/>
+		     <instanceof value="org.eclipse.cdt.core.model.ICContainer"/>
+
+		     <and>
+		         <instanceof value="org.eclipse.core.resources.IFile"/>
+    	         <test property="org.eclipse.cdt.ui.isSource" value="" />
+             </and>
+             <and>
+	         	<instanceof value="org.eclipse.cdt.core.model.ITranslationUnit"/>
+    	        <test property="org.eclipse.cdt.ui.isSource" value="" />
+	         </and>	
+		    </or>          
+         </enabledWhen>
+      </page>    
+
       <page
             name="%CDTIndexerProperty.name"
             class="org.eclipse.cdt.ui.dialogs.IndexerOptionPropertyPage"
+            category="org.eclipse.cdt.ui.newui.Page_head_general"
             id="org.eclipse.cdt.ui.indexer">
          <enabledWhen>
 		     <adapt type="org.eclipse.core.resources.IProject">
@@ -1440,6 +1487,7 @@
       <page
             name="%CDTFileTypesProperty.name"
             class="org.eclipse.cdt.internal.ui.preferences.CFileTypesPropertyPage"
+            category="org.eclipse.cdt.ui.newui.Page_head_general"
             id="org.eclipse.cdt.ui.fileTypes">
          <enabledWhen>
 		     <adapt type="org.eclipse.core.resources.IProject">
@@ -1450,6 +1498,7 @@
       <page
             name="%CDTHelpProperty.name"
             class="org.eclipse.cdt.ui.dialogs.CHelpConfigurationPropertyPage"
+            category="org.eclipse.cdt.ui.newui.Page_head_general"
             id="org.eclipse.cdt.ui.cHelp">
          <enabledWhen>
 		     <adapt type="org.eclipse.core.resources.IProject">
@@ -1460,6 +1509,7 @@
       <page
             class="org.eclipse.cdt.internal.ui.language.ProjectLanguageMappingPropertyPage"
             id="org.eclipse.cdt.ui.projectLanguageMappings"
+            category="org.eclipse.cdt.ui.newui.Page_head_general"
             name="%CDTLanguagesProperty.name">
          <enabledWhen>
 		     <adapt type="org.eclipse.core.resources.IProject">
@@ -1470,12 +1520,13 @@
       <page
             class="org.eclipse.cdt.internal.ui.language.FileLanguageMappingPropertyPage"
             id="org.eclipse.cdt.ui.fileLanguageMappings"
+            category="org.eclipse.cdt.ui.newui.Page_head_general"
             name="%CDTLanguagesProperty.name">
          <enabledWhen>
             <adapt
                   type="org.eclipse.cdt.core.model.ITranslationUnit">
             </adapt>
-         </enabledWhen>
+         </enabledWhen>z`
       </page>
    </extension>
    <extension