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 af423cbb2303f71a5b1374a187d201ed85386248..98e21741644525ec8283ba726e94d598acccdb28 100644 (file)
--- a/gtk2_ardour/ardour.menus.in
+++ b/gtk2_ardour/ardour.menus.in
@@ -1,12 +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-zoom'/>
-  <accelerator action='set-mouse-mode-timefx'/>
-  <accelerator action='set-mouse-mode-object-range'/>
-  <accelerator action='toggle-internal-edit'/>
-  
   <menubar name='Main' action='MainMenu'>
     <menu name='Session' action='Session'>
       <menuitem action='New'/>
@@ -16,6 +8,7 @@
       <separator/>
       <menuitem action='Save'/>
       <menuitem action='SaveAs'/>
+      <menuitem action='Rename'/>
       <menuitem action='Snapshot'/>
       <menuitem action='SaveTemplate'/>
       <menu name='Metadata' action='Metadata'>
@@ -27,24 +20,31 @@
       <separator/>
       <menuitem action='addExistingAudioFiles'/>
       <!--menuitem action='importFromSession'/-->
+
+      <menuitem action='OpenVideo'/>
+      <menuitem action='CloseVideo'/>
+
       <menu name='Export' action='Export'>
         <menuitem action='ExportAudio'/>
         <menuitem action='StemExport'/>
+        <menuitem action='ExportVideo'/>
       </menu>
       <menu name='Cleanup' action='Cleanup'>
         <menuitem action='CleanupUnused'/>
         <menuitem action='FlushWastebasket'/>
       </menu>
-#ifndef GTKOSX
       <separator/>
+      <menuitem action='toggle-session-options-editor'/>
+#ifdef GTKOSX      
+      <menuitem action='toggle-about'/>
+      <menuitem action='toggle-rc-options-editor'/>
 #endif
-      <menuitem action='ToggleSessionOptionsEditor'/>
-#ifdef GTKOSX
-      <menuitem action='ToggleRCOptionsEditor'/>
-      <menuitem action='About'/>
-#endif
+      <separator/>
+      <menuitem action='lock'/>
+#ifndef GTKOSX
       <separator/>
       <menuitem action='Quit'/>
+#endif
     </menu>
 
     <menu name='Transport' action='Transport'>
@@ -53,6 +53,7 @@
         <menuitem action='main-menu-play-selected-regions'/>
         <menuitem action='play-edit-range'/>
         <menuitem action='PlaySelection'/>
+        <menuitem action='PlayPreroll'/>
         <menuitem action='play-from-edit-point-and-return'/>
         <menuitem action='Loop'/>
       </menu>
@@ -112,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'/>
@@ -137,12 +136,14 @@
       <menuitem action='TogglePunchIn'/>
       <menuitem action='TogglePunchOut'/>
       <menuitem action='ToggleAutoInput'/>
+      <menuitem action='ToggleFollowEdits'/>
       <menuitem action='ToggleAutoPlay'/>
       <menuitem action='ToggleAutoReturn'/>
       <menuitem action='ToggleClick'/>
       <menuitem action='toggle-follow-playhead'/>
+      <menuitem action='ToggleFollowEdits'/>
       <menuitem action='panic'/>
-      <separator/>
+     <separator/>
     </menu>
 
     <menu name='Edit' action='Edit'>
@@ -153,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'/>
@@ -163,19 +165,19 @@
         <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'/>
       </menu>     
       <separator/>
+      <menuitem action='editor-delete'/>
       <menuitem action='editor-crop'/>
       <menuitem action='split-region'/>
       <menuitem action='split-region-at-transients'/>
@@ -207,47 +209,37 @@
         <menuitem action='cycle-edit-point'/>
         <menuitem action='cycle-edit-point-with-marker'/>
       </menu>
-      <menuitem action='toggle-edit-mode'/>
       <separator/>
       <menu action="TempoMenu">
         <menuitem action='set-tempo-from-region'/>
         <menuitem action='set-tempo-from-edit-range'/>
       </menu>
