summaryrefslogtreecommitdiff
path: root/gtk2_ardour/ardour.menus
diff options
context:
space:
mode:
Diffstat (limited to 'gtk2_ardour/ardour.menus')
-rw-r--r--gtk2_ardour/ardour.menus76
1 files changed, 58 insertions, 18 deletions
diff --git a/gtk2_ardour/ardour.menus b/gtk2_ardour/ardour.menus
index 6f11572151..54060c06aa 100644
--- a/gtk2_ardour/ardour.menus
+++ b/gtk2_ardour/ardour.menus
@@ -80,23 +80,6 @@
<menuitem action='editor-paste'/>
<menuitem action='remove-last-capture'/>
<separator/>
- <menu action="EditSelectRangeOptions">
- <menuitem action='extend-range-to-start-of-region'/>
- <menuitem action='extend-range-to-end-of-region'/>
- <menuitem action='start-range'/>
- <menuitem action='finish-range'/>
- <menuitem action='finish-add-range'/>
- </menu>
- <menu action="EditSelectRegionOptions">
- <menuitem action='select-all'/>
- <menuitem action='select-all-after-edit-cursor'/>
- <menuitem action='select-all-before-edit-cursor'/>
- <menuitem action='select-all-after-playhead'/>
- <menuitem action='select-all-before-playhead'/>
- <menuitem action='select-all-between-cursors'/>
- <menuitem action='select-all-in-punch-range'/>
- <menuitem action='select-all-in-loop-range'/>
- </menu>
<menu action='EditCursorMovementOptions'>
<menuitem action='edit-cursor-to-next-region-start'/>
<menuitem action='edit-cursor-to-next-region-end'/>
@@ -109,6 +92,7 @@
<menuitem action='edit-cursor-to-range-start'/>
<menuitem action='edit-cursor-to-range-end'/>
</menu>
+<<<<<<< .working
<menu action='RegionEditOps'>
<menuitem action='crop'/>
<menuitem action='duplicate-region'/>
@@ -119,11 +103,20 @@
<menuitem action="nudge-next-forward"/>
<menuitem action="nudge-backward"/>
<menuitem action="nudge-next-backward"/>
+ <separator/>
+ <menuitem action='align-regions-start'/>
+ <menuitem action='align-regions-start-relative'/>
+ <menuitem action='align-regions-end'/>
+ <menuitem action='align-regions-end-relative'/>
+ <menuitem action='align-regions-sync'/>
+ <menuitem action='align-regions-sync-relative'/>
</menu>
+=======
+>>>>>>> .merge-right.r2626
<menu name='KeyMouse Actions' action='KeyMouse Actions'>
<menuitem action='audition-at-mouse'/>
<menuitem action='brush-at-mouse'/>
- <menuitem action='set-edit-cursor'/>
+ <menuitem action='set-edit-point'/>
<menuitem action='mute-unmute-region'/>
<menuitem action='set-playhead'/>
<menuitem action='split-region'/>
@@ -136,6 +129,52 @@
<menuitem action='set-mouse-mode-timefx'/>
</menu>
</menu>
+ <menu name='Select' action='Select'>
+ <menuitem action='select-range-between-cursors'/>
+ <menuitem action='extend-range-to-start-of-region'/>
+ <menuitem action='extend-range-to-end-of-region'/>
+ <menuitem action='start-range'/>
+ <menuitem action='finish-range'/>
+ <menuitem action='finish-add-range'/>
+ <separator/>
+ <menuitem action='select-all'/>
+ <menuitem action='select-all-after-edit-cursor'/>
+ <menuitem action='select-all-before-edit-cursor'/>
+ <menuitem action='select-all-after-playhead'/>
+ <menuitem action='select-all-before-playhead'/>
+ <menuitem action='select-all-between-cursors'/>
+ <menuitem action='select-all-within-cursors'/>
+ <menuitem action='select-all-in-punch-range'/>
+ <menuitem action='select-all-in-loop-range'/>
+ </menu>
+ <menu name='Regions' action='Regions'>
+ <menuitem action='crop'/>
+ <menuitem action='duplicate-region'/>
+ <menuitem action='insert-region'/>
+ <menuitem action='normalize-region'/>
+ <separator/>
+ <menuitem action="nudge-forward"/>
+ <menuitem action="nudge-next-forward"/>
+ <menuitem action="nudge-backward"/>
+ <menuitem action="nudge-next-backward"/>
+ <menuitem action='split-region'/>
+ <menuitem action='set-region-sync-position'/>
+ <separator/>
+ <menuitem action='align-regions-start'/>
+ <menuitem action='align-regions-start-relative'/>
+ <menuitem action='align-regions-end'/>
+ <menuitem action='align-regions-end-relative'/>
+ <menuitem action='align-regions-sync'/>
+ <menuitem action='align-regions-sync-relative'/>
+ <separator/>
+ <menuitem action='set-fade-in-length'/>
+ <menuitem action='set-fade-out-length'/>
+ <separator/>
+ <menuitem action='trim-from-start'/>
+ <menuitem action='trim-to-end'/>
+ <menuitem action='trim-region-to-loop'/>
+ <menuitem action='trim-region-to-punch'/>
+ </menu>
<menu name='View' action = 'View'>
<menu name='ZoomFocus' action='ZoomFocus'>
<menuitem action='zoom-focus-left'/>
@@ -143,6 +182,7 @@
<menuitem action='zoom-focus-center'/>
<menuitem action='zoom-focus-playhead'/>
<menuitem action='zoom-focus-edit'/>
+ <menuitem action='zoom-focus-mouse'/>
</menu>
<menu name='SnapMode' action='SnapMode'>
<menuitem action='snap-normal'/>