X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fardour.menus.in;h=ef3201e05f5c98f130e79fa57fe7b1b32b9ce616;hb=40e2a6b16b47acf1f19a31f5e6d1cd463c45e1b6;hp=f17f8e2bd0fb9ec3fa5e2952546a4b91f9b8b569;hpb=2c231282baa596219506c1ee4632708977cc0714;p=ardour.git

diff --git a/gtk2_ardour/ardour.menus.in b/gtk2_ardour/ardour.menus.in
index f17f8e2bd0..ef3201e05f 100644
--- a/gtk2_ardour/ardour.menus.in
+++ b/gtk2_ardour/ardour.menus.in
@@ -1,5 +1,13 @@
 <ui>
 
+    <accelerator action='set-mouse-mode-object'/>
+    <accelerator action='set-mouse-mode-range'/>
+    <accelerator action='set-mouse-mode-gain'/>
+    <accelerator action='set-mouse-mode-zoom'/>
+    <accelerator action='set-mouse-mode-timefx'/>
+    <accelerator action='set-mouse-mode-object-range'/>
+    <accelerator action='toggle-internal-edit'/>
+
     <menubar name='Main' action='MainMenu'>
         <menu name='Session' action='Session'>
            <menuitem action='New'/>
@@ -8,6 +16,7 @@
            <menuitem action='Close'/>
            <separator/>
            <menuitem action='Save'/>
+           <menuitem action='SaveAs'/>
            <menuitem action='Snapshot'/>
            <menuitem action='SaveTemplate'/>
            <menu name='Metadata' action='Metadata'>
@@ -18,21 +27,24 @@
            <menuitem action='AddTrackBus'/>	
            <separator/>
            <menuitem action='addExistingAudioFiles'/>
-           <menuitem action='importFromSession'/>
-           <separator/>
+           <!--menuitem action='importFromSession'/-->
            <menu name='Export' action='Export'>
                <menuitem action='ExportAudio'/>
+               <menuitem action='StemExport'/>
            </menu>
-           <separator/>
            <menu name='Cleanup' action='Cleanup'>
                <menuitem action='CleanupUnused'/>
                <menuitem action='FlushWastebasket'/>
            </menu>
+#ifndef GTKOSX
            <separator/>
+#endif
+           <menuitem action='ToggleSessionOptionsEditor'/>
 #ifdef GTKOSX
-           <menuitem action='ToggleOptionsEditor'/>
+           <menuitem action='ToggleRCOptionsEditor'/>
            <menuitem action='About'/>
 #endif
+           <separator/>
            <menuitem action='Quit'/>
         </menu>
 
@@ -41,11 +53,13 @@
 	       <menu action="PlayMenu">
 	       	     <menuitem action='play-selected-regions'/>
 		     <menuitem action='play-edit-range'/>
+		     <menuitem action='PlaySelection'/>
                      <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'/>
 	       <menu action="SetLoopMenu">
 	       	       <menuitem action='set-loop-from-edit-range'/>
@@ -128,6 +142,7 @@
                <menuitem action='ToggleAutoReturn'/>
                <menuitem action='ToggleClick'/>
                <menuitem action='toggle-follow-playhead'/>
+               <menuitem action='panic'/>
 	       <separator/>
        </menu>
 
@@ -155,17 +170,21 @@
                    <menuitem action='start-range'/>
                    <menuitem action='finish-range'/>
                    <menuitem action='finish-add-range'/>
+		   <separator/>
+                   <menuitem action='select-next-route'/>
+                   <menuitem action='select-prev-route'/>
 	       </menu>	   
 	       <separator/>
                <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'/>
@@ -175,85 +194,108 @@
 		   <menuitem action='align-regions-sync'/>
 		   <menuitem action='align-regions-sync-relative'/>
                </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'/>
-		   <menuitem action='trim-to-previous-region'/>
-		   <menuitem action='trim-to-next-region'/>
-	       </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'/>
                </menu>
                <separator/>       
 	       <menuitem action='remove-last-capture'/>
 	       <separator/>
