remove Glib::ustring from gtk2_ardour

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

diff --git a/gtk2_ardour/ardour.menus.in b/gtk2_ardour/ardour.menus.in
index 6cf7f0dbb99d488946708364e8ae25696e73bb15..307a9a817534a6c931c24fb8116bb93858987099 100644 (file)
--- a/gtk2_ardour/ardour.menus.in
+++ b/gtk2_ardour/ardour.menus.in
@@ -29,9 +29,10 @@
                <menuitem action='CleanupUnused'/>
                <menuitem action='FlushWastebasket'/>
            </menu>
+#ifndef GTKOSX
            <separator/>
+#endif
            <menuitem action='ToggleSessionOptionsEditor'/>
-           <separator/>
 #ifdef GTKOSX
            <menuitem action='ToggleRCOptionsEditor'/>
            <menuitem action='About'/>
@@ -215,6 +216,7 @@
                   <menuitem action='set-mouse-mode-gain'/>
                   <menuitem action='set-mouse-mode-zoom'/>
                   <menuitem action='set-mouse-mode-timefx'/>
+                  <menuitem action='set-mouse-mode-object-range'/>
                   <separator/>
                   <menuitem action='toggle-internal-edit'/>
                   <separator/>
@@ -264,6 +266,7 @@
              <menuitem action='region-fill-track'/>
              <separator/>
              <menuitem action='loop-region'/>
+             <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'/>
@@ -297,6 +300,26 @@
        </menu>
 
         <menu name='View' action = 'View'>
+               <menuitem action='ToggleMaximalEditor'/>
+               <menuitem action='KeepTearoffs'/>
+
+               <separator/>
+
+              <menu action="PrimaryClockMenu">
+                    <menuitem action="primary-clock-bbt"/>
+                    <menuitem action="primary-clock-minsec"/>
+                    <menuitem action="primary-clock-samples"/>
+                    <menuitem action="primary-clock-off"/>
+              </menu>
+              <menu action="SecondaryClockMenu">
+                    <menuitem action="secondary-clock-bbt"/>
+                    <menuitem action="secondary-clock-minsec"/>
+                    <menuitem action="secondary-clock-samples"/>
+                    <menuitem action="secondary-clock-off"/>
+              </menu>
+
+               <separator/>
+
               <menu action="ZoomMenu">
                             <menuitem action='temporal-zoom-in'/>
                             <menuitem action='temporal-zoom-out'/>
@@ -341,18 +364,7 @@
                   <menuitem action='snap-to-region-sync'/>
                   <menuitem action='snap-to-region-boundary'/>
                </menu>
-              <menu action="PrimaryClockMenu">
-                    <menuitem action="primary-clock-bbt"/>
-                    <menuitem action="primary-clock-minsec"/>
-                    <menuitem action="primary-clock-samples"/>
-                    <menuitem action="primary-clock-off"/>
-              </menu>
-              <menu action="SecondaryClockMenu">
-                    <menuitem action="secondary-clock-bbt"/>
-                    <menuitem action="secondary-clock-minsec"/>
-                    <menuitem action="secondary-clock-samples"/>
-                    <menuitem action="secondary-clock-off"/>
-              </menu>
+
               <menu action="RulerMenu">
                     <menuitem action="toggle-minsec-ruler"/>
                     <menuitem action="toggle-samples-ruler"/>
@@ -397,7 +409,8 @@
                             <menuitem action='goto-visual-state-12'/>
               </menu>
 
-              <menuitem action='ToggleMaximalEditor'/>
+               <separator/>
+
               <menuitem action='show-editor-mixer'/>
               <menuitem action='show-editor-list'/>
                <menuitem action='ToggleMeasureVisibility'/>
@@ -420,17 +433,21 @@
                </menu>
         </menu>
         <menu action = 'WindowMenu'>
-              <menuitem action='ToggleMaximalEditor'/>
-              <separator/>
                <menuitem action='goto-editor'/>
                <menuitem action='goto-mixer'/>
                <menuitem action='toggle-editor-mixer-on-top'/>
+
+              <separator/>
+
                <menuitem action='ToggleInspector'/>
                <menuitem action='ToggleLocations'/>
                <menuitem action='ToggleKeyEditor'/>
                <menuitem action='ToggleBundleManager'/>
                <menuitem action='ToggleThemeManager'/>
                <menuitem action='ToggleBigClock'/>
+
+              <separator/>
+
                <menuitem action='NewMIDITracer'/>
                <menuitem action='toggle-audio-connection-manager'/>
                <menuitem action='toggle-midi-connection-manager'/>
@@ -442,6 +459,8 @@
             <menuitem action='About'/>
 #endif
              <menuitem action='Chat'/>
+            <menuitem action='Manual'/>
+            <menuitem action='Reference'/>
        </menu>
      </menubar>