Merge "Issue #666 re-enable CAVE menu in NC perspective, remove extra help menu" into development

Former-commit-id: 689dcd5d4d [formerly c74a54b9ed] [formerly 47920c3168 [formerly 9207aa6af20bd76369a5952bd836526ce6d7197f]]
Former-commit-id: 47920c3168
Former-commit-id: 528f6045e9
This commit is contained in:
Nate Jensen 2012-08-03 10:43:39 -05:00 committed by Gerrit Code Review
commit ca6dbc6be6

View file

@ -414,7 +414,7 @@
</command> </command>
</menu> </menu>
<menu <!--menu
id="NCHelp" id="NCHelp"
label="Help" label="Help"
mnemonic="H"> mnemonic="H">
@ -442,7 +442,7 @@
name="aboutAdditions" name="aboutAdditions"
visible="false"> visible="false">
</separator> </separator>
</menu> </menu-->
</menuContribution> </menuContribution>
<menuContribution <menuContribution
locationURI="menu:NCHelp?after=additions"> locationURI="menu:NCHelp?after=additions">
@ -917,10 +917,11 @@
pattern="com\.raytheon\.viz\.ui\.tools\.nav/.*"> <!-- Raytheons Pan and Zoom --> pattern="com\.raytheon\.viz\.ui\.tools\.nav/.*"> <!-- Raytheons Pan and Zoom -->
</activityPatternBinding> </activityPatternBinding>
<activityPatternBinding <!-- Raytheons CAVE Menu -->
<!--activityPatternBinding
activityId="gov.noaa.nws.ncep.NC.activity" activityId="gov.noaa.nws.ncep.NC.activity"
pattern="com\.raytheon\.viz\.ui\.personalities\.awips/.*"> <!-- Raytheons CAVE Menu --> pattern="com\.raytheon\.viz\.ui\.personalities\.awips/.*">
</activityPatternBinding> </activityPatternBinding-->
<!-- this gets rid of all Raytheon menus and toolbars!!!! activityPatternBinding <!-- this gets rid of all Raytheon menus and toolbars!!!! activityPatternBinding
activityId="gov.noaa.nws.ncep.NC.activity" activityId="gov.noaa.nws.ncep.NC.activity"