-	       <menu action='KeyMouseActions'>
-                   <menuitem action='select-next-route'/>
-                   <menuitem action='select-prev-route'/>
-		   <menuitem action='brush-at-mouse'/>
-		   <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'/>
-		   <separator/>
-		   <menuitem action='boost-region-gain'/>
-		   <menuitem action='cut-region-gain'/>
-		   <separator/>
-		   <menuitem action='break-drag'/>
-             </menu>
+	       <menu action="EditPointMenu">
+	           <menuitem action='cycle-edit-point'/>
+	           <menuitem action='cycle-edit-point-with-marker'/>
+	       </menu>
+	       <menuitem action='toggle-edit-mode'/>
+	       <separator/>
+	       <menu action="TempoMenu">
+	       	      <menuitem action='set-tempo-from-region'/>
+		      <menuitem action='set-tempo-from-edit-range'/>
+	       </menu>
 #ifndef GTKOSX
 	     <separator/>
-             <menuitem action='ToggleOptionsEditor'/>
+             <menuitem action='ToggleRCOptionsEditor'/>
 #endif
         </menu>         
 
-	<menu action='RegionMenu'>
-	      <menuitem action='insert-region'/>
+	<menu name='RegionMenu' action='RegionMenu'>
+	      <menuitem action='insert-region-from-region-list'/>
 	      <menuitem action='rename-region'/>
-	      <menuitem action='raise-region'/>
-	      <menuitem action='lower-region'/>
-	      <menuitem action='naturalize-region'/>
-	      <menuitem action='lock-region'/>
+	      <menuitem action='show-region-properties'/>
 	      <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='normalize-region'/>
-	      <menuitem action='boost-region-gain'/>
-	      <menuitem action='cut-region-gain'/>      		   
-	      <menuitem action='pitch-shift-region'/>
+	      <menuitem action='play-selected-regions'/>
+	      <menuitem action='export-region'/>
+	      <menuitem action='bounce-region'/>
+	      <menuitem action='analyze-region'/>
+	      <menuitem action='toggle-region-lock'/>
+	      <menuitem action='toggle-region-lock-style'/>
 	      <menuitem action='toggle-opaque-region'/>
-	      <menuitem action='toggle-selected-region-fade-in'/>
-	      <menuitem action='toggle-selected-region-fade-out'/>
-	      <menuitem action='toggle-selected-region-fades'/>
-	      <separator/>
-	      <menuitem action='duplicate-region'/>
-	      <menuitem action='multi-duplicate-region'/>
-	      <menuitem action='region-fill-track'/>
-	      <separator/>
+              <menuitem action='toggle-region-mute'/>
+	      <menuitem action='pitch-shift-region'/>
+	      <menuitem action='naturalize-region'/>
+	      <menuitem action='split-region'/>
+	      <menuitem action='split-multichannel-region'/>
+	      <menuitem action='remove-region'/>
 	      <menuitem action='loop-region'/>
