X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fardour.menus;h=e7463553d2fadb399c6768ed8c8f19ddd36e274f;hb=fc26b49ac5e177857a155a567ff9f966f330e261;hp=4874eddc2ad451f3e56c1748c1122621139f156a;hpb=cd87dceb0fda44d7c8fcc2b7844f65def25edb23;p=ardour.git

diff --git a/gtk2_ardour/ardour.menus b/gtk2_ardour/ardour.menus
index 4874eddc2a..e7463553d2 100644
--- a/gtk2_ardour/ardour.menus
+++ b/gtk2_ardour/ardour.menus
@@ -11,11 +11,20 @@
            <menuitem action='Snapshot'/>
            <menuitem action='SaveTemplate'/>
            <separator/>
-           <menuitem action='AddTrackBus'/>
+           <menuitem action='AddTrackBus'/>	
+           <separator/>
+           <menu action='addExistingAudioFiles'>
+	       <menuitem action='addExternalAudioAsRegion'/>	       
+	       <menuitem action='addExternalAudioToTrack'/>	       
+               <separator/>
+	       <menuitem action='addExternalAudioAsTrack'/>	       
+	       <menuitem action='addExternalAudioAsTapeTrack'/>	       
+           </menu>
            <separator/>
            <menu name='Export' action='Export'>
                <menuitem action='ExportSession'/>
-               <menuitem action='ExportRange'/>
+               <menuitem action='ExportSelection'/>
+               <menuitem action='ExportRangeMarkers'/>
            </menu>
            <separator/>
            <menu name='Cleanup' action='Cleanup'>
@@ -32,8 +41,14 @@
                <menuitem action='PlaySelection'/>
                <menuitem action='Forward'/>
                <menuitem action='Rewind'/>
+               <menuitem action='GotoZero'/>
                <menuitem action='GotoStart'/>
                <menuitem action='GotoEnd'/>
+	       <separator/>
+               <menuitem action='Record'/>
+               <separator/> 
+               <menuitem action='TransitionToRoll'/>
+               <menuitem action='TransitionToReverse'/>
                <separator/> 
                <menuitem action='jump-forward-to-mark'/>
                <menuitem action='jump-backward-to-mark'/>
@@ -50,11 +65,6 @@
                <separator/>       
                <menuitem action='playhead-to-range-start'/>
                <menuitem action='playhead-to-range-end'/>
-               <separator/> 
-               <menuitem action='set-playhead'/>
-               <menuitem action='audition-at-mouse'/>
-               <menuitem action='brush-at-mouse'/>
-               <separator/> 
                <menu action='TransportOptions'>
                     <menuitem action='ToggleTimeMaster'/>
                     <menuitem action='TogglePunchIn'/>
@@ -63,41 +73,74 @@
                     <menuitem action='ToggleAutoPlay'/>
                     <menuitem action='ToggleAutoReturn'/>
                     <menuitem action='ToggleClick'/>
-                    <menuitem action='ToggleFollowPlayhead'/>
+                    <menuitem action='toggle-follow-playhead'/>
+                    <menuitem action='ToggleVideoSync'/>
                </menu>
        </menu>
        <menu name='Edit' action='Edit'>
                <menuitem action='undo'/>
                <menuitem action='redo'/>
                <menuitem action='editor-cut'/>
+               <menuitem action='editor-delete'/>
                <menuitem action='editor-copy'/>
                <menuitem action='editor-paste'/>
-               <separator/>
-               <menuitem action='extend-range-to-start-of-region'/>
-               <menuitem action='extend-range-to-end-of-region'/>
-               <separator/>       
-               <menuitem action='edit-cursor-to-next-region-start'/>
-               <menuitem action='edit-cursor-to-next-region-end'/>
-               <menuitem action='edit-cursor-to-previous-region-start'/>
-               <menuitem action='edit-cursor-to-previous-region-end'/>
-               <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'/>
-               <menuitem action='set-edit-cursor'/>
+	       <menuitem action='remove-last-capture'/>
                <separator/>       