+      <menuitem action='set-mouse-mode-object-range'/>
 #ifndef GTKOSX
       <separator/>
-      <menuitem action='ToggleRCOptionsEditor'/>
+      <menuitem action='toggle-rc-options-editor'/>
 #endif
     </menu>         
 
     <menu name='RegionMenu' action='RegionMenu'>
       <menuitem action='insert-region-from-region-list'/>
-      <menuitem action='rename-region'/>
-      <menuitem action='show-region-properties'/>
-      <menuitem action='set-region-sync-position'/>
-      <menuitem action='remove-region-sync'/>
       <menuitem action='play-selected-regions'/>
-      <menuitem action='export-region'/>
-      <menuitem action='bounce-region'/>
-      <menuitem action='combine-regions'/>
-      <menuitem action='uncombine-regions'/>
-      <menuitem action='analyze-region'/>
-      <menuitem action='toggle-region-lock'/>
-      <menuitem action='toggle-region-lock-style'/>
-      <menuitem action='toggle-opaque-region'/>
-      <menuitem action='toggle-region-mute'/>
-      <menuitem action='pitch-shift-region'/>
-      <menuitem action='transpose-region'/>
-      <menuitem action='naturalize-region'/>
-      <menuitem action='split-region'/>
-      <menuitem action='split-multichannel-region'/>
-      <menuitem action='remove-region'/>
       <menuitem action='loop-region'/>
-      <menuitem action='snap-regions-to-grid'/>
-      <menuitem action='close-region-gaps'/>
-      <menuitem action='place-transient' />
-      <menuitem action='show-rhythm-ferret'/>
-      <menuitem action='strip-region-silence'/>
-      <menuitem action='reverse-region'/>    
+      <menuitem action='rename-region'/>
+      <menuitem action='show-region-properties'/>
+      <menu action='RegionMenuEdit'>
+         <menuitem action='combine-regions'/>
+         <menuitem action='uncombine-regions'/>
+         <menuitem action='analyze-region'/>
+         <menuitem action='pitch-shift-region'/>
+         <menuitem action='split-region'/>
+         <menuitem action='split-multichannel-region'/>
+         <menuitem action='close-region-gaps'/>
+         <menuitem action='place-transient' />
+         <menuitem action='show-rhythm-ferret'/>
+         <menuitem action='strip-region-silence'/>
+         <menuitem action='reverse-region'/>    
+      </menu>
       <menu action='RegionMenuLayering'>
         <menuitem action='raise-region-to-top'/>
         <menuitem action='raise-region'/>
@@ -255,24 +247,34 @@
         <menuitem action='lower-region-to-bottom'/>
       </menu>
       <menu action='RegionMenuMIDI'>
+        <menuitem action='transpose-region'/>
         <menuitem action='insert-patch-change'/>
         <menuitem action='quantize-region'/>
         <menuitem action='fork-region'/>
         <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'/>                      
         <menuitem action='reset-region-gain-envelopes'/>
-        <menuitem action='toggle-region-gain-envelope-visible'/>
         <menuitem action='toggle-region-gain-envelope-active'/>
-        <menuitem action='normalize-region'/>
       </menu>
-      <menu action='RegionMenuNudge'>
+      <menu action='RegionMenuPosition'>
+        <menuitem action='naturalize-region'/>
+        <menuitem action='snap-regions-to-grid'/>
+        <menuitem action='toggle-region-lock'/>
+        <menuitem action='toggle-region-lock-style'/>
+        <menuitem action='toggle-region-video-lock'/>
+        <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'/>
@@ -299,6 +301,11 @@
         <menuitem action='multi-duplicate-region'/>
         <menuitem action='region-fill-track'/>
       </menu>
+      <menuitem action='export-region'/>
+      <menuitem action='bounce-regions-processed'/>
+      <menuitem action='bounce-regions-unprocessed'/>
+      <separator/>
+      <menuitem action='remove-region'/>
     </menu>
 
     <menu action='TrackMenu'>
