mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-25 01:45:33 +02:00
Code Issues Wiki Activity

Bug 328472 - "C/C++ Build" does not show under Preferences

Browse source
This commit is contained in:
Anton Leherbauer 2010-10-29 12:26:52 +00:00
parent 679eb0d976
commit af5c98eed9
2 changed files with 34 additions and 89 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

121
build/org.eclipse.cdt.managedbuilder.ui/plugin.xml
View file

@ -479,22 +479,11 @@
id="org.eclipse.cdt.managedbuilder.ui.properties.Page_head_build"
name="%page.c.build"
>
<filter
name="projectNature"
value="org.eclipse.cdt.managedbuilder.core.managedBuildNature">
</filter>
<enabledWhen>
<or>
<adapt
type="org.eclipse.core.resources.IProject">
</adapt>
<instanceof value="org.eclipse.core.resources.IFolder"/>
<instanceof value="org.eclipse.cdt.core.model.ICContainer"/>
<instanceof value="org.eclipse.cdt.core.model.ITranslationUnit"/>
<instanceof value="org.eclipse.core.resources.IFile"/>
</or>
<adapt type="org.eclipse.core.resources.IResource">
<test property="org.eclipse.core.resources.projectNature"
value="org.eclipse.cdt.managedbuilder.core.managedBuildNature"/>
</adapt>
</enabledWhen>
</page>
<page
@ -503,15 +492,11 @@
category="org.eclipse.cdt.managedbuilder.ui.properties.Page_head_build"
name="%CDTVariablesProperty.name"
>
<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"/>
</or>
<adapt type="org.eclipse.core.resources.IProject">
<test property="org.eclipse.core.resources.projectNature"
value="org.eclipse.cdt.managedbuilder.core.managedBuildNature"/>
</adapt>
</enabledWhen>
</page>
@ -521,21 +506,11 @@
category="org.eclipse.cdt.ui.newui.Page_head_general"
name="%CDTPathSymbolsProperty.name"
>
<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"/>
<instanceof value="org.eclipse.core.resources.IFile"/>
<instanceof value="org.eclipse.cdt.core.model.ITranslationUnit"/>
</or>
<adapt type="org.eclipse.core.resources.IResource">
<test property="org.eclipse.core.resources.projectNature"
value="org.eclipse.cdt.managedbuilder.core.managedBuildNature"/>
</adapt>
</enabledWhen>
</page>
@ -545,16 +520,12 @@
category="org.eclipse.cdt.ui.newui.Page_head_general"
name="%CDTExpPathSymbolsProperty.name"
>
<filter
name="projectNature"
value="org.eclipse.cdt.managedbuilder.core.managedBuildNature">
</filter>
<enabledWhen>
<and>
<or>
<instanceof value="org.eclipse.core.resources.IProject"/>
<instanceof value="org.eclipse.cdt.core.model.ICProject"/>
</or>
<adapt type="org.eclipse.core.resources.IProject">
<test property="org.eclipse.core.resources.projectNature"
value="org.eclipse.cdt.managedbuilder.core.managedBuildNature"/>
</adapt>
<test property="org.eclipse.cdt.ui.pageEnabled" value="export" />
</and>
</enabledWhen>
@ -566,21 +537,11 @@
category="org.eclipse.cdt.managedbuilder.ui.properties.Page_head_build"
name="%CDTBuildProperty.name"
>
<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"/>
<instanceof value="org.eclipse.core.resources.IFile"/>
<instanceof value="org.eclipse.cdt.core.model.ITranslationUnit"/>
</or>
<adapt type="org.eclipse.core.resources.IResource">
<test property="org.eclipse.core.resources.projectNature"
value="org.eclipse.cdt.managedbuilder.core.managedBuildNature"/>
</adapt>
</enabledWhen>
</page>
<page
@ -589,22 +550,12 @@
category="org.eclipse.cdt.managedbuilder.ui.properties.Page_head_build"
name="%CDTToolchainProperty.name"
>
<filter
name="projectNature"
value="org.eclipse.cdt.managedbuilder.core.managedBuildNature">
</filter>
<enabledWhen>
<and>
<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"/>
<instanceof value="org.eclipse.core.resources.IFile"/>
<instanceof value="org.eclipse.cdt.core.model.ITranslationUnit"/>
</or>
<adapt type="org.eclipse.core.resources.IResource">
<test property="org.eclipse.core.resources.projectNature"
value="org.eclipse.cdt.managedbuilder.core.managedBuildNature"/>
</adapt>
<test property="org.eclipse.cdt.ui.pageEnabled" value="toolEdit" />
</and>
</enabledWhen>
@ -616,15 +567,11 @@
category="org.eclipse.cdt.managedbuilder.ui.properties.Page_head_build"
name="%Discovery.options"
>
<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"/>
</or>
<adapt type="org.eclipse.core.resources.IProject">
<test property="org.eclipse.core.resources.projectNature"
value="org.eclipse.cdt.managedbuilder.core.managedBuildNature"/>
</adapt>
</enabledWhen>
</page>
<page
@ -633,15 +580,11 @@
category="org.eclipse.cdt.managedbuilder.ui.properties.Page_head_build"
name="%Environment"
>
<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"/>
</or>
<adapt type="org.eclipse.core.resources.IProject">
<test property="org.eclipse.core.resources.projectNature"
value="org.eclipse.cdt.managedbuilder.core.managedBuildNature"/>
</adapt>
</enabledWhen>
</page>

2
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractPage.java
View file

@ -1217,6 +1217,8 @@ implements
internalElement = ((ICElement)el).getResource();
else if (el instanceof IResource)
internalElement = (IResource)el;
else
internalElement = (IResource) el.getAdapter(IResource.class);
if (internalElement == null) return false;
isProject = internalElement instanceof IProject;
isFolder = internalElement instanceof IFolder;