X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fardour.menus.in;h=59e3c996a3fc3003ca21fefe080a0b651702770d;hb=5932b7903a7c43cc3b5cfd043e64d577e0125799;hp=faa3e6ac06a9b418630fd832bcda6f7704da59b7;hpb=976e16340615caa446bf2d1987ced37118e249b3;p=ardour.git

diff --git a/gtk2_ardour/ardour.menus.in b/gtk2_ardour/ardour.menus.in
index faa3e6ac06..59e3c996a3 100644
--- a/gtk2_ardour/ardour.menus.in
+++ b/gtk2_ardour/ardour.menus.in
@@ -2,6 +2,7 @@
   <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'/>
@@ -9,6 +10,8 @@
   <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'>
@@ -212,7 +215,6 @@
         <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'/>
@@ -226,34 +228,25 @@
 
     <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-regions-processed'/>
-      <menuitem action='bounce-regions-unprocessed'/>
-      <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='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'/>
@@ -261,20 +254,26 @@
         <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'/>
+        <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'/>
@@ -305,6 +304,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'>
@@ -370,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'/>
@@ -379,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'/>
@@ -524,6 +533,8 @@
     <menuitem action='newsend'/>
     <menuitem action='newaux'/>
     <separator/>
+    <menuitem action='controls'/>
+    <separator/>
     <menuitem action='clear'/>
     <menuitem action='clear_pre'/>
     <menuitem action='clear_post'/>
@@ -543,7 +554,7 @@
     <menuitem action='ab_plugins'/>
     <separator/>
     <menuitem action='edit'/>
-    <menuitem action='controls'/>
+    <menuitem action='edit-generic'/>
   </popup>
 
   <popup name='ShuttleUnitPopup'>
@@ -580,55 +591,38 @@
   </popup>
 
   <popup name='PopupRegionMenu' action='PopupRegionMenu'>
-    <menuitem action='rename-region'/>
-    <menuitem action='show-region-properties'/>
-    <menuitem action='combine-regions'/>
-    <menuitem action='uncombine-regions'/>
-    <menuitem action='split-region'/>
-    <menuitem action='split-multichannel-region'/>
-    <menuitem action='set-region-sync-position'/>
-    <menuitem action='remove-region-sync'/>
     <menuitem action='play-selected-regions'/>
-    <menuitem action='export-region'/>
-    <menuitem action='bounce-regions-processed'/>
-    <menuitem action='bounce-regions-unprocessed'/>
-    <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='reverse-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='remove-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='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='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'/>
@@ -642,6 +636,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'/>
@@ -649,6 +649,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'/>
@@ -659,6 +666,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>