-	      <menuitem action='set-punch-from-region'/>
-	      <menuitem action='add-range-marker-from-region'/>
-	      <menuitem action='add-range-markers-from-region'/>
+	      <menuitem action='snap-regions-to-grid'/>
+	      <menuitem action='close-region-gaps'/>
+	      <menuitem action='place-transient' />
+	      <menuitem action='show-rhythm-ferret'/>
+	      <menuitem action='strip-region-silence'/>
+              <menuitem action='reverse-region'/>    
+	      <menu action='RegionMenuLayering'>
+	      	      <menuitem action='raise-region-to-top'/>
+	      	      <menuitem action='raise-region'/>
+		      <menuitem action='lower-region'/>
+		      <menuitem action='lower-region-to-bottom'/>
+              </menu>
+	      <menu action='RegionMenuMIDI'>
+	              <menuitem action='insert-patch-change'/>
+	              <menuitem action='quantize-region'/>
+	              <menuitem action='fork-region'/>
+		      <menuitem action='show-region-list-editor'/>
+              </menu>
+	      <menu action='RegionMenuGain'>
+	      	      <menuitem action='boost-region-gain'/>
+	              <menuitem action='cut-region-gain'/>      		   
+	      	      <menuitem action='reset-region-gain-envelopes'/>
+	      	      <menuitem action='toggle-region-gain-envelope-visible'/>
+		      <menuitem action='toggle-region-gain-envelope-active'/>
+	      	      <menuitem action='normalize-region'/>
+              </menu>
+	      <menu action='RegionMenuNudge'>
+	      	      <menuitem action='nudge-forward'/>
+	      	      <menuitem action='nudge-backward'/>
+	      	      <menuitem action='nudge-forward-by-capture-offset'/>
+	      	      <menuitem action='nudge-backward-by-capture-offset'/>
+	      </menu>
+	      <menu action='RegionMenuTrim'>
+	      	      <menuitem action='trim-front'/>
+	      	      <menuitem action='trim-back'/>
+	      	      <menuitem action='trim-region-to-loop'/>
+	      	      <menuitem action='trim-region-to-punch'/>
+		      <menuitem action='trim-to-previous-region'/>
+		      <menuitem action='trim-to-next-region'/>
+	      </menu>
+	      <menu action='RegionMenuRanges'>
+	              <menuitem action='set-loop-from-region'/>
+	              <menuitem action='set-punch-from-region'/>
+	              <menuitem action='add-range-marker-from-region'/>
+	              <menuitem action='add-range-markers-from-region'/>
+	              <menuitem action='set-selection-from-region'/>
+              </menu>
+	      <menu action='RegionMenuFades'>
+	              <menuitem action='toggle-region-fade-in'/>
+	              <menuitem action='toggle-region-fade-out'/>
+	              <menuitem action='toggle-region-fades'/>
+              </menu>
+	      <menu action='RegionMenuDuplicate'>
+	      	      <menuitem action='duplicate-region'/>
+	      	      <menuitem action='multi-duplicate-region'/>
+	      	      <menuitem action='region-fill-track'/>
+              </menu>
 	</menu>
 
         <menu action='TrackMenu'>
@@ -264,22 +306,38 @@
 	        <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'/>
 		</menu>
-		<menu action='WaveformMenu'>
-		      <menuitem action='toggle-waveform-visible'/>
-		      <menuitem action='linear-waveforms'/>
-		      <menuitem action='logarithmic-waveforms'/>
-		</menu>
+                <menuitem action='track-record-enable-toggle'/>
 		<menuitem action='toggle-track-active'/>	
 		<menuitem action='remove-track'/>	
 	</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'/>
@@ -287,14 +345,16 @@
                	     <menuitem action='zoom-to-region'/>
                	     <menuitem action='zoom-to-region-both-axes'/>
                	     <menuitem action='toggle-zoom'/>
+		     <menuitem action='expand-tracks'/>
+		     <menuitem action='shrink-tracks'/>
 	       </menu>
                <menu name='ZoomFocus' action='ZoomFocus'>
                    <menuitem action='zoom-focus-left'/>
                    <menuitem action='zoom-focus-right'/>
                    <menuitem action='zoom-focus-center'/>
                    <menuitem action='zoom-focus-playhead'/>
-                   <menuitem action='zoom-focus-edit'/>
                    <menuitem action='zoom-focus-mouse'/>
+                   <menuitem action='zoom-focus-edit'/>
                </menu>
 	       <menu name='SnapMode' action='SnapMode'>
 		   <menuitem action='snap-off'/>
@@ -306,16 +366,26 @@
 	       </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-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-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'/>
@@ -324,33 +394,7 @@
 		   <menuitem action='snap-to-region-sync'/>
 		   <menuitem action='snap-to-region-boundary'/>
                </menu>
-               <menu name='MeterFalloff' action='MeterFalloff'>
-                    <menuitem action='MeterFalloffOff'/>
-                    <menuitem action='MeterFalloffSlowest'/>
-                    <menuitem action='MeterFalloffSlow'/>
-                    <menuitem action='MeterFalloffMedium'/>
-                    <menuitem action='MeterFalloffFast'/>
-                    <menuitem action='MeterFalloffFaster'/>
-                    <menuitem action='MeterFalloffFastest'/>
-               </menu>
-               <menu name='MeterHold' action='MeterHold'>
-                   <menuitem action='MeterHoldOff'/>
-                   <menuitem action='MeterHoldShort'/>
-                   <menuitem action='MeterHoldMedium'/>
-                   <menuitem action='MeterHoldLong'/>
-               </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"/>
@@ -395,14 +439,14 @@
                	     <menuitem action='goto-visual-state-12'/>
 	       </menu>
 
