properly track step edit status in editor & mixer windows

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

diff --git a/gtk2_ardour/ardour.menus.in b/gtk2_ardour/ardour.menus.in
index c0eb33f7e229eb7b274e1c4394619656a4dba56e..008d250f002c2d7f0a9a7b4799331345d119e521 100644 (file)
--- a/gtk2_ardour/ardour.menus.in
+++ b/gtk2_ardour/ardour.menus.in
@@ -124,12 +124,6 @@
               </menu>
 
               <separator/>
-              <menu action='SyncMenu'>
-                            <menuitem action='SendMTC'/>
-                            <menuitem action='SendMMC'/>
-                            <menuitem action='UseMMC'/>
-                            <menuitem action='SendMidiClock'/>
-              </menu>
               <menuitem action='ToggleTimeMaster'/>
                <menuitem action='TogglePunch'/>
                <menuitem action='TogglePunchIn'/>
@@ -172,12 +166,13 @@
                <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/>
-                   <menuitem action='split-region-at-transients'/>
                </menu>
               <menu action="AlignMenu">
                   <menuitem action='align-regions-start'/>
@@ -272,8 +267,14 @@
              <menuitem action='set-punch-from-region'/>
              <menuitem action='add-range-marker-from-region'/>
              <menuitem action='add-range-markers-from-region'/>
+
+             <separator/>
+             <menuitem action='snap-regions-to-grid'/>
+             <menuitem action='close-region-gaps'/>
              <separator/>
+             <menuitem action='place-transient' />
              <menuitem action='toggle-rhythm-ferret'/>
+             
        </menu>
 
         <menu action='TrackMenu'>
@@ -284,8 +285,8 @@
                <menu action='TrackHeightMenu'>
                     <menuitem action='fit-tracks'/>
                     <menuitem action='track-height-largest'/>
-                    <menuitem action='track-height-large'/>
                     <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'/>
@@ -296,6 +297,26 @@
        </menu>
 
         <menu name='View' action = 'View'>
+               <menuitem action='ToggleMaximalEditor'/>
+               <menuitem action='KeepTearoffs'/>
+
+               <separator/>
+
+              <menu action="PrimaryClockMenu">
+                    <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-bbt"/>
+                    <menuitem action="secondary-clock-minsec"/>
+                    <menuitem action="secondary-clock-samples"/>
+                    <menuitem action="secondary-clock-off"/>
+              </menu>
+
+               <separator/>
+
               <menu action="ZoomMenu">
                             <menuitem action='temporal-zoom-in'/>
                             <menuitem action='temporal-zoom-out'/>
@@ -340,18 +361,7 @@
                   <menuitem action='snap-to-region-sync'/>
                   <menuitem action='snap-to-region-boundary'/>
                </menu>
-              <menu action="PrimaryClockMenu">
-                    <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-bbt"/>
-                    <menuitem action="secondary-clock-minsec"/>
-                    <menuitem action="secondary-clock-samples"/>
-                    <menuitem action="secondary-clock-off"/>
-              </menu>
+
               <menu action="RulerMenu">
                     <menuitem action="toggle-minsec-ruler"/>
                     <menuitem action="toggle-samples-ruler"/>
@@ -396,7 +406,8 @@
                             <menuitem action='goto-visual-state-12'/>
               </menu>
 
-              <menuitem action='ToggleMaximalEditor'/>
+               <separator/>
+
               <menuitem action='show-editor-mixer'/>
               <menuitem action='show-editor-list'/>
                <menuitem action='ToggleMeasureVisibility'/>
@@ -419,17 +430,22 @@
                </menu>
         </menu>
         <menu action = 'WindowMenu'>
-              <menuitem action='ToggleMaximalEditor'/>
-              <separator/>
                <menuitem action='goto-editor'/>
                <menuitem action='goto-mixer'/>
                <menuitem action='toggle-editor-mixer-on-top'/>
+
+              <separator/>
+
                <menuitem action='ToggleInspector'/>
                <menuitem action='ToggleLocations'/>
                <menuitem action='ToggleKeyEditor'/>
                <menuitem action='ToggleBundleManager'/>
                <menuitem action='ToggleThemeManager'/>
                <menuitem action='ToggleBigClock'/>
+
+              <separator/>
+
+               <menuitem action='NewMIDITracer'/>
                <menuitem action='toggle-audio-connection-manager'/>
                <menuitem action='toggle-midi-connection-manager'/>
                <menuitem action='toggle-log-window'/>