X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fardour-sae.menus;h=d03449ff4ffd8cf7c0627e0b72909280c618710d;hb=54fd56de755a44420d906ad660b18c2d671f1057;hp=16f00955f36802de8ec052b919eb6e3686f45a03;hpb=8aa9508c82f32efcf9c7c00e2c9e76268d4dddce;p=ardour.git

diff --git a/gtk2_ardour/ardour-sae.menus b/gtk2_ardour/ardour-sae.menus
index 16f00955f3..d03449ff4f 100644
--- a/gtk2_ardour/ardour-sae.menus
+++ b/gtk2_ardour/ardour-sae.menus
@@ -1,23 +1,22 @@
 <ui>
-
     <menubar name='Main' action='MainMenu'>
+
         <menu name='Session' action='Session'>
            <menuitem action='New'/>
            <menuitem action='Open'/>
            <menuitem action='Recent'/>
            <menuitem action='Close'/>
-           <menuitem action='Quit'/>
            <separator/>
            <menuitem action='Save'/>
            <menuitem action='Snapshot'/>
            <menuitem action='SaveTemplate'/>
            <separator/>
-           <menuitem action='AddTrackBus'/>	
 
 	   <menu name='Files' action='Files'>
               <menuitem action='addExistingAudioFiles'/>
               <separator/>
 	      <menuitem action='ExportSession'/>
+	      <menuitem action='export-region'/>
 	   </menu>
 
            <separator/>
@@ -27,242 +26,338 @@
            </menu>
            <menuitem action='ToggleOptionsEditor'/>
            <menuitem action='About'/>
+           <menuitem action='Quit'/>
         </menu>
+
         <menu name='Transport' action='Transport'>
                <menuitem action='ToggleRoll'/>
-               <menuitem action='play-from-edit-point-and-return'/>
-               <menuitem action='play-edit-range'/>
+	       <menu action="PlayMenu">
+	       	     <menuitem action='play-selected-regions'/>
+		     <menuitem action='play-edit-range'/>
+                     <menuitem action='play-from-edit-point-and-return'/>
+		     <menuitem action='Loop'/>
+  	       </menu>
                <menuitem action='record-roll'/>
+               <menuitem action='Record'/>
                <menuitem action='ToggleRollForgetCapture'/>
-               <menuitem action='Loop'/>
-               <menuitem action='loop-region'/>
-               <menuitem action='set-playhead'/>
+	       <menuitem action='remove-last-capture'/>
+	       <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>
+
+	       <separator/>
                <menuitem action='Forward'/>
                <menuitem action='Rewind'/>
-               <menuitem action='GotoZero'/>
-               <menuitem action='GotoStart'/>
-               <menuitem action='GotoEnd'/>
-	       <separator/>
-               <menuitem action='tab-to-transient-forwards'/>
-               <menuitem action='tab-to-transient-backwards'/>
-               <menuitem action='nudge-playhead-forward'/>
-               <menuitem action='nudge-playhead-backward'/>
-	       <separator/>
-               <menuitem action='Record'/>
-               <separator/> 
                <menuitem action='TransitionToRoll'/>
                <menuitem action='TransitionToReverse'/>
-               <separator/> 
-               <menuitem action='jump-forward-to-mark'/>
-               <menuitem action='jump-backward-to-mark'/>
-               <menuitem action='add-location-from-playhead'/>
-               <separator/> 
-               <menuitem action='playhead-to-next-region-boundary'/>
-               <menuitem action='playhead-to-previous-region-boundary'/>
-               <menuitem action='playhead-to-next-region-sync'/>
-               <menuitem action='playhead-to-previous-region-sync'/>
-               <menuitem action='center-playhead'/>
 	       <separator/>
