L: menu organization (incl. return of the Session Properties)

gtk2_ardour/livetrax.menus.in

@@ -19,6 +19,8 @@
 #ifdef __APPLE__
       <menuitem action='toggle-about'/>
 #endif
+      <separator/>
+      <menuitem action='toggle-session-options-editor'/>
       <separator/>
       <menuitem action='lock'/>
 #ifndef __APPLE__
@@ -34,15 +36,16 @@
       <menuitem action='record-roll'/>
       <separator/>
       <menu action="MovePlayHeadMenu">
-        <menuitem action='add-location-from-playhead'/>
-        <menuitem action='jump-forward-to-mark'/>
-        <menuitem action='jump-backward-to-mark'/>
+        <menuitem action='set-playhead'/>
         <menuitem action='GotoStart'/>
         <menuitem action='GotoEnd'/>
       </menu>
-      <menuitem action='solo-selection'/>
       <separator/>
-      <menuitem action='set-playhead'/>
+        <menuitem action='add-location-from-playhead'/>
+        <menuitem action='add-section-from-playhead'/>
+        <menuitem action='jump-forward-to-mark'/>
+        <menuitem action='jump-backward-to-mark'/>
+      <separator/>
       <separator/>
       <menuitem action='ToggleFollowEdits'/>
       <menuitem action='ToggleAutoReturn'/>
@@ -59,21 +62,11 @@
       <menuitem action='editor-delete'/>
       <menuitem action='editor-crop'/>
       <separator/>
+      <menuitem action='solo-selection'/>
+      <separator/>
       <menuitem action='select-loop-range'/>
       <separator/>
       <menuitem action='split-region'/>
-      <menu action="SelectMenu">
-        <menuitem action='select-all-objects'/>
-        <menuitem action='invert-selection'/>
-      </menu>
-      <menu action='RegionMenuEdit'>
-        <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='toggle-region-lock'/>
-      </menu>
         <separator/>
         <menuitem action='start-range'/>
         <menuitem action='finish-range'/>
@@ -81,6 +74,18 @@
      <menuitem action='remove-last-capture'/>
     </menu>
 
+    <menu name='RegionMenu' action='RegionMenu'>
+       <menu action="SelectMenu">
+         <menuitem action='select-all-objects'/>
+         <menuitem action='invert-selection'/>
+       </menu>
+       <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='toggle-region-lock'/>
+    </menu>
 
     <menu action='TrackMenu'>
       <menuitem action='AddTrackBus'/>
@@ -95,7 +100,6 @@
         <menuitem action="primary-clock-minsec"/>
         <menuitem action="primary-clock-samples"/>
      </menu>
-     <menuitem action='ToggleGroupTabs'/>
      <menu action="ZoomMenu">
         <menuitem action="fit-selection"/>
         <menuitem action="zoom-to-selection"/>
@@ -103,7 +107,8 @@
         <menuitem action='temporal-zoom-out'/>
         <menuitem action='zoom-to-session'/>
       </menu>
-    </menu>
+      <menuitem action='ToggleGroupTabs'/>
+   </menu>
 
     <menu action = 'WindowMenu'>
      <menuitem action='toggle-audio-midi-setup'/>