X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fardour.menus.in;h=15f1bde1b624c62a3125fff5c5a1911fc8904f78;hb=89b0beb2ddf002e8d95ad89148e2c7e395294b0c;hp=62d637058b447b818a9bd3842d59c10ce25ae7d5;hpb=88a6513e76e397bdd19d4e76eaf44da8170cf73a;p=ardour.git

diff --git a/gtk2_ardour/ardour.menus.in b/gtk2_ardour/ardour.menus.in
index 62d637058b..15f1bde1b6 100644
--- a/gtk2_ardour/ardour.menus.in
+++ b/gtk2_ardour/ardour.menus.in
@@ -2,10 +2,16 @@
   <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'>
@@ -16,6 +22,7 @@
       <separator/>
       <menuitem action='Save'/>
       <menuitem action='SaveAs'/>
+      <menuitem action='Rename'/>
       <menuitem action='Snapshot'/>
       <menuitem action='SaveTemplate'/>
       <menu name='Metadata' action='Metadata'>
@@ -27,24 +34,30 @@
       <separator/>
       <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'/>
+        <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
+#ifndef GTKOSX
       <separator/>
       <menuitem action='Quit'/>
+#endif
     </menu>
 
     <menu name='Transport' action='Transport'>
@@ -53,6 +66,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>
@@ -137,12 +151,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'>
@@ -176,6 +192,7 @@
         <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,46 +224,39 @@
         <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='join-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='toggle-opaque-region'/>
+         <menuitem action='toggle-region-mute'/>
+         <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'/>
@@ -254,20 +264,29 @@
         <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='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'/>
+#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'/>
@@ -298,6 +317,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'>
@@ -311,7 +335,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'/>
@@ -326,16 +349,16 @@
       <separator/>
 
       <menu action="PrimaryClockMenu">
+        <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/>
@@ -357,6 +380,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'/>
@@ -364,7 +388,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'/>
@@ -373,6 +400,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'/>
@@ -407,6 +436,21 @@
         <menuitem action="toggle-loop-punch-ruler"/>
         <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"/>
+        <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'/>
@@ -467,20 +511,24 @@
     </menu>
     <menu action = 'WindowMenu'>
       <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'/>
       <menuitem action='toggle-speaker-config'/>
 
       <separator/>
 
+      <menuitem action='ToggleJadeo'/>
+      <separator/>
+
       <menuitem action='NewMIDITracer'/>
       <menuitem action='toggle-audio-connection-manager'/>
       <menuitem action='toggle-midi-connection-manager'/>
@@ -489,7 +537,7 @@
     </menu>
     <menu name='Help' action='Help'>
 #ifndef GTKOSX
-      <menuitem action='About'/>
+      <menuitem action='toggle-about'/>
 #endif
       <menuitem action='Chat'/>
       <menuitem action='Manual'/>
@@ -510,6 +558,10 @@
     <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'>
@@ -518,6 +570,8 @@
     <menuitem action='newsend'/>
     <menuitem action='newaux'/>
     <separator/>
+    <menuitem action='controls'/>
+    <separator/>
     <menuitem action='clear'/>
     <menuitem action='clear_pre'/>
     <menuitem action='clear_post'/>
@@ -537,6 +591,7 @@
     <menuitem action='ab_plugins'/>
     <separator/>
     <menuitem action='edit'/>
+    <menuitem action='edit-generic'/>
   </popup>
 
   <popup name='ShuttleUnitPopup'>
@@ -573,52 +628,41 @@
   </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='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='toggle-opaque-region'/>
+       <menuitem action='toggle-region-mute'/>
+       <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'/>
+#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'/>
       <menuitem action='nudge-forward'/>
       <menuitem action='nudge-backward'/>
       <menuitem action='nudge-forward-by-capture-offset'/>
@@ -632,6 +676,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'/>
@@ -639,6 +689,13 @@
       <menuitem action='add-range-markers-from-region'/>
       <menuitem action='set-selection-from-region'/>
     </menu>
+    <menu action='RegionMenuGain'>
+      <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'/>
@@ -649,6 +706,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>