Fix editor sizing issue introduced in 4dc65e66

[ardour.git] / gtk2_ardour / ardour-sae.menus

diff --git a/gtk2_ardour/ardour-sae.menus b/gtk2_ardour/ardour-sae.menus
index dd57e2aa36b9250aa825c5e3526e88c5cffd1db7..effd9abc095156b6b8157f24e842dc3e1ea519c5 100644 (file)
--- a/gtk2_ardour/ardour-sae.menus
+++ b/gtk2_ardour/ardour-sae.menus
@@ -10,6 +10,7 @@
            <menuitem action='Save'/>
            <menuitem action='Snapshot'/>
            <menuitem action='SaveTemplate'/>
+           <menuitem action='ManageTemplates'/>
            <separator/>
 
           <menu name='Files' action='Files'>
@@ -56,11 +57,11 @@
                <menuitem action='TransitionToRoll'/>
                <menuitem action='TransitionToReverse'/>
               <separator/>
-              
+
               <menuitem action='set-playhead'/>
 
               <menu action="MovePlayHeadMenu">
-                  
+
                    <menuitem action='playhead-to-edit'/>
                   <menuitem action='center-playhead'/>
                   <separator/>
@@ -122,7 +123,7 @@
                <menuitem action='editor-cut'/>
                <menuitem action='editor-copy'/>
                <menuitem action='editor-paste'/>
-               <separator/>       
+               <separator/>
                <menuitem action='editor-delete'/>
               <menuitem action='split-region'/>
               <menu action="SeparateMenu">
@@ -132,7 +133,7 @@
                    <separator/>
                    <menuitem action='split-region-at-transients'/>
                </menu>
-               <separator/>       
+               <separator/>
               <menuitem action='duplicate-region'/>
               <menuitem action='multi-duplicate-region'/>
               <menuitem action='region-fill-track'/>
@@ -158,11 +159,14 @@
               </menu>
               <menu action="FadeMenu">
                   <menuitem action='set-fade-in-length'/>
-                  <menuitem action='toggle-fade-in-active'/>
+                  <menuitem action='toggle-region-fade-in'/>
                   <menuitem action='set-fade-out-length'/>
-                  <menuitem action='toggle-fade-out-active'/>
+                  <menuitem action='toggle-region-fade-out'/>
+                  <separator/>
+                  <menuitem action='toggle-selected-region-fades'/>
+                   <menuitem action='toggle-region-fades'/>
                </menu>
-              <menu action="SelectMenu">          
+              <menu action="SelectMenu">
                   <menuitem action='select-all'/>
                   <menuitem action='deselect-all'/>
                   <menuitem action='invert-selection'/>
@@ -172,17 +176,22 @@
                   <menuitem action='select-all-within-cursors'/>
                   <menuitem action='select-all-in-punch-range'/>
                   <menuitem action='select-all-in-loop-range'/>
-              </menu>     
+                  <separator/>
+                  <menuitem action='select-next-route'/>
+                  <menuitem action='select-prev-route'/>
+              </menu>
         </menu>
 
         <menu action='TrackMenu'>
-               <menuitem action='AddTrackBus'/>        
+               <menuitem action='remove-track'/>
+               <menuitem action='AddTrackBus'/>
+               <menuitem action="move-selected-tracks-up"/>
+               <menuitem action="move-selected-tracks-down"/>
                <menu action='TrackHeightMenu'>
                     <menuitem action='track-height-largest'/>
                     <menuitem action='track-height-large'/>
                     <menuitem action='track-height-larger'/>
                     <menuitem action='track-height-normal'/>
-                    <menuitem action='track-height-smaller'/>
                     <menuitem action='track-height-small'/>
                </menu>
                <menu action='WaveformMenu'>
@@ -190,32 +199,31 @@
                      <menuitem action='linear-waveforms'/>
                      <menuitem action='logarithmic-waveforms'/>
                </menu>
-               <menuitem action='toggle-track-active'/>        
-               <menuitem action='remove-track'/>       
+               <menuitem action='toggle-track-active'/>
        </menu>
 
        <menu action='RegionMenu'>
-             <menuitem action='insert-region'/>
+             <menuitem action='insert-region-from-region-list'/>
              <menuitem action='rename-region'/>
              <menuitem action='auto-rename-region'/>
              <menuitem action='raise-region'/>
              <menuitem action='lower-region'/>
              <menuitem action='naturalize-region'/>
-             <menuitem action='lock-region'/>
+             <menuitem action='toggle-region-lock'/>
              <menuitem action='set-region-sync-position'/>
              <menuitem action='remove-region-sync'/>
