From ab00dd29088ba4c6006be38bed9dadc8c97de5a8 Mon Sep 17 00:00:00 2001
From: AWIPS User <mjames@unidata.ucar.edu>
Date: Sat, 19 Sep 2015 19:54:01 -0600
Subject: [PATCH] further menu edits

Former-commit-id: c7a75b70e828bbb4f087bd27da454779a9e3073c
Former-commit-id: 1e613dabe7a57489213583855f2a6292d8db73fe
---
 .../menus/ncepHydro/awc/baseAWC.xml           | 14 +++-
 .../menus/ncepHydro/cpc/baseCPC.xml           |  2 +-
 .../menus/ncepHydro/cpc/cpcMenus.xml          |  2 +-
 .../menus/ncepHydro/hpc/baseHPC.xml           | 12 +++
 .../menus/ncepHydro/hpc/hpcMenus.xml          |  4 +-
 .../localization/menus/ncepHydro/index.xml    | 14 ++--
 .../menus/ncepHydro/mpc/mpcMenus.xml          |  2 +-
 .../menus/ncepHydro/spc/baseSPC.xml           |  4 +-
 .../plugin.xml                                | 52 +++----------
 .../menus/upperair/baseUpperAir.xml           |  6 ++
 .../plugin.xml                                | 16 ++--
 cave/com.raytheon.uf.viz.d2d.ui/plugin.xml    | 37 ++++++---
 .../menus/npp/nucaps/nucapsMenuItems.xml      |  7 +-
 .../localization/menus/npp/nppMenuItems.xml   |  8 +-
 .../menus/hydro/baseHPCStation.xml            | 14 ----
 .../localization/menus/hydro/baseRFCffg.xml   |  9 ++-
 .../menus/satellite/baseComposite.xml         |  2 -
 .../satellite/baseDerivedProductPlots.xml     | 50 +++++-------
 .../menus/satellite/baseSounderImagery.xml    | 77 +++++++++++--------
 .../localization/menus/satellite/index.xml    | 10 ++-
 .../menus/volume/baseFamilies.xml             | 28 +++----
 21 files changed, 187 insertions(+), 183 deletions(-)

diff --git a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/awc/baseAWC.xml b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/awc/baseAWC.xml
index d44b91a82b..7fe43c3109 100644
--- a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/awc/baseAWC.xml
+++ b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/awc/baseAWC.xml
@@ -19,8 +19,16 @@
         further_licensing_information.
     -->
 <menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<contribute xsi:type="subMenu" menuText="CCFP"
-	            id="ncepHydro.awc.ccfp">
-	    <contribute xsi:type="subinclude" fileName="menus/ncepHydro/awc/ccfp.xml"/>
+	<contribute xsi:type="bundleItem" file="bundles/Ccfp.xml"
+		menuText="AWC 4 Hour CCFP" id="CCFP4HOUR">
+		<substitute key="validDuration" value="14400" />
+	</contribute>
+	<contribute xsi:type="bundleItem" file="bundles/Ccfp.xml"
+		menuText="AWC 6 Hour CCFP" id="CCFP6HOUR">
+		<substitute key="validDuration" value="21600" />
+	</contribute>
+	<contribute xsi:type="bundleItem" file="bundles/Ccfp.xml"
+		menuText="AWC 8 Hour CCFP" id="CCFP8HOUR">
+		<substitute key="validDuration" value="28800" />
 	</contribute>
 </menuTemplate>
diff --git a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/cpc/baseCPC.xml b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/cpc/baseCPC.xml
index 82be8eb2fc..ade2721152 100644
--- a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/cpc/baseCPC.xml
+++ b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/cpc/baseCPC.xml
@@ -21,7 +21,7 @@
 <menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">	
     <contribute xsi:type="subinclude" fileName="menus/ncepHydro/cpc/cpcMenus.xml"/>
     
-	<contribute xsi:type="subMenu" menuText="Outlook Grids"
+	<contribute xsi:type="subMenu" menuText="CPC Outlook Grids"
 	            id="ncepHydro.cpc.outlookGrids">
 	    <contribute xsi:type="subinclude" fileName="menus/ncepHydro/cpc/outlookGrids.xml"/>
 	</contribute>
diff --git a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/cpc/cpcMenus.xml b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/cpc/cpcMenus.xml
index 2545031c39..0df2a340f9 100644
--- a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/cpc/cpcMenus.xml
+++ b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/cpc/cpcMenus.xml
@@ -19,7 +19,7 @@
         further_licensing_information.
     -->
 <menuTemplate>
-    <contribute xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="subMenu" menuText="Hazard Charts" id="ncepHydro.cpc.hazardCharts">
+    <contribute xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="subMenu" menuText="CPC Hazard Charts" id="ncepHydro.cpc.hazardCharts">
         <contribute xsi:type="titleItem" titleText="------ 3-7 Day Hazards Outlook ------" id="threeTo7DayHazardsOutlook"/>
         <contribute xsi:type="bundleItem" useReferenceTime="true" file="bundles/Redbook.xml" menuText="3-7 day Precipitation Fcst" timeQuery="true" id="threeTo7DayPrecipFcst">
             <substitute value="PEIY97" key="wmo"/>
diff --git a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/hpc/baseHPC.xml b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/hpc/baseHPC.xml
index 554c629687..06c5b944d4 100644
--- a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/hpc/baseHPC.xml
+++ b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/hpc/baseHPC.xml
@@ -23,6 +23,18 @@
  	<contribute xsi:type="bundleItem" file="bundles/ncepHydro/hpc/HPC6hrQPF.xml" 
               menuText="HPC QPF 6hr (Grid)" id="HPCQPF6hr">
     </contribute>
