X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fardour.menus.in;h=2c88709e1db288d5dbd3cf82dc0e76465c987e3f;hb=1f9c26136cc5ee6d9f0f05f94d0a9280214b879d;hp=6d08937cf05547e162e8360fd2425ddb9d693012;hpb=5399425f534e2d96d07cf29f427bfa0f39d904b7;p=ardour.git

diff --git a/gtk2_ardour/ardour.menus.in b/gtk2_ardour/ardour.menus.in
index 6d08937cf0..2c88709e1d 100644
--- a/gtk2_ardour/ardour.menus.in
+++ b/gtk2_ardour/ardour.menus.in
@@ -1,18 +1,4 @@
 <ui>
-  <accelerator action='set-mouse-mode-object'/>
-  <accelerator action='set-mouse-mode-range'/>
-  <accelerator action='set-mouse-mode-gain'/>
-  <accelerator action='set-mouse-mode-draw'/>
-  <accelerator action='set-mouse-mode-zoom'/>
-  <accelerator action='set-mouse-mode-timefx'/>
-  <accelerator action='set-mouse-mode-object-range'/>
-  <accelerator action='toggle-internal-edit'/>
-  <accelerator action='focus-on-clock'/>
-  <accelerator action='track-solo-toggle'/>
-  <accelerator action='track-mute-toggle'/>
-  <accelerator action='toggle-edit-mode'/>
-  <accelerator action='toggle-midi-input-active'/>
-  
   <menubar name='Main' action='MainMenu'>
     <menu name='Session' action='Session'>
       <menuitem action='New'/>
@@ -22,17 +8,24 @@
       <separator/>
       <menuitem action='Save'/>
       <menuitem action='SaveAs'/>
+#ifndef WINDOWS /* can't move open files. */
       <menuitem action='Rename'/>
-      <menuitem action='Snapshot'/>
+      <menuitem action='SnapshotStay'/>
+      <menuitem action='SnapshotSwitch'/>
+#endif
       <menuitem action='SaveTemplate'/>
+      <menuitem action='Archive'/>
       <menu name='Metadata' action='Metadata'>
         <menuitem action='EditMetadata'/>
         <menuitem action='ImportMetadata'/>
       </menu>
       <separator/>
-      <menuitem action='AddTrackBus'/>	
+      <menuitem action='AddTrackBus'/>
       <separator/>
       <menuitem action='addExistingAudioFiles'/>
+#ifdef PTFORMAT
+      <menuitem action='addExistingPTFiles'/>
+#endif
       <!--menuitem action='importFromSession'/-->
 
       <menuitem action='OpenVideo'/>
@@ -44,16 +37,21 @@
         <menuitem action='ExportVideo'/>
       </menu>
       <menu name='Cleanup' action='Cleanup'>
+        <menuitem action='bring-into-session'/>
+        <menuitem action='CleanupPeakFiles'/>
         <menuitem action='CleanupUnused'/>
         <menuitem action='FlushWastebasket'/>
       </menu>
       <separator/>
       <menuitem action='toggle-session-options-editor'/>
-#ifdef GTKOSX      
+#ifdef __APPLE__
       <menuitem action='toggle-about'/>
-      <menuitem action='toggle-rc-options-editor'/>
 #endif
-#ifndef GTKOSX
+#ifndef MIXBUS
+      <separator/>
+      <menuitem action='lock'/>
+#endif
+#ifndef __APPLE__
       <separator/>
       <menuitem action='Quit'/>
 #endif
@@ -62,25 +60,25 @@
     <menu name='Transport' action='Transport'>
       <menuitem action='ToggleRoll'/>
       <menu action="PlayMenu">
-        <menuitem action='main-menu-play-selected-regions'/>
-        <menuitem action='play-edit-range'/>
         <menuitem action='PlaySelection'/>
         <menuitem action='PlayPreroll'/>
+        <menuitem action='ToggleRollMaybe'/>
         <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'/>
-        <menuitem action='set-loop-from-region'/>
-      </menu>
-      <menu action="SetPunchMenu">
-        <menuitem action='set-punch-from-edit-range'/>
-        <menuitem action='set-punch-from-region'/>
-      </menu>
+      <menuitem action='Record'/>
+      <menuitem action='RecordPreroll'/>
+      <menuitem action='RecordCountIn'/>
+#if 0
+      <menuitem action='toggle-skip-playback'/>
+#endif
+
+      <separator/>
+      <menuitem action='set-loop-from-edit-range'/>
+      <menuitem action='set-punch-from-edit-range'/>
+      <menuitem action='set-session-from-edit-range'/>
 
       <separator/>
       <menuitem action='Forward'/>