@@ -312,7 +319,6 @@
         <menuitem action='track-height-larger'/>
         <menuitem action='track-height-large'/>
         <menuitem action='track-height-normal'/>
-        <menuitem action='track-height-smaller'/>
         <menuitem action='track-height-small'/>
       </menu>
       <menuitem action='track-record-enable-toggle'/>
@@ -322,21 +328,23 @@
 
     <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"/>
         <menuitem action="primary-clock-samples"/>
-        <menuitem action="primary-clock-off"/>
       </menu>
       <menu action="SecondaryClockMenu">
+        <menuitem action="secondary-clock-timecode"/>
         <menuitem action="secondary-clock-bbt"/>
         <menuitem action="secondary-clock-minsec"/>
         <menuitem action="secondary-clock-samples"/>
-        <menuitem action="secondary-clock-off"/>
       </menu>
 
       <separator/>
@@ -358,6 +366,7 @@
         <menuitem action='zoom-focus-playhead'/>
         <menuitem action='zoom-focus-mouse'/>
         <menuitem action='zoom-focus-edit'/>
+        <menuitem action='cycle-zoom-focus'/>
       </menu>
       <menu name='SnapMode' action='SnapMode'>
         <menuitem action='snap-off'/>
@@ -365,7 +374,10 @@
         <menuitem action='snap-magnetic'/>
         <separator/>
         <menuitem action='cycle-snap-mode'/>
-        <menuitem action='cycle-snap-choice'/>
+        <menuitem action='next-snap-choice'/>
+        <menuitem action='prev-snap-choice'/>
+        <menuitem action='next-snap-choice-music-only'/>
+        <menuitem action='prev-snap-choice-music-only'/>
       </menu>
       <menu name='SnapTo' action='SnapTo'>
         <menuitem action='snap-to-cd-frame'/>
@@ -374,6 +386,8 @@
         <menuitem action='snap-to-timecode-minutes'/>
         <menuitem action='snap-to-seconds'/>
         <menuitem action='snap-to-minutes'/>
+        <menuitem action='snap-to-onetwentyeighths'/>
+        <menuitem action='snap-to-sixtyfourths'/>
         <menuitem action='snap-to-thirtyseconds'/>
         <menuitem action='snap-to-twentyeighths'/>
         <menuitem action='snap-to-twentyfourths'/>
@@ -408,6 +422,19 @@
         <menuitem action="toggle-loop-punch-ruler"/>
         <menuitem action="toggle-cd-marker-ruler"/>
         <menuitem action="toggle-marker-ruler"/>
+        <separator/>
+        <menuitem action="toggle-video-ruler"/>
+      </menu>
+      <menu action="VideoMonitorMenu">
+        <menuitem action="zoom-vmon-100"/>
+        <menuitem action="toggle-vmon-letterbox"/>
+        <separator/>
+        <menuitem action="toggle-vmon-ontop"/>
+        <menuitem action="toggle-vmon-fullscreen"/>
+        <separator/>
+        <menuitem action="toggle-vmon-timecode"/>
+        <menuitem action="toggle-vmon-frame"/>
+        <menuitem action="toggle-vmon-osdbg"/>
       </menu>
       <menu action="ScrollMenu">
         <menuitem action='scroll-tracks-down'/>
@@ -451,37 +478,28 @@
       <menuitem action='ToggleGroupTabs'/>
       <menuitem action='show-marker-lines'/>
     </menu>
-    <menu name='JACK' action='JACK'>
-      <menuitem action='JACKDisconnect'/>
-      <menuitem action='JACKReconnect'/>
-      <menu name='Latency' action='Latency'>
-        <menuitem action='JACKLatency32'/>
-        <menuitem action='JACKLatency64'/>
-        <menuitem action='JACKLatency128'/>
-        <menuitem action='JACKLatency256'/>
-        <menuitem action='JACKLatency512'/>
-        <menuitem action='JACKLatency1024'/>
-        <menuitem action='JACKLatency2048'/>
-        <menuitem action='JACKLatency4096'/>
-        <menuitem action='JACKLatency8192'/>
-      </menu>
-    </menu>
     <menu action = 'WindowMenu'>