+	<contribute xsi:type="bundleItem" file="bundles/BufrMosPlot.xml" 
+		 menuText="HPC MaxT/MinT" id="HPCmaxTminT" >
+        	<substitute key="model" value="HPC"/>
+    		<substitute key="plotModel" value="bufrmos/maxmin.svg"/>
+    		<substitute key="title" value="HPC MaxT/MinT ( F )"/>
+    </contribute>
+    <contribute xsi:type="bundleItem" file="bundles/BufrMosPlot.xml" 
+		 menuText="HPC POP 24hr" id="HPCpop24hr" >
+        	<substitute key="model" value="HPC"/>
+    		<substitute key="plotModel" value="bufrmos/pop24hr.svg"/>
+    		<substitute key="title" value="HPC POP 24hr"/>
+    </contribute>
 
     <contribute xsi:type="subinclude" fileName="menus/ncepHydro/hpc/hpcMenus.xml"/>
 
diff --git a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/hpc/hpcMenus.xml b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/hpc/hpcMenus.xml
index 5a1365e067..e94ada8e32 100644
--- a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/hpc/hpcMenus.xml
+++ b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/hpc/hpcMenus.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<contribute xsi:type="subMenu" menuText="Precipitation"
+	<contribute xsi:type="subMenu" menuText="HPC Precip Products"
 		id="ncepHydro.hpc.precipitation">
 		<contribute xsi:type="bundleItem" file="bundles/Redbook.xml"
 			menuText="Instantaneous Precip" id="instantaneousPrecip">
@@ -129,7 +129,7 @@
 		</contribute>
 	</contribute>
 
-	<contribute xsi:type="subMenu" menuText="Temps &amp;&amp; Weather"
+	<contribute xsi:type="subMenu" menuText="HPC Temp &amp;&amp; Wx Products"
 		id="ncepHydro.hpc.tempsAndWeather">
 		<contribute xsi:type="bundleItem" file="bundles/Redbook.xml"
 			menuText="1-5 Day Max Temp Anomaly" id="fiveDayMaxTempAnomaly">
diff --git a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/index.xml b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/index.xml
index 78e5aa1436..a9586be819 100644
--- a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/index.xml
+++ b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/index.xml
@@ -19,18 +19,18 @@
         further_licensing_information.
     -->
 <menuContributionFile>
-	<include installTo="menu:ncepHydro?after=SPC" 
+	<include installTo="menu:ncepHydro?before=SPC" 
              fileName="menus/ncepHydro/spc/baseSPC.xml"/>
-    <include installTo="menu:ncepHydro?after=TPC" 
+    <include installTo="menu:ncepHydro?before=TPC" 
     		 fileName="menus/ncepHydro/tpc/baseTPC.xml"/>
-    <include installTo="menu:ncepHydro?after=NCO" 
+    <include installTo="menu:ncepHydro?before=NCO" 
              fileName="menus/ncepHydro/nco/baseNCO.xml"/>
-    <include installTo="menu:ncepHydro?after=HPC" 
+    <include installTo="menu:ncepHydro?before=HPC" 
              fileName="menus/ncepHydro/hpc/baseHPC.xml"/>
-    <include installTo="menu:ncepHydro?after=MPC" 
+    <include installTo="menu:ncepHydro?before=OPC" 
              fileName="menus/ncepHydro/mpc/baseMPC.xml"/>
-    <include installTo="menu:ncepHydro?after=CPC" 
+    <include installTo="menu:ncepHydro?before=CPC" 
              fileName="menus/ncepHydro/cpc/baseCPC.xml"/>
-    <include installTo="menu:ncepHydro?after=AWC" 
+    <include installTo="menu:ncepHydro?before=AWC" 
              fileName="menus/ncepHydro/awc/baseAWC.xml"/>
 </menuContributionFile>
\ No newline at end of file
diff --git a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/mpc/mpcMenus.xml b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/mpc/mpcMenus.xml
index 44119fd875..12a9e0e08d 100644
--- a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/mpc/mpcMenus.xml
+++ b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/mpc/mpcMenus.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <menuTemplate>
-    <contribute xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="subMenu" menuText="Marine Guidance" id="ncepHydro.mpc.marineGuidance">
+    <contribute xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="subMenu" menuText="OPC Marine Guidance" id="ncepHydro.mpc.marineGuidance">
         <contribute xsi:type="bundleItem" useReferenceTime="true" file="bundles/Redbook.xml" menuText="Tropical Sfc Analysis" timeQuery="true" id="tropicalSfcAnalysis">
             <substitute value="PYNA98" key="wmo"/>
         </contribute>
diff --git a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/spc/baseSPC.xml b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/spc/baseSPC.xml
index 27a27e3095..2e86b65177 100644
--- a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/spc/baseSPC.xml
+++ b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/spc/baseSPC.xml
@@ -21,10 +21,10 @@
 <menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 	
     <contribute xsi:type="bundleItem" file="bundles/ncepHydro/ConvectiveWatchPlot.xml"
-             menuText="Convective Watches" id="convectiveWatches">
+             menuText="SPC Convective Watches" id="convectiveWatches">
     </contribute>
  	<contribute xsi:type="bundleItem" file="bundles/ncepHydro/SvrWxPlot.xml" 
-               menuText="Svr Wx Plot" id="spcWxPlot">
+               menuText="SPC Svr Wx Plot" id="spcWxPlot">
 	</contribute>
 	
 	<contribute xsi:type="subinclude" fileName="menus/ncepHydro/spc/hazardMenus.xml"/>