@@ -89,7 +87,7 @@
       <menuitem action='TransitionToReverse'/>
       <separator/>
 
-      
+
       <menu action="MovePlayHeadMenu">
         <menuitem action='set-playhead'/>
         <menuitem action='playhead-to-edit'/>
@@ -125,13 +123,12 @@
         <menuitem action='selected-marker-to-previous-region-boundary'/>
         <menuitem action='edit-cursor-to-next-region-sync'/>
         <menuitem action='edit-cursor-to-previous-region-sync'/>
-        <separator/>
-        <menuitem action='edit-to-playhead'/>
-        <menuitem action='set-edit-point'/>
       </menu>
 
       <menu action="MarkerMenu">
         <menuitem action='add-location-from-playhead'/>
+        <menuitem action='remove-location-from-playhead'/>
+        <menuitem action='toggle-location-at-playhead'/>
         <separator/>
         <menuitem action='goto-mark-1'/>
         <menuitem action='goto-mark-2'/>
@@ -142,6 +139,9 @@
         <menuitem action='goto-mark-7'/>
         <menuitem action='goto-mark-8'/>
         <menuitem action='goto-mark-9'/>
+        <separator/>
+        <menuitem action='set-session-start-from-playhead'/>
+        <menuitem action='set-session-end-from-playhead'/>
       </menu>
 
       <separator/>
@@ -155,22 +155,33 @@
       <menuitem action='ToggleAutoReturn'/>
       <menuitem action='ToggleClick'/>
       <menuitem action='toggle-follow-playhead'/>
+      <menuitem action='toggle-stationary-playhead'/>
       <menuitem action='ToggleFollowEdits'/>
       <menuitem action='panic'/>
-     <separator/>
+      <separator/>
     </menu>
 
     <menu name='Edit' action='Edit'>
       <menuitem action='undo'/>
       <menuitem action='redo'/>
+      <separator/>
+      <menuitem action='undo-last-selection-op'/>
+      <menuitem action='redo-last-selection-op'/>
+      <separator/>
       <menuitem action='editor-cut'/>
       <menuitem action='editor-copy'/>
       <menuitem action='editor-paste'/>
-      <separator/>       
-      <menu action="SelectMenu">	   
-        <menuitem action='select-all'/>
+      <separator/>
+      <menu action="SelectMenu">
+        <menuitem action='select-all-objects'/>
+        <menuitem action='select-all-tracks'/>
         <menuitem action='deselect-all'/>
         <menuitem action='invert-selection'/>
+        <separator/>
+        <menuitem action='select-loop-range'/>
+        <menuitem action='select-punch-range'/>
+        <menuitem action='select-from-regions'/>
+        <separator/>
         <menuitem action='select-all-after-edit-cursor'/>
         <menuitem action='select-all-before-edit-cursor'/>
         <menuitem action='select-all-between-cursors'/>
@@ -178,26 +189,23 @@
         <menuitem action='select-all-in-punch-range'/>
         <menuitem action='select-all-in-loop-range'/>
         <separator/>
-        <menuitem action='select-range-between-cursors'/>
         <menuitem action='move-range-start-to-previous-region-boundary'/>
         <menuitem action='move-range-start-to-next-region-boundary'/>
         <menuitem action='move-range-end-to-previous-region-boundary'/>
         <menuitem action='move-range-end-to-next-region-boundary'/>
+        <separator/>
         <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>	   
+      </menu>
       <separator/>
       <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/>
@@ -211,29 +219,87 @@
         <menuitem action='align-regions-sync-relative'/>
       </menu>
       <menu action="FadeMenu">
+        <menuitem action='editor-fade-range'/>
         <menuitem action='set-fade-in-length'/>
         <menuitem action='toggle-region-fade-in'/>
         <menuitem action='set-fade-out-length'/>
         <menuitem action='toggle-region-fade-out'/>
       </menu>
-      <separator/>       
+      <separator/>
       <menuitem action='remove-last-capture'/>
       <separator/>
       <menu action="EditPointMenu">
         <menuitem action='cycle-edit-point'/>
         <menuitem action='cycle-edit-point-with-marker'/>
       </menu>
