From bd5481c5be4aa380f5b3f04633a256f2dacfb746 Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Thu, 25 Apr 2024 09:27:11 -0600
Subject: [PATCH] Revert "menu file now named after downcase-d PROGRAM_NAME"

This reverts commit 7cc5328d9569e920684877024a5751987e52334a.
---
 gtk2_ardour/mixbus.menus.in | 980 ------------------------------------
 gtk2_ardour/opts.cc         |   2 +-
 2 files changed, 1 insertion(+), 981 deletions(-)
 delete mode 100644 gtk2_ardour/mixbus.menus.in

diff --git a/gtk2_ardour/mixbus.menus.in b/gtk2_ardour/mixbus.menus.in
deleted file mode 100644
index 77490b4db7..0000000000
--- a/gtk2_ardour/mixbus.menus.in
+++ /dev/null
@@ -1,980 +0,0 @@
-<ui>
-  <menubar name='Main' action='MainMenu'>
-    <menu name='Session' action='Session'>
-      <menuitem action='New'/>
-      <menuitem action='Open'/>
-      <menuitem action='Recent'/>
-      <menuitem action='Close'/>
-      <separator/>
-      <menuitem action='Save'/>
-      <menuitem action='SaveAs'/>
-#ifndef WINDOWS /* can't move open files. */
-      <menuitem action='Rename'/>
-      <menuitem action='SnapshotStay'/>
-      <menuitem action='SnapshotSwitch'/>
-#endif
-      <menuitem action='SaveTemplate'/>
-      <menuitem action='Archive'/>
-      <separator/>
-      <menuitem action='AddTrackBus'/>
-      <separator/>
-      <menuitem action='addExistingAudioFiles'/>
-#ifdef PTFORMAT
-      <menuitem action='addExistingPTFiles'/>
-#endif
-      <!--menuitem action='importFromSession'/-->
-
-      <menuitem action='OpenVideo'/>
-      <menuitem action='CloseVideo'/>
-
-      <menuitem action='LoudnessAssistant'/>
-
-      <menu name='Export' action='Export'>
-        <menuitem action='QuickExport'/>
-        <menuitem action='ExportAudio'/>
-#ifdef VAPOR
-        <menuitem action='SurroundExport'/>
-#endif
-        <menuitem action='StemExport'/>
-        <menuitem action='ExportVideo'/>
-      </menu>
-      <separator/>
-      <menuitem action='toggle-session-options-editor'/>
-#ifdef VAPOR
-      <menuitem action='ToggleSurroundMaster'/>
-#endif
-
-      <menu name='MonitorMenu' action='MonitorMenu'>
-        <menuitem action='UseMonitorSection'/>
-        <menuitem action='monitor-cut-all'/>
-        <menuitem action='monitor-dim-all'/>
-        <menuitem action='monitor-mono'/>
-      </menu>
-
-      <menu name='Metadata' action='Metadata'>
-        <menuitem action='EditMetadata'/>
-        <menuitem action='ImportMetadata'/>
-      </menu>
-      <menu name='Cleanup' action='Cleanup'>
-        <menuitem action='bring-into-session'/>
-        <menuitem action='CleanupPeakFiles'/>
-        <menuitem action='CleanupUnusedSources'/>
-        <menuitem action='CleanupUnusedRegions'/>
-        <menuitem action='FlushWastebasket'/>
-      </menu>
-#ifdef __APPLE__
-      <menuitem action='toggle-about'/>
-#endif
-#ifndef MIXBUS
-      <separator/>
-      <menuitem action='lock'/>
-#endif
-#ifndef __APPLE__
-      <separator/>
-      <menuitem action='Quit'/>
-#endif
-    </menu>
-
-    <menu name='Transport' action='Transport'>
-      <menuitem action='ToggleRoll'/>
-      <menu action="PlayMenu">
-        <menuitem action='PlaySelection'/>
-        <menuitem action='solo-selection'/>
-        <menuitem action='PlayPreroll'/>
-        <menuitem action='ToggleRollMaybe'/>
-        <menuitem action='play-from-edit-point-and-return'/>
-        <menuitem action='Loop'/>
-      </menu>
-      <menuitem action='record-roll'/>
-      <menuitem action='ToggleRollForgetCapture'/>
-      <menuitem action='Record'/>
-      <menuitem action='RecordPreroll'/>
-      <menuitem action='RecordCountIn'/>
-#if 0
-      <menuitem action='toggle-skip-playback'/>
-#endif
-
-      <separator/>
-      <menuitem action='Forward'/>
-      <menuitem action='Rewind'/>
-      <menuitem action='TransitionToRoll'/>
-      <menuitem action='TransitionToReverse'/>
-      <separator/>
-
-      <separator/>
-      <menuitem action='set-loop-from-edit-range'/>
-      <menuitem action='set-punch-from-edit-range'/>
-      <menuitem action='set-session-from-edit-range'/>
-
-      <menu action="MovePlayHeadMenu">
-        <menuitem action='set-playhead'/>
-        <menuitem action='playhead-to-edit'/>
-        <menuitem action='center-playhead'/>
-        <separator/>
-        <menuitem action='nudge-playhead-forward'/>
-        <menuitem action='nudge-playhead-backward'/>
-        <separator/>
-        <menuitem action='tab-to-transient-forwards'/>
-        <menuitem action='tab-to-transient-backwards'/>
-        <separator/>
-        <menuitem action='playhead-forward-to-grid'/>
-        <menuitem action='playhead-backward-to-grid'/>
-        <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/>
-        <menuitem action='jump-forward-to-mark'/>
-        <menuitem action='jump-backward-to-mark'/>
-        <separator/>
-        <menuitem action='jump-to-loop-start'/>
-        <menuitem action='jump-to-loop-end'/>
-        <separator/>
-        <menuitem action='GotoZero'/>
-        <menuitem action='GotoStart'/>
-        <menuitem action='GotoEnd'/>
-        <menuitem action='GotoWallClock'/>
-      </menu>
-
-      <menu action="MoveActiveMarkMenu">
-        <menuitem action='selected-marker-to-next-region-boundary'/>
-        <menuitem action='selected-marker-to-previous-region-boundary'/>
-        <menuitem action='edit-cursor-to-next-region-sync'/>
-        <menuitem action='edit-cursor-to-previous-region-sync'/>
-      </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'/>
-        <menuitem action='goto-mark-3'/>
-        <menuitem action='goto-mark-4'/>
-        <menuitem action='goto-mark-5'/>
-        <menuitem action='goto-mark-6'/>
-        <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>
-
-      <menu action="CueMenu">
-        <menuitem action='trigger-cue-0'/>
-        <menuitem action='trigger-cue-1'/>
-        <menuitem action='trigger-cue-2'/>
-        <menuitem action='trigger-cue-3'/>
-        <menuitem action='trigger-cue-4'/>
-        <menuitem action='trigger-cue-5'/>
-        <menuitem action='trigger-cue-6'/>
-        <menuitem action='trigger-cue-7'/>
-      </menu>
-
-      <separator/>
-      <menuitem action='ToggleTimeMaster'/>
-      <menuitem action='TogglePunch'/>
-      <menuitem action='TogglePunchIn'/>
-      <menuitem action='TogglePunchOut'/>
-      <menuitem action='ToggleAutoInput'/>
-      <menuitem action='ToggleFollowEdits'/>
-      <menuitem action='ToggleAutoPlay'/>
-      <menuitem action='ToggleAutoReturn'/>
-      <menuitem action='ToggleClick'/>
-      <menuitem action='toggle-follow-playhead'/>
-      <menuitem action='toggle-stationary-playhead'/>
-      <menuitem action='ToggleFollowEdits'/>
-      <menuitem action='ToggleExternalSync'/>
-      <menuitem action='panic'/>
-      <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/>
-      <menuitem action='cut-paste-section'/>
-      <menuitem action='copy-paste-section'/>
-      <menuitem action='delete-section'/>
-      <separator/>
-      <menu action="SelectMenu">
-        <menuitem action='select-all-objects'/>
-        <menuitem action='select-all-tracks'/>
-        <menuitem action='select-all-visible-lanes'/>
-        <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='add-range-marker-from-selection'/>
-        <separator/>
-        <menuitem action='select-all-after-edit-cursor'/>
-        <menuitem action='select-all-before-edit-cursor'/>
-        <menuitem action='select-all-between-cursors'/>
-        <menuitem action='select-all-within-cursors'/>
-        <menuitem action='select-all-in-punch-range'/>
-        <menuitem action='select-all-in-loop-range'/>
-        <separator/>
-        <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'/>
-        <separator/>
-        <menuitem action='select-next-route'/>
-        <menuitem action='select-prev-route'/>
-      </menu>
-      <separator/>
-      <menuitem action='editor-delete'/>
-      <menuitem action='editor-crop'/>
-      <menuitem action='split-region'/>
-      <menu action="SeparateMenu">
-        <menuitem action='separate-under-region'/>
-        <menuitem action='separate-from-loop'/>
-        <menuitem action='separate-from-punch'/>
-      </menu>
-      <menu action="ConsolidateMenu">
-        <menuitem action='editor-consolidate'/>
-#ifndef MIXBUS
-        <menuitem action='editor-consolidate-with-processing'/>
-#endif
-        <menuitem action='combine-regions'/>
-        <menuitem action='uncombine-regions'/>
-      </menu>
-      <menu action="AlignMenu">
-        <menuitem action='align-regions-start'/>
-        <menuitem action='align-regions-start-relative'/>
-        <menuitem action='align-regions-end'/>
-        <menuitem action='align-regions-end-relative'/>
-        <menuitem action='align-regions-sync'/>
-        <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/>
-      <menu action="AnalyzeMenu">
-        <menuitem action='editor-analyze-spectrum'/>
-        <menuitem action='editor-analyze-loudness'/>
-        <menuitem action='editor-loudness-assistant'/>
-      </menu>
-     <separator/>
-      <menuitem action='tag-last-capture'/>
-      <menuitem action='remove-last-capture'/>
-      <separator/>
-      <menu action="EditPointMenu">
-        <menuitem action='cycle-edit-point'/>
-        <menuitem action='cycle-edit-point-with-marker'/>
-      </menu>
-      <menu action="MarkerClickBehavior">
-        <menuitem action='cycle-marker-click-behavior'/>
-        <menuitem action='marker-click-select-only'/>
-        <menuitem action='marker-click-locate'/>
-        <menuitem action='marker-click-locate-when-stopped'/>
-      </menu>
-      <menuitem action='cycle-snap-mode'/>
-      <menu name='GridChoice' action='GridChoice'>
-        <menuitem action='prev-grid-choice'/>
-        <menuitem action='next-grid-choice'/>
-        <separator/>
-        <menuitem action='grid-type-none'/>
-        <menuitem action='grid-type-bar'/>
-        <menuitem action='grid-type-beat'/>
-        <menuitem action='grid-type-halves'/>
-        <menuitem action='grid-type-quarters'/>
-        <menuitem action='grid-type-eighths'/>
-        <menuitem action='grid-type-asixteenthbeat'/>
-        <menuitem action='grid-type-thirtyseconds'/>
-        <menu action='GridChoiceTriplets'>
-          <menuitem action='grid-type-thirds'/>
-          <menuitem action='grid-type-sixths'/>
-          <menuitem action='grid-type-twelfths'/>
-          <menuitem action='grid-type-twentyfourths'/>
-        </menu>
-        <menu action='GridChoiceQuintuplets'>
-          <menuitem action='grid-type-fifths'/>
-          <menuitem action='grid-type-tenths'/>
-          <menuitem action='grid-type-twentieths'/>
-        </menu>
-        <menu action='GridChoiceSeptuplets'>
-          <menuitem action='grid-type-sevenths'/>
-          <menuitem action='grid-type-fourteenths'/>
-          <menuitem action='grid-type-twentyeighths'/>
-        </menu>
-        <menuitem action='grid-type-timecode'/>
-        <menuitem action='grid-type-minsec'/>
-        <menuitem action='grid-type-cdframe'/>
-      </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'/>
-      <menuitem action='show-touched-automation'/>
-      <separator/>
-      <menu action="LuaScripts">
-        <menuitem action='toggle-script-manager'/>
-        <separator/>
-        <menuitem action='script-1'/>
-        <menuitem action='script-2'/>
-        <menuitem action='script-3'/>
-        <menuitem action='script-4'/>
-        <menuitem action='script-5'/>
-        <menuitem action='script-6'/>
-        <menuitem action='script-7'/>
-        <menuitem action='script-8'/>
-        <menuitem action='script-9'/>
-      </menu>
-#ifndef __APPLE__
-      <separator/>
-#endif
-      <menuitem action='menu-show-preferences'/>
-    </menu>
-
-    <menu name='RegionMenu' action='RegionMenu'>
-      <menuitem action='insert-region-from-source-list'/>
-      <menuitem action='play-selected-regions'/>
-      <menuitem action='tag-selected-regions'/>
-      <separator/>
-      <menuitem action='group-selected-regions'/>
-      <menuitem action='ungroup-selected-regions'/>
-      <separator/>
-      <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'>
-#ifndef MIXBUS
-        <menuitem action='combine-regions'/>
-        <menuitem action='uncombine-regions'/>
-#endif
-        <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'/>
-        <menuitem action='raise-region'/>
-        <menuitem action='lower-region'/>
-        <menuitem action='lower-region-to-bottom'/>
-      </menu>
-      <menu action='RegionMenuMIDI'>
-        <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='fork-regions-from-unselected'/>
-        <menuitem action='deinterlace-midi'/>
-        <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='reset-region-gain'/>
-        <menuitem action='reset-region-gain-envelopes'/>
-        <menuitem action='toggle-region-polarity'/>
-        <menuitem action='toggle-region-gain-envelope-active'/>
-      </menu>
-      <menu action='RegionMenuPosition'>
-        <menuitem action='naturalize-region'/>
-        <menuitem action='snap-regions-to-grid'/>
-        <menuitem action='toggle-region-lock'/>
-        <menuitem action='toggle-region-video-lock'/>
-        <menuitem action='set-region-sync-position'/>
-        <menuitem action='remove-region-sync'/>
-        <menuitem action='nudge-forward'/>
-        <menuitem action='nudge-backward'/>
-        <menuitem action='nudge-forward-by-capture-offset'/>
-        <menuitem action='nudge-backward-by-capture-offset'/>
-        <menuitem action='sequence-regions'/>
-      </menu>
-      <menu action='RegionMenuMarkers'>
-        <menuitem action='add-region-cue-marker'/>
-        <menuitem action='clear-region-cue-markers'/>
-        <separator/>
-        <menuitem action='make-region-markers-cd'/>
-        <menuitem action='make-region-markers-global'/>
-      </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>
-      <menuitem action='export-region'/>
-      <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'/>
-#ifdef MIXBUS
-      <menuitem action='addExistingAudioFiles'/>
-      <menu action='MixTools'>
-          <menuitem action='lua-store-mixer-settings'/>
-              <menuitem action='lua-recall-mixer-settings'/>
-              <menuitem action='lua-reset-mixer'/>
-              <menuitem action='lua-manage-tracks'/>
-      </menu>
-#endif
-      <menuitem action='duplicate-routes'/>
-      <separator/>
-      <menuitem action='track-record-enable-toggle'/>
-      <menuitem action='track-solo-toggle'/>
-      <menuitem action='track-mute-toggle'/>
-      <menu action='TrackPlaylistMenu'>
-        <menuitem action='show-plist-selector'/>
-        <separator/>
-        <menuitem action='new-playlists-for-all-tracks'/>
-        <menuitem action='new-playlists-for-armed-tracks'/>
-        <menuitem action='new-playlists-for-selected-tracks'/>
-        <separator/>
-        <menuitem action='copy-playlists-for-all-tracks'/>
-        <menuitem action='copy-playlists-for-armed-tracks'/>
-        <menuitem action='copy-playlists-for-selected-tracks'/>
-      </menu>
-      <separator/>
-      <menuitem action='insert-time'/>
-      <menuitem action='remove-time'/>
-      <menuitem action='remove-gaps'/>
-      <separator/>
-      <menuitem action="move-selected-tracks-up"/>
-      <menuitem action="move-selected-tracks-down"/>
-      <menu action='TrackHeightMenu'>
-        <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>
-      <separator/>
-      <menuitem action='toggle-track-active'/>
-      <menuitem action='remove-track'/>
-      <separator/>
-    </menu>
-
-    <menu name='View' action = 'View'>
-      <menuitem action='ToggleMaximalEditor'/>
-      <menuitem action='ToggleMaximalMixer'/>
-
-      <separator/>
-      <menu name='LayerDisplay' action = 'LayerDisplay'>
-        <menuitem action='layer-display-stacked'/>
-        <menuitem action='layer-display-overlaid'/>
-      </menu>
-
-      <menu action="AutomationMenu">
-        <menuitem action="toggle-all-existing-automation"/>
-      </menu>
-
-      <separator/>
-
-      <menu action="PrimaryClockMenu">
-        <menuitem action='focus-on-clock'/>
-        <menuitem action="primary-clock-timecode"/>
-        <menuitem action="primary-clock-bbt"/>
-        <menuitem action="primary-clock-minsec"/>
-        <menuitem action="primary-clock-samples"/>
-      </menu>
-      <menu action="SecondaryClockMenu">
-        <menuitem action="secondary-clock-timecode"/>
-        <menuitem action="secondary-clock-bbt"/>
-        <menuitem action="secondary-clock-minsec"/>
-        <menuitem action="secondary-clock-samples"/>
-      </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-arrangement-ruler"/>
-        <menuitem action="toggle-marker-ruler"/>
-        <menuitem action="toggle-cue-marker-ruler"/>
-        <separator/>
-        <menuitem action="toggle-video-ruler"/>
-      </menu>
-      <separator/>
-      <menu action="ZoomMenu">
-        <menuitem action='temporal-zoom-in'/>
-        <menuitem action='temporal-zoom-out'/>
-        <menuitem action='zoom-to-session'/>
-        <menuitem action='zoom-to-extents'/>
-        <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'/>
-      </menu>
-      <menu name='ZoomFocus' action='ZoomFocus'>
-        <menuitem action='zoom-focus-left'/>
-        <menuitem action='zoom-focus-right'/>
-        <menuitem action='zoom-focus-center'/>
-        <menuitem action='zoom-focus-playhead'/>
-        <menuitem action='zoom-focus-mouse'/>
-        <menuitem action='zoom-focus-edit'/>
-        <menuitem action='cycle-zoom-focus'/>
-      </menu>
-      <menu action="ScrollMenu">
-        <menuitem action='scroll-tracks-down'/>
-        <menuitem action='scroll-tracks-up'/>
-        <menuitem action='scroll-forward'/>
-        <menuitem action='scroll-backward'/>
-      </menu>
-      <separator/>
-      <menu action="VideoMonitorMenu">
-        <menuitem action="zoom-vmon-100"/>
-        <menuitem action="toggle-vmon-letterbox"/>
-        <separator/>
-        <menuitem action="toggle-vmon-ontop"/>
-        <menuitem action="toggle-vmon-fullscreen"/>
-        <separator/>
-        <menuitem action="toggle-vmon-timecode"/>
-        <menuitem action="toggle-vmon-frame"/>
-        <menuitem action="toggle-vmon-osdbg"/>
-      </menu>
-      <separator/>
-      <menu action="SavedViewMenu">
-        <menuitem action='save-visual-state-1'/>
-        <menuitem action='goto-visual-state-1'/>
-        <menuitem action='save-visual-state-2'/>
-        <menuitem action='goto-visual-state-2'/>
-        <menuitem action='save-visual-state-3'/>
-        <menuitem action='goto-visual-state-3'/>
-        <menuitem action='save-visual-state-4'/>
-        <menuitem action='goto-visual-state-4'/>
-        <menuitem action='save-visual-state-5'/>
-        <menuitem action='goto-visual-state-5'/>
-        <menuitem action='save-visual-state-6'/>
-        <menuitem action='goto-visual-state-6'/>
-        <menuitem action='save-visual-state-7'/>
-        <menuitem action='goto-visual-state-7'/>
-        <menuitem action='save-visual-state-8'/>
-        <menuitem action='goto-visual-state-8'/>
-        <menuitem action='save-visual-state-9'/>
-        <menuitem action='goto-visual-state-9'/>
-        <menuitem action='save-visual-state-10'/>
-        <menuitem action='goto-visual-state-10'/>
-        <menuitem action='save-visual-state-11'/>
-        <menuitem action='goto-visual-state-11'/>
-        <menuitem action='save-visual-state-12'/>
-        <menuitem action='goto-visual-state-12'/>
-      </menu>
-
-      <separator/>
-
-      <menuitem action='show-editor-mixer'/>
-      <menuitem action='show-editor-list'/>
-
-      <menuitem action='ToggleSummary'/>
-      <menuitem action='ToggleGroupTabs'/>
-      <menuitem action='show-marker-lines'/>
-
-      <separator/>
-      <menuitem action='ToggleMixerList'/>
-#ifdef MIXBUS
-      <menuitem action='ToggleMixbusPane'/>
-#endif
-      <menuitem action='ToggleVCAPane'/>
-      <menuitem action='ToggleMonitorSection'/>
-      <menuitem action='ToggleFoldbackStrip'/>
-#ifdef MIXBUS
-      <separator/>
-      <menuitem action='ToggleStripCtrls'/>
-      <menuitem action='ToggleStripEQ'/>
-      <menuitem action='ToggleStripBus'/>
-#endif
-
-    </menu>
-    <menu action = 'WindowMenu'>
-      <menuitem action='toggle-audio-midi-setup'/>
-      <separator/>
-      <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='RecorderMenu'>
-        <menuitem action='show-recorder'/>
-        <menuitem action='hide-recorder'/>
-        <menuitem action='attach-recorder'/>
-        <menuitem action='detach-recorder'/>
-      </menu>
-      <menu action='TriggerMenu'>
-        <menuitem action='show-trigger'/>
-        <menuitem action='hide-trigger'/>
-        <menuitem action='attach-trigger'/>
-        <menuitem action='detach-trigger'/>
-      </menu>
-      <menu action='PrefsMenu'>
-        <menuitem action='show-preferences'/>
-        <menuitem action='hide-preferences'/>
-        <menuitem action='attach-preferences'/>
-        <menuitem action='detach-preferences'/>
-      </menu>
-      <!-- Common Ardour Widows (all toggle) !-->
-      <menuitem action='toggle-meterbridge'/>
-      <menuitem action='toggle-locations'/>
-      <menuitem action='toggle-big-clock'/>
-      <menuitem action='toggle-big-transport'/>
-      <menuitem action='toggle-virtual-keyboard'/>
-      <menuitem action='toggle-library-downloader'/>
-
-      <separator/><!-- Video Monitor !-->
-      <menuitem action='ToggleJadeo'/>
-
-      <separator/><!-- Connection dialogs !-->
-      <menuitem action='toggle-audio-connection-manager'/>
-      <menuitem action='toggle-midi-connection-manager'/>
-
-#ifndef MIXBUS
-      <separator/><!-- Ardour specific connection customization !-->
-      <menuitem action='toggle-inspector'/>
-      <menuitem action='toggle-bundle-manager'/>
-#if 0
-      <menuitem action='toggle-speaker-config'/>
-#endif
-#endif
-
-      <separator/><!-- Plugin Related !-->
-      <menuitem action='toggle-plugin-manager'/>
-#ifndef MIXBUS
-      <menuitem action='toggle-io-plugins'/>
-#endif
-#ifdef MIXBUS
-      <separator/>
-      <menuitem action='license-manager'/>
-#endif
-
-      <separator/><!-- Misc Configuration !-->
-      <menuitem action='toggle-luawindow'/>
-      <menuitem action='ManageTemplates'/>
-      <menuitem action='toggle-transport-masters'/>
-      <menuitem action='toggle-key-editor'/>
-
-      <separator/><!-- Performance measurement !-->
-      <menuitem action='toggle-plugin-dsp-load'/>
-      <menuitem action='toggle-dsp-statistics'/>
-#if 0
-      <menuitem action='toggle-idle-o-meter'/>
-#endif
-
-      <separator/><!-- Logging !-->
-      <menuitem action='NewMIDITracer'/>
-      <menuitem action='toggle-log-window'/>
-    </menu>
-
-    <menu name='Help' action='Help'>
-#ifndef __APPLE__
-      <menuitem action='toggle-about'/>
-#endif
-#ifdef MIXBUS
-      <menuitem action='website'/>
-      <menuitem action='tutorial'/>
-      <menuitem action='reference'/>
-      <menuitem action='videos'/>
-      <menuitem action='forums'/>
-#else
-      <menuitem action='chat'/>
-      <menuitem action='tutorial'/>
-      <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" accelerators='true'>
-    <menuitem action='show-editor'/>
-    <menuitem action='hide-editor'/>
-    <menuitem action='attach-editor'/>
-    <menuitem action='detach-editor'/>
-  </popup>
-
-  <popup action="mixerTabbableButtonMenu" accelerators='true'>
-    <menuitem action='show-mixer'/>
-    <menuitem action='hide-mixer'/>
-    <menuitem action='attach-mixer'/>
-    <menuitem action='detach-mixer'/>
-  </popup>
-
-  <popup action="recorderTabbableButtonMenu" accelerators='true'>
-    <menuitem action='show-recorder'/>
-    <menuitem action='hide-recorder'/>
-    <menuitem action='attach-recorder'/>
-    <menuitem action='detach-recorder'/>
-  </popup>
-
-  <popup action="preferencesTabbableButtonMenu" accelerators='true'>
-    <menuitem action='show-preferences'/>
-    <menuitem action='hide-preferences'/>
-    <menuitem action='attach-preferences'/>
-    <menuitem action='detach-preferences'/>
-  </popup>
-
-  <popup action="triggerTabbableButtonMenu" accelerators='true'>
-    <menuitem action='show-trigger'/>
-    <menuitem action='hide-trigger'/>
-    <menuitem action='attach-trigger'/>
-    <menuitem action='detach-trigger'/>
-  </popup>
-
-  <popup action="RulerMenuPopup" accelerators='true'>
-    <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"/>
-    <menuitem action="toggle-cue-marker-ruler"/>
-    <separator/>
-    <menuitem action="toggle-video-ruler"/>
-  </popup>
-
-  <popup name='ProcessorMenu' accelerators='true'>
-    <menuitem action='presets'/>
-    <menuitem action='edit'/>
-    <menuitem action='edit-generic'/>
-    <menuitem action='controls'/>
-    <menuitem action='rename'/>
-    <separator/>
-    <menuitem action='manage-pins'/>
-    <separator/>
-    <menuitem action='send_options'/>
-    <separator/>
-    <menuitem action='newplugin'/>
-    <menuitem action='newinsert'/>
-    <menuitem action='newsend'/>
-    <menuitem action='newaux'/>
-    <menuitem action='newlisten'/>
-    <menuitem action='removelisten'/>
-    <separator/>
-    <menuitem action='clear'/>
-    <menuitem action='clear_pre'/>
-    <menuitem action='clear_post'/>
-    <separator/>
-    <menuitem action='cut'/>
-    <menuitem action='copy'/>
-    <menuitem action='paste'/>
-    <menuitem action='delete'/>
-    <separator/>
-    <menuitem action='selectall'/>
-    <menuitem action='deselectall'/>
-    <separator/>
-    <menuitem action='activate_all'/>
-    <menuitem action='deactivate_all'/>
-#ifndef MIXBUS
-    <menuitem action='ab_plugins'/>
-#endif
-    <separator/>
-#ifndef MIXBUS
-    <menu action="disk-io-menu">
-      <menuitem action='disk-io-prefader'/>
-      <menuitem action='disk-io-postfader'/>
-      <menuitem action='disk-io-custom'/>
-    </menu>
-#endif
-    <menuitem action='custom-volume-pos'/>
-    <separator/>
-  </popup>
-
-  <popup name='ShuttleUnitPopup' accelerators='true'>
-    <menuitem action='SetShuttleUnitsPercentage'/>
-    <menuitem action='SetShuttleUnitsSemitones'/>
-  </popup>
-
-  <popup name='RegionListMenu' accelerators='true'>
-    <menuitem action='rlAudition'/>
-    <separator/>
-    <menuitem action='addExternalAudioToRegionList'/>
-    <separator/>
-    <menuitem action='removeUnusedRegions'/>
-  </popup>
-
-  <popup name='PopupRegionMenu' action='PopupRegionMenu' accelerators='true'>
-    <menuitem action='play-selected-regions'/>
-    <menuitem action='tag-selected-regions'/>
-    <separator/>
-    <menuitem action='group-selected-regions'/>
-    <menuitem action='ungroup-selected-regions'/>
-    <separator/>
-    <menuitem action='loop-region'/>
-    <menuitem action='rename-region'/>
-    <menuitem action='show-region-properties'/>
-    <menu action='RegionMenuEdit'>
-      <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='fork-regions-from-unselected'/>
-      <menuitem action='deinterlace-midi'/>
-      <menuitem action='show-region-list-editor'/>
-    </menu>
-    <menu action='RegionMenuPosition'>
-      <menuitem action='naturalize-region'/>
-      <menuitem action='toggle-region-lock'/>
-      <menuitem action='toggle-region-video-lock'/>
-      <menuitem action='snap-regions-to-grid'/>
-      <menuitem action='set-region-sync-position'/>
-      <menuitem action='remove-region-sync'/>
-      <menuitem action='nudge-forward'/>
-      <menuitem action='nudge-backward'/>
-      <menuitem action='nudge-forward-by-capture-offset'/>
-      <menuitem action='nudge-backward-by-capture-offset'/>
-      <menuitem action='sequence-regions'/>
-    </menu>
-    <menu action='RegionMenuMarkers'>
-      <menuitem action='add-region-cue-marker'/>
-      <menuitem action='clear-region-cue-markers'/>
-      <separator/>
-      <menuitem action='make-region-markers-cd'/>
-      <menuitem action='make-region-markers-global'/>
-    </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='RegionMenuLayering'>
-      <menuitem action='raise-region-to-top'/>
-      <menuitem action='raise-region'/>
-      <menuitem action='lower-region'/>
-      <menuitem action='lower-region-to-bottom'/>
-    </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='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='reset-region-gain'/>
-      <menuitem action='reset-region-gain-envelopes'/>
-      <menuitem action='toggle-region-polarity'/>
-      <menuitem action='toggle-region-gain-envelope-active'/>
-    </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>
-    <menuitem action='export-region'/>
-    <menuitem action='bounce-regions-unprocessed'/>
-#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>
diff --git a/gtk2_ardour/opts.cc b/gtk2_ardour/opts.cc
index c9402067f6..dbcd0655f9 100644
--- a/gtk2_ardour/opts.cc
+++ b/gtk2_ardour/opts.cc
@@ -50,7 +50,7 @@ bool ARDOUR_COMMAND_LINE::new_session = false;
 bool ARDOUR_COMMAND_LINE::try_hw_optimization = true;
 bool ARDOUR_COMMAND_LINE::no_connect_ports = false;
 string ARDOUR_COMMAND_LINE::keybindings_path = ""; /* empty means use builtin default */
-std::string ARDOUR_COMMAND_LINE::menus_file = std::string (PBD::downcase(PROGRAM_NAME)) + ".menus";
+std::string ARDOUR_COMMAND_LINE::menus_file = "ardour.menus";
 bool ARDOUR_COMMAND_LINE::finder_invoked_ardour = false;
 string ARDOUR_COMMAND_LINE::load_template;
 bool ARDOUR_COMMAND_LINE::check_announcements = true;