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

diff --git a/gtk2_ardour/ardour.menus.in b/gtk2_ardour/ardour.menus.in
index 6cf7f0dbb9..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'/>
@@ -19,23 +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'/>
-           <separator/>
 #ifdef GTKOSX
            <menuitem action='ToggleRCOptionsEditor'/>
            <menuitem action='About'/>
 #endif
+           <separator/>
            <menuitem action='Quit'/>
         </menu>
 
@@ -161,6 +170,9 @@
                    <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'/>
@@ -182,51 +194,21 @@
 		   <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='toggle-internal-edit'/>
-		   <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='escape'/>
-             </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'/>
@@ -237,44 +219,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'>
@@ -297,6 +318,26 @@
 	</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'/>
@@ -304,6 +345,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'/>
@@ -329,10 +372,20 @@
 		   <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'/>
@@ -341,18 +394,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"/>
@@ -397,12 +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='ToggleSummary'/>
                <menuitem action='ToggleGroupTabs'/>
+	       <menuitem action='show-marker-lines'/>
         </menu>
         <menu name='JACK' action='JACK'>
                <menuitem action='JACKDisconnect'/>
@@ -420,17 +464,21 @@
                </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-speaker-config'/>
+
+	       <separator/>
+
                <menuitem action='NewMIDITracer'/>
                <menuitem action='toggle-audio-connection-manager'/>
                <menuitem action='toggle-midi-connection-manager'/>
@@ -442,6 +490,8 @@
 	     <menuitem action='About'/>
 #endif
              <menuitem action='Chat'/>
+	     <menuitem action='Manual'/>
+	     <menuitem action='Reference'/>
 	</menu>
      </menubar>
 
@@ -460,7 +510,7 @@
 	   <menuitem action="toggle-loop-punch-ruler"/>
      </popup>
 
-     <popup name='processormenu'>
+     <popup name='ProcessorMenu'>
 	 <menuitem action='newplugin'/>
 	 <menuitem action='newinsert'/>
 	 <menuitem action='newsend'/>
@@ -496,7 +546,7 @@
          <menuitem action='rlAudition'/>
          <menuitem action='rlHide'/>
          <menuitem action='rlShow'/>
-	  <separator/>
+	 <separator/>
          <menuitem action='rlShowAll'/>
          <menuitem action='rlShowAuto'/>
          <menu name='Sort' action='RegionListSort'>
@@ -515,6 +565,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>