X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fardour.menus.in;h=428160c0f5c95ab8b5385afdfa6929ad9655969c;hb=04db4c788c8bf5070eb13b9165277ea81ab50070;hp=1378234d9a8621d9ef9bf69d37f6ad44d52a78b0;hpb=265cf739b5c40839a66aa53e06b31d6a256af03a;p=ardour.git

diff --git a/gtk2_ardour/ardour.menus.in b/gtk2_ardour/ardour.menus.in
index 1378234d9a..428160c0f5 100644
--- a/gtk2_ardour/ardour.menus.in
+++ b/gtk2_ardour/ardour.menus.in
@@ -8,6 +8,7 @@
            <menuitem action='Close'/>
            <separator/>
            <menuitem action='Save'/>
+           <menuitem action='SaveAs'/>
            <menuitem action='Snapshot'/>
            <menuitem action='SaveTemplate'/>
            <menu name='Metadata' action='Metadata'>
@@ -19,22 +20,22 @@
            <separator/>
            <menuitem action='addExistingAudioFiles'/>
            <menuitem action='importFromSession'/>
-           <separator/>
            <menu name='Export' action='Export'>
                <menuitem action='ExportAudio'/>
            </menu>
-           <separator/>
            <menu name='Cleanup' action='Cleanup'>
                <menuitem action='CleanupUnused'/>
                <menuitem action='FlushWastebasket'/>
            </menu>
+#ifndef GTKOSX
            <separator/>
+#endif
            <menuitem action='ToggleSessionOptionsEditor'/>
-           <separator/>
 #ifdef GTKOSX
            <menuitem action='ToggleRCOptionsEditor'/>
            <menuitem action='About'/>
 #endif
+           <separator/>
            <menuitem action='Quit'/>
         </menu>
 
@@ -43,11 +44,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'/>
@@ -121,12 +124,6 @@
 	       </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'/>
@@ -169,12 +166,13 @@
                <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'/>
@@ -184,24 +182,11 @@
 		   <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'/>
@@ -217,6 +202,7 @@
 		   <menuitem action='set-mouse-mode-gain'/>
 		   <menuitem action='set-mouse-mode-zoom'/>
 		   <menuitem action='set-mouse-mode-timefx'/>
+		   <menuitem action='set-mouse-mode-object-range'/>
 		   <separator/>
 		   <menuitem action='toggle-internal-edit'/>
 		   <separator/>
@@ -227,7 +213,7 @@
 		   <menuitem action='boost-region-gain'/>
 		   <menuitem action='cut-region-gain'/>
 		   <separator/>
-		   <menuitem action='break-drag'/>
+		   <menuitem action='escape'/>
              </menu>
 	       <menu action="TempoMenu">
 	       	      <menuitem action='set-tempo-from-region'/>
@@ -239,36 +225,83 @@
 #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'>
@@ -279,17 +312,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>
+                <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'/>
@@ -303,8 +357,8 @@
                    <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'/>
@@ -316,9 +370,9 @@
 	       </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'/>
@@ -334,18 +388,7 @@
 		   <menuitem action='snap-to-region-sync'/>
 		   <menuitem action='snap-to-region-boundary'/>
                </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"/>
@@ -390,13 +433,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='ToggleWaveformsWhileRecording'/>
                <menuitem action='ToggleSummary'/>
                <menuitem action='ToggleGroupTabs'/>
+	       <menuitem action='show-marker-lines'/>
         </menu>
         <menu name='JACK' action='JACK'>
                <menuitem action='JACKDisconnect'/>
@@ -414,25 +458,33 @@
                </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'/>
+
+	       <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='Help' action='Help'>
+#ifndef GTKOSX
 	     <menuitem action='About'/>
+#endif
+             <menuitem action='Chat'/>
+	     <menuitem action='Manual'/>
+	     <menuitem action='Reference'/>
 	</menu>
      </menubar>
 
@@ -455,7 +507,7 @@
 	 <menuitem action='newplugin'/>
 	 <menuitem action='newinsert'/>
 	 <menuitem action='newsend'/>
-	 <menuitem action='newreturn'/>
+         <menuitem action='newaux'/>
 	  <separator/>
 	 <menuitem action='clear'/>
 	 <menuitem action='clear_pre'/>
@@ -471,11 +523,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>
@@ -488,7 +538,7 @@
      <popup name='RegionListMenu'>
          <menuitem action='rlAudition'/>
          <menuitem action='rlHide'/>
-         <menuitem action='rlRemove'/>
+         <menuitem action='rlShow'/>
 	  <separator/>
          <menuitem action='rlShowAll'/>
          <menuitem action='rlShowAuto'/>
@@ -510,27 +560,84 @@
          <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'/>
-         <separator/>
-         <menuitem action='rename'/>
-         <separator/>
-         <menuitem action='selectall'/>
-         <menuitem action='deselectall'/>
-         <separator/>
-         <menuitem action='activate_all'/>
-         <menuitem action='deactivate_all'/>
-         <separator/>
-         <menuitem action='edit'/>
-     </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>