diff --git a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/plugin.xml b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/plugin.xml
index 2d95a4ba1e..d2f8edebe2 100644
--- a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/plugin.xml
+++ b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/plugin.xml
@@ -34,69 +34,37 @@
                 </reference>
              </visibleWhen>
              <separator
-                   name="xxx"
+                   name="SPC"
                    visible="true">
              </separator>
-             <command id="SPC"
-                   commandId="com.raytheon.viz.ui.actions.titleAction"
-                   label="------ SPC ------">
-             </command>
              <separator
-                   name="xxx"
+                   name="TPC"
                    visible="true">
              </separator>
-             <command id="TPC"
-                   commandId="com.raytheon.viz.ui.actions.titleAction"
-                   label="------ TPC ------">
-             </command>
              <separator
-                   name="xxx"
+                   name="NCO"
                    visible="true">
-             </separator>
-             <command id="NCO"
-                   commandId="com.raytheon.viz.ui.actions.titleAction"
-                   label="------ NCO ------">
-             </command>
+             </separator>     
              <separator
-                   name="xxx"
+                   name="HPC"
                    visible="true">
              </separator>
-             <command id="HPC"
-                   commandId="com.raytheon.viz.ui.actions.titleAction"
-                   label="------ HPC ------">
-             </command>       
              <separator
-                   name="xxx"
+                   name="OPC"
                    visible="true">
              </separator>
-             <command id="MPC"
-                   commandId="com.raytheon.viz.ui.actions.titleAction"
-                   label="------ MPC ------">
-             </command>
              <separator
-                   name="xxx"
+                   name="CPC"
                    visible="true">
              </separator>
-             <command id="CPC"
-                   commandId="com.raytheon.viz.ui.actions.titleAction"
-                   label="------ CPC ------">
-             </command>
              <separator
-                   name="xxx"
+                   name="AWC"
                    visible="true">
              </separator>
-             <command id="AWC"
-                   commandId="com.raytheon.viz.ui.actions.titleAction"
-                   label="------ AWC ------">
-             </command>
-             <separator
-                   name="xxx"
+			 <separator
+                   name="HYDRO"
                    visible="true">
              </separator>
-             <command id="HYDRO"
-                   commandId="com.raytheon.viz.ui.actions.titleAction"
-                   label="------ Hydro ------">
-             </command>
              <separator name="QPE" visible="false"/>
              <separator name="QPF" visible="false"/>
              <separator name="HydroMenuEnd" visible="false"/>
diff --git a/cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/menus/upperair/baseUpperAir.xml b/cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/menus/upperair/baseUpperAir.xml
index 20efd22934..70e9bb5d84 100644
--- a/cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/menus/upperair/baseUpperAir.xml
+++ b/cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/menus/upperair/baseUpperAir.xml
@@ -19,6 +19,12 @@
         further_licensing_information.
     -->
 <menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<contribute xsi:type="bundleItem" file="bundles/npp/soundingAvailability.xml"
+			menuText="NUCAPS Soundings" id="NUCAPSAvailability">
+			<substitute key="name" value="NUCAPS"/>
+			<substitute key="pluginName" value="nucaps"/>
+			<substitute key="soundingResourceData" value="com.raytheon.uf.viz.npp.nucaps.NucapsNSharpResourceData"/>
+	</contribute>
     <contribute xsi:type="subMenu" id="UAplots" menuText="UA plots">
         <contribute xsi:type="titleItem" titleText="------ NCEP ------" />
         <contribute xsi:type="separator" id="NCEPEnd"
diff --git a/cave/com.raytheon.uf.viz.d2d.ui.upperair/plugin.xml b/cave/com.raytheon.uf.viz.d2d.ui.upperair/plugin.xml
index cb5e2c8f7c..839645ccf9 100644
--- a/cave/com.raytheon.uf.viz.d2d.ui.upperair/plugin.xml
+++ b/cave/com.raytheon.uf.viz.d2d.ui.upperair/plugin.xml
@@ -33,6 +33,14 @@
                       definitionId="com.raytheon.uf.viz.d2d.ui.inD2DActionSet">
                 </reference>
              </visibleWhen>
+             <command
+                   commandId="gov.noaa.nws.ncep.ui.nsharp.palette"
+                   id="gov.noaa.nws.ncep.ui.nsharp.palette"
+                   label="NSHARP Soundings"
+                   mode="FORCE_TEXT"
+                   style="push"
+                   tooltip="Nsharp">
+             </command>
 
              <command
                    commandId="com.raytheon.viz.ui.actions.titleAction"
@@ -48,13 +56,7 @@
                    commandId="com.raytheon.viz.ui.actions.titleAction"
                    label="------ Aircraft ------" id="AIRCRAFT">
              </command>
-             <separator name="AircraftMenuEnd" visible="false"/> 
-             <command
-                   commandId="com.raytheon.viz.ui.actions.titleAction"
-                   label="------ RAOB ------" id="RAOB">
-             </command>
-             <separator name="RAOBMenuMiddle" visible="false"/>  
-             <separator name="RAOBMenuEnd" visible="false"/>          
+             <separator name="AircraftMenuEnd" visible="false"/>      
           </menu>
     </menuContribution>
 </extension>
diff --git a/cave/com.raytheon.uf.viz.d2d.ui/plugin.xml b/cave/com.raytheon.uf.viz.d2d.ui/plugin.xml
index fbb58511d8..ba6ebd7331 100644
--- a/cave/com.raytheon.uf.viz.d2d.ui/plugin.xml
+++ b/cave/com.raytheon.uf.viz.d2d.ui/plugin.xml
@@ -72,12 +72,17 @@
              </visibleWhen>
              <command
                    commandId="org.eclipse.ui.window.newEditor"