+      <menuitem action='toggle-audio-midi-setup'/>
+      <separator/>
       <menuitem action='toggle-mixer'/>
-      <menuitem action='toggle-mixer-on-top'/>
-
+      <menuitem action='toggle-meterbridge'/>
+      <menuitem action='toggle-editor-mixer'/>
       <separator/>
-
-      <menuitem action='ToggleInspector'/>
-      <menuitem action='ToggleLocations'/>
-      <menuitem action='ToggleKeyEditor'/>
-      <menuitem action='ToggleBundleManager'/>
-      <menuitem action='ToggleThemeManager'/>
-      <menuitem action='ToggleBigClock'/>
+      <menuitem action='toggle-inspector'/>
+      <menuitem action='toggle-locations'/>
+      <menuitem action='toggle-key-editor'/>
+      <menuitem action='toggle-bundle-manager'/>
+      <menuitem action='toggle-theme-manager'/>
+      <menuitem action='toggle-big-clock'/>
+#if 0
       <menuitem action='toggle-speaker-config'/>
+#endif
 
       <separator/>
 
+      <menuitem action='ToggleJadeo'/>
+      <separator/>
+
       <menuitem action='NewMIDITracer'/>
       <menuitem action='toggle-audio-connection-manager'/>
       <menuitem action='toggle-midi-connection-manager'/>
@@ -490,7 +508,7 @@
     </menu>
     <menu name='Help' action='Help'>
 #ifndef GTKOSX
-      <menuitem action='About'/>
+      <menuitem action='toggle-about'/>
 #endif
       <menuitem action='Chat'/>
       <menuitem action='Manual'/>
@@ -511,6 +529,8 @@
     <menuitem action="toggle-marker-ruler"/>
     <menuitem action="toggle-cd-marker-ruler"/>
     <menuitem action="toggle-loop-punch-ruler"/>
+    <separator/>
+    <menuitem action="toggle-video-ruler"/>
   </popup>
 
   <popup name='ProcessorMenu'>
@@ -519,6 +539,9 @@
     <menuitem action='newsend'/>
     <menuitem action='newaux'/>
     <separator/>
+    <menuitem action='controls'/>
+    <menuitem action='send_options'/>
+    <separator/>
     <menuitem action='clear'/>
     <menuitem action='clear_pre'/>
     <menuitem action='clear_post'/>
@@ -538,7 +561,7 @@
     <menuitem action='ab_plugins'/>
     <separator/>
     <menuitem action='edit'/>
-    <menuitem action='controls'/>
+    <menuitem action='edit-generic'/>
   </popup>
 
   <popup name='ShuttleUnitPopup'>
@@ -575,58 +598,42 @@
   </popup>
 
   <popup name='PopupRegionMenu' action='PopupRegionMenu'>
-    <menuitem action='rename-region'/>
-    <menuitem action='show-region-properties'/>
-    <menuitem action='set-region-sync-position'/>
-    <menuitem action='remove-region-sync'/>
     <menuitem action='play-selected-regions'/>
-    <menuitem action='export-region'/>
-    <menuitem action='bounce-region'/>
-    <menuitem action='analyze-region'/>
-    <menuitem action='toggle-region-lock'/>
-    <menuitem action='toggle-region-lock-style'/>
-    <menuitem action='toggle-opaque-region'/>
-    <menuitem action='toggle-region-mute'/>
-    <menuitem action='pitch-shift-region'/>
-    <menuitem action='transpose-region'/>
-    <menuitem action='naturalize-region'/>
-    <menuitem action='combine-regions'/>
-    <menuitem action='uncombine-regions'/>
-    <menuitem action='split-region'/>
-    <menuitem action='split-multichannel-region'/>
-    <menuitem action='remove-region'/>
     <menuitem action='loop-region'/>
