set ARDOUR_SURFACES_PATH for a bundle, just like ARDOUR_PANNER_PATH

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

diff --git a/gtk2_ardour/ardour.menus.in b/gtk2_ardour/ardour.menus.in
index c6dbc010473b7d02587729475baf22034c835746..ef3201e05f5c98f130e79fa57fe7b1b32b9ce616 100644 (file)
--- a/gtk2_ardour/ardour.menus.in
+++ b/gtk2_ardour/ardour.menus.in
@@ -1,5 +1,13 @@
 <ui>
 
+    <accelerator action='set-mouse-mode-object'/>
+    <accelerator action='set-mouse-mode-range'/>
+    <accelerator action='set-mouse-mode-gain'/>
+    <accelerator action='set-mouse-mode-zoom'/>
+    <accelerator action='set-mouse-mode-timefx'/>
+    <accelerator action='set-mouse-mode-object-range'/>
+    <accelerator action='toggle-internal-edit'/>
+
     <menubar name='Main' action='MainMenu'>
         <menu name='Session' action='Session'>
            <menuitem action='New'/>
@@ -162,6 +170,9 @@
                    <menuitem action='start-range'/>
                    <menuitem action='finish-range'/>
                    <menuitem action='finish-add-range'/>
+                  <separator/>
+                   <menuitem action='select-next-route'/>
+                   <menuitem action='select-prev-route'/>
               </menu>     
               <separator/>
                <menuitem action='editor-delete'/>
@@ -192,30 +203,12 @@
                <separator/>       
               <menuitem action='remove-last-capture'/>
               <separator/>
-              <menu action='KeyMouseActions'>
-                   <menuitem action='select-next-route'/>
-                   <menuitem action='select-prev-route'/>
-                  <menuitem action='brush-at-mouse'/>
-                  <separator/>
-                  <menuitem action='step-mouse-mode'/>
-                  <menuitem action='set-mouse-mode-object'/>
-                  <menuitem action='set-mouse-mode-range'/>
-                  <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/>
-                  <menuitem action='cycle-edit-point'/>
-                  <menuitem action='cycle-edit-point-with-marker'/>
-                  <menuitem action='toggle-edit-mode'/>
-                  <separator/>
-                  <menuitem action='boost-region-gain'/>
-                  <menuitem action='cut-region-gain'/>
-                  <separator/>
-                  <menuitem action='escape'/>
-             </menu>
+              <menu action="EditPointMenu">
+                  <menuitem action='cycle-edit-point'/>
+                  <menuitem action='cycle-edit-point-with-marker'/>
+              </menu>
+              <menuitem action='toggle-edit-mode'/>
+              <separator/>
               <menu action="TempoMenu">
                      <menuitem action='set-tempo-from-region'/>
                      <menuitem action='set-tempo-from-edit-range'/>
@@ -379,10 +372,20 @@
                   <menuitem action='snap-to-seconds'/>
                   <menuitem action='snap-to-minutes'/>
                   <menuitem action='snap-to-thirtyseconds'/>
+                  <menuitem action='snap-to-twentyeighths'/>
+                  <menuitem action='snap-to-twentyfourths'/>
+                  <menuitem action='snap-to-twentieths'/>
                   <menuitem action='snap-to-asixteenthbeat'/>
+                  <menuitem action='snap-to-fourteenths'/>
+                  <menuitem action='snap-to-twelfths'/>
+                  <menuitem action='snap-to-tenths'/>
                   <menuitem action='snap-to-eighths'/>
+                  <menuitem action='snap-to-sevenths'/>
+                  <menuitem action='snap-to-sixths'/>
+                  <menuitem action='snap-to-fifths'/>
                   <menuitem action='snap-to-quarters'/>
                   <menuitem action='snap-to-thirds'/>
+                  <menuitem action='snap-to-halves'/>
                   <menuitem action='snap-to-beat'/>
                   <menuitem action='snap-to-bar'/>
                   <menuitem action='snap-to-mark'/>