-                   label="New Map..."
+                   label="New Map"
+                   style="push">
+             </command>
+             <command
+                   commandId="com.raytheon.viz.ui.maps.createProjection"
+                   label="New Projection"
                    style="push">
              </command>
              <command
                    commandId="com.raytheon.viz.ui.loadSerialized"
-                   label="Load Map..."
+                   label="Load Map"
                    style="push">
              </command>
              <command
@@ -351,13 +356,13 @@
                 </reference>
              </visibleWhen>
                <separator name="MENUSTART" visible="false"/>
-               <separator name="GROUP1" visible="false"/>
-               <separator name="GROUP2" visible="false"/>
-               <separator name="GROUP3" visible="false"/>
-               <separator name="GROUP4" visible="false"/>
-               <separator name="GROUP5" visible="false"/>
-               <separator name="GROUP6" visible="false"/>
-               <separator name="GROUP7" visible="false"/>
+               <separator name="GROUP1" visible="true"/>
+               <separator name="GROUP2" visible="true"/>
+               <separator name="GROUP3" visible="true"/>
+               <separator name="GROUP4" visible="true"/>
+               <separator name="GROUP5" visible="true"/>
+               <separator name="GROUP6" visible="true"/>
+               <separator name="GROUP7" visible="true"/>
                <separator name="MENUEND" visible="false"/>
          </menu>
          <menu
@@ -584,6 +589,20 @@
                      value="CREATE_RBD">
                </parameter>
             </command>
+            <command
+                  commandId="gov.noaa.nws.ncep.ui.nsharp.palette"
+                  icon="icons/nsharp.png"
+                  id="gov.noaa.nws.ncep.ui.nsharp.palette"
+                  label="Nsharp"
+                  mode="FORCE_TEXT"
+                  style="push"
+                  tooltip="Nsharp">
+               <visibleWhen>
+                  <reference
+                        definitionId="com.raytheon.uf.viz.d2d.ui.inD2DActionSet">
+                  </reference>
+               </visibleWhen>
+            </command>
 
 
          </toolbar>
diff --git a/cave/com.raytheon.uf.viz.npp.nucaps/localization/menus/npp/nucaps/nucapsMenuItems.xml b/cave/com.raytheon.uf.viz.npp.nucaps/localization/menus/npp/nucaps/nucapsMenuItems.xml
index ccba47f49f..df81723149 100644
--- a/cave/com.raytheon.uf.viz.npp.nucaps/localization/menus/npp/nucaps/nucapsMenuItems.xml
+++ b/cave/com.raytheon.uf.viz.npp.nucaps/localization/menus/npp/nucaps/nucapsMenuItems.xml
@@ -19,10 +19,5 @@
         further_licensing_information.
     -->
 <menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<contribute xsi:type="bundleItem" file="bundles/npp/soundingAvailability.xml"
-			menuText="NUCAPS Sounding Availability" id="NUCAPSAvailability">
-			<substitute key="name" value="NUCAPS"/>
-			<substitute key="pluginName" value="nucaps"/>
-			<substitute key="soundingResourceData" value="com.raytheon.uf.viz.npp.nucaps.NucapsNSharpResourceData"/>
-	</contribute>
+	
 </menuTemplate>
\ No newline at end of file
diff --git a/cave/com.raytheon.uf.viz.npp/localization/menus/npp/nppMenuItems.xml b/cave/com.raytheon.uf.viz.npp/localization/menus/npp/nppMenuItems.xml
index 802fb9e237..a6f3bc162b 100644
--- a/cave/com.raytheon.uf.viz.npp/localization/menus/npp/nppMenuItems.xml
+++ b/cave/com.raytheon.uf.viz.npp/localization/menus/npp/nppMenuItems.xml
@@ -19,10 +19,14 @@
         further_licensing_information.
     -->
 <menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<contribute xsi:type="bundleItem" file="bundles/npp/soundingAvailability.xml"
+			menuText="NUCAPS Soundings" id="NUCAPSAvailability">
+			<substitute key="name" value="NUCAPS"/>
+			<substitute key="pluginName" value="nucaps"/>
+			<substitute key="soundingResourceData" value="com.raytheon.uf.viz.npp.nucaps.NucapsNSharpResourceData"/>
+	</contribute>
 	<contribute xsi:type="subMenu" id="NPPProducts" menuText="NPP Products">
 		<contribute xsi:type="separator" id="Imagery" visible="false"/>
-		<contribute xsi:type="titleItem" id="SoundingsTitle" titleText="------ Soundings ------"/>
-		<contribute xsi:type="separator" id="Soundings" visible="false"/>
 	</contribute>
 	<contribute xsi:type="bundleItem" file="bundles/npp/viirs/viirsImagery.xml"
 		menuText="VIIRS AK - Band 1 (0.64u)" id="Img0.64">
diff --git a/cave/com.raytheon.viz.hydro/localization/menus/hydro/baseHPCStation.xml b/cave/com.raytheon.viz.hydro/localization/menus/hydro/baseHPCStation.xml
index 5f6935893b..1adcbf4281 100644
--- a/cave/com.raytheon.viz.hydro/localization/menus/hydro/baseHPCStation.xml
+++ b/cave/com.raytheon.viz.hydro/localization/menus/hydro/baseHPCStation.xml
@@ -19,20 +19,6 @@
         further_licensing_information.
     -->
 <menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<contribute xsi:type="subMenu" menuText="HPC Station Data">