+      <menu name='SnapMode' action='SnapMode'>
+        <menuitem action='snap-off'/>
+        <menuitem action='snap-normal'/>
+        <menuitem action='snap-magnetic'/>
+        <separator/>
+        <menuitem action='cycle-snap-mode'/>
+        <menuitem action='next-snap-choice'/>
+        <menuitem action='prev-snap-choice'/>
+        <menuitem action='next-snap-choice-music-only'/>
+        <menuitem action='prev-snap-choice-music-only'/>
+      </menu>
+      <menu name='SnapTo' action='SnapTo'>
+        <menuitem action='snap-to-cd-frame'/>
+        <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-onetwentyeighths'/>
+        <menuitem action='snap-to-sixtyfourths'/>
+        <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'/>
+        <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>
       <separator/>
       <menu action="TempoMenu">
         <menuitem action='set-tempo-from-region'/>
         <menuitem action='set-tempo-from-edit-range'/>
       </menu>
       <menuitem action='set-mouse-mode-object-range'/>
-#ifndef GTKOSX
       <separator/>
-      <menuitem action='toggle-rc-options-editor'/>
+      <menu action="LuaScripts">
+        <menuitem action='toggle-script-manager'/>
+        <separator/>
+        <menuitem action='script-action-1'/>
+        <menuitem action='script-action-2'/>
+        <menuitem action='script-action-3'/>
+        <menuitem action='script-action-4'/>
+        <menuitem action='script-action-5'/>
+        <menuitem action='script-action-6'/>
+        <menuitem action='script-action-7'/>
+        <menuitem action='script-action-8'/>
+        <menuitem action='script-action-9'/>
+      </menu>
+#ifndef __APPLE__
+      <separator/>
 #endif
-    </menu>         
+      <menuitem action='menu-show-preferences'/>
+    </menu>
 
     <menu name='RegionMenu' action='RegionMenu'>
       <menuitem action='insert-region-from-region-list'/>
@@ -241,20 +307,19 @@
       <menuitem action='loop-region'/>
       <menuitem action='rename-region'/>
       <menuitem action='show-region-properties'/>
+      <menuitem action='loudness-analyze-region'/>
+      <menuitem action='spectral-analyze-region'/>
       <menu action='RegionMenuEdit'>
-         <menuitem action='combine-regions'/>
-         <menuitem action='uncombine-regions'/>
-         <menuitem action='analyze-region'/>
-         <menuitem action='toggle-opaque-region'/>
-         <menuitem action='toggle-region-mute'/>
-         <menuitem action='pitch-shift-region'/>
-         <menuitem action='split-region'/>
-         <menuitem action='split-multichannel-region'/>
-         <menuitem action='close-region-gaps'/>
-         <menuitem action='place-transient' />
-         <menuitem action='show-rhythm-ferret'/>
-         <menuitem action='strip-region-silence'/>
-         <menuitem action='reverse-region'/>    
+        <menuitem action='combine-regions'/>
+        <menuitem action='uncombine-regions'/>
+        <menuitem action='pitch-shift-region'/>
+        <menuitem action='split-region-at-transients'/>
+        <menuitem action='split-multichannel-region'/>
+        <menuitem action='close-region-gaps'/>
+        <menuitem action='place-transient' />
+        <menuitem action='show-rhythm-ferret'/>
+        <menuitem action='strip-region-silence'/>
+        <menuitem action='reverse-region'/>
       </menu>
       <menu action='RegionMenuLayering'>
         <menuitem action='raise-region-to-top'/>
@@ -266,13 +331,19 @@
         <menuitem action='transpose-region'/>
         <menuitem action='insert-patch-change'/>
         <menuitem action='quantize-region'/>
+        <menuitem action='legatize-region'/>
+        <menuitem action='remove-overlap'/>
+        <menuitem action='transform-region'/>
         <menuitem action='fork-region'/>
         <menuitem action='show-region-list-editor'/>
       </menu>
       <menu action='RegionMenuGain'>
+        <menuitem action='toggle-opaque-region'/>
+        <menuitem action='toggle-region-mute'/>
         <menuitem action='normalize-region'/>
         <menuitem action='boost-region-gain'/>
-        <menuitem action='cut-region-gain'/>      		   
+        <menuitem action='cut-region-gain'/>
+        <menuitem action='reset-region-gain'/>
         <menuitem action='reset-region-gain-envelopes'/>
         <menuitem action='toggle-region-gain-envelope-active'/>
       </menu>