-	       <menuitem action='ToggleMaximalEditor'/>
+		<separator/>
+
 	       <menuitem action='show-editor-mixer'/>
 	       <menuitem action='show-editor-list'/>
                <menuitem action='ToggleMeasureVisibility'/>
-               <menuitem action='toggle-waveform-visible'/>
-               <menuitem action='ToggleWaveformsWhileRecording'/>
-	       <menuitem action='SyncEditorAndMixerTrackOrder'/>
-	       <menuitem action='toggle-region-fades-visible'/>
+               <menuitem action='ToggleSummary'/>
+               <menuitem action='ToggleGroupTabs'/>
+	       <menuitem action='show-marker-lines'/>
         </menu>
         <menu name='JACK' action='JACK'>
                <menuitem action='JACKDisconnect'/>
@@ -420,171 +464,34 @@
                </menu>
         </menu>
         <menu action = 'WindowMenu'>
-	       <menuitem action='ToggleMaximalEditor'/>
+               <menuitem action='toggle-mixer'/>
+               <menuitem action='toggle-mixer-on-top'/>
+
 	       <separator/>
-               <menuitem action='goto-editor'/>
-               <menuitem action='goto-mixer'/>
-               <menuitem action='toggle-editor-mixer-on-top'/>
+
                <menuitem action='ToggleInspector'/>
                <menuitem action='ToggleLocations'/>
                <menuitem action='ToggleKeyEditor'/>
                <menuitem action='ToggleBundleManager'/>
                <menuitem action='ToggleThemeManager'/>
                <menuitem action='ToggleBigClock'/>
-               <menuitem action='toggle-rhythm-ferret'/>
-               <menuitem action='toggle-bundle-manager'/>
+               <menuitem action='toggle-speaker-config'/>
+
+	       <separator/>
+
+               <menuitem action='NewMIDITracer'/>
                <menuitem action='toggle-audio-connection-manager'/>
                <menuitem action='toggle-midi-connection-manager'/>
+               <menuitem action='toggle-log-window'/>
    	       <separator/>
         </menu>