-               <menuitem action='edit-cursor-to-range-start'/>
-               <menuitem action='edit-cursor-to-range-end'/>
-               <separator/>
-               <menuitem action='crop'/>
-               <menuitem action='duplicate-region'/>
-               <menuitem action='insert-region'/>
-               <menuitem action='normalize-region'/>
-	       <separator/>
-	       <menuitem action="nudge-forward"/>
-	       <menuitem action="nudge-next-forward"/>
-	       <menuitem action="nudge-backward"/>
-	       <menuitem action="nudge-next-backward"/>
+               <menu action="EditSelectRangeOptions">
+                   <menuitem action='extend-range-to-start-of-region'/>
+                   <menuitem action='extend-range-to-end-of-region'/>
+                   <menuitem action='start-range'/>
+                   <menuitem action='finish-range'/>
+                   <menuitem action='finish-add-range'/>
+               </menu>
+               <menu action="EditSelectRegionOptions">
+                   <menuitem action='select-all'/>
+                   <menuitem action='select-all-after-edit-cursor'/>
+                   <menuitem action='select-all-before-edit-cursor'/>
+                   <menuitem action='select-all-after-playhead'/>
+                   <menuitem action='select-all-before-playhead'/>
+                   <menuitem action='select-all-between-cursors'/>
+                   <menuitem action='select-all-in-punch-range'/>
+                   <menuitem action='select-all-in-loop-range'/>
+               </menu>
+	       <menu action='EditCursorMovementOptions'>
+                   <menuitem action='edit-cursor-to-next-region-start'/>
+    	           <menuitem action='edit-cursor-to-next-region-end'/>
+       	           <menuitem action='edit-cursor-to-previous-region-start'/>
+            	   <menuitem action='edit-cursor-to-previous-region-end'/>
+	           <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'/>
+    	           <menuitem action='edit-cursor-to-range-start'/>
+	           <menuitem action='edit-cursor-to-range-end'/>
+	       </menu>
+	       <menu action='RegionEditOps'>
+                   <menuitem action='crop'/>
+                   <menuitem action='duplicate-region'/>
+                   <menuitem action='insert-region'/>
+               	   <menuitem action='normalize-region'/>
+                   <separator/>       
+	           <menuitem action="nudge-forward"/>
+         	   <menuitem action="nudge-next-forward"/>
+	           <menuitem action="nudge-backward"/>
+        	   <menuitem action="nudge-next-backward"/>
+	       </menu>
+	       <menu name='KeyMouse Actions' action='KeyMouse Actions'>
+	       		<menuitem action='audition-at-mouse'/>
+               		<menuitem action='brush-at-mouse'/>
+               		<menuitem action='set-edit-cursor'/>
+               		<menuitem action='mute-unmute-region'/>
+              	 	<menuitem action='set-playhead'/>
+	       		<menuitem action='split-region'/>
+	       		<menuitem action='set-region-sync-position'/>
+			<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'/>
+          </menu>
         </menu>         
         <menu name='View' action = 'View'>
                <menu name='ZoomFocus' action='ZoomFocus'>
@@ -107,9 +150,31 @@
                    <menuitem action='zoom-focus-playhead'/>
                    <menuitem action='zoom-focus-edit'/>
                </menu>
+	       <menu name='SnapMode' action='SnapMode'>
+		   <menuitem action='snap-normal'/>
+		   <menuitem action='snap-magnetic'/>
+	       </menu>
                <menu name='SnapTo' action='SnapTo'>
-                   <menuitem action='snap-to-beat'/>
-                   <menuitem action='snap-to-bar'/>
+		   <menuitem action='snap-to-frame'/>
+		   <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-edit-cursor'/>
+		   <menuitem action='snap-to-region-start'/>
+		   <menuitem action='snap-to-region-end'/>
+		   <menuitem action='snap-to-region-sync'/>
+		   <menuitem action='snap-to-region-boundary'/>
                </menu>
                <menu name='MeterFalloff' action='MeterFalloff'>
                     <menuitem action='MeterFalloffOff'/>
@@ -138,9 +203,17 @@
                <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='ToggleWaveformVisibility'/>
                <menuitem action='ToggleWaveformsWhileRecording'/>
                <menuitem action='ToggleMeasureVisibility'/>
+	       <separator/>
+	       <menuitem action='show-editor-mixer'/>
          </menu>
         <menu name='JACK' action='JACK'>
                <menuitem action='JACKDisconnect'/>