@@ -288,7 +359,7 @@
         <menuitem action='nudge-backward'/>
         <menuitem action='nudge-forward-by-capture-offset'/>
         <menuitem action='nudge-backward-by-capture-offset'/>
-	<menuitem action='sequence-regions'/>
+        <menuitem action='sequence-regions'/>
       </menu>
       <menu action='RegionMenuTrim'>
         <menuitem action='trim-front'/>
@@ -316,38 +387,50 @@
         <menuitem action='region-fill-track'/>
       </menu>
       <menuitem action='export-region'/>
-      <menuitem action='bounce-regions-processed'/>
       <menuitem action='bounce-regions-unprocessed'/>
+#ifndef MIXBUS
+      <menuitem action='bounce-regions-processed'/>
+#endif
       <separator/>
       <menuitem action='remove-region'/>
     </menu>
 
     <menu action='TrackMenu'>
-      <menuitem action='AddTrackBus'/>	
+      <menuitem action='AddTrackBus'/>
+#ifdef MIXBUS
+      <menuitem action='addExistingAudioFiles'/>
+#endif
+      <menuitem action='duplicate-routes'/>
+      <separator/>
+      <menuitem action='track-record-enable-toggle'/>
+      <menuitem action='track-solo-toggle'/>
+      <menuitem action='track-mute-toggle'/>
+      <separator/>
       <menuitem action='insert-time'/>
+      <menuitem action='remove-time'/>
       <menuitem action="move-selected-tracks-up"/>
       <menuitem action="move-selected-tracks-down"/>
       <menu action='TrackHeightMenu'>
-        <menuitem action='fit-tracks'/>
+        <menuitem action='fit-selection'/>
         <menuitem action='track-height-largest'/>
         <menuitem action='track-height-larger'/>
         <menuitem action='track-height-large'/>
         <menuitem action='track-height-normal'/>
         <menuitem action='track-height-small'/>
       </menu>
-      <menuitem action='track-record-enable-toggle'/>
-      <menuitem action='toggle-track-active'/>	
-      <menuitem action='remove-track'/>	
+      <separator/>
+      <menuitem action='toggle-track-active'/>
+      <menuitem action='remove-track'/>
     </menu>
 
     <menu name='View' action = 'View'>
       <menuitem action='ToggleMaximalEditor'/>
       <menuitem action='ToggleMaximalMixer'/>
-      <menuitem action='KeepTearoffs'/>
 
       <separator/>
 
       <menu action="PrimaryClockMenu">
+        <menuitem action='focus-on-clock'/>
         <menuitem action="primary-clock-timecode"/>
         <menuitem action="primary-clock-bbt"/>
         <menuitem action="primary-clock-minsec"/>
@@ -366,8 +449,9 @@
         <menuitem action='temporal-zoom-in'/>
         <menuitem action='temporal-zoom-out'/>
         <menuitem action='zoom-to-session'/>
-        <menuitem action='zoom-to-region'/>
-        <menuitem action='zoom-to-region-both-axes'/>
+        <menuitem action='zoom-to-selection'/>
+        <menuitem action='zoom-to-selection-horiz'/>
+        <menuitem action='fit-selection'/>
         <menuitem action='toggle-zoom'/>
         <menuitem action='expand-tracks'/>
         <menuitem action='shrink-tracks'/>
@@ -381,57 +465,16 @@
         <menuitem action='zoom-focus-edit'/>
         <menuitem action='cycle-zoom-focus'/>
       </menu>
-      <menu name='SnapMode' action='SnapMode'>
-        <menuitem action='snap-off'/>
-        <menuitem action='snap-normal'/>
-        <menuitem action='snap-magnetic'/>
-        <separator/>
-        <menuitem action='cycle-snap-mode'/>
-        <menuitem action='next-snap-choice'/>
-        <menuitem action='prev-snap-choice'/>
-        <menuitem action='next-snap-choice-music-only'/>
-        <menuitem action='prev-snap-choice-music-only'/>
-      </menu>
-      <menu name='SnapTo' action='SnapTo'>
-        <menuitem action='snap-to-cd-frame'/>
-        <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-onetwentyeighths'/>
-        <menuitem action='snap-to-sixtyfourths'/>
-        <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'/>
-        <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 action="RulerMenu">
         <menuitem action="toggle-minsec-ruler"/>