-        <menu name='Options' action='Options'>
-	       <menu action='AudioFileFormat'>
-                   <menu action='AudioFileFormatData'>
-		        <menuitem action='FileDataFormatFloat'/>
-		        <menuitem action='FileDataFormat24bit'/>
-		        <menuitem action='FileDataFormat16bit'/>
-		   </menu>
-                   <menu action='AudioFileFormatHeader'>
-		        <menuitem action='FileHeaderFormatBWF'/>
-		        <menuitem action='FileHeaderFormatWAVE'/>
-		        <menuitem action='FileHeaderFormatWAVE64'/>
-		        <menuitem action='FileHeaderFormatCAF'/>
-		   </menu>
-               </menu>
-	       <menu action='SyncMenu'>
-               	     <menuitem action='SendMTC'/>
-               	     <menuitem action='SendMMC'/>
-               	     <menuitem action='UseMMC'/>
-               	     <menuitem action='SendMidiClock'/>
-	       </menu>
-	       <menu action="TempoMenu">
-	       	      <menuitem action='set-tempo-from-region'/>
-		      <menuitem action='set-tempo-from-edit-range'/>
-	       </menu>
-	       <menu action='Timecode'>
-		   <menuitem action='Smpte23976'/>
-		   <menuitem action='Smpte24'/>
-		   <menuitem action='Smpte24976'/>
-		   <menuitem action='Smpte25'/>
-		   <menuitem action='Smpte2997'/>
-		   <menuitem action='Smpte2997drop'/>
-		   <menuitem action='Smpte30'/>
-		   <menuitem action='Smpte30drop'/>
-		   <menuitem action='Smpte5994'/>
-		   <menuitem action='Smpte60'/>
-               </menu>
-	       <menu action='Pullup'>
-		   <menuitem action='PullupPlus4Plus1'/>
-		   <menuitem action='PullupPlus4'/>
-		   <menuitem action='PullupPlus4Minus1'/>
-		   <menuitem action='PullupPlus1'/>
-		   <menuitem action='PullupNone'/>
-		   <menuitem action='PullupMinus1'/>
-		   <menuitem action='PullupMinus4Plus1'/>
-		   <menuitem action='PullupMinus4'/>
-		   <menuitem action='PullupMinus4Minus1'/>
-               </menu>
-	       <menu action='Subframes'>
-		   <menuitem action='Subframes80'/>
-		   <menuitem action='Subframes100'/>
-               </menu>
-               <separator/>
-               <menu action='Autoconnect'>
-                   <menuitem action='InputAutoConnectPhysical'/>
-                   <menuitem action='InputAutoConnectManual'/>
-    	           <separator/>
-                   <menuitem action='OutputAutoConnectPhysical'/>
-                   <menuitem action='OutputAutoConnectMaster'/>
-                   <menuitem action='OutputAutoConnectManual'/>
-               </menu>
-	       <menu action='ControlSurfaces'>
-                   <menuitem action='RemoteUserDefined'/>
-                   <menuitem action='RemoteMixerDefined'/>
-                   <menuitem action='RemoteEditorDefined'/>
-    	           <separator/>
-                   <menuitem action='AutoRebinding'/>
-               </menu>
-               <menu action='Monitoring'>
-                   <menuitem action='UseExternalMonitoring'/>
-                   <menuitem action='UseSoftwareMonitoring'/>
-                   <menuitem action='UseHardwareMonitoring'/>
-    	           <separator/>
-               	   <menuitem action='ToggleTapeMachineMode'/>
-               </menu>
-	       <menu action='Metering'>
-			<menuitem action='ShowTrackMeters'/>
-                   <menu action='MeteringFallOffRate'>
-		        <menuitem action='MeterFalloffOff'/>
-   		        <menuitem action='MeterFalloffSlowest'/>
-			<menuitem action='MeterFalloffSlow'/>
-	                <menuitem action='MeterFalloffMedium'/>
-	                <menuitem action='MeterFalloffFast'/>
-	                <menuitem action='MeterFalloffFaster'/>
-	                <menuitem action='MeterFalloffFastest'/>
-                   </menu>
-                   <menu action='MeteringHoldTime'>
-	                <menuitem action='MeterHoldOff'/>
-	                <menuitem action='MeterHoldShort'/>
-	                <menuitem action='MeterHoldMedium'/>
-	                <menuitem action='MeterHoldLong'/>
-                   </menu>
-               </menu>
-               <menu action='Solo'>
-                   <menuitem action='LatchedSolo'/>
-                   <menuitem action='SoloInPlace'/>
-                   <menuitem action='SoloViaBus'/>
-                   <menuitem action='ShowSoloMutes'/>
-                   <menuitem action='SoloMuteOverride'/>
-               </menu>
-	       <menu action='Crossfades'>
-		   <menuitem action='toggle-xfades-active'/>
-		   <menuitem action='toggle-xfades-visible'/>
-		   <menuitem action='toggle-auto-xfades'/>
-		   <separator/>
-		   <menuitem action='CrossfadesFull'/>
-		   <menuitem action='CrossfadesShort'/>
-	       </menu>
-	       <menu action='Layering'>
-		     <menuitem action='LayerLaterHigher'/>
-		     <menuitem action='LayerMoveAddHigher'/>
-		     <menuitem action='LayerAddHigher'/>
-	       </menu>
-	       <menu name='Denormals' action='Denormals'>
-                      <menuitem action='DenormalProtection'/>
-		      <separator/>
-                      <menuitem action='DenormalNone'/>
-                      <menuitem action='DenormalFTZ'/>
-                      <menuitem action='DenormalDAZ'/>
-	              <menuitem action='DenormalFTZDAZ'/>
-               </menu>
-               <separator/>
-	       <menu action='MiscOptions'>
-               	     <menuitem action='StopPluginsWithTransport'/>
-               	     <menuitem action='NewPluginsActive'/>
-               	     <menuitem action='DoNotRunPluginsWhileRecording'/>
-               	     <menuitem action='LatchedRecordEnable'/>
-               	     <menuitem action='RegionEquivalentsOverlap'/>
-               	     <menuitem action='PeriodicSafetyBackups'/>
-               	     <menuitem action='VerifyRemoveLastCapture'/>
-               	     <menuitem action='StopRecordingOnXrun'/>
-		     <menuitem action='CreateXrunMarker'/>
-		     <menuitem action='StopTransportAtEndOfSession'/>
-		     <menuitem action='GainReduceFastTransport'/>
-	       	     <menuitem action='PrimaryClockDeltaEditCursor'/>
-	       	     <menuitem action='SecondaryClockDeltaEditCursor'/>
-	       	     <menuitem action='OnlyCopyImportedFiles'/>
-	       	     <menuitem action='ShowTrackMeters'/>
-	       	     <menuitem action='DefaultNarrowMS'/>
-               	     <menuitem action='link-region-and-track-selection'/>
-	             <menuitem action='NameNewMarkers'/>
-               	     <menuitem action='RubberbandingSnapsToGrid'/>
-               	     <menuitem action='AutoAnalyseAudio'/>
-               	     <menuitem action='toggle-region-fades'/>
-                     <menuitem action='automation-follows-regions'/>
-		</menu>
-         </menu>
 	 <menu name='Help' action='Help'>