-		<contribute xsi:type="bundleItem" file="bundles/BufrMosPlot.xml" 
-			 menuText="MaxT/MinT" id="HPCmaxTminT" >
-	        	<substitute key="model" value="HPC"/>
-        		<substitute key="plotModel" value="bufrmos/maxmin.svg"/>
-	    		<substitute key="title" value="HPC MaxT/MinT ( F )"/>
-	    </contribute>
-	    <contribute xsi:type="bundleItem" file="bundles/BufrMosPlot.xml" 
-			 menuText="POP 24hr" id="HPCpop24hr" >
-	        	<substitute key="model" value="HPC"/>
-        		<substitute key="plotModel" value="bufrmos/pop24hr.svg"/>
-	    		<substitute key="title" value="HPC POP 24hr"/>
-	    </contribute>
-	</contribute>
 	<contribute xsi:type="subMenu" menuText="0-3 Hour Radar-based QPF">
 		<contribute xsi:type="bundleItem" file="bundles/hydro/zeroToThreeHourRadarQPF.xml"
 			menuText="0-3hr Prob > 0.1 inch" id="probGt01Inch">
diff --git a/cave/com.raytheon.viz.hydro/localization/menus/hydro/baseRFCffg.xml b/cave/com.raytheon.viz.hydro/localization/menus/hydro/baseRFCffg.xml
index 7e2d410b54..22f56b2592 100644
--- a/cave/com.raytheon.viz.hydro/localization/menus/hydro/baseRFCffg.xml
+++ b/cave/com.raytheon.viz.hydro/localization/menus/hydro/baseRFCffg.xml
@@ -20,19 +20,19 @@
     -->
 <menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   	<contribute xsi:type="bundleItem" file="bundles/hydro/FFGLmosaic.xml"
-		menuText="1hr FFG Mosaic" id="1hrFFG">
+		menuText="RFC 1hr FFG Mosaic" id="1hrFFG">
 		<substitute key="timespan" value="FFG0124hr"/>
 	    <substitute key="type" value="FFG-"/>
 	    <substitute key="name" value="RFC 1hr FFG Mosaic"/>
 	</contribute>
 	<contribute xsi:type="bundleItem" file="bundles/hydro/FFGLmosaic.xml"
-		menuText="3hr FFG Mosaic" id="3hrFFG">
+		menuText="RFC 3hr FFG Mosaic" id="3hrFFG">
 		<substitute key="timespan" value="FFG0324hr"/>
 	    <substitute key="type" value="FFG-"/>
 	    <substitute key="name" value="RFC 3hr FFG Mosaic"/>
 	</contribute>
 	<contribute xsi:type="bundleItem" file="bundles/hydro/FFGLmosaic.xml"
-		menuText="6hr FFG Mosaic" id="6hrFFG">
+		menuText="RFC 6hr FFG Mosaic" id="6hrFFG">
 		<substitute key="timespan" value="FFG0624hr"/>
 	    <substitute key="type" value="FFG-"/>
 	    <substitute key="name" value="RFC 6hr FFG Mosaic"/>
@@ -260,6 +260,9 @@
 			</contribute>
 		</contribute>
 	</contribute>
+	<contribute xsi:type="bundleItem" file="bundles/FFG.xml"
+		menuText="All FFG" id="AllFFG">
+	</contribute>
 	<contribute xsi:type="bundleItem" file="bundles/FFGCounty.xml"
 		menuText="County FFG" id="CntyFFG">
 	</contribute>
diff --git a/cave/com.raytheon.viz.satellite/localization/menus/satellite/baseComposite.xml b/cave/com.raytheon.viz.satellite/localization/menus/satellite/baseComposite.xml
index afb9c498ec..44741164c5 100644
--- a/cave/com.raytheon.viz.satellite/localization/menus/satellite/baseComposite.xml
+++ b/cave/com.raytheon.viz.satellite/localization/menus/satellite/baseComposite.xml
@@ -28,7 +28,5 @@
     	<substitute key="blendedTimeMatchMode" value="ALL_IMAGES"/>
     </contribute>
 	<contribute xsi:type="separator" id="baseCompositeSeparator"/>
-    <!--
     <contribute xsi:type="subinclude" fileName="menus/satellite/basePOESImagery.xml" /> 
-    -->
 </menuTemplate>
\ No newline at end of file
diff --git a/cave/com.raytheon.viz.satellite/localization/menus/satellite/baseDerivedProductPlots.xml b/cave/com.raytheon.viz.satellite/localization/menus/satellite/baseDerivedProductPlots.xml
index 36e5a55bce..ce98950d72 100644
--- a/cave/com.raytheon.viz.satellite/localization/menus/satellite/baseDerivedProductPlots.xml
+++ b/cave/com.raytheon.viz.satellite/localization/menus/satellite/baseDerivedProductPlots.xml
@@ -207,26 +207,24 @@
 			<substitute key="between" value="90100--105000" />
 		</contribute>
 	</contribute>