@@ -158,52 +231,132 @@
                </menu>
         </menu>
         <menu name='Windows' action = 'Windows'>
-               <menuitem action='GotoEditor'/>
-               <menuitem action='GotoMixer'/>
+	       <menuitem action='ToggleMaximalEditor'/>
+	       <separator/>
+               <menuitem action='goto-editor'/>
+               <menuitem action='goto-mixer'/>
                <menuitem action='ToggleOptionsEditor'/>
-               <menuitem action='ToggleSoundFileBrowser'/>
-               <menuitem action='ToggleConnections'/>
+               <menuitem action='ToggleInspector'/>
                <menuitem action='ToggleLocations'/>
+               <menuitem action='ToggleColorManager'/>
                <menuitem action='ToggleBigClock'/>
-			    <separator/>
-			   <menuitem action='About'/>
+   	       <separator/>
         </menu>
         <menu name='Options' action='Options'>
+	       <menu action='AudioFileFormat'>
+                   <menu action='AudioFileFormatData'>
+		        <menuitem action='FileDataFormatFloat'/>
+		        <menuitem action='FileDataFormat24bit'/>
+		   </menu>
+                   <menu action='AudioFileFormatHeader'>
+		        <menuitem action='FileHeaderFormatBWF'/>
+		        <menuitem action='FileHeaderFormatWAVE'/>
+		        <menuitem action='FileHeaderFormatWAVE64'/>
+		        <menuitem action='FileHeaderFormatCAF'/>
+		   </menu>
+               </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='AutoConnectNewTrackInputsToHardware'/>
-                   <menuitem action='AutoConnectNewTrackOutputsToHardware'/>
-                   <menuitem action='AutoConnectNewTrackOutputsToHardware'/>
-                   <menuitem action='ManuallyConnectNewTrackOutputs'/>
+                   <menuitem action='InputAutoConnectPhysical'/>
+                   <menuitem action='InputAutoConnectManual'/>
+    	           <separator/>
+                   <menuitem action='OutputAutoConnectPhysical'/>
+                   <menuitem action='OutputAutoConnectMaster'/>
+                   <menuitem action='OutputAutoConnectManual'/>
                </menu>
-               <menu action='Monitoring'>
+	       <menu action='ControlSurfaces'>
+                   <menuitem action='RemoteUserDefined'/>
+                   <menuitem action='RemoteMixerDefined'/>
+                   <menuitem action='RemoteEditorDefined'/>
+               </menu>
+                   <menu action='Monitoring'>
                    <menuitem action='UseHardwareMonitoring'/>
                    <menuitem action='UseSoftwareMonitoring'/>
                    <menuitem action='UseExternalMonitoring'/>
                </menu>
+	       <menu action='Metering'>
+                   <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'/>
+               </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>
                <separator/>
                <menuitem action='SendMTC'/>
                <menuitem action='SendMMC'/>
                <menuitem action='UseMMC'/>
-               <menuitem action='SendMIDIfeedback'/>
-               <menuitem action='UseMIDIcontrol'/>
                <separator/>
+               <menuitem action='UseOSC'/>
                <menuitem action='StopPluginsWithTransport'/>
                <menuitem action='DoNotRunPluginsWhileRecording'/>
                <menuitem action='LatchedRecordEnable'/>
+               <menuitem action='RegionEquivalentsOverlap'/>
                <separator/>
                <menuitem action='VerifyRemoveLastCapture'/>
                <menuitem action='StopRecordingOnXrun'/>
                <menuitem action='StopTransportAtEndOfSession'/>
                <menuitem action='GainReduceFastTransport'/>
-               <separator/>
-               <menuitem action='AutomaticallyCreateCrossfades'/>
-               <menuitem action='UnmuteNewFullCrossfades'/>
+	       <separator/>
          </menu>
+	 <menu name='Help' action='Help'>
+	     <menuitem action='About'/>
+	</menu>
      </menubar>
 
      <popup name='redirectmenu'>
@@ -259,7 +412,6 @@
                <menuitem action='SortBySourceFilesystem'/>
          </menu>
          <separator/>
-         <menuitem action='rlEmbedAudio'/>
-         <menuitem action='rlImportAudio'/>
+         <menuitem action='addExternalAudioToRegionList'/>	       
      </popup>
 </ui>