X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fardour.menus.in;h=1378234d9a8621d9ef9bf69d37f6ad44d52a78b0;hb=8c4ce1e2ce35571aed5a686671431fdfffae7f8c;hp=af83c90b9c98dccacdb0b3f0e7c5898ef1360c8b;hpb=9245b7f95947ae196b8bb734ecb9767a362cccfe;p=ardour.git

diff --git a/gtk2_ardour/ardour.menus.in b/gtk2_ardour/ardour.menus.in
index af83c90b9c..1378234d9a 100644
--- a/gtk2_ardour/ardour.menus.in
+++ b/gtk2_ardour/ardour.menus.in
@@ -29,8 +29,10 @@
                <menuitem action='FlushWastebasket'/>
            </menu>
            <separator/>
+           <menuitem action='ToggleSessionOptionsEditor'/>
+           <separator/>
 #ifdef GTKOSX
-           <menuitem action='ToggleOptionsEditor'/>
+           <menuitem action='ToggleRCOptionsEditor'/>
            <menuitem action='About'/>
 #endif
            <menuitem action='Quit'/>
@@ -80,6 +82,8 @@
 	           <separator/>
 		   <menuitem action='playhead-to-next-region-boundary'/>
 		   <menuitem action='playhead-to-previous-region-boundary'/>
+		   <menuitem action='playhead-to-next-region-boundary-noselection'/>
+		   <menuitem action='playhead-to-previous-region-boundary-noselection'/>
 		   <menuitem action='playhead-to-next-region-sync'/>
 		   <menuitem action='playhead-to-previous-region-sync'/>
 		   <separator/>
@@ -117,6 +121,12 @@
 	       </menu>
 
 	       <separator/>
+	       <menu action='SyncMenu'>
+               	     <menuitem action='SendMTC'/>
+               	     <menuitem action='SendMMC'/>
+               	     <menuitem action='UseMMC'/>
+               	     <menuitem action='SendMidiClock'/>
+	       </menu>
 	       <menuitem action='ToggleTimeMaster'/>
                <menuitem action='TogglePunch'/>
                <menuitem action='TogglePunchIn'/>
@@ -126,6 +136,7 @@
                <menuitem action='ToggleAutoReturn'/>
                <menuitem action='ToggleClick'/>
                <menuitem action='toggle-follow-playhead'/>
+               <menuitem action='panic'/>
 	       <separator/>
        </menu>
 
@@ -183,6 +194,8 @@
 		   <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'/>
@@ -205,6 +218,8 @@
 		   <menuitem action='set-mouse-mode-zoom'/>
 		   <menuitem action='set-mouse-mode-timefx'/>
 		   <separator/>
+		   <menuitem action='toggle-internal-edit'/>
+		   <separator/>
 		   <menuitem action='cycle-edit-point'/>
 		   <menuitem action='cycle-edit-point-with-marker'/>
 		   <menuitem action='toggle-edit-mode'/>
@@ -214,9 +229,13 @@
 		   <separator/>
 		   <menuitem action='break-drag'/>
              </menu>
+	       <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>         
 
@@ -266,11 +285,6 @@
 		     <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='toggle-track-active'/>	
 		<menuitem action='remove-track'/>	
 	</menu>
@@ -320,21 +334,6 @@
 		   <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"/>
@@ -395,10 +394,9 @@
 	       <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'/>
         </menu>
         <menu name='JACK' action='JACK'>
                <menuitem action='JACKDisconnect'/>
@@ -429,154 +427,10 @@
                <menuitem action='ToggleBigClock'/>
                <menuitem action='toggle-rhythm-ferret'/>
                <menuitem action='toggle-bundle-manager'/>
+               <menuitem action='toggle-audio-connection-manager'/>
+               <menuitem action='toggle-midi-connection-manager'/>
    	       <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'>
 	     <menuitem action='About'/>
 	</menu>
@@ -601,8 +455,11 @@
 	 <menuitem action='newplugin'/>
 	 <menuitem action='newinsert'/>
 	 <menuitem action='newsend'/>
+	 <menuitem action='newreturn'/>
 	  <separator/>
 	 <menuitem action='clear'/>
+	 <menuitem action='clear_pre'/>
+	 <menuitem action='clear_post'/>
 	  <separator/>
 	 <menuitem action='cut'/>
 	 <menuitem action='copy'/>
@@ -657,6 +514,7 @@
          <menuitem action='newplugin'/>
          <menuitem action='newinsert'/>
          <menuitem action='newsend'/>
+         <menuitem action='newreturn'/>
          <separator/>
          <menuitem action='clear'/>
          <separator/>