+#ifndef GTKOSX
 	     <menuitem action='About'/>
+#endif
+             <menuitem action='Chat'/>
+	     <menuitem action='Manual'/>
+	     <menuitem action='Reference'/>
 	</menu>
      </menubar>
 
@@ -603,13 +510,15 @@
 	   <menuitem action="toggle-loop-punch-ruler"/>
      </popup>
 
-     <popup name='processormenu'>
+     <popup name='ProcessorMenu'>
 	 <menuitem action='newplugin'/>
 	 <menuitem action='newinsert'/>
 	 <menuitem action='newsend'/>
-	 <menuitem action='newreturn'/>
+         <menuitem action='newaux'/>
 	  <separator/>
 	 <menuitem action='clear'/>
+	 <menuitem action='clear_pre'/>
+	 <menuitem action='clear_post'/>
 	  <separator/>
 	 <menuitem action='cut'/>
 	 <menuitem action='copy'/>
@@ -621,11 +530,9 @@
 	 <menuitem action='selectall'/>
 	 <menuitem action='deselectall'/>
 	  <separator/>
-	 <menuitem action='activate'/>
-	 <menuitem action='deactivate'/>
-	  <separator/>
 	 <menuitem action='activate_all'/>
 	 <menuitem action='deactivate_all'/>
+	 <menuitem action='ab_plugins'/>
 	  <separator/>
 	 <menuitem action='edit'/>
       </popup>
@@ -638,8 +545,8 @@
      <popup name='RegionListMenu'>
          <menuitem action='rlAudition'/>
          <menuitem action='rlHide'/>
-         <menuitem action='rlRemove'/>
-	  <separator/>
+         <menuitem action='rlShow'/>
+	 <separator/>
          <menuitem action='rlShowAll'/>
          <menuitem action='rlShowAuto'/>
          <menu name='Sort' action='RegionListSort'>
@@ -658,29 +565,88 @@
                <menuitem action='SortBySourceFilesystem'/>
          </menu>
          <separator/>
-         <menuitem action='addExternalAudioToRegionList'/>	       
-     </popup>
-     <popup name='processormenu'>
-         <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'/>
+         <menuitem action='addExternalAudioToRegionList'/>
          <separator/>
-         <menuitem action='rename'/>
-         <separator/>
-         <menuitem action='selectall'/>
-         <menuitem action='deselectall'/>
-         <separator/>
-         <menuitem action='activate_all'/>
-         <menuitem action='deactivate_all'/>
-         <separator/>
-         <menuitem action='edit'/>
+         <menuitem action='removeUnusedRegions'/>    
      </popup>