-    <menuitem action='snap-regions-to-grid'/>
-    <menuitem action='close-region-gaps'/>
-    <menuitem action='place-transient' />
-    <menuitem action='show-rhythm-ferret'/>
-    <menuitem action='strip-region-silence'/>
-    <menuitem action='reverse-region'/>    
-    <menu action='RegionMenuLayering'>
-      <menuitem action='raise-region-to-top'/>
-      <menuitem action='raise-region'/>
-      <menuitem action='lower-region'/>
-      <menuitem action='lower-region-to-bottom'/>
+    <menuitem action='rename-region'/>
+    <menuitem action='show-region-properties'/>
+    <menu action='RegionMenuEdit'>
+       <menuitem action='combine-regions'/>
+       <menuitem action='uncombine-regions'/>
+       <menuitem action='split-region'/>
+       <menuitem action='split-multichannel-region'/>
+       <menuitem action='pitch-shift-region'/>
+       <menuitem action='reverse-region'/>    
+       <menuitem action='close-region-gaps'/>
+       <menuitem action='place-transient' />
+       <menuitem action='show-rhythm-ferret'/>
+       <menuitem action='strip-region-silence'/>
     </menu>
     <menu action='RegionMenuMIDI'>
-      <menuitem action='insert-patch-change'/>
+      <menuitem action='transpose-region'/>
+      <menuitem action='insert-patch-change-context'/>
       <menuitem action='quantize-region'/>
       <menuitem action='fork-region'/>
       <menuitem action='show-region-list-editor'/>
     </menu>
-    <menu action='RegionMenuGain'>
-      <menuitem action='boost-region-gain'/>
-      <menuitem action='cut-region-gain'/>                        
-      <menuitem action='reset-region-gain-envelopes'/>
-      <menuitem action='toggle-region-gain-envelope-visible'/>
-      <menuitem action='toggle-region-gain-envelope-active'/>
-      <menuitem action='normalize-region'/>
-    </menu>
-    <menu action='RegionMenuNudge'>
+    <menu action='RegionMenuPosition'>
+      <menuitem action='naturalize-region'/>
+      <menuitem action='toggle-region-lock'/>
+      <menuitem action='toggle-region-lock-style'/>
+      <menuitem action='toggle-region-video-lock'/>
+      <menuitem action='snap-regions-to-grid'/>
+      <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'/>
@@ -636,6 +643,12 @@
       <menuitem action='trim-to-previous-region'/>
       <menuitem action='trim-to-next-region'/>
     </menu>
+    <menu action='RegionMenuLayering'>
+      <menuitem action='raise-region-to-top'/>
+      <menuitem action='raise-region'/>
+      <menuitem action='lower-region'/>
+      <menuitem action='lower-region-to-bottom'/>
+    </menu>
     <menu action='RegionMenuRanges'>
       <menuitem action='set-loop-from-region'/>
       <menuitem action='set-punch-from-region'/>
@@ -643,6 +656,15 @@
       <menuitem action='add-range-markers-from-region'/>
       <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'/>                        
+      <menuitem action='reset-region-gain-envelopes'/>
+      <menuitem action='toggle-region-gain-envelope-active'/>
+    </menu>
     <menu action='RegionMenuFades'>
       <menuitem action='toggle-region-fade-in'/>
       <menuitem action='toggle-region-fade-out'/>
@@ -653,6 +675,12 @@
       <menuitem action='multi-duplicate-region'/>
       <menuitem action='region-fill-track'/>
     </menu>
+    <menuitem action='export-region'/>
+    <menuitem action='bounce-regions-processed'/>
+    <menuitem action='bounce-regions-unprocessed'/>
+    <menuitem action='analyze-region'/>
+    <separator/>
+    <menuitem action='remove-region'/>
     
   </popup>