X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fardour-sae.menus;h=d5e5988c4161c3d01effd6c5b364b6226bbbc03c;hb=4336bb25d739cd007811ccd0298a15acc5e20787;hp=021d8c3b0eebf4c62ab6de66cf117b5a07ace811;hpb=42db44c1939410aab15eb3c0d08f6026fb58b003;p=ardour.git

diff --git a/gtk2_ardour/ardour-sae.menus b/gtk2_ardour/ardour-sae.menus
index 021d8c3b0e..d5e5988c41 100644
--- a/gtk2_ardour/ardour-sae.menus
+++ b/gtk2_ardour/ardour-sae.menus
@@ -158,9 +158,12 @@
 	       </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">	   
 	           <menuitem action='select-all'/>
@@ -172,10 +175,14 @@
 		   <menuitem action='select-all-within-cursors'/>
 		   <menuitem action='select-all-in-punch-range'/>
 		   <menuitem action='select-all-in-loop-range'/>
+		   <separator/>
+		   <menuitem action='select-next-route'/>
+		   <menuitem action='select-prev-route'/>
 	       </menu>	   
         </menu>
 
         <menu action='TrackMenu'>
+		<menuitem action='remove-track'/>
 	        <menuitem action='AddTrackBus'/>	
 	        <menuitem action="move-selected-tracks-up"/>
 	        <menuitem action="move-selected-tracks-down"/>
@@ -193,23 +200,22 @@
 		      <menuitem action='logarithmic-waveforms'/>
 		</menu>
 		<menuitem action='toggle-track-active'/>	
-		<menuitem action='remove-track'/>	
 	</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'/>
+              <menuitem action='toggle-region-mute'/>
 	      <separator/>       
               <menuitem action='reverse-region'/>    
-	      <menuitem action='monoize-region'/>
+	      <menuitem action='split-multichannel-region'/>
 	      <menuitem action='normalize-region'/>
 	      <menuitem action='boost-region-gain'/>
 	      <menuitem action='cut-region-gain'/>      		   
@@ -266,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'>
@@ -306,17 +312,16 @@
 	           <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'/>
+		   <separator/>
 		   <menuitem action='cycle-edit-point'/>
 		   <menuitem action='cycle-edit-point-with-marker'/>
 		   <menuitem action='toggle-edit-mode'/>
@@ -331,7 +336,6 @@
 
      </menubar>
 
-<<<<<<< .working
      <popup action="RulerMenuPopup">
      	  <menuitem action="toggle-minsec-ruler"/>
 	  <menuitem action="toggle-samples-ruler"/>
@@ -345,31 +349,18 @@
      </popup>
 
      <popup name='processormenu'>
-=======
-     <popup action="RulerMenuPopup">
-     	  <menuitem action="toggle-minsec-ruler"/>
-	  <menuitem action="toggle-samples-ruler"/>
-          <menuitem action="toggle-bbt-ruler"/>
+	 <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/>