remove some cruft with previous commits. remove option link-region-and-track-selecti...

[ardour.git] / gtk2_ardour / ardour.menus.in

diff --git a/gtk2_ardour/ardour.menus.in b/gtk2_ardour/ardour.menus.in
index 197b484698d13f1570402b3c86f2b950698f41ca..98e21741644525ec8283ba726e94d598acccdb28 100644 (file)
--- a/gtk2_ardour/ardour.menus.in
+++ b/gtk2_ardour/ardour.menus.in
@@ -1,18 +1,4 @@
 <ui>
-  <accelerator action='set-mouse-mode-object'/>
-  <accelerator action='set-mouse-mode-range'/>
-  <accelerator action='set-mouse-mode-gain'/>
-  <accelerator action='set-mouse-mode-draw'/>
-  <accelerator action='set-mouse-mode-zoom'/>
-  <accelerator action='set-mouse-mode-timefx'/>
-  <accelerator action='set-mouse-mode-object-range'/>
-  <accelerator action='toggle-internal-edit'/>
-  <accelerator action='focus-on-clock'/>
-  <accelerator action='track-solo-toggle'/>
-  <accelerator action='track-mute-toggle'/>
-  <accelerator action='toggle-edit-mode'/>
-  <accelerator action='toggle-midi-input-active'/>
-  
   <menubar name='Main' action='MainMenu'>
     <menu name='Session' action='Session'>
       <menuitem action='New'/>
@@ -35,10 +21,9 @@
       <menuitem action='addExistingAudioFiles'/>
       <!--menuitem action='importFromSession'/-->
 
-#ifndef NOVIDEOTIMELINE
       <menuitem action='OpenVideo'/>
       <menuitem action='CloseVideo'/>
-#endif
+
       <menu name='Export' action='Export'>
         <menuitem action='ExportAudio'/>
         <menuitem action='StemExport'/>
@@ -54,6 +39,8 @@
       <menuitem action='toggle-about'/>
       <menuitem action='toggle-rc-options-editor'/>
 #endif
+      <separator/>
+      <menuitem action='lock'/>
 #ifndef GTKOSX
       <separator/>
       <menuitem action='Quit'/>
@@ -126,13 +113,11 @@
         <menuitem action='selected-marker-to-previous-region-boundary'/>
         <menuitem action='edit-cursor-to-next-region-sync'/>
         <menuitem action='edit-cursor-to-previous-region-sync'/>
-        <separator/>
-        <menuitem action='edit-to-playhead'/>
-        <menuitem action='set-edit-point'/>
       </menu>
 
       <menu action="MarkerMenu">
         <menuitem action='add-location-from-playhead'/>
+               <menuitem action='remove-location-from-playhead'/>
         <separator/>
         <menuitem action='goto-mark-1'/>
         <menuitem action='goto-mark-2'/>
@@ -169,7 +154,8 @@
       <menuitem action='editor-paste'/>
       <separator/>       
       <menu action="SelectMenu">          
-        <menuitem action='select-all'/>
+        <menuitem action='select-all-objects'/>
+        <menuitem action='select-all-tracks'/>
         <menuitem action='deselect-all'/>
         <menuitem action='invert-selection'/>
         <menuitem action='select-all-after-edit-cursor'/>
@@ -179,14 +165,13 @@
         <menuitem action='select-all-in-punch-range'/>
         <menuitem action='select-all-in-loop-range'/>
         <separator/>
-        <menuitem action='select-range-between-cursors'/>
         <menuitem action='move-range-start-to-previous-region-boundary'/>
         <menuitem action='move-range-start-to-next-region-boundary'/>
         <menuitem action='move-range-end-to-previous-region-boundary'/>
         <menuitem action='move-range-end-to-next-region-boundary'/>
+        <separator/>
         <menuitem action='start-range'/>
         <menuitem action='finish-range'/>
-        <menuitem action='finish-add-range'/>
         <separator/>
         <menuitem action='select-next-route'/>
         <menuitem action='select-prev-route'/>
@@ -246,8 +231,6 @@
          <menuitem action='combine-regions'/>
          <menuitem action='uncombine-regions'/>
          <menuitem action='analyze-region'/>
-         <menuitem action='toggle-opaque-region'/>
-         <menuitem action='toggle-region-mute'/>
          <menuitem action='pitch-shift-region'/>
          <menuitem action='split-region'/>
          <menuitem action='split-multichannel-region'/>
@@ -271,6 +254,8 @@
         <menuitem action='show-region-list-editor'/>
       </menu>
       <menu action='RegionMenuGain'>
+        <menuitem action='toggle-opaque-region'/>
+        <menuitem action='toggle-region-mute'/>
         <menuitem action='normalize-region'/>
         <menuitem action='boost-region-gain'/>
         <menuitem action='cut-region-gain'/>                      
@@ -282,15 +267,14 @@
         <menuitem action='snap-regions-to-grid'/>
         <menuitem action='toggle-region-lock'/>
         <menuitem action='toggle-region-lock-style'/>
-#ifndef NOVIDEOTIMELINE
         <menuitem action='toggle-region-video-lock'/>