-               <menuitem action='playhead-to-edit'/>
-               <menuitem action='focus-on-clock'/>
+              
+	       <menuitem action='set-playhead'/>
+
+	       <menu action="MovePlayHeadMenu">
+ 	           
+                   <menuitem action='playhead-to-edit'/>
+  	           <menuitem action='center-playhead'/>
+	           <separator/>
+ 		   <menuitem action='nudge-playhead-forward'/>
+                   <menuitem action='nudge-playhead-backward'/>
+		   <separator/>
+                   <menuitem action='tab-to-transient-forwards'/>
+                   <menuitem action='tab-to-transient-backwards'/>
+	           <separator/>
+		   <menuitem action='playhead-forward-to-grid'/>
+		   <menuitem action='playhead-backward-to-grid'/>
+	           <separator/>
+		   <menuitem action='playhead-to-next-region-boundary'/>
+		   <menuitem action='playhead-to-previous-region-boundary'/>
+		   <menuitem action='playhead-to-next-region-sync'/>
+		   <menuitem action='playhead-to-previous-region-sync'/>
+		   <separator/>
+		   <menuitem action='jump-forward-to-mark'/>
+		   <menuitem action='jump-backward-to-mark'/>
+	       </menu>
+
+	       <menu action="MoveActiveMarkMenu">
+                   <menuitem action='selected-marker-to-next-region-boundary'/>
+    	           <menuitem action='selected-marker-to-previous-region-boundary'/>
+	           <menuitem action='edit-cursor-to-next-region-sync'/>
+    	           <menuitem action='edit-cursor-to-previous-region-sync'/>
+		   <separator/>
+            	   <menuitem action='edit-to-playhead'/>
+		   <menuitem action='set-edit-point'/>
+	       </menu>
+
+	       <menu action="MarkerMenu">
+	       	   <menuitem action='add-location-from-playhead'/>
+		   <separator/>
+		   <menuitem action='goto-mark-1'/>
+		   <menuitem action='goto-mark-2'/>
+		   <menuitem action='goto-mark-3'/>
+		   <menuitem action='goto-mark-4'/>
+		   <menuitem action='goto-mark-5'/>
+		   <menuitem action='goto-mark-6'/>
+		   <menuitem action='goto-mark-7'/>
+		   <menuitem action='goto-mark-8'/>
+		   <menuitem action='goto-mark-9'/>
+	       </menu>
+
 	       <separator/>
+               <menuitem action='TogglePunch'/>
                <menuitem action='TogglePunchIn'/>
                <menuitem action='TogglePunchOut'/>
                <menuitem action='ToggleAutoInput'/>
                <menuitem action='ToggleAutoPlay'/>
                <menuitem action='ToggleAutoReturn'/>
                <menuitem action='ToggleClick'/>
-               <menuitem action='toggle-follow-playhead'/>
-	       <separator/>
-	       <menuitem action='set-loop-from-edit-range'/>
-	       <menuitem action='set-loop-from-region'/>
-	       <menuitem action='set-punch-from-edit-range'/>
-	       <menuitem action='set-punch-from-region'/>
-	       <menu action='LocateToMarker'>
-		     <menuitem action='goto-mark-1'/>
-		     <menuitem action='goto-mark-2'/>
-		     <menuitem action='goto-mark-3'/>
-		     <menuitem action='goto-mark-4'/>
-		     <menuitem action='goto-mark-5'/>
-		     <menuitem action='goto-mark-6'/>
-		     <menuitem action='goto-mark-7'/>
-		     <menuitem action='goto-mark-8'/>
-		     <menuitem action='goto-mark-9'/>
-		</menu>
        </menu>
-       <menu name='Edit' action='Edit'>
+
+       <menu action='Edit'>
                <menuitem action='undo'/>
                <menuitem action='redo'/>
                <menuitem action='editor-cut'/>
-               <menuitem action='editor-delete'/>
                <menuitem action='editor-copy'/>
                <menuitem action='editor-paste'/>
-               <menuitem action='set-edit-point'/>
-               <menuitem action='editor-separate'/>
                <separator/>       
-	       <menuitem action='remove-last-capture'/>
+               <menuitem action='editor-delete'/>
+	       <menuitem action='split-region'/>
+	       <menu action="SeparateMenu">
+	            <menuitem action='editor-separate'/>
+	            <menuitem action='separate-from-loop'/>
+	            <menuitem action='separate-from-punch'/>
+		    <separator/>
+		    <menuitem action='split-region-at-transients'/>
+               </menu>
                <separator/>       
-               <menuitem action='select-all'/>
-               <menuitem action='deselect-all'/>
-               <menuitem action='invert-selection'/>
-               <menuitem action='select-all-after-edit-cursor'/>
-               <menuitem action='select-all-before-edit-cursor'/>
-               <menuitem action='select-all-between-cursors'/>
-               <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'/>
+	       <menuitem action='duplicate-region'/>
+	       <menuitem action='multi-duplicate-region'/>
+	       <menuitem action='region-fill-track'/>
 	       <separator/>