-	<contribute xsi:type="subMenu" menuText="Scatterometer Winds">
-		<!--
-		<contribute xsi:type="bundleItem" file="bundles/Scatterometer_quikscat.xml"
-			menuText="QuikSCAT 12.5 km" id="QuikSCAT">
-	        <substitute key="legend" value="QUIKSCAT"/>
-	        <substitute key="svg" value="quikScatPlotDesign.svg"/>
-	        <substitute key="plugin" value="bufrquikscat"/>
-	        <substitute key="posOffset" value="0"/>
-	        <substitute key="negOffset" value="5400"/>
-	    </contribute>
-	    -->
-	    <contribute xsi:type="bundleItem" file="bundles/Scatterometer.xml" 
-               menuText="ASCAT Winds 25 km" id="ASCATWinds">
-	        <substitute key="legend" value="ASCAT"/>
-	        <substitute key="svg" value="ascatPlotDesign.svg"/>
-	        <substitute key="plugin" value="bufrascat"/>
-	        <substitute key="posOffset" value="2650"/>
-	        <substitute key="negOffset" value="2650"/>
-	    </contribute>
-	</contribute>
+	<!--
+	<contribute xsi:type="bundleItem" file="bundles/Scatterometer_quikscat.xml"
+		menuText="QuikSCAT 12.5 km" id="QuikSCAT">
+        <substitute key="legend" value="QUIKSCAT"/>
+        <substitute key="svg" value="quikScatPlotDesign.svg"/>
+        <substitute key="plugin" value="bufrquikscat"/>
+        <substitute key="posOffset" value="0"/>
+        <substitute key="negOffset" value="5400"/>
+    </contribute>
+    -->
+    <contribute xsi:type="bundleItem" file="bundles/Scatterometer.xml" 
+           menuText="ASCAT Winds 25 km" id="ASCATWinds">
+        <substitute key="legend" value="ASCAT"/>
+        <substitute key="svg" value="ascatPlotDesign.svg"/>
+        <substitute key="plugin" value="bufrascat"/>
+        <substitute key="posOffset" value="2650"/>
+        <substitute key="negOffset" value="2650"/>
+    </contribute>
 	<contribute xsi:type="subMenu" menuText="SSM/I Point Data">
 		<contribute xsi:type="titleItem" 
 				titleText="------ SSM/I Data ------" id="SSMIDataLine"/>
@@ -253,16 +251,4 @@
 	        <substitute key="offset" value="1800"/>
 	    </contribute>
 	</contribute>
-       <contribute xsi:type="bundleItem" file="bundles/SoundingAvailability.xml" 
-               menuText="GOES Sounding Availability" id="goesSoundingAvailability">
-        <substitute key="pluginName" value="goessounding"/>
-        <substitute key="plotSource" value="GOES Sounding Availability"/>
-        <substitute key="offset" value="1800"/>
-    </contribute>
-	<contribute xsi:type="bundleItem" file="bundles/SoundingAvailability.xml" 
-               menuText="POES Sounding Availability" id="poesSoundingAvailability">
-        <substitute key="pluginName" value="poessounding"/>
-        <substitute key="plotSource" value="POES Sounding Availability"/>
-        <substitute key="offset" value="1800"/>
-    </contribute>   
 </menuTemplate>
\ No newline at end of file
diff --git a/cave/com.raytheon.viz.satellite/localization/menus/satellite/baseSounderImagery.xml b/cave/com.raytheon.viz.satellite/localization/menus/satellite/baseSounderImagery.xml
index 0f85224975..76f1ad7e1a 100644
--- a/cave/com.raytheon.viz.satellite/localization/menus/satellite/baseSounderImagery.xml
+++ b/cave/com.raytheon.viz.satellite/localization/menus/satellite/baseSounderImagery.xml
@@ -19,8 +19,40 @@
         further_licensing_information.
     -->
 <menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  
 	<contribute xsi:type="separator" id="MySeparatorId"/>
+
 	<contribute xsi:type="subMenu" menuText="Sounder Imagery">
+		
+	<contribute xsi:type="titleItem" titleText="------ Uniwisc Sounder Imagery ------" id="SounderLine"/>
+    <contribute xsi:type="satBundleItem" file="bundles/DefaultSatellite.xml" 
+        menuText="Ozone" id="GOES-Sounder-Ozone">
+        <substitute key="element" value="Sounder Based Total Column Ozone"/>
+        <substitute key="entity" value="SOUNDER" /> 
+        <substitute key="sector" value="GOES-Sounder" />     
+        <substitute key="colormap" value="Sat/Ozone/Ozone"/>
+    </contribute>
+	<contribute xsi:type="satBundleItem" file="bundles/DefaultSatellite.xml" 
+        menuText="Derived Lifted Index" id="GOES-Sounder-LI">
+        <substitute key="element" value="Sounder Based Derived Lifted Index"/>
+        <substitute key="entity" value="SOUNDER" /> 
+        <substitute key="sector" value="GOES-Sounder" />     
+        <substitute key="colormap" value="Sat/Ozone/Ozone"/>
+    </contribute>
+	<contribute xsi:type="satBundleItem" file="bundles/DefaultSatellite.xml" 
+        menuText="Precipitable Water" id="GOES-Sounder-PW">
+        <substitute key="element" value="Sounder Based Derived Precipitable Water"/>
+        <substitute key="entity" value="SOUNDER" /> 
+        <substitute key="sector" value="GOES-Sounder" />     
+        <substitute key="colormap" value="Sat/Precip Water/Precip Water - Polar"/>
+    </contribute>
+	<contribute xsi:type="satBundleItem" file="bundles/DefaultSatellite.xml" 
+        menuText="CAPE" id="GOES-Sounder-Cape">
+        <substitute key="element" value="CAPE"/>
+        <substitute key="entity" value="SOUNDER" /> 
+        <substitute key="sector" value="GOES-Sounder" />     
+        <substitute key="colormap" value="Sat/IR/IR WV"/>
+    </contribute>
 		<contribute xsi:type="titleItem" 
 			titleText="------ GE and GW CONUS Sounder Imagery ------" id="SounderLine"/>
         <contribute xsi:type="bundleItem" file="bundles/DefaultCONUSSatellite.xml" 
@@ -66,36 +98,7 @@
 	    <contribute xsi:type="separator" id="MySeparatorId"/>
 		
 		