-#endif
         <menuitem action='set-region-sync-position'/>
         <menuitem action='remove-region-sync'/>
         <menuitem action='nudge-forward'/>
         <menuitem action='nudge-backward'/>
         <menuitem action='nudge-forward-by-capture-offset'/>
         <menuitem action='nudge-backward-by-capture-offset'/>
+       <menuitem action='sequence-regions'/>
       </menu>
       <menu action='RegionMenuTrim'>
         <menuitem action='trim-front'/>
@@ -344,11 +328,13 @@
 
     <menu name='View' action = 'View'>
       <menuitem action='ToggleMaximalEditor'/>
+      <menuitem action='ToggleMaximalMixer'/>
       <menuitem action='KeepTearoffs'/>
 
       <separator/>
 
       <menu action="PrimaryClockMenu">
+               <menuitem action='focus-on-clock'/>
         <menuitem action="primary-clock-timecode"/>
         <menuitem action="primary-clock-bbt"/>
         <menuitem action="primary-clock-minsec"/>
@@ -437,9 +423,7 @@
         <menuitem action="toggle-cd-marker-ruler"/>
         <menuitem action="toggle-marker-ruler"/>
         <separator/>
-#ifndef NOVIDEOTIMELINE
         <menuitem action="toggle-video-ruler"/>
-#endif
       </menu>
       <menu action="VideoMonitorMenu">
         <menuitem action="zoom-vmon-100"/>
@@ -494,21 +478,6 @@
       <menuitem action='ToggleGroupTabs'/>
       <menuitem action='show-marker-lines'/>
     </menu>
-    <menu name='JACK' action='JACK'>
-      <menuitem action='EngineDisconnect'/>
-      <menuitem action='EngineReconnect'/>
-      <menu name='Latency' action='Latency'>
-        <menuitem action='EngineLatency32'/>
-        <menuitem action='EngineLatency64'/>
-        <menuitem action='EngineLatency128'/>
-        <menuitem action='EngineLatency256'/>
-        <menuitem action='EngineLatency512'/>
-        <menuitem action='EngineLatency1024'/>
-        <menuitem action='EngineLatency2048'/>
-        <menuitem action='EngineLatency4096'/>
-        <menuitem action='EngineLatency8192'/>
-      </menu>
-    </menu>
     <menu action = 'WindowMenu'>
       <menuitem action='toggle-audio-midi-setup'/>
       <separator/>
@@ -522,7 +491,9 @@
       <menuitem action='toggle-bundle-manager'/>
       <menuitem action='toggle-theme-manager'/>
       <menuitem action='toggle-big-clock'/>
+#if 0
       <menuitem action='toggle-speaker-config'/>
+#endif
 
       <separator/>
 
@@ -558,10 +529,8 @@
     <menuitem action="toggle-marker-ruler"/>
     <menuitem action="toggle-cd-marker-ruler"/>
     <menuitem action="toggle-loop-punch-ruler"/>
-#ifndef NOVIDEOTIMELINE
     <separator/>
     <menuitem action="toggle-video-ruler"/>
-#endif
   </popup>
 
   <popup name='ProcessorMenu'>
@@ -571,6 +540,7 @@
     <menuitem action='newaux'/>
     <separator/>
     <menuitem action='controls'/>
+    <menuitem action='send_options'/>
     <separator/>
     <menuitem action='clear'/>
     <menuitem action='clear_pre'/>
@@ -637,8 +607,6 @@
        <menuitem action='uncombine-regions'/>
        <menuitem action='split-region'/>
        <menuitem action='split-multichannel-region'/>
-       <menuitem action='toggle-opaque-region'/>
-       <menuitem action='toggle-region-mute'/>
        <menuitem action='pitch-shift-region'/>
        <menuitem action='reverse-region'/>    
        <menuitem action='close-region-gaps'/>
@@ -657,9 +625,7 @@
       <menuitem action='naturalize-region'/>
       <menuitem action='toggle-region-lock'/>
       <menuitem action='toggle-region-lock-style'/>
-#ifndef NOVIDEOTIMELINE
       <menuitem action='toggle-region-video-lock'/>
-#endif
       <menuitem action='snap-regions-to-grid'/>
       <menuitem action='set-region-sync-position'/>
       <menuitem action='remove-region-sync'/>
@@ -667,6 +633,7 @@
       <menuitem action='nudge-backward'/>
       <menuitem action='nudge-forward-by-capture-offset'/>
       <menuitem action='nudge-backward-by-capture-offset'/>
+      <menuitem action='sequence-regions'/>
     </menu>
     <menu action='RegionMenuTrim'>
       <menuitem action='trim-front'/>
@@ -690,6 +657,8 @@
       <menuitem action='set-selection-from-region'/>
     </menu>
     <menu action='RegionMenuGain'>
+      <menuitem action='toggle-opaque-region'/>
+      <menuitem action='toggle-region-mute'/>
       <menuitem action='normalize-region'/>
       <menuitem action='boost-region-gain'/>
       <menuitem action='cut-region-gain'/>