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 b6eb8273ab24b7ee737f0548aa20b5f85450f70f..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'/>
@@ -47,6 +41,9 @@
               <separator/>
                <menuitem action='Record'/>
                <separator/> 
+               <menuitem action='TransitionToRoll'/>
+               <menuitem action='TransitionToReverse'/>
+               <separator/> 
                <menuitem action='jump-forward-to-mark'/>
                <menuitem action='jump-backward-to-mark'/>
                <menuitem action='add-location-from-playhead'/>
@@ -81,6 +78,7 @@
                <menuitem action='editor-delete'/>
                <menuitem action='editor-copy'/>
                <menuitem action='editor-paste'/>
+              <menuitem action='remove-last-capture'/>
                <separator/>       
                <menu action="EditSelectRangeOptions">
                    <menuitem action='extend-range-to-start-of-region'/>
@@ -122,6 +120,21 @@
                   <menuitem action="nudge-backward"/>
                   <menuitem action="nudge-next-backward"/>
               </menu>
+              <menu name='KeyMouse Actions' action='KeyMouse Actions'>
+                       <menuitem action='audition-at-mouse'/>
+                               <menuitem action='brush-at-mouse'/>
+                               <menuitem action='set-edit-cursor'/>
+                               <menuitem action='mute-unmute-region'/>
+                       <menuitem action='set-playhead'/>
+                       <menuitem action='split-region'/>
+                       <menuitem action='set-region-sync-position'/>
+                       <separator/>
+                       <menuitem action='set-mouse-mode-object'/>
+                       <menuitem action='set-mouse-mode-range'/>
+                       <menuitem action='set-mouse-mode-gain'/>
+                       <menuitem action='set-mouse-mode-zoom'/>
+                       <menuitem action='set-mouse-mode-timefx'/>
+          </menu>
         </menu>         
         <menu name='View' action = 'View'>
                <menu name='ZoomFocus' action='ZoomFocus'>
@@ -131,9 +144,31 @@
                    <menuitem action='zoom-focus-playhead'/>
                    <menuitem action='zoom-focus-edit'/>
                </menu>
+              <menu name='SnapMode' action='SnapMode'>
+                  <menuitem action='snap-normal'/>
+                  <menuitem action='snap-magnetic'/>
+              </menu>
                <menu name='SnapTo' action='SnapTo'>
-                   <menuitem action='snap-to-beat'/>
-                   <menuitem action='snap-to-bar'/>
+                  <menuitem action='snap-to-frame'/>
+                  <menuitem action='snap-to-cd-frame'/>
+                  <menuitem action='snap-to-smpte-frame'/>
+                  <menuitem action='snap-to-smpte-seconds'/>
+                  <menuitem action='snap-to-smpte-minutes'/>
+                  <menuitem action='snap-to-seconds'/>
+                  <menuitem action='snap-to-minutes'/>
+                  <menuitem action='snap-to-thirtyseconds'/>
+                  <menuitem action='snap-to-asixteenthbeat'/>
+                  <menuitem action='snap-to-eighths'/>
+                  <menuitem action='snap-to-quarters'/>
+                  <menuitem action='snap-to-thirds'/>
+                  <menuitem action='snap-to-beat'/>
+                  <menuitem action='snap-to-bar'/>
+                  <menuitem action='snap-to-mark'/>
+                  <menuitem action='snap-to-edit-cursor'/>
+                  <menuitem action='snap-to-region-start'/>
+                  <menuitem action='snap-to-region-end'/>
+                  <menuitem action='snap-to-region-sync'/>
+                  <menuitem action='snap-to-region-boundary'/>
                </menu>
                <menu name='MeterFalloff' action='MeterFalloff'>
                     <menuitem action='MeterFalloffOff'/>
@@ -165,11 +200,15 @@
                <menuitem action='scroll-forward'/>
                <menuitem action='scroll-backward'/>
               <separator/>
+               <menuitem action='scroll-playhead-forward'/>
+               <menuitem action='scroll-playhead-backward'/>
+              <separator/>
                <menuitem action='ToggleWaveformVisibility'/>
                <menuitem action='ToggleWaveformsWhileRecording'/>
                <menuitem action='ToggleMeasureVisibility'/>
               <separator/>
               <menuitem action='show-editor-mixer'/>
+              <menuitem action='SyncEditorAndMixerTrackOrder'/>
          </menu>
         <menu name='JACK' action='JACK'>
                <menuitem action='JACKDisconnect'/>
@@ -192,19 +231,19 @@
                <menuitem action='goto-editor'/>
                <menuitem action='goto-mixer'/>
                <menuitem action='ToggleOptionsEditor'/>
-               <menuitem action='ToggleSoundFileBrowser'/>
                <menuitem action='ToggleInspector'/>
                <menuitem action='ToggleLocations'/>
-               <menuitem action='ToggleColorManager'/>
+               <menuitem action='ToggleKeyEditor'/>
+               <menuitem action='ToggleThemeManager'/>
                <menuitem action='ToggleBigClock'/>
               <separator/>
-              <menuitem action='About'/>
         </menu>
         <menu name='Options' action='Options'>
               <menu action='AudioFileFormat'>
                    <menu action='AudioFileFormatData'>
                        <menuitem action='FileDataFormatFloat'/>
                        <menuitem action='FileDataFormat24bit'/>
+                       <menuitem action='FileDataFormat16bit'/>
                   </menu>
                    <menu action='AudioFileFormatHeader'>
                        <menuitem action='FileHeaderFormatBWF'/>
