fixup keybinding editor binding action; restore some menu items lost in the trunk...

[ardour.git] / gtk2_ardour / ardour.menus

diff --git a/gtk2_ardour/ardour.menus b/gtk2_ardour/ardour.menus
index 3f9c9004223f6dc823431ee1a606da2c67c082f1..a24041374bfbaad553861c3f688820c6d69aaf24 100644 (file)
--- a/gtk2_ardour/ardour.menus
+++ b/gtk2_ardour/ardour.menus
@@ -13,13 +13,7 @@
            <separator/>
            <menuitem action='AddTrackBus'/>    
            <separator/>
-           <menu action='addExistingAudioFiles'>
-              <menuitem action='addExternalAudioAsRegion'/>           
-              <menuitem action='addExternalAudioToTrack'/>            
-               <separator/>
-              <menuitem action='addExternalAudioAsTrack'/>            
-              <menuitem action='addExternalAudioAsTapeTrack'/>        
-           </menu>
+           <menuitem action='addExistingAudioFiles'/>
            <separator/>
            <menu name='Export' action='Export'>
                <menuitem action='ExportSession'/>
@@ -214,6 +208,7 @@
                <menuitem action='ToggleMeasureVisibility'/>
               <separator/>
               <menuitem action='show-editor-mixer'/>
+              <menuitem action='SyncEditorAndMixerTrackOrder'/>
          </menu>
         <menu name='JACK' action='JACK'>
                <menuitem action='JACKDisconnect'/>
@@ -238,6 +233,7 @@
                <menuitem action='ToggleOptionsEditor'/>
                <menuitem action='ToggleInspector'/>
                <menuitem action='ToggleLocations'/>
+               <menuitem action='ToggleKeyEditor'/>
                <menuitem action='ToggleThemeManager'/>
                <menuitem action='ToggleBigClock'/>
               <separator/>
@@ -247,6 +243,7 @@
                    <menu action='AudioFileFormatData'>
                        <menuitem action='FileDataFormatFloat'/>
                        <menuitem action='FileDataFormat24bit'/>
+                       <menuitem action='FileDataFormat16bit'/>
                   </menu>
                    <menu action='AudioFileFormatHeader'>
                        <menuitem action='FileHeaderFormatBWF'/>
@@ -301,9 +298,9 @@
                    <menuitem action='UseSoftwareMonitoring'/>
                    <menuitem action='UseExternalMonitoring'/>
                </menu>
-                  <menu action='Plugins'>
-                       <menuitem action='DisableAllPlugins'/>
-                       <menuitem action='ABAllPlugins'/>
+               <menu action='Plugins'>
+                  <menuitem action='DisableAllPlugins'/>
+                   <menuitem action='ABAllPlugins'/>
                </menu>
               <menu action='Metering'>
                    <menu action='MeteringFallOffRate'>
@@ -340,7 +337,15 @@
                     <menuitem action='LayerLaterHigher'/>
                     <menuitem action='LayerMoveAddHigher'/>
                     <menuitem action='LayerAddHigher'/>
-           </menu>
+              </menu>
+              <menu name='Denormals' action='Denormals'>
+                      <menuitem action='DenormalProtection'/>
+                     <separator/>
+                      <menuitem action='DenormalNone'/>
+                      <menuitem action='DenormalFTZ'/>
+                      <menuitem action='DenormalDAZ'/>
+                     <menuitem action='DenormalFTZDAZ'/>
+               </menu>
                <separator/>
                <menuitem action='SendMTC'/>
                <menuitem action='SendMMC'/>
@@ -357,17 +362,17 @@
                <menuitem action='StopRecordingOnXrun'/>
                <menuitem action='StopTransportAtEndOfSession'/>
                <menuitem action='GainReduceFastTransport'/>
+              <menuitem action='PrimaryClockDeltaEditCursor'/>
+              <menuitem action='SecondaryClockDeltaEditCursor'/>
+              <menuitem action='OnlyCopyImportedFiles'/>
               <separator/>
-                               <menuitem action='PrimaryClockDeltaEditCursor'/>
-                               <menuitem action='SecondaryClockDeltaEditCursor'/>
-                       <separator/>
          </menu>
         <menu name='Help' action='Help'>
             <menuitem action='About'/>
        </menu>
      </menubar>
 
-     <popup name='redirectmenu'>
+     <popup name='processormenu'>
         <menuitem action='newplugin'/>
         <menuitem action='newinsert'/>
         <menuitem action='newsend'/>
@@ -390,9 +395,6 @@
         <menuitem action='activate_all'/>
         <menuitem action='deactivate_all'/>
          <separator/>
-        <menuitem action='deactivate_plugins'/>
-        <menuitem action='a_b_plugins'/>
-         <separator/>
         <menuitem action='edit'/>
       </popup>