X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fardour.menus.in;h=c6dbc010473b7d02587729475baf22034c835746;hb=b461bc1dc1970a9e147c43a721d3155f6215f8c7;hp=8d6950b90bb5de8ce04dc3557bbda377015097b9;hpb=5524e377a2668e75c1a50c02fcb4cd7a88701e8e;p=ardour.git

diff --git a/gtk2_ardour/ardour.menus.in b/gtk2_ardour/ardour.menus.in
index 8d6950b90b..c6dbc01047 100644
--- a/gtk2_ardour/ardour.menus.in
+++ b/gtk2_ardour/ardour.menus.in
@@ -19,23 +19,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'/>
-           <separator/>
 #ifdef GTKOSX
            <menuitem action='ToggleRCOptionsEditor'/>
            <menuitem action='About'/>
 #endif
+           <separator/>
            <menuitem action='Quit'/>
         </menu>
 
@@ -182,24 +183,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'/>
@@ -238,44 +226,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'/>
-
-	      <separator/>
 	      <menuitem action='snap-regions-to-grid'/>
 	      <menuitem action='close-region-gaps'/>
-	      <separator/>
 	      <menuitem action='place-transient' />
-	      <menuitem action='toggle-rhythm-ferret'/>
-	      
+	      <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'>
@@ -325,6 +352,8 @@
                	     <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'/>
@@ -414,6 +443,7 @@
                <menuitem action='ToggleMeasureVisibility'/>
                <menuitem action='ToggleSummary'/>
                <menuitem action='ToggleGroupTabs'/>
+	       <menuitem action='show-marker-lines'/>
         </menu>
         <menu name='JACK' action='JACK'>
                <menuitem action='JACKDisconnect'/>
@@ -431,9 +461,8 @@
                </menu>
         </menu>
         <menu action = 'WindowMenu'>
-               <menuitem action='goto-editor'/>
-               <menuitem action='goto-mixer'/>
-               <menuitem action='toggle-editor-mixer-on-top'/>
+               <menuitem action='toggle-mixer'/>
+               <menuitem action='toggle-mixer-on-top'/>
 
 	       <separator/>
 
@@ -443,6 +472,7 @@
                <menuitem action='ToggleBundleManager'/>
                <menuitem action='ToggleThemeManager'/>
                <menuitem action='ToggleBigClock'/>
+               <menuitem action='toggle-speaker-config'/>
 
 	       <separator/>
 
@@ -457,6 +487,8 @@
 	     <menuitem action='About'/>
 #endif
              <menuitem action='Chat'/>
+	     <menuitem action='Manual'/>
+	     <menuitem action='Reference'/>
 	</menu>
      </menubar>
 
@@ -475,7 +507,7 @@
 	   <menuitem action="toggle-loop-punch-ruler"/>
      </popup>
 
-     <popup name='processormenu'>
+     <popup name='ProcessorMenu'>
 	 <menuitem action='newplugin'/>
 	 <menuitem action='newinsert'/>
 	 <menuitem action='newsend'/>
@@ -511,7 +543,7 @@
          <menuitem action='rlAudition'/>
          <menuitem action='rlHide'/>
          <menuitem action='rlShow'/>
-	  <separator/>
+	 <separator/>
          <menuitem action='rlShowAll'/>
          <menuitem action='rlShowAuto'/>
          <menu name='Sort' action='RegionListSort'>
@@ -530,6 +562,88 @@
                <menuitem action='SortBySourceFilesystem'/>
          </menu>
          <separator/>
-         <menuitem action='addExternalAudioToRegionList'/>	       
+         <menuitem action='addExternalAudioToRegionList'/>
+         <separator/>
+         <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>