Fix session-open after selecting new, template, then back

[ardour.git] / gtk2_ardour / ardour.menus.in

diff --git a/gtk2_ardour/ardour.menus.in b/gtk2_ardour/ardour.menus.in
index 7d18d17d11e154d9f9459dab0e1aca580a0e0d10..668df5c905ff088b0d6c99a26410aebcd407c2a0 100644 (file)
--- a/gtk2_ardour/ardour.menus.in
+++ b/gtk2_ardour/ardour.menus.in
@@ -15,10 +15,6 @@
 #endif
       <menuitem action='SaveTemplate'/>
       <menuitem action='Archive'/>
-      <menu name='Metadata' action='Metadata'>
-        <menuitem action='EditMetadata'/>
-        <menuitem action='ImportMetadata'/>
-      </menu>
       <separator/>
       <menuitem action='AddTrackBus'/>
       <separator/>
@@ -28,11 +24,6 @@
 #endif
       <!--menuitem action='importFromSession'/-->
 
-      <menu name='Scripting' action='Scripting'>
-        <menuitem action='AddLuaScript'/>
-        <menuitem action='RemoveLuaScript'/>
-      </menu>
-
       <menuitem action='OpenVideo'/>
       <menuitem action='CloseVideo'/>
 
@@ -41,14 +32,18 @@
         <menuitem action='StemExport'/>
         <menuitem action='ExportVideo'/>
       </menu>
+      <separator/>
+      <menuitem action='toggle-session-options-editor'/>
+      <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='CleanupUnused'/>
         <menuitem action='FlushWastebasket'/>
       </menu>
-      <separator/>
-      <menuitem action='toggle-session-options-editor'/>
 #ifdef __APPLE__
       <menuitem action='toggle-about'/>
 #endif
@@ -74,6 +69,8 @@
       <menuitem action='record-roll'/>
       <menuitem action='ToggleRollForgetCapture'/>
       <menuitem action='Record'/>
+      <menuitem action='RecordPreroll'/>
+      <menuitem action='RecordCountIn'/>
 #if 0
       <menuitem action='toggle-skip-playback'/>
 #endif
@@ -285,7 +282,7 @@
       </menu>
       <menuitem action='set-mouse-mode-object-range'/>
       <separator/>
-      <menu action="ActionScripts">
+      <menu action="LuaScripts">
         <menuitem action='toggle-script-manager'/>
         <separator/>
         <menuitem action='script-action-1'/>
@@ -346,6 +343,7 @@
         <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-gain-envelope-active'/>
       </menu>
@@ -561,13 +559,11 @@
         <menuitem action='detach-preferences'/>
       </menu>
       <menuitem action='toggle-meterbridge'/>
-      <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'/>
 #endif
@@ -575,20 +571,26 @@
 #if 0
       <menuitem action='toggle-speaker-config'/>
 #endif
-
-      <separator/>
-#ifdef MIXBUS
-      <menuitem action='license-manager'/>
-
-      <separator/>
+#if 0
+      <menuitem action='toggle-idle-o-meter'/>
 #endif
 
+      <separator/>
       <menuitem action='ToggleJadeo'/>
       <separator/>
 
-      <menuitem action='NewMIDITracer'/>
       <menuitem action='toggle-audio-connection-manager'/>
       <menuitem action='toggle-midi-connection-manager'/>
+      <separator/>
+      <menuitem action='toggle-luawindow'/>
+      <menuitem action='ManageTemplates'/>
+      <menuitem action='toggle-key-editor'/>
+      <separator/>
+#ifdef MIXBUS
+      <menuitem action='license-manager'/>
+      <separator/>
+#endif
+      <menuitem action='NewMIDITracer'/>
       <menuitem action='toggle-log-window'/>
       <separator/>
     </menu>
@@ -659,9 +661,7 @@
     <menuitem action='newaux'/>
     <separator/>
     <menuitem action='controls'/>
-#ifndef MIXBUS
     <menuitem action='send_options'/>
-#endif
     <separator/>
     <menuitem action='clear'/>
     <menuitem action='clear_pre'/>
@@ -791,6 +791,7 @@
       <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-gain-envelope-active'/>
     </menu>