-              <menuitem action='mute-unmute-region'/>
-             <separator/>       
-              <menuitem action='reverse-region'/>    
-             <menuitem action='monoize-region'/>
+              <menuitem action='toggle-region-mute'/>
+             <separator/>
+              <menuitem action='reverse-region'/>
+             <menuitem action='split-multichannel-region'/>
              <menuitem action='normalize-region'/>
              <menuitem action='boost-region-gain'/>
-             <menuitem action='cut-region-gain'/>                         
+             <menuitem action='cut-region-gain'/>
              <menuitem action='pitch-shift-region'/>
              <separator/>
              <menuitem action='toggle-selected-region-fades'/>
              <menuitem action='toggle-region-fades'/>
-        </menu>         
+        </menu>
 
         <menu name='View' action = 'View'>
               <menuitem action='ToggleMaximalEditor'/>
@@ -264,13 +272,13 @@
         </menu>
 
        <menu action="WindowMenu">
-             <menuitem action='goto-editor'/>
-             <menuitem action='goto-mixer'/>
+
+             <menuitem action='toggle-editor-mixer-on-top'/>
              <menuitem action='ToggleLocations'/>
              <menuitem action='ToggleKeyEditor'/>
              <menuitem action='ToggleThemeManager'/>
              <menuitem action='ToggleBigClock'/>
-             <menuitem action='toggle-rhythm-ferret'/>
+             <menuitem action='show-rhythm-ferret'/>
        </menu>
 
         <menu name='Options' action='Options'>
@@ -290,9 +298,6 @@
               <menu action="LatchMenu">
                      <menuitem action='LatchedSolo'/>
               </menu>
-              <menu action="Link">
-                    <menuitem action='link-region-and-track-selection'/> 
-              </menu>
                <menu action='ZoomFocusMenu'>
                    <menuitem action='zoom-focus-playhead'/>
                    <menuitem action='zoom-focus-edit'/>
@@ -304,17 +309,17 @@
                   <menuitem action='edit-at-selected-marker'/>
               </menu>
               <menu action='KeyMouseActions'>
-                  <menuitem action='select-next-route'/>
-                  <menuitem action='select-prev-route'/>
                   <menuitem action='focus-on-clock'/>
                   <menuitem action='GotoZero'/>
                   <menuitem action='GotoStart'/>
                   <menuitem action='GotoEnd'/>
+                  <separator/>
+                  <menuitem action='step-mouse-mode'/>
                   <menuitem action='set-mouse-mode-object'/>
-                  <menuitem action='set-mouse-mode-range'/>
-                  <menuitem action='set-mouse-mode-gain'/>
                   <menuitem action='set-mouse-mode-zoom'/>
                   <menuitem action='set-mouse-mode-timefx'/>
+                  <menuitem action='set-mouse-mode-content'/>
+                  <separator/>
                   <menuitem action='cycle-edit-point'/>
                   <menuitem action='cycle-edit-point-with-marker'/>
                   <menuitem action='toggle-edit-mode'/>
@@ -329,7 +334,6 @@
 
      </menubar>
 
-<<<<<<< .working
      <popup action="RulerMenuPopup">
          <menuitem action="toggle-minsec-ruler"/>
          <menuitem action="toggle-samples-ruler"/>
@@ -342,32 +346,19 @@
          <menuitem action="toggle-marker-ruler"/>
      </popup>
 
-     <popup name='processormenu'>
-=======
-     <popup action="RulerMenuPopup">
-         <menuitem action="toggle-minsec-ruler"/>
-         <menuitem action="toggle-samples-ruler"/>
-          <menuitem action="toggle-bbt-ruler"/>
+     <popup name='ProcessorMenu'>
+        <menuitem action='delete'/>
          <separator/>
-         <menuitem action="toggle-meter-ruler"/>
-         <menuitem action="toggle-tempo-ruler"/>
-         <menuitem action="toggle-loop-punch-ruler"/>
-         <menuitem action="toggle-cd-marker-ruler"/>
-         <menuitem action="toggle-marker-ruler"/>
-     </popup>
-
-     <popup name='redirectmenu'>
->>>>>>> .merge-right.r3622
         <menuitem action='newplugin'/>
         <menuitem action='newinsert'/>
         <menuitem action='newsend'/>
+        <menuitem action='newreturn'/>
          <separator/>
         <menuitem action='clear'/>
          <separator/>
         <menuitem action='cut'/>
         <menuitem action='copy'/>
         <menuitem action='paste'/>
-        <menuitem action='delete'/>
          <separator/>
         <menuitem action='rename'/>
          <separator/>
@@ -411,6 +402,6 @@
                <menuitem action='SortBySourceFilesystem'/>
          </menu>
          <separator/>
-         <menuitem action='addExternalAudioToRegionList'/>            
+         <menuitem action='addExternalAudioToRegionList'/>
      </popup>
 </ui>