+
+	<popup name='PopupRegionMenu' action='PopupRegionMenu'>
+	      <menuitem action='rename-region'/>
+	      <menuitem action='show-region-properties'/>
+	      <menuitem action='set-region-sync-position'/>
+	      <menuitem action='remove-region-sync'/>
+	      <menuitem action='play-selected-regions'/>
+	      <menuitem action='export-region'/>
+	      <menuitem action='bounce-region'/>
+	      <menuitem action='analyze-region'/>
+	      <menuitem action='toggle-region-lock'/>
+	      <menuitem action='toggle-region-lock-style'/>
+	      <menuitem action='toggle-opaque-region'/>
+              <menuitem action='toggle-region-mute'/>
+	      <menuitem action='pitch-shift-region'/>
+	      <menuitem action='naturalize-region'/>
+	      <menuitem action='split-region'/>
+	      <menuitem action='split-multichannel-region'/>
+	      <menuitem action='remove-region'/>
+	      <menuitem action='loop-region'/>
+	      <menuitem action='snap-regions-to-grid'/>
+	      <menuitem action='close-region-gaps'/>
+	      <menuitem action='place-transient' />
+	      <menuitem action='show-rhythm-ferret'/>
+	      <menuitem action='strip-region-silence'/>
+              <menuitem action='reverse-region'/>    
+	      <menu action='RegionMenuLayering'>
+	      	      <menuitem action='raise-region-to-top'/>
+	      	      <menuitem action='raise-region'/>
+		      <menuitem action='lower-region'/>
+		      <menuitem action='lower-region-to-bottom'/>
+              </menu>
+	      <menu action='RegionMenuMIDI'>
+	              <menuitem action='insert-patch-change'/>
+	              <menuitem action='quantize-region'/>
+	              <menuitem action='fork-region'/>
+		      <menuitem action='show-region-list-editor'/>
+              </menu>
+	      <menu action='RegionMenuGain'>
+	      	      <menuitem action='boost-region-gain'/>
+	              <menuitem action='cut-region-gain'/>      		   
+	      	      <menuitem action='reset-region-gain-envelopes'/>
+	      	      <menuitem action='toggle-region-gain-envelope-visible'/>
+		      <menuitem action='toggle-region-gain-envelope-active'/>
+	      	      <menuitem action='normalize-region'/>
+              </menu>
+	      <menu action='RegionMenuNudge'>
+	      	      <menuitem action='nudge-forward'/>
+	      	      <menuitem action='nudge-backward'/>
+	      	      <menuitem action='nudge-forward-by-capture-offset'/>
+	      	      <menuitem action='nudge-backward-by-capture-offset'/>
+	      </menu>
+	      <menu action='RegionMenuTrim'>
+	      	      <menuitem action='trim-front'/>
+	      	      <menuitem action='trim-back'/>
+	      	      <menuitem action='trim-region-to-loop'/>
+	      	      <menuitem action='trim-region-to-punch'/>
+		      <menuitem action='trim-to-previous-region'/>
+		      <menuitem action='trim-to-next-region'/>
+	      </menu>
+	      <menu action='RegionMenuRanges'>
+	              <menuitem action='set-loop-from-region'/>
+	              <menuitem action='set-punch-from-region'/>
+	              <menuitem action='add-range-marker-from-region'/>
+	              <menuitem action='add-range-markers-from-region'/>
+	              <menuitem action='set-selection-from-region'/>
+              </menu>
+	      <menu action='RegionMenuFades'>
+	              <menuitem action='toggle-region-fade-in'/>
+	              <menuitem action='toggle-region-fade-out'/>
+	              <menuitem action='toggle-region-fades'/>
+              </menu>
+	      <menu action='RegionMenuDuplicate'>
+	      	      <menuitem action='duplicate-region'/>
+	      	      <menuitem action='multi-duplicate-region'/>
+	      	      <menuitem action='region-fill-track'/>
+              </menu>
+	      
+	</popup>
+
 </ui>