remove track-selection requirement so fit_selected_tracks works as coded. change...

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

diff --git a/gtk2_ardour/ardour.menus.in b/gtk2_ardour/ardour.menus.in
index 53eeb745d517467a310f0b9efa44bf7248883c7a..a26101a1cd19456b2488ea78e6986f3f7e338995 100644 (file)
--- a/gtk2_ardour/ardour.menus.in
+++ b/gtk2_ardour/ardour.menus.in
@@ -29,8 +29,8 @@
         <menuitem action='StemExport'/>
         <menuitem action='ExportVideo'/>
       </menu>
-      <menuitem action='bring-into-session'/>
       <menu name='Cleanup' action='Cleanup'>
+               <menuitem action='bring-into-session'/>
         <menuitem action='CleanupUnused'/>
         <menuitem action='FlushWastebasket'/>
       </menu>
@@ -51,26 +51,22 @@
     <menu name='Transport' action='Transport'>
       <menuitem action='ToggleRoll'/>
       <menu action="PlayMenu">
-        <menuitem action='main-menu-play-selected-regions'/>
-        <menuitem action='play-edit-range'/>
         <menuitem action='PlaySelection'/>
         <menuitem action='PlayPreroll'/>
+        <menuitem action='ToggleRollMaybe'/>
         <menuitem action='play-from-edit-point-and-return'/>
         <menuitem action='Loop'/>
       </menu>
       <menuitem action='record-roll'/>
-      <menuitem action='Record'/>
-      <menuitem action='ToggleRollMaybe'/>
       <menuitem action='ToggleRollForgetCapture'/>
+      <menuitem action='Record'/>
+#if 0
       <menuitem action='toggle-skip-playback'/>
-      <menu action="SetLoopMenu">
-        <menuitem action='set-loop-from-edit-range'/>
-        <menuitem action='set-loop-from-region'/>
-      </menu>
-      <menu action="SetPunchMenu">
-        <menuitem action='set-punch-from-edit-range'/>
-        <menuitem action='set-punch-from-region'/>
-      </menu>
+#endif
+
+      <separator/>
+      <menuitem action='set-loop-from-edit-range'/>
+      <menuitem action='set-punch-from-edit-range'/>
 
       <separator/>
       <menuitem action='Forward'/>
@@ -151,6 +147,10 @@
     <menu name='Edit' action='Edit'>
       <menuitem action='undo'/>
       <menuitem action='redo'/>
+      <separator/>
+      <menuitem action='undo-last-selection-op'/>
+      <menuitem action='redo-last-selection-op'/>
+      <separator/>  
       <menuitem action='editor-cut'/>
       <menuitem action='editor-copy'/>
       <menuitem action='editor-paste'/>
@@ -182,10 +182,8 @@
       <menuitem action='editor-delete'/>
       <menuitem action='editor-crop'/>
       <menuitem action='split-region'/>
-      <menuitem action='split-region-at-transients'/>
       <menu action="SeparateMenu">
         <menuitem action='separate-under-region'/>
-        <menuitem action='editor-separate'/>
         <menuitem action='separate-from-loop'/>
         <menuitem action='separate-from-punch'/>
         <separator/>
@@ -211,6 +209,49 @@
         <menuitem action='cycle-edit-point'/>
         <menuitem action='cycle-edit-point-with-marker'/>
       </menu>
