Fix restore of track visibility from state files (#3245)

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

diff --git a/gtk2_ardour/ardour.menus.in b/gtk2_ardour/ardour.menus.in
index bd2c4dda62badceb8702e5a74c0483d471879822..e6ae76a74eaa6b621100578f5b4310d4282749c9 100644 (file)
--- a/gtk2_ardour/ardour.menus.in
+++ b/gtk2_ardour/ardour.menus.in
@@ -8,6 +8,7 @@
            <menuitem action='Close'/>
            <separator/>
            <menuitem action='Save'/>
+           <menuitem action='SaveAs'/>
            <menuitem action='Snapshot'/>
            <menuitem action='SaveTemplate'/>
            <menu name='Metadata' action='Metadata'>
@@ -49,6 +50,7 @@
               </menu>
                <menuitem action='record-roll'/>
                <menuitem action='Record'/>
+               <menuitem action='ToggleRollMaybe'/>
                <menuitem action='ToggleRollForgetCapture'/>
               <menu action="SetLoopMenu">
                       <menuitem action='set-loop-from-edit-range'/>
@@ -228,7 +230,7 @@
                   <menuitem action='boost-region-gain'/>
                   <menuitem action='cut-region-gain'/>
                   <separator/>
-                  <menuitem action='break-drag'/>
+                  <menuitem action='escape'/>
              </menu>
               <menu action="TempoMenu">
                      <menuitem action='set-tempo-from-region'/>
@@ -270,6 +272,8 @@
              <menuitem action='set-punch-from-region'/>
              <menuitem action='add-range-marker-from-region'/>
              <menuitem action='add-range-markers-from-region'/>
+             <separator/>
+             <menuitem action='toggle-rhythm-ferret'/>
        </menu>
 
         <menu action='TrackMenu'>
@@ -280,12 +284,13 @@
                <menu action='TrackHeightMenu'>
                     <menuitem action='fit-tracks'/>
                     <menuitem action='track-height-largest'/>
-                    <menuitem action='track-height-large'/>
                     <menuitem action='track-height-larger'/>
+                    <menuitem action='track-height-large'/>
                     <menuitem action='track-height-normal'/>
                     <menuitem action='track-height-smaller'/>
                     <menuitem action='track-height-small'/>
                </menu>
+                <menuitem action='track-record-enable-toggle'/>
                <menuitem action='toggle-track-active'/>        
                <menuitem action='remove-track'/>       
        </menu>
@@ -304,8 +309,8 @@
                    <menuitem action='zoom-focus-right'/>
                    <menuitem action='zoom-focus-center'/>
                    <menuitem action='zoom-focus-playhead'/>
-                   <menuitem action='zoom-focus-edit'/>
                    <menuitem action='zoom-focus-mouse'/>
+                   <menuitem action='zoom-focus-edit'/>
                </menu>
               <menu name='SnapMode' action='SnapMode'>
                   <menuitem action='snap-off'/>
@@ -395,7 +400,6 @@
               <menuitem action='show-editor-mixer'/>
               <menuitem action='show-editor-list'/>
                <menuitem action='ToggleMeasureVisibility'/>
-               <menuitem action='ToggleWaveformsWhileRecording'/>
                <menuitem action='ToggleSummary'/>
                <menuitem action='ToggleGroupTabs'/>
         </menu>
@@ -426,15 +430,16 @@
                <menuitem action='ToggleBundleManager'/>
                <menuitem action='ToggleThemeManager'/>
                <menuitem action='ToggleBigClock'/>
-               <menuitem action='toggle-rhythm-ferret'/>
-               <menuitem action='toggle-bundle-manager'/>
                <menuitem action='toggle-audio-connection-manager'/>
                <menuitem action='toggle-midi-connection-manager'/>
                <menuitem action='toggle-log-window'/>
               <separator/>
         </menu>
         <menu name='Help' action='Help'>
+#ifndef GTKOSX
             <menuitem action='About'/>
+#endif
+             <menuitem action='Chat'/>
        </menu>
      </menubar>
 
@@ -457,7 +462,7 @@
         <menuitem action='newplugin'/>
         <menuitem action='newinsert'/>
         <menuitem action='newsend'/>
-        <menuitem action='newreturn'/>
+         <menuitem action='newaux'/>
          <separator/>
         <menuitem action='clear'/>
         <menuitem action='clear_pre'/>
@@ -473,11 +478,9 @@
         <menuitem action='selectall'/>
         <menuitem action='deselectall'/>
          <separator/>
-        <menuitem action='activate'/>
-        <menuitem action='deactivate'/>
-         <separator/>
         <menuitem action='activate_all'/>
         <menuitem action='deactivate_all'/>
+        <menuitem action='ab_plugins'/>
          <separator/>
         <menuitem action='edit'/>
       </popup>
@@ -490,7 +493,7 @@
      <popup name='RegionListMenu'>
          <menuitem action='rlAudition'/>
          <menuitem action='rlHide'/>
-         <menuitem action='rlRemove'/>
+         <menuitem action='rlShow'/>
          <separator/>
          <menuitem action='rlShowAll'/>
          <menuitem action='rlShowAuto'/>
@@ -512,27 +515,4 @@
          <separator/>
          <menuitem action='addExternalAudioToRegionList'/>            
      </popup>
-     <popup name='processormenu'>
-         <menuitem action='newplugin'/>
-         <menuitem action='newinsert'/>
-         <menuitem action='newsend'/>
-         <menuitem action='newreturn'/>
-         <separator/>
-         <menuitem action='clear'/>
-         <separator/>
-         <menuitem action='cut'/>
-         <menuitem action='copy'/>
-         <menuitem action='paste'/>
-         <menuitem action='delete'/>
-         <separator/>
-         <menuitem action='rename'/>
-         <separator/>
-         <menuitem action='selectall'/>
-         <menuitem action='deselectall'/>
-         <separator/>
-         <menuitem action='activate_all'/>
-         <menuitem action='deactivate_all'/>
-         <separator/>
-         <menuitem action='edit'/>
-     </popup>
 </ui>