clean up plugin-ui meter layout

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

diff --git a/gtk2_ardour/ardour.menus.in b/gtk2_ardour/ardour.menus.in
index 608f4dd6e4f4147426f1aeca897778eab1b7b565..15f1bde1b624c62a3125fff5c5a1911fc8904f78 100644 (file)
--- a/gtk2_ardour/ardour.menus.in
+++ b/gtk2_ardour/ardour.menus.in
@@ -34,31 +34,30 @@
       <separator/>
       <menuitem action='addExistingAudioFiles'/>
       <!--menuitem action='importFromSession'/-->
-#ifdef WITH_VIDEOTIMELINE
+
+#ifndef NOVIDEOTIMELINE
       <menuitem action='OpenVideo'/>
       <menuitem action='CloseVideo'/>
 #endif
       <menu name='Export' action='Export'>
         <menuitem action='ExportAudio'/>
         <menuitem action='StemExport'/>
-#ifdef WITH_VIDEOTIMELINE
         <menuitem action='ExportVideo'/>
-#endif
       </menu>
       <menu name='Cleanup' action='Cleanup'>
         <menuitem action='CleanupUnused'/>
         <menuitem action='FlushWastebasket'/>
       </menu>
-#ifndef GTKOSX
       <separator/>
+      <menuitem action='toggle-session-options-editor'/>
+#ifdef GTKOSX      
+      <menuitem action='toggle-about'/>
+      <menuitem action='toggle-rc-options-editor'/>
 #endif
-      <menuitem action='ToggleSessionOptionsEditor'/>
-#ifdef GTKOSX
-      <menuitem action='ToggleRCOptionsEditor'/>
-      <menuitem action='About'/>
-#endif
+#ifndef GTKOSX
       <separator/>
       <menuitem action='Quit'/>
+#endif
     </menu>
 
     <menu name='Transport' action='Transport'>
@@ -233,7 +232,7 @@
       <menuitem action='set-mouse-mode-object-range'/>
 #ifndef GTKOSX
       <separator/>
-      <menuitem action='ToggleRCOptionsEditor'/>
+      <menuitem action='toggle-rc-options-editor'/>
 #endif
     </menu>         
 
@@ -283,7 +282,7 @@
         <menuitem action='snap-regions-to-grid'/>
         <menuitem action='toggle-region-lock'/>
         <menuitem action='toggle-region-lock-style'/>
-#ifdef WITH_VIDEOTIMELINE
+#ifndef NOVIDEOTIMELINE
         <menuitem action='toggle-region-video-lock'/>
 #endif
         <menuitem action='set-region-sync-position'/>
@@ -437,11 +436,22 @@
         <menuitem action="toggle-loop-punch-ruler"/>
         <menuitem action="toggle-cd-marker-ruler"/>
         <menuitem action="toggle-marker-ruler"/>
-#ifdef WITH_VIDEOTIMELINE
         <separator/>
+#ifndef NOVIDEOTIMELINE
         <menuitem action="toggle-video-ruler"/>
 #endif
       </menu>
+      <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>
       <menu action="ScrollMenu">
         <menuitem action='scroll-tracks-down'/>
         <menuitem action='scroll-tracks-up'/>
@@ -501,24 +511,23 @@
     </menu>
     <menu action = 'WindowMenu'>
       <menuitem action='toggle-mixer'/>
-      <menuitem action='toggle-mixer-on-top'/>
+      <menuitem action='toggle-meterbridge'/>
+      <menuitem action='toggle-editor-mixer'/>
 
       <separator/>
 
-      <menuitem action='ToggleInspector'/>
-      <menuitem action='ToggleLocations'/>
-      <menuitem action='ToggleKeyEditor'/>
-      <menuitem action='ToggleBundleManager'/>
-      <menuitem action='ToggleThemeManager'/>
-      <menuitem action='ToggleBigClock'/>
+      <menuitem action='toggle-inspector'/>
+      <menuitem action='toggle-locations'/>
+      <menuitem action='toggle-key-editor'/>
+      <menuitem action='toggle-bundle-manager'/>
+      <menuitem action='toggle-theme-manager'/>
+      <menuitem action='toggle-big-clock'/>
       <menuitem action='toggle-speaker-config'/>
 
       <separator/>
 
-#ifdef WITH_VIDEOTIMELINE
       <menuitem action='ToggleJadeo'/>
       <separator/>
-#endif
 
       <menuitem action='NewMIDITracer'/>
       <menuitem action='toggle-audio-connection-manager'/>
@@ -528,7 +537,7 @@
     </menu>
     <menu name='Help' action='Help'>
 #ifndef GTKOSX
-      <menuitem action='About'/>
+      <menuitem action='toggle-about'/>
 #endif
       <menuitem action='Chat'/>
       <menuitem action='Manual'/>
@@ -549,9 +558,9 @@
     <menuitem action="toggle-marker-ruler"/>
     <menuitem action="toggle-cd-marker-ruler"/>
     <menuitem action="toggle-loop-punch-ruler"/>
-#ifdef WITH_VIDEOTIMELINE
-         <separator/>
-         <menuitem action="toggle-video-ruler"/>
+#ifndef NOVIDEOTIMELINE
+    <separator/>
+    <menuitem action="toggle-video-ruler"/>
 #endif
   </popup>
 
@@ -648,7 +657,7 @@
       <menuitem action='naturalize-region'/>
       <menuitem action='toggle-region-lock'/>
       <menuitem action='toggle-region-lock-style'/>
-#ifdef WITH_VIDEOTIMELINE
+#ifndef NOVIDEOTIMELINE
       <menuitem action='toggle-region-video-lock'/>
 #endif
       <menuitem action='snap-regions-to-grid'/>