-	       <menu action='EditCursorMovementOptions'>
-                   <menuitem action='selected-marker-to-next-region-boundary'/>
-    	           <menuitem action='selected-marker-to-previous-region-boundary'/>
-	           <menuitem action='edit-cursor-to-next-region-sync'/>
-    	           <menuitem action='edit-cursor-to-previous-region-sync'/>
-        	   <menuitem action='center-edit-cursor'/>
-            	   <menuitem action='edit-to-playhead'/>
-	       </menu>
-	       <menu name='KeyMouse Actions' action='KeyMouse Actions'>
-	       		<menuitem action='play-selected-regions'/>
-               		<menuitem action='brush-at-mouse'/>
-               		<menuitem action='mute-unmute-region'/>
-			<separator/>
-			<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'/>
-			<separator/>
-			<menuitem action='boost-region-gain'/>
-			<menuitem action='cut-region-gain'/>
-	 	</menu>
-        </menu>         
-	<menu name='Regions' action='Regions'>
-                   <menuitem action='crop'/>
-                   <menuitem action='duplicate-region'/>
-                   <menuitem action='insert-region'/>
-               	   <menuitem action='normalize-region'/>
-                   <menuitem action='split-region-at-transients'/>
-                   <separator/>       
-	           <menuitem action="nudge-forward"/>
-	           <menuitem action="nudge-backward"/>
-        	   <menuitem action='split-region'/>
-	       	   <menuitem action='set-region-sync-position'/>
-                   <separator/>       
+	       <menu action="AlignMenu">
 		   <menuitem action='align-regions-start'/>
 		   <menuitem action='align-regions-start-relative'/>
 		   <menuitem action='align-regions-end'/>
 		   <menuitem action='align-regions-end-relative'/>
 		   <menuitem action='align-regions-sync'/>
 		   <menuitem action='align-regions-sync-relative'/>
-                   <separator/>       
-		   <menuitem action='set-fade-in-length'/>
-		   <menuitem action='toggle-fade-in-active'/>
-		   <menuitem action='set-fade-out-length'/>
-		   <menuitem action='toggle-fade-out-active'/>
-                   <separator/>       
+               </menu>
+	       <menu action="NudgeRegionMenu">
+	           <menuitem action="nudge-forward"/>
+	           <menuitem action="nudge-backward"/>
+               </menu>
+	       <menu action="TrimMenu">
 		   <menuitem action='trim-front'/>
 		   <menuitem action='trim-back'/>
+		   <menuitem action='crop'/>
 		   <menuitem action='trim-region-to-loop'/>
 		   <menuitem action='trim-region-to-punch'/>
-                   <separator/>       
-		   <menuitem action='pitch-shift-region'/>
-		   <menuitem action='set-tempo-from-region'/>
-		   <menuitem action='set-tempo-from-edit-range'/>
+	       </menu>
+	       <menu action="FadeMenu">
+		   <menuitem action='set-fade-in-length'/>
+		   <menuitem action='toggle-region-fade-in'/>
+		   <menuitem action='set-fade-out-length'/>
+		   <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'/>
+		   <menuitem action='deselect-all'/>
+		   <menuitem action='invert-selection'/>
+		   <menuitem action='select-all-after-edit-cursor'/>
+		   <menuitem action='select-all-before-edit-cursor'/>
+		   <menuitem action='select-all-between-cursors'/>
+		   <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"/>
+	        <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-small'/>
+		</menu>
+		<menu action='WaveformMenu'>
+		      <menuitem action='toggle-waveform-visible'/>
+		      <menuitem action='linear-waveforms'/>
+		      <menuitem action='logarithmic-waveforms'/>
+		</menu>
+		<menuitem action='toggle-track-active'/>	
 	</menu>
+
+	<menu action='RegionMenu'>
+	      <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='toggle-region-lock'/>
+	      <menuitem action='set-region-sync-position'/>
+	      <menuitem action='remove-region-sync'/>
+              <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='pitch-shift-region'/>
+	      <separator/>
+	      <menuitem action='toggle-selected-region-fades'/>
+	      <menuitem action='toggle-region-fades'/>
+        </menu>         
+
         <menu name='View' action = 'View'>
 	       <menuitem action='ToggleMaximalEditor'/>
+	       <menuitem action='show-editor-mixer'/>
+               <menuitem action='ToggleMeasureVisibility'/>
+	       <menuitem action='ToggleLogoVisibility'/>
+	       <menuitem action='toggle-region-fades-visible'/>
 	       <separator/>
-               <menu name='ZoomFocus' action='ZoomFocus'>
+	       <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"/>
+	       	     <menuitem action="toggle-bbt-ruler"/>
+		     <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"/>
+	       </menu>
+	       <menu action="ZoomMenu">
+               	     <menuitem action='temporal-zoom-in'/>
+               	     <menuitem action='temporal-zoom-out'/>
+               	     <menuitem action='zoom-to-session'/>
+               	     <menuitem action='zoom-to-region'/>
+               	     <menuitem action='toggle-zoom'/>
+	       </menu>
+	       <menu action="ScrollMenu">
+               	     <menuitem action='scroll-tracks-down'/>
+               	     <menuitem action='scroll-tracks-up'/>
+               	     <menuitem action='scroll-forward'/>
+               	     <menuitem action='scroll-backward'/>
+	       </menu>
+	       <separator/>
+        </menu>
+
+	<menu action="WindowMenu">
+	  
+	      <menuitem action='toggle-editor-mixer-on-top'/>
+	      <menuitem action='ToggleLocations'/>
+	      <menuitem action='ToggleKeyEditor'/>
+	      <menuitem action='ToggleThemeManager'/>
+	      <menuitem action='ToggleBigClock'/>
+	      <menuitem action='show-rhythm-ferret'/>
+	</menu>
+
+        <menu name='Options' action='Options'>
+               <menu action='Monitoring'>
+                   <menuitem action='UseSoftwareMonitoring'/>
+                   <menuitem action='UseExternalMonitoring'/>
+               </menu>
+	       <menu action="SyncMenu">
+	            <menuitem action='SendMMC'/>
+		    <menuitem action='UseMMC'/>
+                    <menuitem action='SendMTC'/>
+	      </menu>
+	       <menu action="TempoMenu">
+	       	      <menuitem action='set-tempo-from-region'/>
+		      <menuitem action='set-tempo-from-edit-range'/>
+	       </menu>
+	       <menu action="LatchMenu">
+                     <menuitem action='LatchedSolo'/>
+	       </menu>
+               <menu action='ZoomFocusMenu'>
                    <menuitem action='zoom-focus-playhead'/>
                    <menuitem action='zoom-focus-edit'/>
                    <menuitem action='zoom-focus-mouse'/>
                </menu>
