Do not try to restore Route solo state after clearing all solo state

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

diff --git a/gtk2_ardour/trx.menus.in b/gtk2_ardour/trx.menus.in
index a8a53a9cb0abf517fe8fd2d4d374092f67f5be0d..d4a7e3187ac15e9e4cb7c331f8d4c959f5c796da 100644 (file)
--- a/gtk2_ardour/trx.menus.in
+++ b/gtk2_ardour/trx.menus.in
@@ -5,8 +5,8 @@
   <accelerator action='set-mouse-mode-draw'/>
   <accelerator action='set-mouse-mode-zoom'/>
   <accelerator action='set-mouse-mode-timefx'/>
+  <accelerator action='set-mouse-mode-content'/>
   <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'/>
@@ -44,14 +44,14 @@
         <menuitem action='CleanupUnused'/>
         <menuitem action='FlushWastebasket'/>
       </menu>
-      #ifdef GTKOSX      
+#ifdef GTKOSX      
       <menuitem action='toggle-about'/>
       <menuitem action='toggle-rc-options-editor'/>
-      #endif
-      #ifndef GTKOSX
+#endif
+#ifndef GTKOSX
       <separator/>
       <menuitem action='Quit'/>
-      #endif
+#endif
     </menu>
 
     <menu name='Transport' action='Transport'>
@@ -97,10 +97,10 @@
       <menuitem action='editor-crop'/>
       <menuitem action='split-region'/>
       <separator/>
-      #ifndef GTKOSX
+#ifndef GTKOSX
       <separator/>
       <menuitem action='toggle-rc-options-editor'/>
-      #endif
+#endif
     </menu>         
 
     <menu action='TrackMenu'>
@@ -154,9 +154,9 @@
       <menuitem action='toggle-big-clock'/>
     </menu>
     <menu name='Help' action='Help'>
-      #ifndef GTKOSX
+#ifndef GTKOSX
       <menuitem action='toggle-about'/>
-      #endif
+#endif
       <menuitem action='Manual'/>
     </menu>
   </menubar>
@@ -253,6 +253,8 @@
       <menuitem action='transpose-region'/>
       <menuitem action='insert-patch-change-context'/>
       <menuitem action='quantize-region'/>
+      <menuitem action='legatize-region'/>
+      <menuitem action='remove-overlap'/>
       <menuitem action='fork-region'/>
       <menuitem action='show-region-list-editor'/>
     </menu>