-	<contribute xsi:type="titleItem" titleText="------ Uniwisc Sounder Imagery ------" id="SounderLine"/>
-    <contribute xsi:type="satBundleItem" file="bundles/DefaultSatellite.xml" 
-        menuText="Ozone" id="GOES-Sounder-Ozone">
-        <substitute key="element" value="Sounder Based Total Column Ozone"/>
-        <substitute key="entity" value="SOUNDER" /> 
-        <substitute key="sector" value="GOES-Sounder" />     
-        <substitute key="colormap" value="Sat/Ozone/Ozone"/>
-    </contribute>
-	<contribute xsi:type="satBundleItem" file="bundles/DefaultSatellite.xml" 
-        menuText="Derived Lifted Index" id="GOES-Sounder-LI">
-        <substitute key="element" value="Sounder Based Derived Lifted Index"/>
-        <substitute key="entity" value="SOUNDER" /> 
-        <substitute key="sector" value="GOES-Sounder" />     
-        <substitute key="colormap" value="Sat/Ozone/Ozone"/>
-    </contribute>
-	<contribute xsi:type="satBundleItem" file="bundles/DefaultSatellite.xml" 
-        menuText="Precipitable Water" id="GOES-Sounder-PW">
-        <substitute key="element" value="Sounder Based Derived Precipitable Water"/>
-        <substitute key="entity" value="SOUNDER" /> 
-        <substitute key="sector" value="GOES-Sounder" />     
-        <substitute key="colormap" value="Sat/Precip Water/Precip Water - Polar"/>
-    </contribute>
-	<contribute xsi:type="satBundleItem" file="bundles/DefaultSatellite.xml" 
-        menuText="CAPE" id="GOES-Sounder-Cape">
-        <substitute key="element" value="CAPE"/>
-        <substitute key="entity" value="SOUNDER" /> 
-        <substitute key="sector" value="GOES-Sounder" />     
-        <substitute key="colormap" value="Sat/IR/IR WV"/>
-    </contribute>
-	
+
 		
 		<contribute xsi:type="titleItem" 
 				   titleText="------ OCONUS Sounder Imagery------" id="OconusSndrLine"/>
@@ -199,6 +202,18 @@
 		        <substitute key="colormap" value="Sat/IR/CIRA (IR Default)"/>
 		    </contribute>
 	    </contribute>
-
     </contribute>
+	<contribute xsi:type="separator" id="MySeparatorId"/>
+	<contribute xsi:type="bundleItem" file="bundles/SoundingAvailability.xml" 
+               menuText="GOES Sounding Availability" id="goesSoundingAvailability">
+        <substitute key="pluginName" value="goessounding"/>
+        <substitute key="plotSource" value="GOES Sounding Availability"/>
+        <substitute key="offset" value="1800"/>
+    </contribute>
+	<contribute xsi:type="bundleItem" file="bundles/SoundingAvailability.xml" 
+               menuText="POES Sounding Availability" id="poesSoundingAvailability">
+        <substitute key="pluginName" value="poessounding"/>
+        <substitute key="plotSource" value="POES Sounding Availability"/>
+        <substitute key="offset" value="1800"/>
+    </contribute> 
 </menuTemplate>
\ No newline at end of file
diff --git a/cave/com.raytheon.viz.satellite/localization/menus/satellite/index.xml b/cave/com.raytheon.viz.satellite/localization/menus/satellite/index.xml
index a7a88943a9..d4e7212aae 100644
--- a/cave/com.raytheon.viz.satellite/localization/menus/satellite/index.xml
+++ b/cave/com.raytheon.viz.satellite/localization/menus/satellite/index.xml
@@ -22,7 +22,7 @@
 	<include installTo="menu:satellite?after=GROUP1"
 		fileName="menus/satellite/baseComposite.xml">
 	</include>
-    <include installTo="menu:satellite?before=GROUP3" 
+    <include installTo="menu:satellite?before=GROUP2" 
              fileName="menus/satellite/baseSounderImagery.xml">
     	<substitute key="sector0" value="West CONUS"/>
     	<substitute key="sector1" value="East CONUS"/>
@@ -34,9 +34,10 @@
              fileName="menus/satellite/baseDerivedProductsImagery.xml">
     	<substitute key="sector" value="Supernational"/>
     </include>
-    <include subMenu="Derived Products Plots" installTo="menu:satellite?after=GROUP4" 
+    <include installTo="menu:satellite?before=GROUP3" 
              fileName="menus/satellite/baseDerivedProductPlots.xml"/>
-    <include installTo="menu:satellite?after=GROUP5" 
+	<!--
+    <include installTo="menu:satellite?before=GROUP4" 
              fileName="menus/satellite/baseNHemisphere.xml">
     	<substitute key="sector0" value="West CONUS"/>
     	<substitute key="sector1" value="East CONUS"/>
@@ -44,7 +45,8 @@
     	<substitute key="sector3" value="Northern Hemisphere Composite"/>
     	<substitute key="entity" value="GOES%"/>
     </include>
-    <include installTo="menu:satellite?after=GROUP6" 
+	-->
+    <include installTo="menu:satellite?before=GROUP5" 
              fileName="menus/satellite/baseFourSatComposite.xml">
     	<substitute key="sector" value="NH Composite - Meteosat-GOES E-GOES W-GMS"/>
     	<substitute key="entity" value="Composite"/>
diff --git a/cave/com.raytheon.viz.volumebrowser/localization/menus/volume/baseFamilies.xml b/cave/com.raytheon.viz.volumebrowser/localization/menus/volume/baseFamilies.xml
index b859105916..34387f3c5e 100644
--- a/cave/com.raytheon.viz.volumebrowser/localization/menus/volume/baseFamilies.xml
+++ b/cave/com.raytheon.viz.volumebrowser/localization/menus/volume/baseFamilies.xml
@@ -23,85 +23,85 @@
 		<contribute xsi:type="bundleItem" file="bundles/volume/PrecipMSLP.xml"
 			menuText="GFS" id="GFS" useReferenceTime="true">
 			<substitute key="modelName" value="GFS"/> 