@@ -213,15 +252,15 @@
                        <menuitem action='FileHeaderFormatCAF'/>
                   </menu>
                </menu>
-              <menu action='SMPTE'>
+              <menu action='Timecode'>
                   <menuitem action='Smpte23976'/>
                   <menuitem action='Smpte24'/>
                   <menuitem action='Smpte24976'/>
                   <menuitem action='Smpte25'/>
-                  <menuitem action='Smpte2997drop'/>
                   <menuitem action='Smpte2997'/>
-                  <menuitem action='Smpte30drop'/>
+                  <menuitem action='Smpte2997drop'/>
                   <menuitem action='Smpte30'/>
+                  <menuitem action='Smpte30drop'/>
                   <menuitem action='Smpte5994'/>
                   <menuitem action='Smpte60'/>
                </menu>
@@ -236,6 +275,10 @@
                   <menuitem action='PullupMinus4'/>
                   <menuitem action='PullupMinus4Minus1'/>
                </menu>
+              <menu action='Subframes'>
+                  <menuitem action='Subframes80'/>
+                  <menuitem action='Subframes100'/>
+               </menu>
                <separator/>
                <menu action='Autoconnect'>
                    <menuitem action='InputAutoConnectPhysical'/>
@@ -245,12 +288,20 @@
                    <menuitem action='OutputAutoConnectMaster'/>
                    <menuitem action='OutputAutoConnectManual'/>
                </menu>
-              <menu action='ControlSurfaces'/>
-               <menu action='Monitoring'>
+              <menu action='ControlSurfaces'>
+                   <menuitem action='RemoteUserDefined'/>
+                   <menuitem action='RemoteMixerDefined'/>
+                   <menuitem action='RemoteEditorDefined'/>
+               </menu>
+                   <menu action='Monitoring'>
                    <menuitem action='UseHardwareMonitoring'/>
                    <menuitem action='UseSoftwareMonitoring'/>
                    <menuitem action='UseExternalMonitoring'/>
                </menu>
+               <menu action='Plugins'>
+                  <menuitem action='DisableAllPlugins'/>
+                   <menuitem action='ABAllPlugins'/>
+               </menu>
               <menu action='Metering'>
                    <menu action='MeteringFallOffRate'>
                        <menuitem action='MeterFalloffOff'/>
@@ -272,6 +323,7 @@
                    <menuitem action='LatchedSolo'/>
                    <menuitem action='SoloInPlace'/>
                    <menuitem action='SoloViaBus'/>
+                   <menuitem action='ShowSoloMutes'/>
                </menu>
               <menu action='Crossfades'>
                   <menuitem action='toggle-xfades-active'/>
@@ -282,45 +334,45 @@
                   <menuitem action='CrossfadesShort'/>
               </menu>
               <menu action='Layering'>
-                  <menuitem action='LayerLaterHigher'/>
-                  <menuitem action='LayerMoveAddHigher'/>
-                  <menuitem action='LayerAddHigher'/>
+                    <menuitem action='LayerLaterHigher'/>
+                    <menuitem action='LayerMoveAddHigher'/>
+                    <menuitem action='LayerAddHigher'/>
+              </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'/>
                <menuitem action='UseMMC'/>
                <separator/>
+               <menuitem action='UseOSC'/>
                <menuitem action='StopPluginsWithTransport'/>
                <menuitem action='DoNotRunPluginsWhileRecording'/>
                <menuitem action='LatchedRecordEnable'/>
+               <menuitem action='RegionEquivalentsOverlap'/>
                <separator/>
+               <menuitem action='PeriodicSafetyBackups'/>
                <menuitem action='VerifyRemoveLastCapture'/>
                <menuitem action='StopRecordingOnXrun'/>
                <menuitem action='StopTransportAtEndOfSession'/>
                <menuitem action='GainReduceFastTransport'/>
+              <menuitem action='PrimaryClockDeltaEditCursor'/>
+              <menuitem action='SecondaryClockDeltaEditCursor'/>
+              <menuitem action='OnlyCopyImportedFiles'/>
               <separator/>
          </menu>
         <menu name='Help' action='Help'>
-              <menu name='KeyMouse Actions' action='KeyMouse Actions'>
-                       <menuitem action='audition-at-mouse'/>
-                               <menuitem action='brush-at-mouse'/>
-                               <menuitem action='set-edit-cursor'/>
-                               <menuitem action='mute-unmute-region'/>
-                       <menuitem action='set-playhead'/>
-                       <menuitem action='split-region'/>
-                       <menuitem action='set-region-sync-position'/>
-                       <separator/>
-                       <menuitem action='set-mouse-mode-object'/>
-                       <menuitem action='set-mouse-mode-range'/>
-                       <menuitem action='set-mouse-mode-gain'/>
-                       <menuitem action='set-mouse-mode-zoom'/>
-                       <menuitem action='set-mouse-mode-timefx'/>
-               </menu>
+            <menuitem action='About'/>
        </menu>
      </menubar>
 
-     <popup name='redirectmenu'>
+     <popup name='processormenu'>
         <menuitem action='newplugin'/>
         <menuitem action='newinsert'/>
         <menuitem action='newsend'/>
@@ -330,6 +382,7 @@
         <menuitem action='cut'/>
         <menuitem action='copy'/>
         <menuitem action='paste'/>
+        <menuitem action='delete'/>
          <separator/>
         <menuitem action='rename'/>
          <separator/>