+        <menuitem action="toggle-timecode-ruler"/>
         <menuitem action="toggle-samples-ruler"/>
         <menuitem action="toggle-bbt-ruler"/>
         <separator/>
         <menuitem action="toggle-meter-ruler"/>
         <menuitem action="toggle-tempo-ruler"/>
+        <menuitem action="toggle-range-ruler"/>
         <menuitem action="toggle-loop-punch-ruler"/>
         <menuitem action="toggle-cd-marker-ruler"/>
         <menuitem action="toggle-marker-ruler"/>
@@ -486,29 +529,57 @@
 
       <menuitem action='show-editor-mixer'/>
       <menuitem action='show-editor-list'/>
+      <menuitem action='ToggleMixerList'/>
+      <menuitem action='ToggleMonitorSection'/>
       <menuitem action='ToggleMeasureVisibility'/>
       <menuitem action='ToggleSummary'/>
       <menuitem action='ToggleGroupTabs'/>
       <menuitem action='show-marker-lines'/>
+
     </menu>
     <menu action = 'WindowMenu'>
       <menuitem action='toggle-audio-midi-setup'/>
       <separator/>
-      <menuitem action='toggle-mixer'/>
+      <menu action='EditorMenu'>
+        <menuitem action='show-editor'/>
+        <menuitem action='hide-editor'/>
+        <menuitem action='attach-editor'/>
+        <menuitem action='detach-editor'/>
+      </menu>
+      <menu action='MixerMenu'>
+        <menuitem action='show-mixer'/>
+        <menuitem action='hide-mixer'/>
+        <menuitem action='attach-mixer'/>
+        <menuitem action='detach-mixer'/>
+      </menu>
+      <menu action='PrefsMenu'>
+        <menuitem action='show-preferences'/>
+        <menuitem action='hide-preferences'/>
+        <menuitem action='attach-preferences'/>
+        <menuitem action='detach-preferences'/>
+      </menu>
       <menuitem action='toggle-meterbridge'/>
-      <menuitem action='toggle-editor-mixer'/>
+      <menuitem action='toggle-luawindow'/>
       <separator/>
+#ifndef MIXBUS
       <menuitem action='toggle-inspector'/>
+#endif
       <menuitem action='toggle-locations'/>
       <menuitem action='toggle-key-editor'/>
+#ifndef MIXBUS
       <menuitem action='toggle-bundle-manager'/>
-      <menuitem action='toggle-theme-manager'/>
+#endif
       <menuitem action='toggle-big-clock'/>
 #if 0
       <menuitem action='toggle-speaker-config'/>
 #endif
 
       <separator/>
+#ifdef MIXBUS
+      <menuitem action='license-manager'/>
+
+      <separator/>
+#endif
 
       <menuitem action='ToggleJadeo'/>
       <separator/>
@@ -520,15 +591,48 @@
       <separator/>
     </menu>
     <menu name='Help' action='Help'>
-#ifndef GTKOSX
+#ifndef __APPLE__
       <menuitem action='toggle-about'/>
 #endif
-      <menuitem action='Chat'/>
-      <menuitem action='Manual'/>
-      <menuitem action='Reference'/>
+#ifdef MIXBUS
+      <menuitem action='reference'/>
+      <menuitem action='manual'/>
+      <menuitem action='forums'/>
+      <menuitem action='chat'/>
+#else
+      <menuitem action='chat'/>
+      <menuitem action='manual'/>
+      <menuitem action='reference'/>
+      <menuitem action='forums'/>
+      <menuitem action='howto-report'/>
+      <menuitem action='tracker'/>
+      <menuitem action='website'/>
+      <menuitem action='website-dev'/>
+#endif
     </menu>
   </menubar>
 
+  <popup action="editorTabbableButtonMenu">
+    <menuitem action='show-editor'/>
+    <menuitem action='hide-editor'/>
+    <menuitem action='attach-editor'/>
+    <menuitem action='detach-editor'/>
+  </popup>
+
+  <popup action="mixerTabbableButtonMenu">
+    <menuitem action='show-mixer'/>
+    <menuitem action='hide-mixer'/>
+    <menuitem action='attach-mixer'/>
+    <menuitem action='detach-mixer'/>
+  </popup>
+
+  <popup action="preferencesTabbableButtonMenu">
+    <menuitem action='show-preferences'/>
+    <menuitem action='hide-preferences'/>
+    <menuitem action='attach-preferences'/>
+    <menuitem action='detach-preferences'/>
+  </popup>
+
   <popup action="RulerMenuPopup">
     <menuitem action="toggle-minsec-ruler"/>
     <menuitem action="toggle-timecode-ruler"/>