-			<substitute key="TP" value="TP"/>
+			<substitute key="TP" value="TPrun"/>
 			<substitute key="frameCount" value="41"/>
 		</contribute>
 		<contribute xsi:type="bundleItem" file="bundles/volume/PrecipMSLP.xml"
 			menuText="GFS 40km" id="gfs40" useReferenceTime="true">
 			<substitute key="modelName" value="GFS-40km"/> 
-			<substitute key="TP" value="TP"/>
+			<substitute key="TP" value="TPrun"/>
 			<substitute key="frameCount" value="41"/>
 		</contribute>
 		<contribute xsi:type="bundleItem" file="bundles/volume/PrecipMSLP.xml"
 			menuText="DGEX" id="DGEX" useReferenceTime="true">
 			<substitute key="modelName" value="DGEX"/>
-			<substitute key="TP" value="TP"/>
+			<substitute key="TP" value="TPrun"/>
 			<substitute key="frameCount" value="41"/>
 		</contribute>
 		<contribute xsi:type="bundleItem" file="bundles/volume/PrecipMSLP.xml"
 			menuText="NAM 12km" id="NAM12" useReferenceTime="true">
 			<substitute key="modelName" value="NAM12"/>
-			<substitute key="TP" value="TP"/>
+			<substitute key="TP" value="TPrun"/>
 			<substitute key="frameCount" value="41"/>
 		</contribute>
 		<contribute xsi:type="bundleItem" file="bundles/volume/PrecipMSLP.xml"
 			menuText="NAM 40km" id="NAM-40km" useReferenceTime="true">
 			<substitute key="modelName" value="NAM-40km"/>
-			<substitute key="TP" value="TP"/>
+			<substitute key="TP" value="TPrun"/>
 			<substitute key="frameCount" value="41"/>
 		</contribute>
 		<contribute xsi:type="bundleItem" file="bundles/volume/PrecipMSLP.xml"
 			menuText="NamDNG" id="NamDNG" useReferenceTime="true">
 				<substitute key="modelName" value="NamDNG"/>
-			<substitute key="TP" value="TP"/>
+			<substitute key="TP" value="TPrun"/>
 			<substitute key="frameCount" value="41"/>
 		</contribute>
 		<contribute xsi:type="bundleItem" file="bundles/volume/PrecipMSLP.xml"
 			menuText="RAP 13km" id="RAP-13km" useReferenceTime="true">
 			<substitute key="modelName" value="RAP-13km"/>
-			<substitute key="TP" value="TP1hr"/>
+			<substitute key="TP" value="TPrun"/>
 			<substitute key="frameCount" value="16"/>
 		</contribute>
 		<contribute xsi:type="bundleItem" file="bundles/volume/PrecipMSLP.xml"
 			menuText="HRRR" id="HRRR" useReferenceTime="true">
 			<substitute key="modelName" value="HRRR"/>
-			<substitute key="TP" value="TP1hr"/>
+			<substitute key="TP" value="TPrun"/>
 			<substitute key="frameCount" value="16"/>
 		</contribute>
 		<contribute xsi:type="bundleItem" file="bundles/volume/PrecipMSLP.xml"
 			menuText="NAVGEM" id="NAVGEM" useReferenceTime="true">
 			<substitute key="modelName" value="NAVGEM"/> 
-			<substitute key="TP" value="TP"/>
+			<substitute key="TP" value="TPrun"/>
 			<substitute key="frameCount" value="41"/>
 		</contribute>
 		<contribute xsi:type="bundleItem" file="bundles/volume/PrecipMSLP.xml"
 	        menuText="CMC" id="CMC" useReferenceTime="true">
 			<substitute key="modelName" value="CMC"/>
-			<substitute key="TP" value="TP"/>
+			<substitute key="TP" value="TPrun"/>
 			<substitute key="frameCount" value="12"/>
 		</contribute>
 		<contribute xsi:type="bundleItem" file="bundles/volume/PrecipMSLP.xml"
 			menuText="RTMA" id="RTMA" useReferenceTime="true">
 			<substitute key="modelName" value="RTMA"/> 
-			<substitute key="TP" value="TP1hr"/>
+			<substitute key="TP" value="TPrun"/>
 			<substitute key="frameCount" value="16"/>
 		</contribute>
 		<contribute xsi:type="bundleItem" file="bundles/volume/PrecipMSLP.xml"
                         menuText="URMA" id="URMA" useReferenceTime="true">
                         <substitute key="modelName" value="URMA25"/>
-                        <substitute key="TP" value="TP1hr"/>
+                        <substitute key="TP" value="TPrun"/>
                         <substitute key="frameCount" value="16"/>
                 </contribute>
 		<contribute xsi:type="bundleItem" file="bundles/volume/PrecipMSLP.xml"
 			menuText="NDFD" id="NDFD" useReferenceTime="true">
 			<substitute key="modelName" value="NDFD"/> 
-			<substitute key="TP" value="TP"/>
+			<substitute key="TP" value="TPrun"/>
 			<substitute key="frameCount" value="41"/>
 		</contribute>
 		<contribute xsi:type="bundleItem" file="bundles/volume/PrecipMSLP.xml"
 			menuText="COAMPS-EU" id="COAMPS-EU" useReferenceTime="true">
 			<substitute key="modelName" value="COAMPS-EU"/> 
-			<substitute key="TP" value="TP"/>
+			<substitute key="TP" value="TPrun"/>
 			<substitute key="frameCount" value="17"/>
 		</contribute>
 	</contribute>