diff options
| author | Jeff Johnston | 2018-02-19 23:55:44 +0000 |
|---|---|---|
| committer | Jeff Johnston | 2018-02-20 00:39:47 +0000 |
| commit | 70151ce491ebf3ce6e6a33edf7a5cc130ad4c676 (patch) | |
| tree | bf0807c6613baff25ac205071be91303f69facee /build | |
| parent | 7292fbff6ddd4df49b5aa138ff83f3cb699282d0 (diff) | |
| download | org.eclipse.cdt-70151ce491ebf3ce6e6a33edf7a5cc130ad4c676.tar.gz org.eclipse.cdt-70151ce491ebf3ce6e6a33edf7a5cc130ad4c676.tar.xz org.eclipse.cdt-70151ce491ebf3ce6e6a33edf7a5cc130ad4c676.zip | |
Bug 531360 - Run ninja menu item is showing up in Docker views
- fix visibleWhen attribute of menuContribution
- also fix some warnings due to command not being set up
properly
Change-Id: I8b5239b1edcd5da20201e71d23dce3bfb18c6d0c
Diffstat (limited to 'build')
| -rw-r--r-- | build/org.eclipse.cdt.meson.ui/plugin.xml | 31 |
1 files changed, 24 insertions, 7 deletions
diff --git a/build/org.eclipse.cdt.meson.ui/plugin.xml b/build/org.eclipse.cdt.meson.ui/plugin.xml index 8b27bcb8e2c..a517f8ec1cf 100644 --- a/build/org.eclipse.cdt.meson.ui/plugin.xml +++ b/build/org.eclipse.cdt.meson.ui/plugin.xml @@ -70,14 +70,15 @@ point="org.eclipse.cdt.launch.coreBuildTab"> <provider nature="org.eclipse.cdt.meson.core.mesonNature" - priority="10" tabClass="org.eclipse.cdt.internal.meson.ui.MesonBuildTab"> </provider> </extension> <extension - id="org.eclipse.cdt.meson.ui.commands.ninja" - name="%meson.run.ninja.label" point="org.eclipse.ui.commands"> + <command + id="org.eclipse.cdt.meson.ui.command.runninja" + name="%meson.run.ninja.label"> + </command> </extension> <extension point="org.eclipse.ui.handlers"> @@ -95,12 +96,11 @@ <count value="1"> </count> - <iterate - ifEmpty="false" - operator="and"> + <iterate ifEmpty="false"> <adapt type="org.eclipse.core.resources.IResource"> <test + forcePluginActivation="true" property="org.eclipse.core.resources.projectNature" value="org.eclipse.cdt.meson.core.mesonNature"> </test> @@ -126,7 +126,24 @@ label="%meson.run.ninja.label" mnemonic="%meson.run.ninja.mnemonic" style="push"> - <visibleWhen checkEnabled="true"/> + <visibleWhen> + <with + variable="selection"> + <count + value="1"> + </count> + <iterate ifEmpty="false"> + <adapt + type="org.eclipse.core.resources.IResource"> + <test + forcePluginActivation="true" + property="org.eclipse.core.resources.projectNature" + value="org.eclipse.cdt.meson.core.mesonNature"> + </test> + </adapt> + </iterate> + </with> + </visibleWhen> </command> </menuContribution> </extension> |