@@ -553,7 +657,9 @@
     <menuitem action='newaux'/>
     <separator/>
     <menuitem action='controls'/>
+#ifndef MIXBUS
     <menuitem action='send_options'/>
+#endif
     <separator/>
     <menuitem action='clear'/>
     <menuitem action='clear_pre'/>
@@ -571,7 +677,11 @@
     <separator/>
     <menuitem action='activate_all'/>
     <menuitem action='deactivate_all'/>
+#ifndef MIXBUS
     <menuitem action='ab_plugins'/>
+#endif
+    <separator/>
+    <menuitem action='manage-pins'/>
     <separator/>
     <menuitem action='edit'/>
     <menuitem action='edit-generic'/>
@@ -607,7 +717,7 @@
     <separator/>
     <menuitem action='addExternalAudioToRegionList'/>
     <separator/>
-    <menuitem action='removeUnusedRegions'/>    
+    <menuitem action='removeUnusedRegions'/>
   </popup>
 
   <popup name='PopupRegionMenu' action='PopupRegionMenu'>
@@ -616,23 +726,25 @@
     <menuitem action='rename-region'/>
     <menuitem action='show-region-properties'/>
     <menu action='RegionMenuEdit'>
-       <menuitem action='combine-regions'/>
-       <menuitem action='uncombine-regions'/>
-       <menuitem action='split-region'/>
-       <menuitem action='split-multichannel-region'/>
-       <menuitem action='toggle-opaque-region'/>
-       <menuitem action='toggle-region-mute'/>
-       <menuitem action='pitch-shift-region'/>
-       <menuitem action='reverse-region'/>    
-       <menuitem action='close-region-gaps'/>
-       <menuitem action='place-transient' />
-       <menuitem action='show-rhythm-ferret'/>
-       <menuitem action='strip-region-silence'/>
+      <menuitem action='combine-regions'/>
+      <menuitem action='uncombine-regions'/>
+      <menuitem action='pitch-shift-region'/>
+      <menuitem action='split-region'/>
+      <menuitem action='split-region-at-transients'/>
+      <menuitem action='split-multichannel-region'/>
+      <menuitem action='close-region-gaps'/>
+      <menuitem action='place-transient' />
+      <menuitem action='show-rhythm-ferret'/>
+      <menuitem action='strip-region-silence'/>
+      <menuitem action='reverse-region'/>
     </menu>
     <menu action='RegionMenuMIDI'>
       <menuitem action='transpose-region'/>
       <menuitem action='insert-patch-change-context'/>
       <menuitem action='quantize-region'/>
+      <menuitem action='legatize-region'/>
+      <menuitem action='remove-overlap'/>
+      <menuitem action='transform-region'/>
       <menuitem action='fork-region'/>
       <menuitem action='show-region-list-editor'/>
     </menu>
@@ -672,9 +784,12 @@
       <menuitem action='set-selection-from-region'/>
     </menu>
     <menu action='RegionMenuGain'>
+      <menuitem action='toggle-opaque-region'/>
+      <menuitem action='toggle-region-mute'/>
       <menuitem action='normalize-region'/>
       <menuitem action='boost-region-gain'/>
-      <menuitem action='cut-region-gain'/>      		   
+      <menuitem action='cut-region-gain'/>
+      <menuitem action='reset-region-gain'/>
       <menuitem action='reset-region-gain-envelopes'/>
       <menuitem action='toggle-region-gain-envelope-active'/>
     </menu>
@@ -689,12 +804,15 @@
       <menuitem action='region-fill-track'/>
     </menu>
     <menuitem action='export-region'/>
-    <menuitem action='bounce-regions-processed'/>
     <menuitem action='bounce-regions-unprocessed'/>
-    <menuitem action='analyze-region'/>
+#ifndef MIXBUS
+    <menuitem action='bounce-regions-processed'/>
+#endif
+    <menuitem action='loudness-analyze-region'/>
+    <menuitem action='spectral-analyze-region'/>
     <separator/>
     <menuitem action='remove-region'/>
-    
+
   </popup>
 
 </ui>