+      <menu name='SnapMode' action='SnapMode'>
+        <menuitem action='snap-off'/>
+        <menuitem action='snap-normal'/>
+        <menuitem action='snap-magnetic'/>
+        <separator/>
+        <menuitem action='cycle-snap-mode'/>
+        <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'/>
+        <menuitem action='snap-to-timecode-frame'/>
+        <menuitem action='snap-to-timecode-seconds'/>
+        <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'/>
+        <menuitem action='snap-to-twentieths'/>
+        <menuitem action='snap-to-asixteenthbeat'/>
+        <menuitem action='snap-to-fourteenths'/>
+        <menuitem action='snap-to-twelfths'/>
+        <menuitem action='snap-to-tenths'/>
+        <menuitem action='snap-to-eighths'/>
+        <menuitem action='snap-to-sevenths'/>
+        <menuitem action='snap-to-sixths'/>
+        <menuitem action='snap-to-fifths'/>
+        <menuitem action='snap-to-quarters'/>
+        <menuitem action='snap-to-thirds'/>
+        <menuitem action='snap-to-halves'/>
+        <menuitem action='snap-to-beat'/>
+        <menuitem action='snap-to-bar'/>
+        <menuitem action='snap-to-mark'/>
+        <menuitem action='snap-to-region-start'/>
+        <menuitem action='snap-to-region-end'/>
+        <menuitem action='snap-to-region-sync'/>
+        <menuitem action='snap-to-region-boundary'/>
+      </menu>
       <separator/>
       <menu action="TempoMenu">
         <menuitem action='set-tempo-from-region'/>
@@ -229,12 +270,12 @@
       <menuitem action='loop-region'/>
       <menuitem action='rename-region'/>
       <menuitem action='show-region-properties'/>
+      <menuitem action='analyze-region'/>
       <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-region-at-transients'/>
          <menuitem action='split-multichannel-region'/>
          <menuitem action='close-region-gaps'/>
          <menuitem action='place-transient' />
@@ -323,7 +364,7 @@
       <menuitem action="move-selected-tracks-up"/>
       <menuitem action="move-selected-tracks-down"/>
       <menu action='TrackHeightMenu'>
-        <menuitem action='fit-tracks'/>
+        <menuitem action='fit-selection'/>
         <menuitem action='track-height-largest'/>
         <menuitem action='track-height-larger'/>
         <menuitem action='track-height-large'/>
@@ -364,7 +405,7 @@
         <menuitem action='temporal-zoom-out'/>
         <menuitem action='zoom-to-session'/>
         <menuitem action='zoom-to-selection'/>
-        <menuitem action='zoom-to-selection-both-axes'/>
+        <menuitem action='fit-selection'/>
         <menuitem action='toggle-zoom'/>
         <menuitem action='expand-tracks'/>
         <menuitem action='shrink-tracks'/>
@@ -378,49 +419,6 @@
         <menuitem action='zoom-focus-edit'/>
         <menuitem action='cycle-zoom-focus'/>
       </menu>
-      <menu name='SnapMode' action='SnapMode'>
-        <menuitem action='snap-off'/>
-        <menuitem action='snap-normal'/>
-        <menuitem action='snap-magnetic'/>
-        <separator/>
-        <menuitem action='cycle-snap-mode'/>
-        <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'/>
-        <menuitem action='snap-to-timecode-frame'/>
-        <menuitem action='snap-to-timecode-seconds'/>
-        <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'/>
-        <menuitem action='snap-to-twentieths'/>
-        <menuitem action='snap-to-asixteenthbeat'/>
-        <menuitem action='snap-to-fourteenths'/>
-        <menuitem action='snap-to-twelfths'/>
-        <menuitem action='snap-to-tenths'/>
-        <menuitem action='snap-to-eighths'/>
-        <menuitem action='snap-to-sevenths'/>
-        <menuitem action='snap-to-sixths'/>
-        <menuitem action='snap-to-fifths'/>
-        <menuitem action='snap-to-quarters'/>
-        <menuitem action='snap-to-thirds'/>
-        <menuitem action='snap-to-halves'/>
-        <menuitem action='snap-to-beat'/>
-        <menuitem action='snap-to-bar'/>
-        <menuitem action='snap-to-mark'/>
-        <menuitem action='snap-to-region-start'/>
-        <menuitem action='snap-to-region-end'/>
-        <menuitem action='snap-to-region-sync'/>
-        <menuitem action='snap-to-region-boundary'/>
-      </menu>
 
       <menu action="RulerMenu">
         <menuitem action="toggle-minsec-ruler"/>