-	       <menu name='SnapMode' action='SnapMode'>
+	       <menu action="EditPointMenu">
+	           <menuitem action='edit-at-playhead'/>
+	           <menuitem action='edit-at-mouse'/>
+	           <menuitem action='edit-at-selected-marker'/>
+	       </menu>
+	       <menu action='KeyMouseActions'>
+		   <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-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'/>
 		   <menuitem action='snap-off'/>
 		   <menuitem action='snap-normal'/>
 		   <menuitem action='snap-magnetic'/>
-		   <separator/>
 		   <menuitem action='cycle-snap-mode'/>
-	       </menu>
-               <menu name='SnapTo' action='SnapTo'>
-		   <menuitem action='snap-to-cd-frame'/>
-		   <menuitem action='snap-to-smpte-frame'/>
-		   <menuitem action='snap-to-smpte-seconds'/>
-		   <menuitem action='snap-to-smpte-minutes'/>
-		   <menuitem action='snap-to-seconds'/>
-		   <menuitem action='snap-to-minutes'/>
-		   <menuitem action='snap-to-thirtyseconds'/>
-		   <menuitem action='snap-to-asixteenthbeat'/>
-		   <menuitem action='snap-to-eighths'/>
-		   <menuitem action='snap-to-quarters'/>
-		   <menuitem action='snap-to-thirds'/>
-		   <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'/>
 		   <menuitem action='cycle-snap-choice'/>
                </menu>
-               <separator/>
-               <menuitem action='temporal-zoom-in'/>
-               <menuitem action='temporal-zoom-out'/>
-               <menuitem action='zoom-to-session'/>
-               <menuitem action='zoom-to-region'/>
-               <menuitem action='toggle-zoom'/>
-               <menuitem action='scroll-tracks-down'/>
-               <menuitem action='scroll-tracks-up'/>
-               <menuitem action='scroll-tracks-down'/>
-               <menuitem action='step-tracks-up'/>
-               <menuitem action='step-tracks-down'/>
-   	       <separator/>
-               <menuitem action='scroll-forward'/>
-               <menuitem action='scroll-backward'/>
-   	       <separator/>
-               <menuitem action='scroll-playhead-forward'/>
-               <menuitem action='scroll-playhead-backward'/>
-   	       <separator/>
-	       <menuitem action='show-editor-mixer'/>
-	       <menuitem action='SyncEditorAndMixerTrackOrder'/>
-               <menuitem action='ToggleMeasureVisibility'/>
-	       <menuitem action='ToggleLogoVisibility'/>
-	       <separator/>
-               <menuitem action='goto-editor'/>
-               <menuitem action='goto-mixer'/>
-               <menuitem action='ToggleLocations'/>
-               <menuitem action='ToggleKeyEditor'/>
-               <menuitem action='ToggleThemeManager'/>
-               <menuitem action='ToggleBigClock'/>
-               <menuitem action='toggle-rhythm-ferret'/>
-        </menu>
-        <menu name='Options' action='Options'>
-               <menu action='Monitoring'>
-                   <menuitem action='UseSoftwareMonitoring'/>
-                   <menuitem action='UseExternalMonitoring'/>
-               </menu>
-               <menuitem action='LatchedSolo'/>
-               <menuitem action='link-region-and-track-selection'/>
-         </menu>
+               <menuitem action='toggle-follow-playhead'/>
+	  </menu>
+
      </menubar>
 
-     <popup name='redirectmenu'>
+     <popup action="RulerMenuPopup">
+     	  <menuitem action="toggle-minsec-ruler"/>
+	  <menuitem action="toggle-samples-ruler"/>
+          <menuitem action="toggle-bbt-ruler"/>
+	  <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='ProcessorMenu'>
+	 <menuitem action='delete'/>
+	  <separator/>
 	 <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/>